introduced more logical parameter names when using input xml files

cms-sw · Aug 13, 2015 · fd95157 · fd95157
1 parent 1d0cdce
commit fd95157
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CommonTools/Utils/plugins/GBRForestWriter.cc b/CommonTools/Utils/plugins/GBRForestWriter.cc
@@ -59,11 +59,11 @@ void GBRForestWriter::analyze(const edm::Event&, const edm::EventSetup&)
 	  dummyVariables.push_back(0.);
 	  mvaReader->AddSpectator(spectatorVariable->data(), &dummyVariables.back());
 	}
-	mvaReader->BookMVA((*category)->gbrForestName_.data(), (*category)->inputFileName_.data());
-	TMVA::MethodBDT* bdt = dynamic_cast<TMVA::MethodBDT*>(mvaReader->FindMVA((*category)->gbrForestName_.data()));
+	mvaReader->BookMVA((*category)->methodName_.data(), (*category)->inputFileName_.data());
+	TMVA::MethodBDT* bdt = dynamic_cast<TMVA::MethodBDT*>(mvaReader->FindMVA((*category)->methodName_.data()));
 	if ( !bdt )
 	  throw cms::Exception("GBRForestWriter") 
-	    << "Failed to load MVA = " << (*category)->gbrForestName_.data() << " from file = " << (*category)->inputFileName_ << " !!\n";
+	    << "Failed to load MVA = " << (*category)->methodName_.data() << " from file = " << (*category)->inputFileName_ << " !!\n";
 	gbrForest = new GBRForest(bdt);  
 	delete mvaReader;
 	TMVA::Tools::DestroyInstance();

diff --git a/CommonTools/Utils/plugins/GBRForestWriter.h b/CommonTools/Utils/plugins/GBRForestWriter.h
@@ -55,8 +55,11 @@ class GBRForestWriter : public edm::EDAnalyzer
       if ( inputFileType_ == kXML ) {
 	inputVariables_ = cfg.getParameter<vstring>("inputVariables");
 	spectatorVariables_ = cfg.getParameter<vstring>("spectatorVariables");
+        methodName_ = cfg.getParameter<std::string>("methodName");
+        gbrForestName_ = ( cfg.existsAs<std::string>("gbrForestName") ? cfg.getParameter<std::string>("gbrForestName") : methodName_ );
       }
-      gbrForestName_ = cfg.getParameter<std::string>("gbrForestName");
+      else
+        gbrForestName_ = cfg.getParameter<std::string>("gbrForestName");
     }
     ~categoryEntryType() {}
     std::string inputFileName_;
@@ -65,6 +68,7 @@ class GBRForestWriter : public edm::EDAnalyzer
     vstring inputVariables_;
     vstring spectatorVariables_;
     std::string gbrForestName_;
+    std::string methodName_;
   };
   struct jobEntryType
   {