Changeset 5451 for trunk/Ohana/src/opihi/dvo/lcurve.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/lcurve.c (modified) (5 diffs)

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

@@ -3 +3 @@
 int lcurve (int argc, char **argv) {
   
-  char filename[128], string[128], catdir[256], *p;
+  char string[128], *p;
   double Ra, Dec, Radius, Radius2, r;
   float *RA, *DEC;
@@ -18 +18 @@
   SkyList *skylist;
 
-  VarConfig ("CATDIR", "%s", catdir);
-
   if (!InitPhotcodes ()) return (FALSE);
 
@@ -70 +68 @@
   }
   
-  /* load sky from correct table */
-  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, -1, VERBOSE);
-  SkyTableSetFilenames (sky, CATDIR, "cpt");
-
   Ra = atof (argv[1]);
   Dec = atof (argv[2]);
   Radius = atof (argv[3]);
 
+  /* load sky from correct table */
+  sky = GetSkyTable ();
   skylist = SkyListByRadius (sky, -1, Ra, Dec, Radius);
 
@@ -85 +81 @@
 
   /* set filename, read in header */
-  catalog.filename = skylist[0].regions[0][0].filename;
+  catalog.filename = (char *) skylist[0].regions[0][0].filename;
   switch (lock_catalog (&catalog, LCK_SOFT)) {
   case 2:
@@ -202 +198 @@
   if (catalog.measure != 0) free (catalog.measure);
  
-  SkyListFree (skylist);
+  SkyListFree (skylist, FALSE);
   return (TRUE);
 }