Changeset 8780 for trunk/MagicSoft/Mars/mhflux

Timestamp:

12/10/07 17:45:36 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

• MAlphaFitter.cc (modified) (1 diff)
• MAlphaFitter.h (modified) (1 diff)
• MHAlpha.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -853 +853 @@
             fScaleMode = kUserScale;
         if (txt==(TString)"fixed")
-        {
-            fScaleMode = kUserScale;
-            fScaleUser = fScaleFactor;
-        }
+            FixScale();
         rc = kTRUE;
     }

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

@@ -165 +165 @@
     void EnableBackgroundFit(Bool_t b=kTRUE) { fFitBackground=b; }
 
+    void FixScale()
+    {
+        fScaleMode = kUserScale;
+        fScaleUser = fScaleFactor;
+    }
+
     // Getter
     Double_t GetSignalIntegralMax() const  { return fSigInt; }

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -159 +159 @@
     for (int i=1; i<=n; i++)
     {
-        if (fit.FitEnergy(fHist, fOffData, i))
-        {
-            fHEnergy.SetBinContent(i, fit.GetEventsExcess());
-            if (fit.GetSignificanceExc()>1)
-                fHEnergy.SetBinError(i, fit.GetEventsExcess()/fit.GetSignificanceExc());
-            else
-                fHEnergy.SetBinError(i, fit.GetEventsExcess());
-
-            if (fit.GetSignificanceExc()>1)
-            {
-                mean += fit.GetSignificanceExc()*fit.GetSignificanceExc();
-                num++;
-            }
-        }
+        if (!fit.FitEnergy(fHist, fOffData, i))
+            continue;
+
+        if (fit.GetSignificanceExc()<=0)
+            continue;
+
+        fHEnergy.SetBinContent(i, fit.GetEventsExcess());
+        fHEnergy.SetBinError(i, fit.GetEventsExcess()/fit.GetSignificanceExc());
+
+        mean += fit.GetSignificanceExc()*fit.GetSignificanceExc();
+        num++;
     }
     return TMath::Sqrt(mean)/num;
@@ -188 +185 @@
     for (int i=1; i<=n; i++)
     {
-        if (fit.FitTheta(fHist, fOffData, i))
-        {
-            fHTheta.SetBinContent(i, fit.GetEventsExcess());
-            if (fit.GetSignificanceExc()>1)
-                fHTheta.SetBinError(i, fit.GetEventsExcess()/fit.GetSignificanceExc());
-            else
-                fHTheta.SetBinError(i, fit.GetEventsExcess());
-        }
+        if (!fit.FitTheta(fHist, fOffData, i))
+            continue;
+
+        if (fit.GetSignificanceExc()<=0)
+            continue;
+
+        fHTheta.SetBinContent(i, fit.GetEventsExcess());
+        fHTheta.SetBinError(i, fit.GetEventsExcess()/fit.GetSignificanceExc());
     }
 }
@@ -431 +428 @@
     // Fill histogram
     //
-    fHTime.SetBinContent(n+1, fit.GetEventsExcess());
-    if (fit.GetSignificanceExc()>1)
+    if (fit.GetSignificanceExc()>0)
+    {
+        fHTime.SetBinContent(n+1, fit.GetEventsExcess());
         fHTime.SetBinError(n+1, fit.GetEventsExcess()/fit.GetSignificanceExc());
-    else
-        fHTime.SetBinError(n+1, fit.GetEventsExcess());
+    }
 
     *fLog << all << *fTimeEffOn << ": " << fit.GetEventsExcess() << endl;
@@ -735 +732 @@
     AppendPad("variable");
 
-    if (fHEnergy.GetNbinsX()>1)
+    if (fHEnergy.GetNbinsX()>1 || fHEnergy.GetBinContent(1)>0)
     {
         pad->cd(2);
@@ -759 +756 @@
         delete pad->GetPad(2);
 
-    if (fTimeEffOn && fTime || fHTime.GetNbinsX()>1)
+    if (fTimeEffOn && fTime || fHTime.GetNbinsX()>1 || fHTime.GetBinContent(1)>0)
     {
         pad->cd(3);
@@ -771 +768 @@
         delete pad->GetPad(3);
 
-    if (fHTheta.GetNbinsX()>1)
+    if (fHTheta.GetNbinsX()>1 || fHTheta.GetBinContent(1)>0)
     {
         pad->cd(4);