by changing the behaviour of the global parts of the class PUserFcnBase from pure virtual default NeedGlobalPart=false, the code can be simplified in many places.

This commit is contained in:
suter_a 2021-02-26 15:17:41 +01:00
parent 1372a8b782
commit cc8ac60713
15 changed files with 7 additions and 296 deletions

View File

@ -34,26 +34,6 @@
ClassImp(PUserFcnBase) ClassImp(PUserFcnBase)
//--------------------------------------------------------------------------
// Constructor
//--------------------------------------------------------------------------
/**
* <p>Constructor
*/
PUserFcnBase::PUserFcnBase()
{
}
//--------------------------------------------------------------------------
// Destructor
//--------------------------------------------------------------------------
/**
* <p>Destructor
*/
PUserFcnBase::~PUserFcnBase()
{
}
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// This function is a replacement for the ParseFile method of TSAXParser. // This function is a replacement for the ParseFile method of TSAXParser.
// It is needed because in certain environments ParseFile does not work but ParseBuffer does. // It is needed because in certain environments ParseFile does not work but ParseBuffer does.

View File

@ -55,10 +55,6 @@ public:
ExpRlx(){} ExpRlx(){}
~ExpRlx(){} ~ExpRlx(){}
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
// function operator // function operator
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
@ -73,10 +69,6 @@ public:
SExpRlx(){} SExpRlx(){}
~SExpRlx(){} ~SExpRlx(){}
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
// function operator // function operator
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:

View File

@ -51,12 +51,6 @@ Double_t IAsym_high(Double_t, Double_t, Double_t, Double_t);
class LineGauss : public PUserFcnBase { class LineGauss : public PUserFcnBase {
public: public:
// global user-function-access functions, here without any functionality
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(vector<void*> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
// function operator // function operator
Double_t operator()(Double_t, const vector<Double_t>&) const; Double_t operator()(Double_t, const vector<Double_t>&) const;
@ -68,12 +62,6 @@ public:
class LineLaplace : public PUserFcnBase { class LineLaplace : public PUserFcnBase {
public: public:
// global user-function-access functions, here without any functionality
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(vector<void*> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
// function operator // function operator
Double_t operator()(Double_t, const vector<Double_t>&) const; Double_t operator()(Double_t, const vector<Double_t>&) const;
@ -85,11 +73,6 @@ public:
class LineLorentzian : public PUserFcnBase { class LineLorentzian : public PUserFcnBase {
public: public:
// global user-function-access functions, here without any functionality
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(vector<void*> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
// function operator // function operator
Double_t operator()(Double_t, const vector<Double_t>&) const; Double_t operator()(Double_t, const vector<Double_t>&) const;
@ -101,11 +84,6 @@ public:
class LineSkewLorentzian : public PUserFcnBase { class LineSkewLorentzian : public PUserFcnBase {
public: public:
// global user-function-access functions, here without any functionality
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(vector<void*> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
// function operator // function operator
Double_t operator()(Double_t, const vector<Double_t>&) const; Double_t operator()(Double_t, const vector<Double_t>&) const;
@ -118,11 +96,6 @@ public:
class LineSkewLorentzian2 : public PUserFcnBase { class LineSkewLorentzian2 : public PUserFcnBase {
public: public:
// global user-function-access functions, here without any functionality
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(vector<void*> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
// function operator // function operator
Double_t operator()(Double_t, const vector<Double_t>&) const; Double_t operator()(Double_t, const vector<Double_t>&) const;

View File

@ -38,10 +38,6 @@ public:
TMeanFieldsForScHalfSpace(); TMeanFieldsForScHalfSpace();
~TMeanFieldsForScHalfSpace() {delete fImpProfile; fImpProfile = 0;} ~TMeanFieldsForScHalfSpace() {delete fImpProfile; fImpProfile = 0;}
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
double CalcMeanB (double, const TLondon1D_HS&) const; double CalcMeanB (double, const TLondon1D_HS&) const;
@ -58,10 +54,6 @@ public:
TMeanFieldsForScSingleLayer(); TMeanFieldsForScSingleLayer();
~TMeanFieldsForScSingleLayer() {delete fImpProfile; fImpProfile = 0;} ~TMeanFieldsForScSingleLayer() {delete fImpProfile; fImpProfile = 0;}
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
double CalcMeanB (double, const std::vector<double>&, const std::vector<double>&, const TLondon1D_1L&) const; double CalcMeanB (double, const std::vector<double>&, const std::vector<double>&, const TLondon1D_1L&) const;
@ -78,10 +70,6 @@ public:
TMeanFieldsForScBilayer(); TMeanFieldsForScBilayer();
~TMeanFieldsForScBilayer() {delete fImpProfile; fImpProfile = 0;} ~TMeanFieldsForScBilayer() {delete fImpProfile; fImpProfile = 0;}
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
double CalcMeanB (double, const std::vector<double>&, const std::vector<double>&, const TLondon1D_2L&, double) const; double CalcMeanB (double, const std::vector<double>&, const std::vector<double>&, const TLondon1D_2L&, double) const;
@ -98,10 +86,6 @@ public:
TMeanFieldsForScTrilayer(); TMeanFieldsForScTrilayer();
~TMeanFieldsForScTrilayer() {delete fImpProfile; fImpProfile = 0;} ~TMeanFieldsForScTrilayer() {delete fImpProfile; fImpProfile = 0;}
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
double CalcMeanB (double, const std::vector<double>&, const std::vector<double>&, const TLondon1D_3L&) const; double CalcMeanB (double, const std::vector<double>&, const std::vector<double>&, const TLondon1D_3L&) const;
@ -118,10 +102,6 @@ public:
TMeanFieldsForScTrilayerWithInsulator(); TMeanFieldsForScTrilayerWithInsulator();
~TMeanFieldsForScTrilayerWithInsulator() {delete fImpProfile; fImpProfile = 0;} ~TMeanFieldsForScTrilayerWithInsulator() {delete fImpProfile; fImpProfile = 0;}
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
double CalcMeanB (double, const std::vector<double>&, const std::vector<double>&, const TLondon1D_3LwInsulator&) const; double CalcMeanB (double, const std::vector<double>&, const std::vector<double>&, const TLondon1D_3LwInsulator&) const;

View File

@ -206,7 +206,7 @@ double TPofTCalc::Eval(double t) const {
if (i < fNFFT/2){ if (i < fNFFT/2){
return fPT[i]+(fPT[i+1]-fPT[i])/(fT[i+1]-fT[i])*(t-fT[i]); return fPT[i]+(fPT[i+1]-fPT[i])/(fT[i+1]-fT[i])*(t-fT[i]);
} }
std::cout << "TPofTCalc::Eval: No data for the time " << t << " us available! Returning -999.0 ..." << std::endl; //as35 std::cout << "TPofTCalc::Eval: No data for the time " << t << " us available! Returning -999.0 ..." << std::endl;
return -999.0; return -999.0;
} }

View File

@ -43,10 +43,6 @@ public:
TLondon1DHS(); TLondon1DHS();
~TLondon1DHS(); ~TLondon1DHS();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -76,10 +72,6 @@ public:
TLondon1D1L(); TLondon1D1L();
~TLondon1D1L(); ~TLondon1D1L();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -111,10 +103,6 @@ public:
TLondon1D2L(); TLondon1D2L();
~TLondon1D2L(); ~TLondon1D2L();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -145,10 +133,6 @@ public:
TProximity1D1LHS(); TProximity1D1LHS();
~TProximity1D1LHS(); ~TProximity1D1LHS();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -179,10 +163,6 @@ public:
TLondon1D3L(); TLondon1D3L();
~TLondon1D3L(); ~TLondon1D3L();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -213,10 +193,6 @@ public:
TLondon1D3LS(); TLondon1D3LS();
~TLondon1D3LS(); ~TLondon1D3LS();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:

View File

@ -43,10 +43,6 @@ public:
TSkewedGss(); TSkewedGss();
~TSkewedGss(); ~TSkewedGss();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:

View File

@ -43,10 +43,6 @@ public:
TBulkTriVortexLondon(); TBulkTriVortexLondon();
~TBulkTriVortexLondon(); ~TBulkTriVortexLondon();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -76,10 +72,6 @@ public:
TBulkSqVortexLondon(); TBulkSqVortexLondon();
~TBulkSqVortexLondon(); ~TBulkSqVortexLondon();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -109,10 +101,6 @@ public:
TBulkTriVortexML(); TBulkTriVortexML();
~TBulkTriVortexML(); ~TBulkTriVortexML();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -142,10 +130,6 @@ public:
TBulkTriVortexAGL(); TBulkTriVortexAGL();
~TBulkTriVortexAGL(); ~TBulkTriVortexAGL();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -175,10 +159,6 @@ public:
TBulkTriVortexAGLII(); TBulkTriVortexAGLII();
~TBulkTriVortexAGLII(); ~TBulkTriVortexAGLII();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -208,10 +188,6 @@ public:
TBulkTriVortexNGL(); TBulkTriVortexNGL();
~TBulkTriVortexNGL(); ~TBulkTriVortexNGL();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:

View File

@ -45,10 +45,6 @@ public:
TGapSWave(); TGapSWave();
virtual ~TGapSWave(); virtual ~TGapSWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -73,10 +69,6 @@ public:
TGapPointPWave(); TGapPointPWave();
virtual ~TGapPointPWave(); virtual ~TGapPointPWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -101,10 +93,6 @@ public:
TGapLinePWave(); TGapLinePWave();
virtual ~TGapLinePWave(); virtual ~TGapLinePWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -129,10 +117,6 @@ public:
TGapDWave(); TGapDWave();
virtual ~TGapDWave(); virtual ~TGapDWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -157,10 +141,6 @@ public:
TGapCosSqDWave(); TGapCosSqDWave();
virtual ~TGapCosSqDWave(); virtual ~TGapCosSqDWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -185,10 +165,6 @@ public:
TGapSinSqDWave(); TGapSinSqDWave();
virtual ~TGapSinSqDWave(); virtual ~TGapSinSqDWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -213,10 +189,6 @@ public:
TGapAnSWave(); TGapAnSWave();
virtual ~TGapAnSWave(); virtual ~TGapAnSWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -241,10 +213,6 @@ public:
TGapNonMonDWave1(); TGapNonMonDWave1();
virtual ~TGapNonMonDWave1(); virtual ~TGapNonMonDWave1();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -269,10 +237,6 @@ public:
TGapNonMonDWave2(); TGapNonMonDWave2();
virtual ~TGapNonMonDWave2(); virtual ~TGapNonMonDWave2();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -298,10 +262,6 @@ public:
TGapPowerLaw() {} TGapPowerLaw() {}
virtual ~TGapPowerLaw() {} virtual ~TGapPowerLaw() {}
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -319,10 +279,6 @@ public:
TGapDirtySWave() {} TGapDirtySWave() {}
virtual ~TGapDirtySWave() {} virtual ~TGapDirtySWave() {}
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -341,10 +297,6 @@ public:
TLambdaSWave(); TLambdaSWave();
virtual ~TLambdaSWave(); virtual ~TLambdaSWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -363,10 +315,6 @@ public:
TLambdaPointPWave(); TLambdaPointPWave();
virtual ~TLambdaPointPWave(); virtual ~TLambdaPointPWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -385,10 +333,6 @@ public:
TLambdaLinePWave(); TLambdaLinePWave();
virtual ~TLambdaLinePWave(); virtual ~TLambdaLinePWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -407,10 +351,6 @@ public:
TLambdaDWave(); TLambdaDWave();
virtual ~TLambdaDWave(); virtual ~TLambdaDWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -429,10 +369,6 @@ public:
TLambdaAnSWave(); TLambdaAnSWave();
virtual ~TLambdaAnSWave(); virtual ~TLambdaAnSWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -451,10 +387,6 @@ public:
TLambdaNonMonDWave1(); TLambdaNonMonDWave1();
virtual ~TLambdaNonMonDWave1(); virtual ~TLambdaNonMonDWave1();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -473,10 +405,6 @@ public:
TLambdaNonMonDWave2(); TLambdaNonMonDWave2();
virtual ~TLambdaNonMonDWave2(); virtual ~TLambdaNonMonDWave2();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -495,10 +423,6 @@ public:
TLambdaPowerLaw() {} TLambdaPowerLaw() {}
virtual ~TLambdaPowerLaw() {} virtual ~TLambdaPowerLaw() {}
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -516,10 +440,6 @@ public:
TLambdaInvSWave(); TLambdaInvSWave();
virtual ~TLambdaInvSWave(); virtual ~TLambdaInvSWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -538,10 +458,6 @@ public:
TLambdaInvPointPWave(); TLambdaInvPointPWave();
virtual ~TLambdaInvPointPWave(); virtual ~TLambdaInvPointPWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -560,10 +476,6 @@ public:
TLambdaInvLinePWave(); TLambdaInvLinePWave();
virtual ~TLambdaInvLinePWave(); virtual ~TLambdaInvLinePWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -582,10 +494,6 @@ public:
TLambdaInvDWave(); TLambdaInvDWave();
virtual ~TLambdaInvDWave(); virtual ~TLambdaInvDWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -604,10 +512,6 @@ public:
TLambdaInvAnSWave(); TLambdaInvAnSWave();
virtual ~TLambdaInvAnSWave(); virtual ~TLambdaInvAnSWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -626,10 +530,6 @@ public:
TLambdaInvNonMonDWave1(); TLambdaInvNonMonDWave1();
virtual ~TLambdaInvNonMonDWave1(); virtual ~TLambdaInvNonMonDWave1();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -648,10 +548,6 @@ public:
TLambdaInvNonMonDWave2(); TLambdaInvNonMonDWave2();
virtual ~TLambdaInvNonMonDWave2(); virtual ~TLambdaInvNonMonDWave2();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -670,10 +566,6 @@ public:
TLambdaInvPowerLaw() {} TLambdaInvPowerLaw() {}
virtual ~TLambdaInvPowerLaw() {} virtual ~TLambdaInvPowerLaw() {}
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -691,10 +583,6 @@ public:
TFilmMagnetizationDWave(); TFilmMagnetizationDWave();
virtual ~TFilmMagnetizationDWave(); virtual ~TFilmMagnetizationDWave();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:

View File

@ -44,10 +44,6 @@ class PGbGLF : public PUserFcnBase
PGbGLF() {} PGbGLF() {}
virtual ~PGbGLF() {} virtual ~PGbGLF() {}
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) {}
virtual Bool_t GlobalPartIsValid() const { return true; }
virtual Double_t operator()(Double_t t, const std::vector<Double_t> &param) const; virtual Double_t operator()(Double_t t, const std::vector<Double_t> &param) const;
private: private:

View File

@ -58,10 +58,6 @@ public:
TLFStatGssKT(); TLFStatGssKT();
~TLFStatGssKT(); ~TLFStatGssKT();
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -85,10 +81,6 @@ public:
TLFStatExpKT(); TLFStatExpKT();
~TLFStatExpKT(); ~TLFStatExpKT();
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -119,10 +111,6 @@ public:
TLFDynGssKT(); TLFDynGssKT();
~TLFDynGssKT(); ~TLFDynGssKT();
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -172,10 +160,6 @@ public:
TLFDynExpKT(); TLFDynExpKT();
~TLFDynExpKT(); ~TLFDynExpKT();
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -227,10 +211,6 @@ public:
TLFDynSG(); TLFDynSG();
~TLFDynSG(); ~TLFDynSG();
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:
@ -255,10 +235,6 @@ public:
TLFSGInterpolation(); TLFSGInterpolation();
~TLFSGInterpolation(); ~TLFSGInterpolation();
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:

View File

@ -8,7 +8,7 @@
***************************************************************************/ ***************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2013-2019 by Andreas Suter * * Copyright (C) 2013-2021 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@ -43,11 +43,6 @@ class PPhotoMeissner : public PUserFcnBase
virtual Bool_t IsValid() { return fValid; } virtual Bool_t IsValid() { return fValid; }
// global user-function-access functions, here without any functionality
virtual Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(std::vector<void*> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
// function operator // function operator
Double_t operator()(Double_t, const std::vector<Double_t>&) const; Double_t operator()(Double_t, const std::vector<Double_t>&) const;

View File

@ -43,11 +43,6 @@ class PSkewedLorentzian : public PUserFcnBase
virtual Bool_t IsValid() { return fValid; } virtual Bool_t IsValid() { return fValid; }
// global user-function-access functions, here without any functionality
virtual Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(std::vector<void*> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
// function operator // function operator
Double_t operator()(Double_t, const std::vector<Double_t>&) const; Double_t operator()(Double_t, const std::vector<Double_t>&) const;

View File

@ -50,10 +50,6 @@ public:
ZFMagGss(){} ///< default constructor ZFMagGss(){} ///< default constructor
~ZFMagGss(){} ///< default destructor ~ZFMagGss(){} ///< default destructor
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
ClassDef(ZFMagGss,1) ClassDef(ZFMagGss,1)
@ -75,10 +71,6 @@ public:
ZFMagExp(){} ///< default constructor ZFMagExp(){} ///< default constructor
~ZFMagExp(){} ///< default destructor ~ZFMagExp(){} ///< default destructor
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
ClassDef(ZFMagExp,1) ClassDef(ZFMagExp,1)
@ -99,10 +91,6 @@ public:
UniaxialStatGssKT(); UniaxialStatGssKT();
virtual ~UniaxialStatGssKT(); virtual ~UniaxialStatGssKT();
virtual Bool_t NeedGlobalPart() const { return false; }
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) { }
virtual Bool_t GlobalPartIsValid() const { return true; }
double operator()(double, const std::vector<double>&) const; double operator()(double, const std::vector<double>&) const;
private: private:

View File

@ -42,12 +42,12 @@
class PUserFcnBase : public TObject class PUserFcnBase : public TObject
{ {
public: public:
PUserFcnBase(); PUserFcnBase() {}
virtual ~PUserFcnBase(); virtual ~PUserFcnBase() {}
virtual Bool_t NeedGlobalPart() const = 0; ///< if a user function needs a global part this function should return true, otherwise false virtual Bool_t NeedGlobalPart() const { return false; } ///< if a user function needs a global part this function should return true, otherwise false (default: false)
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) = 0; ///< if a user function is using a global part, this function is used to invoke and retrieve the proper global object virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) {} ///< if a user function is using a global part, this function is used to invoke and retrieve the proper global object
virtual Bool_t GlobalPartIsValid() const = 0; ///< if a user function is using a global part, this function returns if the global object part is valid virtual Bool_t GlobalPartIsValid() const { return false; } ///< if a user function is using a global part, this function returns if the global object part is valid (default: false)
virtual Double_t operator()(Double_t t, const std::vector<Double_t> &param) const = 0; virtual Double_t operator()(Double_t t, const std::vector<Double_t> &param) const = 0;