Index: /trunk/FACT++/spectrum/spectrum.sql
===================================================================
--- /trunk/FACT++/spectrum/spectrum.sql	(revision 19901)
+++ /trunk/FACT++/spectrum/spectrum.sql	(revision 19902)
@@ -9,5 +9,5 @@
       SUM(SumW)            AS  SumW
    FROM
-      SummaryData
+      AnalysisData
    GROUP BY
       %101:bin
@@ -57,8 +57,8 @@
       EnergyEstI/SumWI                AS  AvgEnergyEstI,
 
-      %102:id.ExcessFluxW              AS  SimExcess,
-      %102:id.ErrExcessFluxW           AS  ErrSimExcess,
-      %102:id.IntegralExcessFluxW      AS  SimExcessI,
-      %102:id.ErrIntegralExcessFluxW   AS  ErrSimExcessI,
+      %102:id.ExcessFluxW                 AS  SimExcess,
+      %102:id.ErrExcessFluxW              AS  ErrSimExcess,
+      %102:id.IntegralExcessFluxW         AS  SimExcessI,
+      %102:id.ErrIntegralExcessFluxW      AS  ErrSimExcessI,
 
       -- For flux-vs-theta: Correction for already applied ZdWeights
Index: /trunk/FACT++/spectrum/summary-est.sql
===================================================================
--- /trunk/FACT++/spectrum/summary-est.sql	(revision 19901)
+++ /trunk/FACT++/spectrum/summary-est.sql	(revision 19902)
@@ -46,15 +46,20 @@
       *,
 
-      SignalN - BackgroundN                          AS  ExcessN,
+      SignalW                       /Width/AreaTime  AS  SignalFluxW,
+      BackgroundW                   /Width/AreaTime  AS  BackgroundFluxW,
+      (SignalN - BackgroundN)                        AS  ExcessN,
+      (SignalW - BackgroundW)                        AS  ExcessW,
+      (SignalW - BackgroundW)       /Width/AreaTime  AS  ExcessFluxW,
+
+      SQRT(SignalN)                                  AS  ErrSignalN,
+      SQRT(SignalW2)                                 AS  ErrSignalW,
+      SQRT(SignalW2)                /Width/AreaTime  AS  ErrSignalFluxW,
+
+      SQRT(BackgroundN)                              AS  ErrBackgroundN,
+      SQRT(BackgroundW2)                             AS  ErrBackgroundW,
+      SQRT(BackgroundW2)            /Width/AreaTime  AS  ErrBackgroundFluxW,
 
       SQRT(SignalN + BackgroundN)                    AS  ErrExcessN,
-      SQRT(SignalN)                                  AS  ErrSignalN,
-      SQRT(BackgroundN)                              AS  ErrBackgroundN,
-
-      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)                  AS  ErrExcessW,
       SQRT(SignalW2 + BackgroundW2) /Width/AreaTime  AS  ErrExcessFluxW,
 
Index: /trunk/FACT++/spectrum/summary-sim.sql
===================================================================
--- /trunk/FACT++/spectrum/summary-sim.sql	(revision 19901)
+++ /trunk/FACT++/spectrum/summary-sim.sql	(revision 19902)
@@ -91,4 +91,5 @@
       SQRT(TrigCountN)                       AS  ErrTrigCountN,
       SQRT(SignalN)                          AS  ErrSignalN,
+      SQRT(BackgroundN)                      AS  ErrBackgroundN,
 
       SimSumW              /Width/AreaTime   AS  SimFluxW,