rename

cms-sw · Apr 12, 2017 · c86a68d · c86a68d
1 parent 27c1abc
commit c86a68d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/RecoParticleFlow/Configuration/python/RecoParticleFlow_EventContent_cff.py b/RecoParticleFlow/Configuration/python/RecoParticleFlow_EventContent_cff.py
@@ -45,7 +45,7 @@
     'keep *_trackerDrivenElectronSeeds_preid_*',
     'keep *_particleFlowPtrs_*_*',
     'keep *_particleFlowTmpPtrs_*_*',
-    'keep *_chargedHadronIsolation_*_*'
+    'keep *_chargedHadronPFTrackIsolation_*_*'
         )
     )
 # RECO content
@@ -90,7 +90,7 @@
     'keep *_trackerDrivenElectronSeeds_preid_*',
     'keep *_particleFlowPtrs_*_*',
     'keep *_particleFlowTmpPtrs_*_*',
-    'keep *_chargedHadronIsolation_*_*'
+    'keep *_chargedHadronPFTrackIsolation_*_*'
         )
 )    
 
@@ -133,7 +133,7 @@
     'keep recoConversions_pfPhotonTranslator_*_*',
     'keep *_particleFlowPtrs_*_*',
     'keep *_particleFlowTmpPtrs_*_*',
-    'keep *_chargedHadronIsolation_*_*'
+    'keep *_chargedHadronPFTrackIsolation_*_*'
         )
 )
 

diff --git a/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py b/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py
@@ -19,7 +19,7 @@
 from CommonTools.ParticleFlow.pfParticleSelection_cff import *
 
 from RecoEgamma.EgammaIsolationAlgos.particleBasedIsoProducer_cff import *
-from RecoParticleFlow.PFProducer.chargedHadronIsolation_cfi import *
+from RecoParticleFlow.PFProducer.chargedHadronPFTrackIsolation_cfi import *
 
 from RecoJets.JetProducers.fixedGridRhoProducerFastjet_cfi import *
 fixedGridRhoFastjetAllTmp = fixedGridRhoFastjetAll.clone(pfCandidatesTag = cms.InputTag("particleFlowTmp"))
@@ -37,7 +37,7 @@
                                  particleFlowEGammaFinal*
                                  pfParticleSelectionSequence )
 
-particleFlowLinks = cms.Sequence( particleFlow*particleFlowPtrs*chargedHadronIsolation*particleBasedIsolationSequence)
+particleFlowLinks = cms.Sequence( particleFlow*particleFlowPtrs*chargedHadronPFTrackIsolation*particleBasedIsolationSequence)
 
 from RecoParticleFlow.PFTracking.hgcalTrackCollection_cfi import *
 from RecoParticleFlow.PFProducer.simPFProducer_cfi import *

diff --git a/...plugins/ChargedHadronIsolationProducer.cc → .../ChargedHadronPFTrackIsolationProducer.cc b/...plugins/ChargedHadronIsolationProducer.cc → .../ChargedHadronPFTrackIsolationProducer.cc
@@ -1,5 +1,5 @@
 /*
- * ChargedHadronIsolationProducer
+ * ChargedHadronPFTrackIsolationProducer
  *
  * Author: Andreas Hinzmann
  *
@@ -27,12 +27,12 @@ namespace edm {
    class ConfigurationDescriptions;
 }
 
-class ChargedHadronIsolationProducer : public edm::stream::EDProducer<> 
+class ChargedHadronPFTrackIsolationProducer : public edm::stream::EDProducer<> 
 {
 public:
 
-  explicit ChargedHadronIsolationProducer(const edm::ParameterSet& cfg);
-  ~ChargedHadronIsolationProducer() {}
+  explicit ChargedHadronPFTrackIsolationProducer(const edm::ParameterSet& cfg);
+  ~ChargedHadronPFTrackIsolationProducer() {}
   void produce(edm::Event& evt, const edm::EventSetup& es);
   static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
 
@@ -45,7 +45,7 @@ class ChargedHadronIsolationProducer : public edm::stream::EDProducer<>
 
 };
 
-ChargedHadronIsolationProducer::ChargedHadronIsolationProducer(const edm::ParameterSet& cfg)
+ChargedHadronPFTrackIsolationProducer::ChargedHadronPFTrackIsolationProducer(const edm::ParameterSet& cfg)
 {
   srcCandidates_ = cfg.getParameter<edm::InputTag>("src");
   Candidates_token = consumes<edm::View<reco::PFCandidate> >(srcCandidates_);
@@ -55,7 +55,7 @@ ChargedHadronIsolationProducer::ChargedHadronIsolationProducer(const edm::Parame
   produces<edm::ValueMap<bool> >();
 }
 
-void ChargedHadronIsolationProducer::produce(edm::Event& evt, const edm::EventSetup& es) 
+void ChargedHadronPFTrackIsolationProducer::produce(edm::Event& evt, const edm::EventSetup& es) 
 {
   // get a view of our Candidates via the base candidates
   typedef edm::View<reco::PFCandidate> PFCandidateView;
@@ -88,14 +88,14 @@ void ChargedHadronIsolationProducer::produce(edm::Event& evt, const edm::EventSe
   evt.put(std::move(out));
 }
 
-void ChargedHadronIsolationProducer::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+void ChargedHadronPFTrackIsolationProducer::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
    edm::ParameterSetDescription desc;
    desc.add<edm::InputTag>("src", edm::InputTag("particleFlow"));
    desc.add<double>("minTrackPt", 1);
    desc.add<double>("minRawCaloEnergy", 0.5);
-   descriptions.add("chargedHadronIsolation", desc);
+   descriptions.add("chargedHadronPFTrackIsolation", desc);
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-DEFINE_FWK_MODULE(ChargedHadronIsolationProducer);
+DEFINE_FWK_MODULE(ChargedHadronPFTrackIsolationProducer);
diff --git a/...ucer/python/chargedHadronIsolation_cfi.py → ...thon/chargedHadronPFTrackIsolation_cfi.py b/...ucer/python/chargedHadronIsolation_cfi.py → ...thon/chargedHadronPFTrackIsolation_cfi.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
 
-chargedHadronIsolation = cms.EDProducer(
-    "ChargedHadronIsolationProducer",
+chargedHadronPFTrackIsolation = cms.EDProducer(
+    "ChargedHadronPFTrackIsolationProducer",
     src = cms.InputTag("particleFlow"),
     minTrackPt = cms.double(1),
     minRawCaloEnergy = cms.double(0.5),