Skip to content
Snippets Groups Projects
Commit 3e96d30d authored by John Chapman's avatar John Chapman
Browse files

Fix G4AtlasApps configuration unit tests

`test_AtlasG4_cosmics_configuration.py` and `test_TestBeam_tf_configuration.py`
have been updated to take into account the fact that
`xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg` has been added to
the start of the AlgSequence of all jobs which generate events on-the-fly.
parent 06dd55c6
No related branches found
No related tags found
No related merge requests found
...@@ -113,7 +113,7 @@ class TestAtlasG4Cosmics(unittest.TestCase): ...@@ -113,7 +113,7 @@ class TestAtlasG4Cosmics(unittest.TestCase):
ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members'] ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
# need to evaluate to obtain actual Python object # need to evaluate to obtain actual Python object
ath_alg_seqence_list = eval(ath_alg_seqence_as_str) ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[0] actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[1] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now.
expected_last_ath_alg_sequence_entry = "CosmicGenerator/CosmicGenerator" expected_last_ath_alg_sequence_entry = "CosmicGenerator/CosmicGenerator"
self.assertEqual(expected_last_ath_alg_sequence_entry, self.assertEqual(expected_last_ath_alg_sequence_entry,
actual_last_ath_alg_sequence_entry) actual_last_ath_alg_sequence_entry)
...@@ -198,7 +198,7 @@ class TestAtlasG4Cosmics(unittest.TestCase): ...@@ -198,7 +198,7 @@ class TestAtlasG4Cosmics(unittest.TestCase):
ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members'] ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
# need to evaluate to obtain actual Python object # need to evaluate to obtain actual Python object
ath_alg_seqence_list = eval(ath_alg_seqence_as_str) ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[2] # Position 1 is the Sim Timer Alg 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
expected_last_ath_alg_sequence_entry = "Simulation::BeamEffectsAlg/BeamEffectsAlg" expected_last_ath_alg_sequence_entry = "Simulation::BeamEffectsAlg/BeamEffectsAlg"
self.assertEqual(expected_last_ath_alg_sequence_entry, self.assertEqual(expected_last_ath_alg_sequence_entry,
actual_last_ath_alg_sequence_entry) actual_last_ath_alg_sequence_entry)
......
...@@ -107,7 +107,7 @@ class TestTestBeam(unittest.TestCase): ...@@ -107,7 +107,7 @@ class TestTestBeam(unittest.TestCase):
ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members'] ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
# need to evaluate to obtain actual Python object # need to evaluate to obtain actual Python object
ath_alg_seqence_list = eval(ath_alg_seqence_as_str) ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[0] actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[1] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
expected_last_ath_alg_sequence_entry = "PyAthena::Alg/ParticleGun" expected_last_ath_alg_sequence_entry = "PyAthena::Alg/ParticleGun"
self.assertEqual(expected_last_ath_alg_sequence_entry, self.assertEqual(expected_last_ath_alg_sequence_entry,
actual_last_ath_alg_sequence_entry) actual_last_ath_alg_sequence_entry)
...@@ -117,7 +117,7 @@ class TestTestBeam(unittest.TestCase): ...@@ -117,7 +117,7 @@ class TestTestBeam(unittest.TestCase):
ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members'] ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
# need to evaluate to obtain actual Python object # need to evaluate to obtain actual Python object
ath_alg_seqence_list = eval(ath_alg_seqence_as_str) ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[1] actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[2] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
expected_last_ath_alg_sequence_entry = "CopyEventWeight/CopyEventWeight" expected_last_ath_alg_sequence_entry = "CopyEventWeight/CopyEventWeight"
self.assertEqual(expected_last_ath_alg_sequence_entry, self.assertEqual(expected_last_ath_alg_sequence_entry,
actual_last_ath_alg_sequence_entry) actual_last_ath_alg_sequence_entry)
...@@ -127,7 +127,7 @@ class TestTestBeam(unittest.TestCase): ...@@ -127,7 +127,7 @@ class TestTestBeam(unittest.TestCase):
ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members'] ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
# need to evaluate to obtain actual Python object # need to evaluate to obtain actual Python object
ath_alg_seqence_list = eval(ath_alg_seqence_as_str) ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[2] actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[3] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
expected_last_ath_alg_sequence_entry = "Simulation::BeamEffectsAlg/BeamEffectsAlg" expected_last_ath_alg_sequence_entry = "Simulation::BeamEffectsAlg/BeamEffectsAlg"
self.assertEqual(expected_last_ath_alg_sequence_entry, self.assertEqual(expected_last_ath_alg_sequence_entry,
actual_last_ath_alg_sequence_entry) actual_last_ath_alg_sequence_entry)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment