From f370021c814bbb81c1aebc204e0e54e48e6042dc Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Wed, 12 Aug 2020 13:38:45 +0200
Subject: [PATCH] Migrate Event/xAOD/xAODTauAthenaPool/ TPCnv unit tests to
ComponentAccumulator xAODTauAthenaPool_20.1.7.2_test - passes
xAODTauAthenaPool_20.7.2.2_test - passes xAODTauAthenaPool_21.0.79_test -
passes (reference file updated)
---
Event/xAOD/xAODTauAthenaPool/CMakeLists.txt | 7 +++---
.../share/xAODTauAthenaPool_21.0.79.ref | 2 --
.../test/xAODTauAthenaPool_20.1.7.2_test.py | 18 ++++++++++++++
.../test/xAODTauAthenaPool_20.7.2.2_test.py | 21 ++++++++++++++++
.../test/xAODTauAthenaPool_21.0.79_test.py | 24 +++++++++++++++++++
5 files changed, 67 insertions(+), 5 deletions(-)
create mode 100755 Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.1.7.2_test.py
create mode 100755 Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.7.2.2_test.py
create mode 100755 Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_21.0.79_test.py
diff --git a/Event/xAOD/xAODTauAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTauAthenaPool/CMakeLists.txt
index 3b1b0bb386c..1d4422522e1 100644
--- a/Event/xAOD/xAODTauAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTauAthenaPool/CMakeLists.txt
@@ -18,6 +18,7 @@ atlas_add_poolcnv_library( xAODTauAthenaPoolPoolCnv
# Install files from the package.
atlas_install_joboptions( share/*.py )
+atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
find_package( AthenaPoolUtilitiesTest )
@@ -25,13 +26,13 @@ find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND )
set( XAODTAUATHENAPOOL_REFERENCE_TAG
xAODTauAthenaPoolReference-01-01-00 )
- run_tpcnv_legacy_test( xAODTauAthenaPool_20.1.7.2 AOD-20.1.7.2-full
+ run_tpcnv_test( xAODTauAthenaPool_20.1.7.2 AOD-20.1.7.2-full
REQUIRED_LIBRARIES xAODTauAthenaPoolPoolCnv
REFERENCE_TAG ${XAODTAUATHENAPOOL_REFERENCE_TAG} )
- run_tpcnv_legacy_test( xAODTauAthenaPool_20.7.2.2 AOD-20.7.2.2-full
+ run_tpcnv_test( xAODTauAthenaPool_20.7.2.2 AOD-20.7.2.2-full
REQUIRED_LIBRARIES xAODTauAthenaPoolPoolCnv
REFERENCE_TAG ${XAODTAUATHENAPOOL_REFERENCE_TAG} )
- run_tpcnv_legacy_test( xAODTauAthenaPool_21.0.79 AOD-21.0.79-full
+ run_tpcnv_test( xAODTauAthenaPool_21.0.79 AOD-21.0.79-full
REQUIRED_LIBRARIES xAODTauAthenaPoolPoolCnv
REFERENCE_TAG ${XAODTAUATHENAPOOL_REFERENCE_TAG} )
else()
diff --git a/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_21.0.79.ref b/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_21.0.79.ref
index 84a6ee1d93b..5ebc7ba4e08 100644
--- a/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_21.0.79.ref
+++ b/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_21.0.79.ref
@@ -510,8 +510,6 @@ IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] C634B46D-ECB2-A045-91CC-00A82369D887
Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000070.gen.COND/cond12_data.000029.gen.COND._0001.pool.root
RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000070.gen.COND/cond12_data.000029.gen.COND._0001.pool.root File version:53005
-PixelDetectorMa...WARNING Cannot set AlignableTransform for identifier [2.1.0.0.0.-4.256.0] at level 2
-PixelDetectorMa...WARNING Subsequent WARNINGS will be printed at DEBUG level.
PixelDetectorMa... INFO Processing IBLDist alignment container with key (/Indet/IBLDist) and alignment folder pointing to /Indet/Align
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] D67CA215-C5CB-DF11-954C-000423DC2158
Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000019.gen.COND/cond09_mc.000019.gen.COND._0010.pool.root
diff --git a/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.1.7.2_test.py
new file mode 100755
index 00000000000..8b2bbfeb047
--- /dev/null
+++ b/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.1.7.2_test.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+
+ infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
+ keys = [
+ #xAOD::TauJetAuxContainer
+ 'HLT_xAOD__TauJetContainer_TrigTauRecMerged',
+ 'HLT_xAOD__TauJetContainer_TrigTauRecPreselection',
+ 'TauJets',
+ ]
+
+ TPCnvTest(infile, keys)
diff --git a/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.7.2.2_test.py b/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.7.2.2_test.py
new file mode 100755
index 00000000000..dae8e87fa0d
--- /dev/null
+++ b/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.7.2.2_test.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+
+ infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root'
+ keys = [
+ #xAOD::DiTauJetAuxContainer_v1
+ 'DiTauJets',
+
+ #xAOD::TauJetAuxContainer_v2
+ 'HLT_xAOD__TauJetContainer_TrigTauRecMerged',
+ 'HLT_xAOD__TauJetContainer_TrigTauRecPreselection',
+ 'TauJets',
+ ]
+
+ TPCnvTest(infile, keys)
diff --git a/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_21.0.79_test.py
new file mode 100755
index 00000000000..a65bbb30733
--- /dev/null
+++ b/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_21.0.79_test.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+
+ infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
+ keys = [
+ #xAOD::DiTauJetAuxContainer_v1
+ 'DiTauJets',
+
+ #xAOD::TauJetAuxContainer_v3
+ 'HLT_xAOD__TauJetContainer_TrigTauRecMerged',
+ 'HLT_xAOD__TauJetContainer_TrigTauRecPreselection',
+ 'TauJets',
+
+ #xAOD::TauTrackAuxContainer_v1
+ 'TauTracks',
+ ]
+
+ TPCnvTest(infile, keys)
--
GitLab