Index: trunk/Ohana/src/opihi/dvo/dmagaves.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dmagaves.c	(revision 4470)
+++ trunk/Ohana/src/opihi/dvo/dmagaves.c	(revision 4585)
@@ -3,15 +3,14 @@
 int dmagaves (int argc, char **argv) {
   
-  Catalog catalog;
-  Graphdata graphsky;
-  RegionFile *regions;
-  PhotCode *code[3];
-  Vector *xvec, *yvec;
-
-  char filename[256], catdir[256], *CPTfile;
+  char filename[256], catdir[256], *RegionName, *RegionList;
   double Radius, *M1, M2;
   int i, j, k, m, N1, N;
   int Npts, NPTS, param, mode[3];
   int Ngraph, Nsec, Nregions;
+
+  Catalog catalog;
+  RegionFile *regions;
+  PhotCode *code[3];
+  Vector *xvec, *yvec;
 
   /* defaults */
@@ -20,4 +19,6 @@
   catalog.secfilt = NULL;
   catalog.measure = NULL;
+  RegionName = NULL;
+  RegionList = NULL;
 
   /* load photcode information */
@@ -25,54 +26,22 @@
   Nsec = GetPhotcodeNsecfilt ();
 
-  /* load data about plot windows */
-  Ngraph = 0;
-  if (!GetGraphData (&graphsky, NULL, &Ngraph)) return (FALSE);
- 
   /* find CATDIR in config system */
-  VarConfig ("CATDIR", "%s", catdir);
-
-  /* check for CPT selection */
-  CPTfile = NULL;
-  if (N = get_argument (argc, argv, "-cpt")) {
-    remove_argument (N, &argc, argv);
-    CPTfile = strcreate (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 (!SetRegionSelection (&argc, argv, &RegionName, &RegionList)) goto escape;
+  if (!SetPhotSelections (&argc, argv, 3)) goto usage;
+
+  /* interpret command-line options: dmagaves F1 - F2 : (value) */
   if (argc != 6) { goto usage; }
   if (strcmp (argv[2], "-")) goto usage;
   if (strcmp (argv[4], ":")) goto usage;
+  if (!GetPhotcodeInfo (argv[1], &code[0], &mode[0])) goto usage;
+  if (!GetPhotcodeInfo (argv[3], &code[1], &mode[1])) goto usage;
+  if ((param = GetAverageParam (argv[5])) == AVE_ZERO) goto usage;
+  if (!TestPhotSelections (&code[2], param)) goto escape;
 
-  /* interpret command-line options */
-  if (!GetPhotcodeInfo (argv[1], &code[0], &mode[0])) return (FALSE);
-  if (!GetPhotcodeInfo (argv[3], &code[1], &mode[1])) return (FALSE);
-  if ((param = GetAverageParam (argv[5])) == AVE_ZERO) {
-    GetAverageParamHelp ();
-    return (FALSE);
-  }
-  code[2] = GetPhotcodeEquivbyCode (code[0][0].code);
-  mode[2] = mode[0];
-
-  /* test PhotSelections: is photcode specified if needed? */
-  for (i = 0; i < 3; i++) {
-    if (!TestPhotSelections (&code[i])) {
-      fprintf (stderr, "photcode selection rules violated\n");
-      fprintf (stderr, "average and ensemble restrictions require a corresponding photcode\n");
-      goto escape;
-    }
-  }
-
-  /* determine region-file names */
-  if (CPTfile == NULL) {
-    float Radius;
-    Radius = MAX (fabs(graphsky.xmax), fabs(graphsky.ymax));
-    regions = find_regions (graphsky.coords.crval1, graphsky.coords.crval2, Radius, &Nregions);
-  } else {
-    Nregions = 1;
-    ALLOCATE (regions, RegionFile, 1);
-    strcpy (regions[0].name, CPTfile);
-  }
+  /* load region corresponding to selection above */
+  if ((regions = SelectRegions (RegionName, RegionList, &Nregions)) == NULL) goto escape;
 
   /* init vectors to save data */
@@ -103,7 +72,9 @@
       m = catalog.average[i].offset;
 
+      SetSelectionParam (0);
       M1 = ExtractDMag (code, mode, &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N1);
       if (N1 == 0) goto skip;
 
+      SetSelectionParam (2);
       M2 = ExtractAverages (code[2], mode[2], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], param);
 
@@ -112,5 +83,5 @@
 	yvec[0].elements[Npts] = M2;
 	Npts++;
-	if (Npts == NPTS) {
+	if (Npts >= NPTS) {
 	  NPTS += 2000;
 	  REALLOCATE (xvec[0].elements, float, NPTS);
@@ -128,5 +99,4 @@
     catalog.measure = (Measure *) NULL;
   }
-  FreeImageSelection ();
   if (regions != NULL) free (regions);
   xvec[0].Nelements = yvec[0].Nelements = Npts;
@@ -138,9 +108,10 @@
 
 escape:
-  FreeImageSelection ();
   if (regions != NULL) free (regions);
   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);
 }