From aa9a41fd2c23d39be811d568d9bcce61e0dbb501 Mon Sep 17 00:00:00 2001 From: Kirill Skovpen Date: Fri, 29 Apr 2022 11:35:02 +0200 Subject: [PATCH 1/3] add tauembed wfs --- Configuration/PyReleaseValidation/python/MatrixReader.py | 9 ++++++--- Configuration/PyReleaseValidation/python/relval_steps.py | 9 +++++++++ .../PyReleaseValidation/python/relval_tauembed.py | 5 +++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 Configuration/PyReleaseValidation/python/relval_tauembed.py diff --git a/Configuration/PyReleaseValidation/python/MatrixReader.py b/Configuration/PyReleaseValidation/python/MatrixReader.py index 54b78ca9a3398..92ccf88d4e699 100644 --- a/Configuration/PyReleaseValidation/python/MatrixReader.py +++ b/Configuration/PyReleaseValidation/python/MatrixReader.py @@ -54,7 +54,8 @@ def reset(self, what='all'): 'relval_2026':'2026-', 'relval_identity':'id-', 'relval_machine': 'mach-', - 'relval_premix': 'premix-' + 'relval_premix': 'premix-', + 'relval_tauembed': 'tau-' } self.files = ['relval_standard' , @@ -71,7 +72,8 @@ def reset(self, what='all'): 'relval_2026', 'relval_identity', 'relval_machine', - 'relval_premix' + 'relval_premix', + 'relval_tauembed' ] self.filesDefault = {'relval_standard':True , 'relval_highstats':True , @@ -87,7 +89,8 @@ def reset(self, what='all'): 'relval_2026':True, 'relval_identity':False, 'relval_machine':True, - 'relval_premix':True + 'relval_premix':True, + 'relval_tauembed':True } self.relvalModule = None diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index d7a461e1bda79..52eddddd879bf 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -513,6 +513,15 @@ steps['RunEGamma2018Dml1']={'INPUT':InputInfo(dataSet='/EGamma/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018Dml1)} steps['RunEGamma2018Dml2']={'INPUT':InputInfo(dataSet='/EGamma/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018Dml2)} +#### Run2 TauEmbed #### +Run2016C={276092: [[91, 95]]} +steps['RunDoubleMuonTE2016C']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2016C-v2/RAW',label='2016C',events=10000,location='STD', ls=Run2016C)} +dataTE = {'--conditions': 'auto:run2_data', '--scenario': 'pp'} +mcTE = {'--conditions': 'auto:run2_mc', '--scenario': 'pp'} +steps['RAWRECOTE16'] = merge([{'-s': 'RAW2DIGI,L1Reco,RECO,PAT', '--datatier': 'RAWRECO', '--eventcontent': 'RAWRECO', '--data': '', '--era': 'Run2_2016_HIPM', '--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016,TauAnalysis/MCEmbeddingTools/customisers.customiseSelecting',}, dataTE]) +steps['RAWRECOLHECLEANTE16'] = merge([{'-s': 'RAW2DIGI,RECO', '--data': '', '--eventcontent': 'RAWRECO', '--datatier': 'RAWRECO', '--era': 'Run2_2016_HIPM', '--customise': 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016,TauAnalysis/MCEmbeddingTools/customisers.customiseLHEandCleaning',}, dataTE]) +steps['EMBEDHADTE16'] = merge([{'cfg': 'TauAnalysis/MCEmbeddingTools/python/EmbeddingPythia8Hadronizer_cfi.py', '-s': 'GEN,SIM,DIGI,L1,DIGI2RAW,RAW2DIGI,RECO', '--processName': 'EmbeddingPythia8Hadronizer', '--eventcontent': 'RAWRECO', '--datatier': 'RAWRECO', '--beamspot': 'Realistic25ns13TeV2016Collision', '--customise': 'TauAnalysis/MCEmbeddingTools/customisers.customiseGenerator', '--customise_commands': '\"process.generator.nAttempts = cms.uint32(1000)\"', '--era': 'Run2_2016_HIPM',}, mcTE]) + def gen(fragment,howMuch): global step1Defaults return merge([{'cfg':fragment},howMuch,step1Defaults]) diff --git a/Configuration/PyReleaseValidation/python/relval_tauembed.py b/Configuration/PyReleaseValidation/python/relval_tauembed.py new file mode 100644 index 0000000000000..1b7f8245c0296 --- /dev/null +++ b/Configuration/PyReleaseValidation/python/relval_tauembed.py @@ -0,0 +1,5 @@ +from Configuration.PyReleaseValidation.relval_steps import * + +workflows = Matrix() + +workflows[100.0] = ['', ['RunDoubleMuonTE2016C', 'RAWRECOTE16', 'RAWRECOLHECLEANTE16', 'EMBEDHADTE16']] From 45379f7338a2025562180dec3a33613c6677e1ec Mon Sep 17 00:00:00 2001 From: Kirill Skovpen Date: Mon, 9 May 2022 09:02:54 +0200 Subject: [PATCH 2/3] update --- Configuration/PyReleaseValidation/python/MatrixReader.py | 9 +++------ .../PyReleaseValidation/python/relval_standard.py | 3 +++ .../PyReleaseValidation/python/relval_tauembed.py | 5 ----- 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 Configuration/PyReleaseValidation/python/relval_tauembed.py diff --git a/Configuration/PyReleaseValidation/python/MatrixReader.py b/Configuration/PyReleaseValidation/python/MatrixReader.py index 92ccf88d4e699..54b78ca9a3398 100644 --- a/Configuration/PyReleaseValidation/python/MatrixReader.py +++ b/Configuration/PyReleaseValidation/python/MatrixReader.py @@ -54,8 +54,7 @@ def reset(self, what='all'): 'relval_2026':'2026-', 'relval_identity':'id-', 'relval_machine': 'mach-', - 'relval_premix': 'premix-', - 'relval_tauembed': 'tau-' + 'relval_premix': 'premix-' } self.files = ['relval_standard' , @@ -72,8 +71,7 @@ def reset(self, what='all'): 'relval_2026', 'relval_identity', 'relval_machine', - 'relval_premix', - 'relval_tauembed' + 'relval_premix' ] self.filesDefault = {'relval_standard':True , 'relval_highstats':True , @@ -89,8 +87,7 @@ def reset(self, what='all'): 'relval_2026':True, 'relval_identity':False, 'relval_machine':True, - 'relval_premix':True, - 'relval_tauembed':True + 'relval_premix':True } self.relvalModule = None diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 496b1635928bf..cf22d37912e47 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -445,6 +445,9 @@ workflows[136.8861] = ['',['RunEGamma2018Dml1','HLTDR2_2018ml','RECODR2_2018reHLT_skimEGamma_Prompt_L1TEgDQM','HARVEST2018_L1TEgDQM_Prompt']] workflows[136.8862] = ['',['RunEGamma2018Dml2','HLTDR2_2018ml','RECODR2_2018reHLT_skimEGamma_Prompt_L1TEgDQM','HARVEST2018_L1TEgDQM_Prompt']] +#### Test of tau embed +workflows[136.9] = ['', ['RunDoubleMuon2016C', 'RAWRECOTE16', 'RAWRECOLHECLEANTE16', 'EMBEDHADTE16']] + ### run 2021 collisions ### workflows[139.001] = ['',['RunMinimumBias2021','HLTDR3_2021','RECODR3_MinBiasOffline','HARVESTD2021MB']] workflows[139.002] = ['',['RunZeroBias2021','HLTDR3_2021','RECODR3_ZBOffline','HARVESTD2021ZB']] diff --git a/Configuration/PyReleaseValidation/python/relval_tauembed.py b/Configuration/PyReleaseValidation/python/relval_tauembed.py deleted file mode 100644 index 1b7f8245c0296..0000000000000 --- a/Configuration/PyReleaseValidation/python/relval_tauembed.py +++ /dev/null @@ -1,5 +0,0 @@ -from Configuration.PyReleaseValidation.relval_steps import * - -workflows = Matrix() - -workflows[100.0] = ['', ['RunDoubleMuonTE2016C', 'RAWRECOTE16', 'RAWRECOLHECLEANTE16', 'EMBEDHADTE16']] From 197058de155529f4009e96404969e21d187e4b5a Mon Sep 17 00:00:00 2001 From: Kirill Skovpen Date: Wed, 11 May 2022 12:10:55 +0200 Subject: [PATCH 3/3] update --- Configuration/PyReleaseValidation/python/relval_steps.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 52eddddd879bf..35da3612de014 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -514,7 +514,6 @@ steps['RunEGamma2018Dml2']={'INPUT':InputInfo(dataSet='/EGamma/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018Dml2)} #### Run2 TauEmbed #### -Run2016C={276092: [[91, 95]]} steps['RunDoubleMuonTE2016C']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2016C-v2/RAW',label='2016C',events=10000,location='STD', ls=Run2016C)} dataTE = {'--conditions': 'auto:run2_data', '--scenario': 'pp'} mcTE = {'--conditions': 'auto:run2_mc', '--scenario': 'pp'}