Changeset 14401 for trunk/Ohana/src/opihi/dvo/cmd.c

Timestamp:

Aug 4, 2007, 10:15:51 AM (19 years ago)

Author:

eugene

Message:

extensive updates to the avextract / mextract / skyregion system

File:

• trunk/Ohana/src/opihi/dvo/cmd.c (modified) (7 diffs)

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

@@ -3 +3 @@
 int cmd (int argc, char **argv) { /* really need to think about upper limits & how to represent them */
   
-  char *RegionName, *RegionList;
   double *M1, *M3;
   int i, j, m, i1, i3, N1, N3, N;
@@ -12 +11 @@
   Catalog catalog;
   SkyList *skylist;
+  SkyRegionSelection *selection;
   Vector *xvec, *yvec;
 
@@ -18 +18 @@
   catalog.secfilt = NULL;
   catalog.measure = NULL;
-  RegionName = NULL;
-  RegionList = NULL;
   skylist = NULL;
+  selection = NULL;
 
   /* load photcode information */
@@ -27 +26 @@
 
   /* interpret command-line options */
-  if (!SetRegionSelection (&argc, argv, &RegionName, &RegionList)) goto escape;
+  if ((selection = SetRegionSelection (&argc, argv)) == NULL) goto escape;
   if (!SetPhotSelections (&argc, argv, 3)) goto usage;
 
@@ -46 +45 @@
 
   /* load region corresponding to selection above */
-  if ((skylist = SelectRegions (RegionName, RegionList)) == NULL) goto escape;
+  if ((skylist = SelectRegions (selection)) == NULL) goto escape;
 
   /* init vectors to save data */
@@ -107 +106 @@
     dvo_catalog_free (&catalog);
   }
-  SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));
+
   xvec[0].Nelements = yvec[0].Nelements = Npts;
+  SkyListFree (skylist);
+  FreeSkyRegionSelection (selection);
   return (TRUE);
 
@@ -116 +117 @@
 
 escape:
-  SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));
   dvo_catalog_free (&catalog);
-  if (RegionName != NULL) free (RegionName);
-  if (RegionList != NULL) free (RegionList);
+  SkyListFree (skylist);
+  FreeSkyRegionSelection (selection);
   return (FALSE);
 }