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

Add AlCaReco producers in phase-2 workflows #39858

Merged
merged 4 commits into from
Oct 28, 2022
Merged

Add AlCaReco producers in phase-2 workflows #39858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73efc68
customize eta range of Tracker Alignment ALCARECO producer for phase-…
mmusich Oct 26, 2022
1331952
add ALCA step to phase-2 runTheMatrix workflows
mmusich Oct 26, 2022
fa08b2d
supply more updated AlCaRecoTriggerBits payload in Run4 global tag
mmusich Oct 26, 2022
638de99
supply TkPhase2OTCPERecord for refitting
mmusich Oct 26, 2022
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
2 changes: 2 additions & 0 deletions Alignment/CommonAlignmentProducer/python/ALCARECOTkAlDiMuonAndVertex_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@
from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlDiMuonHLT,
eventSetupPathsKey='TkAlZMuMuHI')
from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(ALCARECOTkAlDiMuon, etaMin = -4, etaMax = 4)
3 changes: 3 additions & 0 deletions Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@
ALCARECOTkAlJetHT.TwoBodyDecaySelector.applyAcoplanarityFilter = False

seqALCARECOTkAlJetHT = cms.Sequence(ALCARECOTkAlJetHTHLT+ALCARECOTkAlJetHTDCSFilter+ALCARECOTkAlJetHTPrescaler*ALCARECOTkAlJetHT)

from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(ALCARECOTkAlJetHT, etaMin = -4, etaMax = 4)
3 changes: 3 additions & 0 deletions Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@
(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlJpsiMuMuHLT,
eventSetupPathsKey='TkAlJpsiMuMuHI'
)

from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(ALCARECOTkAlJpsiMuMu, etaMin = -4, etaMax = 4)
2 changes: 2 additions & 0 deletions Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@
trackQualities = cms.vstring("highPurity")
)

from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(ALCARECOTkAlMinBias, etaMin = -4, etaMax = 4)
2 changes: 2 additions & 0 deletions Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,5 @@
(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMuonIsolated.GlobalSelector,
minJetDeltaR=0.0
)
from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(ALCARECOTkAlMuonIsolated, etaMin = -4, etaMax = 4)
2 changes: 2 additions & 0 deletions Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,5 @@
(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlUpsilonMuMuHLT,
eventSetupPathsKey='TkAlUpsilonMuMuHI'
)
from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(ALCARECOTkAlUpsilonMuMu, etaMin = -4, etaMax = 4)
3 changes: 3 additions & 0 deletions Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,6 @@
(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlZMuMuHLT,
eventSetupPathsKey='TkAlZMuMuHI'
)

from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(ALCARECOTkAlZMuMu, etaMin = -4, etaMax = 4)
2 changes: 1 addition & 1 deletion Configuration/AlCa/python/autoCond.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
# GlobalTag for MC production with realistic conditions for Phase1 2024
'phase1_2024_realistic' : '125X_mcRun3_2024_realistic_v4',
# GlobalTag for MC production with realistic conditions for Phase2
'phase2_realistic' : '125X_mcRun4_realistic_v2'
'phase2_realistic' : '125X_mcRun4_realistic_v3'
}

aliases = {
Expand Down
2 changes: 2 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3952,6 +3952,8 @@ def gen2021HiMix(fragment,howMuch):
'--filein':'file:step3.root'
}

upgradeStepDict['ALCAPhase2'][k] = merge([{'-s':'ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+TkAlMuonIsolated+TkAlMinBias+MuAlOverlaps+EcalESAlign+TkAlZMuMu+TkAlDiMuonAndVertex+HcalCalHBHEMuonProducerFilter+TkAlUpsilonMuMu+TkAlJpsiMuMu'},upgradeStepDict['ALCA'][k]])

upgradeStepDict['FastSim'][k]={'-s':'GEN,SIM,RECO,VALIDATION',
'--eventcontent':'FEVTDEBUGHLT,DQM',
'--datatier':'GEN-SIM-DIGI-RECO,DQMIO',
Expand Down
17 changes: 9 additions & 8 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
'HARVESTFast',
'HARVESTGlobal',
'ALCA',
'ALCAPhase2',
'Nano',
'MiniAOD',
'HLT75e33',
Expand Down Expand Up @@ -2102,56 +2103,56 @@ def condition(self, fragment, stepList, key, hasHarvest):
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C17I13M9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
},
'2026D88' : {
'Geom' : 'Extended2026D88',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C17I13M9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
},
'2026D91' : {
'Geom' : 'Extended2026D91',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T30',
'Era' : 'Phase2C17I13M9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
},
'2026D92' : {
'Geom' : 'Extended2026D92',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C17I13M9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
},
'2026D93' : {
'Geom' : 'Extended2026D93',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C17I13M9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
},
'2026D94' : {
'Geom' : 'Extended2026D94',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C18I13M9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
},
'2026D95' : {
'Geom' : 'Extended2026D95',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C17I13M9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
},
'2026D96' : {
'Geom' : 'Extended2026D96',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C17I13M9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
},
}

Expand Down
1 change: 1 addition & 0 deletions RecoTracker/TransientTrackingRecHit/python/TTRHBuilders_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
#TransientTRH builder with template
from RecoLocalTracker.SiPixelRecHits.PixelCPETemplateReco_cfi import *
from RecoLocalTracker.SiPixelRecHits.PixelCPEClusterRepair_cfi import *
from RecoLocalTracker.Phase2TrackerRecHits.Phase2StripCPEESProducer_cfi import *
from RecoTracker.TransientTrackingRecHit.TTRHBuilderWithTemplate_cfi import *