Changeset 10700 for trunk/ippTools/scripts/dettest.sh

Timestamp:

Dec 13, 2006, 3:34:19 PM (19 years ago)

Author:

jhoblitt

Message:

preserve exit status in END block

File:

• trunk/ippTools/scripts/dettest.sh (modified) (2 diffs)

trunk/ippTools/scripts/dettest.sh

@@ -8 +8 @@
 
 #dettool -definebyquery -det_type flat -set_exp_type fooflat -set_filter foo -set_airmass 10 -set_exp_time 30.0 -set_ccd_temp 100 -set_posang 360 -set_object iobject || exit 1
-dettool -definebyquery -det_type flat -set_exp_type fooflat -set_filter foo -set_airmass 10 -set_exp_time 30.0 -set_object iobject || exit 1
+det_id=`dettool -definebyquery -det_type flat -set_exp_type fooflat -set_filter foo -set_airmass 10 -set_exp_time 30.0 -set_object iobject -simple | cut -f1 -d" "` || exit 1
+
 dettool -raw || exit 1
 
 for ID in `seq 0 3` ; do
-    dettool -addprocessedimfile -det_id $det_id -exp_tag t10 -class_id $ID -uri file://proc-$ID -recip myrecip -bg 1 -bg_stdev 1 -bg_mean_stdev 1 || exit 1
+    dettool -addprocessedimfile -det_id $det_id -exp_tag t11.2 -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 -addprocessedimfile -det_id $det_id -exp_tag t11 -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 -addprocessedimfile -det_id $det_id -exp_tag t11 -class_id $ID -uri file://proc-$ID -recip myrecip -bg 1 -bg_stdev 1 -bg_mean_stdev 1 || exit 1
+#done;
+
 
 dettool -tostacked || exit 1
@@ -42 +44 @@
 
 for ID in `seq 0 3` ; do
-    dettool -addresidimfile -det_id $det_id -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 $det_id -exp_tag t11 -class_id $ID -recip myrecip -bg 1 -bg_stdev 1 -bg_mean_stdev 1 -uri file://resid-$ID || exit 1
+    dettool -addresidimfile -det_id $det_id -exp_tag t11.2 -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 $det_id -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 $det_id -exp_tag t11 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri jpeg1 -b2_uri jpeg2  -reject || exit 1
+dettool -addresidexp -det_id $det_id -exp_tag t11.2 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri jpeg1 -b2_uri jpeg2  || exit 1
+#dettool -addresidexp -det_id $det_id -exp_tag t11.2 -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 $det_id -iteration 0 -recip yourrecipe || exit 1
-dettool -updateresidexp -det_id $det_id -iteration 0 -exp_tag t10 -reject || exit 1
-dettool -updateresidexp -det_id $det_id -iteration 0 -exp_tag t11 || exit 1
+dettool -updateresidexp -det_id $det_id -iteration 0 -exp_tag t11.2 -reject || exit 1
+dettool -updateresidexp -det_id $det_id -iteration 0 -exp_tag t11.2 || exit 1
 
 dettool -adddetrunsummary -det_id $det_id -iteration 0 -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -accept || exit 1