Changeset 41620 for branches/eam_branches/relphot.20210521/src/load_images.c

Timestamp:

May 27, 2021, 11:41:52 AM (5 years ago)

Author:

eugene

Message:

consolidate reset operations for clarity

File:

• branches/eam_branches/relphot.20210521/src/load_images.c (modified) (2 diffs)

branches/eam_branches/relphot.20210521/src/load_images.c

@@ -57 +57 @@
   // reset image values as needed.  always allow 'few' images to succeed, if possible (new
   // images / detections may have been added
-  for (off_t i = 0; i < Nsubset; i++) {
-    // reset these two regardless (we will re-determine)
-    subset[i].flags &= ~(ID_IMAGE_PHOTOM_NOCAL | ID_IMAGE_PHOTOM_POOR | ID_IMAGE_PHOTOM_SKIP | ID_IMAGE_PHOTOM_FEW);
-    if (RESET) {
-      if (RESET_ZEROPTS) {
-        if (!KEEP_UBERCAL || !(subset[i].flags & ID_IMAGE_PHOTOM_UBERCAL)) {
-          subset[i].McalPSF  = 0.0;
-          subset[i].McalAPER = 0.0;
-          subset[i].dMcal    = NAN;
-          subset[i].flags   &= ~ID_IMAGE_PHOTOM_UBERCAL;
-        }
-      }
-      subset[i].flags &= ~(ID_IMAGE_MOSAIC_POOR | ID_IMAGE_NIGHT_POOR);
-      subset[i].flags &= ~(ID_IMAGE_IMAGE_PHOTCAL | ID_IMAGE_MOSAIC_PHOTCAL | ID_IMAGE_TGROUP_PHOTCAL);
-      subset[i].ubercalDist = 1000;
-    }
-  }
+  ResetImages (subset, Nsubset);
 
   // XXX consider allowing relphot to skip the AstroMap load (do we need precise astrometry here?)
@@ -115 +99 @@
   return TRUE;
 }
+
+// This function re-creates the image subset array using the array of LineNumbers saved
+// initially by load_images.  This function is only called by relphot_images.c after the
+// loops have been completed (if any).  I am not certain this function is doing anything
+// at all : the values in the image subset are copied back to the master table in
+// save_images_updates() so the values copied from the master to the subset should already
+// be there.
 
 int reload_images (FITS_DB *db) {