Changeset 38654

Timestamp:

Jul 30, 2015, 6:01:10 PM (11 years ago)

Author:

eugene

Message:

correctly handle missing radial aperture entry

File:

• trunk/Ohana/src/addstar/src/ReadXradFITS.c (modified) (3 diffs)

trunk/Ohana/src/addstar/src/ReadXradFITS.c

@@ -14 +14 @@
   /* load the table data */
   if (!gfits_fread_ftable_data (f, &table, FALSE)) {
-    fprintf (stderr, "ERROR: can't read table header\n");
-    exit (1);
+    fprintf (stderr, "WARNING: no xrad data, skipping\n");
+    return TRUE;
+  }
+
+  if (theader[0].Naxis[1] == 0) {
+    fprintf (stderr, "WARNING: no xrad data, skipping\n");
+    return TRUE;
   }
 
@@ -65 +70 @@
   for (i = 0; i < catalog->Nmeasure; i++) {
     if (catalog->measure[i].detID < RadID[Nap]) {
-      Nap ++;
       continue;
+      // this is a psf measurement which does not have a radial aperture
     }
     if (catalog->measure[i].detID > RadID[Nap]) {
       myAbort("radial apertures out of order?  seems like a bug\n");
+      // this would be a radial aperture which does not have a radial aperture
     }
 
@@ -95 +101 @@
     Nap ++;
   }
-  catalog->Nlensing = Nap;
+  myAssert (Nap == Nrow, "did we go too far???");
 
   gfits_free_table (&table);