From 06bbfe8194875a7db9b45e821f3c71119c633f4c Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Mon, 10 Jul 2023 14:31:13 +0200
Subject: [PATCH] Digitization unit tests: Fall back to old expected
configuration for HepMC2-based nightlies
test_MC16a_Digi_tf_configuration.py: Fall back to old expected configuration for HepMC2-based nightlies (ATLASSIM-6646)
---
.../test/test_MC16a_Digi_tf_configuration.py | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/Simulation/Digitization/test/test_MC16a_Digi_tf_configuration.py b/Simulation/Digitization/test/test_MC16a_Digi_tf_configuration.py
index 60366a26e18f..e8bdb3a4b607 100755
--- a/Simulation/Digitization/test/test_MC16a_Digi_tf_configuration.py
+++ b/Simulation/Digitization/test/test_MC16a_Digi_tf_configuration.py
@@ -7,6 +7,13 @@ import unittest
import os
import six
+def HepMCVersion():
+ try:
+ from AthenaPython.PyAthena import HepMC3 # noqa: F401
+ HepMCVersion=3
+ except ImportError:
+ HepMCVersion=2
+ return HepMCVersion
class TestDigitizationMC16a(unittest.TestCase):
@@ -173,6 +180,8 @@ class TestDigitizationMC16a(unittest.TestCase):
def test___StandardSignalOnlyTruthPileUpToolsAlg_PileUpTools(self):
expected_PileUpTools = ['SimpleMergeMcEventCollTool/SignalOnlyMcEventCollTool','MergeTruthJetsTool/MergeAntiKt4TruthJetsTool','MergeTruthJetsTool/MergeAntiKt6TruthJetsTool','MergeTrackRecordCollTool/MergeMuonEntryLayerTool','MergeCalibHitsTool/MergeCalibHitsTool','BCM_DigitizationTool/BCM_DigitizationTool','PixelDigitizationTool/PixelDigitizationTool','SCT_DigitizationTool/SCT_DigitizationTool','TRTDigitizationTool/TRTDigitizationTool','LArPileUpTool/LArPileUpTool','TileHitVecToCntTool/TileHitVecToCntTool','CscDigitizationTool/CscDigitizationTool','MdtDigitizationTool/MdtDigitizationTool','RpcDigitizationTool/RpcDigitizationTool','TgcDigitizationTool/TgcDigitizationTool']
+ if HepMCVersion() == 2:
+ expected_PileUpTools = ['MergeMcEventCollTool/SignalOnlyMcEventCollTool','MergeTruthJetsTool/MergeAntiKt4TruthJetsTool','MergeTruthJetsTool/MergeAntiKt6TruthJetsTool','MergeTrackRecordCollTool/MergeMuonEntryLayerTool','MergeCalibHitsTool/MergeCalibHitsTool','BCM_DigitizationTool/BCM_DigitizationTool','PixelDigitizationTool/PixelDigitizationTool','SCT_DigitizationTool/SCT_DigitizationTool','TRTDigitizationTool/TRTDigitizationTool','LArPileUpTool/LArPileUpTool','TileHitVecToCntTool/TileHitVecToCntTool','CscDigitizationTool/CscDigitizationTool','MdtDigitizationTool/MdtDigitizationTool','RpcDigitizationTool/RpcDigitizationTool','TgcDigitizationTool/TgcDigitizationTool']
self._assert_Algorithm_property_unordered_equal(
'StandardSignalOnlyTruthPileUpToolsAlg',
'PileUpTools',
@@ -232,6 +241,9 @@ class TestDigitizationMC16a(unittest.TestCase):
expected_property_list = ['TruthCollInputKey', 'TruthCollOutputKey', 'OnlySaveSignalTruth', 'OverrideEventNumbers', 'PileUpMergeSvc', 'ExtraOutputs', 'LastXing', 'ExtraInputs', 'DetStore', 'FirstXing', 'EvtStore']
expected_nonstring_properties = {'ExtraOutputs': '[]', 'LastXing': '0', 'OverrideEventNumbers': 'True', 'ExtraInputs': '[]', 'FirstXing': '0'}
expected_string_properties = {'TruthCollInputKey': 'TruthEvent', 'TruthCollOutputKey': 'TruthEvent'}
+ if HepMCVersion() == 2:
+ expected_property_list = ['KeepUnstable', 'SaveInTimeMinBias', 'AddBackgroundCollisionVertices', 'zRange', 'TruthCollInputKey', 'TruthCollOutputKey', 'OnlySaveSignalTruth', 'OutOfTimeAbsEtaMax', 'PileUpMergeSvc', 'rRange', 'CompressOutputCollection', 'ExtraOutputs', 'AbsEtaMax', 'LastXing', 'SaveOutOfTimeMinBias', 'ExtraInputs', 'DetStore', 'SaveCavernBackground', 'FirstXing', 'SaveRestOfMinBias', 'EvtStore', 'HighTimeToKeep', 'LowTimeToKeep']
+ expected_nonstring_properties = {'KeepUnstable': 'False', 'SaveInTimeMinBias': 'True', 'AddBackgroundCollisionVertices': 'True', 'zRange': '200.0', 'OnlySaveSignalTruth': 'True', 'OutOfTimeAbsEtaMax': '3.0', 'rRange': '20.0', 'CompressOutputCollection': 'False', 'ExtraOutputs': '[]', 'AbsEtaMax': '5.0', 'LastXing': '0', 'SaveOutOfTimeMinBias': 'True', 'ExtraInputs': '[]', 'SaveCavernBackground': 'True', 'FirstXing': '0', 'SaveRestOfMinBias': 'False', 'HighTimeToKeep': '50.5', 'LowTimeToKeep': '-50.5'}
self._detailed_ConfigurablePropertiesCheck(
tested_configurable_name,
expected_property_list,
--
GitLab