From ff917d695362ec122bd034ad59c1432da1be39f1 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Fri, 18 Nov 2022 14:32:20 +0100
Subject: [PATCH] Fix ctest and python style errors
---
DDDigi/src/DigiKernel.cpp | 2 +-
examples/DDDigi/scripts/DigiTest.py | 2 +-
examples/DDDigi/scripts/TestProperties.py | 2 +-
examples/DDG4/scripts/TestUserCommands.py | 52 +++++++++++------------
4 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/DDDigi/src/DigiKernel.cpp b/DDDigi/src/DigiKernel.cpp
index 8af666e11..566813ddc 100644
--- a/DDDigi/src/DigiKernel.cpp
+++ b/DDDigi/src/DigiKernel.cpp
@@ -443,7 +443,7 @@ int DigiKernel::run() {
if ( 0 == internals->num_threads ) {
internals->num_threads = ctrl_t::max_allowed_parallelism;
}
- info("+++ Number of TBB threads to: %d",internals->num_threads);
+ info("+++ Number of TBB threads: %d",internals->num_threads);
info("+++ Number of parallel events: %d",internals->maxEventsParallel);
internals->tbb_init = std::make_unique<ctrl_t>(ctrl_t::max_allowed_parallelism,internals->num_threads+1);
if ( internals->maxEventsParallel >= 0 ) {
diff --git a/examples/DDDigi/scripts/DigiTest.py b/examples/DDDigi/scripts/DigiTest.py
index 6798d8464..9a4205836 100644
--- a/examples/DDDigi/scripts/DigiTest.py
+++ b/examples/DDDigi/scripts/DigiTest.py
@@ -137,7 +137,7 @@ def test_setup_1(digi, print_level=WARNING, parallel=True):
# ========================================================================================================
digi.info('Created SIGNAL input')
input = digi.input_action('DigiParallelActionSequence/READER')
- input.adopt_action('DigiDDG4ROOT/SignalReader',
+ input.adopt_action('DigiDDG4ROOT/SignalReader',
mask=0xCBAA,
input=[digi.next_input()],
OutputLevel=print_level, keep_raw=False)
diff --git a/examples/DDDigi/scripts/TestProperties.py b/examples/DDDigi/scripts/TestProperties.py
index c07b7a5fd..a4db1357e 100644
--- a/examples/DDDigi/scripts/TestProperties.py
+++ b/examples/DDDigi/scripts/TestProperties.py
@@ -25,7 +25,7 @@ def run():
histo = digi.create_action('DigiDepositEnergyMonitor/TestHisto')
histo.histo1D_deposits = ("Energy", u"Some main deposit Title", 101, -0.5, 100.5)
num_tests = num_tests + 1
- histo.histo1D_delta = ("Delta", u"Some delta Title", 50, -5, 5)
+ histo.histo1D_delta = ("Delta", u"Some delta Title", 50, -5, 5)
num_tests = num_tests + 1
histo.printProperties()
info('property: histo1D_deposits = %s [%s]' %
diff --git a/examples/DDG4/scripts/TestUserCommands.py b/examples/DDG4/scripts/TestUserCommands.py
index 2b25c5331..ed4074c87 100644
--- a/examples/DDG4/scripts/TestUserCommands.py
+++ b/examples/DDG4/scripts/TestUserCommands.py
@@ -41,8 +41,9 @@ def run():
sys.exit(0)
kernel = DDG4.Kernel()
- kernel.loadGeometry(str("file:" + os.environ['DD4hepExamplesINSTALL'] +
- "/examples/ClientTests/compact/BoxTrafos.xml"))
+ kernel.loadGeometry(str("file:"
+ + os.environ['DD4hepExamplesINSTALL']
+ + "/examples/ClientTests/compact/BoxTrafos.xml"))
geant4 = DDG4.Geant4(kernel)
# Configure UI
if args.macro:
@@ -52,33 +53,28 @@ def run():
ui.HaveUI = False
- ui.ConfigureCommands = [
- '/ddg4/Print/param configure-command-1',
- '/ddg4/Print/print_param',
- '/ddg4/Print/param configure-command-2',
- '/ddg4/Print/print_param']
- ui.InitializeCommands = [
- '/ddg4/Print/param initialize-command-1',
- '/ddg4/Print/print_param',
- '/ddg4/Print/param initialize-command-2',
- '/ddg4/Print/print_param']
- ui.PreRunCommands = [
- '/ddg4/Print/param pre-run-command-1',
- '/ddg4/Print/print_param',
- '/ddg4/Print/param pre-run-command-2',
- '/ddg4/Print/print_param']
- ui.TerminateCommands = [
- '/ddg4/Print/param terminate-command-1',
- '/ddg4/Print/print_param',
- '/ddg4/Print/param terminate-command-2',
- '/ddg4/Print/print_param',
- '/ddg4/UI/terminate']
+ ui.ConfigureCommands = ['/ddg4/Print/param configure-command-1',
+ '/ddg4/Print/print_param',
+ '/ddg4/Print/param configure-command-2',
+ '/ddg4/Print/print_param']
+ ui.InitializeCommands = ['/ddg4/Print/param initialize-command-1',
+ '/ddg4/Print/print_param',
+ '/ddg4/Print/param initialize-command-2',
+ '/ddg4/Print/print_param']
+ ui.PreRunCommands = ['/ddg4/Print/param pre-run-command-1',
+ '/ddg4/Print/print_param',
+ '/ddg4/Print/param pre-run-command-2',
+ '/ddg4/Print/print_param']
+ ui.TerminateCommands = ['/ddg4/Print/param terminate-command-1',
+ '/ddg4/Print/print_param',
+ '/ddg4/Print/param terminate-command-2',
+ '/ddg4/Print/print_param',
+ '/ddg4/UI/terminate']
# Post-run commands are only executed in interactive mode!
- ui.PostRunCommands = [
- '/ddg4/Print/param post-run-command-1',
- '/ddg4/Print/print_param',
- '/ddg4/Print/param post-run-command-2',
- '/ddg4/Print/print_param']
+ ui.PostRunCommands = ['/ddg4/Print/param post-run-command-1',
+ '/ddg4/Print/print_param',
+ '/ddg4/Print/param post-run-command-2',
+ '/ddg4/Print/print_param']
prt = DDG4.Action(kernel, 'TestPrintAction/Print')
prt.enableUI()
--
GitLab