Changeset 5956

Timestamp:

Jan 9, 2006, 6:22:57 PM (21 years ago)

Author:

eugene

Message:

skyregion bug fixes

Location:

trunk/Ohana/src/libdvo/src

Files:

• skyregion_io.c (modified) (5 diffs)
• skyregion_ops.c (modified) (6 diffs)

trunk/Ohana/src/libdvo/src/skyregion_io.c

@@ -72 +72 @@
   if (f == (FILE *) NULL) { 
     fprintf (stderr, "cannot open %s for output\n", filename);
-    exit (1);
+    return (FALSE);
   }
   
@@ -111 +111 @@
   if (sky == NULL) {
     fprintf (stderr, "error loading sky table\n");
-    exit (1);
+    return (NULL);
   }
   /* set the depths to the default depth */
@@ -119 +119 @@
   sprintf (filename, "%s/SkyTable.fits", catdir);
   check_file_access (filename, FALSE, verbose);
-  SkyTableSave (sky, filename);
+  if (!SkyTableSave (sky, filename)) return NULL;
+
   fits_convert_SkyRegion (sky[0].regions, sizeof (SkyTable), sky[0].Nregions);
   return (sky);
@@ -128 +129 @@
   if (sky == NULL) {
     fprintf (stderr, "error loading sky table\n");
-    exit (1);
+    return (NULL);
   }
 
@@ -134 +135 @@
   sprintf (filename, "%s/SkyTable.fits", catdir);
   check_file_access (filename, FALSE, verbose);
-  SkyTableSave (sky, filename);
+  if (!SkyTableSave (sky, filename)) return NULL;
+
   fits_convert_SkyRegion (sky[0].regions, sizeof (SkyRegion), sky[0].Nregions);
   return (sky);

trunk/Ohana/src/libdvo/src/skyregion_ops.c

@@ -51 +51 @@
   ALLOCATE (list, SkyList, 1);
   ALLOCATE (list[0].regions,  SkyRegion *, NREGIONS);
+  ALLOCATE (list[0].filename,  char *, NREGIONS);
   list[0].Nregions = N;
 
@@ -71 +72 @@
 
     list[0].regions[N] = &region[No];
+    list[0].filename[N] = table[0].filename[No];
     N++;
-    if (N == NREGIONS) {
-      NREGIONS += 10;
-      REALLOCATE (list[0].regions, SkyRegion *, NREGIONS);
-    }      
+    CHECK_REALLOCATE (list[0].regions, SkyRegion *, NREGIONS, N, 10);
+    CHECK_REALLOCATE (list[0].filename, char *, NREGIONS, N, 10);
     list[0].Nregions = N;
 
@@ -167 +167 @@
     extra = SkyListChildrenByBounds (table, -1, depth, Rmin, 360.0, Dmin, Dmax);
     REALLOCATE (list[0].regions, SkyRegion *, list[0].Nregions + extra[0].Nregions);
+    REALLOCATE (list[0].filename, char *, list[0].Nregions + extra[0].Nregions);
     Ns = list[0].Nregions;
     for (i = 0; i < extra[0].Nregions; i++) {
       list[0].regions[i + Ns] = extra[0].regions[i];
+      list[0].filename[i + Ns] = extra[0].filename[i];
     }
     list[0].Nregions += extra[0].Nregions;
@@ -192 +194 @@
   ALLOCATE (list, SkyList, 1);
   ALLOCATE (list[0].regions, SkyRegion *, NNEW);
+  ALLOCATE (list[0].filename, char *, NNEW);
 
   region = table[0].regions;
@@ -221 +224 @@
         NNEW = Nnew + children[0].Nregions + 50;
         REALLOCATE (list[0].regions, SkyRegion *, NNEW);
+        REALLOCATE (list[0].filename, char *, NNEW);
       }
       for (j = 0; j < children[0].Nregions; j++) {
         list[0].regions[Nnew + j] = children[0].regions[j];
+        list[0].filename[Nnew + j] = children[0].filename[j];
       }
       Nnew += children[0].Nregions;
@@ -229 +234 @@
     } else {
       list[0].regions[Nnew] = &region[i];
+      list[0].filename[Nnew] = table[0].filename[i];
       Nnew ++;
       CHECK_REALLOCATE (list[0].regions, SkyRegion *, NNEW, Nnew, 50);
+      CHECK_REALLOCATE (list[0].filename, char *, NNEW, Nnew, 50);
     }
   }