Changeset 33309 for branches/eam_branches/ipp-20111122/Ohana/src/opihi/lib.shell/VectorOps.c

Timestamp:

Feb 20, 2012, 6:55:53 AM (14 years ago)

Author:

eugene

Message:

dvo_client with mextract connected to vector IO table now builds

File:

• branches/eam_branches/ipp-20111122/Ohana/src/opihi/lib.shell/VectorOps.c (modified) (3 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/lib.shell/VectorOps.c

@@ -15 +15 @@
 
 // this function is NOT thread protected : it is only used in startup and/or shutdown
+void FreeVectorArray (Vector **vec, int Nvec) {
+
+  int i;
+
+  if (!vec) return;
+  for (i = 0; i < Nvec; i++) {
+    if (!vec[i]) continue;
+    if (vec[i]->elements.Int) {
+      free (vec[i]->elements.Int);
+    }
+    free (vec[i]);
+  }
+  free (vec);
+}
+
+// this function is NOT thread protected : it is only used in startup and/or shutdown
 void FreeVectors () {
-
-  int i;
-
-  for (i = 0; i < Nvectors; i++) {
-    if (vectors[i][0].elements.Int) {
-      free (vectors[i][0].elements.Int);
-    }
-    free (vectors[i]);
-  }
-  free (vectors);
+  FreeVectorArray (vectors, Nvectors);
 }
 
@@ -93 +100 @@
 }
   
+// Assign the given Vector to the internal array of vectors by name
+int AssignVector (Vector *vec, char *name, int mode, int verbose) {
+
+  int i;
+
+  if (name == NULL) goto error;
+  if (ISNUM(name[0])) goto error;
+  if (IsBuffer(name)) goto error;
+
+  for (i = 0; (i < Nvectors) && (strcmp(vectors[i][0].name, name)); i++);
+  /* is a new vector */
+  if (i == Nvectors) { 
+    if (mode == OLDVECTOR) goto error;
+    pthread_mutex_lock (&mutex);
+    Nvectors ++;
+    REALLOCATE (vectors, Vector *, Nvectors);
+    vectors[i] = vec;
+    pthread_mutex_unlock (&mutex);
+    return TRUE;
+  } 
+  /* is an old vector */
+  if (mode == NEWVECTOR) goto error;
+  vectors[i] = vec;
+  return TRUE;
+
+ error:
+  if (verbose) gprint (GP_ERR, "invalid vector %s\n", name);
+  return FALSE;
+}
+  
 /* delete by pointer */
 int DeleteVector (Vector *vec) {
@@ -287 +324 @@
   return (TRUE);
 }
-  
-// write a set of vectors to a FITS file
-int WriteVectorTableFITS (char *filename, char *extname, Vector **vec, int Nvec, int append, char *format) {
-  
-  char *tformat = NULL;
-  Header header;
-  Matrix matrix;
-  Header theader;
-  FTable ftable;
-
-  int j;
-  FILE *f = NULL;
-
-  /* open file for outuput */
-  if (append) {
-    f = fopen (filename, "a");
-  } else {
-    f = fopen (filename, "w");
-  }
-  if (f == (FILE *) NULL) {
-    gprint (GP_ERR, "can't open file for write\n");
-    return (FALSE);
-  }
-
-  if (!append) {
-    gfits_init_header (&header);
-    header.extend = TRUE;
-    gfits_create_header (&header);
-    gfits_create_matrix (&header, &matrix);
-  }
-
-  gfits_create_table_header (&theader, "BINTABLE", extname);
-
-  ALLOCATE (tformat, char, 2*Nvec);
-  if (format) {
-    // the bintable format string can only define the byte-width of each field.  valid output columns are currently:
-    // B (char), I (16 bit short), J (32 bit int), E (32 bit float), D (64 bit double).
-    // the format string is just the sequence of types, eg: LIIJEED
-    // validate the format string
-    char *ptr = format;
-    for (j = 0; j < Nvec; j++) {
-      while (*ptr && OHANA_WHITESPACE (*ptr)) ptr++;
-      if (*ptr == 0) {
-        gprint (GP_ERR, "error in binary table format %s (insufficient format chars)\n", format);
-        goto escape;
-      }
-      if ((*ptr != 'B') && (*ptr != 'I') && (*ptr != 'J') && (*ptr != 'D') && (*ptr != 'E')) {
-        gprint (GP_ERR, "error in binary table format %s: invalid character %c\n", format, *ptr);
-        goto escape;
-      }
-      tformat[2*j + 0] = *ptr;
-      tformat[2*j + 1] = 0; // a bit sleazy : use a 2xN string to store N 1-byte strings
-      ptr ++;
-    }
-    while (*ptr && OHANA_WHITESPACE (*ptr)) ptr++;
-    if (*ptr) {
-      gprint (GP_ERR, "error in binary table format %s (extra characters in format)\n", format);
-      goto escape;
-    }
-  } else {
-    for (j = 0; j < Nvec; j++) {
-      // if the format is not defined, just use the native byte-widths
-      tformat[2*j + 0] = (vec[j][0].type == OPIHI_FLT) ? 'D' : 'J';
-      tformat[2*j + 1] = 0;
-    }
-  }
-
-  // define the columns of the table.  XXX NOTE: we cannot have duplicate names in
-  // output table (because the data goes to the named column below).  need to enforce
-  // this somehow
-  for (j = 0; j < Nvec; j++) {
-    gfits_define_bintable_column (&theader, &tformat[2*j], vec[j][0].name, NULL, NULL, 1.0, 0.0);
-  }
-  free (tformat);
-
-  // generate the output array that carries the data
-  gfits_create_table (&theader, &ftable);
-
-  // add the vectors to the output array
-  for (j = 0; j < Nvec; j++) {
-    if (vec[j][0].type == OPIHI_FLT) {
-      gfits_set_bintable_column_reformat (&theader, &ftable, vec[j][0].name, "double", vec[j][0].elements.Flt, vec[j][0].Nelements);
-    } else {
-      gfits_set_bintable_column_reformat (&theader, &ftable, vec[j][0].name, "int", vec[j][0].elements.Int, vec[j][0].Nelements);
-    }
-  }
-
-  if (!append) {
-    gfits_fwrite_header  (f, &header);
-    gfits_fwrite_matrix  (f, &matrix);
-    gfits_free_header (&header);
-    gfits_free_matrix (&matrix);
-  }
-  gfits_fwrite_Theader (f, &theader);
-  gfits_fwrite_table  (f, &ftable);
-
-  gfits_free_header (&theader);
-  gfits_free_table (&ftable);
-
-  fclose (f);
-  fflush (f);
-  return (TRUE);
-
- escape:
-  if (!append) {
-    gfits_free_header (&header);
-    gfits_free_matrix (&matrix);
-  }
-  gfits_free_header (&theader);
-  gfits_free_table (&ftable);
-
-  if (tformat) free (tformat);
-  fclose (f);
-  fflush (f);
-  return (FALSE);
-}