Index: /branches/eam_branches/ipp-20140717/ippToPsps/test/mkgpc1.sh
===================================================================
--- /branches/eam_branches/ipp-20140717/ippToPsps/test/mkgpc1.sh	(revision 37206)
+++ /branches/eam_branches/ipp-20140717/ippToPsps/test/mkgpc1.sh	(revision 37207)
@@ -158,5 +158,5 @@
   echo ntable: $ntable
   if ($ntable != 21) then
-    echo "expected 21 lines (19 tables), but got $ntable, not deleting"
+    echo "expected 21 lines (20 tables), but got $ntable, not deleting"
     exit 2
   endif
Index: /branches/eam_branches/ipp-20140717/ippToPsps/test/mksasdata.dvo
===================================================================
--- /branches/eam_branches/ipp-20140717/ippToPsps/test/mksasdata.dvo	(revision 37206)
+++ /branches/eam_branches/ipp-20140717/ippToPsps/test/mksasdata.dvo	(revision 37207)
@@ -10,6 +10,6 @@
 macro mkfull
   init.db
-  # mkcatdir.cam
-  mkcatdir.stk
+  mkcatdir.cam
+  # mkcatdir.stk
 end
 
@@ -50,28 +50,43 @@
   exec rm -rf $catdir
 
-  $expfile = sasdata/o5745g0620o.356996.cm.473458
-  exec addstar -D CAMERA gpc1 -D CATDIR $catdir -D CATFORMAT PS1_V5 $expfile.smf
+  list expfiles
+    sasdata/o5745g0495o.356867.cm.982612
+    sasdata/o5745g0507o.356882.cm.982626
+    sasdata/o5745g0517o.356892.cm.982636
+    sasdata/o5745g0527o.356909.cm.982650
+  end
 
-  # are these used to find the exposures in any way?
-  $RA = 333.5
-  $DEC = -5.0
+  for i 0 $expfiles:n
+    $expfile = $expfiles:$i
+    exec addstar -D CAMERA gpc1 -D CATDIR $catdir -D CATFORMAT PS1_V5 $expfile.smf
 
-  # a single exposure
-  $expID = 1
-  dbinsert rawExp (exp_id, exp_name, exp_time, bg, bg_stdev, ra, decl) values ($expID, "o5745g0620o", 10.0, 100.0, 2.0, {$RA*3.1415/180.0}, {$DEC*3.1415/180.0})
-  dbinsert chipRun (exp_id, chip_id) values ($expID, $expID)
-  dbinsert camRun (chip_id, cam_id, dist_group, software_ver) values ($expID, $expID, "testgroup", "38000M")
-  dbinsert camProcessedExp (cam_id, path_base) values ($expID, "$expfile")
-  dbinsert fakeRun (fake_id, cam_id) values ($expID, $expID)
-  dbinsert warpRun (warp_id, fake_id) values ($expID, $expID)
-  dbinsert warpSkyCellMap (warp_id, skycell_id, class_id) values ($expID, "skycell.0000.000", "XY00")
-  dbinsert addRun (stage, state, stage_id, minidvodb_name) values ("cam", "full", $expID, "$catdirbase")
+    # are these used to find the exposures in any way?
+    $RA = 333.9
+    $DEC = -3.8
 
-  # catdirs for the exposures
-  dbinsert minidvodbRun (minidvodb_name, minidvodb_id, state) values ("$catdirbase", 1, "merged")
-  dbinsert minidvodbProcessed (minidvodb_id, fault) values (1, 0)
-  
-  dbinsert mergedvodbRun (minidvodb_id, merge_id, state, mergedvodb) values (1, 1, "full", "$catdirbase")
-  dbinsert mergedvodbProcessed (merge_id, fault) values (1, 0)
+    # a single exposure
+    $expID = $i + 1
+    substr $expfile 8 11 expname
+
+    dbinsert rawExp (exp_id, exp_name, exp_time, bg, bg_stdev, ra, decl, dateobs) values ($expID, "$expname", 10.0, 100.0, 2.0, {$RA*3.1415/180.0}, {$DEC*3.1415/180.0}, "2010/01/01 00:00:00")
+    dbinsert chipRun (exp_id, chip_id) values ($expID, $expID)
+    dbinsert camRun (chip_id, cam_id, dist_group, software_ver) values ($expID, $expID, "testgroup", "38000M")
+    dbinsert camProcessedExp (cam_id, path_base, fault) values ($expID, "$expfile", 0)
+    dbinsert fakeRun (fake_id, cam_id) values ($expID, $expID)
+    dbinsert warpRun (warp_id, fake_id) values ($expID, $expID)
+    dbinsert warpSkyCellMap (warp_id, skycell_id, class_id) values ($expID, "skycell.0000.000", "XY00")
+    dbinsert addRun (add_id, stage, state, stage_id, minidvodb_name) values ($expID, "cam", "full", $expID, "$catdirbase")
+    dbinsert addProcessedExp (add_id, fault) values ($expID, 0)
+    
+    # catdirs for the exposures
+    dbinsert minidvodbRun (minidvodb_name, minidvodb_id, state) values ("$catdirbase", 1, "merged")
+    dbinsert minidvodbProcessed (minidvodb_id, fault) values (1, 0)
+    
+    dbinsert mergedvodbRun (minidvodb_id, merge_id, state, mergedvodb) values (1, 1, "full", "$catdirbase")
+    dbinsert mergedvodbProcessed (merge_id, fault) values (1, 0)
+  end
+
+  echo relphot -D CATDIR $catdir -region 330 340 -10 0 -images g,r,i,z,y -update
+  exec relphot -D CATDIR $catdir -region 330 340 -10 0 -images g,r,i,z,y -update
 end
 
Index: /branches/eam_branches/ipp-20140717/ippToPsps/test/sastest.sh
===================================================================
--- /branches/eam_branches/ipp-20140717/ippToPsps/test/sastest.sh	(revision 37206)
+++ /branches/eam_branches/ipp-20140717/ippToPsps/test/sastest.sh	(revision 37207)
@@ -234,6 +234,6 @@
   echo "330		      " >> cambatch.dat # min_ra
   echo "340		      " >> cambatch.dat # max_ra
-  echo "-8		      " >> cambatch.dat # min_dec
-  echo "2		      " >> cambatch.dat # max_dec
+  echo "-10		      " >> cambatch.dat # min_dec
+  echo "0		      " >> cambatch.dat # max_dec
   echo "1		      " >> cambatch.dat # box_size
   echo "$OUTDIR		      " >> cambatch.dat # base_path
@@ -259,4 +259,13 @@
   echo "2020-01-01 00:00:00.0 " >> cambatch.dat # trange_end
   cat cambatch.dat | ippjython queue.py -test edit
+  if ($status) exit
+endif
+
+if ($cambatch) then
+  echo ""
+  echo " ---- load P2 batches ----"
+
+  rm -rf $OUTDIR/P2
+  ippjython loader.py -test $queuename once < /dev/null
   if ($status) exit
 endif
@@ -317,2 +326,60 @@
   if ($status) exit
 endif
+
+# this code is sensitive to a previously existing database?
+if ($objectqueue) then
+  echo ""
+  echo " ---- queue OB batches ----"
+
+  if ($objectqueuename == 0) then
+    set objectqueuename = $queuename\_obj
+  endif
+  echo "$objectqueuename       " >  objectbatch.dat # skychunk name
+  echo "test_ds		       " >> objectbatch.dat # datastore_product
+  echo "IPP_PSPS	       " >> objectbatch.dat # datastore_type
+  echo "0		       " >> objectbatch.dat # datastore_publish
+  echo "catdir.sas.cam	       " >> objectbatch.dat # dvo_label
+  echo "$OUTDIR/catdir.sas.cam " >> objectbatch.dat # dvo_location
+  echo "330		       " >> objectbatch.dat # min_ra
+  echo "340		       " >> objectbatch.dat # max_ra
+  echo "-10		       " >> objectbatch.dat # min_dec
+  echo "0		       " >> objectbatch.dat # max_dec
+  echo "2		       " >> objectbatch.dat # box_size
+  echo "$OUTDIR		       " >> objectbatch.dat # base_path
+  echo "0		       " >> objectbatch.dat # data_release
+  echo "0		       " >> objectbatch.dat # delete_local
+  echo "1		       " >> objectbatch.dat # delete_datastore
+  echo "1		       " >> objectbatch.dat # delete_dxlayer
+  echo "2012-12-10 00:00:00.0  " >> objectbatch.dat # epoch
+  echo "3PI		       " >> objectbatch.dat # survey
+  echo "3PI		       " >> objectbatch.dat # psps_survey
+  echo "0		       " >> objectbatch.dat # queue_P2
+  echo "0		       " >> objectbatch.dat # queue_ST
+  echo "1		       " >> objectbatch.dat # queue_OB
+  echo "0                      " >> objectbatch.dat # queue_DF
+  echo "0                      " >> objectbatch.dat # queue_DO
+  echo "0                      " >> objectbatch.dat # queue_FW
+  echo "0                      " >> objectbatch.dat # queue_FO
+  echo "1                      " >> objectbatch.dat # active
+  echo "0                      " >> objectbatch.dat # parallel
+  echo "use_new                " >> objectbatch.dat # P2_smf_version
+  echo "any                    " >> objectbatch.dat # ST_cmf_version
+  echo "2000-01-01 00:00:00.0  " >> objectbatch.dat # trange_start
+  echo "2020-01-01 00:00:00.0  " >> objectbatch.dat # trange_end
+  cat objectbatch.dat | ippjython queue.py -test edit once
+  if ($status) exit
+endif
+
+if ($objectbatch) then
+  echo ""
+  echo " ---- load OB batches ----"
+
+  if ($objectqueuename == 0) then
+    set objectqueuename = $queuename\_obj
+  endif
+  rm -rf $OUTDIR/OB
+
+  ippjython loader.py -test $objectqueuename once < /dev/null
+  if ($status) exit
+endif
+