Changeset 14059 for trunk/ippTools/share

Timestamp:

Jul 6, 2007, 4:50:21 PM (19 years ago)

Author:

jhoblitt

Message:

remove use of rawExp.imfiles

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• dettool_tonormalizedexp.sql (added)
• dettool_tonormalizedstat.sql (added)
• dettool_toprocessedexp.sql (modified) (2 diffs)
• dettool_toresidexp.sql (modified) (3 diffs)

trunk/ippTools/share/Makefile.am

@@ -14 +14 @@
         dettool_find_completed_runs.sql \
         dettool_raw.sql \
+        dettool_tonormalizedexp.sql \
+        dettool_tonormalizedstat.sql \
+        dettool_toprocessedexp.sql \
     dettool_toprocessedimfile.sql \
-        dettool_toprocessedexp.sql \
+        dettool_toresidexp.sql \
+        dettool_toresidimfile.sql \
         dettool_tostacked.sql \
-        dettool_toresidimfile.sql \
-        dettool_toresidexp.sql \
         difftool_inputskyfile.sql \
         difftool_skyfile.sql \

trunk/ippTools/share/dettool_toprocessedexp.sql

@@ -29 +29 @@
         detProcessedImfile.exp_id,
         detProcessedImfile.class_id,
+        rawImfile.class_id as rawimfile_class_id,
         rawExp.camera,
         rawExp.exp_tag
@@ -56 +57 @@
         detRun.det_id
     HAVING
-        COUNT(detProcessedImfile.class_id) = rawExp.imfiles
+        COUNT(detProcessedImfile.class_id) = COUNT(rawImfile.class_id)
     ) AS detProcessedExp
 

trunk/ippTools/share/dettool_toresidexp.sql

@@ -36 +36 @@
         detInputExp.include,
         rawExp.camera,
-        rawExp.imfiles,
         rawExp.exp_tag,
         detResidImfile.class_id
@@ -44 +43 @@
     JOIN rawExp
         ON detInputExp.exp_id = rawExp.exp_id
-    JOIN detResidImfile
+    JOIN rawImfile
+        on rawExp.exp_id = rawImfile.exp_id
+    LEFT JOIN detResidImfile
         ON detRun.det_id = detResidImfile.det_id
         AND detRun.iteration = detResidImfile.iteration
         AND detInputExp.exp_id = detResidImfile.exp_id
+        AND rawImfile.class_id = detResidImfile.class_id
     LEFT JOIN detResidExp
         ON detResidImfile.det_id = detResidExp.det_id
@@ -63 +65 @@
         detRun.det_id
     HAVING
-        rawExp.imfiles = COUNT(detResidImfile.class_id)
+        COUNT(rawImfile.class_id) = COUNT(detResidImfile.class_id)
     ) AS toresidexp