Changeset 4585 for trunk/Ohana/src/opihi/dvo/calmextract.c

Timestamp:

Jul 20, 2005, 4:27:25 AM (21 years ago)

Author:

eugene

Message:

substantial cleanup of photometry extraction functions

File:

• trunk/Ohana/src/opihi/dvo/calmextract.c (modified) (5 diffs)

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

@@ -6 +6 @@
 int calmextract (int argc, char **argv) {
   
+  int i, j, k, m, N, N1, Nr, mode[2];
+  int NSTAR, Nstar, Nsec, Nregions;
+  char filename[256], catdir[256], *RegionName, *RegionList;
+  double *M1, M2, dM2, color, Radius;
+
   Catalog catalog;
-  Graphdata graphsky;
   RegionFile *regions;
   PhotCode *code[2];
   Vector **vec;
-
-  int i, j, k, m, N, N1, Nr, mode[2];
-  int Ngraph, NSTAR, Nstar, Nsec, Nregions, RegionList;
-  char filename[256], catdir[256], RegionListFile[256];
-  double *M1, M2, dM2, color, Radius;
 
   /* these need to be freed in the end */
@@ -22 +21 @@
   catalog.secfilt = NULL;
   catalog.measure = NULL;
+  RegionName = NULL;
+  RegionList = NULL;
 
   /* load photcode information */
-  if (!InitPhotcodes ()) return (FALSE);
+  if (!InitPhotcodes ()) goto escape;
   Nsec = GetPhotcodeNsecfilt ();
 
-  /* load data about plot windows */
-  Ngraph = 0;
-  if (!GetGraphData (&graphsky, NULL, &Ngraph)) goto escape;
-
   /* find CATDIR in config system */
-  VarConfig ("CATDIR", "%s", catdir);
-
-  /* specify catalog files */
-  RegionList = FALSE;
-  if (N = get_argument (argc, argv, "-list")) {
-    RegionList = TRUE;
-    remove_argument (N, &argc, argv);
-    strcpy (RegionListFile, argv[N]);
-    remove_argument (N, &argc, argv);
-  }
+  if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
 
   /* command line arguments */
-  if (!SetPhotSelections (&argc, argv)) goto usage;
+  if (!SetRegionSelection (&argc, argv, &RegionName, &RegionList)) goto escape;
+  if (!SetPhotSelections (&argc, argv, 2)) goto usage;
+
+  /* interpret required command-line arguments: calmextract F1 - F2 */
   if (argc != 4) goto usage;
   if (strcmp (argv[2], "-")) goto usage;
   if (!GetPhotcodeInfo (argv[1], &code[0], &mode[0])) goto usage;
   if (!GetPhotcodeInfo (argv[3], &code[1], &mode[1])) goto usage;
-  /* code.type must be PHOT_REF */
-
-  /* test PhotSelections: is photcode specified if needed? */
-  if (!TestPhotSelections (&code)) {
-    fprintf (stderr, "photcode selection rules violated\n");
-    fprintf (stderr, "average and ensemble restrictions require a corresponding photcode\n");
-    goto escape;
-  }
-
+  if (!TestPhotSelections (&code[0], MEAS_ZERO)) goto escape;
 
   /* returned vectors are dmag, mag, color, time, airmass, ra, dec, x, y, exptime */
@@ -86 +69 @@
   }
 
-  /* select region files */
-  if (RegionList) {
-    regions = region_list (RegionListFile, &Nregions);
-    if (!SetImageSelection (MEAS_XMOSAIC, NULL, FALSE)) goto escape;
-  } else {
-    Radius = MAX (fabs(graphsky.xmax), fabs(graphsky.ymax));
-    regions = find_regions (graphsky.coords.crval1, graphsky.coords.crval2, Radius, &Nregions);
-    if (!SetImageSelection (MEAS_XMOSAIC, &graphsky, TRUE)) goto escape;
-  }
+  /* load region corresponding to selection above */
+  if ((regions = SelectRegions (RegionName, RegionList, &Nregions)) == NULL) goto escape;
+  if (!SetImageSelection (MEAS_XMOSAIC)) goto escape;
 
   for (Nr = 0; Nr < Nregions; Nr++) {
@@ -177 +154 @@
     vec[i][0].Nelements = N;
   }
+  FreeImageSelection ();
   return (TRUE);
   
@@ -185 +163 @@
  escape:
   
+  FreeImageSelection ();
   if (regions != NULL) free (regions);  
   for (i = 0; i < NVEC; i++) {