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

Add run3 tracking low pu era #33532

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Add run3 tracking low pu era #33532

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
16b06bc
add a Era_Run3_trackingLowPU
mmusich Apr 26, 2021
557315b
adapt UpgradeWorkflow_trackingLowPU to accept 2021 conditions
mmusich Apr 26, 2021
e57a631
adjust the workflows produced in the trackingLowPu and 0T workflows +…
mmusich Apr 28, 2021
2f07188
update documentation in /Configuration/PyReleaseValidation/README
mmusich Apr 29, 2021
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
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Run3_trackingLowPU_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.ModifierChain_run3_noTrackingModifier_cff import run3_noTrackingModifier
from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU

Run3_trackingLowPU = cms.ModifierChain(run3_noTrackingModifier, trackingLowPU)
6 changes: 6 additions & 0 deletions Configuration/Eras/python/ModifierChain_run3_noTrackingModifier_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Run3_cff import Run3
from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1

run3_noTrackingModifier = Run3.copyAndExclude([trackingPhase1])
3 changes: 2 additions & 1 deletion Configuration/PyReleaseValidation/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ The offsets currently in use are:
* 0.1: Tracking-only validation and DQM
* 0.2: Tracking Run-2 era, `Run2_2017_trackingRun2`
* 0.3: 0.1 + 0.2
* 0.4: LowPU tracking era, `Run2_2017_trackingLowPU`
* 0.4: LowPU tracking era, `Run2_2017_trackingLowPU`, `Run3_trackingLowPU`
* 0.424: 0 Tesla (Run 3) + `Run3_trackingLowPU`
* 0.5: Pixel tracking only + 0.1
* 0.501: Patatrack, pixel only quadruplets, on CPU
* 0.502: Patatrack, pixel only quadruplets, on GPU
Expand Down
23 changes: 20 additions & 3 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
# some commonalities among tracking WFs
class UpgradeWorkflowTracking(UpgradeWorkflow):
def condition(self, fragment, stepList, key, hasHarvest):
result = (fragment=="TTbar_13" or fragment=="TTbar_14TeV") and not 'PU' in key and hasHarvest and self.condition_(fragment, stepList, key, hasHarvest)
result = (fragment=="TTbar_13" or fragment=="TTbar_14TeV" or fragment=="MinBias_14TeV") and not 'PU' in key and hasHarvest and self.condition_(fragment, stepList, key, hasHarvest)
if result:
# skip ALCA and Nano
skipList = [s for s in stepList if (("ALCA" in s) or ("Nano" in s))]
Expand Down Expand Up @@ -259,8 +259,10 @@ class UpgradeWorkflow_trackingLowPU(UpgradeWorkflowTracking):
def setup_(self, step, stepName, stepDict, k, properties):
if 'Reco' in step and stepDict[step][k]['--era']=='Run2_2017':
stepDict[stepName][k] = merge([{'--era': 'Run2_2017_trackingLowPU'}, stepDict[step][k]])
elif 'Reco' in step and stepDict[step][k]['--era']=='Run3':
stepDict[stepName][k] = merge([{'--era': 'Run3_trackingLowPU'}, stepDict[step][k]])
def condition_(self, fragment, stepList, key, hasHarvest):
return '2017' in key
return ((fragment=="TTbar_13") and ('2017' in key)) or ((fragment=="TTbar_14TeV" or fragment=="MinBias_14TeV") and ('2021' in key))
upgradeWFs['trackingLowPU'] = UpgradeWorkflow_trackingLowPU(
steps = [
'Reco',
Expand Down Expand Up @@ -763,7 +765,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
myGT+="_0T"
stepDict[stepName][k] = merge([{'-n':'1','--magField':'0T','--conditions':myGT}, stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
return (fragment=="TTbar_13" or fragment=="TTbar_14TeV") and ('2017' in key or '2018' in key or '2021' in key)
return ((fragment=="TTbar_13") and ('2017' in key or '2018' in key)) or ((fragment=="TTbar_14TeV" or fragment=="MinBias_14TeV") and ('2021' in key))
upgradeWFs['0T'] = UpgradeWorkflow_0T(
steps = [
'GenSim',
Expand All @@ -781,6 +783,21 @@ def condition(self, fragment, stepList, key, hasHarvest):
offset = 0.24,
)

class UpgradeWorkflow_trackingLowPUat0T(UpgradeWorkflowTracking,UpgradeWorkflow_0T):
def setup_(self, step, stepName, stepDict, k, properties):
if 'Reco' in step and stepDict[step][k]['--era']=='Run3':
stepDict[stepName][k] = merge([{'--era': 'Run3_trackingLowPU'}, stepDict[step][k]])
def condition_(self, fragment, stepList, key, hasHarvest):
return ((fragment=="TTbar_14TeV" or fragment=="MinBias_14TeV") and ('2021' in key))
upgradeWFs['trackingLowPUat0T'] = UpgradeWorkflow_trackingLowPUat0T(
steps = [
'Reco',
],
PU = [],
suffix = '_trackingLowPUat0T',
offset = 0.424,
Copy link

Choose a reason for hiding this comment

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

Once you would like to specify new offset, please also document it in README (https://github.com/cms-sw/cmssw/blob/e57a6313443f3a7c6f8a7d053a92c007fc7e7cc3/Configuration/PyReleaseValidation/README.md). I understood that you are trying to combine 0.4 and 0.24 offsets together but this is a bit confusing. Is 0.24 related with 0.2 at all? maybe 0.41 is just good and move this class to below 0.4? We should try to avoid so many digits of the offset which already appeared. It becomes more confusing now :(

Copy link
Contributor

Choose a reason for hiding this comment

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

Hi @chayanit, this PR is still in draft mode (not yet open for review)
Trying to get your point, nevertheless.
I think there are already several workflows in the current matrix with 4 offset digits. What makes them less confusing?

)

class UpgradeWorkflow_ParkingBPH(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'Reco' in step and 'Run2_2018' in stepDict[step][k]['--era']:
Expand Down
3 changes: 2 additions & 1 deletion Configuration/StandardSequences/python/Eras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def __init__(self):
'Run2_2018_pp_on_AA_noHCALmitigation',
'Run2_2018_highBetaStar',
'Run3',
'Run3_trackingLowPU',
'Run3_pp_on_PbPb',
'Run3_dd4hep',
'Phase2',
Expand Down Expand Up @@ -76,7 +77,7 @@ def __init__(self):
'hcalHardcodeConditions', 'hcalSkipPacker',
'run2_HLTconditions_2016','run2_HLTconditions_2017','run2_HLTconditions_2018',
'bParking']
internalUseModChains = ['run2_2017_noTrackingModifier']
internalUseModChains = ['run2_2017_noTrackingModifier','run3_noTrackingModifier']

self.pythonCfgLines = {}

Expand Down