From 8b48dfe2acf0de481e3d1b6d850614fdf5324f7f Mon Sep 17 00:00:00 2001
From: Wojciech Krupa <wojciech.krupa@cern.ch>
Date: Thu, 6 Feb 2025 15:31:42 +0100
Subject: [PATCH] implementation of mainteiners suggestions
---
Tr/TrackMonitors/src/UTGlobalEffMon.cpp | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/Tr/TrackMonitors/src/UTGlobalEffMon.cpp b/Tr/TrackMonitors/src/UTGlobalEffMon.cpp
index bf6dd5afa70..0834972a01a 100755
--- a/Tr/TrackMonitors/src/UTGlobalEffMon.cpp
+++ b/Tr/TrackMonitors/src/UTGlobalEffMon.cpp
@@ -22,7 +22,6 @@
#include "Kernel/LHCbID.h"
#include "Kernel/UTNames.h"
#include "LHCbAlgs/Consumer.h"
-#include "TMath.h"
#include "TrackKernel/TrackFunctors.h"
#include "TrackMonitorTupleBase.h"
#include "UTDAQ/UTDAQHelper.h"
@@ -47,8 +46,8 @@ class Mutable {
mutable T m_t;
public:
- template <typename... Args, typename = std::enable_if_t<std::is_constructible_v<T, Args...>>>
- Mutable( Args&&... args ) : m_t{ std::forward<Args>( args )... } {}
+ template <typename... Args> requires std::is_constructible_v<T,Args...>
+ Mutable( Args&&... args ) : m_t{ std::forward<Args>(args)... } {}
template <typename Arg>
decltype( auto ) operator[]( Arg&& arg ) const {
@@ -72,8 +71,8 @@ namespace {
return [=]( const LHCb::Track* track ) { return track->type() == atype; };
};
- auto TrackBackwardPredicate = []() { return [=]( const LHCb::Track* track ) { return track->isVeloBackward(); }; };
-
+ auto TrackBackwardPredicate = []( const LHCb::Track* track ) { return track->isVeloBackward(); };
+
auto TrackForwardPredicate = []() { return [=]( const LHCb::Track* track ) { return !track->isVeloBackward(); }; };
auto TrackVeloSidePredicate = []( int asign ) {
@@ -284,12 +283,9 @@ void UTGlobalEffMon<TFitResult, TNode>::operator()( LHCb::Track::Range const& tr
unsigned int nlay = 0;
if ( _tr2ut0 != -1 ) {
++nlay;
- bool inner = false;
UInt_t _mo = ( _tr2ut0 >> 10 ) & 7;
UInt_t _st = ( _tr2ut0 >> 14 ) & 15;
- if ( _st == 0 ) {
- if ( _mo == 3 || _mo == 4 ) { inner = true; }
- }
+ bool inner = ( _st == 0 ) && ( _mo == 3 || _mo == 4 );
if ( inner ) {
++m_h_residual_inner[_tr2utr0];
++m_h_residualpull_inner[_tr2utchi0];
--
GitLab