From 32c42d421964797b77a38b9450e352f612d87103 Mon Sep 17 00:00:00 2001 From: Theo Chatzistavrou Date: Tue, 25 Jul 2023 09:19:25 +0200 Subject: [PATCH 1/3] remove_unnecessary_modules --- .../python/HLT_75e33/modules/hltPFPuppiMETv0_cfi.py | 9 --------- .../python/HLT_75e33/modules/hltPFSoftKillerMET_cfi.py | 7 ------- .../HLT_75e33/modules/hltParticleFlowSoftKiller_cfi.py | 7 ------- .../python/HLT_75e33/sequences/HLTJMESequence_cfi.py | 2 -- .../sequences/HLTPFPuppiJMEReconstruction_cfi.py | 2 -- .../sequences/HLTPFSoftKillerMETReconstruction_cfi.py | 9 --------- 6 files changed, 36 deletions(-) delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiMETv0_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltPFSoftKillerMET_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSoftKiller_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFSoftKillerMETReconstruction_cfi.py diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiMETv0_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiMETv0_cfi.py deleted file mode 100644 index 1959277c137c7..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiMETv0_cfi.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hltPFPuppiMETv0 = cms.EDProducer("PFMETProducer", - applyWeight = cms.bool(True), - calculateSignificance = cms.bool(False), - globalThreshold = cms.double(0.0), - src = cms.InputTag("particleFlowTmp"), - srcWeights = cms.InputTag("hltPFPuppi") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFSoftKillerMET_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFSoftKillerMET_cfi.py deleted file mode 100644 index 2567d44889a73..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFSoftKillerMET_cfi.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hltPFSoftKillerMET = cms.EDProducer("PFMETProducer", - calculateSignificance = cms.bool(False), - globalThreshold = cms.double(0.0), - src = cms.InputTag("hltParticleFlowSoftKiller") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSoftKiller_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSoftKiller_cfi.py deleted file mode 100644 index dbf3913857d3d..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSoftKiller_cfi.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hltParticleFlowSoftKiller = cms.EDProducer("SoftKillerProducer", - PFCandidates = cms.InputTag("particleFlowTmp"), - Rho_EtaMax = cms.double(5.0), - rParam = cms.double(0.4) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTJMESequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTJMESequence_cfi.py index a4df920f92fd6..ce2ec0ea52bb2 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTJMESequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTJMESequence_cfi.py @@ -7,7 +7,6 @@ from ..sequences.HLTPFJetsCHSReconstruction_cfi import * from ..sequences.HLTPFMETsReconstruction_cfi import * from ..sequences.HLTPFPuppiJMEReconstruction_cfi import * -from ..sequences.HLTPFSoftKillerMETReconstruction_cfi import * HLTJMESequence = cms.Sequence( HLTCaloMETReconstruction + @@ -16,6 +15,5 @@ HLTAK8PFJetsReconstruction + HLTPFJetsCHSReconstruction + HLTPFMETsReconstruction + - HLTPFSoftKillerMETReconstruction + HLTPFPuppiJMEReconstruction ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFPuppiJMEReconstruction_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFPuppiJMEReconstruction_cfi.py index d16bc852bfc58..dee866b2f71b6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFPuppiJMEReconstruction_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFPuppiJMEReconstruction_cfi.py @@ -16,7 +16,6 @@ from ..modules.hltPFPuppiMET_cfi import * from ..modules.hltPFPuppiMETTypeOne_cfi import * from ..modules.hltPFPuppiMETTypeOneCorrector_cfi import * -from ..modules.hltPFPuppiMETv0_cfi import * from ..modules.hltPFPuppiNoLep_cfi import * from ..modules.hltPixelClustersMultiplicity_cfi import * @@ -26,7 +25,6 @@ hltPFPuppiMET + hltPixelClustersMultiplicity + hltPFPuppi + - hltPFPuppiMETv0 + hltAK4PFPuppiJets + hltAK4PFPuppiJetCorrectorL1 + hltAK4PFPuppiJetCorrectorL2 + diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFSoftKillerMETReconstruction_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFSoftKillerMETReconstruction_cfi.py deleted file mode 100644 index e6c050578fbba..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFSoftKillerMETReconstruction_cfi.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hltParticleFlowSoftKiller_cfi import * -from ..modules.hltPFSoftKillerMET_cfi import * - -HLTPFSoftKillerMETReconstruction = cms.Sequence( - hltParticleFlowSoftKiller + - hltPFSoftKillerMET -) From 8e63b7106880b30e3415948c1db255288ac46e7d Mon Sep 17 00:00:00 2001 From: Theo Chatzistavrou Date: Tue, 25 Jul 2023 10:51:36 +0200 Subject: [PATCH 2/3] removing PS modules in PF --- .../modules/hltEcalPreshowerDigis_cfi.py | 10 --- .../modules/hltEcalPreshowerRecHit_cfi.py | 8 --- .../hltParticleFlowClusterECALL1Seeded_cfi.py | 1 - .../hltParticleFlowClusterECALUnseeded_cfi.py | 1 - .../hltParticleFlowClusterPSL1Seeded_cfi.py | 71 ------------------- .../hltParticleFlowClusterPSUnseeded_cfi.py | 71 ------------------- .../hltParticleFlowRecHitPSL1Seeded_cfi.py | 22 ------ .../hltParticleFlowRecHitPSUnseeded_cfi.py | 22 ------ .../modules/particleFlowBlock_cfi.py | 14 ---- .../modules/particleFlowClusterECAL_cfi.py | 1 - .../modules/particleFlowClusterPS_cfi.py | 71 ------------------- .../modules/particleFlowRecHitPS_cfi.py | 22 ------ .../paths/HLT_IsoMu24_FromL1TkMuon_cfi.py | 8 --- ...FullUnpackingEgammaEcalL1SeededTask_cfi.py | 4 -- .../HLTDoFullUnpackingEgammaEcalTask_cfi.py | 4 -- ...LTPFClusteringForEgammaL1SeededTask_cfi.py | 4 -- ...LTPFClusteringForEgammaUnseededTask_cfi.py | 4 -- .../HLT_75e33/tasks/RawToDigiTask_cfi.py | 2 - .../HLT_75e33/tasks/ecalRecHitNoTPTask_cfi.py | 2 - .../tasks/particleFlowClusterTask_cfi.py | 4 +- .../HLT_75e33/tasks/pfClusteringPSTask_cfi.py | 9 --- 21 files changed, 1 insertion(+), 354 deletions(-) delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalPreshowerDigis_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalPreshowerRecHit_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterPSL1Seeded_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterPSUnseeded_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitPSL1Seeded_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitPSUnseeded_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterPS_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitPS_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/tasks/pfClusteringPSTask_cfi.py diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalPreshowerDigis_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalPreshowerDigis_cfi.py deleted file mode 100644 index 495f2312c5775..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalPreshowerDigis_cfi.py +++ /dev/null @@ -1,10 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hltEcalPreshowerDigis = cms.EDProducer("ESRawToDigi", - ESdigiCollection = cms.string(''), - InstanceES = cms.string(''), - LookupTable = cms.FileInPath('EventFilter/ESDigiToRaw/data/ES_lookup_table.dat'), - debugMode = cms.untracked.bool(False), - mightGet = cms.optional.untracked.vstring, - sourceTag = cms.InputTag("rawDataCollector") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalPreshowerRecHit_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalPreshowerRecHit_cfi.py deleted file mode 100644 index a6b1fa3360c03..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalPreshowerRecHit_cfi.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hltEcalPreshowerRecHit = cms.EDProducer("ESRecHitProducer", - ESRecoAlgo = cms.int32(0), - ESdigiCollection = cms.InputTag("hltEcalPreshowerDigis"), - ESrechitCollection = cms.string('EcalRecHitsES'), - algo = cms.string('ESRecHitWorker') -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALL1Seeded_cfi.py index 564e50759ce5a..531c65fefbcab 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALL1Seeded_cfi.py @@ -15,7 +15,6 @@ srfAwareCorrection = cms.bool(True) ), inputECAL = cms.InputTag("hltParticleFlowClusterECALUncorrectedL1Seeded"), - inputPS = cms.InputTag("hltParticleFlowClusterPSL1Seeded"), mightGet = cms.optional.untracked.vstring, minimumPSEnergy = cms.double(0) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALUnseeded_cfi.py index 81987263844ab..a59c4fa4f023f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALUnseeded_cfi.py @@ -15,7 +15,6 @@ srfAwareCorrection = cms.bool(True) ), inputECAL = cms.InputTag("hltParticleFlowClusterECALUncorrectedUnseeded"), - inputPS = cms.InputTag("hltParticleFlowClusterPSUnseeded"), mightGet = cms.optional.untracked.vstring, minimumPSEnergy = cms.double(0) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterPSL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterPSL1Seeded_cfi.py deleted file mode 100644 index 1442f2386c732..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterPSL1Seeded_cfi.py +++ /dev/null @@ -1,71 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hltParticleFlowClusterPSL1Seeded = cms.EDProducer("PFClusterProducer", - energyCorrector = cms.PSet( - - ), - initialClusteringStep = cms.PSet( - algoName = cms.string('Basic2DGenericTopoClusterizer'), - thresholdsByDetector = cms.VPSet( - cms.PSet( - detector = cms.string('PS1'), - gatheringThreshold = cms.double(6e-05), - gatheringThresholdPt = cms.double(0.0) - ), - cms.PSet( - detector = cms.string('PS2'), - gatheringThreshold = cms.double(6e-05), - gatheringThresholdPt = cms.double(0.0) - ) - ), - useCornerCells = cms.bool(False) - ), - pfClusterBuilder = cms.PSet( - algoName = cms.string('Basic2DGenericPFlowClusterizer'), - excludeOtherSeeds = cms.bool(True), - maxIterations = cms.uint32(50), - minFracTot = cms.double(1e-20), - minFractionToKeep = cms.double(1e-07), - positionCalc = cms.PSet( - algoName = cms.string('Basic2DGenericPFlowPositionCalc'), - logWeightDenominator = cms.double(6e-05), - minAllowedNormalization = cms.double(1e-09), - minFractionInCalc = cms.double(1e-09), - posCalcNCrystals = cms.int32(-1) - ), - recHitEnergyNorms = cms.VPSet( - cms.PSet( - detector = cms.string('PS1'), - recHitEnergyNorm = cms.double(6e-05) - ), - cms.PSet( - detector = cms.string('PS2'), - recHitEnergyNorm = cms.double(6e-05) - ) - ), - showerSigma = cms.double(0.3), - stoppingTolerance = cms.double(1e-08) - ), - positionReCalc = cms.PSet( - - ), - recHitCleaners = cms.VPSet(), - recHitsSource = cms.InputTag("hltParticleFlowRecHitPSL1Seeded"), - seedCleaners = cms.VPSet(), - seedFinder = cms.PSet( - algoName = cms.string('LocalMaximumSeedFinder'), - nNeighbours = cms.int32(4), - thresholdsByDetector = cms.VPSet( - cms.PSet( - detector = cms.string('PS1'), - seedingThreshold = cms.double(0.00012), - seedingThresholdPt = cms.double(0.0) - ), - cms.PSet( - detector = cms.string('PS2'), - seedingThreshold = cms.double(0.00012), - seedingThresholdPt = cms.double(0.0) - ) - ) - ) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterPSUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterPSUnseeded_cfi.py deleted file mode 100644 index 4e3a957568050..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterPSUnseeded_cfi.py +++ /dev/null @@ -1,71 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hltParticleFlowClusterPSUnseeded = cms.EDProducer("PFClusterProducer", - energyCorrector = cms.PSet( - - ), - initialClusteringStep = cms.PSet( - algoName = cms.string('Basic2DGenericTopoClusterizer'), - thresholdsByDetector = cms.VPSet( - cms.PSet( - detector = cms.string('PS1'), - gatheringThreshold = cms.double(6e-05), - gatheringThresholdPt = cms.double(0.0) - ), - cms.PSet( - detector = cms.string('PS2'), - gatheringThreshold = cms.double(6e-05), - gatheringThresholdPt = cms.double(0.0) - ) - ), - useCornerCells = cms.bool(False) - ), - pfClusterBuilder = cms.PSet( - algoName = cms.string('Basic2DGenericPFlowClusterizer'), - excludeOtherSeeds = cms.bool(True), - maxIterations = cms.uint32(50), - minFracTot = cms.double(1e-20), - minFractionToKeep = cms.double(1e-07), - positionCalc = cms.PSet( - algoName = cms.string('Basic2DGenericPFlowPositionCalc'), - logWeightDenominator = cms.double(6e-05), - minAllowedNormalization = cms.double(1e-09), - minFractionInCalc = cms.double(1e-09), - posCalcNCrystals = cms.int32(-1) - ), - recHitEnergyNorms = cms.VPSet( - cms.PSet( - detector = cms.string('PS1'), - recHitEnergyNorm = cms.double(6e-05) - ), - cms.PSet( - detector = cms.string('PS2'), - recHitEnergyNorm = cms.double(6e-05) - ) - ), - showerSigma = cms.double(0.3), - stoppingTolerance = cms.double(1e-08) - ), - positionReCalc = cms.PSet( - - ), - recHitCleaners = cms.VPSet(), - recHitsSource = cms.InputTag("hltParticleFlowRecHitPSUnseeded"), - seedCleaners = cms.VPSet(), - seedFinder = cms.PSet( - algoName = cms.string('LocalMaximumSeedFinder'), - nNeighbours = cms.int32(4), - thresholdsByDetector = cms.VPSet( - cms.PSet( - detector = cms.string('PS1'), - seedingThreshold = cms.double(0.00012), - seedingThresholdPt = cms.double(0.0) - ), - cms.PSet( - detector = cms.string('PS2'), - seedingThreshold = cms.double(0.00012), - seedingThresholdPt = cms.double(0.0) - ) - ) - ) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitPSL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitPSL1Seeded_cfi.py deleted file mode 100644 index ccc0e143a21fa..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitPSL1Seeded_cfi.py +++ /dev/null @@ -1,22 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hltParticleFlowRecHitPSL1Seeded = cms.EDProducer("PFRecHitProducer", - navigator = cms.PSet( - name = cms.string('PFRecHitPreshowerNavigator') - ), - producers = cms.VPSet(cms.PSet( - name = cms.string('PFPSRecHitCreator'), - qualityTests = cms.VPSet( - cms.PSet( - name = cms.string('PFRecHitQTestThreshold'), - threshold = cms.double(0.0) - ), - cms.PSet( - cleaningThreshold = cms.double(0.0), - name = cms.string('PFRecHitQTestES'), - topologicalCleaning = cms.bool(True) - ) - ), - src = cms.InputTag("hltEcalPreshowerRecHit","EcalRecHitsES") - )) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitPSUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitPSUnseeded_cfi.py deleted file mode 100644 index 2ed438cfbe2a8..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitPSUnseeded_cfi.py +++ /dev/null @@ -1,22 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hltParticleFlowRecHitPSUnseeded = cms.EDProducer("PFRecHitProducer", - navigator = cms.PSet( - name = cms.string('PFRecHitPreshowerNavigator') - ), - producers = cms.VPSet(cms.PSet( - name = cms.string('PFPSRecHitCreator'), - qualityTests = cms.VPSet( - cms.PSet( - name = cms.string('PFRecHitQTestThreshold'), - threshold = cms.double(0.0) - ), - cms.PSet( - cleaningThreshold = cms.double(0.0), - name = cms.string('PFRecHitQTestES'), - topologicalCleaning = cms.bool(True) - ) - ), - src = cms.InputTag("hltEcalPreshowerRecHit","EcalRecHitsES") - )) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBlock_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBlock_cfi.py index 7ffa99bc4e221..35330e8022a3b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBlock_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBlock_cfi.py @@ -56,23 +56,9 @@ cms.PSet( importerName = cms.string('GenericClusterImporter'), source = cms.InputTag("particleFlowClusterHF") - ), - cms.PSet( - importerName = cms.string('GenericClusterImporter'), - source = cms.InputTag("particleFlowClusterPS") ) ), linkDefinitions = cms.VPSet( - cms.PSet( - linkType = cms.string('PS1:ECAL'), - linkerName = cms.string('PreshowerAndECALLinker'), - useKDTree = cms.bool(True) - ), - cms.PSet( - linkType = cms.string('PS2:ECAL'), - linkerName = cms.string('PreshowerAndECALLinker'), - useKDTree = cms.bool(True) - ), cms.PSet( linkType = cms.string('TRACK:ECAL'), linkerName = cms.string('TrackAndECALLinker'), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECAL_cfi.py index 9f6e5306e8983..8e7e7cd26fbb1 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECAL_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECAL_cfi.py @@ -15,7 +15,6 @@ srfAwareCorrection = cms.bool(True) ), inputECAL = cms.InputTag("particleFlowTimeAssignerECAL"), - inputPS = cms.InputTag("particleFlowClusterPS"), mightGet = cms.optional.untracked.vstring, minimumPSEnergy = cms.double(0) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterPS_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterPS_cfi.py deleted file mode 100644 index b3e34804c77fc..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterPS_cfi.py +++ /dev/null @@ -1,71 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -particleFlowClusterPS = cms.EDProducer("PFClusterProducer", - energyCorrector = cms.PSet( - - ), - initialClusteringStep = cms.PSet( - algoName = cms.string('Basic2DGenericTopoClusterizer'), - thresholdsByDetector = cms.VPSet( - cms.PSet( - detector = cms.string('PS1'), - gatheringThreshold = cms.double(6e-05), - gatheringThresholdPt = cms.double(0.0) - ), - cms.PSet( - detector = cms.string('PS2'), - gatheringThreshold = cms.double(6e-05), - gatheringThresholdPt = cms.double(0.0) - ) - ), - useCornerCells = cms.bool(False) - ), - pfClusterBuilder = cms.PSet( - algoName = cms.string('Basic2DGenericPFlowClusterizer'), - excludeOtherSeeds = cms.bool(True), - maxIterations = cms.uint32(50), - minFracTot = cms.double(1e-20), - minFractionToKeep = cms.double(1e-07), - positionCalc = cms.PSet( - algoName = cms.string('Basic2DGenericPFlowPositionCalc'), - logWeightDenominator = cms.double(6e-05), - minAllowedNormalization = cms.double(1e-09), - minFractionInCalc = cms.double(1e-09), - posCalcNCrystals = cms.int32(-1) - ), - recHitEnergyNorms = cms.VPSet( - cms.PSet( - detector = cms.string('PS1'), - recHitEnergyNorm = cms.double(6e-05) - ), - cms.PSet( - detector = cms.string('PS2'), - recHitEnergyNorm = cms.double(6e-05) - ) - ), - showerSigma = cms.double(0.3), - stoppingTolerance = cms.double(1e-08) - ), - positionReCalc = cms.PSet( - - ), - recHitCleaners = cms.VPSet(), - recHitsSource = cms.InputTag("particleFlowRecHitPS"), - seedCleaners = cms.VPSet(), - seedFinder = cms.PSet( - algoName = cms.string('LocalMaximumSeedFinder'), - nNeighbours = cms.int32(4), - thresholdsByDetector = cms.VPSet( - cms.PSet( - detector = cms.string('PS1'), - seedingThreshold = cms.double(0.00012), - seedingThresholdPt = cms.double(0.0) - ), - cms.PSet( - detector = cms.string('PS2'), - seedingThreshold = cms.double(0.00012), - seedingThresholdPt = cms.double(0.0) - ) - ) - ) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitPS_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitPS_cfi.py deleted file mode 100644 index 278cbf9d6897e..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitPS_cfi.py +++ /dev/null @@ -1,22 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -particleFlowRecHitPS = cms.EDProducer("PFRecHitProducer", - navigator = cms.PSet( - name = cms.string('PFRecHitPreshowerNavigator') - ), - producers = cms.VPSet(cms.PSet( - name = cms.string('PFPSRecHitCreator'), - qualityTests = cms.VPSet( - cms.PSet( - name = cms.string('PFRecHitQTestThreshold'), - threshold = cms.double(0.0) - ), - cms.PSet( - cleaningThreshold = cms.double(0.0), - name = cms.string('PFRecHitQTestES'), - topologicalCleaning = cms.bool(True) - ) - ), - src = cms.InputTag("hltEcalPreshowerRecHit","EcalRecHitsES") - )) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py index 117ab02d233dd..4ca2d5dc8a494 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py @@ -19,8 +19,6 @@ from ..modules.hltDt4DSegments_cfi import * from ..modules.hltEcalDetIdToBeRecovered_cfi import * from ..modules.hltEcalDigis_cfi import * -from ..modules.hltEcalPreshowerDigis_cfi import * -from ..modules.hltEcalPreshowerRecHit_cfi import * from ..modules.hltEcalRecHit_cfi import * from ..modules.hltEcalUncalibRecHit_cfi import * from ..modules.hltFixedGridRhoFastjetAllCaloForEGamma_cfi import * @@ -60,10 +58,8 @@ from ..modules.hltParticleFlowClusterECALUnseeded_cfi import * from ..modules.hltParticleFlowClusterHBHE_cfi import * from ..modules.hltParticleFlowClusterHCAL_cfi import * -from ..modules.hltParticleFlowClusterPSUnseeded_cfi import * from ..modules.hltParticleFlowRecHitECALUnseeded_cfi import * from ..modules.hltParticleFlowRecHitHBHE_cfi import * -from ..modules.hltParticleFlowRecHitPSUnseeded_cfi import * from ..modules.hltPhase2L3FromL1TkMuonPixelLayerQuadruplets_cfi import * from ..modules.hltPhase2L3FromL1TkMuonPixelTracks_cfi import * from ..modules.hltPhase2L3FromL1TkMuonPixelTracksHitDoublets_cfi import * @@ -151,8 +147,6 @@ hltDt4DSegments, hltEcalDetIdToBeRecovered, hltEcalDigis, - hltEcalPreshowerDigis, - hltEcalPreshowerRecHit, hltEcalRecHit, hltEcalUncalibRecHit, hltFixedGridRhoFastjetAllCaloForEGamma, @@ -192,10 +186,8 @@ hltParticleFlowClusterECALUnseeded, hltParticleFlowClusterHBHE, hltParticleFlowClusterHCAL, - hltParticleFlowClusterPSUnseeded, hltParticleFlowRecHitECALUnseeded, hltParticleFlowRecHitHBHE, - hltParticleFlowRecHitPSUnseeded, hltPhase2L3FromL1TkMuonPixelLayerQuadruplets, hltPhase2L3FromL1TkMuonPixelTracks, hltPhase2L3FromL1TkMuonPixelTracksHitDoublets, diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTDoFullUnpackingEgammaEcalL1SeededTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTDoFullUnpackingEgammaEcalL1SeededTask_cfi.py index 2a66e09d02977..87664c9f3ebfc 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTDoFullUnpackingEgammaEcalL1SeededTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTDoFullUnpackingEgammaEcalL1SeededTask_cfi.py @@ -4,8 +4,6 @@ from ..modules.hltEcalBarrelDigisInRegions_cfi import * from ..modules.hltEcalDetIdToBeRecovered_cfi import * from ..modules.hltEcalDigis_cfi import * -from ..modules.hltEcalPreshowerDigis_cfi import * -from ..modules.hltEcalPreshowerRecHit_cfi import * from ..modules.hltEcalRecHitL1Seeded_cfi import * from ..modules.hltEcalUncalibRecHitL1Seeded_cfi import * from ..modules.hltL1TEGammaFilteredCollectionProducer_cfi import * @@ -15,8 +13,6 @@ hltEcalBarrelDigisInRegions, hltEcalDetIdToBeRecovered, hltEcalDigis, - hltEcalPreshowerDigis, - hltEcalPreshowerRecHit, hltEcalRecHitL1Seeded, hltEcalUncalibRecHitL1Seeded, hltL1TEGammaFilteredCollectionProducer diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTDoFullUnpackingEgammaEcalTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTDoFullUnpackingEgammaEcalTask_cfi.py index 9f2001a98389b..a955d22c318cf 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTDoFullUnpackingEgammaEcalTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTDoFullUnpackingEgammaEcalTask_cfi.py @@ -3,8 +3,6 @@ from ..modules.bunchSpacingProducer_cfi import * from ..modules.hltEcalDetIdToBeRecovered_cfi import * from ..modules.hltEcalDigis_cfi import * -from ..modules.hltEcalPreshowerDigis_cfi import * -from ..modules.hltEcalPreshowerRecHit_cfi import * from ..modules.hltEcalRecHit_cfi import * from ..modules.hltEcalUncalibRecHit_cfi import * @@ -12,8 +10,6 @@ bunchSpacingProducer, hltEcalDetIdToBeRecovered, hltEcalDigis, - hltEcalPreshowerDigis, - hltEcalPreshowerRecHit, hltEcalRecHit, hltEcalUncalibRecHit ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTPFClusteringForEgammaL1SeededTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTPFClusteringForEgammaL1SeededTask_cfi.py index b762b82323e79..0ec1036edc48a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTPFClusteringForEgammaL1SeededTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTPFClusteringForEgammaL1SeededTask_cfi.py @@ -3,9 +3,7 @@ from ..modules.hltL1TEGammaFilteredCollectionProducer_cfi import * from ..modules.hltParticleFlowClusterECALL1Seeded_cfi import * from ..modules.hltParticleFlowClusterECALUncorrectedL1Seeded_cfi import * -from ..modules.hltParticleFlowClusterPSL1Seeded_cfi import * from ..modules.hltParticleFlowRecHitECALL1Seeded_cfi import * -from ..modules.hltParticleFlowRecHitPSL1Seeded_cfi import * from ..modules.hltParticleFlowSuperClusterECALL1Seeded_cfi import * from ..modules.hltRechitInRegionsECAL_cfi import * @@ -13,9 +11,7 @@ hltL1TEGammaFilteredCollectionProducer, hltParticleFlowClusterECALL1Seeded, hltParticleFlowClusterECALUncorrectedL1Seeded, - hltParticleFlowClusterPSL1Seeded, hltParticleFlowRecHitECALL1Seeded, - hltParticleFlowRecHitPSL1Seeded, hltParticleFlowSuperClusterECALL1Seeded, hltRechitInRegionsECAL ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTPFClusteringForEgammaUnseededTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTPFClusteringForEgammaUnseededTask_cfi.py index 129e00a34f55d..35d7f43d97ed1 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTPFClusteringForEgammaUnseededTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTPFClusteringForEgammaUnseededTask_cfi.py @@ -2,16 +2,12 @@ from ..modules.hltParticleFlowClusterECALUncorrectedUnseeded_cfi import * from ..modules.hltParticleFlowClusterECALUnseeded_cfi import * -from ..modules.hltParticleFlowClusterPSUnseeded_cfi import * from ..modules.hltParticleFlowRecHitECALUnseeded_cfi import * -from ..modules.hltParticleFlowRecHitPSUnseeded_cfi import * from ..modules.hltParticleFlowSuperClusterECALUnseeded_cfi import * HLTPFClusteringForEgammaUnseededTask = cms.Task( hltParticleFlowClusterECALUncorrectedUnseeded, hltParticleFlowClusterECALUnseeded, - hltParticleFlowClusterPSUnseeded, hltParticleFlowRecHitECALUnseeded, - hltParticleFlowRecHitPSUnseeded, hltParticleFlowSuperClusterECALUnseeded ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/RawToDigiTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/RawToDigiTask_cfi.py index 10528028df967..0d6cc7b3f4aa4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/RawToDigiTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/RawToDigiTask_cfi.py @@ -1,6 +1,5 @@ import FWCore.ParameterSet.Config as cms -from ..modules.hltEcalPreshowerDigis_cfi import * from ..modules.hltHcalDigis_cfi import * from ..modules.hgcalDigis_cfi import * from ..modules.muonCSCDigis_cfi import * @@ -10,7 +9,6 @@ RawToDigiTask = cms.Task( hltEcalDigisTask, - hltEcalPreshowerDigis, hltHcalDigis, hgcalDigis, muonCSCDigis, diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/ecalRecHitNoTPTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/ecalRecHitNoTPTask_cfi.py index 8927a6529dbff..43a4c067aa673 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/ecalRecHitNoTPTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/ecalRecHitNoTPTask_cfi.py @@ -1,9 +1,7 @@ import FWCore.ParameterSet.Config as cms -from ..modules.hltEcalPreshowerRecHit_cfi import * from ..modules.ecalRecHit_cfi import * ecalRecHitNoTPTask = cms.Task( - hltEcalPreshowerRecHit, ecalRecHit ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/particleFlowClusterTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/particleFlowClusterTask_cfi.py index ed65d93e196a1..b2ae56c76731a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/particleFlowClusterTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/particleFlowClusterTask_cfi.py @@ -5,13 +5,11 @@ from ..tasks.pfClusteringHBHEHFTask_cfi import * from ..tasks.pfClusteringHGCalTask_cfi import * from ..tasks.pfClusteringHOTask_cfi import * -from ..tasks.pfClusteringPSTask_cfi import * particleFlowClusterTask = cms.Task( particleFlowBadHcalPseudoCluster, pfClusteringECALTask, pfClusteringHBHEHFTask, pfClusteringHGCalTask, - pfClusteringHOTask, - pfClusteringPSTask + pfClusteringHOTask ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/pfClusteringPSTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/pfClusteringPSTask_cfi.py deleted file mode 100644 index 2dc9a12c719bd..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/pfClusteringPSTask_cfi.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.particleFlowClusterPS_cfi import * -from ..modules.particleFlowRecHitPS_cfi import * - -pfClusteringPSTask = cms.Task( - particleFlowClusterPS, - particleFlowRecHitPS -) From 18f8ac156378bf6bb494ecc47cba250d8f0273b4 Mon Sep 17 00:00:00 2001 From: Theo Chatzistavrou Date: Tue, 25 Jul 2023 16:10:36 +0200 Subject: [PATCH 3/3] add skipPS option --- .../HLT_75e33/modules/hltParticleFlowClusterECALL1Seeded_cfi.py | 1 + .../HLT_75e33/modules/hltParticleFlowClusterECALUnseeded_cfi.py | 1 + .../python/HLT_75e33/modules/particleFlowClusterECAL_cfi.py | 1 + 3 files changed, 3 insertions(+) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALL1Seeded_cfi.py index 531c65fefbcab..fd4e88e01374f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALL1Seeded_cfi.py @@ -16,5 +16,6 @@ ), inputECAL = cms.InputTag("hltParticleFlowClusterECALUncorrectedL1Seeded"), mightGet = cms.optional.untracked.vstring, + skipPS = cms.bool(True), minimumPSEnergy = cms.double(0) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALUnseeded_cfi.py index a59c4fa4f023f..d87c0204e8938 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALUnseeded_cfi.py @@ -16,5 +16,6 @@ ), inputECAL = cms.InputTag("hltParticleFlowClusterECALUncorrectedUnseeded"), mightGet = cms.optional.untracked.vstring, + skipPS = cms.bool(True), minimumPSEnergy = cms.double(0) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECAL_cfi.py index 8e7e7cd26fbb1..edd36d325aa9a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECAL_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECAL_cfi.py @@ -16,5 +16,6 @@ ), inputECAL = cms.InputTag("particleFlowTimeAssignerECAL"), mightGet = cms.optional.untracked.vstring, + skipPS = cms.bool(True), minimumPSEnergy = cms.double(0) )