Changeset 41607 for branches/eam_branches/relphot.20210521/src/setMrelCatalog.c

Timestamp:

May 21, 2021, 4:49:23 PM (5 years ago)

Author:

eugene

Message:

add code to set Mflat based on Mgrid before final Mrel calculation

File:

• branches/eam_branches/relphot.20210521/src/setMrelCatalog.c (modified) (5 diffs)

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

@@ -233 +233 @@
       // data for which the associated image has not been loaded (probably because of
       // overlaps).  Msys + measure.Mcal is our best guess of the true magnitude
-      Mmos = Mgrid = 0;
       Mcal = measureT[k].McalPSF; // check that this is zero for loaded REF value
     } else {
@@ -243 +242 @@
       Mgrp  = getMgrp  (meas, cat, measureT[k].airmass, &dMgrp);
       if (isnan(Mgrp))  SKIP_THIS_MEAS(Ngrp);
-      Mgrid = getMgridTiny (&measureT[k]);
+      Mgrid = isSetMrelFinal ? 0.0 : getMgridTiny (&measureT[k]); 
       if (isnan(Mgrid)) SKIP_THIS_MEAS(Ngrid);
       Mflat = isnan (measureT[k].Mflat) ? 0.0 : measureT[k].Mflat;
     }
+    // on the final calculation of Mrel the value of Mgrid has been applied to Mflat, but
+    // it has not been removed from the GridOps.c structures.  In order to avoid double-counting,
+    // we need to skip Mgrid on the final calculation.
 
     int myUbercalDist = getUbercalDist(meas, cat);
@@ -562 +564 @@
   SecFilt *secfilt = &catalog[0].secfilt[ave*Nsecfilt];
 
-  float McalPSF = 0, McalAPER = 0, Mmos = 0, Mgrid = 0;
+  float McalPSF = 0, McalAPER = 0;
 
   // set the primary projection cell and skycell for this coordinate
@@ -726 +728 @@
       McalPSF  = measure[meas].McalPSF; // check that this is zero for loaded REF value
       McalAPER = McalPSF; // check that this is zero for loaded REF value
-      Mmos     = 0.0;
-      Mgrid    = 0.0;
     } else {
       McalPSF   = getMcal  (measSeq, cat, MAG_CLASS_PSF);
       McalAPER  = USE_MCAL_PSF_FOR_STACK_APER ? getMcal  (measSeq, cat, MAG_CLASS_PSF) : getMcal  (measSeq, cat, MAG_CLASS_KRON);
-      Mmos      = getMmos  (measSeq, cat);
-      Mgrid     = getMgrid (&measure[meas]);
-      // XXX can Mmos and Mgrid exist for stacks?
     }
     
@@ -769 +766 @@
     // get the zero point for the selected image
     // Use a different zero point for the PSF-like and APERTURE-like magnitudes
-    float zpPSF  = PhotZeroPoint (&measure[meas], &average[0], &secfilt[0]) - (McalPSF  + Mmos + Mgrid);
-    float zpAPER = PhotZeroPoint (&measure[meas], &average[0], &secfilt[0]) - (McalAPER + Mmos + Mgrid);
+    float zpPSF  = PhotZeroPoint (&measure[meas], &average[0], &secfilt[0]) - McalPSF;
+    float zpAPER = PhotZeroPoint (&measure[meas], &average[0], &secfilt[0]) - McalAPER;
 
     // zpFactor to go from instrumental flux to Janskies