From 9a024fe04978e956b3f418ac9e64a8c850aa46c1 Mon Sep 17 00:00:00 2001 From: Shin-Shan Date: Thu, 29 Jun 2023 12:33:25 +0200 Subject: [PATCH] add outputBaseDir input argument for online DQM --- .../visualization-live-secondInstance_cfg.py | 2 +- .../python/clients/visualization-live_cfg.py | 2 +- DQM/Integration/python/config/inputsource_cfi.py | 14 ++++++++++++++ DQM/Integration/python/config/pbsource_cfi.py | 13 +++++++++++++ 4 files changed, 29 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 a056d7d4a9557..ec2b36cea9a08 100644 --- a/DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py +++ b/DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py @@ -79,7 +79,7 @@ m = re.search(r"\((\w+)\)", str(source.runNumber)) runno = str(m.group(1)) - outDir= '/fff/BU0/output/EvD/run'+runno+'/streamEvDOutput2' + outDir= options.outputBaseDir+'/EvD/run'+runno+'/streamEvDOutput2' else: runno = options.runNumber outDir = "./upload" diff --git a/DQM/Integration/python/clients/visualization-live_cfg.py b/DQM/Integration/python/clients/visualization-live_cfg.py index d1adac1c8b1b2..d62f03b8e9400 100644 --- a/DQM/Integration/python/clients/visualization-live_cfg.py +++ b/DQM/Integration/python/clients/visualization-live_cfg.py @@ -77,7 +77,7 @@ m = re.search(r"\((\w+)\)", str(source.runNumber)) runno = str(m.group(1)) - outDir= '/fff/BU0/output/EvD/run'+runno+'/streamEvDOutput' + outDir= options.outputBaseDir+'/EvD/run'+runno+'/streamEvDOutput' else: runno = options.runNumber outDir = "./upload" diff --git a/DQM/Integration/python/config/inputsource_cfi.py b/DQM/Integration/python/config/inputsource_cfi.py index 0da9bea589e9e..f343fa7f9a5a7 100644 --- a/DQM/Integration/python/config/inputsource_cfi.py +++ b/DQM/Integration/python/config/inputsource_cfi.py @@ -67,6 +67,20 @@ VarParsing.VarParsing.varType.string, "Unique run key from RCMS for Frontier") +# Parameter for output directory of the event display clients +# visualization-live and visualization-live-secondInstance +# this additional input argument was added in the hltd framework +# only for the visualization clients +# Note, the other clients do not use this input parameter + +options.register('outputBaseDir', + '/fff/BU0/output', + VarParsing.VarParsing.multiplicity.singleton, + VarParsing.VarParsing.varType.string, + "Directory where the visualization output files will appear.") + + + options.parseArguments() # Fix to allow scram to compile diff --git a/DQM/Integration/python/config/pbsource_cfi.py b/DQM/Integration/python/config/pbsource_cfi.py index fb2165a3448f2..15619260fcd26 100644 --- a/DQM/Integration/python/config/pbsource_cfi.py +++ b/DQM/Integration/python/config/pbsource_cfi.py @@ -60,6 +60,19 @@ VarParsing.VarParsing.varType.string, "Unique run key from RCMS for Frontier") +# Parameter for output directory of the event display clients +# visualization-live and visualization-live-secondInstance +# this additional input argument was added in the hltd framework +# only for the visualization clients +# Note, the other clients do not use this input parameter + +options.register('outputBaseDir', + '/fff/BU0/output', + VarParsing.VarParsing.multiplicity.singleton, + VarParsing.VarParsing.varType.string, + "Directory where the visualization output files will appear.") + + options.parseArguments() # Fix to allow scram to compile