Changes between Version 82 and Version 83 of DatabaseBasedAnalysis

Timestamp:

08/06/18 17:15:12 (7 years ago)

Author:

tbretz

Comment:

--

DatabaseBasedAnalysis

@@ -602 +602 @@
 
 {{{#!sql
-SELECT
+SELECT -- 10
     Counter.*,
     `Signal` - `Background`/5      AS `Excess`,
     LiMa(`Signal`, `Background`/5) AS `Significance`
 FROM
-(
-    /* Counter */
-    SELECT
+( -- Counter
+
+    SELECT -- 9
         COUNT(IF(Weight>0, 1, NULL)) AS `Signal`,
         COUNT(IF(Weight<0, 1, NULL)) AS `Background`
     FROM
-    (
-        /* Table9 */
-        SELECT
+    ( -- Table8
+
+        SELECT -- 8
             Weight,
             (Disp*Disp + Dist*Dist - 2*Disp*Dist*SQRT(1-LX*LX)) AS ThetaSq
         FROM
-        (
-            /* Table8 */
-            SELECT
+        ( -- Table7
+
+            SELECT -- 7
                 Weight, Dist, LX,
-                IF (SIGN(Sign1)<0 || SIGN(Sign2)<0, -Xi, Xi) * (1-WL) AS Disp
+                IF (SIGN(Sign1)<0 || SIGN(Sign2)<0, -Xi, Xi) * (1-WdivL) AS Disp
             FROM
-            (
-                /* Table7 */
-                SELECT
-                    Weight, WL, Dist, LX,
-                    1.39252 + 0.154247*Slope + 1.67972*(1-1/(1+4.86232*Leakage1)) AS Xi,
-                    M3L+0.07             AS Sign1,
-                    (Dist-0.5)*7.2-Slope AS Sign2
+            ( -- Table6
+
+                SELECT -- 6
+                    Weight, WdivL, Dist, LX,
+                    1.39252e0 + 0.154247e0*Slope + 1.67972e0*(1-1/(1+4.86232e0*Leakage1)) AS Xi,
+                    M3L+0.07e0             AS Sign1,
+                    (Dist-0.5e0)*7.2e0-Slope AS Sign2
                 FROM
-                (
-                    /* Table6 */
-                    SELECT
-                        Weight, Leakage1, WL, LX,
-                        Norm          *0.0117193246260285378 AS Dist,
-                        M3Long   *Sign*0.0117193246260285378 AS M3L,
-                        SlopeLong*Sign/0.0117193246260285378 AS Slope
+                ( -- Table5
+
+                    SELECT -- 5
+                        Weight, Leakage1, WdivL, LX,
+                        Norm          *0.0117193246260285378e0 AS Dist,
+                        M3Long   *Sign*0.0117193246260285378e0 AS M3L,
+                        SlopeLong*Sign/0.0117193246260285378e0 AS Slope
                     FROM
-                    (
-                        /* Table5 */
-                        SELECT
-                            Weight, M3Long, SlopeLong, Leakage1, Norm, WL, LX,
+                    ( -- Table4
+
+                        SELECT -- 4
+                            Weight, M3Long, SlopeLong, Leakage1, WdivL, LX, Norm,
                             ASIN(LX) AS Alpha,
                             SIGN(LY) AS Sign
-                        FROM
-                        (
-                            /* Table4 */
-                            SELECT
-                                Weight, M3Long, SlopeLong, Leakage1, Norm, WL,
+                        FROM 
+                        ( -- Table 3
+
+                            SELECT -- 3
+                                Weight, M3Long, SlopeLong, Leakage1, WdivL, Norm,
                                 TRUNCATE((CosDelta*DY - SinDelta*DX)/Norm, 6) AS LX,
                                 TRUNCATE((CosDelta*DX + SinDelta*DY)/Norm, 6) AS LY
-                            FROM
-                            (
-                                /* Table3 */
-                                SELECT
-                                    Weight, CosDelta, SinDelta, DX, DY, M3Long, SlopeLong, Leakage1, WL,
+                            FROM 
+                            ( -- Table2
+
+                                SELECT -- 2
+                                    Weight, CosDelta, SinDelta, DX, DY, M3Long, SlopeLong, Leakage1, WdivL,
                                     SQRT(DX*DX + DY*DY) AS Norm
-                                FROM
-                                (
-                                    /* Table2 */
-                                    SELECT
-                                        Weight, CosDelta, SinDelta, M3Long, SlopeLong, Leakage1, WL,
-                                        MeanX - PX/1.02 AS DX,
-                                        MeanY - PY/1.02 AS DY
-                                    FROM
+                                FROM 
+                                ( -- Table1
+
+                                    SELECT -- 1
+                                        Weight, CosDelta, SinDelta, M3Long, SlopeLong, Leakage1, WdivL,
+                                        MeanX - PX/1.02e0 AS DX,
+                                        MeanY - PY/1.02e0 AS DY
+                                    FROM -- Table0
                                     (
-                                        /* Table1 */
-                                        SELECT 
-                                            Weight, MeanX, MeanY, CosDelta, SinDelta, M3Long, SlopeLong, Leakage1, WL,
-                                            cosa*X - sina*Y AS PX,
-                                            cosa*Y + sina*X AS PY
-                                        FROM
-                                        ( 
-                                            /* Table0 */                                        
-                                            SELECT
-                                                Weight,
-                                                Size,
-                                                NumUsedPixels,
-                                                NumIslands,
-                                                Leakage1,
-                                                MeanX,
-                                                MeanY,
-                                                CosDelta,
-                                                SinDelta,
-                                                M3Long,
-                                                SlopeLong,
-                                                Width/Length AS WL,
-                                                PI()*Width*Length AS Area,
-                                                cosa,
-                                                sina,
-                                                X,
-                                                Y
-                                            FROM RunInfo
-                                            LEFT JOIN Events   USING (FileId)
-                                            LEFT JOIN Position USING (FileId, EvtNumber)
-                                            CROSS JOIN Wobble
-                                            WHERE
-                                                fSourceKey=5
-                                            AND
-                                                fRunTypeKey=1
-                                            AND
-                                                FileId BETWEEN 131101000 AND 131107000
-                                            AND
-                                                fZenithDistanceMax<35
-                                            AND
-                                                fR750Cor>0.9*fR750Ref
-                                            AND
-                                                NumUsedPixels>5.5
-                                            AND
-                                                NumIslands<3.5
-                                            AND
-                                                Leakage1<0.1
-
-                                        ) Table0
- 
+                                        SELECT -- 0
+                                            Weight,
+                                            Size,
+                                            NumUsedPixels,
+                                            NumIslands,
+                                            Leakage1,
+                                            MeanX,
+                                            MeanY,
+                                            CosDelta,
+                                            SinDelta,
+                                            M3Long,
+                                            SlopeLong,
+                                            Width/Length      AS WdivL,
+                                            PI()*Width*Length AS Area,
+                                            cosa*X - sina*Y   AS PX,
+                                            cosa*Y + sina*X   AS PY
+                                        FROM RunInfo
+                                        LEFT JOIN Events   USING (FileId)
+                                        LEFT JOIN Position USING (FileId, EvtNumber)
+                                        CROSS JOIN Wobble
                                         WHERE
-                                            Area < LOG10(Size)*898-1535
-
-                                    ) Table1
-
-                                ) Table2
-
-                            ) Table3
-
-                        ) Table4
-
-                    ) Table5
-
-                ) Table6
-
-            ) Table7
-
-        ) Table8
-
-    HAVING
+                                            fSourceKey=5
+                                        AND
+                                            fRunTypeKey=1
+                                        AND
+                                            FileId BETWEEN 131101000 AND 131107000
+                                        AND
+                                            fZenithDistanceMax<35
+                                        AND
+                                            fR750Cor>0.9*fR750Ref
+                                        AND
+                                            NumUsedPixels>5.5
+                                        AND
+                                            NumIslands<3.5
+                                        AND
+                                            Leakage1<0.1
+
+                                        /* END: SELECT -- 0 */
+
+                                    ) Table0
+
+                                    WHERE
+                                        Area < LOG10(Size)*898-1535
+
+                                    /* END: SELECT -- 1 */
+
+                                ) Table1
+
+                                /* END: SELECT -- 2 */
+
+                            ) Table2
+
+                            /* END: SELECT -- 3 */
+
+                        ) Table3
+
+                        /* END: SELECT -- 4 */
+
+                    ) Table4
+
+                    /* END: SELECT -- 5 */
+
+                ) Table5
+
+                /* END: SELECT -- 6 */
+
+            ) Table6
+
+            /* END: SELECT -- 7 */
+
+        ) Table7
+
+        /* END: SELECT -- 8 */
+
+    ) Table8
+
+    WHERE
         ThetaSq<0.024
 
-    ) Table9
+    /* END: SELECT -- 9 */
 
 ) Counter
 
+/* END: SELECT -- 10 */
 }}}
 
@@ -753 +762 @@
 This new query results in 
 {{{
-Execution time: 12.2317s
+Execution time: 12.0002s
 }}}
 
@@ -789 +798 @@
 
 {{{
-Execution time: 7.64598s
+Execution time: 7.59051s
 }}}