Changeset 35249

Timestamp:

Mar 6, 2013, 4:00:16 PM (13 years ago)

Author:

eugene

Message:

trying to set up remote image metadata

Location:

branches/eam_branches/ipp-20130306/Ohana/src/opihi/dvo

Files:

• dvo_client.c (modified) (2 diffs)
• mextract.c (modified) (8 diffs)
• mmatch.c (modified) (1 diff)
• mmextract.c (modified) (1 diff)

branches/eam_branches/ipp-20130306/Ohana/src/opihi/dvo/dvo_client.c

@@ -39 +39 @@
     remove_argument (N, argc, argv);
   }
+  if (!HOST_ID) {
+    fprintf (stderr, "ERROR: dvo_client requires a -hostID value\n");
+    exit (3);
+  }
 
   HOSTDIR = NULL;
@@ -45 +49 @@
     HOSTDIR = strcreate (argv[N]);;
     remove_argument (N, argc, argv);
+  }
+  if (!HOSTDIR) {
+    fprintf (stderr, "ERROR: dvo_client requires a -hostdir value\n");
+    exit (3);
   }
 

branches/eam_branches/ipp-20130306/Ohana/src/opihi/dvo/mextract.c

@@ -1 +1 @@
 # include "dvoshell.h"
-
-int SaveImageMetadata () {
-
-}
 
 int field_needs_images (dbField *field) {
@@ -20 +16 @@
     if (field->ID == MEAS_CENTER_OFFSET)  return TRUE; // 0.5*NX, 0.5*NY
     if (field->ID == MEAS_EXPNAME_AS_INT) return TRUE; // expname (or as int)
-    mean airmass;
+    if (field->ID == MEAS_AIRMASS)        return TRUE; // airmass
     return FALSE;
 }
@@ -56 +52 @@
     remove_argument (N, &argc, argv);
     VERBOSE = TRUE;
+  }
+
+  char *imageMetadataFile = FALSE;
+  if ((N = get_argument (argc, argv, "-image-metadata"))) {
+    remove_argument (N, &argc, argv);
+    imageMetadataFile = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
   }
 
@@ -89 +92 @@
 
   // init locally static variables (time refs)
-  dbExtractMeasuresInit();
+  // HOST_ID tells library if operation is on remote client or not
+  dbExtractMeasuresInit(HOST_ID);
 
   // command-line is of the form: mextract field,field, field [where (field op value)...]
@@ -149 +153 @@
 
       char *filename = abspath("image.metadata.fits", DVO_MAX_PATH);
-      SaveImageMetadata (filename, image, Nimage);
+      ImageMetadataSave (filename, image, Nimage);
       argc += 2;
       argv[argc-2] = strcreate ("-image-metadata");
@@ -171 +175 @@
   }
 
-  if (REMOTE_CLIENT) {
-    if (loadImages) {
-      ImageMetadata = *imageMetadata = LoadImageMetadata (filename, &Nimages);
-      if (!imageMetadata) goto escape;
-      SetImageMetadata (imageMetadata, Nimages);
-  } else {
-    if (loadImages && !SetImageSelection (TRUE, selection)) goto escape;
+  if (loadImages) {
+    if (HOST_ID) {
+      if (!SetImageMetadataSelection (imageMetadataFile)) goto escape;
+    } else {
+      if (!SetImageSelection (TRUE, selection)) goto escape;
+    }
   }
 
@@ -294 +297 @@
   free (stack);
   FreeImageSelection ();
+  FreeImageMetadataSelection ();
   SkyListFree (skylist);
   FreeSkyRegionSelection (selection);
@@ -307 +311 @@
   free (stack);
   FreeImageSelection ();
+  FreeImageMetadataSelection ();
   SkyListFree (skylist);
   FreeSkyRegionSelection (selection);

branches/eam_branches/ipp-20130306/Ohana/src/opihi/dvo/mmatch.c

@@ -73 +73 @@
 
   // init locally static variables (time refs)
-  dbExtractMeasuresInit();
+  // HOST_ID tells library if operation is on remote client or not
+  dbExtractMeasuresInit(HOST_ID);
 
   // this does all the work of re-packaging the command, calling it on the remote machines, then loading in the results

branches/eam_branches/ipp-20130306/Ohana/src/opihi/dvo/mmextract.c

@@ -46 +46 @@
   
   // init locally static variables (time refs)
-  dbExtractMeasuresInit();
+  dbExtractMeasuresInit(HOST_ID);
 
   // parse skyregion options