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

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

@@ -7 +7 @@
   float *RA, *DEC;
   int Nstars, found, PhotCodeSelect;
-  int i, j, k, m, N, NPTS, Nsec, RELPHOT, *N1, Nregions, TimeFormat;
+  int i, j, k, m, N, NPTS, Nsec, RELPHOT, *N1, TimeFormat;
   time_t TimeReference;
-  RegionFile *regions;
   Vector *tvec, *mvec, *dmvec;
   Catalog catalog;
@@ -50 +49 @@
   Radius = atof (argv[3]);
 
-  regions = find_regions (Ra, Dec, Radius, &Nregions);
+  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, -1, VERBOSE);
+  SkyTableSetFilenames (sky, CATDIR, "cpt");
+  skylist = SkyListByRadius (sky, -1, Ra, Dec, Radius);
 
-  if (Nregions > 1) {
+  if (skylist[0].Nregions > 1) {
     fprintf (stderr, "warning, radius overlaps region boundary, not yet implemented\n");
   }
 
   /* set filename, read in header */
-  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:
@@ -148 +148 @@
   if (catalog.secfilt != 0) free (catalog.secfilt);
  
+  SkyListFree (skylist);
   return (TRUE);
-
 }