diff --git a/geom/geom/inc/TGeoOpticalSurface.h b/geom/geom/inc/TGeoOpticalSurface.h index 0f9c43192187c..1fc057b821fe1 100644 --- a/geom/geom/inc/TGeoOpticalSurface.h +++ b/geom/geom/inc/TGeoOpticalSurface.h @@ -93,7 +93,6 @@ class TGeoOpticalSurface : public TNamed { }; private: - std::string fName = ""; // Surface name ESurfaceType fType = kTdielectric_metal; // Surface type ESurfaceModel fModel = kMglisur; // Surface model ESurfaceFinish fFinish = kFpolished; // Surface finish @@ -162,7 +161,7 @@ class TGeoOpticalSurface : public TNamed { static ESurfaceFinish StringToFinish(const char *finish); static const char *FinishToString(ESurfaceFinish finish); - ClassDefOverride(TGeoOpticalSurface, 2) // Class representing an optical surface + ClassDefOverride(TGeoOpticalSurface, 3) // Class representing an optical surface }; //////////////////////////////////////////////////////////////////////////// diff --git a/geom/geom/inc/TGeoPatternFinder.h b/geom/geom/inc/TGeoPatternFinder.h index bc77b71bc9cad..408ae046adebf 100644 --- a/geom/geom/inc/TGeoPatternFinder.h +++ b/geom/geom/inc/TGeoPatternFinder.h @@ -457,8 +457,8 @@ class TGeoPatternHoneycomb : public TGeoPatternFinder { // data members Int_t fNrows; // number of rows Int_t fAxisOnRows; // axis along each row - Int_t *fNdivisions; // [fNrows] number of divisions for each row - Double_t *fStart; // [fNrows] starting points for each row + Int_t *fNdivs; // [fNrows] number of divisions for each row + Double_t *fRowStart; // [fNrows] starting points for each row protected: TGeoPatternHoneycomb(const TGeoPatternHoneycomb &); @@ -477,7 +477,7 @@ class TGeoPatternHoneycomb : public TGeoPatternFinder { TGeoNode *FindNode(Double_t *point, const Double_t *dir = nullptr) override; void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const override; - ClassDefOverride(TGeoPatternHoneycomb, 1) // pattern for honeycomb divisions + ClassDefOverride(TGeoPatternHoneycomb, 2) // pattern for honeycomb divisions }; #endif diff --git a/geom/geom/src/TGeoPatternFinder.cxx b/geom/geom/src/TGeoPatternFinder.cxx index 9616aa2b7ad2d..fc4f6f1b6e29e 100644 --- a/geom/geom/src/TGeoPatternFinder.cxx +++ b/geom/geom/src/TGeoPatternFinder.cxx @@ -2302,8 +2302,8 @@ TGeoPatternHoneycomb::TGeoPatternHoneycomb() { fNrows = 0; fAxisOnRows = 0; - fNdivisions = nullptr; - fStart = nullptr; + fNdivs = nullptr; + fRowStart = nullptr; CreateThreadData(1); } //////////////////////////////////////////////////////////////////////////////// @@ -2313,8 +2313,8 @@ TGeoPatternHoneycomb::TGeoPatternHoneycomb(TGeoVolume *vol, Int_t nrows) : TGeoP { fNrows = nrows; fAxisOnRows = 0; - fNdivisions = nullptr; - fStart = nullptr; + fNdivs = nullptr; + fRowStart = nullptr; CreateThreadData(1); // compute everything else } @@ -2325,8 +2325,8 @@ TGeoPatternHoneycomb::TGeoPatternHoneycomb(const TGeoPatternHoneycomb &pfh) : TGeoPatternFinder(pfh), fNrows(pfh.fNrows), fAxisOnRows(pfh.fAxisOnRows), - fNdivisions(pfh.fNdivisions), - fStart(pfh.fStart) + fNdivs(pfh.fNdivs), + fRowStart(pfh.fRowStart) { CreateThreadData(1); } @@ -2340,8 +2340,8 @@ TGeoPatternHoneycomb &TGeoPatternHoneycomb::operator=(const TGeoPatternHoneycomb TGeoPatternFinder::operator=(pfh); fNrows = pfh.fNrows; fAxisOnRows = pfh.fAxisOnRows; - fNdivisions = pfh.fNdivisions; - fStart = pfh.fStart; + fNdivs = pfh.fNdivs; + fRowStart = pfh.fRowStart; CreateThreadData(1); } return *this; diff --git a/roofit/roofit/inc/RooIntegralMorph.h b/roofit/roofit/inc/RooIntegralMorph.h index f9d7dee2a344d..df74ee12cbcb9 100644 --- a/roofit/roofit/inc/RooIntegralMorph.h +++ b/roofit/roofit/inc/RooIntegralMorph.h @@ -65,7 +65,7 @@ class RooIntegralMorph : public RooAbsCachedPdf { void interpolateGap(Int_t ixlo, Int_t ixhi) ; RooIntegralMorph* _self ; // - std::unique_ptr _nset ; + std::unique_ptr _nargset; RooAbsPdf* _pdf1 ; // PDF1 RooAbsPdf* _pdf2 ; // PDF2 RooRealVar* _x ; // X @@ -106,8 +106,7 @@ class RooIntegralMorph : public RooAbsCachedPdf { double evaluate() const override ; private: - - ClassDefOverride(RooIntegralMorph,1) // Linear shape interpolation operator p.d.f + ClassDefOverride(RooIntegralMorph, 2) // Linear shape interpolation operator p.d.f }; #endif diff --git a/roofit/roofit/inc/RooUnblindOffset.h b/roofit/roofit/inc/RooUnblindOffset.h index 1bd42b920739e..af74a3b68d484 100644 --- a/roofit/roofit/inc/RooUnblindOffset.h +++ b/roofit/roofit/inc/RooUnblindOffset.h @@ -37,10 +37,10 @@ class RooUnblindOffset : public RooAbsHiddenReal { // Function evaluation double evaluate() const override ; - RooRealProxy _value ; + RooRealProxy _proxyValue; RooBlindTools _blindEngine ; - ClassDefOverride(RooUnblindOffset,1) // Offset unblinding transformation + ClassDefOverride(RooUnblindOffset, 2) // Offset unblinding transformation }; #endif diff --git a/roofit/roofit/inc/RooUnblindPrecision.h b/roofit/roofit/inc/RooUnblindPrecision.h index 41f5466b2eda7..120fc2b083302 100644 --- a/roofit/roofit/inc/RooUnblindPrecision.h +++ b/roofit/roofit/inc/RooUnblindPrecision.h @@ -40,10 +40,10 @@ class RooUnblindPrecision : public RooAbsHiddenReal { // Function evaluation double evaluate() const override ; - RooRealProxy _value ; // Holder of the blind value + RooRealProxy _proxyValue; // Holder of the blind value RooBlindTools _blindEngine ; // Blinding engine - ClassDefOverride(RooUnblindPrecision,1) // Precision unblinding transformation + ClassDefOverride(RooUnblindPrecision, 2) // Precision unblinding transformation }; #endif diff --git a/roofit/roofit/src/RooIntegralMorph.cxx b/roofit/roofit/src/RooIntegralMorph.cxx index 1bc8519f7adee..9f72bebf3cc1f 100644 --- a/roofit/roofit/src/RooIntegralMorph.cxx +++ b/roofit/roofit/src/RooIntegralMorph.cxx @@ -248,12 +248,12 @@ RooIntegralMorph::MorphCacheElem::MorphCacheElem(RooIntegralMorph &self, const R { // Mark in base class that normalization of cached pdf is invariant under pdf parameters - _nset = std::make_unique(*_x); + _nargset = std::make_unique(*_x); _c1 = std::unique_ptr{_pdf1->createCdf(*_x)}; _c2 = std::unique_ptr{_pdf2->createCdf(*_x)}; - _cb1 = std::unique_ptr{_c1->bindVars(*_x,_nset.get())}; - _cb2 = std::unique_ptr{_c2->bindVars(*_x,_nset.get())}; + _cb1 = std::unique_ptr{_c1->bindVars(*_x,_nargset.get())}; + _cb2 = std::unique_ptr{_c2->bindVars(*_x,_nargset.get())}; _rf1 = std::make_unique(*_cb1); _rf2 = std::make_unique(*_cb2); @@ -414,9 +414,9 @@ void RooIntegralMorph::MorphCacheElem::calculate(TIterator* dIter) _rf2->findRoot(x2,x2,xMax,y) ; _x->setVal(x1); - double f1x1 = _pdf1->getVal(_nset.get()); + double f1x1 = _pdf1->getVal(_nargset.get()); _x->setVal(x2); - double f2x2 = _pdf2->getVal(_nset.get()); + double f2x2 = _pdf2->getVal(_nargset.get()); double fbarX = f1x1*f2x2 / ( _alpha->getVal()*f2x2 + (1-_alpha->getVal())*f1x1 ) ; dIter->Next() ; diff --git a/roofit/roofit/src/RooUnblindOffset.cxx b/roofit/roofit/src/RooUnblindOffset.cxx index a22dcb1a65f15..b52afe99573f7 100644 --- a/roofit/roofit/src/RooUnblindOffset.cxx +++ b/roofit/roofit/src/RooUnblindOffset.cxx @@ -39,7 +39,7 @@ of the unblind parameter RooUnblindOffset::RooUnblindOffset(const char *name, const char *title, const char *blindString, double scale, RooAbsReal& cpasym) : RooAbsHiddenReal(name,title), - _value("value","Offset blinded value",this,cpasym), + _proxyValue("value","Offset blinded value",this,cpasym), _blindEngine(blindString,RooBlindTools::full,0.,scale) { } @@ -51,7 +51,7 @@ RooUnblindOffset::RooUnblindOffset(const char *name, const char *title, const char *blindString, double scale, RooAbsReal& cpasym, RooAbsCategory& blindState) : RooAbsHiddenReal(name,title,blindState), - _value("value","Offset blinded value",this,cpasym), + _proxyValue("value","Offset blinded value",this,cpasym), _blindEngine(blindString,RooBlindTools::full,0.,scale) { } @@ -61,7 +61,7 @@ RooUnblindOffset::RooUnblindOffset(const char *name, const char *title, RooUnblindOffset::RooUnblindOffset(const RooUnblindOffset& other, const char* name) : RooAbsHiddenReal(other, name), - _value("asym",this,other._value), + _proxyValue("asym",this,other._proxyValue), _blindEngine(other._blindEngine) { } @@ -73,9 +73,9 @@ double RooUnblindOffset::evaluate() const { if (isHidden()) { // Blinding is active for this event - return _blindEngine.UnHideOffset(_value); + return _blindEngine.UnHideOffset(_proxyValue); } else { // Blinding is not active for this event - return _value ; + return _proxyValue ; } } diff --git a/roofit/roofit/src/RooUnblindPrecision.cxx b/roofit/roofit/src/RooUnblindPrecision.cxx index f301a40628d5a..5ef508bfa44ab 100644 --- a/roofit/roofit/src/RooUnblindPrecision.cxx +++ b/roofit/roofit/src/RooUnblindPrecision.cxx @@ -41,7 +41,7 @@ RooUnblindPrecision::RooUnblindPrecision(const char *name, const char *title, double scale, RooAbsReal& value, bool sin2betaMode) : RooAbsHiddenReal(name,title), - _value("value","Precision blinded value",this,value), + _proxyValue("value","Precision blinded value",this,value), _blindEngine(blindString,RooBlindTools::full,centralValue,scale,sin2betaMode) { } @@ -54,7 +54,7 @@ RooUnblindPrecision::RooUnblindPrecision(const char *name, const char *title, double scale, RooAbsReal& value, RooAbsCategory& blindState, bool sin2betaMode) : RooAbsHiddenReal(name,title,blindState), - _value("value","Precision blinded value",this,value), + _proxyValue("value","Precision blinded value",this,value), _blindEngine(blindString,RooBlindTools::full,centralValue,scale,sin2betaMode) { } @@ -64,7 +64,7 @@ RooUnblindPrecision::RooUnblindPrecision(const char *name, const char *title, RooUnblindPrecision::RooUnblindPrecision(const RooUnblindPrecision& other, const char* name) : RooAbsHiddenReal(other, name), - _value("asym",this,other._value), + _proxyValue("asym",this,other._proxyValue), _blindEngine(other._blindEngine) { } @@ -76,9 +76,9 @@ double RooUnblindPrecision::evaluate() const { if (isHidden()) { // Blinding active for this event - return _blindEngine.UnHidePrecision(_value); + return _blindEngine.UnHidePrecision(_proxyValue); } else { // Blinding not active for this event - return _value ; + return _proxyValue ; } } diff --git a/roofit/roofitcore/inc/RooAbsPdf.h b/roofit/roofitcore/inc/RooAbsPdf.h index 18d154764ef2d..d77e0a9becea6 100644 --- a/roofit/roofitcore/inc/RooAbsPdf.h +++ b/roofit/roofitcore/inc/RooAbsPdf.h @@ -329,8 +329,6 @@ class RooAbsPdf : public RooAbsReal { mutable Int_t _traceCount = 0; ///< Number of traces remaining to print mutable Int_t _negCount = 0; ///< Number of negative probabilities remaining to print - bool _selectComp = false; ///< Component selection flag for RooAbsPdf::plotCompOn - std::unique_ptr _specGeneratorConfig ; /// #include "RooAbsData.h" #include "RooAbsDataStore.h" #include "RooAbsPdf.h" -#include "RooAddPdf.h" #include "RooArgSet.h" #include "RooBinSamplingPdf.h" #include "RooBinning.h" -#include "RooCategory.h" #include "RooDataHist.h" #include "RooDataSet.h" #include "RooErrorHandler.h" @@ -59,7 +55,6 @@ parallelized calculation of test statistics. #include "RooMsgService.h" #include "RooProdPdf.h" #include "RooProduct.h" -#include "RooRealSumPdf.h" #include "RooRealVar.h" #include "RooVectorDataStore.h" @@ -126,7 +121,7 @@ RooAbsOptTestStatistic::RooAbsOptTestStatistic(const RooAbsOptTestStatistic &oth return; } - initSlave(*other._funcClone, *other._dataClone, other._projDeps ? *other._projDeps : RooArgSet(), + initSlave(*other._funcClone, *other._dataClone, other._projDepsOpt ? *other._projDepsOpt : RooArgSet(), other._rangeName.c_str(), other._addCoefRangeName.c_str()); } @@ -297,16 +292,16 @@ void RooAbsOptTestStatistic::initSlave(RooAbsReal& real, RooAbsData& indata, con // Remove projected dependents from normalization set if (!projDeps.empty()) { - _projDeps = new RooArgSet; - projDeps.snapshot(*_projDeps, false) ; + _projDepsOpt = new RooArgSet; + projDeps.snapshot(*_projDepsOpt, false); - //RooArgSet* tobedel = (RooArgSet*) _normSet->selectCommon(*_projDeps) ; - _normSet->remove(*_projDeps,true,true) ; + // RooArgSet* tobedel = (RooArgSet*) _normSet->selectCommon(*_projDeps) ; + _normSet->remove(*_projDepsOpt, true, true); - // Mark all projected dependents as such - RooArgSet projDataDeps; - _funcObsSet->selectCommon(*_projDeps, projDataDeps); - projDataDeps.setAttribAll("projectedDependent") ; + // Mark all projected dependents as such + RooArgSet projDataDeps; + _funcObsSet->selectCommon(*_projDepsOpt, projDataDeps); + projDataDeps.setAttribAll("projectedDependent"); } @@ -344,8 +339,8 @@ RooAbsOptTestStatistic::~RooAbsOptTestStatistic() if (operMode()==Slave) { delete _funcClone ; delete _funcObsSet ; - if (_projDeps) { - delete _projDeps ; + if (_projDepsOpt) { + delete _projDepsOpt; } if (_ownData) { delete _dataClone ; @@ -769,7 +764,7 @@ const char* RooAbsOptTestStatistic::cacheUniqueSuffix() const { void RooAbsOptTestStatistic::runRecalculateCache(std::size_t firstEvent, std::size_t lastEvent, std::size_t stepSize) const { - _dataClone->store()->recalculateCache(_projDeps, firstEvent, lastEvent, stepSize, _skipZeroWeights); + _dataClone->store()->recalculateCache(_projDepsOpt, firstEvent, lastEvent, stepSize, _skipZeroWeights); } /// \endcond diff --git a/roofit/roofitcore/src/RooAbsOptTestStatistic.h b/roofit/roofitcore/src/RooAbsOptTestStatistic.h index 23a9a2e7766f8..9f2a428e6ddbe 100644 --- a/roofit/roofitcore/src/RooAbsOptTestStatistic.h +++ b/roofit/roofitcore/src/RooAbsOptTestStatistic.h @@ -76,8 +76,8 @@ class RooAbsOptTestStatistic : public RooAbsTestStatistic { RooArgSet* _funcCloneSet = nullptr; ///< Set owning all components of internal clone of input function RooAbsData* _dataClone = nullptr; ///< Pointer to internal clone if input data RooAbsReal* _funcClone = nullptr; ///< Pointer to internal clone of input function - RooArgSet* _projDeps = nullptr; ///< Set of projected observable - bool _ownData = false; ///< Do we own the dataset + RooArgSet *_projDepsOpt = nullptr; ///< Set of projected observable (optimized) + bool _ownData = false; ///< Do we own the dataset bool _sealed = false; ///< Is test statistic sealed -- i.e. no access to data TString _sealNotice ; ///< User-defined notice shown when reading a sealed likelihood RooArgSet* _funcObsSet = nullptr; ///< List of observables in the pdf expression diff --git a/roofit/roofitcore/src/RooAbsPdf.cxx b/roofit/roofitcore/src/RooAbsPdf.cxx index 4cbfa4e9097cc..573d3f7a78e11 100644 --- a/roofit/roofitcore/src/RooAbsPdf.cxx +++ b/roofit/roofitcore/src/RooAbsPdf.cxx @@ -142,20 +142,16 @@ called for each data event. #include "RooMsgService.h" #include "RooArgSet.h" #include "RooArgProxy.h" -#include "RooRealProxy.h" #include "RooRealVar.h" #include "RooGenContext.h" #include "RooBinnedGenContext.h" #include "RooPlot.h" #include "RooCurve.h" -#include "RooCategory.h" #include "RooNameReg.h" #include "RooCmdConfig.h" #include "RooGlobalFunc.h" #include "RooRandom.h" -#include "RooNumIntConfig.h" #include "RooProjectedPdf.h" -#include "RooParamBinning.h" #include "RooNumCdf.h" #include "RooFitResult.h" #include "RooNumGenConfig.h" @@ -171,8 +167,6 @@ called for each data event. #include "ROOT/StringUtils.hxx" #include "TMath.h" #include "TPaveText.h" -#include "TMatrixD.h" -#include "TMatrixDSym.h" #include #include @@ -239,11 +233,11 @@ RooAbsPdf::RooAbsPdf() : _normMgr(this, 10) {} //////////////////////////////////////////////////////////////////////////////// /// Constructor with name and title only -RooAbsPdf::RooAbsPdf(const char *name, const char *title) : - RooAbsReal(name,title), _normMgr(this,10), _selectComp(true) +RooAbsPdf::RooAbsPdf(const char *name, const char *title) : RooAbsReal(name, title), _normMgr(this, 10) { - resetErrorCounters() ; - setTraceCounter(0) ; + _selectComp = true; + resetErrorCounters(); + setTraceCounter(0); } @@ -251,29 +245,27 @@ RooAbsPdf::RooAbsPdf(const char *name, const char *title) : //////////////////////////////////////////////////////////////////////////////// /// Constructor with name, title, and plot range -RooAbsPdf::RooAbsPdf(const char *name, const char *title, - double plotMin, double plotMax) : - RooAbsReal(name,title,plotMin,plotMax), _normMgr(this,10), _selectComp(true) +RooAbsPdf::RooAbsPdf(const char *name, const char *title, double plotMin, double plotMax) + : RooAbsReal(name, title, plotMin, plotMax), _normMgr(this, 10) { - resetErrorCounters() ; - setTraceCounter(0) ; + _selectComp = true; + resetErrorCounters(); + setTraceCounter(0); } - - //////////////////////////////////////////////////////////////////////////////// /// Copy constructor -RooAbsPdf::RooAbsPdf(const RooAbsPdf& other, const char* name) : - RooAbsReal(other,name), - _normMgr(other._normMgr,this), _selectComp(other._selectComp), _normRange(other._normRange) +RooAbsPdf::RooAbsPdf(const RooAbsPdf &other, const char *name) + : RooAbsReal(other, name), _normMgr(other._normMgr, this), _normRange(other._normRange) { - resetErrorCounters() ; - setTraceCounter(other._traceCount) ; + _selectComp = other._selectComp; + resetErrorCounters(); + setTraceCounter(other._traceCount); - if (other._specGeneratorConfig) { - _specGeneratorConfig = std::make_unique(*other._specGeneratorConfig); - } + if (other._specGeneratorConfig) { + _specGeneratorConfig = std::make_unique(*other._specGeneratorConfig); + } } diff --git a/tmva/tmva/inc/TMVA/DataLoader.h b/tmva/tmva/inc/TMVA/DataLoader.h index 8f48c520287df..c78d581567973 100644 --- a/tmva/tmva/inc/TMVA/DataLoader.h +++ b/tmva/tmva/inc/TMVA/DataLoader.h @@ -191,8 +191,7 @@ namespace TMVA { std::vector fDefaultTrfs; ///< list of transformations on default DataSet // cd to local directory - TString fOptions; ///< option string given by construction (presently only "V") - TString fTransformations; ///< List of transformations to test + TString fTransformations; ///< List of transformations to test Bool_t fVerbose; ///< verbose mode // flag determining the way training and test data are assigned to DataLoader @@ -210,8 +209,7 @@ namespace TMVA { Types::EAnalysisType fAnalysisType; ///< the training type protected: - - ClassDefOverride(DataLoader,4); + ClassDefOverride(DataLoader, 5); }; void DataLoaderCopy(TMVA::DataLoader* des, TMVA::DataLoader* src); } // namespace TMVA