Changeset 9057 for trunk/ippTools/scripts

Timestamp:

Sep 28, 2006, 5:25:54 PM (20 years ago)

Author:

jhoblitt

Message:

require ippdb 0.0.38
the "big" exp_id -> exp_tag conversion

Location:

trunk/ippTools/scripts

Files:

• dettest.sh (modified) (2 diffs)
• regtest.sh (modified) (1 diff)

trunk/ippTools/scripts/dettest.sh

@@ -9 +9 @@
 
 for ID in `seq 0 3` ; do
-    dettool -addprocessed -det_id 1 -exp_id 10 -class_id $ID -uri file://proc-$ID -recip myrecip -bg 1 -bg_stdev 1 -bg_mean_stdev 1 || exit 1
+    dettool -addprocessedimfile -det_id 1 -exp_tag t10 -class_id $ID -uri file://proc-$ID -recip myrecip -bg 1 -bg_stdev 1 -bg_mean_stdev 1 || exit 1
 done;
 
 for ID in `seq 0 3` ; do
-    dettool -addprocessed -det_id 1 -exp_id 11 -class_id $ID -uri file://proc-$ID -recip myrecip -bg 1 -bg_stdev 1 -bg_mean_stdev 1 || exit 1
+    dettool -addprocessedimfile -det_id 1 -exp_tag t11 -class_id $ID -uri file://proc-$ID -recip myrecip -bg 1 -bg_stdev 1 -bg_mean_stdev 1 || exit 1
 done;
 
@@ -34 +34 @@
 
 for ID in `seq 0 3` ; do
-    dettool -addresidimfile -det_id 1 -exp_id 10 -class_id $ID -recip myrecip -bg 1 -bg_stdev 1 -bg_mean_stdev 1 -uri file://resid-$ID || exit 1
+    dettool -addresidimfile -det_id 1 -exp_tag t10 -class_id $ID -recip myrecip -bg 1 -bg_stdev 1 -bg_mean_stdev 1 -uri file://resid-$ID || exit 1
 done;
 for ID in `seq 0 3` ; do
-    dettool -addresidimfile -det_id 1 -exp_id 11 -class_id $ID -recip myrecip -bg 1 -bg_stdev 1 -bg_mean_stdev 1 -uri file://resid-$ID || exit 1
+    dettool -addresidimfile -det_id 1 -exp_tag t11 -class_id $ID -recip myrecip -bg 1 -bg_stdev 1 -bg_mean_stdev 1 -uri file://resid-$ID || exit 1
 done;
 
 dettool -toresidexp || exit 1
-dettool -addresidexp -det_id 1 -exp_id 10 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri jpeg1 -b2_uri jpeg2  || exit 1
-dettool -addresidexp -det_id 1 -exp_id 11 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri jpeg1 -b2_uri jpeg2  -reject || exit 1
+dettool -addresidexp -det_id 1 -exp_tag t10 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri jpeg1 -b2_uri jpeg2  || exit 1
+dettool -addresidexp -det_id 1 -exp_tag t11 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri jpeg1 -b2_uri jpeg2  -reject || exit 1
 
 dettool -residdetrun || exit 1
 dettool -residexp || exit 1
 dettool -updateresidexp -det_id 1 -iteration 0 -recip yourrecipe || exit 1
-dettool -updateresidexp -det_id 1 -iteration 0 -exp_id 10 -reject || exit 1
-dettool -updateresidexp -det_id 1 -iteration 0 -exp_id 11 || exit 1
+dettool -updateresidexp -det_id 1 -iteration 0 -exp_tag t10 -reject || exit 1
+dettool -updateresidexp -det_id 1 -iteration 0 -exp_tag t11 || exit 1
 dettool -residexp || exit 1
 dettool -updatedetrun -det_id 1 -again || exit 1

trunk/ippTools/scripts/regtest.sh

@@ -8 +8 @@
 echo -e "YES\nipp\n\n" | pxadmin -recreate || exit 1
 
-$inject -newExp -exp_id 10 -inst gpc -telescope ps1 -exp_type object -imfiles 4 || exit 1
+$inject -newExp -exp_tag t10 -exp_id 10 -inst gpc -telescope ps1 -exp_type object -imfiles 4 || exit 1
 
 for ID in `seq 0 3`; do
-    $inject -newImfile -exp_id 10 -class OTA -class_id $ID -uri file://$ID || exit 1
+    $inject -newImfile -exp_tag t10 -class OTA -class_id $ID -uri file://$ID || exit 1
 done;
 
-$inject -newExp -exp_id 11 -inst gpc -telescope ps1 -exp_type object -imfiles 4 || exit 1
+$inject -newExp -exp_tag t11 -exp_id 11 -inst gpc -telescope ps1 -exp_type object -imfiles 4 || exit 1
 
 for ID in `seq 0 3`; do
-    $inject -newImfile -exp_id 11 -class OTA -class_id $ID -uri file://$ID || exit 1
+    $inject -newImfile -exp_tag t11 -class OTA -class_id $ID -uri file://$ID || exit 1
 done;
 
 for ID in `seq 0 3`; do
-    $p0tool -updateimfile -exp_id 10 -exp_type object -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 || exit 1
+    $p0tool -updateimfile -exp_tag t10 -exp_type object -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 || exit 1
 done;
 
-$p0tool -updateexp -exp_id 10 -filter r -airmass 10 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 $* || exit 1
+$p0tool -updateexp -exp_tag t10 -filter r -airmass 10 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 $* || exit 1
 
 for ID in `seq 0 3`; do
-    $p0tool -updateimfile -exp_id 11 -exp_type object -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 || exit 1
+    $p0tool -updateimfile -exp_tag t11 -exp_type object -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 || exit 1
 done;
 
-$p0tool -updateexp -exp_id 11 -filter r -airmass 11 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 $* || exit 1
+$p0tool -updateexp -exp_tag t11 -filter r -airmass 11 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 $* || exit 1