Changeset 40244 for branches/eam_branches/ohana.20170822/src/opihi

Timestamp:

Dec 5, 2017, 6:04:35 AM (9 years ago)

Author:

eugene

Message:

split measure->Mcal into McalPSF and McalAPER

Location:

branches/eam_branches/ohana.20170822/src/opihi/dvo

Files:

• gstar.c (modified) (1 diff)
• imdata.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/opihi/dvo/gstar.c

@@ -760 +760 @@
 
             if (FULL_OUTPUT) {
-              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Mcal);
+              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].McalPSF);
+              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].McalAPER);
               gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Mflat);
               gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Map);

branches/eam_branches/ohana.20170822/src/opihi/dvo/imdata.c

@@ -183 +183 @@
         for (i = 0; i < catalog.Nmeasure; i++) {
           if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-          vec[0].elements.Flt[N] = catalog.measure[i].Mcal;
+          vec[0].elements.Flt[N] = catalog.measure[i].McalPSF;
           N++;
           CHECK_REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS, N, 1000);