Changeset 18366 for trunk/ippTools/share

Timestamp:

Jun 29, 2008, 3:02:07 PM (18 years ago)

Author:

eugene

Message:

merge updates from cleanup branch

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• camtool_find_chip_id.sql (modified) (1 diff)
• camtool_find_pendingexp.sql (modified) (1 diff)
• camtool_queue_chip_id.sql (modified) (1 diff)
• chiptool_pendingcleanup.sql (deleted)
• chiptool_pendingcleanupimfile.sql (added)
• chiptool_pendingcleanuprun.sql (added)
• chiptool_pendingimfile.sql (modified) (1 diff)
• flatcorr_completely_processed_chiprun.sql (modified) (1 diff)
• flatcorr_find_processedimfiles.sql (modified) (1 diff)
• flatcorr_pending.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -11 +11 @@
         chiptool_find_rawexp.sql \
         chiptool_find_unprocessed_imfile.pl \
-        chiptool_pendingcleanup.sql \
+        chiptool_pendingcleanuprun.sql \
+        chiptool_pendingcleanupimfile.sql \
         chiptool_pendingimfile.sql \
         chiptool_processedimfile.sql \
+        chiptool_run.sql \
         chiptool_revertprocessedimfile.sql \
         chiptool_unmasked.sql \

trunk/ippTools/share/camtool_find_chip_id.sql

@@ -29 +29 @@
         using(exp_id)
     WHERE
-        chipRun.state = 'stop') as Foo
+        chipRun.state = 'full') as Foo

trunk/ippTools/share/camtool_find_pendingexp.sql

@@ -24 +24 @@
         ON camRun.label = camMask.label
     WHERE
-        chipRun.state = 'stop'
+        chipRun.state = 'full'
         AND camRun.state = 'run'
         AND camMask.label IS NULL

trunk/ippTools/share/camtool_queue_chip_id.sql

@@ -16 +16 @@
     FROM chipRun
     WHERE
-        chipRun.state = 'stop'
+        chipRun.state = 'full'
         AND chipRun.chip_id = %lld

trunk/ippTools/share/chiptool_pendingimfile.sql

@@ -20 +20 @@
     ON chipRun.label = chipMask.label
 WHERE
-    chipRun.state = 'run'
+    chipRun.state = 'new'
     AND chipProcessedImfile.chip_id IS NULL
     AND chipProcessedImfile.exp_id IS NULL

trunk/ippTools/share/flatcorr_completely_processed_chiprun.sql

@@ -26 +26 @@
             AND rawImfile.class_id = chipProcessedImfile.class_id
         WHERE
-            chipRun.state = 'stop'
+            chipRun.state = 'full'
         GROUP BY
             chipRun.chip_id,

trunk/ippTools/share/flatcorr_find_processedimfiles.sql

@@ -11 +11 @@
 WHERE
     flatcorrRun.state = 'run'
-    AND chipRun.state = 'stop'
+    AND chipRun.state = 'new'
 

trunk/ippTools/share/flatcorr_pending.sql

@@ -15 +15 @@
 WHERE
     flatcorrRun.state = 'run'
-    AND chipRun.state = 'stop'
+    AND chipRun.state = 'full'
 GROUP BY
     chipRun.chip_id,