From c0b62c3d83372c4de85e72397a5f3df5e1bcd6ec Mon Sep 17 00:00:00 2001
From: Siarhei Harkusha <Siarhei.Harkusha@cern.ch>
Date: Thu, 21 Mar 2019 17:40:39 +0100
Subject: [PATCH] TileMonitoring: Clean up and restructure a bit
---
.../python/TileJetMonitorAlgorithm.py | 2 --
.../python/TileMonitoringCfgHelper.py | 2 --
.../src/TileJetMonitorAlgorithm.cxx | 28 +++++++++++--------
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/TileCalorimeter/TileMonitoring/python/TileJetMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileJetMonitorAlgorithm.py
index 267556693d4..337718e8140 100644
--- a/TileCalorimeter/TileMonitoring/python/TileJetMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileJetMonitorAlgorithm.py
@@ -4,8 +4,6 @@
'''
@file TileJetMonitorAlgorithm.py
-@author
-@date
@brief Python configuration of TileJetMonitorAlgorithm algorithm for the Run III
'''
diff --git a/TileCalorimeter/TileMonitoring/python/TileMonitoringCfgHelper.py b/TileCalorimeter/TileMonitoring/python/TileMonitoringCfgHelper.py
index b2fb690ed03..6f0f3aea151 100644
--- a/TileCalorimeter/TileMonitoring/python/TileMonitoringCfgHelper.py
+++ b/TileCalorimeter/TileMonitoring/python/TileMonitoringCfgHelper.py
@@ -4,8 +4,6 @@
'''
@file TileMonitoringHelper.py
-@author
-@date
@brief Helper functions for Run 3 Tile monitoring algorithm configuration
'''
diff --git a/TileCalorimeter/TileMonitoring/src/TileJetMonitorAlgorithm.cxx b/TileCalorimeter/TileMonitoring/src/TileJetMonitorAlgorithm.cxx
index cacfea01c2b..87583b6c992 100644
--- a/TileCalorimeter/TileMonitoring/src/TileJetMonitorAlgorithm.cxx
+++ b/TileCalorimeter/TileMonitoring/src/TileJetMonitorAlgorithm.cxx
@@ -13,14 +13,10 @@
#include "CaloIdentifier/TileID.h"
#include "CaloEvent/CaloCell.h"
-//#include "CaloEvent/CaloCluster.h"
-
#include "StoreGate/ReadHandle.h"
#include <xAODCore/ShallowCopy.h>
#include "xAODCaloEvent/CaloCluster.h"
-//#include "JetUtils/JetCaloQualityUtils.h"
-//#include "JetUtils/JetCellAccessor.h"
TileJetMonitorAlgorithm::TileJetMonitorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator )
@@ -431,19 +427,29 @@ bool TileJetMonitorAlgorithm::passesJvt(const xAOD::Jet& jet) const {
if (jet.pt() > m_jetPtMin
&& jet.pt() < m_jetPtMax
&& fabs(jet.getAttribute<float>("DetectorEta")) < m_jetTrackingEtaLimit
- && m_jvt->updateJvt(jet) < m_jvtThreshold)
+ && m_jvt->updateJvt(jet) < m_jvtThreshold) {
+
return false;
- return true;
+
+ } else {
+ return true;
+ }
}
bool TileJetMonitorAlgorithm::isGoodJet(const xAOD::Jet& jet) const {
- if (! m_doJetCleaning) return true;
- if (jet.pt() < m_jetPtMin) return false;
- if (! passesJvt(jet)) return false;
- if (! m_jetCleaningTool->keep(jet)) return false;
- return true;
+ if (m_doJetCleaning) {
+
+ if (jet.pt() >= m_jetPtMin && passesJvt(jet) && m_jetCleaningTool->keep(jet)) {
+ return true;
+ } else {
+ return false;
+ }
+
+ } else {
+ return true;
+ }
}
--
GitLab