Changeset 38615

Timestamp:

Jul 22, 2015, 8:15:13 AM (11 years ago)

Author:

eugene

Message:

update setphot to handle new Eddie table

Location:

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

Files:

• load_zpt_table.c (modified) (3 diffs)
• update_dvo_setphot.c (modified) (1 diff)

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

@@ -107 +107 @@
   if (NO_METADATA) {
     NFILTER = 5;
-    NSEASON = 4;
+    NSEASON = 5;
     NCHIP_X = 8;
     NCHIP_Y = 8;
@@ -165 +165 @@
   // ubercal hard-coded values
   char filters_uc[5][3] = {"g", "r", "i", "z", "y"};
-  double tstart_uc[] = {55000.0, 55296.0, 55327.0, 55662.0};
-  double tstop_uc[]  = {55296.0, 55327.0, 55662.0, 60000.0};
+
+  // double tstart_uc[] = {55000.0, 55296.0, 55327.0, 55662.0};
+  // double tstop_uc[]  = {55296.0, 55327.0, 55662.0, 60000.0};
+
+  double tstart_uc[] = {50000.0, 55296.0, 55327.0, 55662.0, 56110.0};
+  double tstop_uc[]  = {55296.0, 55327.0, 55662.0, 56110.0, 65000.0};
 
   double mjdstart, mjdstop;
@@ -275 +279 @@
         exit (2);
     }
+
+    // ***** 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);
 
     // XXX the initial hacked-together table from Eddie is missing the last 2 elements.  they should be zero

branches/eam_branches/ipp-20150625/Ohana/src/uniphot/src/update_dvo_setphot.c

@@ -53 +53 @@
     dvo_catalog_init (&catalog, TRUE);
     catalog.filename    = HOST_ID ? localFilename : skylist[0].filename[i];
-    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
+    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
     catalog.Nsecfilt    = GetPhotcodeNsecfilt ();