Changeset 14191

Timestamp:

Jul 12, 2007, 5:17:43 PM (19 years ago)

Author:

eugene

Message:

fixed handling of the photcodes in mextract and avextract

Location:

trunk/Ohana/src/opihi

Files:

• dvo/avextract.c (modified) (4 diffs)
• dvo/dbCmdlineFields.c (modified) (1 diff)
• dvo/dbExtractMeasures.c (modified) (1 diff)
• dvo/dbFields.c (modified) (5 diffs)
• dvo/dbStackOps.c (modified) (1 diff)
• dvo/mextract.c (modified) (4 diffs)
• include/dvoshell.h (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/avextract.c

@@ -13 +13 @@
   PhotCode *code;
   Vector **vec;
-
   dbField *fields;
   dbStack *stack;
@@ -23 +22 @@
   code = NULL;
   mode = MAG_AVE;
+  fields = NULL;
+  stack = NULL;
+
   dvo_catalog_init (&catalog, TRUE);
 
@@ -108 +110 @@
   }
 
-  // XXX free fields and stack 
-
+  dbFreeFields (fields, Nfields);
+  dbFreeStack (stack, Nstack);
   SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));
   return (TRUE);
@@ -118 +120 @@
 
 escape:
+  dbFreeFields (fields, Nfields);
+  dbFreeStack (stack, Nstack);
   SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));
   dvo_catalog_free (&catalog);

trunk/Ohana/src/opihi/dvo/dbCmdlineFields.c

@@ -39 +39 @@
         gprint (GP_ERR, "unknown database field %s\n", field);
         free (field);
-        for (j = 0; j <= Nfields; j++) {
-          if (fields->name != NULL) free (fields->name);
-        }
-        free (fields);
+        dbFreeFields (fields, Nfields);
         return (NULL);
       }

trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c

@@ -22 +22 @@
 
   switch (field->ID) {
-    // XXX not sure how to apply the photcode here....
     case MEAS_MAG: /* magnitudes are already determined above */
+      // if user has requested a photcode, supply the value only if we match (else NO_MAG)
+      if ((field->photcode->type != PHOT_MAG) && 
+          (measure[0].photcode != field->photcode->code)) {
+          break;
+      }
       switch (field->magMode) {
         case MAG_INST:

trunk/Ohana/src/opihi/dvo/dbFields.c

@@ -1 +1 @@
 # include "dvoshell.h"
 
-dbInitField (dbField *field) {
+void dbFreeFields (dbField *fields, int Nfields) {
+
+  int i;
+
+  if (fields == NULL) return;
+
+  for (i = 0; i <= Nfields; i++) {
+    if (fields[i].name != NULL) free (fields[i].name);
+    if (fields[i].photcode != NULL) {
+      if (fields[i].photcode[0].type == PHOT_MAG) {
+        free (fields[i].photcode);
+      }
+    }
+  }
+  free (fields);
+}
+
+void dbInitField (dbField *field) {
   field->name = NULL;
   field->extract = FALSE;
@@ -26 +43 @@
 PhotCode *ParsePhotcodeField (char *field, int *mode, int defMode) {
 
+  int useDefault;
   char *tmpstring, *p;
   PhotCode *code;
 
   *mode = defMode;
+  useDefault = TRUE;
 
   p = strchr (field, ':');
   if (p != NULL) {
     *mode = GetMagMode (p + 1);
+    useDefault = FALSE;
     if (*mode == MAG_NONE) return (NULL);
     tmpstring = strncreate (field, p - field);
@@ -39 +59 @@
     tmpstring = strcreate (field);
   }
+  if (!strcasecmp (tmpstring, "MAG")) {
+    ALLOCATE (code, PhotCode, 1);
+    code[0].code = 0;
+    strcpy (code[0].name, "MAG");
+    code[0].type = PHOT_MAG;
+    free (tmpstring);
+    return (code);
+  }
   code = GetPhotcodebyName (tmpstring);
+
+  // enforce compatibility
+  // XXX this is kind of poorly done
+  if ((code[0].type == PHOT_REF) && (*mode != MAG_ERR)) {
+    *mode = MAG_CAT;
+  }
+  if (code[0].type == PHOT_DEP) {
+    if (useDefault) {
+      *mode = MAG_REL;
+    } else {
+      if ((*mode == MAG_AVE) || (*mode == MAG_REF)) {
+        // XXX error;
+        *mode = MAG_REL;
+      }
+    }
+  } 
   free (tmpstring);
-
   return (code);
 }
@@ -112 +155 @@
   if (!strcasecmp (fieldName, "PAR"))   ESCAPE (AVE_PAR,       MAG_NONE);
   if (!strcasecmp (fieldName, "dPAR"))  ESCAPE (AVE_PAR_ERR,   MAG_NONE);
-  if (!strcasecmp (fieldName, "MAG"))   ESCAPE (AVE_MAG,       MAG_AVE);
-  if (!strcasecmp (fieldName, "dMAG"))  ESCAPE (AVE_dMAG,      MAG_ERR);
+  // if (!strcasecmp (fieldName, "MAG"))   ESCAPE (AVE_MAG,       MAG_AVE);
+  // if (!strcasecmp (fieldName, "dMAG"))  ESCAPE (AVE_dMAG,      MAG_ERR);
   if (!strcasecmp (fieldName, "NMEAS")) ESCAPE (AVE_NMEAS,     MAG_NONE);
   if (!strcasecmp (fieldName, "NMISS")) ESCAPE (AVE_NMISS,     MAG_NONE);
@@ -129 +172 @@
   code = ParsePhotcodeField (fieldName, &mode, MAG_AVE);
   if (code == NULL) return (FALSE);
+  if (code[0].type == PHOT_MAG) {
+    gprint (GP_ERR, "'mag' is ambiguous for avextract\n");
+    free (code);
+    return (FALSE);
+  }
 
   // need to distinguish phot, sys errors and scatter

trunk/Ohana/src/opihi/dvo/dbStackOps.c

@@ -10 +10 @@
 
   int i;
+
+  if (stack == NULL) return;
 
   for (i = 0; i < Nstack; i++) {

trunk/Ohana/src/opihi/dvo/mextract.c

@@ -14 +14 @@
   PhotCode *code;
   Vector **vec;
-
   dbField *fields;
   dbStack *stack;
@@ -24 +23 @@
   code = NULL;
   mode = MAG_REL;
+  fields = NULL;
+  stack = NULL;
+
   dvo_catalog_init (&catalog, TRUE);
 
@@ -120 +122 @@
   }
 
-  // XXX free fields and stack 
-
+  dbFreeFields (fields, Nfields);
+  dbFreeStack (stack, Nstack);
   FreeImageSelection ();
   SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));
@@ -134 +136 @@
 
 escape:
+  dbFreeFields (fields, Nfields);
+  dbFreeStack (stack, Nstack);
   FreeImageSelection ();
   SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));

trunk/Ohana/src/opihi/include/dvoshell.h

@@ -137 +137 @@
 void         dbExtractMeasuresInit  PROTO(());
 
+void         dbInitField            PROTO((dbField *field));
+void         dbFreeFields           PROTO((dbField *fields, int Nfields));
+
 # endif