Skip to content
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

Jump to bottom

Replace TMVA::Factory->SetInputTrees with TMVA::DataLoader #17185

Merged
merged 1 commit into from Jan 17, 2017
Merged

Replace TMVA::Factory->SetInputTrees with TMVA::DataLoader #17185

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 14 additions & 9 deletions PhysicsTools/MVATrainer/plugins/ProcTMVA.cc
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@

#include <TMVA/Types.h>
#include <TMVA/Factory.h>
#include <TMVA/DataLoader.h>

#include "FWCore/Utilities/interface/Exception.h"

Expand Down Expand Up @@ -340,34 +341,38 @@ void ProcTMVA::runTMVATrainer()
<< "Could not open TMVA ROOT file for writing."
<< std::endl;

std::auto_ptr<TMVA::Factory> factory(
std::unique_ptr<TMVA::Factory> factory(
new TMVA::Factory(getTreeName().c_str(), file.get(), ""));

factory->SetInputTrees(treeSig, treeBkg);
std::unique_ptr<TMVA::DataLoader> loader(new TMVA::DataLoader("ProcTMVA"));

loader->SetInputTrees(treeSig, treeBkg);

for(std::vector<std::string>::const_iterator iter = names.begin();
iter != names.end(); iter++)
factory->AddVariable(iter->c_str(), 'D');
loader->AddVariable(iter->c_str(), 'D');

factory->SetWeightExpression("__WEIGHT__");
loader->SetWeightExpression("__WEIGHT__");

if (doUserTreeSetup)
factory->PrepareTrainingAndTestTree(
if (doUserTreeSetup) {
loader->PrepareTrainingAndTestTree(
setupCuts.c_str(), setupOptions);
else
factory->PrepareTrainingAndTestTree(
} else {
loader->PrepareTrainingAndTestTree(
"", 0, 0, 0, 0,
"SplitMode=Block:!V");
}

for(std::vector<Method>::const_iterator iter = methods.begin();
iter != methods.end(); ++iter)
factory->BookMethod(iter->type, iter->name, iter->description);
factory->BookMethod(loader.get(), iter->type, iter->name, iter->description);

factory->TrainAllMethods();
factory->TestAllMethods();
factory->EvaluateAllMethods();

factory.release(); // ROOT seems to take care of destruction?!
loader.release();

file->Close();

Expand Down