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

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

@@ -8 +8 @@
   SkyTable *sky;
   SkyList *skylist;
-  char catdir[256];
-
-  VarConfig ("CATDIR", "%s", catdir);
 
   if ((argc != 3) && (argc != 4)) {
@@ -18 +15 @@
 
   /* 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]);
@@ -28 +22 @@
     Radius = 0.0001;
 
+  sky = GetSkyTable ();
   skylist = SkyListByRadius (sky, -1, Ra, Dec, Radius);
 
   for (i = 0; i < skylist[0].Nregions; i++) {
-    if (stat (skylist[0].regions[i][0].filename, &filestat) != -1) {
-      fprintf (stderr, "%3d %s *\n", i, regions[i].name);
+    if (stat ((char *) skylist[0].regions[i][0].filename, &filestat) != -1) {
+      fprintf (stderr, "%3d %s *\n", i, skylist[0].regions[i][0].name);
     } else {
-      fprintf (stderr, "%3d %s\n", i, regions[i].name);
+      fprintf (stderr, "%3d %s\n", i, skylist[0].regions[i][0].name);
     } 
-    set_str_variable ("CATNAME", regions[i].name);
+    set_str_variable ("CATNAME", (char *) skylist[0].regions[i][0].filename);
   }
 
   return (TRUE);
-  SkyListFree (regions);
+  SkyListFree (skylist, FALSE);
 }