Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EGM HLT@Phase2] Phase out caloTowers #40525

Merged
merged 3 commits into from
Jan 16, 2023
Merged

[EGM HLT@Phase2] Phase out caloTowers #40525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1341348
phase out calotowers
swagata87 Jan 13, 2023
0171145
addressed Marino's comments
swagata87 Jan 15, 2023
fda2b10
use correct thresholds for HCAL
swagata87 Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHoverEL1Seeded_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
import FWCore.ParameterSet.Config as cms

hltEgammaHoverEL1Seeded = cms.EDProducer("EgammaHLTBcHcalIsolationProducersRegional",
hltEgammaHoverEL1Seeded = cms.EDProducer("EgammaHLTHcalVarProducerFromRecHit",
absEtaLowEdges = cms.vdouble(0.0, 1.479),
caloTowerProducer = cms.InputTag("hltTowerMakerForAllForEgamma"),
depth = cms.int32(-1),
depth = cms.int32(0),
doEtSum = cms.bool(False),
doRhoCorrection = cms.bool(False),
effectiveAreas = cms.vdouble(0.105, 0.17),
etMin = cms.double(0.0),
innerCone = cms.double(0.0),
outerCone = cms.double(0.14),
recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesL1Seeded"),
rhoMax = cms.double(99999999.0),
rhoProducer = cms.InputTag("hltFixedGridRhoFastjetAllCaloForEGamma"),
rhoScale = cms.double(1.0),
useSingleTower = cms.bool(False)
useSingleTower = cms.bool(False),
hbheRecHitsTag = cms.InputTag( "hltHbhereco" ),
eThresHB = cms.vdouble( 0.8, 1.2, 1.2, 1.2 ),
etThresHB = cms.vdouble( 0.0, 0.0, 0.0, 0.0 ),
eThresHE = cms.vdouble( 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2 ),
etThresHE = cms.vdouble( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ),
maxSeverityHB = cms.int32( 9 ),
maxSeverityHE = cms.int32( 9 )
)
15 changes: 10 additions & 5 deletions HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHoverEUnseeded_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
import FWCore.ParameterSet.Config as cms

hltEgammaHoverEUnseeded = cms.EDProducer("EgammaHLTBcHcalIsolationProducersRegional",
hltEgammaHoverEUnseeded = cms.EDProducer("EgammaHLTHcalVarProducerFromRecHit",
absEtaLowEdges = cms.vdouble(0.0, 1.479),
caloTowerProducer = cms.InputTag("hltTowerMakerForAllForEgamma"),
depth = cms.int32(-1),
depth = cms.int32(0),
doEtSum = cms.bool(False),
doRhoCorrection = cms.bool(False),
effectiveAreas = cms.vdouble(0.105, 0.17),
etMin = cms.double(0.0),
innerCone = cms.double(0.0),
outerCone = cms.double(0.14),
recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesUnseeded"),
rhoMax = cms.double(99999999.0),
rhoProducer = cms.InputTag("hltFixedGridRhoFastjetAllCaloForEGamma"),
rhoScale = cms.double(1.0),
useSingleTower = cms.bool(False)
useSingleTower = cms.bool(False),
hbheRecHitsTag = cms.InputTag( "hltHbhereco" ),
eThresHB = cms.vdouble( 0.8, 1.2, 1.2, 1.2 ),
etThresHB = cms.vdouble( 0.0, 0.0, 0.0, 0.0 ),
eThresHE = cms.vdouble( 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2 ),
etThresHE = cms.vdouble( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ),
maxSeverityHB = cms.int32( 9 ),
maxSeverityHE = cms.int32( 9 )
)
13 changes: 13 additions & 0 deletions ...gger/Configuration/python/HLT_75e33/modules/hltFixedGridRhoFastjetAllCaloForEGamma_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import FWCore.ParameterSet.Config as cms

hltFixedGridRhoFastjetAllCaloForEGamma = cms.EDProducer("FixedGridRhoProducerFastjetFromRecHit",
gridSpacing = cms.double(0.55),
maxRapidity = cms.double(2.5),
hbheRecHitsTag = cms.InputTag( "hltHbhereco" ),
ebRecHitsTag = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ),
eeRecHitsTag = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ),
skipHCAL = cms.bool( False ),
skipECAL = cms.bool( False ),
eThresHB = cms.vdouble( 0.8, 1.2, 1.2, 1.2 ),
eThresHE = cms.vdouble( 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2 )
)
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHBHEForEgamma_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
cms.PSet(
depths = cms.vint32(1, 2, 3, 4),
detector = cms.string('HCAL_BARREL1'),
gatheringThreshold = cms.vdouble(0.8, 0.8, 0.8, 0.8),
gatheringThreshold = cms.vdouble(0.8, 1.2, 1.2, 1.2),
gatheringThresholdPt = cms.vdouble(0.0, 0.0, 0.0, 0.0)
),
cms.PSet(
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHBHEForEgamma_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
cms.PSet(
depth = cms.vint32(1, 2, 3, 4),
detectorEnum = cms.int32(1),
threshold = cms.vdouble(0.8, 0.8, 0.8, 0.8)
threshold = cms.vdouble(0.8, 1.2, 1.2, 1.2)
),
cms.PSet(
depth = cms.vint32(
Expand Down
10 changes: 0 additions & 10 deletions HLTrigger/Configuration/python/HLT_75e33/modules/hltRegionalTowerForEgamma_cfi.py
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions HLTrigger/Configuration/python/HLT_75e33/modules/hltTowerMakerForAllForEgamma_cfi.py
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_75e33/tasks/HLTFastJetForEgammaTask_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

from ..modules.hltTowerMakerForAllForEgamma_cfi import *
from ..modules.hltFixedGridRhoFastjetAllCaloForEGamma_cfi import *

HLTFastJetForEgammaTask = cms.Task(
hltTowerMakerForAllForEgamma
hltFixedGridRhoFastjetAllCaloForEGamma
)
4 changes: 1 addition & 3 deletions HLTrigger/Configuration/python/HLT_75e33/tasks/HLTPFHcalClusteringForEgammaTask_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
from ..modules.hltParticleFlowClusterHBHEForEgamma_cfi import *
from ..modules.hltParticleFlowClusterHCALForEgamma_cfi import *
from ..modules.hltParticleFlowRecHitHBHEForEgamma_cfi import *
from ..modules.hltRegionalTowerForEgamma_cfi import *

HLTPFHcalClusteringForEgammaTask = cms.Task(
hltParticleFlowClusterHBHEForEgamma,
hltParticleFlowClusterHCALForEgamma,
hltParticleFlowRecHitHBHEForEgamma,
hltRegionalTowerForEgamma
hltParticleFlowRecHitHBHEForEgamma
)