Changeset 13969

Timestamp:

Jun 25, 2007, 10:47:22 AM (19 years ago)

Author:

jhoblitt

Message:

overhaul new* -> raw* table transistions to keep the complete history

Location:

branches/backtrack/ippTools

Files:

• scripts/camtest.sh (modified) (1 diff)
• scripts/regtest.sh (modified) (1 diff)
• share/regtool_find_unprocessed_exp.sql (modified) (1 diff)
• share/regtool_find_unprocessed_imfile.sql (modified) (1 diff)
• share/regtool_pendingexp.sql (modified) (1 diff)

branches/backtrack/ippTools/scripts/camtest.sh

@@ -8 +8 @@
 camtool -pendingimfile || exit 1
 
-camtool -addprocessedexp -cam_id 1 -uri file:///cam -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -path_base file:///foo -zp_mean 1 -zp_stdev 2 || exit 1
-camtool -addprocessedexp -cam_id 2 -uri file:///cam -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -path_base file:///foo -zp_mean 1 -zp_stdev 2 || exit 1
+camtool -addprocessedexp -cam_id 1 -chip_id 1 -uri file:///cam -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -path_base file:///foo -zp_mean 1 -zp_stdev 2 || exit 1
+camtool -addprocessedexp -cam_id 2 -chip_id 2 -uri file:///cam -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -path_base file:///foo -zp_mean 1 -zp_stdev 2 || exit 1

branches/backtrack/ippTools/scripts/regtest.sh

@@ -11 +11 @@
 
 for ID in `seq 0 3`; do
-    $inject -newImfile -exp_tag $exp_tag1 -class OTA -class_id $ID -uri file://$ID || exit 1
+    $inject -newImfile -exp_tag $exp_tag1 -class_id $ID -uri file://$ID || exit 1
 done;
+
+$inject -updatenewExp -exp_tag $exp_tag1 -state run
 
 exp_tag2=`$inject -newExp -exp_id t11 -inst gpc -telescope ps1 -imfiles 4 -workdir file::///some/path -simple` || exit 1
 
 for ID in `seq 0 3`; do
-    $inject -newImfile -exp_tag $exp_tag2 -class OTA -class_id $ID -uri file://$ID || exit 1
+    $inject -newImfile -exp_tag $exp_tag2 -class_id $ID -uri file://$ID || exit 1
 done;
+
+$inject -updatenewExp -exp_tag $exp_tag2 -state run
 
 $regtool -pendingimfile || exit 1

branches/backtrack/ippTools/share/regtool_find_unprocessed_exp.sql

@@ -1 @@
-SELECT
-   newExp.*
-FROM newExp
-LEFT JOIN newImfile
-   USING(exp_tag)
-LEFT JOIN rawExp
-   USING(exp_tag)
+SELECT DISTINCT * FROM
+    (SELECT
+       newExp.*
+    FROM newExp
+    JOIN newImfile
+       USING(exp_tag)
+    LEFT JOIN rawExp
+       USING(exp_tag)
+    WHERE
+        newExp.state = 'run'
+        AND rawExp.exp_tag IS NULL
+        AND newExp.imfiles =
+        (SELECT COUNT(exp_tag) FROM rawImfile
+            WHERE rawImfile.exp_tag = newExp.exp_tag)) as Foo
 WHERE
-    newExp.exp_tag IS NOT NULL
-    AND newImfile.exp_tag IS NULL
-    AND rawExp.exp_tag IS NULL
-    AND newExp.imfiles =
-    (SELECT COUNT(exp_tag) FROM rawImfile
-        WHERE rawImfile.exp_tag = newExp.exp_tag)
-    AND newExp.exp_tag = '%s'
+    exp_tag = '%s'

branches/backtrack/ippTools/share/regtool_find_unprocessed_imfile.sql

@@ -1 @@
-SELECT
-    *
-FROM
-    (SELECT newImfile.* FROM newImfile
-        LEFT JOIN newExp USING(exp_tag)
-        LEFT JOIN rawExp USING(exp_tag)
-        WHERE newExp.exp_tag IS NOT NULL
+SELECT DISTINCT * FROM
+    (SELECT
+        newImfile.*
+    FROM newImfile
+    JOIN newExp
+        USING(exp_tag)
+    LEFT JOIN rawExp
+        USING(exp_tag)
+    WHERE
+        newExp.state = 'run'
         AND rawExp.exp_tag IS NULL) as Foo

branches/backtrack/ippTools/share/regtool_pendingexp.sql

@@ -2 +2 @@
     newExp.*
 FROM newExp
-LEFT JOIN newImfile
+JOIN newImfile
     USING(exp_tag)
 LEFT JOIN rawExp
     USING(exp_tag)
 WHERE
-    newImfile.exp_tag IS NULL
+    newExp.state = 'run'
     AND rawExp.exp_tag IS NULL
     AND newExp.imfiles =