Changeset 40574 for trunk/Ohana/src/opihi

Timestamp:

Dec 5, 2018, 11:39:29 AM (8 years ago)

Author:

eugene

Message:

add option to accept motions from incoming dvo database; respect -region in avextract, mextract, avperiodogram

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/write_vectors.c (modified) (1 diff)
• dvo/avextract.c (modified) (1 diff)
• dvo/avperiodogram.c (modified) (1 diff)
• dvo/mextract.c (modified) (1 diff)
• lib.shell/parse.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.data/write_vectors.c

@@ -271 +271 @@
     gprint (GP_ERR, "      J : 4 byte int\n");    
     gprint (GP_ERR, "      K : 8 byte int\n");    
-    gprint (GP_ERR, "      D : 4 byte float\n");    
-    gprint (GP_ERR, "      E : 8 byte float\n");    
+    gprint (GP_ERR, "      E : 4 byte float\n");    
+    gprint (GP_ERR, "      D : 8 byte float\n");    
     gprint (GP_ERR, "   -h : this help listing\n");
     gprint (GP_ERR, "   --h : this help listing\n");

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

@@ -137 +137 @@
   // this does all the work of re-packaging the command, calling it on the remote machines, then loading in the results
   if (PARALLEL && !HOST_ID) {
+
+    if (!SetSkyRegions (selection)) {
+      FreeSkyRegionSelection (selection);
+      dbFreeFields (fields, Nfields);
+      dvo_catalog_free (&catalog);
+      goto help;
+    }
+
     int status = HostTableParallelOps (skylist, argc, argv, RESULT_FILE, TRUE, 0, VERBOSE);
 

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

@@ -51 +51 @@
   // the result files are left behind for the user to access (no automatic re-merge)
   if (PARALLEL && !HOST_ID) {
+
+    // check for -region and apply to current sky region
+    if (!SetSkyRegions (selection)) {
+      FreeSkyRegionSelection (selection);
+      dbFreeFields (fields, Nfields);
+      goto help;
+    }
+
     int status = HostTableParallelOps (skylist, argc, argv, NULL, FALSE, 0, VERBOSE);
     SkyListFree (skylist);

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

@@ -143 +143 @@
   // this does all the work of re-packaging the command, calling it on the remote machines, then loading in the results
   if (PARALLEL && !HOST_ID) {
+
+    // check for -region and apply to current sky region
+    if (!SetSkyRegions (selection)) {
+      FreeSkyRegionSelection (selection);
+      dbFreeFields (fields, Nfields);
+      dvo_catalog_free (&catalog);
+      goto help;
+    }
 
     // Image Metadata for remote queries:

trunk/Ohana/src/opihi/lib.shell/parse.c

@@ -291 +291 @@
     val = dvomath (1, &L, &size, -1);
     if (val == NULL) {
+      gprint (GP_ERR, "cannot evaluate expression in brackets: %s\n", L);
       print_error ();
       goto error;