Changeset 33649 for trunk/Ohana/src/libdvo/src/dvo_catalog_mef.c

Timestamp:

Apr 1, 2012, 2:28:17 PM (14 years ago)

Author:

eugene

Message:

new query fields (secfilt flags; mean airmass; mcal offset, photcode_klam, photcode_c); updates to the measure,average,secfilt bit flags (relphot & relastr); support for distributed hosts & flat-field corrections in dvo; support for PS1_V3 schema; remove strdup from code (break ohana memory management); better support for Average,Measure Tiny values (used by relphot and relastro)

File:

• trunk/Ohana/src/libdvo/src/dvo_catalog_mef.c (modified) (12 diffs)

trunk/Ohana/src/libdvo/src/dvo_catalog_mef.c

@@ -3 +3 @@
 int dvo_catalog_load_mef (Catalog *catalog, int VERBOSE) {
   
+  off_t Nbytes;
+  off_t Naverage;
+  off_t Nmeasure;
+  off_t Nmissing;
+  off_t Nitems, Nexpect;
   int Nsecfilt;
-  off_t Nitems, Nbytes, Nexpect, Naverage, Nmeasure, Nmissing;
-  FILE *f;
 
   Header header;
-  Matrix matrix;
   FTable ftable;
-  SecFilt *primary;
-
-  f = catalog[0].f;
+
+  SecFilt *primary = NULL;
+
   ftable.header = &header;
 
-  /* move pointer past header -- must be already read (load_catalog) */
-  fseeko (f, catalog[0].header.datasize, SEEK_SET);
-
-  /* matrix should be empty */
-  if (!gfits_fread_matrix (f, &matrix, &catalog[0].header)) {
-    if (VERBOSE) fprintf (stderr, "can't read primary matrix");
-    return (FALSE);
-  }
   /* get the components from the header */
   if (!gfits_scan (&catalog[0].header, "NSTARS",   OFF_T_FMT, 1,  &Naverage)) return (FALSE);
@@ -57 +51 @@
   catalog[0].secfilt = NULL;
 
-  /* validate table mode */
+  /* validate table mode ?*/
+
+  /*** Average Table ***/
+
+  /* need to read the table header to determine format (whether or not we read averages) */
+  /* move pointer past PHU header -- must be already read (load_catalog) */
+  Nbytes = catalog[0].header.datasize + gfits_data_size (&catalog[0].header);
+  fseeko (catalog[0].f, Nbytes, SEEK_SET);
 
   /* read Average table header */
-  if (!gfits_fread_header (f, &header)) {
+  if (!gfits_fread_header (catalog[0].f, &header)) {
     if (VERBOSE) fprintf (stderr, "can't read table average header");
     return (FALSE);
   }
+
   /* read Average table data (or skip) */
   if (catalog[0].catflags & LOAD_AVES) {
-    if (!gfits_fread_ftable_data (f, &ftable, FALSE)) {
+    if (!gfits_fread_ftable_data (catalog[0].f, &ftable, FALSE)) {
       if (VERBOSE) fprintf (stderr, "can't read table average data");
       return (FALSE);
@@ -78 +80 @@
     catalog[0].Naves_off = 0;
   } else {
+    catalog[0].catformat = FtableGetFormat (&ftable);
     Nbytes = gfits_data_size (&header);
-    fseeko (f, Nbytes, SEEK_CUR);
+    fseeko (catalog[0].f, Nbytes, SEEK_CUR);
     ALLOCATE (catalog[0].average, Average, 1);
     catalog[0].Naverage = 0;
@@ -88 +91 @@
 
   /* read Measure table header */
-  if (!gfits_fread_header (f, &header)) {
+  if (!gfits_fread_header (catalog[0].f, &header)) {
     if (VERBOSE) fprintf (stderr, "can't read table measure header");
     return (FALSE);
@@ -94 +97 @@
   /* read Measure table data */
   if (catalog[0].catflags & LOAD_MEAS) {
-    if (!gfits_fread_ftable_data (f, &ftable, FALSE)) {
+    if (!gfits_fread_ftable_data (catalog[0].f, &ftable, FALSE)) {
       if (VERBOSE) fprintf (stderr, "can't read table measure data");
       return (FALSE);
@@ -106 +109 @@
   } else {
     Nbytes = gfits_data_size (&header);
-    fseeko (f, Nbytes, SEEK_CUR);
+    fseeko (catalog[0].f, Nbytes, SEEK_CUR);
     ALLOCATE (catalog[0].measure, Measure, 1);
     catalog[0].Nmeasure = 0;
@@ -113 +116 @@
 
   /* read Missing table header */
-  if (!gfits_fread_header (f, &header)) {
+  if (!gfits_fread_header (catalog[0].f, &header)) {
     if (VERBOSE) fprintf (stderr, "can't read table missing header");
     return (FALSE);
@@ -119 +122 @@
   /* read Missing table data */
   if (catalog[0].catflags & LOAD_MISS) {
-    if (!gfits_fread_ftable_data (f, &ftable, FALSE)) {
+    if (!gfits_fread_ftable_data (catalog[0].f, &ftable, FALSE)) {
       if (VERBOSE) fprintf (stderr, "can't read table missing data");
       return (FALSE);
@@ -136 +139 @@
   } else {
     Nbytes = gfits_data_size (&header);
-    fseeko (f, Nbytes, SEEK_CUR);
+    fseeko (catalog[0].f, Nbytes, SEEK_CUR);
     ALLOCATE (catalog[0].missing, Missing, 1);
     catalog[0].Nmissing = 0;
@@ -143 +146 @@
 
   /* read secfilt table header */
-  if (!gfits_fread_header (f, &header)) {
+  if (!gfits_fread_header (catalog[0].f, &header)) {
     if (VERBOSE) fprintf (stderr, "can't read table secfilt header");
     return (FALSE);
@@ -149 +152 @@
   /* read secfilt table data */
   if (catalog[0].catflags & LOAD_SECF) {
-    if (!gfits_fread_ftable_data (f, &ftable, FALSE)) {
+    if (!gfits_fread_ftable_data (catalog[0].f, &ftable, FALSE)) {
       if (VERBOSE) fprintf (stderr, "can't read table secfilt data");
       return (FALSE);
@@ -187 +190 @@
     /* no real need to skip the data array here... */
     Nbytes = gfits_data_size (&header);
-    fseeko (f, Nbytes, SEEK_CUR);
+    fseeko (catalog[0].f, Nbytes, SEEK_CUR);
     if (primary != NULL) {
       free (primary);