From 5a22ba3b2e3c847654555787fd232946303662bf Mon Sep 17 00:00:00 2001 From: pmandrik Date: Tue, 19 Apr 2022 18:32:54 +0200 Subject: [PATCH 1/5] add splash run option --- .../python/clients/visualization-live-secondInstance_cfg.py | 3 ++- DQM/Integration/python/clients/visualization-live_cfg.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py b/DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py index 42d1e8d3a16ad..05d274f1c6627 100644 --- a/DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py +++ b/DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py @@ -47,7 +47,8 @@ from DQM.Integration.config.FrontierCondition_GT_autoExpress_cfi import GlobalTag kwds = { 'globalTag': GlobalTag.globaltag.value(), - 'globalTagConnect': GlobalTag.connect.value() + 'globalTagConnect': GlobalTag.connect.value(), + 'beamSplashRun' : options.BeamSplashRun, } # explicitly select the input collection, since we get multiple in online diff --git a/DQM/Integration/python/clients/visualization-live_cfg.py b/DQM/Integration/python/clients/visualization-live_cfg.py index c67e3906cd0df..3aa1655458a3a 100644 --- a/DQM/Integration/python/clients/visualization-live_cfg.py +++ b/DQM/Integration/python/clients/visualization-live_cfg.py @@ -47,7 +47,8 @@ from DQM.Integration.config.FrontierCondition_GT_autoExpress_cfi import GlobalTag kwds = { 'globalTag': GlobalTag.globaltag.value(), - 'globalTagConnect': GlobalTag.connect.value() + 'globalTagConnect': GlobalTag.connect.value(), + 'beamSplashRun' : options.BeamSplashRun, } # explicitly select the input collection, since we get multiple in online From 3f62b8913a01407991d87daaa90d63290072f105 Mon Sep 17 00:00:00 2001 From: pmandrik Date: Tue, 19 Apr 2022 18:33:04 +0200 Subject: [PATCH 2/5] add splash run option --- Configuration/DataProcessing/python/Reco.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Configuration/DataProcessing/python/Reco.py b/Configuration/DataProcessing/python/Reco.py index 7a8a79aa3c075..16d9cbbf1ea5c 100644 --- a/Configuration/DataProcessing/python/Reco.py +++ b/Configuration/DataProcessing/python/Reco.py @@ -157,9 +157,14 @@ def visualizationProcessing(self, globalTag, **args): eiStep='' + if 'beamSplashRun' in args: + eiStep = ":localreco+hcalOnlyGlobalRecoSequence+caloTowersRec" if args['beamSplashRun'] else "" + print("Using RECO%s step for ED clients" % eiStep) + options.step += 'RAW2DIGI,L1Reco,RECO'+eiStep+',ENDJOB' + dictIO(options,args) options.conditions = gtNameAndConnect(globalTag, args) options.timeoutOutput = True From 51d1808b278928ebcd97bf9b71dc46dbc422ab53 Mon Sep 17 00:00:00 2001 From: pmandrik Date: Mon, 9 May 2022 11:08:04 +0200 Subject: [PATCH 3/5] move reco options into dqm clients --- Configuration/DataProcessing/python/Reco.py | 8 ++++---- .../clients/visualization-live-secondInstance_cfg.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Configuration/DataProcessing/python/Reco.py b/Configuration/DataProcessing/python/Reco.py index 16d9cbbf1ea5c..6023f467e54cc 100644 --- a/Configuration/DataProcessing/python/Reco.py +++ b/Configuration/DataProcessing/python/Reco.py @@ -158,10 +158,10 @@ def visualizationProcessing(self, globalTag, **args): eiStep='' if 'beamSplashRun' in args: - eiStep = ":localreco+hcalOnlyGlobalRecoSequence+caloTowersRec" if args['beamSplashRun'] else "" - print("Using RECO%s step for ED clients" % eiStep) - - options.step += 'RAW2DIGI,L1Reco,RECO'+eiStep+',ENDJOB' + options.step += 'RAW2DIGI,L1Reco,RECO'+args['beamSplashRun']+',ENDJOB' + print("Using RECO%s step in visualizationProcessing" % args['beamSplashRun']) + else : + options.step += 'RAW2DIGI,L1Reco,RECO'+eiStep+',ENDJOB' diff --git a/DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py b/DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py index 05d274f1c6627..41ac5f20f2d7f 100644 --- a/DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py +++ b/DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py @@ -48,7 +48,7 @@ kwds = { 'globalTag': GlobalTag.globaltag.value(), 'globalTagConnect': GlobalTag.connect.value(), - 'beamSplashRun' : options.BeamSplashRun, + 'beamSplashRun' : ":localreco+hcalOnlyGlobalRecoSequence+caloTowersRec" if options.BeamSplashRun else "", } # explicitly select the input collection, since we get multiple in online From 1fdb41b21c9a67094be0218604057c80e01abba1 Mon Sep 17 00:00:00 2001 From: pmandrik Date: Mon, 9 May 2022 11:10:15 +0200 Subject: [PATCH 4/5] move reco options into dqm clients v2 --- DQM/Integration/python/clients/visualization-live_cfg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DQM/Integration/python/clients/visualization-live_cfg.py b/DQM/Integration/python/clients/visualization-live_cfg.py index 3aa1655458a3a..ed13a74ddf85e 100644 --- a/DQM/Integration/python/clients/visualization-live_cfg.py +++ b/DQM/Integration/python/clients/visualization-live_cfg.py @@ -48,7 +48,7 @@ kwds = { 'globalTag': GlobalTag.globaltag.value(), 'globalTagConnect': GlobalTag.connect.value(), - 'beamSplashRun' : options.BeamSplashRun, + 'beamSplashRun' : ":localreco+hcalOnlyGlobalRecoSequence+caloTowersRec" if options.BeamSplashRun else "", } # explicitly select the input collection, since we get multiple in online From 7a55b8ecdf2acfea6447df04a6e69f14ade2303f Mon Sep 17 00:00:00 2001 From: pmandrik Date: Mon, 9 May 2022 19:26:02 +0200 Subject: [PATCH 5/5] add BeamSplashRun to unittest config --- DQM/Integration/python/config/unittestinputsource_cfi.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DQM/Integration/python/config/unittestinputsource_cfi.py b/DQM/Integration/python/config/unittestinputsource_cfi.py index 16a7899832b7b..6bade5861a70b 100644 --- a/DQM/Integration/python/config/unittestinputsource_cfi.py +++ b/DQM/Integration/python/config/unittestinputsource_cfi.py @@ -67,6 +67,12 @@ VarParsing.VarParsing.varType.int, "This number of last events in each lumisection will be processed.") +options.register('BeamSplashRun', + False, # default value + VarParsing.VarParsing.multiplicity.singleton, + VarParsing.VarParsing.varType.bool, + "Set client source settings for beam SPLASH run") + # This is used only by the online clients themselves. # We need to register it here because otherwise an error occurs saying that there is an unidentified option. options.register('unitTest',