From 243eff1354a288db78af0c4b1206b675c4e7c443 Mon Sep 17 00:00:00 2001 From: chayanit Date: Thu, 15 Aug 2019 05:26:05 +0200 Subject: [PATCH 1/3] ad-hoc fix of TaskName more than 50 characters --- .../PyReleaseValidation/python/MatrixInjector.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Configuration/PyReleaseValidation/python/MatrixInjector.py b/Configuration/PyReleaseValidation/python/MatrixInjector.py index fdbc211b7ee37..e663fa2cd9cfb 100644 --- a/Configuration/PyReleaseValidation/python/MatrixInjector.py +++ b/Configuration/PyReleaseValidation/python/MatrixInjector.py @@ -450,6 +450,19 @@ def prepare(self,mReader, directories, mode='init'): if primary in o: #print "found",primary,"procuced by",om,"of",t_input['TaskName'] t_second['InputTask'] = t_input['TaskName'] + #ad-hoc fix due to restriction in TaskName of 50 characters + if (len(t_input['TaskName'])>50): + t_input['TaskName'] = t_input['TaskName'].replace('_TuneCUETP8M1','') + t_input['TaskName'] = t_input['TaskName'].replace('_TuneCP5','') + t_input['TaskName'] = t_input['TaskName'].replace('_forSTEAM','') + if (len(t_input['TaskName'])>50): + t_input['TaskName'] = t_input['TaskName'].replace('pythia8','') + t_input['TaskName'] = t_input['TaskName'].replace('_powhegEmissionVeto','') + t_input['TaskName'] = t_input['TaskName'].replace('_aMCatNLO','') + if (len(t_input['TaskName'])>50): + t_input['TaskName'] = t_input['TaskName'].replace('GenSimFull','GS') + t_input['TaskName'] = t_input['TaskName'].replace('GammaGamma','GG') + t_input['TaskName'] = t_input['TaskName'].replace('Bottom','B') t_second['InputFromOutputModule'] = om #print 't_second',pprint.pformat(t_second) if t_second['TaskName'].startswith('HARVEST'): From c88bd413755b287ad6cfdd8442e94dc2a4ae4096 Mon Sep 17 00:00:00 2001 From: chayanit Date: Thu, 15 Aug 2019 11:55:53 +0200 Subject: [PATCH 2/3] due to varieties of GEN fragment, this way seems more feasible --- .../PyReleaseValidation/python/MatrixInjector.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/MatrixInjector.py b/Configuration/PyReleaseValidation/python/MatrixInjector.py index e663fa2cd9cfb..62e7a23160cdf 100644 --- a/Configuration/PyReleaseValidation/python/MatrixInjector.py +++ b/Configuration/PyReleaseValidation/python/MatrixInjector.py @@ -452,17 +452,10 @@ def prepare(self,mReader, directories, mode='init'): t_second['InputTask'] = t_input['TaskName'] #ad-hoc fix due to restriction in TaskName of 50 characters if (len(t_input['TaskName'])>50): - t_input['TaskName'] = t_input['TaskName'].replace('_TuneCUETP8M1','') - t_input['TaskName'] = t_input['TaskName'].replace('_TuneCP5','') - t_input['TaskName'] = t_input['TaskName'].replace('_forSTEAM','') - if (len(t_input['TaskName'])>50): - t_input['TaskName'] = t_input['TaskName'].replace('pythia8','') - t_input['TaskName'] = t_input['TaskName'].replace('_powhegEmissionVeto','') - t_input['TaskName'] = t_input['TaskName'].replace('_aMCatNLO','') - if (len(t_input['TaskName'])>50): - t_input['TaskName'] = t_input['TaskName'].replace('GenSimFull','GS') - t_input['TaskName'] = t_input['TaskName'].replace('GammaGamma','GG') - t_input['TaskName'] = t_input['TaskName'].replace('Bottom','B') + if (t_input['TaskName'].find('GenSim') != -1): + t_input['TaskName'] = 'GenSim' + if (t_input['TaskName'].find('Hadronizer') != -1): + t_input['TaskName'] = 'Hadronizer' t_second['InputFromOutputModule'] = om #print 't_second',pprint.pformat(t_second) if t_second['TaskName'].startswith('HARVEST'): From 4a21a64218858f5a364b3122560f5ac9d929e51a Mon Sep 17 00:00:00 2001 From: chayanit Date: Tue, 20 Aug 2019 16:56:32 +0200 Subject: [PATCH 3/3] fix some typos --- Configuration/PyReleaseValidation/python/MatrixInjector.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/MatrixInjector.py b/Configuration/PyReleaseValidation/python/MatrixInjector.py index 62e7a23160cdf..ab20e4ac9d07e 100644 --- a/Configuration/PyReleaseValidation/python/MatrixInjector.py +++ b/Configuration/PyReleaseValidation/python/MatrixInjector.py @@ -449,13 +449,13 @@ def prepare(self,mReader, directories, mode='init'): for (om,o) in t_input['nowmIO'].items(): if primary in o: #print "found",primary,"procuced by",om,"of",t_input['TaskName'] - t_second['InputTask'] = t_input['TaskName'] #ad-hoc fix due to restriction in TaskName of 50 characters if (len(t_input['TaskName'])>50): if (t_input['TaskName'].find('GenSim') != -1): - t_input['TaskName'] = 'GenSim' + t_input['TaskName'] = 'GenSimFull' if (t_input['TaskName'].find('Hadronizer') != -1): - t_input['TaskName'] = 'Hadronizer' + t_input['TaskName'] = 'HadronizerFull' + t_second['InputTask'] = t_input['TaskName'] t_second['InputFromOutputModule'] = om #print 't_second',pprint.pformat(t_second) if t_second['TaskName'].startswith('HARVEST'):