Index: trunk/ippToPsps/jython/dvo.py
===================================================================
--- trunk/ippToPsps/jython/dvo.py	(revision 39148)
+++ trunk/ippToPsps/jython/dvo.py	(revision 39152)
@@ -704,15 +704,16 @@
         # to grab all detections / objects which are contributed by an
         # item with the center in the given box
-        dR_border = self.skychunk.BORDER / math.cos(math.radians(boxDim['DEC']))
-        dD_border = self.skychunk.BORDER
-        
-        # This is a terrible hack but I'm tired of it taking a decade to ingest the FW skycells.
-
-        #if self.batchType == "ST":
-        #    dR_border = .4 / math.cos(math.radians(boxDim['DEC']))
-        #    dD_border = .4
-        #if self.batchType == "FW":
-        #    dR_border = .4 / math.cos(math.radians(boxDim['DEC']))
-        #    dD_border = .4
+
+        # P2 and DF need to use a full GPC1 exposure radius:
+        myBorder = self.skychunk.BORDER_GPC1
+
+        # ST and FW need to use just a skycell
+        if self.batchType == "ST" :
+            myBorder = self.skychunk.BORDER_SKYCELL
+        if self.batchType == "FW" :
+            myBorder = self.skychunk.BORDER_SKYCELL
+
+        dR_border = myBorder / math.cos(math.radians(boxDim['DEC']))
+        dD_border = myBorder
 
         minRA  = boxDim['minRA']  - dR_border