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

Jump to bottom

define RecoFullLocal and use in Phase2 upgrade workflows #14307

Merged
merged 3 commits into from May 4, 2016
Merged

define RecoFullLocal and use in Phase2 upgrade workflows #14307

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f65c50c
fix hcal upgrade reco input
kpedro88 Apr 29, 2016
5383b7f
define RecoFullLocal and use in Phase2 upgrade workflows
kpedro88 Apr 29, 2016
899af49
remove DigiFulllocalreco step
kpedro88 Apr 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -1609,6 +1609,16 @@ def identityFS(wf):
if k2 in PUDataSets:
upgradeStepDict['RecoFullPU'][k]=merge([PUDataSets[k2],upgradeStepDict['RecoFull'][k]])

upgradeStepDict['RecoFullLocal'][k] = {'-s':'RAW2DIGI,L1Reco,RECO:localreco',
'--conditions':gt,
'--datatier':'GEN-SIM-RECO',
'-n':'10',
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom
}
if cust!=None : upgradeStepDict['RecoFullLocal'][k]['--customise']=cust
if era is not None: upgradeStepDict['RecoFullLocal'][k]['--era']=era

upgradeStepDict['RecoFullHGCAL'][k] = {'-s':'RAW2DIGI,L1Reco,RECO',
'--conditions':gt,
'--datatier':'GEN-SIM-RECO',
Expand Down
6 changes: 3 additions & 3 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Expand Up @@ -98,15 +98,15 @@
# step5 is digi+l1tracktrigger
# step6 is fastsim
# step7 is fastsim harvesting
upgradeSteps=['GenSimFull','GenSimHLBeamSpotFull','DigiFull','DigiFulllocalreco','RecoFull','RecoFullHGCAL','HARVESTFull','DigiTrkTrigFull','FastSim','HARVESTFast','DigiFullPU','RecoFullPU','RecoFullPUHGCAL','HARVESTFullPU','DigiFullTrigger']
upgradeSteps=['GenSimFull','GenSimHLBeamSpotFull','DigiFull','DigiFulllocalreco','RecoFull','RecoFullLocal','RecoFullHGCAL','HARVESTFull','DigiTrkTrigFull','FastSim','HARVESTFast','DigiFullPU','RecoFullPU','RecoFullPUHGCAL','HARVESTFullPU','DigiFullTrigger']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kpedro88 - could we just remove DigiFulllocalreco here (and maybe better, put RecoFulLocal in its place so that the workflow numbers stay the same?


upgradeScenToRun={ '2017':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
#'2017':['GenSimFull'],
'2017PU':['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU'],#full sequence
'2023':['GenSimFull','DigiFull','RecoFull'],#full sequence
'2023tilted':['GenSimFull','DigiFulllocalreco'],#dev scenario
'2023tilted':['GenSimFull','DigiFull','RecoFullLocal'],#dev scenario
'2023sim':['GenSimFull'],#sim scenario
'2023LReco':['GenSimFull','DigiFulllocalreco'],#local reco scneario
'2023LReco':['GenSimFull','DigiFull','RecoFullLocal'],#local reco scenario
'2023Reco':['GenSimFull','DigiFull','RecoFull']#full reco scenario
}

Expand Down
4 changes: 2 additions & 2 deletions RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py
View file
Open in desktop
Expand Up @@ -20,8 +20,8 @@
_phase2_hcalLocalRecoSequence.replace(hbheprereco,hbheUpgradeReco)

from Configuration.StandardSequences.Eras import eras
eras.phase2_common.toModify( hbheprereco, digiLabel = cms.InputTag('simHcalDigis','HBHEUpgradeDigiCollection') )
eras.phase2_common.toModify( hbheUpgradeReco, digiLabel = cms.InputTag('simHcalDigis','HBHEUpgradeDigiCollection') )
eras.phase2_common.toModify( horeco, digiLabel = cms.InputTag('simHcalDigis') )
eras.phase2_common.toModify( hfreco, digiLabel = cms.InputTag('simHcalDigis','HFUpgradeDigiCollection') )
eras.phase2_common.toModify( hfUpgradeReco, digiLabel = cms.InputTag('simHcalDigis','HFUpgradeDigiCollection') )
eras.phase2_common.toModify( zdcreco, digiLabel = cms.InputTag('simHcalUnsuppressedDigis'), digiLabelhcal = cms.InputTag('simHcalUnsuppressedDigis') )
eras.phase2_common.toReplaceWith( hcalLocalRecoSequence, _phase2_hcalLocalRecoSequence )