From ec00dbd8c2931e5dc1d870b34ece8541c423dd99 Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Fri, 31 Jul 2020 16:47:42 +0200
Subject: [PATCH] TrigValSteering.CheckSteps: Merge Trig_reco_tf sub-step logs
---
.../TrigValTools/python/TrigValSteering/CheckSteps.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
index 56e9eda2d1e4..62710f0657c1 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
@@ -662,7 +662,7 @@ class MessageCountStep(Step):
ret, cmd = super(MessageCountStep, self).run(dry_run)
self.auto_report_result = auto_report
if ret != 0:
- self.log.error('%s failed')
+ self.log.error('%s failed', self.name)
self.result = 1
if self.auto_report_result:
self.report_result()
@@ -742,12 +742,12 @@ def default_check_steps(test):
log_to_zip = check_steps[-1].merged_name
# Reco_tf log merging
- reco_tf_steps = [step for step in test.exec_steps if step.type=='Reco_tf']
+ reco_tf_steps = [step for step in test.exec_steps if step.type in ['Reco_tf', 'Trig_reco_tf']]
if len(reco_tf_steps) > 0:
reco_tf_logmerge = LogMergeStep('LogMerge_Reco_tf')
reco_tf_logmerge.warn_if_missing = False
tf_names = ['HITtoRDO', 'RDOtoRDOTrigger', 'RAWtoESD', 'ESDtoAOD',
- 'PhysicsValidation', 'RAWtoALL']
+ 'PhysicsValidation', 'RAWtoALL', 'BSRDOtoRAW']
reco_tf_logmerge.log_files = ['log.'+tf_name for tf_name in tf_names]
if not get_step_from_list('LogMerge', check_steps):
for step in reco_tf_steps:
--
GitLab