Index: /trunk/ippToPsps/config/settings.xml
===================================================================
--- /trunk/ippToPsps/config/settings.xml	(revision 35178)
+++ /trunk/ippToPsps/config/settings.xml	(revision 35179)
@@ -11,5 +11,5 @@
   <localdatabase>
     <loader mach="ipp006">
-      <name>ipptopsps_scratch1</name>
+      <name>ipptopsps_scratch</name>
       <host>ipp006</host>
       <user>dvo</user>
@@ -17,11 +17,29 @@
     </loader>
     <loader mach="ipp007">
-      <name>ipptopsps_scratch1</name>
+      <name>ipptopsps_scratch</name>
       <host>ipp007</host>
       <user>dvo</user>
       <password>dvo</password>
     </loader>
+    <loader mach="ipp008">
+      <name>ipptopsps_scratch</name>
+      <host>ipp008</host>
+      <user>dvo</user>
+      <password>dvo</password>
+    </loader>
+    <loader mach="ipp009">
+      <name>ipptopsps_scratch</name>
+      <host>ipp009</host>
+      <user>dvo</user>
+      <password>dvo</password>
+    </loader>
+    <loader mach="ipp010">
+      <name>ipptopsps_scratch</name>
+      <host>ipp010</host>
+      <user>dvo</user>
+      <password>dvo</password>
+    </loader>
     <loader mach="generic">
-      <name>ipptopsps_scratch1</name>
+      <name>ipptopsps_scratch</name>
       <host>localhost</host>
       <user>dvo</user>
Index: /trunk/ippToPsps/jython/loader.py
===================================================================
--- /trunk/ippToPsps/jython/loader.py	(revision 35178)
+++ /trunk/ippToPsps/jython/loader.py	(revision 35179)
@@ -8,4 +8,5 @@
 import sys
 import os
+import math
 import traceback
 import logging.config
@@ -158,7 +159,8 @@
                     self.logger.infoPair("Box dimensions", "%.1f / %.1f / %.1f" % (boxDim['RA'], boxDim['DEC'], boxDim['SIDE']))
                     self.logger.infoPair(batchType + " items found in this box", "%d" % len(ids))
-                    boxSizeWithBorder = boxDim['SIDE'] + (self.skychunk.BORDER * 2)
+                    boxSizeWithBorder = boxDim['SIDE'] + (self.skychunk.BORDER * 2 / math.cos(math.radians(boxDim['DEC'])))
                     boxSizeSansBorder = boxDim['SIDE']
-                    self.logger.infoPair("got here", "ok")
+                    boxSize = boxSizeWithBorder
+                    self.logger.infoPair("using box of size", str(boxSize))
                     useFullTables = 0
                     if batchType != "OB":
@@ -167,5 +169,5 @@
                             # look in DVO for this box (with extra border)
                             self.logger.infoPair("Querying DVO for this sky area", "")
-                            self.dvoDetections.setSkyAreaAsBox(boxDim['RA'], boxDim['DEC'], boxSizeWithBorder)
+                            self.dvoDetections.setSkyAreaAsBox(boxDim['RA'], boxDim['DEC'], boxSize)
                             #self.dvoDetections.setSkyArea()
                             sizeToBeIngested = self.dvoDetections.getDiskSizeOfRegionsToBeIngested()
@@ -194,5 +196,5 @@
                             # impact of mysql insertion
                             if not self.ippToPspsDb.isBoxIngested(boxId):
-                                self.dvoDetections.nativeIngestDetections(boxId, boxDim['RA'], boxDim['DEC'], boxSizeWithBorder)
+                                self.dvoDetections.nativeIngestDetections(boxId, boxDim['RA'], boxDim['DEC'], boxSize)
 
                             useFullTables = 1
Index: /trunk/ippToPsps/jython/skychunk.py
===================================================================
--- /trunk/ippToPsps/jython/skychunk.py	(revision 35178)
+++ /trunk/ippToPsps/jython/skychunk.py	(revision 35179)
@@ -38,5 +38,5 @@
 
         # XXX this is a poor place to put this information -- it is completely gpc-specific.  
-        # probably should go elsewhere
+        # probably should go elsewhere.  This number is scaled in loader.py by cos(dec)
         self.BORDER = 1.65
         self.isLoaded = False
Index: /trunk/ippToPsps/test/fulltest.sh
===================================================================
--- /trunk/ippToPsps/test/fulltest.sh	(revision 35178)
+++ /trunk/ippToPsps/test/fulltest.sh	(revision 35179)
@@ -25,5 +25,5 @@
 # mkgpc1.sh user localhost eam eam
 
-set mkgpc1       = 0
+set mkgpc1       = 1
 set initdb       = 1
 set mkdummy      = 1
@@ -54,52 +54,11 @@
 endif
 
-## XXX no longer needed : setupScratchDb does not need a fake 'config' (or 'chunk')
-## # create a dummy config so setupScratchDb.py does not fail
-## if ($mkdummy) then
-##   ippjython queue.py -test edit <<EOF
-## dummy
-## none
-## IPP_PSPS
-## 0
-## none
-## none
-## 0
-## 0
-## 0
-## 0
-## 1
-## none
-## 0
-## 0
-## 1
-## 1
-## 2001-01-01 00:00:00.0
-## NONE
-## NONE
-## 1
-## 0
-## 0
-## 1
-## 0
-## EOF
-## endif
-
 # re-create the ipptopsps database
 if ($initscratch) then 
 
   # create the database (ignore failure if it already exists)
-  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch1"
-  # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch2"
-  # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch3"
-
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch1"
-  # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch2"
-  # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch3"
-
-  # setupScratchDb.py now takes the scratch name version, which is appended to the
-  # name in the settings.xml table
-  ippjython setupScratchDb.py -test 1
-  # ippjython setupScratchDb.py -test 2
-  # ippjython setupScratchDb.py -test 3
+  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch"
+  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch"
+  ippjython setupScratchDb.py -test
 endif
 
Index: /trunk/ippToPsps/test/sastest.sh
===================================================================
--- /trunk/ippToPsps/test/sastest.sh	(revision 35178)
+++ /trunk/ippToPsps/test/sastest.sh	(revision 35179)
@@ -19,13 +19,13 @@
 # mkgpc1.sh user localhost eam eam
 
-set mkgpc1      = 0
-set initdb      = 0
-set mkdummy     = 0
-set initscratch = 0
+set mkgpc1      = 1
+set initdb      = 1
+set mkdummy     = 1
+set initscratch = 1
 set initbatch   = 1
 set camqueue    = 1
 set cambatch    = 1
-set stackqueue  = 1
-set stackbatch  = 1
+set stackqueue  = 0
+set stackbatch  = 0
 
 set OUTDIR = "sas12"
@@ -46,50 +46,11 @@
 endif
 
-# create a dummy config so setupScratchDb.py does not fail
-if ($mkdummy) then
-  ippjython queue.py -test edit <<EOF
-dummy
-none
-IPP_PSPS
-0
-none
-none
-0
-0
-0
-0
-1
-none
-0
-0
-1
-1
-2001-01-01 00:00:00.0
-NONE
-NONE
-1
-0
-0
-1
-0
-1
-EOF
-endif
-
 # re-create the ipptopsps database
 if ($initscratch) then 
 
   # create the database (ignore failure if it already exists)
-  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch1"
-  # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch2"
-  # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch3"
-
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch1"
-  # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch2"
-  # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch3"
-
-  ippjython setupScratchDb.py -test dummy ipptopsps_scratch1
-  # ippjython setupScratchDb.py -test dummy ipptopsps_scratch2
-  # ippjython setupScratchDb.py -test dummy ipptopsps_scratch3
+  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch"
+  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch"
+  ippjython setupScratchDb.py -test
 endif
 
@@ -117,6 +78,6 @@
 3PI
 1
-0
-0
+1
+1
 1
 0