Merge pull request #23746 from guitargeek/Category_not_found_fix

Changed category not defined error to warning in ElectronMVA
cms-sw · Jul 8, 2018 · 4d160db · 4d160db
2 parents 45cdd40 + 7b0b8cd
commit 4d160db
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/RecoEgamma/EgammaTools/src/GBRForestTools.cc b/RecoEgamma/EgammaTools/src/GBRForestTools.cc
@@ -62,7 +62,9 @@ std::unique_ptr<const GBRForest> GBRForestTools::createGBRForest(const edm::File
       tmpstr = "";
   } else if (reco::details::hasEnding(weightFile.fullPath(), ".gz") || reco::details::hasEnding(weightFile.fullPath(), ".gzip")) {
       gzipped = true;
-      tmpstr = std::string(reco::details::readGzipFile(weightFile.fullPath()));
+      char *buffer = reco::details::readGzipFile(weightFile.fullPath());
+      tmpstr = std::string(buffer);
+      free(buffer);
   }
   std::stringstream is(tmpstr);
 

diff --git a/RecoEgamma/ElectronIdentification/src/ElectronMVAEstimatorRun2.cc b/RecoEgamma/ElectronIdentification/src/ElectronMVAEstimatorRun2.cc
@@ -104,6 +104,9 @@ float ElectronMVAEstimatorRun2::
 mvaValue( const edm::Ptr<reco::Candidate>& candPtr, const edm::EventBase & iEvent) const {
 
   const int iCategory = findCategory( candPtr );
+
+  if (iCategory < 0) return -999;
+
   std::vector<float> vars;
 
   const edm::Ptr<reco::GsfElectron> gsfPtr{ candPtr };
@@ -148,7 +151,10 @@ int ElectronMVAEstimatorRun2::findCategory( const edm::Ptr<reco::Candidate>& can
       if (categoryFunctions_[i](*gsfEle)) return i;
   }
 
-  throw cms::Exception("MVA failure: ")
-    << " category not defined for particle in " << name_ << tag_ << std::endl;
+  edm::LogWarning  ("MVA warning") <<
+      "category not defined for particle with pt " << gsfEle->pt() << " GeV, eta " <<
+          gsfEle->superCluster()->eta() << " in " << name_ << tag_;
+
+  return -1;
 
 }