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

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

@@ -8 +8 @@
   int i, j, k, m, N, N1, Nr, mode[2];
   int NSTAR, Nstar, Nsecfilt;
-  char *RegionName, *RegionList;
   double *M1, M2, dM2, color;
 
@@ -14 +13 @@
   PhotCode *code[2];
   SkyList *skylist;
+  SkyRegionSelection *selection;
   Vector **vec;
 
@@ -20 +20 @@
   catalog.secfilt = NULL;
   catalog.measure = NULL;
-  RegionName = NULL;
-  RegionList = NULL;
   skylist = NULL;
+  selection = NULL;
   vec = NULL;
 
@@ -30 +29 @@
 
   /* command line arguments */
-  if (!SetRegionSelection (&argc, argv, &RegionName, &RegionList)) goto escape;
+  if ((selection = SetRegionSelection (&argc, argv)) == NULL) goto escape;
   if (!SetPhotSelections (&argc, argv, 2)) goto usage;
 
@@ -68 +67 @@
 
   /* load region corresponding to selection above */
-  if ((skylist = SelectRegions (RegionName, RegionList)) == NULL) goto escape;
-  if (!SetImageSelection (TRUE, ((RegionName == NULL) && (RegionList == NULL)))) goto escape;
+  if ((skylist = SelectRegions (selection)) == NULL) goto escape;
+  if (!SetImageSelection (TRUE, selection)) goto escape;
 
   for (Nr = 0; Nr < skylist[0].Nregions; Nr++) {
@@ -86 +85 @@
     dvo_catalog_unlock (&catalog);
 
+    # if (0)
     /* extract values, assign to vectors */
     for (i = 0; i < catalog.Naverage; i++) {
@@ -119 +119 @@
       ConcatMeasures (vec[NT ], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_EXPTIME); 
       ConcatMeasures (vec[NP ], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_PHOTCODE); 
-      ConcatMeasures (vec[Nd1], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_dMAG); 
+      // ConcatMeasures (vec[Nd1], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_dMAG); 
       ConcatMeasures (vec[Nxc], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_XCCD); 
       ConcatMeasures (vec[Nyc], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_YCCD); 
@@ -139 +139 @@
       if (M1 != NULL) free (M1);
     }
+    # endif
     dvo_catalog_free (&catalog);
   }
 
-  SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));
   for (i = 0; i < NVEC; i++) {
     vec[i][0].Nelements = N;
   }
+  SkyListFree (skylist);
+  FreeSkyRegionSelection (selection);
   FreeImageSelection ();
   return (TRUE);
@@ -154 +156 @@
 
 escape:
+  SkyListFree (skylist);
+  FreeSkyRegionSelection (selection);
   FreeImageSelection ();
-  SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));
   for (i = 0; i < NVEC; i++) {
     DeleteVector (vec[i]);