Index: trunk/ippToPsps/test/fulltest.sh =================================================================== --- trunk/ippToPsps/test/fulltest.sh (revision 38996) +++ trunk/ippToPsps/test/fulltest.sh (revision 39004) @@ -3,5 +3,5 @@ chmod +x mkgpc1data.dvo mkgpc1.sh -# a bit crude : get the datadir path by interpollation of the PATH element for psconfig +# a bit crude : get the datadir path by interpolation of the PATH element for psconfig foreach f ( `echo $PATH | tr : ' '` ) echo $f | grep $PSCONFDIR > /dev/null @@ -76,11 +76,11 @@ set cambatch = 0 breaksw; + case -stack + set stackqueue = 0 + set stackbatch = 0 + breaksw; case -object set objectqueue = 0 set objectbatch = 0 - breaksw; - case -stack - set stackqueue = 0 - set stackbatch = 0 breaksw; case -forcedwarp @@ -117,8 +117,8 @@ set camqueue = 1 set cambatch = 1 + set stackqueue = 1 + set stackbatch = 1 set objectqueue = 1 set objectbatch = 1 - set stackqueue = 1 - set stackbatch = 1 set forcequeue = 1 set forcebatch = 1 @@ -142,11 +142,11 @@ set cambatch = 1 breaksw; + case +stack + set stackqueue = 1 + set stackbatch = 1 + breaksw; case +object set objectqueue = 1 set objectbatch = 1 - breaksw; - case +stack - set stackqueue = 1 - set stackbatch = 1 breaksw; case +forcedwarp @@ -179,5 +179,4 @@ set forcedwarpqueuename = $queuename\_wrp set forcedobjqueuename = $queuename\_fwo - if ($mkgpc1) then @@ -233,5 +232,5 @@ echo "0 " >> initbatch.dat # max_dec echo "2 " >> initbatch.dat # box_size - echo "$OUTDIR " >> initbatch.dat # base_path + echo "$OUTDIR " >> initbatch.dat # base_path echo "0 " >> initbatch.dat # data_release echo "0 " >> initbatch.dat # delete_local @@ -272,26 +271,26 @@ echo " ---- queue P2 batches ----" - echo "$queuename " > cambatch.dat # skychunk name - echo "test_ds " >> cambatch.dat # datastore_product - echo "IPP_PSPS " >> cambatch.dat # datastore_type - echo "0 " >> cambatch.dat # datastore_publish - echo "catdir.cam " >> cambatch.dat # dvo_label + echo "$queuename " > cambatch.dat # skychunk name + echo "test_ds " >> cambatch.dat # datastore_product + echo "IPP_PSPS " >> cambatch.dat # datastore_type + echo "0 " >> cambatch.dat # datastore_publish + echo "catdir.cam " >> cambatch.dat # dvo_label echo "$OUTDIR/catdir.cam " >> cambatch.dat # dvo_location - echo "9 " >> cambatch.dat # min_ra - echo "11 " >> cambatch.dat # max_ra - echo "19 " >> cambatch.dat # min_dec - echo "21 " >> cambatch.dat # max_dec - echo "2 " >> cambatch.dat # box_size - echo "$OUTDIR " >> cambatch.dat # base_path - echo "0 " >> cambatch.dat # data_release - echo "0 " >> cambatch.dat # delete_local - echo "1 " >> cambatch.dat # delete_datastore - echo "1 " >> cambatch.dat # delete_dxlayer + echo "9 " >> cambatch.dat # min_ra + echo "11 " >> cambatch.dat # max_ra + echo "19 " >> cambatch.dat # min_dec + echo "21 " >> cambatch.dat # max_dec + echo "2 " >> cambatch.dat # box_size + echo "$OUTDIR " >> cambatch.dat # base_path + echo "0 " >> cambatch.dat # data_release + echo "0 " >> cambatch.dat # delete_local + echo "1 " >> cambatch.dat # delete_datastore + echo "1 " >> cambatch.dat # delete_dxlayer echo "2012-12-10 00:00:00.0 " >> cambatch.dat # epoch - echo "3PI " >> cambatch.dat # survey - echo "3PI " >> cambatch.dat # psps_survey - echo "1 " >> cambatch.dat # queue_P2 - echo "0 " >> cambatch.dat # queue_ST - echo "0 " >> cambatch.dat # queue_OB + echo "3PI " >> cambatch.dat # survey + echo "3PI " >> cambatch.dat # psps_survey + echo "1 " >> cambatch.dat # queue_P2 + echo "0 " >> cambatch.dat # queue_ST + echo "0 " >> cambatch.dat # queue_OB echo "0 " >> cambatch.dat # queue_DF echo "0 " >> cambatch.dat # queue_DO @@ -314,5 +313,5 @@ rm -rf $OUTDIR/P2 ippjython loader.py $options $queuename once -simtest < /dev/null - if ($status) exit + if ($status) exit 1 endif @@ -325,25 +324,25 @@ 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 "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 "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 "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 @@ -377,26 +376,26 @@ echo " ---- queue ST batches ----" - echo "$stackqueuename " > stackbatch.dat # skychunk name - echo "test_ds " >> stackbatch.dat # datastore_product - echo "IPP_PSPS " >> stackbatch.dat # datastore_type - echo "0 " >> stackbatch.dat # datastore_publish - echo "catdir.stk " >> stackbatch.dat # dvo_label + echo "$stackqueuename " > stackbatch.dat # skychunk name + echo "test_ds " >> stackbatch.dat # datastore_product + echo "IPP_PSPS " >> stackbatch.dat # datastore_type + echo "0 " >> stackbatch.dat # datastore_publish + echo "catdir.stk " >> stackbatch.dat # dvo_label echo "$OUTDIR/catdir.stk " >> stackbatch.dat # dvo_location - echo "9 " >> stackbatch.dat # min_ra - echo "11 " >> stackbatch.dat # max_ra - echo "19 " >> stackbatch.dat # min_dec - echo "21 " >> stackbatch.dat # max_dec - echo "2 " >> stackbatch.dat # box_size - echo "$OUTDIR " >> stackbatch.dat # base_path - echo "0 " >> stackbatch.dat # data_release - echo "0 " >> stackbatch.dat # delete_local - echo "1 " >> stackbatch.dat # delete_datastore - echo "1 " >> stackbatch.dat # delete_dxlayer + echo "9 " >> stackbatch.dat # min_ra + echo "11 " >> stackbatch.dat # max_ra + echo "19 " >> stackbatch.dat # min_dec + echo "21 " >> stackbatch.dat # max_dec + echo "2 " >> stackbatch.dat # box_size + echo "$OUTDIR " >> stackbatch.dat # base_path + echo "0 " >> stackbatch.dat # data_release + echo "0 " >> stackbatch.dat # delete_local + echo "1 " >> stackbatch.dat # delete_datastore + echo "1 " >> stackbatch.dat # delete_dxlayer echo "2012-12-10 00:00:00.0 " >> stackbatch.dat # epoch - echo "3PI " >> stackbatch.dat # survey - echo "3PI " >> stackbatch.dat # psps_survey - echo "0 " >> stackbatch.dat # queue_P2 - echo "1 " >> stackbatch.dat # queue_ST - echo "0 " >> stackbatch.dat # queue_OB + echo "3PI " >> stackbatch.dat # survey + echo "3PI " >> stackbatch.dat # psps_survey + echo "0 " >> stackbatch.dat # queue_P2 + echo "1 " >> stackbatch.dat # queue_ST + echo "0 " >> stackbatch.dat # queue_OB echo "0 " >> stackbatch.dat # queue_DF echo "0 " >> stackbatch.dat # queue_DO @@ -410,5 +409,5 @@ echo "2020-01-01 00:00:00.0 " >> stackbatch.dat # trange_end ippjython queue.py $options edit -simtest < stackbatch.dat - if ($status) exit + if ($status) exit 1 endif @@ -419,5 +418,5 @@ rm -rf $OUTDIR/ST ippjython loader.py $options $stackqueuename once -simtest < /dev/null - if ($status) exit + if ($status) exit 1 endif @@ -430,25 +429,25 @@ echo "$forcedwarpqueuename " > forcebatch.dat # skychunk name - echo "test_ds " >> forcebatch.dat # datastore_product - echo "IPP_PSPS " >> forcebatch.dat # datastore_type - echo "0 " >> forcebatch.dat # datastore_publish - echo "catdir.wrp " >> forcebatch.dat # dvo_label + echo "test_ds " >> forcebatch.dat # datastore_product + echo "IPP_PSPS " >> forcebatch.dat # datastore_type + echo "0 " >> forcebatch.dat # datastore_publish + echo "catdir.wrp " >> forcebatch.dat # dvo_label echo "$OUTDIR/catdir.wrp " >> forcebatch.dat # dvo_location - echo "9 " >> forcebatch.dat # min_ra - echo "11 " >> forcebatch.dat # max_ra - echo "19 " >> forcebatch.dat # min_dec - echo "21 " >> forcebatch.dat # max_dec - echo "2 " >> forcebatch.dat # box_size - echo "$OUTDIR " >> forcebatch.dat # base_path - echo "0 " >> forcebatch.dat # data_release - echo "0 " >> forcebatch.dat # delete_local - echo "1 " >> forcebatch.dat # delete_datastore - echo "1 " >> forcebatch.dat # delete_dxlayer + echo "9 " >> forcebatch.dat # min_ra + echo "11 " >> forcebatch.dat # max_ra + echo "19 " >> forcebatch.dat # min_dec + echo "21 " >> forcebatch.dat # max_dec + echo "2 " >> forcebatch.dat # box_size + echo "$OUTDIR " >> forcebatch.dat # base_path + echo "0 " >> forcebatch.dat # data_release + echo "0 " >> forcebatch.dat # delete_local + echo "1 " >> forcebatch.dat # delete_datastore + echo "1 " >> forcebatch.dat # delete_dxlayer echo "2012-12-10 00:00:00.0 " >> forcebatch.dat # epoch - echo "3PI " >> forcebatch.dat # survey - echo "3PI " >> forcebatch.dat # psps_survey - echo "0 " >> forcebatch.dat # queue_P2 - echo "0 " >> forcebatch.dat # queue_ST - echo "0 " >> forcebatch.dat # queue_OB + echo "3PI " >> forcebatch.dat # survey + echo "3PI " >> forcebatch.dat # psps_survey + echo "0 " >> forcebatch.dat # queue_P2 + echo "0 " >> forcebatch.dat # queue_ST + echo "0 " >> forcebatch.dat # queue_OB echo "0 " >> forcebatch.dat # queue_DF echo "0 " >> forcebatch.dat # queue_DO @@ -482,25 +481,25 @@ 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 "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 "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 "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