Changeset 41623 for branches/eam_branches/relphot.20210521/src/ResetOps.c

Timestamp:

May 27, 2021, 3:55:13 PM (5 years ago)

Author:

eugene

Message:

consolidate reload_catalogs and relphot_objects; option to supply grid correction in relphot -averages and relphot -apply-offsets

File:

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

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

@@ -104 +104 @@
 }
 
-// Used in relphot_objects.c:
-void ResetAverageObjects (Catalog *catalog) {
-
-  // reset the calculated average magnitudes (does not affect ubercal-tied measurements or images)
-  if (!RESET) return;
-
-  int Nsecfilt = catalog->Nsecfilt;
-
-  for (off_t j = 0; j < catalog->Naverage; j++) {
-    catalog->average[j].flags    &= ~photomBitsAverage; // reset all photometry bits (but not astrom)
-    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 (off_t k = 0; k < Nsecfilt; k++) {
-      dvo_secfilt_init (&catalog->secfilt[j*Nsecfilt + k], SECFILT_RESET_ALL);
-    }
-  }
-}
-
 // Used in setMrelFinal.c
 void ResetAverageAndMeasure (Catalog *catalog) {
-
-  /*** RESET photometry flags and Mcal values ***/
-  if (!RESET) return;
 
   int Nsecfilt = GetPhotcodeNsecfilt ();
@@ -141 +116 @@
 
   for (off_t i = 0; i < catalog->Naverage; i++) {
+    catalog[0].average[i].psfQF     = NAN;      // force recalculation in setMrelCatalog
+    catalog[0].average[i].psfQFperf = NAN;      // force recalculation in setMrelCatalog
+    catalog[0].average[i].stargal   = NAN;      // force recalculation in setMrelCatalog
+    catalog[0].average[i].photFlagsUpper = 0;   // reset (will be re-calculated)
+    catalog[0].average[i].photFlagsLower = 0;   // reset (will be re-calculated)
+    catalog[0].average[i].NwarpOK        = 0;   // reset (will be re-calculated)
+
+    if (!RESET) continue;
+
+    catalog->average[i].flags    &= ~photomBitsAverage; // reset all photometry bits (but not astrom)
+
     for (int Ns = 0; Ns < Nsecfilt; Ns++) {