Skip to content
Snippets Groups Projects
Commit 0eba35da authored by Miroslav Saur's avatar Miroslav Saur
Browse files

Merge branch 'calo-use-std-abs' into 'master'

CaloChargedBremAlg: Use std:abs instead of ::abs

Closes #605

See merge request !4304
parents 62c9cd51 f2b760fc
No related branches found
No related tags found
1 merge request!4304CaloChargedBremAlg: Use std:abs instead of ::abs
Pipeline #11052041 passed
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "CaloChargedInfoUtils.h" #include "CaloChargedInfoUtils.h"
#include "GaudiKernel/IFileAccess.h" #include "GaudiKernel/IFileAccess.h"
#include "LHCbAlgs/Transformer.h" #include "LHCbAlgs/Transformer.h"
#include <cmath>
/** @class CaloChargedBremAlg CaloChargedBremAlg.h /** @class CaloChargedBremAlg CaloChargedBremAlg.h
* *
...@@ -161,7 +162,7 @@ namespace LHCb::Calo { ...@@ -161,7 +162,7 @@ namespace LHCb::Calo {
pid.field<ChargedInfoTag::BremAcceptance>().set( comb_brem_acc ); pid.field<ChargedInfoTag::BremAcceptance>().set( comb_brem_acc );
// DLL variables, obtained from base variables + DLL hists from ParamFiles // DLL variables, obtained from base variables + DLL hists from ParamFiles
auto track_logp = -LHCb::Math::fast_log( abs( track.qOverP( SL::FirstMeasurement ).cast() ) ); auto track_logp = -LHCb::Math::fast_log( std::abs( track.qOverP( SL::FirstMeasurement ).cast() ) );
auto dlle_brem = getDLL_3D<DLLType::BremPIDe>( *m_dlls, tracktype, brem_chi2, brem_dx, track_logp ); auto dlle_brem = getDLL_3D<DLLType::BremPIDe>( *m_dlls, tracktype, brem_chi2, brem_dx, track_logp );
pid.field<ChargedInfoTag::BremPIDe>().set( dlle_brem ); pid.field<ChargedInfoTag::BremPIDe>().set( dlle_brem );
} }
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "CaloChargedInfoUtils.h" #include "CaloChargedInfoUtils.h"
#include "GaudiKernel/IFileAccess.h" #include "GaudiKernel/IFileAccess.h"
#include "LHCbAlgs/Transformer.h" #include "LHCbAlgs/Transformer.h"
#include <cmath>
/** @class CaloChargedPIDsAlg CaloChargedPIDsAlg.h /** @class CaloChargedPIDsAlg CaloChargedPIDsAlg.h
* *
...@@ -152,7 +153,7 @@ namespace LHCb::Calo { ...@@ -152,7 +153,7 @@ namespace LHCb::Calo {
pid.field<ChargedInfoTag::ElectronShowerDLL>().set( eshower_dll_val ); pid.field<ChargedInfoTag::ElectronShowerDLL>().set( eshower_dll_val );
// DLL variables, obtained from base variables + DLL hists from ParamFiles // DLL variables, obtained from base variables + DLL hists from ParamFiles
auto track_logp = -LHCb::Math::fast_log( abs( track.qOverP( SL::FirstMeasurement ).cast() ) ); auto track_logp = -LHCb::Math::fast_log( std::abs( track.qOverP( SL::FirstMeasurement ).cast() ) );
auto dlle_ecal = auto dlle_ecal =
inecal ? getDLL_3D<DLLType::EcalPIDe>( *m_dlls_3D, tracktype, eshower_dll_val, eshower_eop_val, track_logp ) inecal ? getDLL_3D<DLLType::EcalPIDe>( *m_dlls_3D, tracktype, eshower_dll_val, eshower_eop_val, track_logp )
: 0.f; : 0.f;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment