Changeset 42821 for trunk/Ohana/src/opihi/dvo/avselect.c

Timestamp:

May 8, 2025, 4:29:52 PM (15 months ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20230313

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/dvo/avselect.c (modified) (3 diffs)

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

@@ -17 +17 @@
   int VERBOSE;
   char name[1024];
-  float RADIUS;
+  opihi_flt RADIUS;
 
   Catalog catalog;
 
   Vector **vec, **invec, *RAvec, *DECvec, *IDXvec, *RADvec;
+  Vector *RINvec = NULL;
   dbField *fields;
   dbValue *values;
@@ -102 +103 @@
   }
 
-  RADIUS = atof (argv[1]);
-
-  /* load regions which contain all supplied RA,DEC coordinates */
+  if (SelectScalar (argv[1], &RADIUS)) {
+    remove_argument (1, &argc, argv);
+  } else {
+    gprint (GP_ERR, " RADIUS must be a numerical value\n");
+    goto help;
+    if ((RINvec = SelectVector (argv[1], ANYVECTOR, TRUE)) == NULL) goto help;
+    RADIUS = 0.0; // find the max radius for region selection:
+    for (i = 0; i < RINvec->Nelements; i++) {
+      RADIUS = MAX(RINvec->elements.Flt[i], RADIUS);
+    }
+  }
+
+  /* load regions which contain all supplied RA,DEC coordinates (for RINvec, uses max radius) */
   if ((skylist = SelectRegionsByCoordVectorsAndRadius (RAvec, DECvec, RADIUS/3600.0)) == NULL) goto escape;
 
@@ -167 +178 @@
     return status;
   }
-
-  RADIUS = atof (argv[1]);
-  remove_argument (1, &argc, argv);
 
   // parse the fields to be extracted and returned