From e915b77ae8e3eaeb0ff9f3696986fbc8193919f7 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Fri, 16 Dec 2016 19:01:53 +0100
Subject: [PATCH] 'More root 6.08 fixes.' (PyDumper-00-01-97)
* Tagging PyDumper-00-01-97.
* python/Dumpers.py: More root 6.08 fixes.
2016-12-10 scott snyder <snyder@bnl.gov>
* Tagging PyDumper-00-01-96.
* Add xAOD::ForwardEventInfoContainer, xAOD::MBTSModuleContainer,
xAOD::ZdcModuleContainer, xAOD::TrigRingerRingsContainer_v2.
* Need to explicitly install headers from the cmake file.
---
Event/PyDumper/CMakeLists.txt | 5 ++++-
Event/PyDumper/python/Dumpers.py | 15 ++++++++++-----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/Event/PyDumper/CMakeLists.txt b/Event/PyDumper/CMakeLists.txt
index 0c4ac602b5c..baff1560753 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 d862e425af1..819f2962ec4 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],
--
GitLab