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

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

@@ -14 +14 @@
   SkyList *skylist, *skyset;
   Vector *vec;
+  SkyRegionSelection *selection;
+
+  // parse skyregion options
+  if ((selection = SetRegionSelection (&argc, argv)) == NULL) {
+    gprint (GP_ERR, "invalid sky region selection\n");
+    return FALSE;
+  }
 
   start = stop = 0;
@@ -78 +85 @@
 
   if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
-  image_subset (image, Nimage, &subset, &Nsubset, (Graphdata *) NULL, FALSE, tzero, trange, TimeSelect);
+  image_subset (image, Nimage, &subset, &Nsubset, selection, tzero, trange, TimeSelect);
   BuildChipMatch (image, Nimage);
   GetTimeFormat (&TimeReference, &TimeFormat);
@@ -89 +96 @@
   ALLOCATE (skylist, SkyList, 1);
   ALLOCATE (skylist[0].regions, SkyRegion *, NREGIONS);
+  skylist[0].ownElements = FALSE;
 
   /* for each image of interest, find the appropriate region files */
@@ -107 +115 @@
       CHECK_REALLOCATE (skylist[0].regions, SkyRegion *, NREGIONS, Nregions, 10);
     }
-    SkyListFree (skyset, FALSE);
+    SkyListFree (skyset);
   }     
   free (subset);