diff --git a/Event/PyDumper/CMakeLists.txt b/Event/PyDumper/CMakeLists.txt
index 0c4ac602b5c24c2e928ebf15353b027c105abc9a..baff1560753d18716efaab4b9d1c65a52c51bb71 100644
--- a/Event/PyDumper/CMakeLists.txt
+++ b/Event/PyDumper/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 782292 2016-11-04 08:51:36Z krasznaa $
+# $Id: CMakeLists.txt 789091 2016-12-10 05:10:19Z ssnyder $
################################################################################
# Package: PyDumper
################################################################################
@@ -11,6 +11,9 @@ atlas_depends_on_subdirs(
PUBLIC
Control/AthContainers )
+# Cling needs to be able to see the headers.
+atlas_install_headers( PyDumper )
+
# Component(s) in the package:
atlas_add_dictionary( PyDumperDictDict
PyDumper/PyDumperDict.h
diff --git a/Event/PyDumper/python/Dumpers.py b/Event/PyDumper/python/Dumpers.py
index d862e425af1f92d7c9fc9c78990aeaaaabceda49..819f2962ec4e4ce8a29211e46be2c60b1e137728 100644
--- a/Event/PyDumper/python/Dumpers.py
+++ b/Event/PyDumper/python/Dumpers.py
@@ -118,11 +118,9 @@ def daz(f):
# For root 6.08, need to use __cppname__ rather than __name__
-# for the name of a type.
-if hasattr(ROOT.TH1, '__cppname__'):
- def typename(t): return t.__cppname__
-else:
- def typename(t): return t.__name__
+# for the name of a type if it's there.
+def typename(t):
+ return getattr (t, '__cppname__', t.__name__)
### library methods ------------------------------------------------------------
@@ -4927,6 +4925,7 @@ dumpspecs = [
['DataVector<xAOD::TrigRNNOutput_v2>', dump_xAOD],
['xAOD::TrigRNNOutputContainer', dump_xAOD],
['DataVector<xAOD::TrigRingerRings_v1>', dump_xAOD],
+ ['DataVector<xAOD::TrigRingerRings_v2>', dump_xAOD],
['xAOD::TrigRingerRingsContainer', dump_xAOD],
['DataVector<xAOD::TrigSpacePointCounts_v1>',dump_xAOD],
['xAOD::TrigSpacePointCountsContainer', dump_xAOD],
@@ -4963,6 +4962,12 @@ dumpspecs = [
['xAOD::CaloRingsContainer', dump_xAOD],
['DataVector<xAOD::RingSet_v1>', dump_xAOD],
['xAOD::RingSetContainer', dump_xAOD],
+ ['DataVector<xAOD::ForwardEventInfo_v1>',dump_xAOD],
+ ['xAOD::ForwardEventInfoContainer', dump_xAOD],
+ ['DataVector<xAOD::MBTSModule_v1>', dump_xAOD],
+ ['xAOD::MBTSModuleContainer', dump_xAOD],
+ ['DataVector<xAOD::ZdcModule_v1>', dump_xAOD],
+ ['xAOD::ZdcModuleContainer', dump_xAOD],
['xAOD::MissingETContainer_v1', dump_xAOD],
['xAOD::MissingETContainer', dump_xAOD],
['xAOD::MissingETComponentMap_v1', dump_xAOD],
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/CMakeLists.txt b/Trigger/TrigEvent/TrigEventAthenaPool/CMakeLists.txt
index 885d67c880095c29f48b2d5626c95f6715324de6..18b170facaf0dcac46776711e1380bb4407c36e4 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/CMakeLists.txt
@@ -54,12 +54,25 @@ endif()
find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND )
- run_tpcnv_test( TrigEventAthenaPool_15.6.1 ESD-15.6.1 )
- run_tpcnv_test( TrigEventAthenaPool_15.6.13.2 AOD-15.6.13.2-full )
- run_tpcnv_test( TrigEventAthenaPool_16.0.3.3 AOD-16.0.3.3-full )
- run_tpcnv_test( TrigEventAthenaPool_17.0.6 AOD-17.0.6-full )
- run_tpcnv_test( TrigEventAthenaPool_18.0.0 AOD-18.0.0-full )
- run_tpcnv_test( TrigEventAthenaPool_20.1.7.2 ESD-20.1.7.2 )
+ set( TRIGEVENTATHENAPOOL_REFERENCE_TAG
+ TrigEventAthenaPoolReference-01-00-00 )
+ run_tpcnv_test( TrigEventAthenaPool_15.6.1 ESD-15.6.1
+ REQUIRED_LIBRARIES TrackParticleAthenaPoolPoolCnv
+ REFERENCE_TAG ${TRIGEVENTATHENAPOOL_REFERENCE_TAG} )
+ run_tpcnv_test( TrigEventAthenaPool_15.6.13.2 AOD-15.6.13.2-full
+ REQUIRED_LIBRARIES TrackParticleAthenaPoolPoolCnv
+ REFERENCE_TAG ${TRIGEVENTATHENAPOOL_REFERENCE_TAG} )
+ run_tpcnv_test( TrigEventAthenaPool_16.0.3.3 AOD-16.0.3.3-full
+ REQUIRED_LIBRARIES TrackParticleAthenaPoolPoolCnv
+ REFERENCE_TAG ${TRIGEVENTATHENAPOOL_REFERENCE_TAG} )
+ run_tpcnv_test( TrigEventAthenaPool_17.0.6 AOD-17.0.6-full
+ REQUIRED_LIBRARIES TrackParticleAthenaPoolPoolCnv
+ REFERENCE_TAG ${TRIGEVENTATHENAPOOL_REFERENCE_TAG} )
+ run_tpcnv_test( TrigEventAthenaPool_18.0.0 AOD-18.0.0-full
+ REQUIRED_LIBRARIES TrackParticleAthenaPoolPoolCnv
+ REFERENCE_TAG ${TRIGEVENTATHENAPOOL_REFERENCE_TAG} )
+ run_tpcnv_test( TrigEventAthenaPool_20.1.7.2 ESD-20.1.7.2
+ REFERENCE_TAG ${TRIGEVENTATHENAPOOL_REFERENCE_TAG} )
else()
message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
endif()