Changeset 39273 for trunk

Timestamp:

Dec 15, 2015, 10:36:22 AM (11 years ago)

Author:

eugene

Message:

for smf files, the region used by LoadData and LoadStars needs to cover all stars loaded from the smf, not just one chip

Location:

trunk/Ohana/src/addstar/src

Files:

• FilterStars.c (modified) (2 diffs)
• LoadData.c (modified) (1 diff)
• LoadStars.c (modified) (3 diffs)
• addstar.c (modified) (1 diff)

trunk/Ohana/src/addstar/src/FilterStars.c

@@ -19 +19 @@
   MTIME = (image[0].exptime > 0) ? 2.500*log10(image[0].exptime) : 0.0;
 
-  RMIN = 360.0;
-  RMAX =   0.0;
-  DMIN = +90.0;
-  DMAX = -90.0;
+  RMIN = region->Rmin;
+  RMAX = region->Rmax;
+  DMIN = region->Dmin;
+  DMAX = region->Dmax;
 
   /* modify resulting star list */
@@ -182 +182 @@
   if (VERBOSE) fprintf (stderr, "stars cover region %f,%f - %f,%f\n", RMIN, DMIN, RMAX, DMAX);
 
-  float dR = RMAX - RMIN;
-  float dD = DMAX - DMIN;
-
   // define containing region a bit generously
-  region->Rmin = RMIN - 0.1*dR;
-  region->Rmax = RMAX + 0.1*dR;
-  region->Dmin = DMIN - 0.1*dD;
-  region->Dmax = DMAX + 0.1*dD;
+  region->Rmin = RMIN;
+  region->Rmax = RMAX;
+  region->Dmin = DMIN;
+  region->Dmax = DMAX;
 
   return (outcat);

trunk/Ohana/src/addstar/src/LoadData.c

@@ -110 +110 @@
     matchOptions.photcode = 0; // use an invalid photcode to avoid touching secfilt
 
-    find_matches_closest (region, newcat, catalog, matchOptions);
+    SkyRegion matchRegion;
+    float dR = region->Rmax - region->Rmin;
+    float dD = region->Dmax - region->Dmin;
+
+    // define matchRegion a bit generously
+    matchRegion.Rmin = region->Rmin - 0.1*dR;
+    matchRegion.Rmax = region->Rmax + 0.1*dR;
+    matchRegion.Dmin = region->Dmin - 0.1*dD;
+    matchRegion.Dmax = region->Dmax + 0.1*dD;
+
+    find_matches_closest (&matchRegion, newcat, catalog, matchOptions);
     dvo_catalog_free (newcat);
     free (newcat);

trunk/Ohana/src/addstar/src/LoadStars.c

@@ -17 +17 @@
   ALLOCATE (catalog->measure, Measure, 1);
   ALLOCATE (catalog->lensing, Lensing, 1);
+
+  SkyRegion region;
+  region.Rmin =  720.0;
+  region.Rmax = -720.0;
+  region.Dmin =  180.0;
+  region.Dmax = -180.0;
 
   for (i = 0; i < Nfile; i++) {
@@ -75 +81 @@
     }
 
-    SkyRegion region;
     newcat = LoadData (f, &file[i], images, Nimages, headers, extsize, headerSets, NheaderSets, &region, options);
 
@@ -89 +94 @@
       matchOptions.photcode = 0; // use an invalid photcode to avoid touching secfilt
       
-      find_matches_closest (&region, newcat, catalog, matchOptions);
+      SkyRegion matchRegion;
+      float dR = region.Rmax - region.Rmin;
+      float dD = region.Dmax - region.Dmin;
+
+      // define matchRegion a bit generously
+      matchRegion.Rmin = region.Rmin - 0.1*dR;
+      matchRegion.Rmax = region.Rmax + 0.1*dR;
+      matchRegion.Dmin = region.Dmin - 0.1*dD;
+      matchRegion.Dmax = region.Dmax + 0.1*dD;
+
+      find_matches_closest (&matchRegion, newcat, catalog, matchOptions);
     }
 

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

@@ -234 +234 @@
   FreePhotcodeTable ();
   SkyTableFree (sky);
-  ohana_memcheck (1);
-  ohana_memdump (1);
   exit (0);
 }