From a17550fbcdf5cf0a5951a21456faba7e044f9222 Mon Sep 17 00:00:00 2001
From: Michael James Fenton <m.fenton@cern.ch>
Date: Thu, 1 Dec 2016 17:20:22 +0100
Subject: [PATCH] config and monitoring bug fixes (TrigMuonEF-00-04-81)
* Online monitoring histogram bug fix
* Typo correction for FTK isolation default settings
* TrigMuonEF-00-04-81
---
.../TrigMuonEF/python/TrigMuonEFConfig.py | 2 +-
.../TrigMuonEF/python/TrigMuonEFMonitoring.py | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
index 3c518c80968..754af718908 100755
--- a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
@@ -563,7 +563,7 @@ class TrigMuonEFTrackIsolationVarConfig (TrigMuonEFTrackIsolation):
# Which isolation to run?
if "FTK" in name:
self.IsoType=2
- self.removeSelfType=1
+ TMEF_VarIsolationTool.removeSelfType=1 # use LeadTrk by default
else:
self.IsoType=1
# Options: 1=ID+EF, 2=FTK+L2
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFMonitoring.py b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFMonitoring.py
index 2922a2f300c..fb4d0fdec5a 100644
--- a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFMonitoring.py
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFMonitoring.py
@@ -336,16 +336,15 @@ class TrigMuonEFTrackIsolationOnlineMonitoring(TrigGenericMonitoringToolConfig):
def __init__ (self, name="TrigMuonEFTrackIsolationOnlineMonitoring"):
super(TrigMuonEFTrackIsolationOnlineMonitoring, self).__init__(name)
self.defineTarget("Online")
- self.Histograms += [ defineHistogram('EF_trks_trkptiso_cone2', type='TH1F', title="Track Isolation cone 0.2; MuonEF CB Trk Isolation cone 0.2 [GeV]",
- xbins=25, xmin=0, xmax=25) ]
- self.Histograms += [ defineHistogram('EF_trks_trkptiso_cone3', type='TH1F', title="Track Isolation cone 0.3; MuonEF CB Trk Isolation cone 0.3 [GeV]",
- xbins=25, xmin=0, xmax=25) ]
- self.Histograms += [ defineHistogram('EF_trks_idtrkdz', type='TH1F', title="dz to ID trks; dz to ID trks",
- xbins=200, xmin=-100, xmax=100.0) ]
- self.Histograms += [ defineHistogram('EF_trks_idtrkdr', type='TH1F', title="dr to ID trks; dr to ID trks",
+ self.Histograms += [ defineHistogram('trks_trkptiso_cone2', type='TH1F', title="Track Isolation cone 0.2; MuonEF CB Trk Isolation cone 0.2 [GeV] (ID)",
+ xbins=35, xmin=-10, xmax=25) ]
+ self.Histograms += [ defineHistogram('trks_trkptiso_cone3', type='TH1F', title="Track Isolation cone 0.3; MuonEF CB Trk Isolation cone 0.3 [GeV] (ID)",
+ xbins=35, xmin=-10, xmax=25) ]
+ self.Histograms += [ defineHistogram('trks_trkdz', type='TH1F', title="dz to trks; dz to trks",
+ xbins=200, xmin=-10, xmax=10.0) ]
+ self.Histograms += [ defineHistogram('trks_trkdr', type='TH1F', title="dr to trks; dr to trks",
xbins=60, xmin=0.0, xmax=3.0) ]
-
class TrigMuonEFTrackIsolationValidationMonitoring(TrigGenericMonitoringToolConfig):
def __init__ (self, name="TrigMuonEFTrackIsolationValidationMonitoring"):
super(TrigMuonEFTrackIsolationValidationMonitoring, self).__init__(name)
--
GitLab