Changeset 33549

Timestamp:

Mar 16, 2012, 9:54:39 AM (14 years ago)

Author:

eugene

Message:

add some asserts to catch bad things in Mcal

Location:

branches/eam_branches/ipp-20111122/Ohana/src

Files:

• relphot/src/StarOps.c (modified) (1 diff)
• uniphot/src/match_zpts_to_images.c (modified) (3 diffs)
• uniphot/src/update_catalog_setphot.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/StarOps.c

@@ -536 +536 @@
         // set the output calibration
         catalog[i].measure[m].Mcal = Mcal + Mmos + Mgrid;
+
+        if (catalog[i].measureT[m].dbFlags & ID_MEAS_PHOTOM_UBERCAL) {
+          myAssert (isfinite(catalog[i].measure[m].Mcal), "oops, broke an ubercal mag");
+        }
       }
     }

branches/eam_branches/ipp-20111122/Ohana/src/uniphot/src/match_zpts_to_images.c

@@ -44 +44 @@
       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
+      }
     }
   }
@@ -52 +55 @@
     // if (i % 1000 == 0) fprintf (stderr, ".");
     // if (Nz % 100 == 0) fprintf (stderr, "!");
+
+    if (!isfinite(zpts[Nz].zpt)) {
+      Nz++;
+      continue;
+    }
 
     Ni = index[i];
@@ -81 +89 @@
     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");
     } else {
       image[Ni].Mcal = SCALE*code[0].C - zpts[Nz].zpt;

branches/eam_branches/ipp-20111122/Ohana/src/uniphot/src/update_catalog_setphot.c

@@ -26 +26 @@
       catalog[0].measure[m].Mcal = Mcal - Mcal_offset;
       catalog[0].measure[m].dMcal = dMcal;
+      myAssert(isfinite(catalog[0].measure[m].Mcal), "oops: ubercal made a nan");
 
       // if we are setting the zero points from an UBERCAL database, and this detection is from one of those images,