Changeset 38443 for branches/eam_branches/ipp-20150419/Ohana/src/opihi/dvo/mextract.c

Timestamp:

Jun 12, 2015, 9:26:15 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150419/Ohana/src/opihi

Files:

• . (modified) (1 prop)
• dvo/mextract.c (modified) (4 diffs)

branches/eam_branches/ipp-20150419/Ohana/src/opihi/dvo/mextract.c

@@ -19 +19 @@
     return FALSE;
 }
+
+void gfits_uncompress_timing ();
 
 int mextract (int argc, char **argv) {
@@ -229 +231 @@
     snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
-    // catalog.catflags |= needLensing ? LOAD_LENSING : SKIP_LENSING;
-    catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
+    // catalog.catflags |= needLensing ? DVO_LOAD_LENSING : DVO_SKIP_LENSING;
+    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
     catalog.Nsecfilt = Nsecfilt;
 
@@ -317 +319 @@
   // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)
   if (RESULT_FILE && !SKIP_RESULTS) {
-    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, NULL);
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, FALSE, NULL);
     if (!status) goto escape;
   }
@@ -330 +332 @@
   SkyListFree (skylist);
   FreeSkyRegionSelection (selection);
+
+  gfits_uncompress_timing();
 
   // fprintf (stderr, "done extr...\n");