Changeset 37511

Timestamp:

Oct 20, 2014, 5:56:40 PM (12 years ago)

Author:

eugene

Message:

grab neighboring catalogs to ensure everybody is assigned (not so efficient...)

Location:

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge/src

Files:

• dvomergeUpdate_catalogs.c (modified) (1 diff)
• merge_catalogs_old.c (modified) (1 diff)

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -58 +58 @@
     }
 
+# if 0
+    // NOTE: i was having trouble dropping objects on edges with the option below.  Since an object can move outside the catalog grab the neighbors.
     // SkyListByBounds will return neighbor catalogs if the boundaries exactly match (due to rounding).  Since the regions are not infinitely small, 
     // compare to a slightly reduced footprint
     float dPos = 2.0/3600.0;
     outlist = SkyListByBounds (outsky, -1, 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);
+# else
+    // Since an object can move outside the catalog grab the neighbors.
+    float dPos = 2.0/3600.0;
+    outlist = SkyListByBounds (outsky, -1, 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);
+# endif
 
     OutputStatus *outstat = OutputStatusInit (outlist->Nregions);

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -4 +4 @@
 # define IN_REGION(R,D) (                                       \
     ((D) >= region[0].Dmin) && ((D) < region[0].Dmax) &&        \
-    ((R) >= region[0].Rmin)  && ((R) < region[0].Rmax))
+    ((R) >= region[0].Rmin) && ((R) < region[0].Rmax))
 
 // merge the input data into the output catalog