Changeset 36936

Timestamp:

Jun 22, 2014, 7:41:56 PM (12 years ago)

Author:

eugene

Message:

FREEZE_IMAGE should only skip gpc1 camera chips (not skychips); make sure mean mags only use gpc1 chips

Location:

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src

Files:

• ImageOps.c (modified) (2 diffs)
• setMrelCatalog.c (modified) (2 diffs)

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/ImageOps.c

@@ -531 +531 @@
   liststats_setmode (&stats, STATMODE);
 
-  if (FREEZE_IMAGES) return;
+  // FREEZE_IMAGES only applies to mosaic data (eg, gpc1)
+  // skip this function if photcode is gpc1 and FREEZE_IMAGES
+  // otherwise, allow image to be calibrated
+  // if (FREEZE_IMAGES) return;
 
   fprintf (stderr, "limiting negative clouds to %f\n", CLOUD_TOLERANCE);
@@ -561 +564 @@
       if (!bad) continue;
     }      
+
+    int isGPC1cam = ((image[i].photcode >= 10000) && (image[i].photcode <= 10500));
+    if (FREEZE_IMAGES && isGPC1cam) continue;
 
     // UBERCAL image: if this is an ubercal image, set minUbercalDist to 0:

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/setMrelCatalog.c

@@ -161 +161 @@
       if ((measureT[k].photcode >= 10000) && (measureT[k].photcode <= 10500)) {
         NexpPS1 ++;
+      }
+
+      // SKIP gpc1 stack data
+      if ((measure[k].photcode >= 11000) && (measure[k].photcode <= 11500)) {
+        continue;
+      }
+
+      // SKIP gpc1 forced-warp data
+      if ((measure[k].photcode >= 12000) && (measure[k].photcode <= 12500)) {
+        continue;
       }
 
@@ -212 +222 @@
           }
           havePS1 = TRUE;
-        }
-
-        // SKIP gpc1 stack data
-        if ((measure[k].photcode >= 11000) && (measure[k].photcode <= 11500)) {
-          continue;
-        }
-
-        // SKIP gpc1 forced-warp data
-        if ((measure[k].photcode >= 12000) && (measure[k].photcode <= 12500)) {
-          continue;
         }