Changeset 39219

Timestamp:

Dec 3, 2015, 4:11:25 PM (11 years ago)

Author:

eugene

Message:

needed modification to handle both old and new ubercal tables

Location:

branches/eam_branches/ipp-20151113/Ohana/src/uniphot

Files:

• include/setphot.h (modified) (1 diff)
• src/initialize_setphot.c (modified) (1 diff)
• src/load_zpt_table.c (modified) (1 diff)

branches/eam_branches/ipp-20151113/Ohana/src/uniphot/include/setphot.h

@@ -36 +36 @@
 int          IMAGES_ONLY;
 int          REPAIR_BY_OBJID;
+int          SKIP_EXTRA_EXTENSIONS;
 
 SkyRegion    UserPatch;

branches/eam_branches/ipp-20151113/Ohana/src/uniphot/src/initialize_setphot.c

@@ -49 +49 @@
   if ((N = get_argument (argc, argv, "-reset"))) {
     RESET = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
+  SKIP_EXTRA_EXTENSIONS = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-extra-extensions"))) {
+    SKIP_EXTRA_EXTENSIONS = TRUE;
     remove_argument (N, &argc, argv);
   }

branches/eam_branches/ipp-20151113/Ohana/src/uniphot/src/load_zpt_table.c

@@ -280 +280 @@
     }
 
-    // ***** skip the extra table segment *****
-    // load data for this header 
-    if (!gfits_load_header (f, &theader)) return (NULL);
-
-    // read the fits table bytes
-    if (!gfits_fread_ftable_data (f, &ftable, FALSE)) return (NULL);
+    // in some versions of ucal, we have extra FITS extensions (for masked chips)
+    // since Eddie gives no (or almost no) metadata, we have to be told if these exist:
+
+    if (SKIP_EXTRA_EXTENSIONS) {
+      // ***** skip the extra table segment *****
+      // load data for this header 
+      if (!gfits_load_header (f, &theader)) return (NULL);
+
+      // read the fits table bytes
+      if (!gfits_fread_ftable_data (f, &ftable, FALSE)) return (NULL);
   
-    // skip over remaining bytes in data segment
-    fseeko (f, ftable.datasize - ftable.validsize, SEEK_CUR);
+      // skip over remaining bytes in data segment
+      fseeko (f, ftable.datasize - ftable.validsize, SEEK_CUR);
+    }
 
     // XXX the initial hacked-together table from Eddie is missing the last 2 elements.  they should be zero