diff --git a/src/classes/PUserFcnBase.cpp b/src/classes/PUserFcnBase.cpp index db655131..9a9ea3fc 100644 --- a/src/classes/PUserFcnBase.cpp +++ b/src/classes/PUserFcnBase.cpp @@ -34,26 +34,6 @@ ClassImp(PUserFcnBase) -//-------------------------------------------------------------------------- -// Constructor -//-------------------------------------------------------------------------- -/** - *

Constructor - */ -PUserFcnBase::PUserFcnBase() -{ -} - -//-------------------------------------------------------------------------- -// Destructor -//-------------------------------------------------------------------------- -/** - *

Destructor - */ -PUserFcnBase::~PUserFcnBase() -{ -} - //-------------------------------------------------------------------------- // 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. diff --git a/src/external/libBNMR/TBNMR.h b/src/external/libBNMR/TBNMR.h index 6a95b4e9..2fb900c5 100644 --- a/src/external/libBNMR/TBNMR.h +++ b/src/external/libBNMR/TBNMR.h @@ -55,10 +55,6 @@ public: ExpRlx(){} ~ExpRlx(){} - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - // function operator double operator()(double, const std::vector&) const; @@ -73,10 +69,6 @@ public: SExpRlx(){} ~SExpRlx(){} - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - // function operator double operator()(double, const std::vector&) const; private: diff --git a/src/external/libBNMR/libLineProfile/LineProfile.h b/src/external/libBNMR/libLineProfile/LineProfile.h index 85e269f1..13a2a106 100644 --- a/src/external/libBNMR/libLineProfile/LineProfile.h +++ b/src/external/libBNMR/libLineProfile/LineProfile.h @@ -51,12 +51,6 @@ Double_t IAsym_high(Double_t, Double_t, Double_t, Double_t); class LineGauss : public PUserFcnBase { public: - - // global user-function-access functions, here without any functionality - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - // function operator Double_t operator()(Double_t, const vector&) const; @@ -68,12 +62,6 @@ public: class LineLaplace : public PUserFcnBase { public: - - // global user-function-access functions, here without any functionality - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - // function operator Double_t operator()(Double_t, const vector&) const; @@ -85,11 +73,6 @@ public: class LineLorentzian : public PUserFcnBase { public: - // global user-function-access functions, here without any functionality - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - // function operator Double_t operator()(Double_t, const vector&) const; @@ -101,11 +84,6 @@ public: class LineSkewLorentzian : public PUserFcnBase { public: - // global user-function-access functions, here without any functionality - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - // function operator Double_t operator()(Double_t, const vector&) const; @@ -118,11 +96,6 @@ public: class LineSkewLorentzian2 : public PUserFcnBase { public: - // global user-function-access functions, here without any functionality - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - // function operator Double_t operator()(Double_t, const vector&) const; diff --git a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h index 641f5239..926a03fd 100644 --- a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h +++ b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h @@ -38,10 +38,6 @@ public: TMeanFieldsForScHalfSpace(); ~TMeanFieldsForScHalfSpace() {delete fImpProfile; fImpProfile = 0;} - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; double CalcMeanB (double, const TLondon1D_HS&) const; @@ -58,10 +54,6 @@ public: TMeanFieldsForScSingleLayer(); ~TMeanFieldsForScSingleLayer() {delete fImpProfile; fImpProfile = 0;} - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; double CalcMeanB (double, const std::vector&, const std::vector&, const TLondon1D_1L&) const; @@ -78,10 +70,6 @@ public: TMeanFieldsForScBilayer(); ~TMeanFieldsForScBilayer() {delete fImpProfile; fImpProfile = 0;} - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; double CalcMeanB (double, const std::vector&, const std::vector&, const TLondon1D_2L&, double) const; @@ -98,10 +86,6 @@ public: TMeanFieldsForScTrilayer(); ~TMeanFieldsForScTrilayer() {delete fImpProfile; fImpProfile = 0;} - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; double CalcMeanB (double, const std::vector&, const std::vector&, const TLondon1D_3L&) const; @@ -118,10 +102,6 @@ public: TMeanFieldsForScTrilayerWithInsulator(); ~TMeanFieldsForScTrilayerWithInsulator() {delete fImpProfile; fImpProfile = 0;} - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; double CalcMeanB (double, const std::vector&, const std::vector&, const TLondon1D_3LwInsulator&) const; diff --git a/src/external/libFitPofB/classes/TPofTCalc.cpp b/src/external/libFitPofB/classes/TPofTCalc.cpp index 5e292e76..2072ee00 100644 --- a/src/external/libFitPofB/classes/TPofTCalc.cpp +++ b/src/external/libFitPofB/classes/TPofTCalc.cpp @@ -206,7 +206,7 @@ double TPofTCalc::Eval(double t) const { if (i < fNFFT/2){ 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; } diff --git a/src/external/libFitPofB/include/TLondon1D.h b/src/external/libFitPofB/include/TLondon1D.h index aa4f4e8f..fcc49e84 100644 --- a/src/external/libFitPofB/include/TLondon1D.h +++ b/src/external/libFitPofB/include/TLondon1D.h @@ -43,10 +43,6 @@ public: TLondon1DHS(); ~TLondon1DHS(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -76,10 +72,6 @@ public: TLondon1D1L(); ~TLondon1D1L(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -111,10 +103,6 @@ public: TLondon1D2L(); ~TLondon1D2L(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -145,10 +133,6 @@ public: TProximity1D1LHS(); ~TProximity1D1LHS(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -179,10 +163,6 @@ public: TLondon1D3L(); ~TLondon1D3L(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -213,10 +193,6 @@ public: TLondon1D3LS(); ~TLondon1D3LS(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: diff --git a/src/external/libFitPofB/include/TSkewedGss.h b/src/external/libFitPofB/include/TSkewedGss.h index 1eb97e9a..dc90366c 100644 --- a/src/external/libFitPofB/include/TSkewedGss.h +++ b/src/external/libFitPofB/include/TSkewedGss.h @@ -43,10 +43,6 @@ public: TSkewedGss(); ~TSkewedGss(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: diff --git a/src/external/libFitPofB/include/TVortex.h b/src/external/libFitPofB/include/TVortex.h index 21c79e90..352309b8 100644 --- a/src/external/libFitPofB/include/TVortex.h +++ b/src/external/libFitPofB/include/TVortex.h @@ -43,10 +43,6 @@ public: TBulkTriVortexLondon(); ~TBulkTriVortexLondon(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -76,10 +72,6 @@ public: TBulkSqVortexLondon(); ~TBulkSqVortexLondon(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -109,10 +101,6 @@ public: TBulkTriVortexML(); ~TBulkTriVortexML(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -142,10 +130,6 @@ public: TBulkTriVortexAGL(); ~TBulkTriVortexAGL(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -175,10 +159,6 @@ public: TBulkTriVortexAGLII(); ~TBulkTriVortexAGLII(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -208,10 +188,6 @@ public: TBulkTriVortexNGL(); ~TBulkTriVortexNGL(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: diff --git a/src/external/libGapIntegrals/TGapIntegrals.h b/src/external/libGapIntegrals/TGapIntegrals.h index 07c498be..69148941 100644 --- a/src/external/libGapIntegrals/TGapIntegrals.h +++ b/src/external/libGapIntegrals/TGapIntegrals.h @@ -45,10 +45,6 @@ public: TGapSWave(); virtual ~TGapSWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -73,10 +69,6 @@ public: TGapPointPWave(); virtual ~TGapPointPWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -101,10 +93,6 @@ public: TGapLinePWave(); virtual ~TGapLinePWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -129,10 +117,6 @@ public: TGapDWave(); virtual ~TGapDWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -157,10 +141,6 @@ public: TGapCosSqDWave(); virtual ~TGapCosSqDWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -185,10 +165,6 @@ public: TGapSinSqDWave(); virtual ~TGapSinSqDWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -213,10 +189,6 @@ public: TGapAnSWave(); virtual ~TGapAnSWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -241,10 +213,6 @@ public: TGapNonMonDWave1(); virtual ~TGapNonMonDWave1(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -269,10 +237,6 @@ public: TGapNonMonDWave2(); virtual ~TGapNonMonDWave2(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -298,10 +262,6 @@ public: TGapPowerLaw() {} virtual ~TGapPowerLaw() {} - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -319,10 +279,6 @@ public: TGapDirtySWave() {} virtual ~TGapDirtySWave() {} - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -341,10 +297,6 @@ public: TLambdaSWave(); virtual ~TLambdaSWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -363,10 +315,6 @@ public: TLambdaPointPWave(); virtual ~TLambdaPointPWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -385,10 +333,6 @@ public: TLambdaLinePWave(); virtual ~TLambdaLinePWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -407,10 +351,6 @@ public: TLambdaDWave(); virtual ~TLambdaDWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -429,10 +369,6 @@ public: TLambdaAnSWave(); virtual ~TLambdaAnSWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -451,10 +387,6 @@ public: TLambdaNonMonDWave1(); virtual ~TLambdaNonMonDWave1(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -473,10 +405,6 @@ public: TLambdaNonMonDWave2(); virtual ~TLambdaNonMonDWave2(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -495,10 +423,6 @@ public: TLambdaPowerLaw() {} virtual ~TLambdaPowerLaw() {} - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -516,10 +440,6 @@ public: TLambdaInvSWave(); virtual ~TLambdaInvSWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -538,10 +458,6 @@ public: TLambdaInvPointPWave(); virtual ~TLambdaInvPointPWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -560,10 +476,6 @@ public: TLambdaInvLinePWave(); virtual ~TLambdaInvLinePWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -582,10 +494,6 @@ public: TLambdaInvDWave(); virtual ~TLambdaInvDWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -604,10 +512,6 @@ public: TLambdaInvAnSWave(); virtual ~TLambdaInvAnSWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -626,10 +530,6 @@ public: TLambdaInvNonMonDWave1(); virtual ~TLambdaInvNonMonDWave1(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -648,10 +548,6 @@ public: TLambdaInvNonMonDWave2(); virtual ~TLambdaInvNonMonDWave2(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -670,10 +566,6 @@ public: TLambdaInvPowerLaw() {} virtual ~TLambdaInvPowerLaw() {} - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -691,10 +583,6 @@ public: TFilmMagnetizationDWave(); virtual ~TFilmMagnetizationDWave(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: diff --git a/src/external/libGbGLF/PGbGLF.h b/src/external/libGbGLF/PGbGLF.h index 93c772ce..aa6cf9db 100644 --- a/src/external/libGbGLF/PGbGLF.h +++ b/src/external/libGbGLF/PGbGLF.h @@ -44,10 +44,6 @@ class PGbGLF : public PUserFcnBase PGbGLF() {} virtual ~PGbGLF() {} - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) {} - virtual Bool_t GlobalPartIsValid() const { return true; } - virtual Double_t operator()(Double_t t, const std::vector ¶m) const; private: diff --git a/src/external/libLFRelaxation/TLFRelaxation.h b/src/external/libLFRelaxation/TLFRelaxation.h index 6db5d71a..e03be8d6 100644 --- a/src/external/libLFRelaxation/TLFRelaxation.h +++ b/src/external/libLFRelaxation/TLFRelaxation.h @@ -58,10 +58,6 @@ public: TLFStatGssKT(); ~TLFStatGssKT(); - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -85,10 +81,6 @@ public: TLFStatExpKT(); ~TLFStatExpKT(); - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -119,10 +111,6 @@ public: TLFDynGssKT(); ~TLFDynGssKT(); - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -172,10 +160,6 @@ public: TLFDynExpKT(); ~TLFDynExpKT(); - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -227,10 +211,6 @@ public: TLFDynSG(); ~TLFDynSG(); - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: @@ -255,10 +235,6 @@ public: TLFSGInterpolation(); ~TLFSGInterpolation(); - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: diff --git a/src/external/libPhotoMeissner/include/PPhotoMeissner.h b/src/external/libPhotoMeissner/include/PPhotoMeissner.h index 85956c76..9f12b7e9 100644 --- a/src/external/libPhotoMeissner/include/PPhotoMeissner.h +++ b/src/external/libPhotoMeissner/include/PPhotoMeissner.h @@ -8,7 +8,7 @@ ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2013-2019 by Andreas Suter * + * Copyright (C) 2013-2021 by Andreas Suter * * andreas.suter@psi.ch * * * * 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; } - // global user-function-access functions, here without any functionality - virtual Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - // function operator Double_t operator()(Double_t, const std::vector&) const; diff --git a/src/external/libSpinValve/include/PSkewedLorentzian.h b/src/external/libSpinValve/include/PSkewedLorentzian.h index c0452aa1..52c0e27b 100644 --- a/src/external/libSpinValve/include/PSkewedLorentzian.h +++ b/src/external/libSpinValve/include/PSkewedLorentzian.h @@ -43,11 +43,6 @@ class PSkewedLorentzian : public PUserFcnBase 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 &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - // function operator Double_t operator()(Double_t, const std::vector&) const; diff --git a/src/external/libZFRelaxation/ZFRelaxation.h b/src/external/libZFRelaxation/ZFRelaxation.h index d142c5ea..db9209a6 100644 --- a/src/external/libZFRelaxation/ZFRelaxation.h +++ b/src/external/libZFRelaxation/ZFRelaxation.h @@ -50,10 +50,6 @@ public: ZFMagGss(){} ///< default constructor ~ZFMagGss(){} ///< default destructor - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; ClassDef(ZFMagGss,1) @@ -75,10 +71,6 @@ public: ZFMagExp(){} ///< default constructor ~ZFMagExp(){} ///< default destructor - Bool_t NeedGlobalPart() const { return false; } - void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; ClassDef(ZFMagExp,1) @@ -99,10 +91,6 @@ public: UniaxialStatGssKT(); virtual ~UniaxialStatGssKT(); - virtual Bool_t NeedGlobalPart() const { return false; } - virtual void SetGlobalPart(std::vector &globalPart, UInt_t idx) { } - virtual Bool_t GlobalPartIsValid() const { return true; } - double operator()(double, const std::vector&) const; private: diff --git a/src/include/PUserFcnBase.h b/src/include/PUserFcnBase.h index c5ddf293..16c65e5d 100644 --- a/src/include/PUserFcnBase.h +++ b/src/include/PUserFcnBase.h @@ -42,12 +42,12 @@ class PUserFcnBase : public TObject { public: - PUserFcnBase(); - virtual ~PUserFcnBase(); + 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 void SetGlobalPart(std::vector &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 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 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 &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 { 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 ¶m) const = 0;