From 7924b569f0ec307028097f2b1624b40cae2a7c60 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Wed, 25 Jul 2018 15:23:09 +0200
Subject: [PATCH] PyDumper: A few dumper fixes.

Add a few more xAOD types for dumping.
Fix dumping of vectors of 8-bit quantities.
---
 Event/PyDumper/python/Dumpers.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Event/PyDumper/python/Dumpers.py b/Event/PyDumper/python/Dumpers.py
index 215e1c3849d..3094fbbc28b 100644
--- a/Event/PyDumper/python/Dumpers.py
+++ b/Event/PyDumper/python/Dumpers.py
@@ -4608,7 +4608,10 @@ def format_obj (x, name=None):
     if tname.startswith ('std::vector<') or tname.startswith ('vector<'):
         ipos = tname.find('<')
         tname2 = tname[ipos+1:]
-        if tname2.startswith('char,') or tname2.startswith ('unsigned char,'):
+        if (tname2.startswith('char,') or
+            tname2.startswith('char>') or
+            tname2.startswith ('unsigned char,') or
+            tname2.startswith ('unsigned char>')):
             l = ', '.join ([str(ord(x[i])) for i in range(len(x))])
         elif tname2.startswith('bool,') or tname2 == 'bool>':
             l = ', '.join ([str(bool(xx)) for xx in x])
@@ -5003,6 +5006,12 @@ dumpspecs = [
     ['xAOD::MBTSModuleContainer',            dump_xAOD],
     ['DataVector<xAOD::ZdcModule_v1>',       dump_xAOD],
     ['xAOD::ZdcModuleContainer',             dump_xAOD],
+    ['DataVector<xAOD::CPMTower_v2>',        dump_xAOD],
+    ['xAOD::CPMTowerContainer',              dump_xAOD],
+    ['DataVector<xAOD::JetElement_v2>',      dump_xAOD],
+    ['xAOD::JetElementContainer',            dump_xAOD],
+    ['DataVector<xAOD::TriggerTower_v2>',    dump_xAOD],
+    ['xAOD::TriggerTowerContainer',          dump_xAOD],
     ['xAOD::MissingETContainer_v1',          dump_xAOD],
     ['xAOD::MissingETContainer',             dump_xAOD],
     ['xAOD::MissingETComponentMap_v1',       dump_xAOD],
-- 
GitLab