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

Timestamp:

01/19/05 13:17:09 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -65 +65 @@
     fChiSqBg=0;
     fIntegralMax=0;
+    fScaleFactor=1;
 
     fCoefficients.Reset();
@@ -210 +211 @@
 }
 
-Bool_t MAlphaFitter::Fit(TH1D &hon, TH1D &hof, Bool_t paint)
+Bool_t MAlphaFitter::Fit(TH1D &hon, TH1D &hof, Double_t alpha, Bool_t paint)
 {
     /*
@@ -224 +225 @@
     fit.SetPolynomOrder(1);
 
-    if (!fit.Fit(h, paint))
+    if (alpha<=0 || !fit.Fit(h, paint))
         return kFALSE;
 
@@ -237 +238 @@
     fEventsSignal     = hon.Integral(0, bin);
     fEventsExcess     = fEventsSignal-fEventsBackground;
-    fSignificance     = MMath::SignificanceLiMaSigned(fEventsSignal, fEventsBackground);
+    fScaleFactor      = alpha;
+    fSignificance     = MMath::SignificanceLiMaSigned(fEventsSignal, fEventsBackground/alpha, alpha);
 
     if (fEventsExcess<0)
@@ -399 +401 @@
     h0->SetDirectory(0);
 
-    Scale(*h0, *h1);
-
-    const Bool_t rc = Fit(*h1, *h0, paint);
+    const Bool_t rc = ScaleAndFit(*h1, h0, paint);
 
     delete h0;
@@ -419 +419 @@
     h0->SetDirectory(0);
 
-    Scale(*h0, *h1);
-
-    const Bool_t rc = Fit(*h1, *h0, paint);
+    const Bool_t rc = ScaleAndFit(*h1, h0, paint);
 
     delete h0;
@@ -439 +437 @@
     h0->SetDirectory(0);
 
-    Scale(*h0, *h1);
-
-    const Bool_t rc = Fit(*h1, *h0, paint);
+    const Bool_t rc = ScaleAndFit(*h1, h0, paint);
 
     delete h0;
@@ -449 +445 @@
 }
 
-void MAlphaFitter::Scale(TH1D &of, const TH1D &on) const
+Double_t MAlphaFitter::Scale(TH1D &of, const TH1D &on) const
 {
     Float_t scaleon = 1;
@@ -456 +452 @@
     {
     case kNone:
-        return;
+        return 1;
 
     case kEntries:
@@ -481 +477 @@
         break;
 
+        // This is just to make some compiler happy
     default:
-        return;
+        return 1;
     }
 
     if (scaleof!=0)
+    {
         of.Scale(scaleon/scaleof);
+        return scaleon/scaleof;
+    }
     else
+    {
         of.Reset();
-}
+        return 0;
+    }
+}