diff --git a/examples/CLICSiD/scripts/CLICSid.py b/examples/CLICSiD/scripts/CLICSid.py index 548ca6d1a7cd956cabec07a36ea2f65eee405944..af1cc72b762fc2703bffe5a6dc118db93bd8912d 100644 --- a/examples/CLICSiD/scripts/CLICSid.py +++ b/examples/CLICSiD/scripts/CLICSid.py @@ -45,7 +45,7 @@ class CLICSid: return self.geant4.setupTrackingField(prt=True) # Example to show how to setup random generator - def setupRandom(self, name, type=None, seed=None, quiet=True): # noqa: A002 + def setupRandom(self, name, type=None, seed=None, quiet=True): # noqa: A002 rndm = DDG4.Action(self.kernel, 'Geant4Random/' + name) if seed: rndm.Seed = seed diff --git a/examples/ClientTests/scripts/Check_Air.py b/examples/ClientTests/scripts/Check_Air.py index e27880deaf195918540a9382eac71d2b13447d35..d446852416d628e8d2b366a5cf35f73fd24c4516 100644 --- a/examples/ClientTests/scripts/Check_Air.py +++ b/examples/ClientTests/scripts/Check_Air.py @@ -23,7 +23,7 @@ import sys logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO) -def help(): +def show_help(): logging.info("Check_shape.py -option [-option] ") logging.info(" -geometry <geometry file> Geometry file ") logging.info(" -vis Enable visualization ") @@ -46,7 +46,7 @@ def run(): vis = True if not geo: - help() + show_help() sys.exit(1) import DDG4 diff --git a/examples/ClientTests/scripts/Check_reflection.py b/examples/ClientTests/scripts/Check_reflection.py index d11cf72cab757363a167ecbc158d72d565679d77..0c48927aea01b189ec509953014e93a5de0b182f 100644 --- a/examples/ClientTests/scripts/Check_reflection.py +++ b/examples/ClientTests/scripts/Check_reflection.py @@ -29,7 +29,7 @@ logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO) logger = logging.getLogger(__name__) -def help(): +def show_help(): logging.info("Check_shape.py -option [-option] ") logging.info(" -geometry <geometry file> Geometry file ") logging.info(" -vis Enable visualization ") @@ -55,7 +55,7 @@ def run(): dump = True if not geo: - help() + show_help() sys.exit(1) import DDG4 diff --git a/examples/ClientTests/scripts/Check_shape.py b/examples/ClientTests/scripts/Check_shape.py index b4020eba9041169802cad222b49b7d30f8044dc9..0f886fff223968a2f06e35ac34edacf0bfe0cc93 100644 --- a/examples/ClientTests/scripts/Check_shape.py +++ b/examples/ClientTests/scripts/Check_shape.py @@ -28,7 +28,7 @@ logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO) logger = logging.getLogger(__name__) -def help(): +def show_help(): logging.info("Check_shape.py -option [-option] ") logging.info(" -geometry <geometry file> Geometry file ") logging.info(" -vis Enable visualization ") @@ -50,7 +50,7 @@ def run(): vis = True if not geo: - help() + show_help() sys.exit(1) import DDG4 diff --git a/examples/ClientTests/scripts/DDG4TestSetup.py b/examples/ClientTests/scripts/DDG4TestSetup.py index 044bd45169f7abedc0a46e64802f3c5119aa147a..e25039056a2612cb7227ec457fa863f7832237eb 100644 --- a/examples/ClientTests/scripts/DDG4TestSetup.py +++ b/examples/ClientTests/scripts/DDG4TestSetup.py @@ -54,11 +54,11 @@ class Setup: return self.geant4.setupGun(name, particle=particle, energy=energy, multiplicity=multiplicity) def setupInput(self, spec, mask=1): - input = DDG4.GeneratorAction(self.kernel, "Geant4InputAction/Input") - input.Input = spec - input.MomentumScale = 1.0 - input.Mask = mask - self.geant4.buildInputStage([input]) + input_action = DDG4.GeneratorAction(self.kernel, "Geant4InputAction/Input") + input_action.Input = spec + input_action.MomentumScale = 1.0 + input_action.Mask = mask + self.geant4.buildInputStage([input_action]) def setupGenerator(self): # And handle the simulation particles. diff --git a/examples/ClientTests/scripts/NestedBoxReflection.py b/examples/ClientTests/scripts/NestedBoxReflection.py index d4fd12a381aff3072c995a67aa33317be28fc5dc..14a55b000493cbb0840cdde67094dd97a695ad0f 100644 --- a/examples/ClientTests/scripts/NestedBoxReflection.py +++ b/examples/ClientTests/scripts/NestedBoxReflection.py @@ -32,7 +32,7 @@ logger = logging.getLogger(__name__) """ -def help(): +def show_help(): logging.info("Check_shape.py -option [-option] ") logging.info(" -vis Enable visualization ") logging.info(" -batch Batch execution ") @@ -57,7 +57,7 @@ def run(): hlp = True if hlp: - help() + show_help() sys.exit(1) kernel = DDG4.Kernel() diff --git a/examples/DDDigi/scripts/DigiTest.py b/examples/DDDigi/scripts/DigiTest.py index 083bccf1a5c7ac558796b1aa23e86fbb92403ab7..2f144b30dc19a4d7e208fa85292f4ca361ff208b 100644 --- a/examples/DDDigi/scripts/DigiTest.py +++ b/examples/DDDigi/scripts/DigiTest.py @@ -96,7 +96,7 @@ class Test(dddigi.Digitize): if o is None: self.error('FAILED Failed to create object') - def declare_input(self, name, input, parallel=True): # noqa: A001 + def declare_input(self, name, input, parallel=True): # noqa: A002 if not self.input: self.input = dddigi.Synchronize(self.kernel(), 'DigiParallelActionSequence/READER') self.input.parallel = True diff --git a/examples/DDDigi/scripts/TestDepositWeighted.py b/examples/DDDigi/scripts/TestDepositWeighted.py index 75e31f1f8ac39883cf61da845b4915fd43c4b8e0..e108b0039478e9449d385627ce615e64f9c9d6c3 100644 --- a/examples/DDDigi/scripts/TestDepositWeighted.py +++ b/examples/DDDigi/scripts/TestDepositWeighted.py @@ -16,20 +16,20 @@ def run(): digi = DigiTest.Test(geometry=None) rdr_output = DigiTest.DEBUG - input = digi.input_action('DigiParallelActionSequence/READER') + input_action = digi.input_action('DigiParallelActionSequence/READER') # ======================================================================================================== digi.info('Created SIGNAL input') - signal = input.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....') # ======================================================================================================== - overlay = input.adopt_action('DigiSequentialActionSequence/Overlay-1') + overlay = input_action.adopt_action('DigiSequentialActionSequence/Overlay-1') evtreader = overlay.adopt_action('DigiDDG4ROOT/Read-1', mask=0x1, input=[digi.next_input()], OutputLevel=rdr_output) digi.check_creation([overlay, evtreader]) digi.info('Created input.overlay-1') # ======================================================================================================== - overlay = input.adopt_action('DigiSequentialActionSequence/Overlay-2') + overlay = input_action.adopt_action('DigiSequentialActionSequence/Overlay-2') evtreader = overlay.adopt_action('DigiDDG4ROOT/Read-2', mask=0x2, input=[digi.next_input()], OutputLevel=rdr_output) digi.check_creation([overlay, evtreader]) digi.info('Created input.overlay-2') diff --git a/examples/DDDigi/scripts/TestHitHistory.py b/examples/DDDigi/scripts/TestHitHistory.py index 8026f28b57402c3d314a13c5ebb8e0fc4feb0f58..4ae83b3c3092777b5fa39359a690a43331cc97f3 100644 --- a/examples/DDDigi/scripts/TestHitHistory.py +++ b/examples/DDDigi/scripts/TestHitHistory.py @@ -15,14 +15,14 @@ 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=0xCBAA, input=[digi.next_input()]) + input_action.adopt_action('DigiDDG4ROOT/SignalReader', mask=0xCBAA, input=[digi.next_input()]) # ======================================================================================================== digi.info('Creating collision overlay....') # ======================================================================================================== - overlay = input.adopt_action('DigiSequentialActionSequence/Overlay-1') + overlay = input_action.adopt_action('DigiSequentialActionSequence/Overlay-1') overlay.adopt_action('DigiDDG4ROOT/Read-1', mask=0xCBEE, input=[digi.next_input()]) digi.info('Created input.overlay-1') # ======================================================================================================== diff --git a/examples/DDDigi/scripts/TestIPMove.py b/examples/DDDigi/scripts/TestIPMove.py index ba89106322f8a9f1e38f3d9f7fa5dea66b0c4aed..c5e1143f18cc55bfe10a6aa3946f0e390e9f674f 100644 --- a/examples/DDDigi/scripts/TestIPMove.py +++ b/examples/DDDigi/scripts/TestIPMove.py @@ -15,10 +15,10 @@ 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') - signal = input.adopt_action('DigiSequentialActionSequence/Signal') + signal = input_action.adopt_action('DigiSequentialActionSequence/Signal') signal.adopt_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()]) set_ip = signal.adopt_action('DigiIPCreate/SignalIP') set_ip.offset_ip = [1, 2, 3] diff --git a/examples/DDDigi/scripts/TestMultiContainerParallel.py b/examples/DDDigi/scripts/TestMultiContainerParallel.py index dc4a33e7eebefea9885955f0494426f49b801cd6..259b9eae938131bd6b77a8045a26de2617af7eca 100644 --- a/examples/DDDigi/scripts/TestMultiContainerParallel.py +++ b/examples/DDDigi/scripts/TestMultiContainerParallel.py @@ -16,10 +16,12 @@ def run(): import DigiTest digi = DigiTest.Test(geometry=None) # digi.load_geo() - input = digi.input_action('DigiParallelActionSequence/READER') + input_action = digi.input_action('DigiParallelActionSequence/READER') # ======================================================================== digi.info('Created SIGNAL input') - signal = input.adopt_action('DigiDDG4ROOT/SignalReader', mask=0xFEED, input=[digi.next_input()]) + signal = input_action.adopt_action('DigiDDG4ROOT/SignalReader', + mask=0xFEED, + input=[digi.next_input()]) digi.check_creation([signal]) # ======================================================================== event = digi.event_action('DigiSequentialActionSequence/EventAction') diff --git a/examples/DDDigi/scripts/TestMultiInteractions.py b/examples/DDDigi/scripts/TestMultiInteractions.py index 4a0bbae61599529715096b59b2ba187765df2997..edf6b388fe710d1b75c0f2fa56c0ebf711653f26 100644 --- a/examples/DDDigi/scripts/TestMultiInteractions.py +++ b/examples/DDDigi/scripts/TestMultiInteractions.py @@ -15,27 +15,27 @@ 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') - signal = input.adopt_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()]) + signal = input_action.adopt_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()]) digi.check_creation([signal]) # ======================================================================================================== digi.info('Creating collision overlays....') # ======================================================================================================== - overlay = input.adopt_action('DigiSequentialActionSequence/Overlay-1') + overlay = input_action.adopt_action('DigiSequentialActionSequence/Overlay-1') evtreader = overlay.adopt_action('DigiDDG4ROOT/Reader-1', mask=0x1, input=[digi.next_input()]) hist_drop = overlay.adopt_action('DigiHitHistoryDrop/Drop-1', masks=[evtreader.mask]) digi.check_creation([overlay, evtreader, hist_drop]) digi.info('Created input.overlay25') # ======================================================================================================== - overlay = input.adopt_action('DigiSequentialActionSequence/Overlay-2') + overlay = input_action.adopt_action('DigiSequentialActionSequence/Overlay-2') evtreader = overlay.adopt_action('DigiDDG4ROOT/Reader-2', mask=0x2, input=[digi.next_input()]) hist_drop = overlay.adopt_action('DigiHitHistoryDrop/Drop-2', masks=[evtreader.mask]) digi.check_creation([overlay, evtreader, hist_drop]) digi.info('Created input.overlay50') # ======================================================================================================== - overlay = input.adopt_action('DigiSequentialActionSequence/Overlay-3') + overlay = input_action.adopt_action('DigiSequentialActionSequence/Overlay-3') evtreader = overlay.adopt_action('DigiDDG4ROOT/Reader-3', mask=0x3, input=[digi.next_input()]) hist_drop = overlay.adopt_action('DigiHitHistoryDrop/Drop-3', masks=[evtreader.mask]) digi.check_creation([overlay, evtreader, hist_drop]) diff --git a/examples/DDDigi/scripts/TestProperties.py b/examples/DDDigi/scripts/TestProperties.py index a4db1357e4673683e50ab35cb7cda14beb8959fc..743c1edf0aab52235cf8f6d223232edff4bc3b76 100644 --- a/examples/DDDigi/scripts/TestProperties.py +++ b/examples/DDDigi/scripts/TestProperties.py @@ -32,105 +32,105 @@ def run(): (str(histo.histo1D_deposits), str(histo.histo1D_deposits.__class__),)) num_tests = num_tests + 1 - input = digi.input_action('DigiParallelActionSequence/Test') + action = digi.input_action('DigiParallelActionSequence/Test') - input.add_property('property_int', 1) + action.add_property('property_int', 1) info('property: has_property = %s [%s]' % - (yes_no(input.hasProperty('property_int')), str(input.property_int.__class__),)) - info('property: property_int = %s' % (str(input.property_int),)) - input.property_int = 123456 - info('property: property_int = %s' % (str(input.property_int),)) - if input.hasProperty('property_int'): + (yes_no(action.hasProperty('property_int')), str(action.property_int.__class__),)) + info('property: property_int = %s' % (str(action.property_int),)) + action.property_int = 123456 + info('property: property_int = %s' % (str(action.property_int),)) + if action.hasProperty('property_int'): num_tests = num_tests + 1 - input.add_vector_property('property_vector_int', [1, 2, 3]) + action.add_vector_property('property_vector_int', [1, 2, 3]) info('property: has_property = %s [%s]' % - (yes_no(input.hasProperty('property_vector_int')), str(input.property_vector_int.__class__), )) - info('property: property_vector_int = %s' % (str(input.property_vector_int),)) - input.property_vector_int = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0] - info('property: property_vector_int = %s' % (str(input.property_vector_int),)) - if input.hasProperty('property_vector_int'): + (yes_no(action.hasProperty('property_vector_int')), str(action.property_vector_int.__class__), )) + info('property: property_vector_int = %s' % (str(action.property_vector_int),)) + action.property_vector_int = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0] + info('property: property_vector_int = %s' % (str(action.property_vector_int),)) + if action.hasProperty('property_vector_int'): num_tests = num_tests + 1 - input.add_list_property('property_list_int', [1, 2, 3]) + action.add_list_property('property_list_int', [1, 2, 3]) info('property: has_property = %s [%s]' % - (yes_no(input.hasProperty('property_list_int')), str(input.property_list_int.__class__),)) - info('property: property_list_int = %s' % (str(input.property_list_int),)) - input.property_list_int = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0] - info('property: property_list_int = %s' % (str(input.property_list_int),)) - if input.hasProperty('property_list_int'): + (yes_no(action.hasProperty('property_list_int')), str(action.property_list_int.__class__),)) + info('property: property_list_int = %s' % (str(action.property_list_int),)) + action.property_list_int = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0] + info('property: property_list_int = %s' % (str(action.property_list_int),)) + if action.hasProperty('property_list_int'): num_tests = num_tests + 1 - input.add_set_property('property_set_int', [1, 2, 3]) + action.add_set_property('property_set_int', [1, 2, 3]) info('property: has_property = %s [%s]' % - (yes_no(input.hasProperty('property_set_int')), str(input.property_set_int.__class__),)) - info('property: property_set_int = %s' % (str(input.property_set_int),)) - input.property_set_int = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0] - info('property: property_set_int = %s' % (str(input.property_set_int),)) - if input.hasProperty('property_set_int'): + (yes_no(action.hasProperty('property_set_int')), str(action.property_set_int.__class__),)) + info('property: property_set_int = %s' % (str(action.property_set_int),)) + action.property_set_int = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0] + info('property: property_set_int = %s' % (str(action.property_set_int),)) + if action.hasProperty('property_set_int'): num_tests = num_tests + 1 - input.add_property('property_double', 1.0) + action.add_property('property_double', 1.0) info('property: has_property = %s [%s]' % - (yes_no(input.hasProperty('property_double')), str(input.property_double.__class__),)) - info('property: property_double = %s' % (str(input.property_double),)) - input.property_double = 123456.7 - info('property: property_double = %s' % (str(input.property_double),)) - if input.hasProperty('property_double'): + (yes_no(action.hasProperty('property_double')), str(action.property_double.__class__),)) + info('property: property_double = %s' % (str(action.property_double),)) + action.property_double = 123456.7 + info('property: property_double = %s' % (str(action.property_double),)) + if action.hasProperty('property_double'): num_tests = num_tests + 1 - input.add_vector_property('property_vector_double', [1.1, 2, 3]) + action.add_vector_property('property_vector_double', [1.1, 2, 3]) info('property: has_property = %s [%s]' % - (yes_no(input.hasProperty('property_vector_double')), str(input.property_vector_double.__class__),)) - info('property: property_vector_double = %s' % (str(input.property_vector_double),)) - input.property_vector_double = [1.5, 2, 3, 4, 5, 6, 7, 8, 9, 0] - info('property: property_vector_double = %s' % (str(input.property_vector_double),)) - if input.hasProperty('property_vector_double'): + (yes_no(action.hasProperty('property_vector_double')), str(action.property_vector_double.__class__),)) + info('property: property_vector_double = %s' % (str(action.property_vector_double),)) + action.property_vector_double = [1.5, 2, 3, 4, 5, 6, 7, 8, 9, 0] + info('property: property_vector_double = %s' % (str(action.property_vector_double),)) + if action.hasProperty('property_vector_double'): num_tests = num_tests + 1 - input.add_list_property('property_list_double', [1.1, 2, 3]) + action.add_list_property('property_list_double', [1.1, 2, 3]) info('property: has_property = %s [%s]' % - (yes_no(input.hasProperty('property_list_double')), str(input.property_list_double.__class__), )) - info('property: property_list_double = %s' % (str(input.property_list_double),)) - input.property_list_double = [1.5, 2, 3, 4, 5, 6, 7, 8, 9, 0] - info('property: property_list_double = %s' % (str(input.property_list_double),)) - if input.hasProperty('property_list_double'): + (yes_no(action.hasProperty('property_list_double')), str(action.property_list_double.__class__), )) + info('property: property_list_double = %s' % (str(action.property_list_double),)) + action.property_list_double = [1.5, 2, 3, 4, 5, 6, 7, 8, 9, 0] + info('property: property_list_double = %s' % (str(action.property_list_double),)) + if action.hasProperty('property_list_double'): num_tests = num_tests + 1 - input.add_set_property('property_set_double', [1.1, 2, 3]) + action.add_set_property('property_set_double', [1.1, 2, 3]) info('property: has_property = %s [%s]' % - (yes_no(input.hasProperty('property_set_double')), str(input.property_set_double.__class__),)) - info('property: property_set_double = %s' % (str(input.property_set_double),)) - input.property_set_double = [1.5, 2, 3, 4, 5, 6, 7, 8, 9, 0] - info('property: property_set_double = %s' % (str(input.property_set_double),)) - if input.hasProperty('property_set_double'): + (yes_no(action.hasProperty('property_set_double')), str(action.property_set_double.__class__),)) + info('property: property_set_double = %s' % (str(action.property_set_double),)) + action.property_set_double = [1.5, 2, 3, 4, 5, 6, 7, 8, 9, 0] + info('property: property_set_double = %s' % (str(action.property_set_double),)) + if action.hasProperty('property_set_double'): num_tests = num_tests + 1 - input.add_property('property_string', "string_1") + action.add_property('property_string', "string_1") info('property: has_property = %s [%s]' % - (yes_no(input.hasProperty('property_string')), str(input.property_string.__class__),)) - info('property: property_string = %s' % (input.property_string,)) - input.property_string = "string_1123456" - info('property: property_string = %s' % (input.property_string,)) - if input.hasProperty('property_string'): + (yes_no(action.hasProperty('property_string')), str(action.property_string.__class__),)) + info('property: property_string = %s' % (action.property_string,)) + action.property_string = "string_1123456" + info('property: property_string = %s' % (action.property_string,)) + if action.hasProperty('property_string'): num_tests = num_tests + 1 - input.add_vector_property('property_vector_string', ["string1", "string2", "string3"]) + action.add_vector_property('property_vector_string', ["string1", "string2", "string3"]) info('property: has_property = %s [%s]' % - (yes_no(input.hasProperty('property_vector_string')), str(input.property_vector_string.__class__),)) - info('property: property_vector_string = %s' % (input.property_vector_string,)) - input.property_vector_string = ["string1", "string2", "string3", "string4", "string5", "string6"] - info('property: property_vector_string = %s' % (input.property_vector_string,)) - if input.hasProperty('property_vector_string'): + (yes_no(action.hasProperty('property_vector_string')), str(action.property_vector_string.__class__),)) + info('property: property_vector_string = %s' % (action.property_vector_string,)) + action.property_vector_string = ["string1", "string2", "string3", "string4", "string5", "string6"] + info('property: property_vector_string = %s' % (action.property_vector_string,)) + if action.hasProperty('property_vector_string'): num_tests = num_tests + 1 - input.add_position_property('property_position', (1., 2., 3.)) + action.add_position_property('property_position', (1., 2., 3.)) info('property: has_property = %s [%s]' % - (yes_no(input.hasProperty('property_position')), str(input.property_position.__class__),)) - info('property: property_position = %s' % (input.property_position,)) - input.property_position = (111.1, 222.2, 333.3) - info('property: property_position = %s' % (input.property_position,)) - if input.hasProperty('property_position'): + (yes_no(action.hasProperty('property_position')), str(action.property_position.__class__),)) + info('property: property_position = %s' % (action.property_position,)) + action.property_position = (111.1, 222.2, 333.3) + info('property: property_position = %s' % (action.property_position,)) + if action.hasProperty('property_position'): num_tests = num_tests + 1 info('We checked %d properties interactions.' % (num_tests,)) diff --git a/examples/DDDigi/scripts/TestResegmentation.py b/examples/DDDigi/scripts/TestResegmentation.py index 7642d0a5e35182783df0fff4705f804eb7ae91cc..3833e4895ce1aa7e179e5af6785f3e96cd264b1b 100644 --- a/examples/DDDigi/scripts/TestResegmentation.py +++ b/examples/DDDigi/scripts/TestResegmentation.py @@ -15,10 +15,12 @@ def run(): import DigiTest digi = DigiTest.Test(geometry=None) digi.load_geo() - input = digi.input_action('DigiParallelActionSequence/READER') + input_action = digi.input_action('DigiParallelActionSequence/READER') # ======================================================================== digi.info('Created SIGNAL input') - signal = input.adopt_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()]) + signal = input_action.adopt_action('DigiDDG4ROOT/SignalReader', + mask=0x0, + input=[digi.next_input()]) digi.check_creation([signal]) # ======================================================================== event = digi.event_action('DigiSequentialActionSequence/EventAction') diff --git a/examples/DDDigi/scripts/TestSegmentationSplit.py b/examples/DDDigi/scripts/TestSegmentationSplit.py index cacf78767d5948d712292a9f4a86068e08c03b64..d4e681b843ab3bda6b4b4b9a7951cddac02dc152 100644 --- a/examples/DDDigi/scripts/TestSegmentationSplit.py +++ b/examples/DDDigi/scripts/TestSegmentationSplit.py @@ -23,10 +23,12 @@ def run(): import DigiTest digi = DigiTest.Test(geometry=None) digi.load_geo() - input = digi.input_action('DigiParallelActionSequence/READER') + input_action = digi.input_action('DigiParallelActionSequence/READER') # ======================================================================== digi.info('Created SIGNAL input') - signal = input.adopt_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()]) + signal = input_action.adopt_action('DigiDDG4ROOT/SignalReader', + mask=0x0, + input=[digi.next_input()]) digi.check_creation([signal]) # ======================================================================== event = digi.event_action('DigiSequentialActionSequence/EventAction') diff --git a/examples/DDDigi/scripts/TestSegmentationSplit2.py b/examples/DDDigi/scripts/TestSegmentationSplit2.py index 1dba594a92348297c15cd7de5e7cb5a36c525860..722c715f628d6e8f9e8672311392fff7824f0432 100644 --- a/examples/DDDigi/scripts/TestSegmentationSplit2.py +++ b/examples/DDDigi/scripts/TestSegmentationSplit2.py @@ -15,10 +15,12 @@ def run(): import DigiTest digi = DigiTest.Test(geometry=None) digi.load_geo() - input = digi.input_action('DigiParallelActionSequence/READER') + input_action = digi.input_action('DigiParallelActionSequence/READER') # ======================================================================== digi.info('Created SIGNAL input') - signal = input.adopt_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()]) + signal = input_action.adopt_action('DigiDDG4ROOT/SignalReader', + mask=0x0, + input=[digi.next_input()]) digi.check_creation([signal]) # ======================================================================== event = digi.event_action('DigiSequentialActionSequence/EventAction') diff --git a/examples/DDDigi/scripts/TestSimpleADCResponse.py b/examples/DDDigi/scripts/TestSimpleADCResponse.py index 479cc34f98ca6772cf8c09a0b76ff11c40d44c19..7ced20d65d46e5c1145a662379428ca0919d81b4 100644 --- a/examples/DDDigi/scripts/TestSimpleADCResponse.py +++ b/examples/DDDigi/scripts/TestSimpleADCResponse.py @@ -16,8 +16,8 @@ def run(): digi = DigiTest.Test(geometry=None) # ======================================================================================================== - input = digi.input_action('DigiSequentialActionSequence/READER') - input.adopt_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()]) + input_action = digi.input_action('DigiSequentialActionSequence/READER') + input_action.adopt_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()]) # ======================================================================================================== event = digi.event_action('DigiSequentialActionSequence/EventAction') event.adopt_action('DigiStoreDump/DumpInput')