Skip to content
Snippets Groups Projects
Commit 9b58009b authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

Made all (enabled) T/P converter tests succeed in AthAnalysis.

ROOT-10940 is hitting the AthAnalysis projects in this test, unlike
all the other projects weirdly enough.

At the same time also disabled some of the tests completely, as they
do not work correctly with the reduced EDM provided by AthAnalysis.
parent cbcfcc1a
No related branches found
No related tags found
No related merge requests found
Showing
with 84 additions and 0 deletions
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root' infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [ keys = [
#xAOD::BTaggingAuxContainer_v1 #xAOD::BTaggingAuxContainer_v1
......
...@@ -26,6 +26,12 @@ atlas_add_poolcnv_library( xAODCaloEventAthenaPoolPoolCnv ...@@ -26,6 +26,12 @@ atlas_add_poolcnv_library( xAODCaloEventAthenaPoolPoolCnv
atlas_install_joboptions( share/*.py ) atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# In AthAnalysis xAOD::CaloCluster doesn't know about its CaloCell link. Which
# makes the converter tests fail in that project...
if( XAOD_ANALYSIS )
return()
endif()
# Set up (a) test(s) for the converter(s): # Set up (a) test(s) for the converter(s):
find_package( AthenaPoolUtilitiesTest ) find_package( AthenaPoolUtilitiesTest )
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root' infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
keys = [ keys = [
#xAOD::CaloCluster #xAOD::CaloCluster
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root' infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [ keys = [
#xAOD::CaloCluster #xAOD::CaloCluster
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root' infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
keys = [ keys = [
#xAOD::ElectronAuxContainer #xAOD::ElectronAuxContainer
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root' infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [ keys = [
#xAOD::ElectronAuxContainer_v3 #xAOD::ElectronAuxContainer_v3
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root' infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root'
keys = [ keys = [
#xAOD::JetTrigAuxContainer_v2 #xAOD::JetTrigAuxContainer_v2
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root' infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [ keys = [
#xAOD::JetTrigAuxContainer_v2 #xAOD::JetTrigAuxContainer_v2
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root' infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
keys = [ keys = [
#xAOD::MissingETAssociationMap #xAOD::MissingETAssociationMap
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root' infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [ keys = [
#xAOD::MissingETAuxAssociationMap_v2 #xAOD::MissingETAuxAssociationMap_v2
......
...@@ -25,6 +25,12 @@ atlas_add_poolcnv_library( xAODMuonAthenaPoolPoolCnv ...@@ -25,6 +25,12 @@ atlas_add_poolcnv_library( xAODMuonAthenaPoolPoolCnv
atlas_install_joboptions( share/*.py ) atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# In AthAnalysis xAOD::Muon doesn't know about its MuonSegment link. Which
# makes the converter tests fail in that project...
if( XAOD_ANALYSIS )
return()
endif()
# Set up (a) test(s) for the converter(s): # Set up (a) test(s) for the converter(s):
find_package( AthenaPoolUtilitiesTest ) find_package( AthenaPoolUtilitiesTest )
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root' infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
keys = [ keys = [
#Muons... #Muons...
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root' infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root'
keys = [ keys = [
#xAOD::MuonAuxContainer_v2 #xAOD::MuonAuxContainer_v2
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-20.7.9.9/AOD-20.7.9.9-full.pool.root' infile = 'aod/AOD-20.7.9.9/AOD-20.7.9.9-full.pool.root'
keys = [ keys = [
#xAOD::MuonAuxContainer_v4 #xAOD::MuonAuxContainer_v4
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root' infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [ keys = [
#xAOD::MuonAuxContainer_v4 #xAOD::MuonAuxContainer_v4
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-master-20190911/AOD-master-20190911-full.pool.root' infile = 'aod/AOD-master-20190911/AOD-master-20190911-full.pool.root'
keys = [ keys = [
#xAOD::MuonAuxContainer_v5 #xAOD::MuonAuxContainer_v5
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root' infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [ keys = [
#xAOD::PFOAuxContainer_v1 #xAOD::PFOAuxContainer_v1
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root' infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [ keys = [
#xAOD::ParticleAuxContainer_v1 #xAOD::ParticleAuxContainer_v1
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root' infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
keys = [ keys = [
#xAOD::TauJetAuxContainer #xAOD::TauJetAuxContainer
......
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" """
import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__": if __name__ == "__main__":
# Force-load some dictionaries. Needed to work around ROOT-10940.
ROOT.xAOD.CaloCluster()
infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root' infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root'
keys = [ keys = [
#xAOD::DiTauJetAuxContainer_v1 #xAOD::DiTauJetAuxContainer_v1
......
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