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

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

@@ -5 +5 @@
 int gstar (int argc, char **argv) {
   
-  char filename[128], catdir[256], *date;
+  char *date;
   double Ra, Dec, Radius, Radius2, r, dec0, dec1;
   double Mcat, Mrel;
@@ -18 +18 @@
   PhotCode *code;
 
-  if (VarConfig ("CATDIR", "%s", catdir) == NULL) return (FALSE);
-
   if (!InitPhotcodes ()) return (FALSE);
   Nsec = GetPhotcodeNsecfilt ();
@@ -54 +52 @@
   
   /* load sky from correct table */
-  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, -1, VERBOSE);
-  SkyTableSetFilenames (sky, CATDIR, "cpt");
+  sky = GetSkyTable ();
   skylist = SkyListByRadius (sky, -1, Ra, Dec, Radius);
 
@@ -63 +60 @@
 
   /* 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: