Changeset 14287

Timestamp:

Jul 18, 2007, 8:46:45 AM (19 years ago)

Author:

eugene

Message:

return NULL if field is not founddvo/dbFields.c

Location:

trunk/Ohana/src/opihi/dvo

Files:

• avextract.c (modified) (5 diffs)
• dbCheckStack.c (modified) (4 diffs)
• dbFields.c (modified) (2 diffs)
• mextract.c (modified) (8 diffs)

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

@@ -3 +3 @@
 int avextract (int argc, char **argv) {
   
-  int i, j, n, m, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
-  int Nsecfilt, mode;
+  int i, j, n, m, N, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
+  int Nsecfilt, mode, VERBOSE;
   char *RegionName, *RegionList, *p;
   char **cstack, name[1024];
   float *values;
+  void *Signal;
 
   Catalog catalog;
@@ -24 +25 @@
   fields = NULL;
   stack = NULL;
+
+  VERBOSE = FALSE;
+  if ((N = get_argument (argc, argv, "-v"))) {
+    remove_argument (N, &argc, argv);
+    VERBOSE = TRUE;
+  }
 
   dvo_catalog_init (&catalog, TRUE);
@@ -69 +76 @@
   NPTS = 1;
 
-  // XXX need to add interrupt test to this loop
-  for (i = 0; i < skylist[0].Nregions; i++) {
+  // grab data from all selected sky regions
+  Signal = signal (SIGINT, handle_interrupt);
+  interrupt = FALSE;
+  for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[i];
@@ -76 +85 @@
     catalog.Nsecfilt = 0;
 
+    if (VERBOSE) gprint (GP_ERR, "trying %s (%d of %d)\n", catalog.filename, i, skylist[0].Nregions);
+      
     // an error exit status here is a significant error
     if (!dvo_catalog_open (&catalog, NULL, FALSE, "r")) {
-      fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
+      gprint (GP_ERR, "ERROR: failure to open catalog file %s\n", catalog.filename);
       exit (2);
     }
     dvo_catalog_unlock (&catalog);
 
-    for (j = 0; j < catalog.Naverage; j++) {
+    for (j = 0; (j < catalog.Naverage) && !interrupt; j++) {
       m = catalog.average[j].offset;
       // extract the relevant values
@@ -105 +116 @@
     dvo_catalog_free (&catalog);
   }
+  signal (SIGINT, Signal);
+  interrupt = FALSE;
   for (n = 0; n < Nreturn; n++) {
     vec[n][0].Nelements = Npts;

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

@@ -1 +1 @@
 # include "dvoshell.h"
 
-int dbCheckStack (dbStack *stack, int Nstack, int table, dbField **inFields, int *Nfields) {
+int dbCheckStack (dbStack *stack, int Nstack, int table, dbField **inFields, int *inNfields) {
 
-  int i, j, status, NFIELDS;
+  int i, j, status, NFIELDS, Nfields;
   char *c;
   dbField *fields;
 
-  NFIELDS = *Nfields + 10;
-  REALLOCATE (*inFields, dbField, NFIELDS);
   fields = *inFields;
+  Nfields = *inNfields;
+
+  NFIELDS = Nfields + 10;
+  REALLOCATE (fields, dbField, NFIELDS);
 
   for (i = 0; i < Nstack; i++) {
@@ -22 +24 @@
 
       // this must be a field : is it already in the list?
-      for (j = 0; (j < *Nfields) && strcasecmp (stack[i].name, fields[j].name); j++);
-      if (j < *Nfields) {
+      for (j = 0; (j < Nfields) && strcasecmp (stack[i].name, fields[j].name); j++);
+      if (j < Nfields) {
         stack[i].field = j;
         stack[i].type  = 'F';
+        stack[i].name  = NULL;
+        stack[i].Float = 0.0;
         continue;
       }
@@ -31 +35 @@
       // this must be a field : is it a valid name?
       if (table == DVO_TABLE_MEASURE) {
-        status = ParseMeasureField (&fields[*Nfields], stack[i].name);
+        status = ParseMeasureField (&fields[Nfields], stack[i].name);
       } 
       if (table == DVO_TABLE_AVERAGE) {
-        status = ParseAverageField (&fields[*Nfields], stack[i].name);
+        status = ParseAverageField (&fields[Nfields], stack[i].name);
       } 
       if (!status) {
@@ -40 +44 @@
         return (FALSE);
       }
-      stack[i].field = *Nfields;
+      stack[i].field = Nfields;
       stack[i].type  = 'F';
+      stack[i].name  = NULL;
+      stack[i].Float = 0.0;
 
-      *Nfields ++;
-      CHECK_REALLOCATE (*inFields, dbField, NFIELDS, *Nfields, 10);
-      fields = *inFields;
+      Nfields ++;
+      CHECK_REALLOCATE (fields, dbField, NFIELDS, Nfields, 10);
     }
   }
+
+  *inNfields = Nfields;
+  *inFields = fields;
+
   return (TRUE);
 }

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

@@ -7 +7 @@
   if (fields == NULL) return;
 
-  for (i = 0; i <= Nfields; i++) {
+  for (i = 0; i < Nfields; i++) {
     if (fields[i].name != NULL) free (fields[i].name);
     if (fields[i].photcode != NULL) {
@@ -68 +68 @@
   }
   code = GetPhotcodebyName (tmpstring);
+  if (!code) {
+      return NULL;
+  }
+
 
   // enforce compatibility

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

@@ -4 +4 @@
   
   int i, j, k, m, n, N, N1, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
-  int param, mode, Nsecfilt;
+  int Nsecfilt, VERBOSE, loadImages, mosaicMode;
   char *RegionName, *RegionList, *p;
   double *M1;
   char **cstack, name[1024];
   float *values;
+  void *Signal;
 
   Catalog catalog;
@@ -22 +23 @@
   RegionList = NULL;
   code = NULL;
-  mode = MAG_REL;
   fields = NULL;
   stack = NULL;
+
+  VERBOSE = FALSE;
+  if ((N = get_argument (argc, argv, "-v"))) {
+    remove_argument (N, &argc, argv);
+    VERBOSE = TRUE;
+  }
 
   dvo_catalog_init (&catalog, TRUE);
@@ -50 +56 @@
   // construct the db Boolean math stack (frees cstack)
   stack = dbRPN (Ncstack, cstack, &Nstack);
+  if ((Ncstack > 0) && (Nstack < 1)) {
+    print_error ();
+    goto escape;
+  }
 
   Nreturn = Nfields; 
@@ -59 +69 @@
 
   // XXX is this still needed?
-  // if (!SetImageSelection (param, ((RegionName == NULL) && (RegionList == NULL)))) goto escape;
+  loadImages = FALSE;
+  mosaicMode = FALSE;
+  for (i = 0; !loadImages && (i < Nfields); i++) {
+    if (fields[i].ID == MEAS_XCCD) loadImages = TRUE;
+    if (fields[i].ID == MEAS_YCCD) loadImages = TRUE;
+    if (fields[i].ID == MEAS_XMOSAIC) loadImages = mosaicMode = TRUE;
+    if (fields[i].ID == MEAS_YMOSAIC) loadImages = mosaicMode = TRUE;
+  }
+  if (loadImages && !SetImageSelection (mosaicMode, ((RegionName == NULL) && (RegionList == NULL)))) goto escape;
 
   /* create storage vector */
@@ -76 +94 @@
   NPTS = 1;
 
-  // XXX need to add interrupt test to this loop
-  for (i = 0; i < skylist[0].Nregions; i++) {
+  // grab data from all selected sky regions
+  Signal = signal (SIGINT, handle_interrupt);
+  interrupt = FALSE;
+  for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[i];
@@ -83 +103 @@
     catalog.Nsecfilt = Nsecfilt;
 
+    if (VERBOSE) gprint (GP_ERR, "trying %s (%d of %d)\n", catalog.filename, i, skylist[0].Nregions);
+      
     // an error exit status here is a significant error
     if (!dvo_catalog_open (&catalog, NULL, FALSE, "r")) {
-      fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
+      gprint (GP_ERR, "ERROR: failure to open catalog file %s\n", catalog.filename);
       exit (2);
     }
@@ -92 +114 @@
     /* XXX need to call dvo_catalog_chipcoords here passing the loaded images */
 
-    for (j = 0; j < catalog.Naverage; j++) {
+    for (j = 0; (j < catalog.Naverage) && !interrupt; j++) {
       m = catalog.average[j].offset;
       for (k = 0; k < catalog.average[j].Nm; k++, m++) {
@@ -117 +139 @@
     dvo_catalog_free (&catalog);
   }
+  signal (SIGINT, Signal);
+  interrupt = FALSE;
+
   for (n = 0; n < Nreturn; n++) {
     vec[n][0].Nelements = Npts;
     REALLOCATE (vec[n][0].elements, float, MAX(1,Npts));
   }
-
   dbFreeFields (fields, Nfields);
   dbFreeStack (stack, Nstack);
+
   FreeImageSelection ();
   SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));
+
   if (RegionName != NULL) free (RegionName);
   if (RegionList != NULL) free (RegionList);