adapt params

HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHcalPFClusterIsoL1Seeded_cfi.py

@@ -11,7 +11,7 @@
     energyEndcap = cms.double(0.0),
     etaStripBarrel = cms.double(0.0),
     etaStripEndcap = cms.double(0.0),
-    pfClusterProducerHCAL = cms.InputTag("hltParticleFlowClusterHCALForEgamma"),
+    pfClusterProducerHCAL = cms.InputTag("hltParticleFlowClusterHCAL"),
     pfClusterProducerHFEM = cms.InputTag(""),
     pfClusterProducerHFHAD = cms.InputTag(""),
     recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesL1Seeded"),

HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHcalPFClusterIsoUnseeded_cfi.py

@@ -11,7 +11,7 @@
     energyEndcap = cms.double(0.0),
     etaStripBarrel = cms.double(0.0),
     etaStripEndcap = cms.double(0.0),
-    pfClusterProducerHCAL = cms.InputTag("hltParticleFlowClusterHCALForEgamma"),
+    pfClusterProducerHCAL = cms.InputTag("hltParticleFlowClusterHCAL"),
     pfClusterProducerHFEM = cms.InputTag(""),
     pfClusterProducerHFHAD = cms.InputTag(""),
     recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesUnseeded"),

HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHBHE_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHBHE_cfi.py

@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-particleFlowClusterHBHE = cms.EDProducer("PFClusterProducer",
+hltParticleFlowClusterHBHE = cms.EDProducer("PFClusterProducer",
     energyCorrector = cms.PSet(
 
     ),
@@ -59,7 +59,7 @@
         ),
         clusterTimeResFromSeed = cms.bool(False),
         excludeOtherSeeds = cms.bool(True),
-        maxIterations = cms.uint32(50),
+        maxIterations = cms.uint32(5),
         maxNSigmaTime = cms.double(10.0),
         minChi2Prob = cms.double(0.0),
         minFracTot = cms.double(1e-20),
@@ -133,7 +133,7 @@
 
     ),
     recHitCleaners = cms.VPSet(),
-    recHitsSource = cms.InputTag("particleFlowRecHitHBHE"),
+    recHitsSource = cms.InputTag("hltParticleFlowRecHitHBHE"),
     seedCleaners = cms.VPSet(),
     seedFinder = cms.PSet(
         algoName = cms.string('LocalMaximumSeedFinder'),

HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHCAL_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHCAL_cfi.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-particleFlowClusterHCAL = cms.EDProducer("PFMultiDepthClusterProducer",
-    clustersSource = cms.InputTag("particleFlowClusterHBHE"),
+hltParticleFlowClusterHCAL = cms.EDProducer("PFMultiDepthClusterProducer",
+    clustersSource = cms.InputTag("hltParticleFlowClusterHBHE"),
     energyCorrector = cms.PSet(
 
     ),

HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHBHE_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHBHE_cfi.py

@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-particleFlowRecHitHBHE = cms.EDProducer("PFRecHitProducer",
+hltParticleFlowRecHitHBHE = cms.EDProducer("PFRecHitProducer",
     navigator = cms.PSet(
         hcalEnums = cms.vint32(1, 2),
         name = cms.string('PFRecHitHCALDenseIdNavigator')
@@ -36,6 +36,6 @@
                 name = cms.string('PFRecHitQTestHCALChannel')
             )
         ),
-        src = cms.InputTag("hbhereco")
+        src = cms.InputTag("hltHbhereco")
     ))
 )

HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBlock_cfi.py

@@ -43,7 +43,7 @@
         ),
         cms.PSet(
             importerName = cms.string('GenericClusterImporter'),
-            source = cms.InputTag("particleFlowClusterHCAL")
+            source = cms.InputTag("hltParticleFlowClusterHCAL")
         ),
         cms.PSet(
             importerName = cms.string('GenericClusterImporter'),

HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHCAL_cfi.py

@@ -2,5 +2,5 @@
 
 pfClusterRefsForJetsHCAL = cms.EDProducer("PFClusterRefCandidateProducer",
     particleType = cms.string('pi+'),
-    src = cms.InputTag("particleFlowClusterHCAL")
+    src = cms.InputTag("hltParticleFlowClusterHCAL")
 )

HLTrigger/Configuration/python/HLT_75e33/tasks/HLTPFHcalClusteringForEgammaTask_cfi.py

@@ -1,11 +1,11 @@
 import FWCore.ParameterSet.Config as cms
 
-from ..modules.hltParticleFlowClusterHBHEForEgamma_cfi import *
-from ..modules.hltParticleFlowClusterHCALForEgamma_cfi import *
-from ..modules.hltParticleFlowRecHitHBHEForEgamma_cfi import *
+from ..modules.hltParticleFlowClusterHBHE_cfi import *
+from ..modules.hltParticleFlowClusterHCAL_cfi import *
+from ..modules.hltParticleFlowRecHitHBHE_cfi import *
 
 HLTPFHcalClusteringForEgammaTask = cms.Task(
-    hltParticleFlowClusterHBHEForEgamma,
-    hltParticleFlowClusterHCALForEgamma,
-    hltParticleFlowRecHitHBHEForEgamma
+    hltParticleFlowClusterHBHE,
+    hltParticleFlowClusterHCAL,
+    hltParticleFlowRecHitHBHE
 )

HLTrigger/Configuration/python/HLT_75e33/tasks/pfClusterRefsForJets_stepTask_cfi.py

@@ -2,12 +2,12 @@
 
 from ..modules.particleFlowClusterECAL_cfi import *
 from ..modules.particleFlowClusterECALUncorrected_cfi import *
-from ..modules.particleFlowClusterHBHE_cfi import *
-from ..modules.particleFlowClusterHCAL_cfi import *
+from ..modules.hltParticleFlowClusterHBHE_cfi import *
+from ..modules.hltParticleFlowClusterHCAL_cfi import *
 from ..modules.particleFlowClusterHF_cfi import *
 from ..modules.particleFlowClusterHO_cfi import *
 from ..modules.particleFlowRecHitECAL_cfi import *
-from ..modules.particleFlowRecHitHBHE_cfi import *
+from ..modules.hltParticleFlowRecHitHBHE_cfi import *
 from ..modules.particleFlowRecHitHF_cfi import *
 from ..modules.particleFlowRecHitHO_cfi import *
 from ..modules.pfClusterRefsForJets_cfi import *
@@ -20,12 +20,12 @@
 pfClusterRefsForJets_stepTask = cms.Task(
     particleFlowClusterECAL,
     particleFlowClusterECALUncorrected,
-    particleFlowClusterHBHE,
-    particleFlowClusterHCAL,
+    hltParticleFlowClusterHBHE,
+    hltParticleFlowClusterHCAL,
     particleFlowClusterHF,
     particleFlowClusterHO,
     particleFlowRecHitECAL,
-    particleFlowRecHitHBHE,
+    hltParticleFlowRecHitHBHE,
     particleFlowRecHitHF,
     particleFlowRecHitHO,
     pfClusterRefsForJets,

HLTrigger/Configuration/python/HLT_75e33/tasks/pfClusteringHBHEHFTask_cfi.py

@@ -1,15 +1,15 @@
 import FWCore.ParameterSet.Config as cms
 
-from ..modules.particleFlowClusterHBHE_cfi import *
-from ..modules.particleFlowClusterHCAL_cfi import *
+from ..modules.hltParticleFlowClusterHBHE_cfi import *
+from ..modules.hltParticleFlowClusterHCAL_cfi import *
 from ..modules.particleFlowClusterHF_cfi import *
-from ..modules.particleFlowRecHitHBHE_cfi import *
+from ..modules.hltParticleFlowRecHitHBHE_cfi import *
 from ..modules.particleFlowRecHitHF_cfi import *
 
 pfClusteringHBHEHFTask = cms.Task(
-    particleFlowClusterHBHE,
-    particleFlowClusterHCAL,
+    hltParticleFlowClusterHBHE,
+    hltParticleFlowClusterHCAL,
     particleFlowClusterHF,
-    particleFlowRecHitHBHE,
+    hltParticleFlowRecHitHBHE,
     particleFlowRecHitHF
 )