Changeset 5448 for trunk/Ohana/src/opihi/dvo/gcat.c

Timestamp:

Oct 27, 2005, 10:38:30 AM (21 years ago)

Author:

eugene

Message:

implementing SkyRegions in all DVO programs

File:

• trunk/Ohana/src/opihi/dvo/gcat.c (modified) (4 diffs)

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

@@ -3 +3 @@
 int gcat (int argc, char **argv) {
   
-  int i, Nregions;
-  RegionFile *regions;
-  char filename[128];
+  int i;
   struct stat filestat;
   double Ra, Dec, Radius;
+  SkyTable *sky;
+  SkyList *skylist;
   char catdir[256];
 
@@ -17 +17 @@
   }
 
+  /* 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]);
@@ -24 +28 @@
     Radius = 0.0001;
 
-  regions = find_regions (Ra, Dec, Radius, &Nregions);
+  skylist = SkyListByRadius (sky, -1, Ra, Dec, Radius);
 
-  for (i = 0; i < Nregions; i++) {
-    sprintf (filename, "%s/%s", catdir, regions[i].name);
-    if (stat (filename, &filestat) != -1) {
+  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);
     } else {
@@ -37 +40 @@
 
   return (TRUE);
-  free (regions);
-
+  SkyListFree (regions);
 }
-