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.

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

Run-3 FastSim modifier and workflows in runTheMatrix #37347

Merged
merged 8 commits into from Apr 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Run3_FastSim_cff.py
@@ -0,0 +1,6 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Run3_cff import Run3
from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM

Run3_FastSim = Run3.copyAndExclude([run3_GEM])
3 changes: 3 additions & 0 deletions Configuration/PyReleaseValidation/README.md
Expand Up @@ -73,4 +73,7 @@ The offsets currently in use are:
* 0.103: Phase-2 aging, 3000fb-1
* 0.201: HGCAL special TICL Pattern recognition Workflows: clue3D
* 0.202: HGCAL special TICL Pattern recognition Workflows: FastJet
* 0.301: FastSim Run-3
* 0.302: FastSim Run-3 trackingOnly validation
* 0.303: FastSim Run-3 MB for mixing
* 0.9001: Sonic Triton
Expand Up @@ -1271,6 +1271,94 @@ def condition(self, fragment, stepList, key, hasHarvest):
offset = 0.9921,
)

class UpgradeWorkflow_Run3FS(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'GenSim' in step:
stepDict[stepName][k] = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,PAT,VALIDATION:@standardValidation,DQM:@standardDQMFS',
'--fast':'',
'--era':'Run3_FastSim',
'--eventcontent':'FEVTDEBUGHLT,MINIAODSIM,DQM',
'--datatier':'GEN-SIM-DIGI-RECO,MINIAODSIM,DQMIO',
'--relval':'27000,3000'}, stepDict[step][k]])
if 'Digi' in step or 'RecoNano' in step or 'ALCA' in step:
stepDict[stepName][k] = None
if 'HARVESTNano' in step:
stepDict[stepName][k] = merge([{'-s':'HARVESTING:validationHarvesting',
'--fast':'',
'--era':'Run3_FastSim',
'--filein':'file:step1_inDQM.root'}, stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
return '2021' in key
upgradeWFs['Run3FS'] = UpgradeWorkflow_Run3FS(
steps = [
'GenSim',
'Digi',
'RecoNano',
'HARVESTNano',
'ALCA'
],
PU = [],
suffix = '_Run3FS',
offset = 0.301,
)

class UpgradeWorkflow_Run3FStrackingOnly(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'GenSim' in step:
stepDict[stepName][k] = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,PAT,VALIDATION:@trackingOnlyValidation',
'--fast':'',
'--era':'Run3_FastSim',
'--eventcontent':'FEVTDEBUGHLT,MINIAODSIM,DQM',
'--datatier':'GEN-SIM-DIGI-RECO,MINIAODSIM,DQMIO',
'--relval':'27000,3000'}, stepDict[step][k]])
if 'Digi' in step or 'RecoNano' in step or 'ALCA' in step:
stepDict[stepName][k] = None
if 'HARVESTNano' in step:
stepDict[stepName][k] = merge([{'-s':'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM',
'--fast':'',
'--era':'Run3_FastSim',
'--filein':'file:step1_inDQM.root'}, stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
return '2021' in key
upgradeWFs['Run3FStrackingOnly'] = UpgradeWorkflow_Run3FStrackingOnly(
steps = [
'GenSim',
'Digi',
'RecoNano',
'HARVESTNano',
'ALCA'
],
PU = [],
suffix = '_Run3FStrackingOnly',
offset = 0.302,
)

class UpgradeWorkflow_Run3FSMBMixing(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'GenSim' in step:
stepDict[stepName][k] = merge([{'-s':'GEN,SIM,RECOBEFMIX',
'--fast':'',
'--era':'Run3_FastSim',
'--eventcontent':'FASTPU',
'--datatier':'GEN-SIM-RECO',
'--relval':'27000,3000'}, stepDict[step][k]])
if 'Digi' in step or 'RecoNano' in step or 'ALCA' in step or 'HARVESTNano' in step:
stepDict[stepName][k] = None
def condition(self, fragment, stepList, key, hasHarvest):
return '2021' in key and fragment=="MinBias_14TeV"
upgradeWFs['Run3FSMBMixing'] = UpgradeWorkflow_Run3FSMBMixing(
steps = [
'GenSim',
'Digi',
'RecoNano',
'HARVESTNano',
'ALCA'
],
PU = [],
suffix = '_Run3FSMBMixing',
offset = 0.303,
)

class UpgradeWorkflow_DD4hep(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'Run3' in stepDict[step][k]['--era']:
Expand Down
1 change: 1 addition & 0 deletions Configuration/StandardSequences/python/Eras.py
Expand Up @@ -38,6 +38,7 @@ def __init__(self):
'Run3_pp_on_PbPb',
'Run3_dd4hep',
'Run3_DDD',
'Run3_FastSim',
'Phase2',
'Phase2C9',
'Phase2C10',
Expand Down
2 changes: 1 addition & 1 deletion SimGeneral/MixingModule/python/aliases_cfi.py
Expand Up @@ -107,7 +107,7 @@

# no castor,pixel,strip digis in fastsim
from Configuration.Eras.Modifier_fastSim_cff import fastSim
fastSim.toModify(simCastorDigis, mix = None)
(fastSim & ~run3_common).toModify(simCastorDigis, mix = None)
fastSim.toModify(simSiPixelDigis, mix = None)
fastSim.toModify(simSiStripDigis, mix = None)
fastSim.toModify(simAPVsaturation, mix = None)
2 changes: 1 addition & 1 deletion SimGeneral/MixingModule/python/digitizers_cfi.py
Expand Up @@ -69,7 +69,7 @@
)

from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify( theDigitizers, castor = None )
(run3_common & ~fastSim).toModify( theDigitizers, castor = None )

from SimGeneral.MixingModule.ecalTimeDigitizer_cfi import ecalTimeDigitizer
from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
Expand Down