Changeset 41387 for branches/eam_branches/relphot.20200519/src/setMrelCatalog.c

Timestamp:

Jul 7, 2020, 9:30:05 AM (6 years ago)

Author:

eugene

Message:

updates to get tgroups working

File:

• branches/eam_branches/relphot.20200519/src/setMrelCatalog.c (modified) (6 diffs)

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

@@ -221 +221 @@
 
     // ** Choose the calibration (depends on the mode : do I have an image reference or not?) 
-    float Mcal = 0.0, Mmos = 0.0, Mgrid = 0.0, Mflat = 0.0;
+    float Mcal = 0.0, Mmos = 0.0, Mgrid = 0.0, Mflat = 0.0, Mgrp = 0.0;
     off_t meas = measureOffset + k;
     if (getImageEntry (meas, cat) < 0) {
@@ -235 +235 @@
       Mmos  = getMmos  (meas, cat);
       if (isnan(Mmos))  SKIP_THIS_MEAS(Nmos);
+      Mgrp  = getMgrp  (meas, cat, measureT[k].airmass);
+      if (isnan(Mgrp))  SKIP_THIS_MEAS(Ngrp);
       Mgrid = getMgrid (meas, cat);
       if (isnan(Mgrid)) SKIP_THIS_MEAS(Ngrid);
@@ -261 +263 @@
       if (CHECK_VALID_MAG(Map, dMap)) {
         int Nap = results->aperData[Nsec].Nlist;
-        results->aperData[Nsec].flxlist[Nap] = Map - Mflat - Mcal - Mmos - Mgrid; // this is consistent with PhotRel
+        results->aperData[Nsec].flxlist[Nap] = Map - Mflat - Mcal - Mmos - Mgrp - Mgrid; // this is consistent with PhotRel
         results->aperData[Nsec].errlist[Nap] = dMap;
         results->aperData[Nsec].wgtlist[Nap] = useUbercalWeight ? UBERCAL_WEIGHT : 1.0;
@@ -281 +283 @@
     if (CHECK_VALID_MAG(Mkron, dMkron)) {
       int Nkron = results->kronData[Nsec].Nlist;
-      results->kronData[Nsec].flxlist[Nkron] = Mkron - Mflat - Mcal - Mmos - Mgrid; // this is consistent with PhotRel
+      results->kronData[Nsec].flxlist[Nkron] = Mkron - Mflat - Mcal - Mmos - Mgrp - Mgrid; // this is consistent with PhotRel
       results->kronData[Nsec].errlist[Nkron] = dMkron;
       results->kronData[Nsec].wgtlist[Nkron] = isUbercal ? UBERCAL_WEIGHT : 1.0;
@@ -294 +296 @@
     if (CHECK_VALID_MAG(Mpsf, dMpsf)) {
       int Npsf = results->psfData[Nsec].Nlist;
-      results->psfData[Nsec].flxlist[Npsf] = Mpsf - Mflat - Mcal - Mmos - Mgrid; // this is consistent with PhotRel
+      results->psfData[Nsec].flxlist[Npsf] = Mpsf - Mflat - Mcal - Mmos - Mgrp - Mgrid; // this is consistent with PhotRel
       results->psfData[Nsec].errlist[Npsf] = dMpsf;
       results->psfData[Nsec].wgtlist[Npsf] = isUbercal ? UBERCAL_WEIGHT : 1.0;
@@ -711 +713 @@
       Mmos      = getMmos  (measSeq, cat);
       Mgrid     = getMgrid (measSeq, cat);
+      // XXX can Mmos and Mgrid exist for stacks?
     }