Index: /trunk/ippToPsps/test/fulltest.sh
===================================================================
--- /trunk/ippToPsps/test/fulltest.sh	(revision 38903)
+++ /trunk/ippToPsps/test/fulltest.sh	(revision 38904)
@@ -27,4 +27,6 @@
 set objectqueue  = 1
 set objectbatch  = 1
+set forcedobjqueue = 1
+set forcedobjbatch = 1
 
 set targ = ($argv)
@@ -49,8 +51,10 @@
     set stackqueue   = 0
     set stackbatch   = 0
-    set forcequeue     = 0
-    set forcebatch     = 0
+    set forcequeue   = 0
+    set forcebatch   = 0
     set objectqueue  = 0
     set objectbatch  = 0
+    set forcedobjqueue = 0
+    set forcedobjbatch = 0
     breaksw;
   case -mkgpc1
@@ -70,4 +74,8 @@
     set cambatch = 0
     breaksw;
+  case -object
+    set objectqueue = 0
+    set objectbatch = 0
+    breaksw;
   case -stack
     set stackqueue = 0
@@ -78,7 +86,7 @@
     set forcebatch = 0
     breaksw;
-  case -object
-    set objectqueue = 0
-    set objectbatch = 0
+  case -forcedobject
+    set forcedobjqueue = 0
+    set forcedobjbatch = 0
     breaksw;
   default:
@@ -101,10 +109,12 @@
     set camqueue     = 1
     set cambatch     = 1
+    set objectqueue  = 1
+    set objectbatch  = 1
     set stackqueue   = 1
     set stackbatch   = 1
     set forcequeue   = 1
     set forcebatch   = 1
-    set objectqueue  = 1
-    set objectbatch  = 1
+    set forcedobjqueue = 1
+    set forcedobjbatch = 1
     breaksw;
   case +mkgpc1
@@ -124,4 +134,8 @@
     set cambatch = 1
     breaksw;
+  case +object
+    set objectqueue = 1
+    set objectbatch = 1
+    breaksw;
   case +stack
     set stackqueue = 1
@@ -132,7 +146,7 @@
     set forcebatch = 1
     breaksw;
-  case +object
-    set objectqueue = 1
-    set objectbatch = 1
+  case +forcedobject
+    set forcedobjqueue = 1
+    set forcedobjbatch = 1
     breaksw;
   default:
@@ -147,5 +161,5 @@
     echo " -XX : turn off features"
     echo " +XX : turn on features"
-    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, stack, forcedwarp, object"
+    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, object, stack, forcedwarp, forcedobject"
     exit 2
 endif
@@ -156,4 +170,5 @@
 set objectqueuename = $queuename\_obj
 set forcedwarpqueuename = $queuename\_wrp
+set forcedobjqueuename = $queuename\_fwo
 
 
@@ -242,4 +257,6 @@
 endif
 
+############################ P2 batches ################################
+
 # this code is sensitive to a previously existing database?
 if ($camqueue) then
@@ -292,4 +309,59 @@
 endif
 
+############################ OB batches ################################
+
+# this code is sensitive to a previously existing database?
+if ($objectqueue) then
+  echo ""
+  echo " ---- queue OB batches ----"
+
+  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.cam	      " >> objectbatch.dat # dvo_label
+  echo "$OUTDIR/catdir.cam    " >> objectbatch.dat # dvo_location
+  echo "9		      " >> objectbatch.dat # min_ra
+  echo "11		      " >> objectbatch.dat # max_ra
+  echo "19		      " >> objectbatch.dat # min_dec
+  echo "21		      " >> 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
+  ippjython queue.py -test edit once -simtest < objectbatch.dat
+  if ($status) exit
+endif
+
+if ($objectbatch) then
+  echo ""
+  echo " ---- load OB batches ----"
+
+  rm -rf $OUTDIR/OB
+
+  ippjython loader.py -test $objectqueuename once -simtest < /dev/null
+  if ($status) exit
+endif
+
+############################ ST batches ################################
+
 # this code is sensitive to a previously existing database?
 if ($stackqueue) then
@@ -341,4 +413,6 @@
   if ($status) exit
 endif
+
+############################ FW batches ################################
 
 # this code is sensitive to a previously existing database?
@@ -392,53 +466,55 @@
 endif
 
+############################ FO batches ################################
+
 # this code is sensitive to a previously existing database?
-if ($objectqueue) then
-  echo ""
-  echo " ---- queue OB batches ----"
-
-  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.cam	      " >> objectbatch.dat # dvo_label
-  echo "$OUTDIR/catdir.cam    " >> objectbatch.dat # dvo_location
-  echo "9		      " >> objectbatch.dat # min_ra
-  echo "11		      " >> objectbatch.dat # max_ra
-  echo "19		      " >> objectbatch.dat # min_dec
-  echo "21		      " >> 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
-  ippjython queue.py -test edit once -simtest < objectbatch.dat
-  if ($status) exit
-endif
-
-if ($objectbatch) then
-  echo ""
-  echo " ---- load OB batches ----"
-
-  rm -rf $OUTDIR/OB
-
-  ippjython loader.py -test $objectqueuename once -simtest < /dev/null
-  if ($status) exit
-endif
-
+if ($forcedobjqueue) then
+  echo ""
+  echo " ---- queue FO batches ----"
+
+  echo "$forcedobjqueuename   " >  forcedobjectbatch.dat # skychunk name
+  echo "test_ds		      " >> forcedobjectbatch.dat # datastore_product
+  echo "IPP_PSPS	      " >> forcedobjectbatch.dat # datastore_type
+  echo "0		      " >> forcedobjectbatch.dat # datastore_publish
+  echo "catdir.wrp	      " >> forcedobjectbatch.dat # dvo_label
+  echo "$OUTDIR/catdir.wrp    " >> forcedobjectbatch.dat # dvo_location
+  echo "9		      " >> forcedobjectbatch.dat # min_ra
+  echo "11		      " >> forcedobjectbatch.dat # max_ra
+  echo "19		      " >> forcedobjectbatch.dat # min_dec
+  echo "21		      " >> forcedobjectbatch.dat # max_dec
+  echo "2		      " >> forcedobjectbatch.dat # box_size
+  echo "$OUTDIR		      " >> forcedobjectbatch.dat # base_path
+  echo "0		      " >> forcedobjectbatch.dat # data_release
+  echo "0		      " >> forcedobjectbatch.dat # delete_local
+  echo "1		      " >> forcedobjectbatch.dat # delete_datastore
+  echo "1		      " >> forcedobjectbatch.dat # delete_dxlayer
+  echo "2012-12-10 00:00:00.0 " >> forcedobjectbatch.dat # epoch
+  echo "3PI		      " >> forcedobjectbatch.dat # survey
+  echo "3PI		      " >> forcedobjectbatch.dat # psps_survey
+  echo "0		      " >> forcedobjectbatch.dat # queue_P2
+  echo "0		      " >> forcedobjectbatch.dat # queue_ST
+  echo "0		      " >> forcedobjectbatch.dat # queue_OB
+  echo "0                     " >> forcedobjectbatch.dat # queue_DF
+  echo "0                     " >> forcedobjectbatch.dat # queue_DO
+  echo "0                     " >> forcedobjectbatch.dat # queue_FW
+  echo "1                     " >> forcedobjectbatch.dat # queue_FO
+  echo "1                     " >> forcedobjectbatch.dat # active
+  echo "0                     " >> forcedobjectbatch.dat # parallel
+  echo "use_new               " >> forcedobjectbatch.dat # P2_smf_version
+  echo "any                   " >> forcedobjectbatch.dat # ST_cmf_version
+  echo "2000-01-01 00:00:00.0 " >> forcedobjectbatch.dat # trange_start
+  echo "2020-01-01 00:00:00.0 " >> forcedobjectbatch.dat # trange_end
+  ippjython queue.py -test edit once -simtest < forcedobjectbatch.dat
+  if ($status) exit
+endif
+
+if ($forcedobjbatch) then
+  echo ""
+  echo " ---- load LO batches ----"
+
+  rm -rf $OUTDIR/LO
+
+  ippjython loader.py -test $forcedobjqueuename once -simtest < /dev/null
+  if ($status) exit
+endif
+