diff --git a/README/ReleaseNotes/v642/index.md b/README/ReleaseNotes/v642/index.md index 4261292ca1193..b43d7fc4f3026 100644 --- a/README/ReleaseNotes/v642/index.md +++ b/README/ReleaseNotes/v642/index.md @@ -53,6 +53,7 @@ The following people have contributed to this new version: * The ROOT IO capability for the `TMVA::Experimental::RBDT` class has been removed, along with the `TMVA.Experimental.SaveXGBoost` Python function. Experimental classes should not be persistified since their on-disk layout is not guaranteed to be stable. An `RBDT` is now built directly from an XGBoost model in its native JSON serialization with the new `TMVA::Experimental::RBDT::LoadXGBoost(jsonPath)`, which works both from C++ and Python. To convert a trained model, save it first with XGBoost's `Booster.save_model("model.json")` and then load it with `LoadXGBoost`. * The **JsMVA** feature for interactive TMVA training in Jupyter notebooks is now removed. It was not functional for years and was therefore already excluded from ROOT 6.38. This also removes the `TMVA::IPythonInteractive` class and the related interactive-training interfaces from the TMVA method and fitter classes, such as `MethodBase::ExitFromTraining()` or `FitterBase::SetIPythonInteractive()`. * The **RooStats::DebuggingSampler** and **RooStats::DebuggingTestStat** classes are removed. They were mock implementations of the `TestStatSampler` and `TestStatistic` interfaces that returned uniform random numbers independent of the data, only meant for debugging the RooStats framework itself during its initial development. +* The `RooTrace` class is deprecated and will be removed in ROOT 6.44. It was a RooFit-specific memory tracer whose instrumentation hooks are compiled out by default, so it has been inert and untested for years. For memory debugging, please use general-purpose tools such as AddressSanitizer or Valgrind instead. ## Python Interface diff --git a/roofit/histfactory/src/FlexibleInterpVar.cxx b/roofit/histfactory/src/FlexibleInterpVar.cxx index 9a8bbf01e6192..44e8db6347a98 100644 --- a/roofit/histfactory/src/FlexibleInterpVar.cxx +++ b/roofit/histfactory/src/FlexibleInterpVar.cxx @@ -16,7 +16,6 @@ */ #include -#include #include #include @@ -36,7 +35,6 @@ using namespace HistFactory; FlexibleInterpVar::FlexibleInterpVar() { - TRACE_CREATE; } @@ -82,7 +80,6 @@ FlexibleInterpVar::FlexibleInterpVar(const char* name, const char* title, R__ASSERT(_low.size() == _interpCode.size()); } - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -92,7 +89,6 @@ FlexibleInterpVar::FlexibleInterpVar(const char* name, const char* title) : RooAbsReal(name, title), _paramList("paramList","List of coefficients",this) { - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -103,7 +99,6 @@ FlexibleInterpVar::FlexibleInterpVar(const FlexibleInterpVar& other, const char* _nominal(other._nominal), _low(other._low), _high(other._high), _interpCode(other._interpCode), _interpBoundary(other._interpBoundary) { - TRACE_CREATE; } @@ -112,7 +107,6 @@ FlexibleInterpVar::FlexibleInterpVar(const FlexibleInterpVar& other, const char* FlexibleInterpVar::~FlexibleInterpVar() { - TRACE_DESTROY; } void FlexibleInterpVar::setInterpCode(RooAbsReal ¶m, int code) diff --git a/roofit/histfactory/src/PiecewiseInterpolation.cxx b/roofit/histfactory/src/PiecewiseInterpolation.cxx index 9e4ae37a18e06..77188f99eb477 100644 --- a/roofit/histfactory/src/PiecewiseInterpolation.cxx +++ b/roofit/histfactory/src/PiecewiseInterpolation.cxx @@ -52,7 +52,6 @@ #include "RooRealVar.h" #include "RooMsgService.h" #include "RooNumIntConfig.h" -#include "RooTrace.h" #include "RooDataHist.h" #include "RooHistFunc.h" @@ -65,7 +64,6 @@ PiecewiseInterpolation::PiecewiseInterpolation() : _normIntMgr(this) { - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -130,7 +128,6 @@ PiecewiseInterpolation::PiecewiseInterpolation(const char *name, const char *tit // Choose special integrator by default specialIntegratorConfig(true)->method1D().setLabel("RooBinIntegrator") ; - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -174,7 +171,6 @@ PiecewiseInterpolation::PiecewiseInterpolation(const PiecewiseInterpolation& oth _interpCode(other._interpCode) { // Member _ownedList is intentionally not copy-constructed -- ownership is not transferred - TRACE_CREATE; } @@ -184,7 +180,6 @@ PiecewiseInterpolation::PiecewiseInterpolation(const PiecewiseInterpolation& oth PiecewiseInterpolation::~PiecewiseInterpolation() { - TRACE_DESTROY; } diff --git a/roofit/roofit/inc/RooPoisson.h b/roofit/roofit/inc/RooPoisson.h index f3a10cfd50afe..fd2efc8bcbbd5 100644 --- a/roofit/roofit/inc/RooPoisson.h +++ b/roofit/roofit/inc/RooPoisson.h @@ -14,7 +14,6 @@ #include "RooCategoryProxy.h" #include "RooAbsReal.h" #include "RooAbsCategory.h" -#include "RooTrace.h" class RooPoisson : public RooAbsPdf { public: diff --git a/roofit/roofit/src/RooKeysPdf.cxx b/roofit/roofit/src/RooKeysPdf.cxx index 394004c223914..c370d163fc676 100644 --- a/roofit/roofit/src/RooKeysPdf.cxx +++ b/roofit/roofit/src/RooKeysPdf.cxx @@ -40,7 +40,6 @@ Cranmer KS, Kernel Estimation in High-Energy Physics. #include "RooRealVar.h" #include "RooRandom.h" #include "RooDataSet.h" -#include "RooTrace.h" #include "TError.h" @@ -53,7 +52,6 @@ const double RooKeysPdf::_nSigma = std::sqrt(-2. * RooKeysPdf::RooKeysPdf() { - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -84,7 +82,6 @@ RooKeysPdf::RooKeysPdf(const char *name, const char *title, RooAbsReal &xpdf, Ro // form the lookup table LoadDataSet(data); - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -117,7 +114,6 @@ RooKeysPdf::RooKeysPdf(const RooKeysPdf &other, const char *name) for (Int_t i= 0; i<_nPoints+1; i++) _lookupTable[i]= other._lookupTable[i]; - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -127,7 +123,6 @@ RooKeysPdf::~RooKeysPdf() { delete[] _dataWgts; delete[] _weights; - TRACE_DESTROY; } //////////////////////////////////////////////////////////////////////////////// diff --git a/roofit/roofit/src/RooLagrangianMorphFunc.cxx b/roofit/roofit/src/RooLagrangianMorphFunc.cxx index 887eba52ea8b1..bfaf0259722c5 100644 --- a/roofit/roofit/src/RooLagrangianMorphFunc.cxx +++ b/roofit/roofit/src/RooLagrangianMorphFunc.cxx @@ -1815,7 +1815,6 @@ RooLagrangianMorphFunc::RooLagrangianMorphFunc(const char *name, const char *tit this->disableInterferences(_config.nonInterfering); this->setup(false); - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -1946,7 +1945,6 @@ RooLagrangianMorphFunc::RooLagrangianMorphFunc(const RooLagrangianMorphFunc &oth } _diagrams.push_back(diagram); } - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -1973,7 +1971,6 @@ RooLagrangianMorphFunc::RooLagrangianMorphFunc() _observables("observable", "morphing observable", this, true, false), _binWidths("binWidths", "set of bin width objects", this, true, false) { - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -1986,7 +1983,6 @@ RooLagrangianMorphFunc::~RooLagrangianMorphFunc() delete vertex; } } - TRACE_DESTROY; } //////////////////////////////////////////////////////////////////////////////// diff --git a/roofit/roofit/src/RooMomentMorphFuncND.cxx b/roofit/roofit/src/RooMomentMorphFuncND.cxx index e4e2386353fa6..41fe25638808f 100644 --- a/roofit/roofit/src/RooMomentMorphFuncND.cxx +++ b/roofit/roofit/src/RooMomentMorphFuncND.cxx @@ -46,7 +46,6 @@ using std::string, std::vector; //_____________________________________________________________________________ RooMomentMorphFuncND::RooMomentMorphFuncND() : _cacheMgr(this, 10, true, true), _setting(RooMomentMorphFuncND::Linear), _useHorizMorph(true) { - TRACE_CREATE; } //_____________________________________________________________________________ @@ -72,7 +71,6 @@ RooMomentMorphFuncND::RooMomentMorphFuncND(const char *name, const char *title, // general initialization initialize(); - TRACE_CREATE; } //_____________________________________________________________________________ @@ -112,7 +110,6 @@ RooMomentMorphFuncND::RooMomentMorphFuncND(const char *name, const char *title, // general initialization initialize(); - TRACE_CREATE; } //_____________________________________________________________________________ @@ -167,7 +164,6 @@ RooMomentMorphFuncND::RooMomentMorphFuncND(const char *name, const char *title, // general initialization initialize(); - TRACE_CREATE; } //_____________________________________________________________________________ @@ -185,13 +181,11 @@ RooMomentMorphFuncND::RooMomentMorphFuncND(const RooMomentMorphFuncND &other, co // general initialization initialize(); - TRACE_CREATE; } //_____________________________________________________________________________ RooMomentMorphFuncND::~RooMomentMorphFuncND() { - TRACE_DESTROY; } //_____________________________________________________________________________ diff --git a/roofit/roofitcore/inc/RooAddPdf.h b/roofit/roofitcore/inc/RooAddPdf.h index c31e30dbafd59..16323c042522e 100644 --- a/roofit/roofitcore/inc/RooAddPdf.h +++ b/roofit/roofitcore/inc/RooAddPdf.h @@ -22,7 +22,6 @@ #include "RooAICRegistry.h" #include "RooObjCacheManager.h" #include "RooNameReg.h" -#include "RooTrace.h" #include #include @@ -33,7 +32,7 @@ class AddCacheElem; class RooAddPdf : public RooAbsPdf { public: - RooAddPdf() : _projCacheMgr(this,10) { TRACE_CREATE; } + RooAddPdf() : _projCacheMgr(this,10) {} RooAddPdf(const char *name, const char *title=nullptr); RooAddPdf(const char *name, const char *title, RooAbsPdf& pdf1, RooAbsPdf& pdf2, RooAbsReal& coef1) ; @@ -42,7 +41,7 @@ class RooAddPdf : public RooAbsPdf { RooAddPdf(const RooAddPdf& other, const char* name=nullptr) ; TObject* clone(const char* newname=nullptr) const override { return new RooAddPdf(*this,newname) ; } - ~RooAddPdf() override { TRACE_DESTROY; } + ~RooAddPdf() override {} bool checkObservables(const RooArgSet* nset) const override; diff --git a/roofit/roofitcore/inc/RooFormulaVar.h b/roofit/roofitcore/inc/RooFormulaVar.h index 70bf46e175d37..3848ced0e82d8 100644 --- a/roofit/roofitcore/inc/RooFormulaVar.h +++ b/roofit/roofitcore/inc/RooFormulaVar.h @@ -19,7 +19,6 @@ #include "RooAbsReal.h" #include "RooArgList.h" #include "RooListProxy.h" -#include "RooTrace.h" #include "RooAbsBinning.h" #include diff --git a/roofit/roofitcore/inc/RooHistFunc.h b/roofit/roofitcore/inc/RooHistFunc.h index 8819001aaac78..fec9d1d67bea3 100644 --- a/roofit/roofitcore/inc/RooHistFunc.h +++ b/roofit/roofitcore/inc/RooHistFunc.h @@ -20,7 +20,6 @@ #include "RooRealProxy.h" #include "RooSetProxy.h" #include "RooAICRegistry.h" -#include "RooTrace.h" #include "RooDataHist.h" #include diff --git a/roofit/roofitcore/inc/RooTrace.h b/roofit/roofitcore/inc/RooTrace.h index df55427fc54c9..a52020bc8b92d 100644 --- a/roofit/roofitcore/inc/RooTrace.h +++ b/roofit/roofitcore/inc/RooTrace.h @@ -23,7 +23,9 @@ #define TRACE_CREATE #define TRACE_DESTROY -class RooTrace { +class R__DEPRECATED(6, 44, "RooTrace is unused and untested, and its hooks are compiled out by default. " + "For memory debugging, please use general-purpose tools like AddressSanitizer " + "or Valgrind instead.") RooTrace { public: RooTrace() ; virtual ~RooTrace() {} ; diff --git a/roofit/roofitcore/src/RooAbsArg.cxx b/roofit/roofitcore/src/RooAbsArg.cxx index ab4297ad9cad2..bdf6957c6e899 100644 --- a/roofit/roofitcore/src/RooAbsArg.cxx +++ b/roofit/roofitcore/src/RooAbsArg.cxx @@ -81,7 +81,6 @@ for single nodes. #include #include #include -#include #include #include #include diff --git a/roofit/roofitcore/src/RooAbsCollection.cxx b/roofit/roofitcore/src/RooAbsCollection.cxx index 8ea4bcf9235b6..31759db42bc42 100644 --- a/roofit/roofitcore/src/RooAbsCollection.cxx +++ b/roofit/roofitcore/src/RooAbsCollection.cxx @@ -34,7 +34,6 @@ implemented using the container denoted by RooAbsCollection::Storage_t. #include "RooAbsRealLValue.h" #include "RooAbsCategoryLValue.h" #include "RooStringVar.h" -#include "RooTrace.h" #include "RooArgList.h" #include "RooLinkedListIter.h" #include "RooCmdConfig.h" @@ -142,7 +141,6 @@ RooAbsCollection::RooAbsCollection(const RooAbsCollection& other, const char *na _name(name), _allRRV(other._allRRV) { - RooTrace::create(this) ; if (!name) setName(other.GetName()) ; _list.reserve(other._list.size()); diff --git a/roofit/roofitcore/src/RooAbsData.cxx b/roofit/roofitcore/src/RooAbsData.cxx index a03e5875f3b7e..dfcea9643d81f 100644 --- a/roofit/roofitcore/src/RooAbsData.cxx +++ b/roofit/roofitcore/src/RooAbsData.cxx @@ -99,7 +99,6 @@ observable snapshots are stored in the dataset. #include "RooDataSet.h" #include "RooCompositeDataStore.h" #include "RooCategory.h" -#include "RooTrace.h" #include "RooUniformBinning.h" #include "RooSimultaneous.h" @@ -150,8 +149,6 @@ RooAbsData::StorageType RooAbsData::getDefaultStorageType( ) RooAbsData::RooAbsData() : storageType(defaultStorageType) { - - RooTrace::create(this) ; } void RooAbsData::initializeVars(RooArgSet const& vars) @@ -199,8 +196,6 @@ RooAbsData::RooAbsData(RooStringView name, RooStringView title, const RooArgSet& initializeVars(vars); _namePtr = RooNameReg::instance().constPtr(GetName()) ; - - RooTrace::create(this); } void RooAbsData::copyImpl(const RooAbsData &other, const char *newName) @@ -250,8 +245,6 @@ RooAbsData::RooAbsData(const RooAbsData &other, const char *newName) _cachedVars{"Cached Variables"} { copyImpl(other, newName); - - RooTrace::create(this); } RooAbsData &RooAbsData::operator=(const RooAbsData &other) @@ -285,8 +278,6 @@ RooAbsData::~RooAbsData() for (auto& item : _ownedComponents) { delete item.second; } - - RooTrace::destroy(this) ; } //////////////////////////////////////////////////////////////////////////////// diff --git a/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx b/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx index b9e32cff6337f..83e2d697fe268 100644 --- a/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx +++ b/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx @@ -61,7 +61,6 @@ parallelized calculation of test statistics. #include "RooProduct.h" #include "RooRealSumPdf.h" #include "RooRealVar.h" -#include "RooTrace.h" #include "RooVectorDataStore.h" #include "ROOT/StringUtils.hxx" diff --git a/roofit/roofitcore/src/RooAddPdf.cxx b/roofit/roofitcore/src/RooAddPdf.cxx index d55e89e0f3aeb..87858e7e56b36 100644 --- a/roofit/roofitcore/src/RooAddPdf.cxx +++ b/roofit/roofitcore/src/RooAddPdf.cxx @@ -104,7 +104,6 @@ RooAddPdf::RooAddPdf(const char *name, const char *title) : _coefList("!coefficients","List of coefficients",this), _coefErrCount{_errorCount} { - TRACE_CREATE; } @@ -302,7 +301,6 @@ RooAddPdf::RooAddPdf(const RooAddPdf &other, const char *name) { finalizeConstruction(); - TRACE_CREATE; } diff --git a/roofit/roofitcore/src/RooArgList.cxx b/roofit/roofitcore/src/RooArgList.cxx index 98dc8ce313eef..e5aeff1907023 100644 --- a/roofit/roofitcore/src/RooArgList.cxx +++ b/roofit/roofitcore/src/RooArgList.cxx @@ -42,7 +42,6 @@ #include "RooStreamParser.h" #include "RooAbsCategoryLValue.h" -#include "RooTrace.h" #include "RooMsgService.h" #include "RooConstVar.h" @@ -57,7 +56,6 @@ using std::endl, std::istream, std::ostream; RooArgList::RooArgList() { - TRACE_CREATE; } @@ -69,7 +67,6 @@ RooArgList::RooArgList(const RooAbsCollection& coll) : RooAbsCollection(coll.GetName()) { add(coll) ; - TRACE_CREATE; } @@ -80,7 +77,6 @@ RooArgList::RooArgList(const RooAbsCollection& coll) : RooArgList::RooArgList(const char *name) : RooAbsCollection(name) { - TRACE_CREATE; } @@ -100,7 +96,6 @@ RooArgList::RooArgList(const TCollection& tcoll, const char* name) : } add(*static_cast(obj)) ; } - TRACE_CREATE; } @@ -113,7 +108,6 @@ RooArgList::RooArgList(const TCollection& tcoll, const char* name) : RooArgList::RooArgList(const RooArgList& other, const char *name) : RooAbsCollection(other,name) { - TRACE_CREATE; } @@ -123,7 +117,6 @@ RooArgList::RooArgList(const RooArgList& other, const char *name) RooArgList::~RooArgList() { - TRACE_DESTROY; } diff --git a/roofit/roofitcore/src/RooArgSet.cxx b/roofit/roofitcore/src/RooArgSet.cxx index 8c00cb5778e3e..b1bf1723fe486 100644 --- a/roofit/roofitcore/src/RooArgSet.cxx +++ b/roofit/roofitcore/src/RooArgSet.cxx @@ -55,7 +55,6 @@ #include "RooAbsRealLValue.h" #include "RooAbsCategoryLValue.h" #include "RooStringVar.h" -#include "RooTrace.h" #include "RooArgList.h" #include "RooSentinel.h" #include "RooMsgService.h" @@ -78,7 +77,6 @@ void RooArgSet::cleanup() { } RooArgSet::RooArgSet() { - TRACE_CREATE; } @@ -90,7 +88,6 @@ RooArgSet::RooArgSet(const RooAbsCollection& coll) : RooAbsCollection(coll.GetName()) { add(coll,true) ; // verbose to catch duplicate errors - TRACE_CREATE; } @@ -109,7 +106,6 @@ RooArgSet::RooArgSet(const RooAbsCollection& collection, const RooAbsArg* var1) add(*var1,true) ; } add(collection,true) ; // verbose to catch duplicate errors - TRACE_CREATE; } @@ -118,7 +114,6 @@ RooArgSet::RooArgSet(const RooAbsCollection& collection, const RooAbsArg* var1) RooArgSet::RooArgSet(const char *name) : RooAbsCollection(name) { - TRACE_CREATE; } @@ -129,7 +124,6 @@ RooArgSet::RooArgSet(const RooArgSet& set1, const RooArgSet& set2, const char *n { add(set1) ; add(set2) ; - TRACE_CREATE; } @@ -149,7 +143,6 @@ RooArgSet::RooArgSet(const TCollection& tcoll, const char* name) : } add(*static_cast(obj)) ; } - TRACE_CREATE; } @@ -160,7 +153,6 @@ RooArgSet::RooArgSet(const TCollection& tcoll, const char* name) : RooArgSet::RooArgSet(const RooArgSet& other, const char *name) : RooAbsCollection(other,name) { - TRACE_CREATE; } @@ -169,7 +161,6 @@ RooArgSet::RooArgSet(const RooArgSet& other, const char *name) RooArgSet::~RooArgSet() { - TRACE_DESTROY; } diff --git a/roofit/roofitcore/src/RooCategory.cxx b/roofit/roofitcore/src/RooCategory.cxx index 054f44d760e61..31ff5823ee7fc 100644 --- a/roofit/roofitcore/src/RooCategory.cxx +++ b/roofit/roofitcore/src/RooCategory.cxx @@ -76,7 +76,6 @@ for advanced uses of categories. #include "RooArgSet.h" #include "RooStreamParser.h" #include "RooMsgService.h" -#include "RooTrace.h" #include "RooHelpers.h" #include "RooFitLegacy/RooCategorySharedProperties.h" #include "RooFitLegacy/RooCatTypeLegacy.h" @@ -102,7 +101,6 @@ std::map> RooCategory::_shar RooCategory::RooCategory() { - TRACE_CREATE; } @@ -115,7 +113,6 @@ RooCategory::RooCategory(const char *name, const char *title) : { setValueDirty() ; setShapeDirty() ; - TRACE_CREATE; } @@ -140,7 +137,6 @@ RooCategory::RooCategory(const RooCategory& other, const char* name) : RooAbsCategoryLValue(other, name), _ranges(other._ranges) { - TRACE_CREATE; } @@ -149,7 +145,6 @@ RooCategory::RooCategory(const RooCategory& other, const char* name) : RooCategory::~RooCategory() { - TRACE_DESTROY; } diff --git a/roofit/roofitcore/src/RooCompositeDataStore.cxx b/roofit/roofitcore/src/RooCompositeDataStore.cxx index 19f26741961e0..1d9f2d67c9af3 100644 --- a/roofit/roofitcore/src/RooCompositeDataStore.cxx +++ b/roofit/roofitcore/src/RooCompositeDataStore.cxx @@ -33,7 +33,6 @@ When iterated from start to finish, datasets will be traversed in the order of t #include "RooMsgService.h" #include "RooFormulaVar.h" #include "RooRealVar.h" -#include "RooTrace.h" #include "RooCategory.h" #include @@ -47,7 +46,6 @@ using std::map, std::list, std::string; RooCompositeDataStore::RooCompositeDataStore() { - TRACE_CREATE; } @@ -64,7 +62,6 @@ RooCompositeDataStore::RooCompositeDataStore( const RooAbsCategory::value_type idx = indexCat.lookupIndex(iter.first); _dataMap[idx] = iter.second; } - TRACE_CREATE; } @@ -78,7 +75,6 @@ RooCompositeDataStore::RooCompositeDataStore(const RooCompositeDataStore& other, RooAbsDataStore* clonedata = item.second->clone() ; _dataMap[item.first] = clonedata ; } - TRACE_CREATE; } @@ -98,7 +94,6 @@ RooCompositeDataStore::RooCompositeDataStore(const RooCompositeDataStore& other, RooAbsDataStore* clonedata = item.second->clone(vars) ; _dataMap[item.first] = clonedata ; } - TRACE_CREATE; } @@ -114,7 +109,6 @@ RooCompositeDataStore::~RooCompositeDataStore() delete item.second; } } - TRACE_DESTROY; } diff --git a/roofit/roofitcore/src/RooDataHist.cxx b/roofit/roofitcore/src/RooDataHist.cxx index 5a91943a5f9df..1fb930e894ccf 100644 --- a/roofit/roofitcore/src/RooDataHist.cxx +++ b/roofit/roofitcore/src/RooDataHist.cxx @@ -59,7 +59,6 @@ See RooAbsDataHelper, rf408_RDataFrameToRooFit.C #include "RooLinkedListIter.h" #include "RooTreeDataStore.h" #include "RooVectorDataStore.h" -#include "RooTrace.h" #include "RooFormulaVar.h" #include "RooFormula.h" #include "RooUniformBinning.h" @@ -85,7 +84,6 @@ using std::string, std::ostream; RooDataHist::RooDataHist() { - TRACE_CREATE; } @@ -124,7 +122,6 @@ RooDataHist::RooDataHist(RooStringView name, RooStringView title, const RooArgSe registerWeightArraysToDataStore(); - TRACE_CREATE; } @@ -176,7 +173,6 @@ RooDataHist::RooDataHist(RooStringView name, RooStringView title, const RooArgLi importTH1Set(vars, indexCat, histMap, wgt, false) ; registerWeightArraysToDataStore(); - TRACE_CREATE; } @@ -200,7 +196,6 @@ RooDataHist::RooDataHist(RooStringView name, RooStringView title, const RooArgLi importDHistSet(vars, indexCat, dhistMap, wgt) ; registerWeightArraysToDataStore(); - TRACE_CREATE; } @@ -230,7 +225,6 @@ RooDataHist::RooDataHist(RooStringView name, RooStringView title, const RooArgLi importTH1(vars,*hist,wgt, false) ; registerWeightArraysToDataStore(); - TRACE_CREATE; } @@ -368,7 +362,6 @@ RooDataHist::RooDataHist(RooStringView name, RooStringView title, const RooArgLi } registerWeightArraysToDataStore(); - TRACE_CREATE; } @@ -987,7 +980,6 @@ RooDataHist::~RooDataHist() delete[] _binv; removeFromDir(this) ; - TRACE_DESTROY; } diff --git a/roofit/roofitcore/src/RooDataSet.cxx b/roofit/roofitcore/src/RooDataSet.cxx index 9c4caa7e6bc6a..4b981e44bc6b2 100644 --- a/roofit/roofitcore/src/RooDataSet.cxx +++ b/roofit/roofitcore/src/RooDataSet.cxx @@ -98,7 +98,6 @@ the new `RooAbsData::uniqueId()`. #include "RooVectorDataStore.h" #include "RooCompositeDataStore.h" #include "RooSentinel.h" -#include "RooTrace.h" #include "RooFitImplHelpers.h" #include "ROOT/StringUtils.hxx" @@ -125,7 +124,6 @@ void RooDataSet::cleanup() {} RooDataSet::RooDataSet() { - TRACE_CREATE; } namespace { @@ -275,7 +273,6 @@ RooDataSet::RooDataSet(RooStringView name, RooStringView title, const RooArgSet& const RooCmdArg& arg4,const RooCmdArg& arg5,const RooCmdArg& arg6,const RooCmdArg& arg7,const RooCmdArg& arg8) : RooAbsData(name,title,{}) { - TRACE_CREATE; // Define configuration for this method RooCmdConfig pc("RooDataSet::ctor(" + std::string(GetName()) + ")"); @@ -531,7 +528,6 @@ RooDataSet::RooDataSet(RooDataSet const & other, const char* newname) : RooAbsData(other,newname), RooDirItem() { initialize(other._wgtVar ? other._wgtVar->GetName() : nullptr); - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -652,7 +648,6 @@ std::unique_ptr RooDataSet::reduceEng(const RooArgSet &varSubset, co RooDataSet::~RooDataSet() { removeFromDir(this) ; - TRACE_DESTROY; } diff --git a/roofit/roofitcore/src/RooFormulaVar.cxx b/roofit/roofitcore/src/RooFormulaVar.cxx index be58ced22b315..d90a3941d4795 100644 --- a/roofit/roofitcore/src/RooFormulaVar.cxx +++ b/roofit/roofitcore/src/RooFormulaVar.cxx @@ -50,7 +50,6 @@ #include "RooFormulaVar.h" #include "RooStreamParser.h" #include "RooMsgService.h" -#include "RooTrace.h" #include "RooFormula.h" #include "RooAbsRealLValue.h" #include "RooAbsBinning.h" diff --git a/roofit/roofitcore/src/RooHistFunc.cxx b/roofit/roofitcore/src/RooHistFunc.cxx index 043df4cd492e4..0ad18c93df74f 100644 --- a/roofit/roofitcore/src/RooHistFunc.cxx +++ b/roofit/roofitcore/src/RooHistFunc.cxx @@ -75,7 +75,6 @@ RooHistFunc::RooHistFunc(const char *name, const char *title, const RooArgSet& v } } - TRACE_CREATE; } @@ -114,7 +113,6 @@ RooHistFunc::RooHistFunc(const char *name, const char *title, const RooArgList& } } - TRACE_CREATE; } RooHistFunc::RooHistFunc(const char *name, const char *title, const RooArgSet &vars, std::unique_ptr dhist, @@ -145,7 +143,6 @@ RooHistFunc::RooHistFunc(const RooHistFunc& other, const char* name) : _totVolume(other._totVolume), _unitNorm(other._unitNorm) { - TRACE_CREATE; _histObsList.addClone(other._histObsList) ; } @@ -156,7 +153,6 @@ RooHistFunc::RooHistFunc(const RooHistFunc& other, const char* name) : RooHistFunc::~RooHistFunc() { - TRACE_DESTROY; } diff --git a/roofit/roofitcore/src/RooProdPdf.cxx b/roofit/roofitcore/src/RooProdPdf.cxx index 483510a1dd6b5..06d7c44a2ec50 100644 --- a/roofit/roofitcore/src/RooProdPdf.cxx +++ b/roofit/roofitcore/src/RooProdPdf.cxx @@ -58,7 +58,6 @@ have to appear in any specific place in the list. #include "RooRangeBoolean.h" #include "RooCustomizer.h" #include "RooRealIntegral.h" -#include "RooTrace.h" #include "RooFitImplHelpers.h" #include "strtok.h" @@ -84,7 +83,6 @@ RooProdPdf::RooProdPdf() : _cacheMgr(this,10) { // Default constructor - TRACE_CREATE; } @@ -133,7 +131,6 @@ RooProdPdf::RooProdPdf(const char *name, const char *title, _extendedIndex=_pdfList.index(&pdf2) ; } } - TRACE_CREATE; } @@ -162,7 +159,6 @@ RooProdPdf::RooProdPdf(const char* name, const char* title, const RooArgList& in _pdfList("!pdfs","List of PDFs",this) { addPdfs(inPdfList); - TRACE_CREATE; } @@ -216,7 +212,6 @@ RooProdPdf::RooProdPdf(const char* name, const char* title, const RooArgSet& ful l.Add((TObject*)&arg7) ; l.Add((TObject*)&arg8) ; initializeFromCmdArgList(fullPdfSet,l) ; - TRACE_CREATE; } @@ -240,7 +235,6 @@ RooProdPdf::RooProdPdf(const char* name, const char* title, l.Add((TObject*)&arg7) ; l.Add((TObject*)&arg8) ; initializeFromCmdArgList(RooArgSet(),l) ; - TRACE_CREATE; } @@ -254,7 +248,6 @@ RooProdPdf::RooProdPdf(const char* name, const char* title, const RooArgSet& ful _pdfList("!pdfs","List of PDFs",this) { initializeFromCmdArgList(fullPdfSet, cmdArgList) ; - TRACE_CREATE; } @@ -279,7 +272,6 @@ RooProdPdf::RooProdPdf(const RooProdPdf& other, const char* name) : _pdfNSetList.emplace_back(std::make_unique(nset->GetName())); nset->snapshot(*_pdfNSetList.back()); } - TRACE_CREATE; } @@ -349,7 +341,6 @@ void RooProdPdf::initializeFromCmdArgList(const RooArgSet& fullPdfSet, const Roo RooProdPdf::~RooProdPdf() { - TRACE_DESTROY; } diff --git a/roofit/roofitcore/src/RooProduct.cxx b/roofit/roofitcore/src/RooProduct.cxx index 7c36ce9d166d9..de10d2bd4acc4 100644 --- a/roofit/roofitcore/src/RooProduct.cxx +++ b/roofit/roofitcore/src/RooProduct.cxx @@ -29,7 +29,6 @@ Represents the product of a given set of RooAbsReal objects. #include "RooAbsReal.h" #include "RooAbsCategory.h" #include "RooMsgService.h" -#include "RooTrace.h" #include #include @@ -50,7 +49,6 @@ namespace { RooProduct::RooProduct() : _cacheMgr(this,10) { - TRACE_CREATE; } @@ -59,7 +57,6 @@ RooProduct::RooProduct() : _cacheMgr(this,10) RooProduct::~RooProduct() { - TRACE_DESTROY; } @@ -76,7 +73,6 @@ RooProduct::RooProduct(const char* name, const char* title, const RooArgList& pr for (auto comp : prodSet) { addTerm(comp); } - TRACE_CREATE; } @@ -93,7 +89,6 @@ RooProduct::RooProduct(const RooProduct& other, const char* name) : _compCSet("!compCSet",this,other._compCSet), _cacheMgr(other._cacheMgr,this) { - TRACE_CREATE; } diff --git a/roofit/roofitcore/src/RooRatio.cxx b/roofit/roofitcore/src/RooRatio.cxx index 26d864a3878d7..e13249f68786f 100644 --- a/roofit/roofitcore/src/RooRatio.cxx +++ b/roofit/roofitcore/src/RooRatio.cxx @@ -25,7 +25,6 @@ Represents the ratio of two RooAbsReal objects. #include #include #include -#include #include "RooFit/Detail/MathFuncs.h" @@ -38,7 +37,6 @@ Represents the ratio of two RooAbsReal objects. RooRatio::RooRatio() { - TRACE_CREATE; } RooRatio::RooRatio(const char *name, const char *title, RooAbsReal &nr, RooAbsReal &dr) @@ -46,7 +44,6 @@ RooRatio::RooRatio(const char *name, const char *title, RooAbsReal &nr, RooAbsRe _numerator("numerator", "numerator", this, nr), _denominator("denominator", "denominator", this, dr) { - TRACE_CREATE; } RooRatio::RooRatio(const char *name, const char *title, RooAbsReal &nr, double dr) @@ -57,7 +54,6 @@ RooRatio::RooRatio(const char *name, const char *title, RooAbsReal &nr, double d auto drvar = new RooRealVar(Form("%s_dr", name), Form("%s_dr", name), dr); _denominator.setArg(*drvar); addOwnedComponents(RooArgSet(*drvar)); - TRACE_CREATE; } RooRatio::RooRatio(const char *name, const char *title, double nr, RooAbsReal &dr) @@ -68,7 +64,6 @@ RooRatio::RooRatio(const char *name, const char *title, double nr, RooAbsReal &d auto nrvar = new RooRealVar(Form("%s_nr", name), Form("%s_nr", name), nr); _numerator.setArg(*nrvar); addOwnedComponents(RooArgSet(*nrvar)); - TRACE_CREATE; } RooRatio::RooRatio(const char *name, const char *title, double nr, double dr) @@ -81,7 +76,6 @@ RooRatio::RooRatio(const char *name, const char *title, double nr, double dr) _numerator.setArg(*nrvar); _denominator.setArg(*drvar); addOwnedComponents(RooArgSet(*nrvar, *drvar)); - TRACE_CREATE; } RooRatio::RooRatio(const char *name, const char *title, const RooArgList &nrlist, const RooArgList &drlist) @@ -94,12 +88,10 @@ RooRatio::RooRatio(const char *name, const char *title, const RooArgList &nrlist _numerator.setArg(*nrprod); _denominator.setArg(*drprod); addOwnedComponents(RooArgSet(*nrprod, *drprod)); - TRACE_CREATE; } RooRatio::~RooRatio() { - TRACE_DESTROY; } RooRatio::RooRatio(const RooRatio &other, const char *name) @@ -107,7 +99,6 @@ RooRatio::RooRatio(const RooRatio &other, const char *name) _numerator("numerator", this, other._numerator), _denominator("denominator", this, other._denominator) { - TRACE_CREATE; } double RooRatio::evaluate() const diff --git a/roofit/roofitcore/src/RooRealIntegral.cxx b/roofit/roofitcore/src/RooRealIntegral.cxx index fe81e5a0c2333..efecfb2fb3c42 100644 --- a/roofit/roofitcore/src/RooRealIntegral.cxx +++ b/roofit/roofitcore/src/RooRealIntegral.cxx @@ -42,7 +42,6 @@ integration is performed in the various implementations of the RooAbsIntegrator #include #include #include -#include #include #include @@ -277,7 +276,6 @@ Int_t RooRealIntegral::_cacheAllNDim(2) ; RooRealIntegral::RooRealIntegral() { - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -630,7 +628,6 @@ RooRealIntegral::RooRealIntegral(const char *name, const char *title, } } - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// @@ -738,14 +735,12 @@ RooRealIntegral::RooRealIntegral(const RooRealIntegral &other, const char *name) other._intList.snapshot(_saveInt) ; other._sumList.snapshot(_saveSum) ; - TRACE_CREATE; } //////////////////////////////////////////////////////////////////////////////// RooRealIntegral::~RooRealIntegral() { - TRACE_DESTROY; } //////////////////////////////////////////////////////////////////////////////// diff --git a/roofit/roofitcore/src/RooRealMPFE.cxx b/roofit/roofitcore/src/RooRealMPFE.cxx index cc3529a15adb9..65b99a2813343 100644 --- a/roofit/roofitcore/src/RooRealMPFE.cxx +++ b/roofit/roofitcore/src/RooRealMPFE.cxx @@ -62,7 +62,6 @@ For general multiprocessing in ROOT, please refer to the TProcessExecutor class. #include "RooCategory.h" #include "RooMsgService.h" #include "RooNLLVar.h" -#include "RooTrace.h" #include "Rtypes.h" #include "TSystem.h" @@ -217,7 +216,6 @@ void RooRealMPFE::initialize() if (_pipe->isChild()) { // Start server loop - RooTrace::callgrind_zero() ; _state = Server ; serverLoop(); diff --git a/roofit/roofitcore/src/RooRealSumFunc.cxx b/roofit/roofitcore/src/RooRealSumFunc.cxx index 9d524bc34937d..29b75c2974c0f 100644 --- a/roofit/roofitcore/src/RooRealSumFunc.cxx +++ b/roofit/roofitcore/src/RooRealSumFunc.cxx @@ -35,7 +35,6 @@ #include "RooRealSumFunc.h" #include "RooRealSumPdf.h" -#include "RooTrace.h" bool RooRealSumFunc::_doFloorGlobal = false; @@ -45,7 +44,6 @@ RooRealSumFunc::RooRealSumFunc() : _normIntMgr(this, 10) { // Default constructor // coverity[UNINIT_CTOR] - TRACE_CREATE; } //_____________________________________________________________________________ @@ -54,7 +52,6 @@ RooRealSumFunc::RooRealSumFunc(const char *name, const char *title) _funcList("!funcList", "List of functions", this), _coefList("!coefList", "List of coefficients", this) { // Constructor with name and title - TRACE_CREATE; } //_____________________________________________________________________________ @@ -71,7 +68,6 @@ RooRealSumFunc::RooRealSumFunc(const char *name, const char *title, RooAbsReal & _funcList.add(func1); _funcList.add(func2); _coefList.add(coef1); - TRACE_CREATE; } //_____________________________________________________________________________ @@ -87,7 +83,6 @@ RooRealSumFunc::RooRealSumFunc(const char *name, const char *title, const RooArg RooRealSumPdf::initializeFuncsAndCoefs(*this, inFuncList, inCoefList, _funcList, _coefList); - TRACE_CREATE; } //_____________________________________________________________________________ @@ -98,13 +93,11 @@ RooRealSumFunc::RooRealSumFunc(const RooRealSumFunc &other, const char *name) { // Copy constructor - TRACE_CREATE; } //_____________________________________________________________________________ RooRealSumFunc::~RooRealSumFunc() { - TRACE_DESTROY; } //_____________________________________________________________________________ diff --git a/roofit/roofitcore/src/RooRealVar.cxx b/roofit/roofitcore/src/RooRealVar.cxx index 58458da80fa08..d2f1d009659bd 100644 --- a/roofit/roofitcore/src/RooRealVar.cxx +++ b/roofit/roofitcore/src/RooRealVar.cxx @@ -36,7 +36,6 @@ or integrals to sub ranges. The range without any name is used as default range. #include "RooMsgService.h" #include "RooParamBinning.h" #include "RooVectorDataStore.h" -#include "RooTrace.h" #include "RooRealVarSharedProperties.h" #include "RooUniformBinning.h" #include "RooSentinel.h" @@ -95,7 +94,6 @@ RooRealVarSharedProperties& RooRealVar::_nullProp() RooRealVar::RooRealVar() : _error(0), _asymErrLo(0), _asymErrHi(0), _binning(new RooUniformBinning()) { _fast = true ; - TRACE_CREATE; } @@ -111,7 +109,6 @@ RooRealVar::RooRealVar(const char *name, const char *title, removeMin(); removeMax(); setConstant(true) ; - TRACE_CREATE; } @@ -146,7 +143,6 @@ RooRealVar::RooRealVar(const char *name, const char *title, // setPlotRange(minValue,maxValue) ; setRange(minValue,maxValue) ; - TRACE_CREATE; } @@ -166,7 +162,6 @@ RooRealVar::RooRealVar(const char *name, const char *title, inRange(value,nullptr,&clipValue) ; _value = clipValue ; - TRACE_CREATE; } @@ -192,8 +187,6 @@ RooRealVar::RooRealVar(const RooRealVar& other, const char* name) : _altNonSharedBinning[item.first] = std::move(abc); } - TRACE_CREATE; - } @@ -207,7 +200,6 @@ RooRealVar::~RooRealVar() // _sharedPropList get erased. deleteSharedProperties(); - TRACE_DESTROY; } diff --git a/roofit/roofitcore/src/RooSharedProperties.cxx b/roofit/roofitcore/src/RooSharedProperties.cxx index da5d5a79f95b4..2d37212bc4150 100644 --- a/roofit/roofitcore/src/RooSharedProperties.cxx +++ b/roofit/roofitcore/src/RooSharedProperties.cxx @@ -25,7 +25,6 @@ that can be stored in RooSharedPropertiesList. #include "RooSharedProperties.h" #include "RooMsgService.h" -#include "RooTrace.h" #include "Riostream.h" @@ -36,7 +35,6 @@ that can be stored in RooSharedPropertiesList. RooSharedProperties::RooSharedProperties() : _refCount(0), _inSharedList(false) { - RooTrace::create(this) ; } @@ -45,7 +43,6 @@ RooSharedProperties::RooSharedProperties() : _refCount(0), _inSharedList(false) RooSharedProperties::RooSharedProperties(const char* uuidstr) : _uuid(uuidstr), _refCount(0), _inSharedList(false) { - RooTrace::create(this) ; } @@ -55,7 +52,6 @@ RooSharedProperties::RooSharedProperties(const char* uuidstr) : _uuid(uuidstr), RooSharedProperties::~RooSharedProperties() { - RooTrace::destroy(this) ; } diff --git a/roofit/roofitcore/src/RooTrace.cxx b/roofit/roofitcore/src/RooTrace.cxx index 607987fbc56a3..bffa423953976 100644 --- a/roofit/roofitcore/src/RooTrace.cxx +++ b/roofit/roofitcore/src/RooTrace.cxx @@ -19,6 +19,10 @@ \class RooTrace \ingroup Roofitcore +\deprecated RooTrace is unused and untested, and its hooks are compiled out by +default. It will be removed in ROOT 6.44. For memory debugging, please use +general-purpose tools like AddressSanitizer or Valgrind instead. + Controls the memory tracing hooks in all RooFit objects. When tracing is active, a table of live RooFit objects is kept that can be queried at any time. In verbose mode, messages @@ -95,6 +99,15 @@ and there is no guarantee that this works. using std::ostream, std::setw, std::hex, std::dec, std::map, std::string; +// RooTrace is deprecated as a whole, so its own implementation necessarily +// refers to the deprecated class and would otherwise trigger warnings. +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4996) +#else +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif RooTrace* RooTrace::_instance=nullptr ; @@ -365,3 +378,9 @@ void RooTrace::callgrind_dump() { ooccoutD((TObject*)nullptr,Tracing) << "RooTrace::callgrind_dump()" << std::endl ; } + +#ifdef _MSC_VER +#pragma warning(pop) +#else +#pragma GCC diagnostic pop +#endif diff --git a/roofit/roofitcore/src/RooUnitTest.cxx b/roofit/roofitcore/src/RooUnitTest.cxx index 012c895c6e43d..6c6ef958346ae 100644 --- a/roofit/roofitcore/src/RooUnitTest.cxx +++ b/roofit/roofitcore/src/RooUnitTest.cxx @@ -42,7 +42,6 @@ Object | function #include "RooHist.h" #include "RooMsgService.h" #include "RooDouble.h" -#include "RooTrace.h" #include "RooRandom.h" #include @@ -582,9 +581,7 @@ bool RooUnitTest::runTest() gRandom->SetSeed(12345) ; RooRandom::randomGenerator()->SetSeed(12345) ; - RooTrace::callgrind_zero() ; if (!testCode()) return false ; - RooTrace::callgrind_dump() ; if (_verb<2) { clearSilentMode() ; diff --git a/roofit/roofitcore/src/RooVectorDataStore.cxx b/roofit/roofitcore/src/RooVectorDataStore.cxx index 2f1b22d1b64b8..79fd2bc51c0cf 100644 --- a/roofit/roofitcore/src/RooVectorDataStore.cxx +++ b/roofit/roofitcore/src/RooVectorDataStore.cxx @@ -39,7 +39,6 @@ which returns spans pointing directly to the data. #include "RooRealVar.h" #include "RooCategory.h" #include "RooHistError.h" -#include "RooTrace.h" #include "RooFitImplHelpers.h" #include "Math/Util.h" @@ -55,7 +54,6 @@ using std::string, std::vector, std::list; RooVectorDataStore::RooVectorDataStore() { - TRACE_CREATE; } @@ -72,7 +70,6 @@ RooVectorDataStore::RooVectorDataStore(RooStringView name, RooStringView title, } setAllBuffersNative() ; - TRACE_CREATE; } @@ -160,7 +157,6 @@ RooVectorDataStore::RooVectorDataStore(const RooVectorDataStore& other, const ch setAllBuffersNative() ; - TRACE_CREATE; } @@ -184,7 +180,6 @@ RooVectorDataStore::RooVectorDataStore(const RooTreeDataStore& other, const RooA _varsww.assign(other._varsww) ; fill() ; } - TRACE_CREATE; } @@ -238,8 +233,6 @@ RooVectorDataStore::RooVectorDataStore(const RooVectorDataStore& other, const Ro setAllBuffersNative() ; - TRACE_CREATE; - } @@ -286,7 +279,6 @@ RooVectorDataStore::RooVectorDataStore(RooStringView name, RooStringView title, loadValues(&tds,cloneVar.get(),cutRange,nStart,nStop); - TRACE_CREATE; } @@ -312,7 +304,6 @@ RooVectorDataStore::~RooVectorDataStore() } delete _cache ; - TRACE_DESTROY; } diff --git a/roofit/roofitcore/test/stressRooFit.cxx b/roofit/roofitcore/test/stressRooFit.cxx index 554cf9f662ce3..e6e0bef1a4680 100644 --- a/roofit/roofitcore/test/stressRooFit.cxx +++ b/roofit/roofitcore/test/stressRooFit.cxx @@ -4,7 +4,6 @@ #include "RooGlobalFunc.h" #include "RooMsgService.h" #include "RooRandom.h" -#include "RooTrace.h" #include "Math/MinimizerOptions.h" @@ -88,8 +87,6 @@ int stressRooFit(const char *refFile, bool writeRef, int doVerbose, int oneTest, // Preload singletons here so they don't show up in trace accounting RooNumIntConfig::defaultConfig(); RooResolutionModel::identity(); - - RooTrace::active(true); } // Add dedicated logging stream for errors that will remain active in silent mode @@ -184,10 +181,6 @@ int stressRooFit(const char *refFile, bool writeRef, int doVerbose, int oneTest, i++; } - if (dryRun) { - RooTrace::dump(); - } - gBenchmark->Stop("StressRooFit"); // Print table with results diff --git a/roofit/roostats/test/stressRooStats.cxx b/roofit/roostats/test/stressRooStats.cxx index 2e3d07b5ca251..0dbd92997536c 100644 --- a/roofit/roostats/test/stressRooStats.cxx +++ b/roofit/roostats/test/stressRooStats.cxx @@ -28,7 +28,6 @@ #include "RooMsgService.h" #include "RooResolutionModel.h" #include "RooRandom.h" -#include "RooTrace.h" // Tests file #include "stressRooStats_tests.h" @@ -90,8 +89,6 @@ int stressRooStats(const char *refFile, bool writeRef, int verbose, bool allTest // Preload singletons here so they don't show up in trace accounting RooNumIntConfig::defaultConfig(); RooResolutionModel::identity(); - - RooTrace::active(true); } // Add dedicated logging stream for errors that will remain active in silent mode @@ -226,10 +223,6 @@ int stressRooStats(const char *refFile, bool writeRef, int verbose, bool allTest } } - if (dryRun) { - RooTrace::dump(); - } - gBenchmark->Stop("stressRooStats"); // Print table with results