Changeset 41387 for branches/eam_branches/relphot.20200519/src/StarOps.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/StarOps.c (modified) (4 diffs)

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

@@ -491 +491 @@
         float Mmos  = getMmos  (m, i);
         if (isnan(Mmos)) continue;
-        float Mgrp  = getMgrp  (m, i);
+        float Mgrp  = getMgrp  (m, i, catalog[i].measureT[m].airmass);
         if (isnan(Mgrp)) continue;
         float Mgrid = getMgrid (m, i);
@@ -507 +507 @@
 
         // set the output calibration
-        float Moff = Mmos + Mgrp + Mgrid;
+        // float Moff = Mmos + Mgrp + Mgrid;
+        float Moff = Mmos + Mgrid; // Mgrp has already been applied to the image.Mcal
         catalog[i].measure[m].McalPSF  = McalPSF + Moff;
         catalog[i].measure[m].McalAPER = useStackAper ? McalAPER + Moff : McalPSF + Moff;
@@ -730 +731 @@
           Mmos  = getMmos  (m, i);
           if (isnan(Mmos)) { Nmos ++; continue; }
-          Mgrp  = getMgrp  (m, i);
+          Mgrp  = getMgrp  (m, i, catalog[i].measureT[m].airmass);
           if (isnan(Mgrp)) { Ngrp ++; continue; }
           Mgrid = getMgrid (m, i);
@@ -736 +737 @@
 
           Msys = PhotSysTiny (&catalog[i].measureT[m], &catalog[i].averageT[j], &catalog[i].secfilt[j*Nsecfilt], MAG_CLASS_PSF);
-          list[N] = Msys - Mcal - Mmos - Mgrid;
+          list[N] = Msys - Mcal - Mmos - Mgrp - Mgrid;
           dlist[N] = MAX (catalog[i].measureT[m].dM, MIN_ERROR);
           N++;