Changeset 14033

Timestamp:

Jul 5, 2007, 4:46:53 PM (19 years ago)

Author:

jhoblitt

Message:

fix dettool -raw SQL

Location:

trunk/ippTools

Files:

• scripts/dettest.sh (modified) (2 diffs)
• share/Makefile.am (modified) (1 diff)
• share/dettool_raw.sql (added)
• src/dettool.c (modified) (1 diff)

trunk/ippTools/scripts/dettest.sh

@@ -7 +7 @@
 ./regtest.sh -detrend || exit 1
 
-det_id=`dettool -definebyquery -det_type bias -filelevel fpa -select_exp_type bias -airmass_min 1 -airmass_max 10 -exp_time_min 10 -exp_time_max 30.0 -workdir file::///some/path -simple | cut -f1 -d" "` || exit 1
+det_id=`dettool -definebyquery -det_type bias -inst gpc -filelevel fpa -select_exp_type bias -airmass_min 1 -airmass_max 10 -exp_time_min 10 -exp_time_max 30.0 -workdir file::///some/path -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.1 -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_id 1 -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.2 -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_id 2 -class_id $ID -uri file://proc-$ID -recip myrecip -bg 1 -bg_stdev 1 -bg_mean_stdev 1 || exit 1
 done;
 
@@ -43 +43 @@
 
 for ID in `seq 0 3` ; do
-    dettool -addresidimfile -det_id $det_id -exp_tag t10.1 -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_id 1 -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.2 -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_id 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.1 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -path_base jpeg1 || exit 1
-dettool -addresidexp -det_id $det_id -exp_tag t11.2 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -path_base jpeg1 -reject || exit 1
+dettool -addresidexp -det_id $det_id -exp_id 1 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -path_base jpeg1 || exit 1
+dettool -addresidexp -det_id $det_id -exp_id 2 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -path_base jpeg1 -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 t11.2 -reject || exit 1
-dettool -updateresidexp -det_id $det_id -iteration 0 -exp_tag t11.2 || exit 1
+dettool -updateresidexp -det_id $det_id -iteration 0 -exp_id 2 -reject || exit 1
+dettool -updateresidexp -det_id $det_id -iteration 0 -exp_id 2 || exit 1
 
 dettool -adddetrunsummary -det_id $det_id -iteration 0 -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -accept || exit 1

trunk/ippTools/share/Makefile.am

@@ -13 +13 @@
         detselect_select.sql \
         dettool_find_completed_runs.sql \
+        dettool_raw.sql \
         difftool_inputskyfile.sql \
         difftool_skyfile.sql \

trunk/ippTools/src/dettool.c

@@ -2050 +2050 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    psString query = psStringCopy(
-            "SELECT"
-            "   detInputExp.det_id,"
-            "   detRun.det_type,"
-            "   rawImfile.*,"
-            "   rawExp.camera"
-            " FROM rawImfile"
-            " JOIN detInputExp"
-            "   USING(exp_id) "
-            " JOIN rawExp"
-            "   USING(exp_id) "
-            " JOIN detRun"
-            "   ON detInputExp.det_id = detRun.det_id"
-            " WHERE"
-            "   detRun.state = 'run'"
-            "   AND detRun.mode = 'master'"
-        );
+    psString query = pxDataGet("dettool_raw.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {