Changeset 6641

Timestamp:

Mar 18, 2006, 5:24:44 PM (20 years ago)

Author:

eugene

Message:

various bugs introduced with skyregions

Location:

trunk/Ohana/src/addstar/src

Files:

• SkyListForStars.c (modified) (3 diffs)
• get2mass.c (modified) (1 diff)
• rfits.c (modified) (1 diff)

trunk/Ohana/src/addstar/src/SkyListForStars.c

@@ -4 +4 @@
   
   int i, j, Nr, NR;
-  SkyRegion *region;
+  SkyList *here;
   SkyList *list;
   
@@ -11 +11 @@
   ALLOCATE (list, SkyList, 1);
   ALLOCATE (list[0].regions,  SkyRegion *, NR);
+  ALLOCATE (list[0].filename, char *, NR);
   list[0].Nregions = Nr;
 
@@ -16 +17 @@
   for (i = 0; i < Nstars; i++) {
     if (stars[i].found) continue;
-    region = SkyRegionByPoint (table, depth, stars[i].R, stars[i].D);
+    here = SkyRegionByPoint (table, depth, stars[i].R, stars[i].D);
     stars[i].found = TRUE;
     /* search forward for all contained stars */
     for (j = i; j < Nstars; j++) {
-      if (stars[j].R >= region[0].Rmax) break;
-      if (stars[j].D <  region[0].Dmin) continue;
-      if (stars[j].D >= region[0].Dmax) continue;
+      if (stars[j].R >= here[0].regions[0][0].Rmax) break;
+      if (stars[j].R <  here[0].regions[0][0].Rmin) break;
+      if (stars[j].D <  here[0].regions[0][0].Dmin) continue;
+      if (stars[j].D >= here[0].regions[0][0].Dmax) continue;
       stars[j].found = TRUE;
     }
-    list[0].regions[Nr] = region;
+    list[0].regions[Nr] = here[0].regions[0];
+    list[0].filename[Nr] = here[0].filename[0];
+    SkyListFree (here, FALSE); 
     Nr ++;
-    CHECK_REALLOCATE (list[0].regions, SkyRegion *, NR, Nr, 100);
+    if (Nr >= NR) {
+        NR += 32;
+        REALLOCATE (list[0].regions, SkyRegion *, NR);
+        REALLOCATE (list[0].filename, char *, NR);
+    }
     list[0].Nregions = Nr;
   }

trunk/Ohana/src/addstar/src/get2mass.c

@@ -94 +94 @@
 
     Nregions ++;
-    CHECK_REALLOCATE (regions, SkyRegion, NREGIONS, Nregions, 20);
-    CHECK_REALLOCATE (filenames, char *, NREGIONS, Nregions, 20);
+    if (Nregions >= NREGIONS) {
+        NREGIONS += 20;
+        REALLOCATE (regions, SkyRegion, NREGIONS);
+        REALLOCATE (filenames, char *, NREGIONS);
+    }
   }    
   fclose (f);

trunk/Ohana/src/addstar/src/rfits.c

@@ -40 +40 @@
   return (NULL);
 }
+
+// **** this needs to be fixed to handle MEF smp files...
+// there will be multiple extension names, how will these get passed?