Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README/ReleaseNotes/v642/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 0 additions & 6 deletions roofit/histfactory/src/FlexibleInterpVar.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/

#include <RooMsgService.h>
#include <RooTrace.h>

#include <RooFit/Detail/MathFuncs.h>
#include <RooStats/HistFactory/FlexibleInterpVar.h>
Expand All @@ -36,7 +35,6 @@ using namespace HistFactory;

FlexibleInterpVar::FlexibleInterpVar()
{
TRACE_CREATE;
}


Expand Down Expand Up @@ -82,7 +80,6 @@ FlexibleInterpVar::FlexibleInterpVar(const char* name, const char* title,
R__ASSERT(_low.size() == _interpCode.size());
}

TRACE_CREATE;
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -92,7 +89,6 @@ FlexibleInterpVar::FlexibleInterpVar(const char* name, const char* title) :
RooAbsReal(name, title),
_paramList("paramList","List of coefficients",this)
{
TRACE_CREATE;
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -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;
}


Expand All @@ -112,7 +107,6 @@ FlexibleInterpVar::FlexibleInterpVar(const FlexibleInterpVar& other, const char*

FlexibleInterpVar::~FlexibleInterpVar()
{
TRACE_DESTROY;
}

void FlexibleInterpVar::setInterpCode(RooAbsReal &param, int code)
Expand Down
5 changes: 0 additions & 5 deletions roofit/histfactory/src/PiecewiseInterpolation.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
#include "RooRealVar.h"
#include "RooMsgService.h"
#include "RooNumIntConfig.h"
#include "RooTrace.h"
#include "RooDataHist.h"
#include "RooHistFunc.h"

Expand All @@ -65,7 +64,6 @@

PiecewiseInterpolation::PiecewiseInterpolation() : _normIntMgr(this)
{
TRACE_CREATE;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -130,7 +128,6 @@ PiecewiseInterpolation::PiecewiseInterpolation(const char *name, const char *tit

// Choose special integrator by default
specialIntegratorConfig(true)->method1D().setLabel("RooBinIntegrator") ;
TRACE_CREATE;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -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;
}


Expand All @@ -184,7 +180,6 @@ PiecewiseInterpolation::PiecewiseInterpolation(const PiecewiseInterpolation& oth

PiecewiseInterpolation::~PiecewiseInterpolation()
{
TRACE_DESTROY;
}


Expand Down
1 change: 0 additions & 1 deletion roofit/roofit/inc/RooPoisson.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "RooCategoryProxy.h"
#include "RooAbsReal.h"
#include "RooAbsCategory.h"
#include "RooTrace.h"

class RooPoisson : public RooAbsPdf {
public:
Expand Down
5 changes: 0 additions & 5 deletions roofit/roofit/src/RooKeysPdf.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -53,7 +52,6 @@ const double RooKeysPdf::_nSigma = std::sqrt(-2. *

RooKeysPdf::RooKeysPdf()
{
TRACE_CREATE;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -84,7 +82,6 @@ RooKeysPdf::RooKeysPdf(const char *name, const char *title, RooAbsReal &xpdf, Ro

// form the lookup table
LoadDataSet(data);
TRACE_CREATE;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -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;
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -127,7 +123,6 @@ RooKeysPdf::~RooKeysPdf() {
delete[] _dataWgts;
delete[] _weights;

TRACE_DESTROY;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
4 changes: 0 additions & 4 deletions roofit/roofit/src/RooLagrangianMorphFunc.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1815,7 +1815,6 @@ RooLagrangianMorphFunc::RooLagrangianMorphFunc(const char *name, const char *tit
this->disableInterferences(_config.nonInterfering);
this->setup(false);

TRACE_CREATE;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1946,7 +1945,6 @@ RooLagrangianMorphFunc::RooLagrangianMorphFunc(const RooLagrangianMorphFunc &oth
}
_diagrams.push_back(diagram);
}
TRACE_CREATE;
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -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;
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -1986,7 +1983,6 @@ RooLagrangianMorphFunc::~RooLagrangianMorphFunc()
delete vertex;
}
}
TRACE_DESTROY;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 0 additions & 6 deletions roofit/roofit/src/RooMomentMorphFuncND.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ using std::string, std::vector;
//_____________________________________________________________________________
RooMomentMorphFuncND::RooMomentMorphFuncND() : _cacheMgr(this, 10, true, true), _setting(RooMomentMorphFuncND::Linear), _useHorizMorph(true)
{
TRACE_CREATE;
}

//_____________________________________________________________________________
Expand All @@ -72,7 +71,6 @@ RooMomentMorphFuncND::RooMomentMorphFuncND(const char *name, const char *title,
// general initialization
initialize();

TRACE_CREATE;
}

//_____________________________________________________________________________
Expand Down Expand Up @@ -112,7 +110,6 @@ RooMomentMorphFuncND::RooMomentMorphFuncND(const char *name, const char *title,
// general initialization
initialize();

TRACE_CREATE;
}

//_____________________________________________________________________________
Expand Down Expand Up @@ -167,7 +164,6 @@ RooMomentMorphFuncND::RooMomentMorphFuncND(const char *name, const char *title,
// general initialization
initialize();

TRACE_CREATE;
}

//_____________________________________________________________________________
Expand All @@ -185,13 +181,11 @@ RooMomentMorphFuncND::RooMomentMorphFuncND(const RooMomentMorphFuncND &other, co
// general initialization
initialize();

TRACE_CREATE;
}

//_____________________________________________________________________________
RooMomentMorphFuncND::~RooMomentMorphFuncND()
{
TRACE_DESTROY;
}

//_____________________________________________________________________________
Expand Down
5 changes: 2 additions & 3 deletions roofit/roofitcore/inc/RooAddPdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "RooAICRegistry.h"
#include "RooObjCacheManager.h"
#include "RooNameReg.h"
#include "RooTrace.h"

#include <vector>
#include <list>
Expand All @@ -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) ;
Expand All @@ -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;

Expand Down
1 change: 0 additions & 1 deletion roofit/roofitcore/inc/RooFormulaVar.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include "RooAbsReal.h"
#include "RooArgList.h"
#include "RooListProxy.h"
#include "RooTrace.h"
#include "RooAbsBinning.h"

#include <memory>
Expand Down
1 change: 0 additions & 1 deletion roofit/roofitcore/inc/RooHistFunc.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "RooRealProxy.h"
#include "RooSetProxy.h"
#include "RooAICRegistry.h"
#include "RooTrace.h"
#include "RooDataHist.h"

#include <list>
Expand Down
4 changes: 3 additions & 1 deletion roofit/roofitcore/inc/RooTrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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() {} ;
Expand Down
1 change: 0 additions & 1 deletion roofit/roofitcore/src/RooAbsArg.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ for single nodes.
#include <RooRealIntegral.h>
#include <RooResolutionModel.h>
#include <RooSetProxy.h>
#include <RooTrace.h>
#include <RooTreeDataStore.h>
#include <RooVectorDataStore.h>
#include <RooWorkspace.h>
Expand Down
2 changes: 0 additions & 2 deletions roofit/roofitcore/src/RooAbsCollection.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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());
Expand Down
9 changes: 0 additions & 9 deletions roofit/roofitcore/src/RooAbsData.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -150,8 +149,6 @@ RooAbsData::StorageType RooAbsData::getDefaultStorageType( )

RooAbsData::RooAbsData() : storageType(defaultStorageType)
{

RooTrace::create(this) ;
}

void RooAbsData::initializeVars(RooArgSet const& vars)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -285,8 +278,6 @@ RooAbsData::~RooAbsData()
for (auto& item : _ownedComponents) {
delete item.second;
}

RooTrace::destroy(this) ;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
1 change: 0 additions & 1 deletion roofit/roofitcore/src/RooAbsOptTestStatistic.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions roofit/roofitcore/src/RooAddPdf.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ RooAddPdf::RooAddPdf(const char *name, const char *title) :
_coefList("!coefficients","List of coefficients",this),
_coefErrCount{_errorCount}
{
TRACE_CREATE;
}


Expand Down Expand Up @@ -302,7 +301,6 @@ RooAddPdf::RooAddPdf(const RooAddPdf &other, const char *name)
{

finalizeConstruction();
TRACE_CREATE;
}


Expand Down
Loading
Loading