Changeset 41620 for branches/eam_branches/relphot.20210521/src/relphot_objects.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/relphot_objects.c (modified) (5 diffs)

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

@@ -10 +10 @@
 int relphot_objects (SkyList *skylist, int hostID, char *hostpath) {
 
-  off_t i, j, k;
-  int Nsecfilt;
+  off_t i;
   struct stat filestat;
 
@@ -85 +84 @@
 
     // reset the calculated average magnitudes (does not affect ubercal-tied measurements or images)
-    if (RESET) {
-      Nsecfilt = catalog.Nsecfilt;
-
-      DVOAverageFlags photomBits = 
-        ID_OBJ_EXT             | // extended in our data (eg, PS)
-        ID_OBJ_EXT_ALT         | // extended in external data (eg, 2MASS)
-        ID_OBJ_GOOD            | // good-quality measurement in our data (eg,PS)
-        ID_OBJ_GOOD_ALT        | // good-quality measurement in  external data (eg, 2MASS)
-        ID_OBJ_GOOD_STACK      | // good-quality object in the stack (> 1 good stack)
-        ID_OBJ_BEST_STACK      | // the primary stack measurement are the best measurements
-        ID_OBJ_SUSPECT_STACK   | // suspect object in the stack (> 1 good or suspect stack, < 2 good)
-        ID_OBJ_BAD_STACK;        // good-quality object in the stack (> 1 good stack)
-      
-      for (j = 0; j < catalog.Naverage; j++) {
-        catalog.average[j].flags    &= ~photomBits; // reset all except astrometry bits
-        catalog.average[j].psfQF     = NAN;     // reset (will be re-calculated here)
-        catalog.average[j].psfQFperf = NAN;     // reset (will be re-calculated here)
-        catalog.average[j].stargal   = NAN;     // reset (will be re-calculated here)
-        catalog.average[j].photFlagsUpper = 0;  // reset (will be re-calculated here)
-        catalog.average[j].photFlagsLower = 0;  // reset (will be re-calculated here)
-        catalog.average[j].NwarpOK        = 0;  // reset (will be re-calculated here)
-        for (k = 0; k < Nsecfilt; k++) {
-          dvo_secfilt_init (&catalog.secfilt[j*Nsecfilt + k], SECFILT_RESET_ALL);
-        }
-      }
-    }
+    ResetAverageObjects(&catalog);
 
     populate_tiny_values(&catalog, DVO_TV_MEASURE | DVO_TV_AVERAGE);
@@ -119 +93 @@
     // XXX reload_catalogs.c calls initTGroupBins here 
 
-    initGridBins   (&catalog, 1); 
+    initGridBins   (); 
 
     findImages (&catalog, 1, FALSE);
@@ -235 +209 @@
     if (RESET)             { strextend (&command, "-reset"); }
     if (RESET_ZEROPTS)     { strextend (&command, "-reset-zpts"); }
+    if (RESET_FLATCORR)    { strextend (&command, "-reset-flat"); }
+    if (!KEEP_UBERCAL)     { strextend (&command, "-reset-ubercal"); }
     if (PRESERVE_PS1)      { strextend (&command, "-preserve-ps1"); }
     if (IS_DIFF_DB)        { strextend (&command, "-is-diff-db"); }
     if (UPDATE)            { strextend (&command, "-update"); }
-    if (!KEEP_UBERCAL)     { strextend (&command, "-reset-ubercal"); }
     if (UPDATE_CATFORMAT)  { strextend (&command, "-update-catformat %s", UPDATE_CATFORMAT); }
     if (BOUNDARY_TREE)     { strextend (&command, "-boundary-tree %s", BOUNDARY_TREE); }
     if (SYNTH_ZERO_POINTS) { strextend (&command, "-synthphot-zpts %s", SYNTH_ZERO_POINTS); }
+    // if (GRID_ZEROPT)       { strextend (&command, "-grid %s", GRID_MEANFILE); } 
     if (USE_BASIC_CHECK)   { strextend (&command, "-basic-image-search"); }
     if (USE_ALL_IMAGES)    { strextend (&command, "-use-all-images"); }
@@ -251 +227 @@
 
     // if (SET_MREL_VERSION != 1) { strextend (&command, "-set-mrel-version %d", SET_MREL_VERSION); } 
+
+    // missing AreaSelect & TimeSelect
 
     fprintf (stderr, "command: %s\n", command);