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

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

@@ -1 +1 @@
 # include "dvo1.h"
+
+/* XXX note : for RegionName or RegionList, we need to free the skylist
+   elements, but not in the case of radius selection - this implies 
+   information carried back up */
 
 static int RegionSelect;
@@ -42 +46 @@
 }
 
-RegionFile *SelectRegions (char *RegionName, char *RegionList, int *nregions) {
+SkyList *SelectRegions (char *RegionName, char *RegionList) {
 
   double Radius;
   int Ngraph;
   Graphdata graphsky;
-  RegionFile *regions;
+  SkyTable *sky;
+  SkyList *skylist;
 
   /* determine region-file names */
   if (RegionName != NULL) {
-    *nregions = 1;
-    ALLOCATE (regions, RegionFile, 1);
-    strcpy (regions[0].name, RegionName);
+    ALLOCATE (skylist, SkyList, 1);
+    ALLOCATE (skylist[0].regions[0], SkyRegion *, 1);
+    ALLOCATE (skylist[0].regions[0][0], SkyRegion, 1);
+    strcpy (skylist[0].regions[0][0].name, RegionName);
+    sprintf (filename, "%s/%s.cpt", CATDIR, RegionName);
+    skylist[0].regions[0][0].filename = strcreate (filename);
     free (RegionName);
     RegionName = NULL;
-    return (regions);
+    return (skylist);
   } 
   if (RegionList != NULL) {
-    regions = region_list (RegionList, nregions);
+    skylist = SkyListLoadFile (RegionList);
     free (RegionList);
     RegionList = NULL;
-    return (regions);
+    return (skylist);
   }
 
@@ -72 +80 @@
 
   Radius = MAX (fabs(graphsky.xmax), fabs(graphsky.ymax));
-  regions = find_regions (graphsky.coords.crval1, graphsky.coords.crval2, Radius, nregions);
-  return (regions);
+
+  /* load sky from correct table */
+  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, -1, VERBOSE);
+  SkyTableSetFilenames (sky, CATDIR, "cpt");
+  skylist = SkyListByRadius (sky, -1, graphmode.coords.crval1, graphmode.coords.crval2, Radius);
+
+  return (skylist);
 }
 
+/* XXX EAM this should perhaps return a skytable? */
 /* returns a list of region files names from file */
-RegionFile *region_list (char *filename, int *Nregions) {
+SkyList *SkyListFromFile (char *filename) {
   
+  FILE *f;
   int NREGIONS, nregion;
-  RegionFile *regions;
-  FILE *f;
+  SkyList *skylist;
+
+  ALLOCATE (skylist, SkyList, 1);
 
   f = fopen (filename, "r");
   if (f == NULL) {
     fprintf (stderr, "ERROR: can't find region list file %s\n", filename);
-    *Nregions = 0;
-    return (NULL);
+    skylist[0].Nregions = 0;
+    skylist[0].regions = NULL;
+    return (skylist);
   }
   
+  Nregions = 0;
   NREGIONS = 50;
-  ALLOCATE (regions, RegionFile, NREGIONS);
-  nregion = 0;
+  ALLOCATE (skylist[0].regions, SkyRegion *, NREGIONS);
 
-  while (fscanf (f, "%s", regions[nregion].name) != EOF) {
-    nregion ++;
-    if (nregion == NREGIONS) {
-      NREGIONS += 50;
-      REALLOCATE (regions, RegionFile, NREGIONS);
+  while (fscanf (f, "%s", filename) != EOF) {
+    ALLOCATE (skylist[0].regions[Nregions], SkyRegion, 1);
+    strcpy (skylist[0].regions[Nregions][0].name, filename);
+    sprintf (filename, "%s/%s.cpt", CATDIR, skylist[0].regions[Nregions][0].name);
+    skylist[0].regions[Nregions][0].filename = strcreate (filename);
+    Nregions ++;
+    CHECK_REALLOCATE (skylist[0].regions, SkyRegion *, NREGIONS, Nregions, 50);
     }
   }