Index: trunk/FACT++/spectrum/spectrum.sql =================================================================== --- trunk/FACT++/spectrum/spectrum.sql (revision 19900) +++ trunk/FACT++/spectrum/spectrum.sql (revision 19901) @@ -17,8 +17,8 @@ SELECT *, - SUM(`Signal`) OVER Integral AS SignalI, - SUM(`Background`) OVER Integral /5 AS BackgroundI, - SUM(SumEnergyEst) OVER Integral AS EnergyEstI, - SUM(SumW) OVER Integral AS SumWI + SUM(`Signal`) OVER Integral AS SignalI, + SUM(`Background`) OVER Integral AS BackgroundI, + SUM(SumEnergyEst) OVER Integral AS EnergyEstI, + SUM(SumW) OVER Integral AS SumWI FROM BinnedData @@ -44,5 +44,5 @@ `Signal` - `Background` AS Excess, SQRT(`Signal`) AS ErrSignal, - SQRT(`Background`) AS ErrBackground, + SQRT(`Background`/5) AS ErrBackground, ExcErr(`Signal`, `Background`) AS ErrExcess, LiMa( `Signal`, `Background`) AS Significance, @@ -50,5 +50,5 @@ SignalI - BackgroundI AS ExcessI, SQRT(SignalI) AS ErrSignalI, - SQRT(BackgroundI) AS ErrBackgroundI, + SQRT(BackgroundI/5) AS ErrBackgroundI, ExcErr(SignalI, BackgroundI) AS ErrExcessI, LiMa( SignalI, BackgroundI) AS SignificanceI, @@ -123,6 +123,4 @@ WHERE Excess>0 -ORDER BY - %101:bin ) SELECT @@ -136,5 +134,6 @@ FROM Spectrum - WINDOW Integral AS (ORDER BY %101:bin DESC) +ORDER BY + %101:bin ASC Index: trunk/FACT++/spectrum/summary-est.sql =================================================================== --- trunk/FACT++/spectrum/summary-est.sql (revision 19900) +++ trunk/FACT++/spectrum/summary-est.sql (revision 19901) @@ -23,17 +23,17 @@ `.%100:binning:_est`, - SUM(SignalN) AS SignalN, - SUM(SignalW) AS SignalW, - SUM(SignalW2) AS SignalW2, + SUM(SignalN) AS SignalN, + SUM(SignalW) AS SignalW, + SUM(SignalW2) AS SignalW2, - SUM(BackgroundN) AS BackgroundN, - SUM(BackgroundW) AS BackgroundW, - SUM(BackgroundW2) AS BackgroundW2, + SUM(BackgroundN)/5 AS BackgroundN, + SUM(BackgroundW)/5 AS BackgroundW, + SUM(BackgroundW2)/25 AS BackgroundW2, - SUM(ResidualW) AS ResidualW, - SUM(ResidualW2) AS ResidualW2, + SUM(ResidualW) AS ResidualW, + SUM(ResidualW2) AS ResidualW2, - SUM(SumEnergySimW) AS SumEnergySimW, - SUM(SumEnergyEstW) AS SumEnergyEstW + SUM(SumEnergySimW) AS SumEnergySimW, + SUM(SumEnergyEstW) AS SumEnergyEstW FROM AnalysisMC @@ -46,19 +46,19 @@ *, - SignalN - BackgroundN/5 AS ExcessN, + SignalN - BackgroundN AS ExcessN, - SQRT(SignalN + BackgroundN/25) AS ErrExcessN, - SQRT(SignalN) AS ErrSignalN, - SQRT(BackgroundN) AS ErrBackgroundN, + SQRT(SignalN + BackgroundN) AS ErrExcessN, + SQRT(SignalN) AS ErrSignalN, + SQRT(BackgroundN) AS ErrBackgroundN, - SignalW /Width/AreaTime AS SignalFluxW, - BackgroundW/5 /Width/AreaTime AS BackgroundFluxW, - (SignalW - BackgroundW/5) /Width/AreaTime AS ExcessFluxW, - SQRT(SignalW2) /Width/AreaTime AS ErrSignalFluxW, - SQRT(BackgroundW2)/5 /Width/AreaTime AS ErrBackgroundFluxW, - SQRT(SignalW2 + BackgroundW2/25) /Width/AreaTime AS ErrExcessFluxW, + SignalW /Width/AreaTime AS SignalFluxW, + BackgroundW /Width/AreaTime AS BackgroundFluxW, + (SignalW - BackgroundW) /Width/AreaTime AS ExcessFluxW, + SQRT(SignalW2) /Width/AreaTime AS ErrSignalFluxW, + SQRT(BackgroundW2) /Width/AreaTime AS ErrBackgroundFluxW, + SQRT(SignalW2 + BackgroundW2) /Width/AreaTime AS ErrExcessFluxW, - SumEnergyEstW/SignalW AS AvgEnergyEstW, - SumEnergySimW/SignalW AS AvgEnergySimW, + SumEnergyEstW/SignalW AS AvgEnergyEstW, + SumEnergySimW/SignalW AS AvgEnergySimW, IF(SignalW>0, ResidualW/SignalW, NULL) AS BiasW, @@ -84,11 +84,11 @@ *, - IntegralSignalFluxW-IntegralBackgroundFluxW/5 AS IntegralExcessFluxW, - SQRT(IntegralSignalFluxW2+IntegralBackgroundFluxW2/25) AS ErrIntegralExcessFluxW, - SQRT(IntegralSignalFluxW2) AS ErrIntegralSignalFluxW, - SQRT(IntegralBackgroundFluxW2) AS ErrIntegralBackgroundFluxW, + IntegralSignalFluxW-IntegralBackgroundFluxW AS IntegralExcessFluxW, + SQRT(IntegralSignalFluxW2+IntegralBackgroundFluxW2) AS ErrIntegralExcessFluxW, + SQRT(IntegralSignalFluxW2) AS ErrIntegralSignalFluxW, + SQRT(IntegralBackgroundFluxW2) AS ErrIntegralBackgroundFluxW, - IntegralEnergyEstW/IntegralSignalW AS AvgIntegralEnergyEstW, - IntegralEnergySimW/IntegralSignalW AS AvgIntegralEnergySimW + IntegralEnergyEstW/IntegralSignalW AS AvgIntegralEnergyEstW, + IntegralEnergySimW/IntegralSignalW AS AvgIntegralEnergySimW FROM Index: trunk/FACT++/spectrum/summary-sim.sql =================================================================== --- trunk/FACT++/spectrum/summary-sim.sql (revision 19900) +++ trunk/FACT++/spectrum/summary-sim.sql (revision 19901) @@ -47,17 +47,17 @@ %102:bin, - SUM(SignalN) AS SignalN, - SUM(SignalW) AS SignalW, - SUM(SignalW2) AS SignalW2, + SUM(SignalN) AS SignalN, + SUM(SignalW) AS SignalW, + SUM(SignalW2) AS SignalW2, - SUM(BackgroundN) AS BackgroundN, - SUM(BackgroundW) AS BackgroundW, - SUM(BackgroundW2) AS BackgroundW2, + SUM(BackgroundN)/5 AS BackgroundN, + SUM(BackgroundW)/5 AS BackgroundW, + SUM(BackgroundW2)/25 AS BackgroundW2, - SUM(ResidualW) AS ResidualW, - SUM(ResidualW2) AS ResidualW2, + SUM(ResidualW) AS ResidualW, + SUM(ResidualW2) AS ResidualW2, - SUM(SumEnergySimW) AS SumEnergyEstW, - SUM(SumEnergyEstW) AS SumEnergySimW + SUM(SumEnergySimW) AS SumEnergyEstW, + SUM(SumEnergyEstW) AS SumEnergySimW FROM AnalysisMC @@ -69,9 +69,9 @@ SELECT *, - TrigCountN/SimCountN AS TriggerEfficiencyN, - TrigSumW/SimSumW AS TriggerEfficiencyW, + TrigCountN/SimCountN AS TriggerEfficiencyN, + TrigSumW/SimSumW AS TriggerEfficiencyW, - SignalW - BackgroundW/5 AS ExcessW, - SignalW2 + BackgroundW2/25 AS ExcessW2 + SignalW - BackgroundW AS ExcessW, + SignalW2 + BackgroundW2 AS ExcessW2 FROM Simulated @@ -88,6 +88,6 @@ *, - SQRT(SimCountN) AS ErrSimCountN, - SQRT(TrigCountN) AS ErrTrigCountN, + SQRT(SimCountN) AS ErrSimCountN, + SQRT(TrigCountN) AS ErrTrigCountN, SQRT(SignalN) AS ErrSignalN, @@ -95,10 +95,11 @@ TrigSumW /Width/AreaTime AS TrigFluxW, SignalW /Width/AreaTime AS SignalFluxW, - BackgroundW/5 /Width/AreaTime AS BackgroundFluxW, + BackgroundW /Width/AreaTime AS BackgroundFluxW, ExcessW /Width/AreaTime AS ExcessFluxW, + SQRT(SimSumW2) /Width/AreaTime AS ErrSimFluxW, SQRT(TrigSumW2) /Width/AreaTime AS ErrTrigFluxW, SQRT(SignalW2) /Width/AreaTime AS ErrSignalFluxW, - SQRT(BackgroundW2)/5 /Width/AreaTime AS ErrBackgroundFluxW, + SQRT(BackgroundW2) /Width/AreaTime AS ErrBackgroundFluxW, SQRT(ExcessW2) /Width/AreaTime AS ErrExcessFluxW, @@ -144,12 +145,12 @@ CutEfficiencyW*SQRT(ExcessW2/POW(ExcessW,2) + TrigSumW2/POW(TrigSumW,2)) AS ErrCutEfficiencyW, - IntegralSignalFluxW - IntegralBackgroundFluxW/5 AS IntegralExcessFluxW, - SQRT(IntegralSignalFluxW2+IntegralBackgroundFluxW2/25) AS ErrIntegralExcessFluxW, - SQRT(IntegralSignalFluxW2) AS ErrIntegralSignalFluxW, - SQRT(IntegralBackgroundFluxW2) AS ErrIntegralBackgroundFluxW, - SQRT(IntegralSimFluxW2) AS ErrIntegralSimFluxW, + IntegralSignalFluxW - IntegralBackgroundFluxW AS IntegralExcessFluxW, + SQRT(IntegralSignalFluxW2+IntegralBackgroundFluxW2) AS ErrIntegralExcessFluxW, + SQRT(IntegralSignalFluxW2) AS ErrIntegralSignalFluxW, + SQRT(IntegralBackgroundFluxW2) AS ErrIntegralBackgroundFluxW, + SQRT(IntegralSimFluxW2) AS ErrIntegralSimFluxW, - IntegralEnergyEstW/IntegralSignalW AS AvgIntegralEnergyEstW, - IntegralEnergySimW/IntegralSignalW AS AvgIntegralEnergySimW + IntegralEnergyEstW/IntegralSignalW AS AvgIntegralEnergyEstW, + IntegralEnergySimW/IntegralSignalW AS AvgIntegralEnergySimW FROM