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

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

@@ -3 +3 @@
 int lightcurve (int argc, char **argv) {
   
-  char filename[128], catdir[256];
   double Ra, Dec, Radius, Radius2, r;
   float *RA, *DEC;
@@ -9 +8 @@
   int i, j, k, m, N, NPTS, Nsec, RELPHOT, *N1, TimeFormat;
   time_t TimeReference;
+
+  PhotCode *code;
+  Catalog catalog;
+  SkyTable *sky;
+  SkyList *skylist;
   Vector *tvec, *mvec, *dmvec;
-  Catalog catalog;
-  PhotCode *code;
-
-  VarConfig ("CATDIR", "%s", catdir);
 
   if (!InitPhotcodes ()) return (FALSE);
@@ -49 +49 @@
   Radius = atof (argv[3]);
 
-  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, -1, VERBOSE);
-  SkyTableSetFilenames (sky, CATDIR, "cpt");
+  sky = GetSkyTable ();
   skylist = SkyListByRadius (sky, -1, Ra, Dec, Radius);
 
@@ -58 +57 @@
 
   /* 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:
@@ -148 +147 @@
   if (catalog.secfilt != 0) free (catalog.secfilt);
  
-  SkyListFree (skylist);
+  SkyListFree (skylist, FALSE);
   return (TRUE);
 }