From e7b0bed37f6aab2afdfdd84c20e99567420c1fec Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Wed, 21 Jun 2017 07:28:19 +0200
Subject: [PATCH] MR issues fixed
Former-commit-id: 0fb4d890322375365d169a122ac3ae2ed4bca57b
---
Control/AthenaMonitoring/python/DefineHistogram.py | 10 +++++++---
.../TrigSteer/L1Decoder/python/L1DecoderMonitoring.py | 3 +++
.../TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx | 2 +-
.../TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx | 2 +-
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Control/AthenaMonitoring/python/DefineHistogram.py b/Control/AthenaMonitoring/python/DefineHistogram.py
index bb7e2993423..7081bef351d 100644
--- a/Control/AthenaMonitoring/python/DefineHistogram.py
+++ b/Control/AthenaMonitoring/python/DefineHistogram.py
@@ -1,12 +1,16 @@
+#
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#
+
def defineHistogram(varname, type='TH1F', path='EXPERT',
title='Unspecified_title_for_the_histogram_is_truly_annoying,_because_this_default_is_long;unspecified_label;unspecified_label',
xbins=100, xmin=0, xmax=1,
ybins=None, ymin=None, ymax=None, zmin=None, zmax=None, opt='', labels=None):
- """ Generates the histogram definition string which is digestable by TrigGenericMonitoringTool.
+ """ Generates the histogram definition string which is digestable by GenericMonitoringTool.
- Note that defaults are compleetly unreasonable. The tile is intentionally made annoying.
- For histogras types supported and allowed paths have a look at TrigGenericMonitoringTool documentation.
+ Note that defaults are compleetly unreasonable. The title is made annoying intentionally.
+ For histograms types, paths and all the options have a look at GenericMonitoringTool documentation.
"""
coded = "%s, %s, %s, %s, %d, %f, %f" % (path, type, varname, title, xbins, xmin, xmax)
if ybins is not None:
diff --git a/Trigger/TrigSteer/L1Decoder/python/L1DecoderMonitoring.py b/Trigger/TrigSteer/L1Decoder/python/L1DecoderMonitoring.py
index 48e5d23e4e4..913e33b7532 100644
--- a/Trigger/TrigSteer/L1Decoder/python/L1DecoderMonitoring.py
+++ b/Trigger/TrigSteer/L1Decoder/python/L1DecoderMonitoring.py
@@ -1,3 +1,6 @@
+#
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#
from AthenaMonitoring.AthenaMonitoringConf import GenericMonitoringTool
from AthenaMonitoring.DefineHistogram import defineHistogram
import math
diff --git a/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx b/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx
index deda05bb9f3..65d600ca066 100644
--- a/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx
@@ -126,7 +126,7 @@ StatusCode EMRoIsUnpackingTool::unpack( const EventContext& ctx,
auto RoIsCount = MonitoredScalar::declare( "count", trigRoIs->size() );
auto RoIsPhi = MonitoredCollection::declare( "phi", *trigRoIs.get(), &TrigRoiDescriptor::phi );
auto RoIsEta = MonitoredCollection::declare( "eta", *trigRoIs.get(), &TrigRoiDescriptor::eta );
- auto monitorit = MonitoredScope::declare( m_monTool, RoIsCount, RoIsEta, RoIsPhi );
+ MonitoredScope::declare( m_monTool, RoIsCount, RoIsEta, RoIsPhi );
}
// recording
diff --git a/Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx b/Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx
index 75b16098f6a..99b6b241852 100644
--- a/Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx
@@ -112,7 +112,7 @@ StatusCode MURoIsUnpackingTool::unpack( const EventContext& ctx,
auto RoIsCount = MonitoredScalar::declare( "count", trigRoIs->size() );
auto RoIsPhi = MonitoredCollection::declare( "phi", *trigRoIs.get(), &TrigRoiDescriptor::phi );
auto RoIsEta = MonitoredCollection::declare( "eta", *trigRoIs.get(), &TrigRoiDescriptor::eta );
- auto monitorit = MonitoredScope::declare( m_monTool, RoIsCount, RoIsEta, RoIsPhi );
+ MonitoredScope::declare( m_monTool, RoIsCount, RoIsEta, RoIsPhi );
}
// recording
{
--
GitLab