Removed more unused members

cms-sw · Aug 31, 2018 · 5de4714 · 5de4714
1 parent fb07393
commit 5de4714
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 70 deletions.
diff --git a/PhysicsTools/PatAlgos/interface/MuonMvaEstimator.h b/PhysicsTools/PatAlgos/interface/MuonMvaEstimator.h
@@ -38,19 +38,6 @@ namespace pat {
     std::unique_ptr<const GBRForest> gbrForest_;
     float dRmax_;
 
-    /// MVA VAriables
-    float pt_ = 0.0;
-    float eta_ = 0.0;
-    float jetNDauCharged_ = 0.0;
-    float miniRelIsoCharged_ = 0.0;
-    float miniRelIsoNeutral_ = 0.0;
-    float jetPtRel_ = 0.0;
-    float jetPtRatio_ = 0.0;
-    float jetBTagCSV_ = 0.0;
-    float sip_ = 0.0;
-    float log_abs_dxyBS_ = 0.0;
-    float log_abs_dzPV_ = 0.0;
-    float segmentCompatibility_ = 0.0;
   };
 }
 #endif
diff --git a/PhysicsTools/PatAlgos/interface/SoftMuonMvaEstimator.h b/PhysicsTools/PatAlgos/interface/SoftMuonMvaEstimator.h
@@ -24,28 +24,6 @@ namespace pat {
 
     std::unique_ptr<const GBRForest> gbrForest_;
 
-    // MVA VAriables
-    float segmentCompatibility_ = 0.0;
-    float chi2LocalMomentum_ = 0.0;
-    float chi2LocalPosition_ = 0.0;
-    float glbTrackProbability_ = 0.0;
-    float iValidFraction_ = 0.0;
-    float layersWithMeasurement_ = 0.0;
-    float trkKink_ = 0.0;
-    float log2PlusGlbKink_ = 0.0;
-    float timeAtIpInOutErr_ = 0.0;
-    float outerChi2_ = 0.0;
-    float innerChi2_ = 0.0;
-    float trkRelChi2_ = 0.0;
-    float vMuonHitComb_ = 0.0;
-    float qProd_ = 0.0;
-
-    // MVA Spectator
-    float pID_ = 0.0;
-    float pt_ = 0.0;
-    float eta_ = 0.0;
-    float momID_ = 0.0;
-
   };
 }
 #endif
diff --git a/RecoJets/JetProducers/interface/PileupJetIdAlgo.h b/RecoJets/JetProducers/interface/PileupJetIdAlgo.h
@@ -15,11 +15,6 @@
 #include "DataFormats/PatCandidates/interface/PackedCandidate.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "TMVA/Tools.h"
-#include "TMVA/Reader.h"
-#include "TMVA/Tools.h"
-#include "TMVA/Reader.h"
-
 #include "DataFormats/JetReco/interface/PileupJetIdentifier.h"
 #include "CondFormats/EgammaObjects/interface/GBRForest.h"
 
@@ -81,10 +76,6 @@ class PileupJetIdAlgo {
           array_t const& rmsCut() const { return rmsCut_; }
           array_t const& betaStarCut() const { return betaStarCut_; }
 
-          std::unique_ptr<const GBRForest> getMVA(std::vector<std::string> const& varList,
-                                                  std::string const& tmvaWeights,
-                                                  std::vector<std::string> const& tmvaSpectators);
-
         private:
 
           std::unique_ptr<const GBRForest> reader_;

diff --git a/RecoJets/JetProducers/src/PileupJetIdAlgo.cc b/RecoJets/JetProducers/src/PileupJetIdAlgo.cc
@@ -98,25 +98,14 @@ PileupJetIdAlgo::AlgoGBRForestsAndConstants::AlgoGBRForestsAndConstants(edm::Par
   if (( ! cutBased_ ) && (runMvas_)) {
     if (etaBinnedWeights_) {
       for (int v = 0; v < nEtaBins_; v++) {
-        etaReader_.push_back(getMVA(tmvaEtaVariables_.at(v), tmvaEtaWeights.at(v), tmvaSpectators));
+        etaReader_.push_back(std::make_unique<GBRForest>(tmvaEtaWeights.at(v)));
       }
     } else {
-      reader_ = getMVA(tmvaVariables_, ps.getParameter<std::string>("tmvaWeights"), tmvaSpectators);
+      reader_ = std::make_unique<GBRForest>(ps.getParameter<std::string>("tmvaWeights"));
     }
   }
 }
 
-std::unique_ptr<const GBRForest>
-PileupJetIdAlgo::AlgoGBRForestsAndConstants::getMVA(std::vector<std::string> const& varList,
-                                                    std::string const& tmvaWeights,
-                                                    std::vector<std::string> const& tmvaSpectators) {
-
-  // A temporary only to access the variables while calling TMVA AddVariable and TMVA AddSpectator.
-  PileupJetIdAlgo algo(nullptr);
-
-  return std::make_unique<const GBRForest> ( tmvaWeights );
-}
-
 PileupJetIdAlgo::PileupJetIdAlgo(AlgoGBRForestsAndConstants const* cache) :
   cache_(cache) {
 

diff --git a/RecoParticleFlow/PFTracking/interface/ConvBremHeavyObjectCache.h b/RecoParticleFlow/PFTracking/interface/ConvBremHeavyObjectCache.h
@@ -15,10 +15,6 @@ namespace convbremhelpers {
     std::unique_ptr<const GBRForest> gbrEndcapsLowPt_;
     std::unique_ptr<const GBRForest> gbrEndcapsHighPt_;
     std::unique_ptr<const PFEnergyCalibration> pfcalib_;
-  private:
-    std::unique_ptr<const GBRForest> setupMVA(const std::string&);
-    // for variable binding
-    float secR, sTIP, nHITS1, Epout, detaBremKF, ptRatioGsfKF;
   };
 }
 

diff --git a/RecoParticleFlow/PFTracking/src/ConvBremHeavyObjectCache.cc b/RecoParticleFlow/PFTracking/src/ConvBremHeavyObjectCache.cc
@@ -3,21 +3,17 @@
 namespace convbremhelpers {
   HeavyObjectCache::HeavyObjectCache(const edm::ParameterSet& conf) {
 
-    pfcalib_.reset( new PFEnergyCalibration() );
+    pfcalib_ = std::make_unique<PFEnergyCalibration>();
 
     const bool useConvBremFinder_ = conf.getParameter<bool>("useConvBremFinder");
 
     if(useConvBremFinder_) {
 
-      gbrBarrelLowPt_   = setupMVA(conf.getParameter<std::string>("pf_convBremFinderID_mvaWeightFileBarrelLowPt"));
-      gbrBarrelHighPt_  = setupMVA(conf.getParameter<std::string>("pf_convBremFinderID_mvaWeightFileBarrelHighPt"));
-      gbrEndcapsLowPt_  = setupMVA(conf.getParameter<std::string>("pf_convBremFinderID_mvaWeightFileEndcapsLowPt"));
-      gbrEndcapsHighPt_ = setupMVA(conf.getParameter<std::string>("pf_convBremFinderID_mvaWeightFileEndcapsHighPt"));
+      gbrBarrelLowPt_   = std::make_unique<const GBRForest>(conf.getParameter<std::string>("pf_convBremFinderID_mvaWeightFileBarrelLowPt"));
+      gbrBarrelHighPt_  = std::make_unique<const GBRForest>(conf.getParameter<std::string>("pf_convBremFinderID_mvaWeightFileBarrelHighPt"));
+      gbrEndcapsLowPt_  = std::make_unique<const GBRForest>(conf.getParameter<std::string>("pf_convBremFinderID_mvaWeightFileEndcapsLowPt"));
+      gbrEndcapsHighPt_ = std::make_unique<const GBRForest>(conf.getParameter<std::string>("pf_convBremFinderID_mvaWeightFileEndcapsHighPt"));
 
     }
   }
-
-  std::unique_ptr<const GBRForest> HeavyObjectCache::setupMVA(const std::string& weights) {
-    return std::make_unique<const GBRForest>( weights );
-  }  
 }