From 3d8e82f014adc96857d3537cae8e3420fb02b16d Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Tue, 6 Dec 2022 19:04:00 +0100
Subject: [PATCH] Silence flake8 warnings
---
examples/DDCMS/scripts/CMSEcalSim.py | 6 +++---
examples/DDCMS/scripts/CMSTrackerSim.py | 6 +++---
.../DDDigi/scripts/TestDepositWeighted.py | 5 ++++-
examples/DDDigi/scripts/TestHitProcessing.py | 8 ++++----
examples/DDDigi/scripts/TestSpillover.py | 19 +++++++++++--------
examples/LHeD/scripts/LHeD.py | 2 +-
6 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/examples/DDCMS/scripts/CMSEcalSim.py b/examples/DDCMS/scripts/CMSEcalSim.py
index 0e59550df..ad68b1a92 100644
--- a/examples/DDCMS/scripts/CMSEcalSim.py
+++ b/examples/DDCMS/scripts/CMSEcalSim.py
@@ -70,9 +70,9 @@ def run():
o = DDG4.DetElement(i.second.ptr())
sd = geant4.description.sensitiveDetector(o.name())
if sd.isValid():
- type = geant4.sensitive_types[sd.type()]
- logger.info('CMSTracker: Configure subdetector %-24s of type %s' % (o.name(), type,))
- geant4.setupDetector(o.name(), type)
+ typ = geant4.sensitive_types[sd.type()]
+ logger.info('CMSTracker: Configure subdetector %-24s of type %s' % (o.name(), typ,))
+ geant4.setupDetector(o.name(), typ)
# And handle the simulation particles.
part = DDG4.GeneratorAction(kernel, "Geant4ParticleHandler/ParticleHandler")
diff --git a/examples/DDCMS/scripts/CMSTrackerSim.py b/examples/DDCMS/scripts/CMSTrackerSim.py
index 5abe2dac9..856aa3374 100644
--- a/examples/DDCMS/scripts/CMSTrackerSim.py
+++ b/examples/DDCMS/scripts/CMSTrackerSim.py
@@ -67,9 +67,9 @@ def run():
o = DDG4.DetElement(i.second.ptr())
sd = geant4.description.sensitiveDetector(o.name())
if sd.isValid():
- type = geant4.sensitive_types[sd.type()]
- logger.info('CMSTracker: Configure subdetector %-24s of type %s' % (o.name(), type,))
- geant4.setupDetector(o.name(), type)
+ typ = geant4.sensitive_types[sd.type()]
+ logger.info('CMSTracker: Configure subdetector %-24s of type %s' % (o.name(), typ,))
+ geant4.setupDetector(o.name(), typ)
# And handle the simulation particles.
part = DDG4.GeneratorAction(kernel, "Geant4ParticleHandler/ParticleHandler")
diff --git a/examples/DDDigi/scripts/TestDepositWeighted.py b/examples/DDDigi/scripts/TestDepositWeighted.py
index e108b0039..72646bd7a 100644
--- a/examples/DDDigi/scripts/TestDepositWeighted.py
+++ b/examples/DDDigi/scripts/TestDepositWeighted.py
@@ -19,7 +19,10 @@ def run():
input_action = digi.input_action('DigiParallelActionSequence/READER')
# ========================================================================================================
digi.info('Created SIGNAL input')
- signal = input_action.adopt_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()], OutputLevel=rdr_output)
+ signal = input_action.adopt_action('DigiDDG4ROOT/SignalReader',
+ mask=0x0,
+ input=[digi.next_input()],
+ OutputLevel=rdr_output)
digi.check_creation([signal])
# ========================================================================================================
digi.info('Creating collision overlays....')
diff --git a/examples/DDDigi/scripts/TestHitProcessing.py b/examples/DDDigi/scripts/TestHitProcessing.py
index 755c8de6b..86f9e4ffa 100644
--- a/examples/DDDigi/scripts/TestHitProcessing.py
+++ b/examples/DDDigi/scripts/TestHitProcessing.py
@@ -15,18 +15,18 @@ def run():
import DigiTest
digi = DigiTest.Test(geometry=None)
- input = digi.input_action('DigiParallelActionSequence/READER')
+ input_action = digi.input_action('DigiParallelActionSequence/READER')
# ========================================================================================================
digi.info('Created SIGNAL input')
- input.adopt_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()])
+ input_action.adopt_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()])
# ========================================================================================================
digi.info('Creating collision overlays....')
# ========================================================================================================
- overlay = input.adopt_action('DigiSequentialActionSequence/Overlay-1')
+ overlay = input_action.adopt_action('DigiSequentialActionSequence/Overlay-1')
overlay.adopt_action('DigiDDG4ROOT/Read-1', mask=0x1, input=[digi.next_input()])
digi.info('Created input.overlay-1')
# ========================================================================================================
- overlay = input.adopt_action('DigiSequentialActionSequence/Overlay-2')
+ overlay = input_action.adopt_action('DigiSequentialActionSequence/Overlay-2')
overlay.adopt_action('DigiDDG4ROOT/Read-2', mask=0x2, input=[digi.next_input()])
digi.info('Created input.overlay-2')
# ========================================================================================================
diff --git a/examples/DDDigi/scripts/TestSpillover.py b/examples/DDDigi/scripts/TestSpillover.py
index f388432ec..f25109a7e 100644
--- a/examples/DDDigi/scripts/TestSpillover.py
+++ b/examples/DDDigi/scripts/TestSpillover.py
@@ -17,14 +17,17 @@ def run():
digi = DigiTest.Test(geometry=None)
attenuation = digi.attenuation
rdr_output = DigiTest.DEBUG
- input = digi.input_action('DigiParallelActionSequence/READER')
+ input_action = digi.input_action('DigiParallelActionSequence/READER')
# ========================================================================================================
- input.adopt_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()], OutputLevel=rdr_output)
+ input_action.adopt_action('DigiDDG4ROOT/SignalReader',
+ mask=0x0,
+ input=[digi.next_input()],
+ OutputLevel=rdr_output)
digi.info('Created input.signal')
# ========================================================================================================
digi.info('Creating spillover sequence for EARLIER bunch crossings.....')
# ========================================================================================================
- spillover = input.adopt_action('DigiSequentialActionSequence/Spillover-25')
+ spillover = input_action.adopt_action('DigiSequentialActionSequence/Spillover-25')
evtreader = spillover.adopt_action('DigiDDG4ROOT/Reader-25ns',
mask=0x1,
input=[digi.next_input()],
@@ -40,7 +43,7 @@ def run():
digi.check_creation([spillover, evtreader, attenuate, hist_drop])
digi.info('Created input.spillover-25')
# ========================================================================================================
- spillover = input.adopt_action('DigiSequentialActionSequence/Spillover-50')
+ spillover = input_action.adopt_action('DigiSequentialActionSequence/Spillover-50')
evtreader = spillover.adopt_action('DigiDDG4ROOT/Reader-50ns',
mask=0x2,
input=[digi.next_input()],
@@ -54,7 +57,7 @@ def run():
digi.check_creation([spillover, evtreader, attenuate, hist_drop])
digi.info('Created input.spillover-50')
# ========================================================================================================
- spillover = input.adopt_action('DigiSequentialActionSequence/Spillover-75')
+ spillover = input_action.adopt_action('DigiSequentialActionSequence/Spillover-75')
evtreader = spillover.adopt_action('DigiDDG4ROOT/Reader-75ns',
mask=0x3,
input=[digi.next_input()],
@@ -70,7 +73,7 @@ def run():
# ========================================================================================================
digi.info('Creating spillover sequence for LATER bunch crossings.....')
# ========================================================================================================
- spillover = input.adopt_action('DigiSequentialActionSequence/Spillover+25')
+ spillover = input_action.adopt_action('DigiSequentialActionSequence/Spillover+25')
evtreader = spillover.adopt_action('DigiDDG4ROOT/Reader+25ns',
mask=0x4,
input=[digi.next_input()],
@@ -84,7 +87,7 @@ def run():
digi.check_creation([spillover, evtreader, attenuate, hist_drop])
digi.info('Created input.spillover+25')
# ========================================================================================================
- spillover = input.adopt_action('DigiSequentialActionSequence/Spillover+50')
+ spillover = input_action.adopt_action('DigiSequentialActionSequence/Spillover+50')
evtreader = spillover.adopt_action('DigiDDG4ROOT/Reader+50ns',
mask=0x5,
input=[digi.next_input()],
@@ -98,7 +101,7 @@ def run():
digi.check_creation([spillover, evtreader, attenuate, hist_drop])
digi.info('Created input.spillover+50')
# ========================================================================================================
- spillover = input.adopt_action('DigiSequentialActionSequence/Spillover+75')
+ spillover = input_action.adopt_action('DigiSequentialActionSequence/Spillover+75')
evtreader = spillover.adopt_action('DigiDDG4ROOT/Reader+75ns',
mask=0x6,
input=[digi.next_input()],
diff --git a/examples/LHeD/scripts/LHeD.py b/examples/LHeD/scripts/LHeD.py
index 0343f8853..1935810d0 100644
--- a/examples/LHeD/scripts/LHeD.py
+++ b/examples/LHeD/scripts/LHeD.py
@@ -26,7 +26,7 @@ class LHeD:
return self.geant4.setupTrackingField(prt=True)
# Example to show how to setup random generator
- def setupRandom(self, name, type=None, seed=None, quiet=True):
+ def setupRandom(self, name, type=None, seed=None, quiet=True): # noqa: A002
rndm = DDG4.Action(self.kernel, 'Geant4Random/' + name)
if seed:
rndm.Seed = seed
--
GitLab