Changeset 38996

Timestamp:

Oct 28, 2015, 8:30:47 PM (11 years ago)

Author:

eugene

Message:

add -stilts option to test; fix RA,DEC (global not local)

Location:

trunk/ippToPsps/test

Files:

• fulltest.sh (modified) (15 diffs)
• mkgpc1data.dvo (modified) (3 diffs)

trunk/ippToPsps/test/fulltest.sh

@@ -30 +30 @@
 set forcedobjbatch = 1
 
-set debug = ""
+set options = "-test"
 
 set targ = ($argv)
@@ -93 +93 @@
     breaksw;
   case -debug
-    set debug = "-debug"
+    set options = "$options -debug"
+    breaksw;
+  case -stilts
+    set options = "$options -stilts"
     breaksw;
   default:
@@ -208 +211 @@
   mysql -h localhost -u dvo -pdvo -e "drop database if exists ipptopsps_test_scratch"
   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch"
-  ippjython setupScratchDb.py -test < /dev/null
+  ippjython setupScratchDb.py $options < /dev/null
   if ($status) exit 1
 endif
@@ -251 +254 @@
   echo "2000-01-01 00:00:00.0  " >> initbatch.dat # trange_start
   echo "2020-01-01 00:00:00.0  " >> initbatch.dat # trange_end
-  ippjython queue.py $debug -test edit < initbatch.dat
+  ippjython queue.py $options edit < initbatch.dat
   if ($status) exit 1
 
@@ -258 +261 @@
 
   rm -rf $OUTDIR/IN
-  ippjython loader.py $debug -test initbatch init -simtest < /dev/null
+  ippjython loader.py $options initbatch init -simtest < /dev/null
   if ($status) exit 1
 endif
@@ -301 +304 @@
   echo "2000-01-01 00:00:00.0 " >> cambatch.dat # trange_start
   echo "2020-01-01 00:00:00.0 " >> cambatch.dat # trange_end
-  ippjython queue.py $debug -test edit -simtest < cambatch.dat
+  ippjython queue.py $options edit -simtest < cambatch.dat
   if ($status) exit 1
 endif
@@ -310 +313 @@
 
   rm -rf $OUTDIR/P2
-  ippjython loader.py $debug -test $queuename once -simtest < /dev/null
+  ippjython loader.py $options $queuename once -simtest < /dev/null
   if ($status) exit
 endif
@@ -353 +356 @@
   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 $debug -test edit once -simtest < objectbatch.dat
+  ippjython queue.py $options edit once -simtest < objectbatch.dat
   if ($status) exit
 endif
@@ -363 +366 @@
   rm -rf $OUTDIR/OB
 
-  ippjython loader.py $debug -test $objectqueuename once -simtest < /dev/null
+  ippjython loader.py $options $objectqueuename once -simtest < /dev/null
   if ($status) exit
 endif
@@ -406 +409 @@
   echo "2000-01-01 00:00:00.0 " >> stackbatch.dat # trange_start
   echo "2020-01-01 00:00:00.0 " >> stackbatch.dat # trange_end
-  ippjython queue.py $debug -test edit -simtest < stackbatch.dat
+  ippjython queue.py $options edit -simtest < stackbatch.dat
   if ($status) exit
 endif
@@ -415 +418 @@
 
   rm -rf $OUTDIR/ST
-  ippjython loader.py $debug -test $stackqueuename once -simtest < /dev/null
+  ippjython loader.py $options $stackqueuename once -simtest < /dev/null
   if ($status) exit
 endif
@@ -458 +461 @@
   echo "2000-01-01 00:00:00.0 " >> forcebatch.dat # trange_start
   echo "2020-01-01 00:00:00.0 " >> forcebatch.dat # trange_end
-  ippjython queue.py $debug -test edit -simtest < forcebatch.dat
+  ippjython queue.py $options edit -simtest < forcebatch.dat
   if ($status) exit 1
 endif
@@ -467 +470 @@
 
   rm -rf $OUTDIR/FW
-  ippjython loader.py $debug -test $forcedwarpqueuename once -simtest < /dev/null
+  ippjython loader.py $options $forcedwarpqueuename once -simtest < /dev/null
   if ($status) exit
 endif
@@ -510 +513 @@
   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 $debug -test edit once -simtest < forcedobjectbatch.dat
+  ippjython queue.py $options edit once -simtest < forcedobjectbatch.dat
   if ($status) exit
 endif
@@ -520 +523 @@
   rm -rf $OUTDIR/LO
 
-  ippjython loader.py $debug -test $forcedobjqueuename once -simtest < /dev/null
-  if ($status) exit
-endif
-
+  ippjython loader.py $options $forcedobjqueuename once -simtest < /dev/null
+  if ($status) exit
+endif
+

trunk/ippToPsps/test/mkgpc1data.dvo

@@ -96 +96 @@
   mkdir $OUTDIR
 
-  local i catdir RA DEC ID stkID rawfile cmffile offset
+  local i catdir ID stkID rawfile cmffile offset
   $catdir = $OUTDIR/catdir.cam
   exec rm -rf $catdir
@@ -232 +232 @@
   mkdir $OUTDIR
 
-  local i catdir RA DEC stkID skyID rawfile cmffile offset
+  local i catdir stkID skyID rawfile cmffile offset
   $catdir = $OUTDIR/catdir.stk
   exec rm -rf $catdir
@@ -297 +297 @@
   mkdir $OUTDIR
 
-  local i catdir RA DEC ID stkID rawfile cmffile offset
+  local i catdir ID stkID rawfile cmffile offset
   $catdir = $OUTDIR/catdir.wrp
   exec rm -rf $catdir