Changeset 5451 for trunk/Ohana/src/opihi/dvo/pmeasure.c

Timestamp:

Oct 27, 2005, 7:10:17 PM (21 years ago)

Author:

eugene

Message:

working on SkyRegion conversion

File:

• trunk/Ohana/src/opihi/dvo/pmeasure.c (modified) (4 diffs)

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

@@ -6 +6 @@
   int i, j, k, m, N;
   int Ngraph;
-  char filename[128], catdir[256];
   double Mz, Mr, mag;
   double Radius, Rmin, Rmax;
@@ -22 +21 @@
   if (!InitPhotcodes ()) return (FALSE);
   if (!GetGraph (&graphmode, NULL, &Ngraph)) return (FALSE);
-  if (VarConfig ("CATDIR", "%s", catdir) == NULL) return (FALSE);
 
   f = (FILE *) NULL;
@@ -76 +74 @@
 
   /* load sky from correct table */
-  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, -1, VERBOSE);
-  SkyTableSetFilenames (sky, CATDIR, "cpt");
+  sky = GetSkyTable ();
   skylist = SkyListByRadius (sky, -1, graphmode.coords.crval1, graphmode.coords.crval2, Radius);
   
@@ -84 +81 @@
     
     /* lock, load, unlock catalog */
-    catalog.filename = skylist[0].regions[j][0].filename;
+    catalog.filename = (char *) skylist[0].regions[j][0].filename;
     switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 2: