Changeset 14401 for trunk/Ohana/src/opihi/dvo/fitsed.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/fitsed.c (modified) (7 diffs)

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

@@ -27 +27 @@
   int Nsecfilt, status;
   void *oldsignal;
-  char *RegionName, *RegionList;
   char name[64], line[1024], key[20];
   float *fitmags, *fiterrs, *wavecode, *vegaToAB;
@@ -43 +42 @@
   Catalog catalog, outcat;
   SkyList *skylist;
+  SkyRegionSelection *selection;
+
   SEDtableRow *SEDtableRaw, **SEDtable;
   SEDtableRow sourceValue, sourceError;
@@ -49 +50 @@
   /* defaults */
   skylist  = NULL;
+  selection = NULL;
+
   catalog.average = NULL;
   catalog.measure = NULL;
@@ -63 +66 @@
   wavecode = NULL;
   hashcode = NULL;
-  RegionName = NULL;
-  RegionList = NULL;
   magSection.name = NULL;
   resSection.name = NULL;
@@ -81 +82 @@
 
   /* interpret command-line options */
-  if (!SetRegionSelection (&argc, argv, &RegionName, &RegionList)) goto escape;
+  if ((selection = SetRegionSelection (&argc, argv)) == NULL) goto escape;
   if (!SetPhotSelections (&argc, argv, 4)) goto usage;
 
@@ -179 +180 @@
 
   /* load region corresponding to selection above */
-  if ((skylist = SelectRegions (RegionName, RegionList)) == NULL) goto escape;
+  if ((skylist = SelectRegions (selection)) == NULL) goto escape;
 
   /* loop over regions, extract data for each region */
@@ -361 +362 @@
 
 finish:
-  if (skylist != NULL) SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));
-  if (RegionName != NULL) free (RegionName);
-  if (RegionList != NULL) free (RegionList);
+  SkyListFree (skylist);
+  FreeSkyRegionSelection (selection);
   if (wavecode != NULL) free (wavecode);
   if (hashcode != NULL) free (hashcode);