Skip to content

[tmva] Retire TH1::AddDirectory use in TMVA. #21646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hageboeck wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[tmva] Retire TH1::AddDirectory use in TMVA. #21646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions tmva/tmva/src/MethodBase.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1458,13 +1458,10 @@ void TMVA::MethodBase::WriteStateToXML( void* parent ) const

void TMVA::MethodBase::ReadStateFromStream( TFile& rf )
{
Bool_t addDirStatus = TH1::AddDirectoryStatus();
TH1::AddDirectory( 0 ); // this avoids the binding of the hists in PDF to the current ROOT file
TDirectory::TContext dirCtx{nullptr}; // Don't register histograms to current directory
fMVAPdfS = (TMVA::PDF*)rf.Get( "MVA_PDF_Signal" );
fMVAPdfB = (TMVA::PDF*)rf.Get( "MVA_PDF_Background" );

TH1::AddDirectory( addDirStatus );

ReadWeightsFromStream( rf );

SetTestvarName();
Expand Down
12 changes: 3 additions & 9 deletions tmva/tmva/src/MethodLikelihood.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,8 +668,7 @@ void TMVA::MethodLikelihood::WriteWeightsToStream( TFile& ) const
void TMVA::MethodLikelihood::ReadWeightsFromXML(void* wghtnode)
{
TString pname = "PDF_";
Bool_t addDirStatus = TH1::AddDirectoryStatus();
TH1::AddDirectory(0); // this avoids the binding of the hists in TMVA::PDF to the current ROOT file
TDirectory::TContext dirCtx{nullptr}; // Don't register histograms to current directory
UInt_t nvars=0;
gTools().ReadAttr(wghtnode, "NVariables",nvars);
void* descnode = gTools().GetChild(wghtnode);
Expand All @@ -688,7 +687,6 @@ void TMVA::MethodLikelihood::ReadWeightsFromXML(void* wghtnode)
(*(*fPDFBgd)[ivar]).ReadXML(pdfnode);
descnode = gTools().GetNextChild(descnode);
}
TH1::AddDirectory(addDirStatus);
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -698,8 +696,7 @@ void TMVA::MethodLikelihood::ReadWeightsFromXML(void* wghtnode)
void TMVA::MethodLikelihood::ReadWeightsFromStream( std::istream & istr )
{
TString pname = "PDF_";
Bool_t addDirStatus = TH1::AddDirectoryStatus();
TH1::AddDirectory(0); // this avoids the binding of the hists in TMVA::PDF to the current ROOT file
TDirectory::TContext dirCtx{nullptr}; // Don't register histograms to current directory
for (UInt_t ivar=0; ivar<GetNvar(); ivar++){
Log() << kDEBUG << "Reading signal and background PDF for variable: " << GetInputVar( ivar ) << Endl;
if ((*fPDFSig)[ivar] !=0) delete (*fPDFSig)[ivar];
Expand All @@ -711,7 +708,6 @@ void TMVA::MethodLikelihood::ReadWeightsFromStream( std::istream & istr )
istr >> *(*fPDFSig)[ivar];
istr >> *(*fPDFBgd)[ivar];
}
TH1::AddDirectory(addDirStatus);
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -720,13 +716,11 @@ void TMVA::MethodLikelihood::ReadWeightsFromStream( std::istream & istr )
void TMVA::MethodLikelihood::ReadWeightsFromStream( TFile& rf )
{
TString pname = "PDF_";
Bool_t addDirStatus = TH1::AddDirectoryStatus();
TH1::AddDirectory(0); // this avoids the binding of the hists in TMVA::PDF to the current ROOT file
TDirectory::TContext dirCtx{nullptr}; // Don't register histograms to current directory
for (UInt_t ivar=0; ivar<GetNvar(); ivar++){
(*fPDFSig)[ivar] = (TMVA::PDF*)rf.Get( TString::Format( "PDF_%s_S", GetInputVar( ivar ).Data() ) );
(*fPDFBgd)[ivar] = (TMVA::PDF*)rf.Get( TString::Format( "PDF_%s_B", GetInputVar( ivar ).Data() ) );
}
TH1::AddDirectory(addDirStatus);
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
5 changes: 1 addition & 4 deletions tmva/tmva/src/PDEFoam.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,7 @@ void TMVA::PDEFoam::SetXmax(Int_t idim, Double_t wmax)

void TMVA::PDEFoam::Create()
{
Bool_t addStatus = TH1::AddDirectoryStatus();
TH1::AddDirectory(kFALSE);
TDirectory::TContext dirCtx{nullptr}; // Don't register histograms to current directory

if(fPseRan==0) Log() << kFATAL << "Random number generator not set" << Endl;
if(fDistr==0) Log() << kFATAL << "Distribution function not set" << Endl;
Expand Down Expand Up @@ -340,8 +339,6 @@ void TMVA::PDEFoam::Create()
InitCells();
Grow();

TH1::AddDirectory(addStatus);

// prepare PDEFoam for the filling with events
ResetCellElements(); // reset all cell elements
} // Create
Expand Down
4 changes: 1 addition & 3 deletions tmva/tmva/src/VariableGaussTransform.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,8 +549,7 @@ void TMVA::VariableGaussTransform::ReadFromXML( void* trfnode ) {

void TMVA::VariableGaussTransform::ReadTransformationFromStream( std::istream& istr, const TString& classname)
{
Bool_t addDirStatus = TH1::AddDirectoryStatus();
TH1::AddDirectory(0); // this avoids the binding of the hists in TMVA::PDF to the current ROOT file
TDirectory::TContext dirCtx{nullptr}; // Don't register histograms to current directory
char buf[512];
istr.getline(buf,512);

Expand Down Expand Up @@ -615,7 +614,6 @@ void TMVA::VariableGaussTransform::ReadTransformationFromStream( std::istream& i

istr.getline(buf,512); // reading the next line
}
TH1::AddDirectory(addDirStatus);

UInt_t classIdx=(classname=="signal")?0:1;
for(UInt_t ivar=0; ivar<fCumulativePDF.size(); ++ivar) {
Expand Down
Loading