Changeset 34088 for trunk/Ohana/src/relphot/src/StarOps.c

Timestamp:

Jun 26, 2012, 11:46:01 AM (14 years ago)

Author:

eugene

Message:

updates for pedantic gcc, mods to relphot average mags to handle GPC1 stacks

File:

• trunk/Ohana/src/relphot/src/StarOps.c (modified) (6 diffs)

trunk/Ohana/src/relphot/src/StarOps.c

@@ -354 +354 @@
       int Next = 0;
       int haveSynth = FALSE;
+      int haveStack = FALSE;
 
       int forceSynth = FALSE;
@@ -413 +414 @@
             }
           }
+          // gpc1 stack data
+          if ((catalog[Nc].measure[m].photcode >= 11000) && (catalog[Nc].measure[m].photcode <= 11400)) {
+            if (pass < 2) continue;
+            haveStack = TRUE;
+          }
+
           // count extended detections for 2MASS (XXX NOTE hardwired photcodes 2011, 2012, 2013)
           if ((catalog[Nc].measure[m].photcode >= 2011) && (catalog[Nc].measure[m].photcode <= 2013)) {
@@ -477 +484 @@
         // up-weight the ubercal values (or convergence can take a long time...)
         if (catalog[Nc].measureT[m].dbFlags & ID_MEAS_PHOTOM_UBERCAL) {
+          haveUbercal = TRUE;
           wlist[N] = 10.0;
         }
@@ -492 +500 @@
 
       int Nminmeas = isSetMrelFinal ? 1 : STAR_TOOFEW + 1;
+
+      if (haveStack && (N > 1)) {
+        // fprintf (stderr, "multiple stack values for %10.6f %10.6f\n", catalog[Nc].averageT[j].R, catalog[Nc].averageT[j].D);
+      }
 
       // when performing the grid analysis, STAR_TOOFEW should be set to 1;
@@ -1106 +1118 @@
   off_t j, N;
   double *xlist, *ylist;
-  double Xmin, Ymin, Xmax, Ymax;
+  // double Xmin, Ymin, Xmax, Ymax;
   Graphdata graphdata;
 
@@ -1117 +1129 @@
 
   N = 0;
-  Xmin = Ymin = +360.0;
-  Xmax = Ymax = -360.0;
+  // Xmin = Ymin = +360.0;
+  // Xmax = Ymax = -360.0;
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {