Changeset 33220

Timestamp:

Feb 8, 2012, 8:32:30 AM (14 years ago)

Author:

eugene

Message:

fix some low-level bugs (dvomergeUpdate needs to use the depth of the actual input catalog, not the first input catalog

Location:

branches/eam_branches/ipp-20111122/Ohana/src

Files:

• addstar/src/loadsupercos_rawdata.c (modified) (1 diff)
• addstar/src/mkcmf.c (modified) (1 diff)
• dvomerge/src/dvomergeUpdate.c (modified) (3 diffs)
• dvomerge/src/dvomergeUpdate_threaded.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/addstar/src/loadsupercos_rawdata.c

@@ -157 +157 @@
       }
           
-      if (VERBOSE) fprintf (stderr, "selected %d stars (%10.6f - %10.6f, %10.6f - %10.6f)\n", Nstars, 
+      if (DEBUG) fprintf (stderr, "selected %d stars (%10.6f - %10.6f, %10.6f - %10.6f)\n", Nstars, 
                           region[0].Rmin, region[0].Rmax, region[0].Dmin, region[0].Dmax);
 

branches/eam_branches/ipp-20111122/Ohana/src/addstar/src/mkcmf.c

@@ -43 +43 @@
   }
 
-  static double mjd = NAN;
+  static double mjd;
+  mjd = NAN;
   if ((N = get_argument (argc, argv, "-mjd"))) {
     remove_argument (N, &argc, argv);

branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeUpdate.c

@@ -3 +3 @@
 int dvomergeUpdate (int argc, char **argv) {
 
-  int depth, CONTINUE;
-  off_t i, j, Ns, Ne;
+  int CONTINUE;
+  off_t i, j;
   SkyTable *outsky, *insky;
   SkyList *outlist, *inlist;
@@ -101 +101 @@
   // loop over the populatable output tables; check for data in input in the corresponding regions
 
-  SkyListPopulatedRange (&Ns, &Ne, inlist, 0);
-  depth = inlist[0].regions[Ns][0].depth;
+  // XXX this is not really used...
+  // SkyListPopulatedRange (&Ns, &Ne, inlist, 0);
+  // depth = inlist[0].regions[Ns][0].depth;
   
   SetPhotcodeTable(NULL);
@@ -126 +127 @@
     // compare to a slightly reduced footprint
     float dPos = 2.0/3600.0;
-    outlist = SkyListByBounds (outsky, depth, inlist[0].regions[i][0].Rmin + dPos, inlist[0].regions[i][0].Rmax - dPos, inlist[0].regions[i][0].Dmin + dPos, inlist[0].regions[i][0].Dmax - dPos);
+    outlist = SkyListByBounds (outsky, inlist[0].regions[i][0].depth, inlist[0].regions[i][0].Rmin + dPos, inlist[0].regions[i][0].Rmax - dPos, inlist[0].regions[i][0].Dmin + dPos, inlist[0].regions[i][0].Dmax - dPos);
     for (j = 0; j < outlist[0].Nregions; j++) {
       if (VERBOSE) fprintf (stderr, "output : %s\n", outlist[0].regions[j][0].name);

branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c

@@ -61 +61 @@
     // compare to a slightly reduced footprint
     float dPos = 2.0/3600.0;
+    // XXX probably need to use threadData->region->depth
     outlist = SkyListByBounds (threadData->outsky, threadData->depth, threadData->region->Rmin + dPos, threadData->region->Rmax - dPos, threadData->region->Dmin + dPos, threadData->region->Dmax - dPos);
     for (j = 0; (j < outlist[0].Nregions) && (threadData->state != TS_FAIL); j++) {