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

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

@@ -13 +13 @@
   double Ra, Dec, Radius, Radius2, r, Rmin;
   double *RA, *DEC;
-  char catdir[256], filename[256];
   
+  SkyTable *sky;
+  SkyList *skylist;
   Measure *measure;
   Image *image;
@@ -20 +21 @@
 
   if (!InitPhotcodes ()) return (FALSE);
-
-  VarConfig ("CATDIR", "%s", catdir);
 
   GetTimeFormat (&TimeReference, &TimeFormat);
@@ -34 +33 @@
   Radius = atof (argv[3]);
 
-  /* load sky from correct table */
-  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, -1, VERBOSE);
-  SkyTableSetFilenames (sky, CATDIR, "cpt");
-
   /* load star nearest position */
+  sky = GetSkyTable ();
   skylist = SkyListByRadius (sky, -1, Ra, Dec, Radius);
   if (skylist[0].Nregions > 1) {
@@ -45 +41 @@
 
   /* lock, load, unlock catalog */
-  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:
@@ -94 +90 @@
     if (catalog.average != 0) free (catalog.average);
     if (catalog.measure != 0) free (catalog.measure);
-    SkyListFree (skylist);
+    SkyListFree (skylist, FALSE);
     return (TRUE);
   }
@@ -160 +156 @@
   free (image);
   free (index);
-  SkyListFree (regions);
+  SkyListFree (skylist, FALSE);
 
   return (TRUE);