Changeset 31657 for branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/skyregion.c

Timestamp:

Jun 21, 2011, 6:45:51 PM (15 years ago)

Author:

eugene

Message:

merge from trunk

File:

• branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/skyregion.c (modified) (4 diffs)

branches/eam_branches/ipp-20110505/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
@@ -10 +12 @@
   
   if (argc == 1) {
+    double RAs, RAe, DECs, DECe;
+    get_skyregion(&RAs, &RAe, &DECs, &DECe);
+
     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");
@@ -24 +29 @@
   return (TRUE);
 }
-
+#ifdef NOT_MOVED_TO_LIBDVO
 int get_skyregion (double *Rs, double *Re, double *Ds, double *De) {
 
@@ -44 +49 @@
   return TRUE;
 }
+#endif
 
 /* find region which overlaps c at given depth (-1 : populated ) */