Changeset 6282 for trunk/MagicSoft/Mars/mhflux

Timestamp:

02/07/05 18:16:48 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -140 +140 @@
     //           R  use the range specified in the function range
     //           Q  quiet mode
+    //           E  Perform better Errors estimation using Minos technique
     h.Fit(fFunc, "NQI", "", bgmin, bgmax);
 
@@ -175 +176 @@
     //           R  use the range specified in the function range
     //           Q  quiet mode
+    //           E  Perform better Errors estimation using Minos technique
     h.Fit(fFunc, "NQI", "", 0, sigmax);
 
@@ -261 +263 @@
     //           R  use the range specified in the function range
     //           Q  quiet mode
+    //           E  Perform better Errors estimation using Minos technique
     TH1D h(hon);
     h.Add(&hof, -1);
@@ -317 +320 @@
     f.fScaleMode    = fScaleMode;
     f.fScaleUser    = fScaleUser;
+    f.fStrategy     = fStrategy;
     f.fCoefficients.Set(fCoefficients.GetSize());
     f.fCoefficients.Reset();
@@ -494 +498 @@
 }
 
+Double_t MAlphaFitter::GetMinimizationValue() const
+{
+    switch (fStrategy)
+    {
+    case kSignificance:
+        return -GetSignificance();
+    case kSignificanceChi2:
+        return -GetSignificance()/GetChiSqSignal();
+    }
+    return 0;
+}
+
 Int_t MAlphaFitter::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
@@ -537 +553 @@
     }
 
-    return rc;
-}
+    if (IsEnvDefined(env, prefix, "MinimizationStrategy", print))
+    {
+        TString txt = GetEnvValue(env, prefix, "MinimizationStrategy", "");
+        txt = txt.Strip(TString::kBoth);
+        txt.ToLower();
+        if (txt==(TString)"Significance")
+            fStrategy = kSignificance;
+        if (txt==(TString)"SignificanceChi2")
+            fStrategy = kSignificanceChi2;
+        rc = kTRUE;
+    }
+
+    return rc;
+}