Changeset 9913

Timestamp:

Nov 8, 2006, 2:45:42 PM (20 years ago)

Author:

jhoblitt

Message:

possible fix for join error in -tonormalize

File:

• trunk/ippTools/src/dettool.c (modified) (1 diff)

trunk/ippTools/src/dettool.c

@@ -2160 +2160 @@
         "   detNormalizedStatImfile.*"
         " FROM detRun"
+        " JOIN detStackedImfile"
+        "   USING(det_id, iteration)"
         " JOIN detInputExp"
-        "   ON detRun.det_id = detInputExp.det_id"
-        "   AND detRun.iteration = detInputExp.iteration"
-        " JOIN detStackedImfile"
-        "   ON detRun.det_id = detStackedImfile.det_id"
-        "   AND detRun.iteration = detStackedImfile.iteration"
-        " JOIN detNormalizedStatImfile"
-        "   ON detRun.det_id = detNormalizedStatImfile.det_id"
-        "   AND detRun.iteration = detNormalizedStatImfile.iteration"
+        "   USING(det_id, iteration)"
         " JOIN rawDetrendExp"
         "   ON detInputExp.exp_tag = rawDetrendExp.exp_tag"
+        " JOIN detNormalizedStatImfile"
+        "   ON detStackedImfile.det_id = detNormalizedStatImfile.det_id"
+        "   AND detStackedImfile.iteration = detNormalizedStatImfile.iteration"
+        "   AND detStackedImfile.class_id = detNormalizedStatImfile.class_id"
         " LEFT JOIN detNormalizedImfile"
-        "   ON detRun.det_id = detNormalizedImfile.det_id"
-        "   AND detRun.iteration = detNormalizedImfile.iteration"
+        "   ON detNormalizedStatImfile.det_id = detNormalizedImfile.det_id"
+        "   AND detNormalizedStatImfile.iteration = detNormalizedImfile.iteration"
         "   AND detNormalizedStatImfile.class_id = detNormalizedImfile.class_id"
         " WHERE"