Changeset 6874 for trunk/MagicSoft/Mars/mhflux

Timestamp:

03/23/05 09:42:31 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

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

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -213 +213 @@
 }
 
-Bool_t MAlphaFitter::Fit(TH1D &hon, TH1D &hof, Double_t alpha, Bool_t paint)
-{
-    /*
-     Clear();
-     if (hon.GetEntries()==0)
-     return kFALSE;
-     */
-
+Bool_t MAlphaFitter::Fit(const TH1D &hon, const TH1D &hof, Double_t alpha, Bool_t paint)
+{
     TH1D h(hon);
-    h.Add(&hof, -1);
+    h.Add(&hof, -1); // substracts also number of entries!
+    h.SetEntries(hon.GetEntries());
 
     MAlphaFitter fit(*this);
@@ -558 +553 @@
         txt = txt.Strip(TString::kBoth);
         txt.ToLower();
-        if (txt==(TString)"Significance")
+        if (txt==(TString)"significance")
             fStrategy = kSignificance;
-        if (txt==(TString)"SignificanceChi2")
+        if (txt==(TString)"significancechi2")
             fStrategy = kSignificanceChi2;
         rc = kTRUE;
     }
 
-    return rc;
-}
+    if (IsEnvDefined(env, prefix, "ScaleMode", print))
+    {
+        TString txt = GetEnvValue(env, prefix, "ScaleMode", "");
+        txt = txt.Strip(TString::kBoth);
+        txt.ToLower();
+        if (txt==(TString)"none")
+            fScaleMode = kNone;
+        if (txt==(TString)"entries")
+            fScaleMode = kEntries;
+        if (txt==(TString)"integral")
+            fScaleMode = kIntegral;
+        if (txt==(TString)"offregion")
+            fScaleMode = kOffRegion;
+        if (txt==(TString)"leastsquare")
+            fScaleMode = kLeastSquare;
+        if (txt==(TString)"userscale")
+            fScaleMode = kUserScale;
+        rc = kTRUE;
+    }
+    if (IsEnvDefined(env, prefix, "Scale", print))
+    {
+        fScaleUser = GetEnvValue(env, prefix, "Scale", fScaleUser);
+        rc = kTRUE;
+    }
+
+    return rc;
+}

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

@@ -125 +125 @@
 
     Bool_t Fit(TH1D &h, Bool_t paint=kFALSE);
-    Bool_t Fit(TH1D &on, TH1D &off, Double_t alpha, Bool_t paint=kFALSE);
+    Bool_t Fit(const TH1D &on, const TH1D &off, Double_t alpha, Bool_t paint=kFALSE);
     Bool_t Fit(TH1D &on, TH1D *off, Double_t alpha, Bool_t paint=kFALSE)
     {

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -827 +827 @@
     //Bool_t rc = fFit.Fit(*h);
     //delete h;
+
     if (!fFit.FitAlpha(fHAlpha, fOffData))
     {
-        *fLog << warn << "Histogram empty." << endl;
+        *fLog << warn << "MAlphaFitter - Fit failed..." << endl;
         return kTRUE;
     }