Changeset 8755 for trunk/ippTools/scripts

Timestamp:

Sep 6, 2006, 2:37:31 PM (20 years ago)

Author:

jhoblitt

Message:

assume pXtools are in the path

Location:

trunk/ippTools/scripts

Files:

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

trunk/ippTools/scripts/dettest.sh

@@ -3 +3 @@
 set -o verbose
 
-./p0test.sh || exit 1
+./p0test.sh -detrend || exit 1
 
-./dettool -definebyquery -det_type flat || exit 1
-./dettool -raw || exit 1
+dettool -definebyquery -det_type flat || exit 1
+dettool -raw || exit 1
 
 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 -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
 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 -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
 done;
 
-./dettool -tostack || exit 1
+dettool -tostack || exit 1
 for ID in `seq 0 3` ; do
-    ./dettool -addstacked -det_id 1 -uri file://stacked-$ID -class_id $ID -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -pleasenormalize || exit 1
+    dettool -addstacked -det_id 1 -uri file://stacked-$ID -class_id $ID -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -pleasenormalize || exit 1
 done;
 
-./dettool -tonormalize || exit 1
+dettool -tonormalize || exit 1
 for ID in `seq 0 3` ; do
-    ./dettool -addnormstat -det_id 1 -class_id $ID -norm 0.12345 || exit 1
+    dettool -addnormstat -det_id 1 -class_id $ID -norm 0.12345 || exit 1
 done;
 
-./dettool -normstat || exit 1
+dettool -normstat || exit 1
 for ID in `seq 0 3` ; do
-    ./dettool -addnormalizedimfile -det_id 1 -class_id $ID -uri file://normalized-$ID || exit 1
+    dettool -addnormalizedimfile -det_id 1 -class_id $ID -uri file://normalized-$ID || exit 1
 done;
 
-./dettool -toresid || exit 1
+dettool -toresid || exit 1
 
 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_id 10 -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_id 11 -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 -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 -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 -residexp || exit 1
-./dettool -updatedetrun -det_id 1 -again || 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 -residexp || exit 1
+dettool -updatedetrun -det_id 1 -again || exit 1

trunk/ippTools/scripts/regtest.sh

@@ -3 +3 @@
 set -o verbose
 
-inject="./pxinject"
-p0tool="./p0tool"
+inject="pxinject"
+p0tool="p0tool"
 
-echo -e "YES\nipp\n\n" | ./pxadmin -recreate || exit 1
+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
@@ -24 +24 @@
 done;
 
-$p0tool -updateexp -exp_id 10 -filter r -airmass 10 -ra 1 -decl 2 -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_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
 
 for ID in `seq 0 3`; do
@@ -30 +30 @@
 done;
 
-$p0tool -updateexp -exp_id 11 -filter r -airmass 11 -ra 1 -decl 2 -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_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