Changeset 4470 for trunk/Ohana/src/opihi/dvo/dmagaves.c

Timestamp:

Jul 6, 2005, 2:37:31 PM (21 years ago)

Author:

eugene

Message:

added -cpt options to dvo extraction functions

File:

• trunk/Ohana/src/opihi/dvo/dmagaves.c (modified) (3 diffs)

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

@@ -9 +9 @@
   Vector *xvec, *yvec;
 
-  char filename[256], catdir[256];
+  char filename[256], catdir[256], *CPTfile;
   double Radius, *M1, M2;
-  int i, j, k, m, N1;
+  int i, j, k, m, N1, N;
   int Npts, NPTS, param, mode[3];
   int Ngraph, Nsec, Nregions;
@@ -31 +31 @@
   /* 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);
+  }    
 
   /* interpret command-line options */
@@ -57 +65 @@
   }
 
-  /* find catalog files which overlap this region */
-  Radius = MAX (fabs(graphsky.xmax), fabs(graphsky.ymax));
-  regions = find_regions (graphsky.coords.crval1, graphsky.coords.crval2, Radius, &Nregions);
-  if (!SetImageSelection (param, &graphsky, TRUE)) return (FALSE);
-  
+  /* 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);
+  }
+
   /* init vectors to save data */
   Npts = 0;