Index: /trunk/ippToPsps/test/sastest.sh
===================================================================
--- /trunk/ippToPsps/test/sastest.sh	(revision 39035)
+++ /trunk/ippToPsps/test/sastest.sh	(revision 39036)
@@ -31,4 +31,8 @@
 set forcedobjqueue = 1
 set forcedobjbatch = 1
+set diffqueue      = 1
+set diffbatch      = 1
+set diffobjqueue   = 1
+set diffobjbatch   = 1
 
 set options = "-test"
@@ -44,5 +48,5 @@
     echo " -XX : turn off features"
     echo " +XX : turn on features"
-    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, stack, forcedwarp, object, forcedobject"
+    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, stack, forcedwarp, object, forcedobject, diff, diffobj"
     exit 2
   case -all
@@ -61,4 +65,8 @@
     set forcedobjqueue = 0
     set forcedobjbatch = 0
+    set diffqueue = 0
+    set diffbatch = 0
+    set diffobjqueue = 0
+    set diffobjbatch = 0
     breaksw;
   case -mkgpc1
@@ -93,4 +101,12 @@
     set forcedobjqueue = 0
     set forcedobjbatch = 0
+    breaksw;
+  case -diff
+    set diffqueue = 0
+    set diffbatch = 0
+    breaksw;
+  case -diffobj
+    set diffobjqueue = 0
+    set diffobjbatch = 0
     breaksw;
   case -debug
@@ -128,4 +144,8 @@
     set forcedobjqueue = 1
     set forcedobjbatch = 1
+    set diffqueue = 1
+    set diffbatch = 1
+    set diffobjqueue = 1
+    set diffobjbatch = 1
     breaksw;
   case +mkgpc1
@@ -160,4 +180,12 @@
     set forcedobjqueue = 1
     set forcedobjbatch = 1
+    breaksw;
+  case +diff
+    set diffqueue = 1
+    set diffbatch = 1
+    breaksw;
+  case +diffobj
+    set diffobjqueue = 1
+    set diffobjbatch = 1
     breaksw;
   default:
@@ -172,5 +200,5 @@
     echo " -XX : turn off features"
     echo " +XX : turn on features"
-    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, object, stack, forcedwarp, forcedobject"
+    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, object, stack, forcedwarp, forcedobject, diff, diffobj"
     echo "  (NOTE: you need to explicitly turn on mkgpc1 if you want to re-build the dvo)"
     exit 2
@@ -183,4 +211,6 @@
 set forcedwarpqueuename = $queuename\_wrp
 set forcedobjqueuename = $queuename\_fwo
+set diffqueuename = $queuename\_dif
+set diffobjqueuename = $queuename\_dio
 
 if ($mkgpc1) then
@@ -223,5 +253,5 @@
 if ($initbatch) then
   echo ""
-  echo " ---- make skychunk for IN batches ----"
+  echo " ---- queue IN batch ----"
 
   echo "initbatch              " >  initbatch.dat # skychunk name
@@ -522,7 +552,7 @@
 if ($forcedobjbatch) then
   echo ""
-  echo " ---- load LO batches ----"
-
-  rm -rf $OUTDIR/LO
+  echo " ---- load FO batches ----"
+
+  rm -rf $OUTDIR/FO
 
   ippjython loader.py $options $forcedobjqueuename once -simtest < /dev/null
@@ -530,2 +560,106 @@
 endif
 
+############################ DF batches ################################
+
+# this code is sensitive to a previously existing database?
+if ($diffqueue) then
+  echo ""
+  echo " ---- queue DF batches ----"
+
+  echo "$diffqueuename          " >  diffbatch.dat # skychunk name
+  echo "test_ds                 " >> diffbatch.dat # datastore_product
+  echo "IPP_PSPS                " >> diffbatch.dat # datastore_type
+  echo "0                       " >> diffbatch.dat # datastore_publish
+  echo "catdir.sas.diff         " >> diffbatch.dat # dvo_label
+  echo "$OUTDIR/catdir.sas.diff " >> diffbatch.dat # dvo_location
+  echo "332.0                   " >> diffbatch.dat # min_ra
+  echo "334.5                   " >> diffbatch.dat # max_ra
+  echo "-1                      " >> diffbatch.dat # min_dec
+  echo "+1                      " >> diffbatch.dat # max_dec
+  echo "2                       " >> diffbatch.dat # box_size
+  echo "$OUTDIR                 " >> diffbatch.dat # base_path
+  echo "0                       " >> diffbatch.dat # data_release
+  echo "0                       " >> diffbatch.dat # delete_local
+  echo "1                       " >> diffbatch.dat # delete_datastore
+  echo "1                       " >> diffbatch.dat # delete_dxlayer
+  echo "2012-12-10 00:00:00.0   " >> diffbatch.dat # epoch
+  echo "3PI                     " >> diffbatch.dat # survey
+  echo "3PI                     " >> diffbatch.dat # psps_survey
+  echo "0                       " >> diffbatch.dat # queue_P2
+  echo "0                       " >> diffbatch.dat # queue_ST
+  echo "0                       " >> diffbatch.dat # queue_OB
+  echo "1                       " >> diffbatch.dat # queue_DF
+  echo "0                       " >> diffbatch.dat # queue_DO
+  echo "0                       " >> diffbatch.dat # queue_FW
+  echo "0                       " >> diffbatch.dat # queue_FO
+  echo "1                       " >> diffbatch.dat # active
+  echo "0                       " >> diffbatch.dat # parallel
+  echo "use_new                 " >> diffbatch.dat # P2_smf_version
+  echo "any                     " >> diffbatch.dat # ST_cmf_version
+  echo "2000-01-01 00:00:00.0   " >> diffbatch.dat # trange_start
+  echo "2020-01-01 00:00:00.0   " >> diffbatch.dat # trange_end
+  ippjython queue.py $options edit -simtest < diffbatch.dat
+  if ($status) exit 1
+endif
+
+if ($diffbatch) then
+  echo ""
+  echo " ---- load DF batches ----"
+
+  rm -rf $OUTDIR/FW
+  ippjython loader.py $options $diffqueuename once -simtest < /dev/null
+  if ($status) exit
+endif
+
+############################ DO batches ################################
+
+# this code is sensitive to a previously existing database?
+if ($diffobjqueue) then
+  echo ""
+  echo " ---- queue do batches ----"
+
+  echo "$diffobjqueuename       " >  diffobjbatch.dat # skychunk name
+  echo "test_ds                 " >> diffobjbatch.dat # datastore_product
+  echo "IPP_PSPS                " >> diffobjbatch.dat # datastore_type
+  echo "0                       " >> diffobjbatch.dat # datastore_publish
+  echo "catdir.sas.diff         " >> diffobjbatch.dat # dvo_label
+  echo "$OUTDIR/catdir.sas.diff " >> diffobjbatch.dat # dvo_location
+  echo "332.0                   " >> diffobjbatch.dat # min_ra
+  echo "334.5                   " >> diffobjbatch.dat # max_ra
+  echo "-1                      " >> diffobjbatch.dat # min_dec
+  echo "+1                      " >> diffobjbatch.dat # max_dec
+  echo "2                       " >> diffobjbatch.dat # box_size
+  echo "$OUTDIR                 " >> diffobjbatch.dat # base_path
+  echo "0                       " >> diffobjbatch.dat # data_release
+  echo "0                       " >> diffobjbatch.dat # delete_local
+  echo "1                       " >> diffobjbatch.dat # delete_datastore
+  echo "1                       " >> diffobjbatch.dat # delete_dxlayer
+  echo "2012-12-10 00:00:00.0   " >> diffobjbatch.dat # epoch
+  echo "3PI                     " >> diffobjbatch.dat # survey
+  echo "3PI                     " >> diffobjbatch.dat # psps_survey
+  echo "0                       " >> diffobjbatch.dat # queue_P2
+  echo "0                       " >> diffobjbatch.dat # queue_ST
+  echo "0                       " >> diffobjbatch.dat # queue_OB
+  echo "0                       " >> diffobjbatch.dat # queue_DF
+  echo "1                       " >> diffobjbatch.dat # queue_DO
+  echo "0                       " >> diffobjbatch.dat # queue_FW
+  echo "0                       " >> diffobjbatch.dat # queue_FO
+  echo "1                       " >> diffobjbatch.dat # active
+  echo "0                       " >> diffobjbatch.dat # parallel
+  echo "use_new                 " >> diffobjbatch.dat # P2_smf_version
+  echo "any                     " >> diffobjbatch.dat # ST_cmf_version
+  echo "2000-01-01 00:00:00.0   " >> diffobjbatch.dat # trange_start
+  echo "2020-01-01 00:00:00.0   " >> diffobjbatch.dat # trange_end
+  ippjython queue.py $options edit once -simtest < diffobjbatch.dat
+  if ($status) exit
+endif
+
+if ($diffobjbatch) then
+  echo ""
+  echo " ---- load DO batches ----"
+
+  rm -rf $OUTDIR/DO
+
+  ippjython loader.py $options $diffobjqueuename once -simtest < /dev/null
+  if ($status) exit
+endif