From fd395e7fcab4c593e77b4fe23f215c741fc9aa90 Mon Sep 17 00:00:00 2001
From: Michele Renda <michele.renda@cern.ch>
Date: Fri, 28 Aug 2020 12:00:52 +0000
Subject: [PATCH] Fix ATEAM-636
---
Tools/PyUtils/python/MetaReader.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/Tools/PyUtils/python/MetaReader.py b/Tools/PyUtils/python/MetaReader.py
index ee7fb225fcc..39c8201e262 100644
--- a/Tools/PyUtils/python/MetaReader.py
+++ b/Tools/PyUtils/python/MetaReader.py
@@ -189,7 +189,9 @@ def read_metadata(filenames, file_type = None, mode = 'lite', promote = None, me
# assign the corresponding persistent class based of the name of the metadata container
if regexEventStreamInfo.match(class_name):
- if class_name.endswith('_p2'):
+ if class_name.endswith('_p1'):
+ persistent_instances[name] = ROOT.EventStreamInfo_p1()
+ elif class_name.endswith('_p2'):
persistent_instances[name] = ROOT.EventStreamInfo_p2()
else:
persistent_instances[name] = ROOT.EventStreamInfo_p3()
@@ -730,15 +732,17 @@ def promote_keys(meta_dict):
if key in md['metadata_items'] and regexEventStreamInfo.match(md['metadata_items'][key]):
md.update(md[key])
- if len(md['eventTypes']):
+ if 'eventTypes' in md and len(md['eventTypes']):
et = md['eventTypes'][0]
md['mc_event_number'] = et.get('mc_event_number', md['runNumbers'][0])
md['mc_channel_number'] = et.get('mc_channel_number', 0)
md['eventTypes'] = et['type']
-
- md['lumiBlockNumbers'] = md['lumiBlockNumbers']
- md['processingTags'] = md[key]['processingTags']
+ if 'lumiBlockNumbers' in md[key]:
+ md['lumiBlockNumbers'] = md[key]['lumiBlockNumbers']
+
+ if 'processingTags' in md[key]:
+ md['processingTags'] = md[key]['processingTags']
meta_dict[filename].pop(key)
break
--
GitLab