Changeset 40574 for trunk

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

Files:

• dvomerge/src/Shutdown.c (modified) (1 diff)
• dvomerge/src/args.c (modified) (2 diffs)
• dvomerge/src/merge_catalogs_old.c (modified) (1 diff)
• libdvo/src/dbCmdlineFields.c (modified) (2 diffs)
• opihi/cmd.data/write_vectors.c (modified) (1 diff)
• opihi/dvo/avextract.c (modified) (1 diff)
• opihi/dvo/avperiodogram.c (modified) (1 diff)
• opihi/dvo/mextract.c (modified) (1 diff)
• opihi/lib.shell/parse.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/src/Shutdown.c

@@ -4 +4 @@
 int Shutdown (char *format, ...) {  
   va_list argp;
-  char *formatplus;
+  char formatplus[1024];
   
-  ALLOCATE (formatplus, char, strlen(format) + 2);
-  strcpy (formatplus, format);
-  strcat (formatplus, "\n");
+  snprintf (formatplus, 1024, "%s\n", format);
 
   va_start (argp, format);
   vfprintf (stderr, formatplus, argp);
-  free (formatplus);
   va_end (argp);
 

trunk/Ohana/src/dvomerge/src/args.c

@@ -112 +112 @@
     remove_argument (N, argc, argv);
     ACCEPT_MOTION = TRUE;
-    remove_argument (N, argc, argv);
   }
 
@@ -330 +329 @@
     remove_argument (N, argc, argv);
     ACCEPT_MOTION = TRUE;
-    remove_argument (N, argc, argv);
   }
 

trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -386 +386 @@
     // we can choose to accept the proper-motion and parallax from the reference tgtcat
     if (ACCEPT_MOTION) {
-      output[0].average[Nave].dR         = input[0].average[N].dR;
-      output[0].average[Nave].dD         = input[0].average[N].dD;
-      output[0].average[Nave].uR         = input[0].average[N].uR;
-      output[0].average[Nave].uD         = input[0].average[N].uD;
-      output[0].average[Nave].duR        = input[0].average[N].duR;
-      output[0].average[Nave].duD        = input[0].average[N].duD;
-      output[0].average[Nave].P          = input[0].average[N].P;
-      output[0].average[Nave].dP         = input[0].average[N].dP;
-      output[0].average[Nave].Tmean      = input[0].average[N].Tmean;
+      output[0].average[n].dR         = input[0].average[N].dR;
+      output[0].average[n].dD         = input[0].average[N].dD;
+      output[0].average[n].uR         = input[0].average[N].uR;
+      output[0].average[n].uD         = input[0].average[N].uD;
+      output[0].average[n].duR        = input[0].average[N].duR;
+      output[0].average[n].duD        = input[0].average[N].duD;
+      output[0].average[n].P          = input[0].average[N].P;
+      output[0].average[n].dP         = input[0].average[N].dP;
+      output[0].average[n].Tmean      = input[0].average[N].Tmean;
     }
 

trunk/Ohana/src/libdvo/src/dbCmdlineFields.c

@@ -125 +125 @@
   // get the ra,dec limits...
   if (selection->useDisplay) {
-    return (TRUE);
+    // return (TRUE);
     // XXX fix this: be more careful with the projection & limits
 
@@ -134 +134 @@
     }
     
+    double Radius = MAX (fabs(graphsky.xmax), fabs(graphsky.ymax));
+    Dmin = graphsky.coords.crval2 - Radius;
+    Dmax = graphsky.coords.crval2 + Radius;
+    
+    if ((Dmin <= -89) || (Dmax >= 89)) {
+      Rmin = 0;
+      Rmax = 360;
+    } else {
+      double Rmod = MAX (Radius / (cos(Dmin*RAD_DEG)), Radius / (cos(Dmax*RAD_DEG)));
+      Rmin = graphsky.coords.crval1 - Rmod;
+      Rmax = graphsky.coords.crval1 + Rmod;
+    }
     // XXX the ra and dec range depend on the projection. 
     // XXX this is wrong...
     // int status;
-    XY_to_RD (&Rmin, &Dmin, graphsky.xmin, graphsky.ymin, &graphsky.coords);
-    XY_to_RD (&Rmax, &Dmax, graphsky.xmax, graphsky.ymax, &graphsky.coords);
+    // XY_to_RD (&Rmin, &Dmin, graphsky.xmin, graphsky.ymin, &graphsky.coords);
+    // XY_to_RD (&Rmax, &Dmax, graphsky.xmax, graphsky.ymax, &graphsky.coords);
   }
 

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;