Changeset 33662 for trunk/Ohana/src/opihi/dvo/skyregion.c

Timestamp:

Apr 1, 2012, 3:24:39 PM (14 years ago)

Author:

eugene

Message:

support for parallel dvo in mextract, avextract, avmerge, gstar, gcat; remove some if-def-ed out code already moved to libdvo; list -vectors and -buffers options (store names of vectors and buffers in lists); list -copy give error if missing source; catlist, hosts & remote functions to support parallel dvos; skyregion -save option; new skycoverage modes (-min-ubercal; -min-dmag-sys; -min-mcal; -max-mcal); gstar output formatting cleanups; add more average info to gstar output; functions for spectral similarity analysis; coords returns nans for projections off the sphere; fix cumulative function; add name:type option to opihi/read function (eg read a:float 2 b:time 3 c:int 4); line -frac option; vtype function to get vector types; threshold function; write -fits option; code for unfinished mtype function (matching vtype)

File:

• trunk/Ohana/src/opihi/dvo/skyregion.c (modified) (3 diffs)

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

@@ -1 +1 @@
 # include "dvoshell.h"
-
-#ifdef NO_MOVED_TO_DVO
-static double RAs = 0.0;
-static double RAe = 0.0;
-static double DECs = 0.0;
-static double DECe = 0.0;
-#endif
 
 // define the sky region for which extractions are limited
 int skyregion (int argc, char **argv) {
   
+  int N;
+
+  // dvo_client should have 2 standard arguments: -hostID and -hostdir
+  int SaveRegion = FALSE;
+  if ((N = get_argument (argc, argv, "-save"))) {
+    remove_argument (N, &argc, argv);
+    SaveRegion = TRUE;
+  }
+
   if (argc == 1) {
-    double RAs, RAe, DECs, DECe;
-    get_skyregion(&RAs, &RAe, &DECs, &DECe);
+    double Rmin, Rmax, Dmin, Dmax;
+    get_skyregion(&Rmin, &Rmax, &Dmin, &Dmax);
 
-    gprint (GP_ERR, "current skyregion: %f - %f : %f - %f\n", RAs, RAe, DECs, DECe);
-    gprint (GP_ERR, "USAGE:  skyregion (min RA) (max RA) (min DEC) (max DEC)\n");
-    return (FALSE);
+    if (SaveRegion) {
+      set_variable ("Rmin", Rmin);
+      set_variable ("Rmax", Rmax);
+      set_variable ("Dmin", Dmin);
+      set_variable ("Dmax", Dmax);
+      return TRUE;
+    } else {
+      gprint (GP_ERR, "current skyregion: %f - %f : %f - %f\n", Rmin, Rmax, Dmin, Dmax);
+      gprint (GP_ERR, "USAGE:  skyregion (min RA) (max RA) (min DEC) (max DEC)\n");
+      return FALSE;
+    }
   }
 
@@ -29 +39 @@
   return (TRUE);
 }
-#ifdef NOT_MOVED_TO_LIBDVO
-int get_skyregion (double *Rs, double *Re, double *Ds, double *De) {
-
-  *Rs = RAs;
-  *Re = RAe;
-  *Ds = DECs;
-  *De = DECe;
-
-  return TRUE;
-}
-
-int set_skyregion (double Rs, double Re, double Ds, double De) {
-
-  RAs  = Rs;
-  RAe  = Re;
-  DECs = Ds;
-  DECe = De;
-
-  return TRUE;
-}
-#endif
 
 /* find region which overlaps c at given depth (-1 : populated ) */
@@ -107 +96 @@
   ALLOCATE (new[0].regions,  SkyRegion *, 1);
   ALLOCATE (new[0].filename,  char *, 1);
+  new[0].Nregions = 0;
+  new[0].ownElements = FALSE; // this list is only holding a view to the elements
 
   // output list