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

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

@@ -5 +5 @@
 int subpix (int argc, char **argv) {
   
-  int i, j, I, Nlo, Nhi, Nentry, Nstars, Nregions, Nimage, Nmeasure;
+  int i, j, I, Nlo, Nhi, Nentry, Nstars, Nimage, Nmeasure;
   int *index, *entry;
   int Nmin, Nsub, NSUB, status;
@@ -17 +17 @@
   Measure *measure;
   Image *image;
-  RegionFile *regions;
   Catalog catalog;
 
@@ -35 +34 @@
   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 */
-  regions = find_regions (Ra, Dec, Radius, &Nregions);
-  if (Nregions > 1) {
+  skylist = SkyListByRadius (sky, -1, Ra, Dec, Radius);
+  if (skylist[0].Nregions > 1) {
     fprintf (stderr, "warning, radius overlaps region boundary, not yet implemented\n");
   }
 
   /* lock, load, unlock catalog */
-  sprintf (filename, "%s/%s", catdir, regions[0].name);
-  catalog.filename = filename;
+  catalog.filename = skylist[0].regions[0][0].filename;
   switch (lock_catalog (&catalog, LCK_SOFT)) {
   case 2:
@@ -92 +94 @@
     if (catalog.average != 0) free (catalog.average);
     if (catalog.measure != 0) free (catalog.measure);
-    free (regions);
+    SkyListFree (skylist);
     return (TRUE);
   }
@@ -158 +160 @@
   free (image);
   free (index);
-  free (regions);
+  SkyListFree (regions);
 
   return (TRUE);