fix parameter percolation

cms-sw · Nov 12, 2014 · dcb36c3 · dcb36c3
1 parent 60a09db
commit dcb36c3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronBaseProducer.cc b/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronBaseProducer.cc
@@ -365,8 +365,9 @@ GsfElectronBaseProducer::GsfElectronBaseProducer( const edm::ParameterSet& cfg )
    }
 
 
-   mva_NIso_Cfg_.vweightsfiles=cfg.getParameter<std::vector<std::string>>("SoftElecMVAFilesString");
-   mva_Iso_Cfg_.vweightsfiles=cfg.getParameter<std::vector<std::string>>("ElecMVAFilesString");
+   mva_NIso_Cfg_.vweightsfiles = cfg.getParameter<std::vector<std::string>>("SoftElecMVAFilesString");
+   mva_NIso_Cfg_.vtxCollection = consumes<reco::VertexCollection>(cfg.getParameter<edm::InputTag>("vtxTag"));
+   mva_Iso_Cfg_.vweightsfiles  = cfg.getParameter<std::vector<std::string>>("ElecMVAFilesString");
   // create algo
   algo_ = new GsfElectronAlgo
    ( inputCfg_, strategyCfg_,

diff --git a/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py
@@ -162,7 +162,6 @@
  SoftElecMVAFilesString = cms.vstring(
     "RecoEgamma/ElectronIdentification/data/TMVA_BDTSoftElectrons_7Feb2014.weights.xml"
                                 ),
- SoftElecMVAVtxTag = cms.InputTag('offlinePrimaryVertices'),
  ElecMVAFilesString = cms.vstring(
      "RecoEgamma/ElectronIdentification/data/TMVA_BDTSimpleCat_17Feb2011.weights.xml"
                                  ),

diff --git a/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py
@@ -160,7 +160,6 @@
   SoftElecMVAFilesString = cms.vstring(
     "RecoEgamma/ElectronIdentification/data/TMVA_BDTSoftElectrons_9Dec2013.weights.xml"
                                 ), 
-  SoftElecMVAVtxTag = cms.InputTag('offlinePrimaryVertices'),
   ElecMVAFilesString = cms.vstring(
      "RecoEgamma/ElectronIdentification/data/TMVA_BDTSimpleCat_17Feb2011.weights.xml"
                                  ),
@@ -335,7 +334,6 @@
    SoftElecMVAFilesString = cms.vstring(
     "RecoEgamma/ElectronIdentification/data/TMVA_BDTSoftElectrons_7Feb2014.weights.xml"
                                 ),
-   SoftElecMVAVtxTag = cms.InputTag('offlinePrimaryVertices'),
    ElecMVAFilesString = cms.vstring(
      "RecoEgamma/ElectronIdentification/data/TMVA_BDTSimpleCat_17Feb2011.weights.xml"
                                  ),

diff --git a/RecoEgamma/ElectronIdentification/interface/SoftElectronMVAEstimator.h b/RecoEgamma/ElectronIdentification/interface/SoftElectronMVAEstimator.h
@@ -13,7 +13,7 @@ class SoftElectronMVAEstimator {
  public:
   struct Configuration{
     std::vector<std::string> vweightsfiles;
-    edm::InputTag fullPrimaryVertexTag_;
+    edm::EDGetTokenT<reco::VertexCollection> vtxCollection;
   };
   SoftElectronMVAEstimator(const Configuration & );
   ~SoftElectronMVAEstimator() ;

diff --git a/RecoEgamma/ElectronIdentification/src/SoftElectronMVAEstimator.cc b/RecoEgamma/ElectronIdentification/src/SoftElectronMVAEstimator.cc
@@ -114,7 +114,7 @@ UInt_t SoftElectronMVAEstimator::GetMVABin(int pu, double eta, double pt) const
 double SoftElectronMVAEstimator::mva(const reco::GsfElectron& myElectron,const edm::Event & evt)  {
 
  edm::Handle<reco::VertexCollection> FullprimaryVertexCollection;
- evt.getByLabel(cfg_.fullPrimaryVertexTag_, FullprimaryVertexCollection);
+ evt.getByToken(cfg_.vtxCollection, FullprimaryVertexCollection);
  const reco::VertexCollection pvc = *(FullprimaryVertexCollection.product());
 
   fbrem                 	=myElectron.fbrem();