Changeset 20608 for trunk/ippTools/share

Timestamp:

Nov 9, 2008, 1:51:39 PM (18 years ago)

Author:

Paul Price

Message:

Change to run a subset of a camera seems to work, based on a simtest and a manual run through with one of two rawImfiles with ignored = 1. Merging pap_branch_20081109; no conflicts.

Location:

trunk/ippTools/share

Files:

• chiptool_completely_processed_exp.sql (modified) (2 diffs)
• chiptool_pendingimfile.sql (modified) (1 diff)
• faketool_completely_processed_exp.sql (modified) (2 diffs)
• pxadmin_create_tables.sql (modified) (4 diffs)
• regtool_pendingexp.sql (modified) (1 diff)
• regtool_processedimfile.sql (modified) (1 diff)
• warptool_imfile.sql (modified) (1 diff)

trunk/ippTools/share/chiptool_completely_processed_exp.sql

@@ -13 +13 @@
     end_stage
 FROM
-    (SELECT 
+    (SELECT
         chipRun.*,
         rawImfile.class_id as rawimfile_class_id,
@@ -19 +19 @@
     FROM chipRun
     JOIN rawImfile
-        USING(exp_id)
+        ON chipRun.exp_id = rawImfile.exp_id
+        AND rawImfile.ignored = 0
     LEFT JOIN chipProcessedImfile
         ON chipRun.chip_id = chipProcessedImfile.chip_id

trunk/ippTools/share/chiptool_pendingimfile.sql

@@ -12 +12 @@
     USING(exp_id)
 JOIN rawImfile
-    USING(exp_id)
+    ON rawExp.exp_id = rawImfile.exp_id
+    AND rawImfile.ignored = 0
 LEFT JOIN chipProcessedImfile
     ON chipRun.chip_id = chipProcessedImfile.chip_id

trunk/ippTools/share/faketool_completely_processed_exp.sql

@@ -13 +13 @@
     epoch
 FROM
-    (SELECT 
+    (SELECT
         fakeRun.*,
         rawImfile.class_id as rawimfile_class_id,
@@ -25 +25 @@
         USING(exp_id)
     JOIN rawImfile
-        USING(exp_id)
+        ON rawImfile.exp_id = rawExp.exp_id
+        AND rawImfile.ignored = 0
     LEFT JOIN fakeProcessedImfile
         ON fakeRun.fake_id = fakeProcessedImfile.fake_id

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -234 +234 @@
     moon_alt FLOAT,
     moon_phase FLOAT,
+    ignored TINYINT DEFAULT 0,
     hostname VARCHAR(64),
     fault SMALLINT NOT NULL,
@@ -1081 +1082 @@
         det_type VARCHAR(64),
         dvodb VARCHAR(64),
-        camera VARCHAR(64),
-        telescope VARCHAR(64),
-        epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+        camera VARCHAR(64),
+        telescope VARCHAR(64),
+        epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
         filter VARCHAR(64),
         state VARCHAR(64),
@@ -1100 +1101 @@
         corr_id BIGINT,
         chip_id BIGINT,
-        include TINYINT,
+        include TINYINT,
         PRIMARY KEY(corr_id, chip_id),
         FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),
@@ -1110 +1111 @@
         chip_id BIGINT,
         cam_id BIGINT,
-        include TINYINT,
+        include TINYINT,
         PRIMARY KEY(corr_id, cam_id),
         FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),

trunk/ippTools/share/regtool_pendingexp.sql

@@ -39 +39 @@
         newExp.state = 'run'
         AND rawExp.exp_id IS NULL
+        AND rawImfile.ignored = 0
 -- where hook %s
     GROUP BY

trunk/ippTools/share/regtool_processedimfile.sql

@@ -7 +7 @@
 JOIN newExp
     USING(exp_id)
--- bogus conditional so there is a where clause to append to
-WHERE rawImfile.exp_id is NOT NULL
+WHERE rawImfile.ignored = 0

trunk/ippTools/share/warptool_imfile.sql

@@ -19 +19 @@
 JOIN rawImfile -- is there any reason not to refer back to rawimfiles?
     ON chipProcessedImfile.exp_id = rawImfile.exp_id
-    AND chipProcessedImfile.class_id = rawImfile.class_id 
+    AND chipProcessedImfile.class_id = rawImfile.class_id
+    AND rawImfile.ignored = 0
 WHERE
     warpRun.state = 'new'