Changeset 5006 for trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

Timestamp:

09/14/04 16:54:56 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -46 +46 @@
 #include "MMath.h"
 
+#include "MLogManip.h"
+
 ClassImp(MAlphaFitter);
 
@@ -86 +88 @@
     Double_t bgmin=fBgMin;
     Double_t bgmax=fBgMax;
-    Byte_t polynom=fPolynom;
+    Byte_t polynom=fPolynomOrder;
 
     // Implementing the function yourself is only about 5% faster
     TF1 func("", Form("gaus(0) + pol%d(3)", polynom), 0, 90);
     //TF1 func("", Form("[0]*(TMath::Gaus(x, [1], [2])+TMath::Gaus(x, -[1], [2]))+pol%d(3)", polynom), 0, 90);
-    TArrayD maxpar(func.GetNpar());
+
+    if (fCoefficients.GetSize() != polynom+3)
+    {
+        fCoefficients.Set(polynom+3);
+        fCoefficients.Reset();
+    }
+    else
+        func.SetParameters(fCoefficients.GetArray());
 
     func.FixParameter(1, 0);
@@ -154 +163 @@
     h.Fit(&func, "NQI", "", 0, sigmax);
 
-    fChiSqSignal  = func.GetChisquare()/func.GetNDF();
-    fSigmaGaus    = func.GetParameter(2);
+    fChiSqSignal = func.GetChisquare()/func.GetNDF();
+    fCoefficients.Set(func.GetNpar(), func.GetParameters());
 
     //const Bool_t ok = NDF>0 && chi2<2.5*NDF;
@@ -167 +176 @@
     }
     // ------------------------------------
-    const Double_t s   = func.Integral(0, sigint)/alphaw;
+    //const Double_t s = func.Integral(0, sigint)/alphaw;
     func.SetParameter(0, 0);
     func.SetParameter(2, 1);
-    const Double_t b   = func.Integral(0, sigint)/alphaw;
-
-    fSignificance = MMath::SignificanceLiMaSigned(s, b);
+    //const Double_t b = func.Integral(0, sigint)/alphaw;
+
+    //fSignificance = MMath::SignificanceLiMaSigned(s, b);
     //exc = s-b;
 
     const Double_t uin = 1.25*sigint;
     const Int_t    bin = h.GetXaxis()->FindFixBin(uin);
-    fIntegralMax  = h.GetBinLowEdge(bin+1);
-    fExcessEvents = h.Integral(0, bin)-func.Integral(0, fIntegralMax)/alphaw;
+
+    fIntegralMax      = h.GetBinLowEdge(bin+1);
+    fEventsBackground = func.Integral(0, fIntegralMax)/alphaw;
+    fEventsSignal     = h.Integral(0, bin);
+    fEventsExcess     = fEventsSignal-fEventsBackground;
+    fSignificance     = MMath::SignificanceLiMaSigned(fEventsSignal, fEventsBackground);
 
     return kTRUE;
@@ -186 +199 @@
 {
     TLatex text(x, y, Form("\\sigma_{Li/Ma}=%.1f (\\alpha<%.1f\\circ)  \\omega=%.1f\\circ  E=%d  (\\alpha<%.1f\\circ)  (\\chi_{b}^{2}=%.1f  \\chi_{s}^{2}=%.1f)",
-                           fSignificance, fSigInt, fSigmaGaus,
-                           (int)fExcessEvents, fIntegralMax,
+                           fSignificance, fSigInt, GetGausSigma(),
+                           (int)fEventsExcess, fIntegralMax,
                            fChiSqBg, fChiSqSignal));