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

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

@@ -8 +8 @@
   int Ngraph, Xgraph, TimeFormat;
   int Nstars, found, AutoLimits, ErrorBars, GalMag, AbsPhot, SaveVectors;
-  int i, j, m, N, NPTS, *N1, Nregions;
+  int i, j, m, N, NPTS, *N1;
   time_t TimeReference;
   struct tm *timeptr;
-  RegionFile *regions;
   Vector *xvec, *yvec;
   Vector Xvec, Yvec, dYvec;
   Catalog catalog;
   Graphdata graphmode;
+  SkyTable *sky;
+  SkyList *skylist;
 
   VarConfig ("CATDIR", "%s", catdir);
@@ -69 +70 @@
   }
   
+  /* 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]);
   Radius = atof (argv[3]);
 
-  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");
   }
 
   /* 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:
@@ -198 +202 @@
   if (catalog.measure != 0) free (catalog.measure);
  
+  SkyListFree (skylist);
   return (TRUE);
-
 }