Skip to content
Snippets Groups Projects
Commit 98804cd4 authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

Merge branch 'typo.G4AtlasApps-20190214' into 'master' 

G4AtlasApps: Fix some spelling errors in identifier names.

See merge request atlas/athena!21128
parents a9a6908a 5db88722
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Simulation/G4Atlas/G4AtlasApps/test/test_AtlasG4_cosmics_configuration.py
+ 9
− 9
View file @ 98804cd4
......@@ -110,10 +110,10 @@ class TestAtlasG4Cosmics(unittest.TestCase):
def test___CosmicGenerator_is_at_start_of_AthAlgSeq(self):
ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
ath_alg_sequence_as_str = self._job_config_dict['AthAlgSeq']['Members']
# need to evaluate to obtain actual Python object
ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[1] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now.
ath_alg_sequence_list = eval(ath_alg_sequence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_sequence_list[1] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now.
expected_last_ath_alg_sequence_entry = "CosmicGenerator/CosmicGenerator"
self.assertEqual(expected_last_ath_alg_sequence_entry,
actual_last_ath_alg_sequence_entry)
......@@ -195,10 +195,10 @@ class TestAtlasG4Cosmics(unittest.TestCase):
def test___BeamEffectsAlg_is_before_G4AtlasAlg_in_AthAlgSeq(self):
ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
ath_alg_sequence_as_str = self._job_config_dict['AthAlgSeq']['Members']
# need to evaluate to obtain actual Python object
ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[3] # Position 1 is the Sim Timer Alg, xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
ath_alg_sequence_list = eval(ath_alg_sequence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_sequence_list[3] # Position 1 is the Sim Timer Alg, xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
expected_last_ath_alg_sequence_entry = "Simulation::BeamEffectsAlg/BeamEffectsAlg"
self.assertEqual(expected_last_ath_alg_sequence_entry,
actual_last_ath_alg_sequence_entry)
......@@ -225,10 +225,10 @@ class TestAtlasG4Cosmics(unittest.TestCase):
def test___G4AtlasAlg_is_at_end_of_AthAlgSeq(self):
ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
ath_alg_sequence_as_str = self._job_config_dict['AthAlgSeq']['Members']
# need to evaluate to obtain actual Python object
ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[-1]
ath_alg_sequence_list = eval(ath_alg_sequence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_sequence_list[-1]
expected_last_ath_alg_sequence_entry = "G4AtlasAlg/G4AtlasAlg"
self.assertEqual(expected_last_ath_alg_sequence_entry,
actual_last_ath_alg_sequence_entry)
......
Simulation/G4Atlas/G4AtlasApps/test/test_TestBeam_tf_configuration.py
+ 12
− 12
View file @ 98804cd4
......@@ -104,30 +104,30 @@ class TestTestBeam(unittest.TestCase):
def test___ParticleGun_is_before_CopyEventWeight_in_AthAlgSeq(self):
ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
ath_alg_sequence_as_str = self._job_config_dict['AthAlgSeq']['Members']
# need to evaluate to obtain actual Python object
ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[1] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
ath_alg_sequence_list = eval(ath_alg_sequence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_sequence_list[1] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
expected_last_ath_alg_sequence_entry = "PyAthena::Alg/ParticleGun"
self.assertEqual(expected_last_ath_alg_sequence_entry,
actual_last_ath_alg_sequence_entry)
def test___CopyEventWeight_is_before_BeamEffectsAlg_in_AthAlgSeq(self):
ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
ath_alg_sequence_as_str = self._job_config_dict['AthAlgSeq']['Members']
# need to evaluate to obtain actual Python object
ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[2] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
ath_alg_sequence_list = eval(ath_alg_sequence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_sequence_list[2] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
expected_last_ath_alg_sequence_entry = "CopyEventWeight/CopyEventWeight"
self.assertEqual(expected_last_ath_alg_sequence_entry,
actual_last_ath_alg_sequence_entry)
def test___BeamEffectsAlg_is_before_G4AtlasAlg_in_AthAlgSeq(self):
ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
ath_alg_sequence_as_str = self._job_config_dict['AthAlgSeq']['Members']
# need to evaluate to obtain actual Python object
ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[3] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
ath_alg_sequence_list = eval(ath_alg_sequence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_sequence_list[3] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
expected_last_ath_alg_sequence_entry = "Simulation::BeamEffectsAlg/BeamEffectsAlg"
self.assertEqual(expected_last_ath_alg_sequence_entry,
actual_last_ath_alg_sequence_entry)
......@@ -159,11 +159,11 @@ class TestTestBeam(unittest.TestCase):
def test___G4AtlasAlg_is_at_end_of_AthAlgSeq(self):
ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
ath_alg_sequence_as_str = self._job_config_dict['AthAlgSeq']['Members']
# need to evaluate to obtain actual Python object
ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
ath_alg_sequence_list = eval(ath_alg_sequence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[-1]
actual_last_ath_alg_sequence_entry = ath_alg_sequence_list[-1]
expected_last_ath_alg_sequence_entry = "G4AtlasAlg/G4AtlasAlg"
self.assertEqual(expected_last_ath_alg_sequence_entry,
actual_last_ath_alg_sequence_entry)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment