Ignore:
Timestamp:
02/07/05 18:17:35 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mhflux
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

    r5971 r6283  
    2828        kUserScale
    2929    };
     30    enum Strategy_t {
     31        kSignificance,
     32        kSignificanceChi2
     33    };
    3034private:
    3135    Float_t fSigInt;
     
    5458    Double_t fScaleUser;
    5559
     60    Strategy_t fStrategy;
     61
    5662public:
    5763    // Implementing the function yourself is only about 5% faster
    58     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)
     64    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)
    5965    {
    6066        fName  = name  ? name  : "MAlphaFitter";
     
    8894    void SetScaleUser(Float_t scale)       { fScaleUser = scale; fScaleMode=kUserScale; }
    8995    void SetScaleMode(ScaleMode_t mode)    { fScaleMode    = mode; }
     96    void SetMinimizationStrategy(Strategy_t mode) { fStrategy = mode; }
    9097    void SetSignalIntegralMax(Float_t s)   { fSigInt       = s; }
    9198    void SetSignalFitMax(Float_t s)        { fSigMax       = s; }
     
    107114    Double_t GetChiSqBg() const            { return fChiSqBg; }
    108115    Double_t GetScaleFactor() const        { return fScaleFactor; }
     116    Double_t GetMinimizationValue() const;
    109117
    110118    Double_t GetGausSigma() const          { return fCoefficients[2]; }
  • trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

    r6240 r6283  
    836836    fFit.Print("result");
    837837
    838     fResult->SetVal(-fFit.GetSignificance());
     838    fResult->SetVal(fFit.GetMinimizationValue());
    839839
    840840    if (!fSkipHistEnergy)
  • trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.cc

    r5620 r6283  
    329329    //           R  use the range specified in the function range
    330330    //           Q  quiet mode
    331     h->Fit(&func, "NIQ", "", yq[0], yq[1]);
     331    h->Fit(&func, "NIQE", "", yq[0], yq[1]);
    332332
    333333    const Double_t chi2 = func.GetChisquare();
Note: See TracChangeset for help on using the changeset viewer.