Index: trunk/ippToPsps/jython/dvo.py
===================================================================
--- trunk/ippToPsps/jython/dvo.py	(revision 39151)
+++ 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
Index: trunk/ippToPsps/jython/ipptopspsdb.py
===================================================================
--- trunk/ippToPsps/jython/ipptopspsdb.py	(revision 39151)
+++ trunk/ippToPsps/jython/ipptopspsdb.py	(revision 39152)
@@ -1158,6 +1158,4 @@
 
         self.skychunk.boxSize = rs.getDouble(10)
-        # self.skychunk.halfBox = self.skychunk.boxSize/2.0
-        # self.skychunk.boxSizeWithBorder = self.skychunk.boxSize + (self.skychunk.BORDER * 2)
 
         self.skychunk.basePath = rs.getString(11)
Index: trunk/ippToPsps/jython/skychunk.py
===================================================================
--- trunk/ippToPsps/jython/skychunk.py	(revision 39151)
+++ trunk/ippToPsps/jython/skychunk.py	(revision 39152)
@@ -39,5 +39,6 @@
         # XXX this is a poor place to put this information -- it is completely gpc-specific.  
         # probably should go elsewhere.  This number is scaled in loader.py by cos(dec)
-        self.BORDER = 1.65
+        self.BORDER_GPC1    = 1.65
+        self.BORDER_SKYCELL = 0.40
         self.isLoaded = False