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

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

@@ -4 +4 @@
   
   int i, j, k, m, N, N1, NPTS;
-  int param, mode, Nregions, Ngraph, Nsec;
-  char filename[128], catdir[256], *p;
-  double *M1;
+  int param, mode, Nregions, Nsec;
+  char filename[128], catdir[256], *RegionName, *RegionList, *p;
+  double Radius, *M1;
 
   PhotCode *code;
   Catalog catalog;
   RegionFile *regions;
-  Graphdata graphsky;
   Vector *vec;
 
+  /* defaults */
   regions = NULL;
   catalog.average = (Average *) NULL; 
   catalog.secfilt = (SecFilt *) NULL;
   catalog.measure = (Measure *) NULL;
+  RegionName = NULL;
+  RegionList = NULL;
+  code = NULL;
+  mode = MAG_REL;
 
   /* load photcode information */
@@ -23 +27 @@
   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;
 
   /* interpret command-line options */
-  if (!SetPhotSelections (&argc, argv)) goto usage;
-  if (argc != 3) goto usage;
+  SetSelectionParam (0);
+  if (!SetRegionSelection (&argc, argv, &RegionName, &RegionList)) goto escape;
+  if (!SetPhotSelections (&argc, argv, 1)) goto usage;
 
-  /* identify selection */
-  code = NULL;
-  mode = MAG_REL;
-  param = GetMeasureParam (argv[2]);
+  /* interpret required command-line arguments: mextract (value) */
+  if (argc != 2) goto usage;
+  param = GetMeasureParam (argv[1]);
   if (param == MEAS_ZERO) {
-    if (!GetPhotcodeInfo (argv[2], &code, &mode)) {
+    if (!GetPhotcodeInfo (argv[1], &code, &mode)) {
       GetMeasureParam ("help");
-      fprintf (stderr, "value may also be a valid photcode\n");
-      fprintf (stderr, "photcodes or 'mag' may have optional magnitude type: mag,[Minst, Mcat, Msys, Mrel, Mcal]\n");
       goto escape;
     }
     param = MEAS_MAG;
-    for (p = argv[2]; *p != 0; p++) { 
+    for (p = argv[1]; *p != 0; p++) { 
       if (*p == '.') *p = ':';
     }
-  } 
-  /* 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, MEAS_ZERO)) goto escape;
 
-  if ((vec = SelectVector (argv[2], ANYVECTOR, TRUE)) == NULL) goto escape;
-
-  /* determine region-file names */
-  if (!strcmp (argv[1], "all")) {
-    float Radius;
-    Radius = MAX (fabs(graphsky.xmax), fabs(graphsky.ymax));
-    regions = find_regions (graphsky.coords.crval1, graphsky.coords.crval2, Radius, &Nregions);
-    /* I don't have a tool to select images by the overlapping region */
-    if (!SetImageSelection (param, &graphsky, TRUE)) goto escape;
-  } else {
-    Nregions = 1;
-    ALLOCATE (regions, RegionFile, 1);
-    strcpy (regions[0].name, argv[1]);
-    if (!SetImageSelection (param, NULL, FALSE)) goto escape;
-  }
+  /* load region corresponding to selection above */
+  if ((regions = SelectRegions (RegionName, RegionList, &Nregions)) == NULL) goto escape;
+  if (!SetImageSelection (param)) goto escape;
 
   /* create storage vector */
-  NPTS = 1000;
-  REALLOCATE (vec[0].elements, float, NPTS);
-  vec[0].Nelements = N = 0;
+  N = 0;
+  NPTS = 1;
+  if ((vec = SelectVector (argv[1], ANYVECTOR, TRUE)) == NULL) goto escape;
 
   for (i = 0; i < Nregions; i++) {
@@ -110 +82 @@
         vec[0].elements[N] = M1[k];
         N++;
-        if (N == NPTS - 1) {
-          NPTS += 2000;
-          REALLOCATE (vec[0].elements, float, NPTS);
-        }
+        CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 2000);
       }
       if (M1 != NULL) free (M1);
@@ -132 +101 @@
 
 usage:
-  fprintf (stderr, "USAGE: mextract (from) (value) [options]\n");
-  fprintf (stderr, "  from: cpt name or 'all'\n");
+  fprintf (stderr, "USAGE: mextract (value) [options]\n");
   fprintf (stderr, "  value: measure.parameter or photcode\n");
   return (FALSE);
 
 escape:
+  FreeImageSelection ();
   if (regions != NULL) free (regions);
-  FreeImageSelection ();
   if (catalog.average != NULL) free (catalog.average);
   if (catalog.secfilt != NULL) free (catalog.secfilt);
   if (catalog.measure != NULL) free (catalog.measure);
+  if (RegionName != NULL) free (RegionName);
+  if (RegionList != NULL) free (RegionList);
   return (FALSE);
 }