Changeset 40291 for trunk/Ohana/src/uniphot/src/match_zpts_to_images.c

Timestamp:

Dec 13, 2017, 10:53:48 AM (9 years ago)

Author:

eugene

Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/uniphot/src/match_zpts_to_images.c (modified) (3 diffs)

trunk/Ohana/src/uniphot/src/match_zpts_to_images.c

@@ -41 +41 @@
   if (RESET) {
     for (i = 0; i < Nimage; i++) {
-      image[i].Mcal = 0.0;
-      image[i].dMcal = NAN;
-      image[i].flags &= ~ID_IMAGE_PHOTOM_NOCAL; // clear the NOCAL flag
+      image[i].McalPSF  = 0.0;
+      image[i].McalAPER = 0.0;
+      image[i].dMcal    = NAN;
+      image[i].flags   &= ~ID_IMAGE_PHOTOM_NOCAL; // clear the NOCAL flag
       if (UBERCAL) {
         image[i].flags &= ~ID_IMAGE_PHOTOM_UBERCAL; // clear the UBERCAL flag
@@ -107 +108 @@
     // UBERCAL includes 2.5log(exptime) + K*airmass in the zero point
     if (UBERCAL) {
-      image[Ni].Mcal = SCALE*code[0].C - zpts[Nz].zpt + 2.5*log10(image[Ni].exptime) + code[0].K*(image[Ni].secz - 1.000);
-      myAssert (isfinite(image[Ni].Mcal), "oops, ubercal made a nan image");
+      image[Ni].McalPSF  = SCALE*code[0].C - zpts[Nz].zpt + 2.5*log10(image[Ni].exptime) + code[0].K*(image[Ni].secz - 1.000);
+      image[Ni].McalAPER = SCALE*code[0].C - zpts[Nz].zpt + 2.5*log10(image[Ni].exptime) + code[0].K*(image[Ni].secz - 1.000);
+      myAssert (isfinite(image[Ni].McalPSF), "oops, ubercal made a nan image");
     } else {
-      image[Ni].Mcal = SCALE*code[0].C - zpts[Nz].zpt;
+      image[Ni].McalPSF  = SCALE*code[0].C - zpts[Nz].zpt;
+      image[Ni].McalAPER = SCALE*code[0].C - zpts[Nz].zpt;
     }
 
@@ -116 +119 @@
     float offset = apply_zpt_offset (code[0].equiv);
     assert (isfinite(offset));
-    image[Ni].Mcal += offset;
+    image[Ni].McalPSF  += offset;
+    image[Ni].McalAPER += offset;
 
     image[Ni].dMcal = zpts[Nz].zpt_err;