Changeset 33221

Timestamp:

Feb 8, 2012, 10:30:30 AM (14 years ago)

Author:

eugene

Message:

when loading a catalog (but not loading average) read the format from the header

Location:

branches/eam_branches/ipp-20111122/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (1 diff)
• src/dvo_catalog.c (modified) (1 diff)
• src/dvo_catalog_mef.c (modified) (12 diffs)
• src/dvo_catalog_split.c (modified) (3 diffs)
• src/dvo_convert.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/libdvo/include/dvo.h

@@ -464 +464 @@
 int WriteRawSecFilt (FILE *f, SecFilt *secfilt, off_t Nsecfilt, char format);
 
+DVOTableFormat FtableGetFormat (FTable *ftable);
+
 Average *FtableToAverage (FTable *ftable, off_t *Naverage, char *format, SecFilt **primary);
 Measure *FtableToMeasure (FTable *ftable, off_t *Nmeasure, char *format);

branches/eam_branches/ipp-20111122/Ohana/src/libdvo/src/dvo_catalog.c

@@ -250 +250 @@
 
   dvo_catalog_init (catalog, FALSE);
+
+  // reset the file pointer in case we've already read some data
+  fseeko (catalog[0].f, 0, SEEK_SET);
 
   // load the main catalog header, determine characteristics

branches/eam_branches/ipp-20111122/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 = NULL;
 
-  f = catalog[0].f;
   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);
@@ -58 +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);
@@ -79 +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;
@@ -89 +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);
@@ -95 +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);
@@ -107 +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;
@@ -114 +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);
@@ -120 +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);
@@ -137 +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;
@@ -144 +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);
@@ -150 +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);
@@ -188 +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);

branches/eam_branches/ipp-20111122/Ohana/src/libdvo/src/dvo_catalog_split.c

@@ -160 +160 @@
 
   off_t Nbytes;
-  off_t Naverage, Nmeasure, Nmissing;
+  off_t Naverage;
+  off_t Nmeasure;
+  off_t Nmissing;
   off_t Nitems;
   int status, Nsecfilt;
@@ -209 +211 @@
 
   /*** 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 (catalog[0].f, &header)) { 
+    if (VERBOSE) fprintf (stderr, "can't read table average header");
+    return (FALSE);
+  }
   if (catalog[0].catflags & LOAD_AVES) {
-    /* move pointer past 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 (catalog[0].f, &header)) { 
-      if (VERBOSE) fprintf (stderr, "can't read table average header");
-      return (FALSE);
-    }
     /* read Average table data : format is irrelevant here */
     if (!gfits_fread_ftable_data (catalog[0].f, &ftable, FALSE)) { 
@@ -234 +239 @@
     catalog[0].Naves_off = 0;
   } else {
+    catalog[0].catformat = FtableGetFormat (&ftable);
     ALLOCATE (catalog[0].average, Average, 1);
     catalog[0].Naverage = 0;

branches/eam_branches/ipp-20111122/Ohana/src/libdvo/src/dvo_convert.c

@@ -10 +10 @@
 /** this file might be more readable if I use macros for the repetative
     constructions below **/
+
+DVOTableFormat FtableGetFormat (FTable *ftable) {
+
+  DVOTableFormat format;
+  char extname[80];
+
+  /* read the format of this table */
+  if (!gfits_scan (ftable[0].header, "EXTNAME", "%s", 1, extname)) {
+    fprintf (stderr, "EXTNAME missing for average table\n");
+    return (DVO_FORMAT_UNDEF);
+  }
+
+  if (!strcmp (extname, "DVO_AVERAGE")) {
+    format = DVO_FORMAT_INTERNAL;
+    return (format);
+  }
+# define CONVERT_FORMAT(NAME, FORMAT)           \
+  if (!strcmp (extname, NAME)) {                \
+    format = DVO_FORMAT_##FORMAT;               \
+    return (format); }
+
+  CONVERT_FORMAT ("DVO_AVERAGE_ELIXIR",          ELIXIR);
+  CONVERT_FORMAT ("DVO_AVERAGE_LONEOS",          LONEOS);
+  CONVERT_FORMAT ("DVO_AVERAGE_PANSTARRS_DEV_0", PANSTARRS_DEV_0);
+  CONVERT_FORMAT ("DVO_AVERAGE_PANSTARRS_DEV_1", PANSTARRS_DEV_1);
+  CONVERT_FORMAT ("DVO_AVERAGE_PS1_DEV_1",       PS1_DEV_1);
+  CONVERT_FORMAT ("DVO_AVERAGE_PS1_DEV_2",       PS1_DEV_2);
+  CONVERT_FORMAT ("DVO_AVERAGE_PS1_V1",          PS1_V1);
+  CONVERT_FORMAT ("DVO_AVERAGE_PS1_V2",          PS1_V2);
+  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF",         PS1_REF);
+# undef CONVERT_FORMAT
+
+  fprintf (stderr, "table format unknown: %s\n", extname);
+  return (DVO_FORMAT_UNDEF);
+}
 
 /*** Average / FTable conversion functions ***/