Changeset 40224 for trunk

Timestamp:

Nov 28, 2017, 8:02:06 PM (9 years ago)

Author:

eugene

Message:

updates to be consistent with current state of code

Location:

trunk/ippToPsps/test

Files:

• fulltest.sh (modified) (8 diffs)
• mkgpc1data.dvo (modified) (2 diffs)
• notes.txt (modified) (1 diff)

trunk/ippToPsps/test/fulltest.sh

@@ -283 +283 @@
   echo "0                      " >> initbatch.dat # queue_FW
   echo "0                      " >> initbatch.dat # queue_FO
+  echo "0                      " >> initbatch.dat # queue_FG
+  echo "0                      " >> initbatch.dat # queue_GO
   echo "1                      " >> initbatch.dat # active
   echo "0                      " >> initbatch.dat # parallel
@@ -334 +336 @@
   echo "0                     " >> cambatch.dat # queue_FW
   echo "0                     " >> cambatch.dat # queue_FO
+  echo "0                     " >> cambatch.dat # queue_FG
+  echo "0                     " >> cambatch.dat # queue_GO
   echo "1                     " >> cambatch.dat # active
   echo "0                     " >> cambatch.dat # parallel
@@ -387 +391 @@
   echo "0                     " >> objectbatch.dat # queue_FW
   echo "0                     " >> objectbatch.dat # queue_FO
+  echo "0                     " >> objectbatch.dat # queue_FG
+  echo "0                     " >> objectbatch.dat # queue_GO
   echo "1                     " >> objectbatch.dat # active
   echo "0                     " >> objectbatch.dat # parallel
@@ -440 +446 @@
   echo "0                     " >> stackbatch.dat # queue_FW
   echo "0                     " >> stackbatch.dat # queue_FO
+  echo "0                     " >> stackbatch.dat # queue_FG
+  echo "0                     " >> stackbatch.dat # queue_GO
   echo "1                     " >> stackbatch.dat # active
   echo "0                     " >> stackbatch.dat # parallel
@@ -493 +501 @@
   echo "1                     " >> forcebatch.dat # queue_FW
   echo "0                     " >> forcebatch.dat # queue_FO
+  echo "0                     " >> forcebatch.dat # queue_FG
+  echo "0                     " >> forcebatch.dat # queue_GO
   echo "1                     " >> forcebatch.dat # active
   echo "0                     " >> forcebatch.dat # parallel
@@ -546 +556 @@
   echo "0                     " >> forcedobjectbatch.dat # queue_FW
   echo "1                     " >> forcedobjectbatch.dat # queue_FO
+  echo "0                     " >> forcedobjectbatch.dat # queue_FG
+  echo "0                     " >> forcedobjectbatch.dat # queue_GO
   echo "1                     " >> forcedobjectbatch.dat # active
   echo "0                     " >> forcedobjectbatch.dat # parallel
@@ -600 +612 @@
   echo "0                     " >> diffbatch.dat # queue_FW
   echo "0                     " >> diffbatch.dat # queue_FO
+  echo "0                     " >> diffbatch.dat # queue_FG
+  echo "0                     " >> diffbatch.dat # queue_GO
   echo "1                     " >> diffbatch.dat # active
   echo "0                     " >> diffbatch.dat # parallel
@@ -652 +666 @@
   echo "0                     " >> diffobjbatch.dat # queue_FW
   echo "0                     " >> diffobjbatch.dat # queue_FO
+  echo "0                     " >> diffobjbatch.dat # queue_FG
+  echo "0                     " >> diffobjbatch.dat # queue_GO
   echo "1                     " >> diffobjbatch.dat # active
   echo "0                     " >> diffobjbatch.dat # parallel

trunk/ippToPsps/test/mkgpc1data.dvo

@@ -197 +197 @@
     end
 
-    echo "*****"
     echo addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
     exec addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
@@ -206 +205 @@
     exec relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -nloop 0 -D STAR_TOOFEW 0 -update
 
-    echo relastro -v -D CATDIR $catdir -D CAMERA simtest -images -update-chips -region 8 12 18 22 -update -apply-offsets
-    exec relastro -v -D CATDIR $catdir -D CAMERA simtest -images -update-chips -region 8 12 18 22 -update -apply-offsets
+    echo relastro -v -D CATDIR $catdir -D CAMERA simtest -images -update-chips -update-all-cameras -region 8 12 18 22 -update -apply-offsets
+    exec relastro -v -D CATDIR $catdir -D CAMERA simtest -images -update-chips -update-all-cameras -region 8 12 18 22 -update -apply-offsets
   else
     echo relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -update

trunk/ippToPsps/test/notes.txt

@@ +1 @@
+
+2017.11.28 EAM:
+
+ updating the test suite (using my desktop kukui -- ubuntu 14.04).
+
+ * need to install xmllint to run ipptopsps
 
 In order to have a reasonably complete test, I need to have a bunch of things that mimic the IPP infrastructure