Removed class MLRes from libBNMR. It wasn`t implemented.
This commit is contained in:
parent
9c73880b8b
commit
7d5429b5e3
29
src/external/libBNMR/TBNMR.cpp
vendored
29
src/external/libBNMR/TBNMR.cpp
vendored
@ -38,7 +38,6 @@
|
||||
|
||||
ClassImp(ExpRlx) // for the ROOT-dictionary
|
||||
ClassImp(SExpRlx)
|
||||
ClassImp(MLRes)
|
||||
|
||||
|
||||
double ExpRlx::operator()(double x, const vector<double> &par) const {
|
||||
@ -84,31 +83,3 @@ double SExpRlx::operator()(double x, const vector<double> &par) const {
|
||||
return 0;
|
||||
}
|
||||
|
||||
double MLRes::operator()(double x, const vector<double> &par) const {
|
||||
assert(par.size()==3); // make sure the number of parameters handed to the function is correct
|
||||
|
||||
// par[0] time of beam off
|
||||
// par[1] is the relaxation rate
|
||||
// par[2] is the exponent
|
||||
double tau_p;
|
||||
double y;
|
||||
|
||||
tau_p = (tau_Li/(1.+par[1]*tau_Li));
|
||||
|
||||
|
||||
if ( x >= 0 && x <= par[0] ) {
|
||||
TF1 sexp("sexp", "exp(-([0]-x)/[3])*exp(-pow(([1]*([0]-x)),[2]))", 0.0, 10000.0);
|
||||
sexp.SetParameters(x, par[1], par[2],tau_Li);
|
||||
sexp.SetNpx(1000);
|
||||
y=sexp.Integral(0.0,x)/(1-exp(-x/tau_Li))/tau_Li;
|
||||
} else if ( x > par[0] ) {
|
||||
TF1 sexp("sexp", "exp(-([3]-x)/[4])*exp(-pow(([1]*([0]-x)),[2]))", 0.0, 10000.0);
|
||||
sexp.SetParameters(x, par[1], par[2], par[0],tau_Li);
|
||||
sexp.SetNpx(1000);
|
||||
y=sexp.Integral(0.0,par[0])/(1-exp(-par[0]/tau_Li))/tau_Li;
|
||||
} else {
|
||||
y = 0;
|
||||
}
|
||||
return y;
|
||||
}
|
||||
|
||||
|
17
src/external/libBNMR/TBNMR.h
vendored
17
src/external/libBNMR/TBNMR.h
vendored
@ -83,22 +83,5 @@ private:
|
||||
ClassDef(SExpRlx,1)
|
||||
};
|
||||
|
||||
class MLRes : public PUserFcnBase {
|
||||
|
||||
public:
|
||||
// default constructor and destructor
|
||||
MLRes(){}
|
||||
~MLRes(){}
|
||||
|
||||
Bool_t NeedGlobalPart() const { return false; }
|
||||
void SetGlobalPart(vector<void *> &globalPart, UInt_t idx) { }
|
||||
Bool_t GlobalPartIsValid() const { return true; }
|
||||
|
||||
// function operator
|
||||
double operator()(double, const vector<double>&) const;
|
||||
|
||||
// definition of the class for the ROOT-dictionary
|
||||
ClassDef(MLRes,1)
|
||||
};
|
||||
|
||||
#endif //LIBBNMRH
|
||||
|
1
src/external/libBNMR/TBNMRLinkDef.h
vendored
1
src/external/libBNMR/TBNMRLinkDef.h
vendored
@ -37,6 +37,5 @@
|
||||
|
||||
#pragma link C++ class ExpRlx+;
|
||||
#pragma link C++ class SExpRlx+;
|
||||
#pragma link C++ class MLRes+;
|
||||
|
||||
#endif //__CINT__
|
||||
|
Loading…
x
Reference in New Issue
Block a user