slightly more modern c++ init style.
This commit is contained in:
parent
9657c8076f
commit
bd75f25ee6
19
src/external/Nonlocal/PNL_PippardFitter.cpp
vendored
19
src/external/Nonlocal/PNL_PippardFitter.cpp
vendored
@ -50,10 +50,6 @@ ClassImp(PNL_PippardFitterGlobal)
|
||||
*/
|
||||
PNL_PippardFitterGlobal::PNL_PippardFitterGlobal()
|
||||
{
|
||||
fValid = true;
|
||||
fStartupHandler = 0;
|
||||
fRgeHandler = 0;
|
||||
|
||||
// read XML startup file
|
||||
char startup_path_name[128];
|
||||
TSAXParser *saxParser = new TSAXParser();
|
||||
@ -348,19 +344,6 @@ Double_t PNL_PippardFitterGlobal::XiP_T(const Double_t xi0, const Double_t meanF
|
||||
|
||||
ClassImp(PNL_PippardFitter)
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// Constructor
|
||||
//--------------------------------------------------------------------------
|
||||
/**
|
||||
*
|
||||
*/
|
||||
PNL_PippardFitter::PNL_PippardFitter()
|
||||
{
|
||||
fValid = false;
|
||||
fInvokedGlobal = false;
|
||||
fPippardFitterGlobal = 0;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// Destructor
|
||||
//--------------------------------------------------------------------------
|
||||
@ -392,7 +375,7 @@ void PNL_PippardFitter::SetGlobalPart(std::vector<void*> &globalPart, UInt_t idx
|
||||
|
||||
if ((Int_t)globalPart.size() <= fIdxGlobal) {
|
||||
fPippardFitterGlobal = new PNL_PippardFitterGlobal();
|
||||
if (fPippardFitterGlobal == 0) {
|
||||
if (fPippardFitterGlobal == nullptr) {
|
||||
fValid = false;
|
||||
std::cerr << std::endl << ">> PNL_PippardFitter::SetGlobalPart(): **ERROR** Couldn't invoke global user function object, sorry ..." << std::endl;
|
||||
} else if (!fPippardFitterGlobal->IsValid()) {
|
||||
|
14
src/external/Nonlocal/PNL_PippardFitter.h
vendored
14
src/external/Nonlocal/PNL_PippardFitter.h
vendored
@ -55,10 +55,10 @@ class PNL_PippardFitterGlobal
|
||||
virtual Double_t GetMagneticField(const Double_t z) const;
|
||||
|
||||
private:
|
||||
Bool_t fValid;
|
||||
Bool_t fValid{true};
|
||||
|
||||
PNL_StartupHandler *fStartupHandler;
|
||||
PRgeHandler *fRgeHandler;
|
||||
PNL_StartupHandler *fStartupHandler{nullptr};
|
||||
PRgeHandler *fRgeHandler{nullptr};
|
||||
|
||||
mutable std::vector<Double_t> fPreviousParam;
|
||||
|
||||
@ -86,7 +86,7 @@ class PNL_PippardFitterGlobal
|
||||
class PNL_PippardFitter : public PUserFcnBase
|
||||
{
|
||||
public:
|
||||
PNL_PippardFitter();
|
||||
PNL_PippardFitter() {}
|
||||
virtual ~PNL_PippardFitter();
|
||||
|
||||
virtual Bool_t NeedGlobalPart() const { return true; }
|
||||
@ -96,11 +96,11 @@ class PNL_PippardFitter : public PUserFcnBase
|
||||
virtual Double_t operator()(Double_t t, const std::vector<Double_t> ¶m) const;
|
||||
|
||||
private:
|
||||
Bool_t fValid;
|
||||
Bool_t fInvokedGlobal;
|
||||
Bool_t fValid{true};
|
||||
Bool_t fInvokedGlobal{false};
|
||||
Int_t fIdxGlobal;
|
||||
|
||||
PNL_PippardFitterGlobal *fPippardFitterGlobal;
|
||||
PNL_PippardFitterGlobal *fPippardFitterGlobal{nullptr};
|
||||
|
||||
ClassDef(PNL_PippardFitter, 1)
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user