From 16b06bc4a09c2ac646bcd5a12f4d48c8da507028 Mon Sep 17 00:00:00 2001 From: mmusich Date: Mon, 26 Apr 2021 18:53:38 +0200 Subject: [PATCH 1/4] add a Era_Run3_trackingLowPU --- Configuration/Eras/python/Era_Run3_trackingLowPU_cff.py | 6 ++++++ .../python/ModifierChain_run3_noTrackingModifier_cff.py | 6 ++++++ Configuration/StandardSequences/python/Eras.py | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Configuration/Eras/python/Era_Run3_trackingLowPU_cff.py create mode 100644 Configuration/Eras/python/ModifierChain_run3_noTrackingModifier_cff.py diff --git a/Configuration/Eras/python/Era_Run3_trackingLowPU_cff.py b/Configuration/Eras/python/Era_Run3_trackingLowPU_cff.py new file mode 100644 index 0000000000000..d87402aa2943e --- /dev/null +++ b/Configuration/Eras/python/Era_Run3_trackingLowPU_cff.py @@ -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) diff --git a/Configuration/Eras/python/ModifierChain_run3_noTrackingModifier_cff.py b/Configuration/Eras/python/ModifierChain_run3_noTrackingModifier_cff.py new file mode 100644 index 0000000000000..b2efc45e4d256 --- /dev/null +++ b/Configuration/Eras/python/ModifierChain_run3_noTrackingModifier_cff.py @@ -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]) diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 585d3d7c67250..f8edac0d825fd 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -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', @@ -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 = {} From 557315b6ee250768f33aed20bd501253c1ed8c8f Mon Sep 17 00:00:00 2001 From: mmusich Date: Mon, 26 Apr 2021 18:54:33 +0200 Subject: [PATCH 2/4] adapt UpgradeWorkflow_trackingLowPU to accept 2021 conditions --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 07bfb1bc8ba56..517b1e41837d5 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -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 '2017' in key or '2021' in key upgradeWFs['trackingLowPU'] = UpgradeWorkflow_trackingLowPU( steps = [ 'Reco', From e57a6313443f3a7c6f8a7d053a92c007fc7e7cc3 Mon Sep 17 00:00:00 2001 From: mmusich Date: Wed, 28 Apr 2021 16:35:55 +0200 Subject: [PATCH 3/4] adjust the workflows produced in the trackingLowPu and 0T workflows + introduce UpgradeWorkflow_trackingLowPUat0T --- .../python/upgradeWorkflowComponents.py | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 517b1e41837d5..2b67c6078e7ee 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -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))] @@ -262,7 +262,7 @@ def setup_(self, step, stepName, stepDict, k, properties): 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 or '2021' 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', @@ -765,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', @@ -783,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, +) + class UpgradeWorkflow_ParkingBPH(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): if 'Reco' in step and 'Run2_2018' in stepDict[step][k]['--era']: From 2f071883b285400b218fab2d4d0aed07b7f42e7c Mon Sep 17 00:00:00 2001 From: mmusich Date: Thu, 29 Apr 2021 09:13:37 +0200 Subject: [PATCH 4/4] update documentation in /Configuration/PyReleaseValidation/README --- Configuration/PyReleaseValidation/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/README.md b/Configuration/PyReleaseValidation/README.md index a4caaddabebfa..48417986f667b 100644 --- a/Configuration/PyReleaseValidation/README.md +++ b/Configuration/PyReleaseValidation/README.md @@ -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