Changeset 6283

Timestamp:

02/07/05 18:17:35 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhflux/MAlphaFitter.h (modified) (4 diffs)
• mhflux/MHAlpha.cc (modified) (1 diff)
• mhflux/MHEffectiveOnTime.cc (modified) (1 diff)
• mhflux/MHEnergyEst.cc (added)
• mhflux/MHEnergyEst.h (added)

trunk/MagicSoft/Mars/Changelog

@@ -71 +71 @@
 
    * mjobs/MJOptimize.[h,cc], mjobs/MSequences.[h,cc],
-     mjobs/MJCut.[h,cc], ganymed.[cc,rc]:
+     mjobs/MJCut.[h,cc], ganymed.[cc,rc], mhflux/MHEnergyEst.[h,cc]:
      - added to repository, but not yet to Makefile because
        there is still some work to be done. But whoever is
        interested in the new classes/program may already use it.
+
+   * mhflux/MAlphaFitter.[h,cc]:
+     - added option to choose the minimization value
+
+   * mhflux/MHAlpha.cc:
+     - replaced significance by minimization value
+
+   * mhflux/MHEffectiveOnTime.cc:
+     - use E-Option when fitting to improve error calculation
+       by using Minos technique
 
 

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

@@ -28 +28 @@
         kUserScale
     };
+    enum Strategy_t {
+        kSignificance,
+        kSignificanceChi2
+    };
 private:
     Float_t fSigInt;
@@ -54 +58 @@
     Double_t fScaleUser;
 
+    Strategy_t fStrategy;
+
 public:
     // Implementing the function yourself is only about 5% faster
-    MAlphaFitter(const char *name=0, const char *title=0) : fSigInt(15), fSigMax(75), fBgMin(45), fBgMax(85), fScaleMin(40), fScaleMax(80), fPolynomOrder(2), fCoefficients(3+fPolynomOrder+1), fFunc(new TF1("", Form("gaus(0) + pol%d(3)", fPolynomOrder), 0, 90)), fScaleMode(kOffRegion), fScaleUser(1)
+    MAlphaFitter(const char *name=0, const char *title=0) : fSigInt(15), fSigMax(75), fBgMin(45), fBgMax(85), fScaleMin(40), fScaleMax(80), fPolynomOrder(2), fCoefficients(3+fPolynomOrder+1), fFunc(new TF1("", Form("gaus(0) + pol%d(3)", fPolynomOrder), 0, 90)), fScaleMode(kOffRegion), fScaleUser(1), fStrategy(kSignificance)
     {
         fName  = name  ? name  : "MAlphaFitter";
@@ -88 +94 @@
     void SetScaleUser(Float_t scale)       { fScaleUser = scale; fScaleMode=kUserScale; }
     void SetScaleMode(ScaleMode_t mode)    { fScaleMode    = mode; }
+    void SetMinimizationStrategy(Strategy_t mode) { fStrategy = mode; }
     void SetSignalIntegralMax(Float_t s)   { fSigInt       = s; }
     void SetSignalFitMax(Float_t s)        { fSigMax       = s; }
@@ -107 +114 @@
     Double_t GetChiSqBg() const            { return fChiSqBg; }
     Double_t GetScaleFactor() const        { return fScaleFactor; }
+    Double_t GetMinimizationValue() const;
 
     Double_t GetGausSigma() const          { return fCoefficients[2]; }

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -836 +836 @@
     fFit.Print("result");
 
-    fResult->SetVal(-fFit.GetSignificance());
+    fResult->SetVal(fFit.GetMinimizationValue());
 
     if (!fSkipHistEnergy)

trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.cc

@@ -329 +329 @@
     //           R  use the range specified in the function range
     //           Q  quiet mode
-    h->Fit(&func, "NIQ", "", yq[0], yq[1]);
+    h->Fit(&func, "NIQE", "", yq[0], yq[1]);
 
     const Double_t chi2 = func.GetChisquare();