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

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

@@ -35 +35 @@
   ALLOCATE (Nvalid, int, Nsecfilt);
 
-  // flags used by the photometry analysis (excluding UBERCAL)
-  unsigned int PHOTOM_FLAGS = 
-    ID_MEAS_NOCAL          | // detection ignored for this analysis (photcode, time range)
-    ID_MEAS_POOR_PHOTOM    | // detection is photometry outlier 
-    ID_MEAS_SKIP_PHOTOM    | // detection was ignored for photometry measurement 
-    ID_MEAS_AREA           | // detetion was outside acceptable area of device
-    ID_MEAS_SYNTH_MAG      | // magnitude is synthetic
-    ID_MEAS_STACK_PRIMARY  | // this stack measurement is in the primary skycell
-    ID_MEAS_STACK_PHOT_SRC | // this measurement supplied the stack photometry
-    ID_MEAS_PHOTOM_PSF     | // this measurement is used for the mean psf mag
-    ID_MEAS_PHOTOM_APER    | // this measurement is used for the mean ap mag
-    ID_MEAS_PHOTOM_KRON    ; // this measurement is used for the mean kron mag
-    
   /* exclude stars not in range or with too few measurements */
   for (i = 0; i < catalog[0].Naverage; i++) {
@@ -61 +48 @@
     }
 
-    // reset the calculated average magnitudes (does not affect ubercal-tied measurements or images)
-    if (RESET) {
-      int Ns;
-
-      for (Ns = 0; Ns < Nphotcodes; Ns++) {
-
-        int thisCode = photcodes[Ns][0].code;
-        int Nsec = GetPhotcodeNsec(thisCode);
-
-        dvo_secfilt_init (&subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec], SECFILT_RESET_ALL);
-      }
-    }
+    // reset the calculated average magnitudes for active photcode only
+    ResetAverageActivePhotcodes (&subcatalog[0].secfilt[Nsecfilt*Naverage]);
 
     Nm = 0;
@@ -111 +88 @@
       if (isnan(catalog[0].measure[offset].Mkron)) { Nnan ++; continue; }
 
-      // require 0x01 in photFlags (fitted with a PSF)
+      // require 0x01 in photFlags (fitted with a PSF) -- add to the test data
 // XXX EAM : test is inconsistent -- fix      if ((catalog[0].measure[offset].photFlags & 0x01) == 0) { Nbad ++; continue; }
 
@@ -156 +133 @@
       subcatalog[0].measureT[Nmeasure].dbFlags &= ~ID_MEAS_SKIP_PHOTOM;
       subcatalog[0].measureT[Nmeasure].averef = Naverage;
-      if (RESET) { 
-        // only reset Mcal for measures with a matching image
-        // do not reset Mcal for ubercal images unless explicitly requested
-        if (subcatalog[0].measureT[Nmeasure].dbFlags & ID_MEAS_PHOTOM_UBERCAL) {
-          if (!KEEP_UBERCAL) {
-            subcatalog[0].measureT[Nmeasure].McalPSF  = 0.0;
-            subcatalog[0].measureT[Nmeasure].McalAPER = 0.0;
-            subcatalog[0].measureT[Nmeasure].dbFlags &= ~ID_MEAS_PHOTOM_UBERCAL;
-          } 
-        } else {
-          if (getImageEntry (Nmeasure, Ncat) >= 0) {
-            subcatalog[0].measureT[Nmeasure].McalPSF  = 0.0;
-            subcatalog[0].measureT[Nmeasure].McalAPER = 0.0;
-          }
-        }
-        subcatalog[0].measureT[Nmeasure].dbFlags &= ~PHOTOM_FLAGS;
-      }
+      ResetMeasureZeroPoints (&subcatalog[0].measureT[Nmeasure], Nmeasure, Ncat);
+
       Nmeasure ++;
       Nm ++;