From f9f0bed4986ecde74e2ae858288d98a406f5d69e Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch> Date: Fri, 25 Sep 2020 15:59:00 +0200 Subject: [PATCH] Fixed the standalone tests of TriggerAnalysisAlgorithms. Since the package is not included in the Athena project (yet), I did not bother with the Athena tests for now. --- .../Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt | 3 --- .../share/TriggerAlgorithmsTest_eljob.py | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt index 25126a762396..c46755354baa 100644 --- a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt +++ b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt @@ -27,9 +27,6 @@ atlas_install_joboptions( share/*_jobOptions.py ) atlas_install_scripts( share/*_eljob.py ) if( XAOD_STANDALONE ) - # FIX ME: temporarily disabled as part of the migration of AnalysisBase - # to master - atlas_add_test( TriggerAlgorithmsTestJobData SCRIPT TriggerAlgorithmsTest_eljob.py --data-type data --unit-test PROPERTIES TIMEOUT 600 ) diff --git a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/share/TriggerAlgorithmsTest_eljob.py b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/share/TriggerAlgorithmsTest_eljob.py index 4ac99cd0b355..9dfbaa71e841 100755 --- a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/share/TriggerAlgorithmsTest_eljob.py +++ b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/share/TriggerAlgorithmsTest_eljob.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # # @author Tadej Novak @@ -24,6 +24,11 @@ parser.add_option( '-u', '--unit-test', dest='unit_test', import ROOT ROOT.xAOD.Init().ignore() +# Force-load some xAOD dictionaries. To avoid issues from ROOT-10940. +ROOT.xAOD.CaloClusterContainer() +ROOT.xAOD.MuonContainer() +ROOT.xAOD.TauJetContainer() + # ideally we'd run over all of them, but we don't have a mechanism to # configure per-sample right now -- GitLab