diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl1.cxx
index f1ac7e20feeb31e6250ffd894d99d26c01a6582a..ce755cd5a87346800587811c945afa1cde9cba88 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* DeltaRApproxBoxCutIncl1.cpp
@@ -33,7 +33,7 @@ namespace {
unsigned int
calcDeltaEta(const TCS::GenericTOB* tob1, const TCS::GenericTOB* tob2) {
- double deta = fabs( tob1->eta() - tob2->eta() );
+ double deta = std::abs( tob1->eta() - tob2->eta() );
return deta;
}
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDetaDPhiIncl3.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDetaDPhiIncl3.cxx
index f9c0909cb06a42998e1d3458ed249dfebb0dc22c..d16a33b25cbe145d45822d0b27ce898b2846e866 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDetaDPhiIncl3.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDetaDPhiIncl3.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* DisambiguationDetaDPhiIncl3.cpp
@@ -128,16 +128,16 @@ TCS::DisambiguationDetaDPhiIncl3::processBitCorrect( const std::vector<TCS::TOBA
{
if( parType_t((*tob1)->Et()) <= p_MinET1) continue; // ET cut
- if( parType_t(fabs((*tob1)->eta())) > p_EtaMax1 ) continue; // Eta cut
- if( parType_t(fabs((*tob1)->eta())) < p_EtaMin1 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) > p_EtaMax1 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) < p_EtaMin1 ) continue; // Eta cut
for( TCS::TOBArray::const_iterator tob2 = input[1]->begin();
tob2 != input[1]->end() && distance(input[1]->begin(), tob2) < p_NumberLeading2;
++tob2) {
if( parType_t((*tob2)->Et()) <= p_MinET2) continue; // ET cut
- if( parType_t(fabs((*tob2)->eta())) > p_EtaMax2 ) continue; // Eta cut
- if( parType_t(fabs((*tob2)->eta())) < p_EtaMin2 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) > p_EtaMax2 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) < p_EtaMin2 ) continue; // Eta cut
// DeltaPhi cuts
unsigned int deltaPhi = TSU::Kinematics::calcDeltaPhiBW( *tob1, *tob2 );
@@ -151,8 +151,8 @@ TCS::DisambiguationDetaDPhiIncl3::processBitCorrect( const std::vector<TCS::TOBA
tob3 != input[2]->end() ;
++tob3) {
if( parType_t((*tob3)->Et()) <= p_MinET3) continue; // ET cut
- if( parType_t(fabs((*tob3)->eta())) > p_EtaMax3 ) continue; // Eta cut
- if( parType_t(fabs((*tob3)->eta())) < p_EtaMin3 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob3)->eta())) > p_EtaMax3 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob3)->eta())) < p_EtaMin3 ) continue; // Eta cut
unsigned int deltaR13 = TSU::Kinematics::calcDeltaR2BW( *tob1, *tob3 );
unsigned int deltaR23 = TSU::Kinematics::calcDeltaR2BW( *tob2, *tob3 );
for(unsigned int i=0; i<numberOutputBits(); ++i) {
@@ -190,16 +190,16 @@ TCS::DisambiguationDetaDPhiIncl3::process( const std::vector<TCS::TOBArray const
{
if( parType_t((*tob1)->Et()) <= p_MinET1) continue; // ET cut
- if( parType_t(fabs((*tob1)->eta())) > p_EtaMax1 ) continue; // Eta cut
- if( parType_t(fabs((*tob1)->eta())) < p_EtaMin1 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) > p_EtaMax1 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) < p_EtaMin1 ) continue; // Eta cut
for( TCS::TOBArray::const_iterator tob2 = input[1]->begin();
tob2 != input[1]->end() && distance(input[1]->begin(), tob2) < p_NumberLeading2;
++tob2) {
if( parType_t((*tob2)->Et()) <= p_MinET2) continue; // ET cut
- if( parType_t(fabs((*tob2)->eta())) > p_EtaMax2 ) continue; // Eta cut
- if( parType_t(fabs((*tob2)->eta())) < p_EtaMin2 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) > p_EtaMax2 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) < p_EtaMin2 ) continue; // Eta cut
// DeltaPhi cuts
unsigned int deltaPhi = TSU::Kinematics::calcDeltaPhi( *tob1, *tob2 );
@@ -213,8 +213,8 @@ TCS::DisambiguationDetaDPhiIncl3::process( const std::vector<TCS::TOBArray const
tob3 != input[2]->end() ;
++tob3) {
if( parType_t((*tob3)->Et()) <= p_MinET3) continue; // ET cut
- if( parType_t(fabs((*tob3)->eta())) > p_EtaMax3 ) continue; // Eta cut
- if( parType_t(fabs((*tob3)->eta())) < p_EtaMin3 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob3)->eta())) > p_EtaMax3 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob3)->eta())) < p_EtaMin3 ) continue; // Eta cut
unsigned int deltaR13 = TSU::Kinematics::calcDeltaR2( *tob1, *tob3 );
unsigned int deltaR23 = TSU::Kinematics::calcDeltaR2( *tob2, *tob3 );
for(unsigned int i=0; i<numberOutputBits(); ++i) {
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx
index ef4d3f5a881a3c96824117de9fccc84cacb18f18..9f75ca7a417fed57785f552552d8bf4068f953c8 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* JetHT.cpp
@@ -108,8 +108,8 @@ TCS::JetHT::process( const std::vector<TCS::TOBArray const *> & input,
++tob)
{
- if( parType_t(fabs((*tob)->eta())) > p_EtaMax ) continue; // Eta cut
- if( parType_t(fabs((*tob)->eta())) < p_EtaMin ) continue; // Eta cut
+ if( parType_t(std::abs((*tob)->eta())) > p_EtaMax ) continue; // Eta cut
+ if( parType_t(std::abs((*tob)->eta())) < p_EtaMin ) continue; // Eta cut
if( parType_t((*tob)->Et()) <= p_MinET ) continue; // E_T cut
TRG_MSG_DEBUG("Jet : ET = " << (*tob)->Et());
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx
index 9f1359db89223947654ecc99d2f6e85f1c15583f..6cf7999707f8d6be4191e8cf302e12b7848e7cdf 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* JetMatch.cpp
@@ -86,8 +86,8 @@ TCS::JetMatch::process( const std::vector<TCS::TOBArray const *> & input,
for( TCS::GenericTOB * tob : *input[0]) {
++objC;
- if( parType_t(fabs(tob->eta())) > p_EtaMax ) continue; // Eta cut
- if( parType_t(fabs(tob->eta())) < p_EtaMin ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) > p_EtaMax ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) < p_EtaMin ) continue; // Eta cut
if( tob->EtWide() <= p_MinET1 ) continue; // E_T cut
if( tob->EtNarrow() <= p_MinET2 ) continue; // E_T cut
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MultiplicityCustom.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MultiplicityCustom.cxx
index e3ad9c24060b537b2372beaa61b32e7a37d13b1d..93f57b9b3ead36dfb90fd74a7d60a1536b2f881c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MultiplicityCustom.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MultiplicityCustom.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* MultiplicityCustom.cpp
@@ -85,8 +85,8 @@ TCS::MultiplicityCustom::process( const std::vector<TCS::TOBArray const *> & inp
tob1 != input[0]->end() && distance( input[0]->begin(), tob1) < nLeading;
++tob1)
{
- if (parType_t(fabs((*tob1)-> eta())) < p_EtaMin) continue;
- if (parType_t(fabs((*tob1)-> eta())) > p_EtaMax) continue;
+ if (parType_t(std::abs((*tob1)-> eta())) < p_EtaMin) continue;
+ if (parType_t(std::abs((*tob1)-> eta())) > p_EtaMax) continue;
if( parType_t((*tob1)->Et()) <= p_MinET ) continue; // E_T cut
//
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx
index 3dda9a616d74177071680830065c2ba2d531b5f4..caf98facaf53372f3c4b714bce06b48b3f10209f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* NotMatch.cpp
@@ -127,16 +127,16 @@ TCS::NotMatch::processBitCorrect( const std::vector<TCS::TOBArray const *> & inp
++tob1)
{
if( parType_t((*tob1)->Et()) <= p_MinET1[i]) continue; // ET cut
- if( parType_t(fabs((*tob1)->eta())) > p_EtaMax1[i] ) continue; // Eta cut
- if( parType_t(fabs((*tob1)->eta())) < p_EtaMin1[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) > p_EtaMax1[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) < p_EtaMin1[i] ) continue; // Eta cut
matched = false;
deltaR2 = 999;
for( TCS::TOBArray::const_iterator tob2 = input[1]->begin();
tob2 != input[1]->end() && distance(input[1]->begin(), tob2) < p_NumberLeading2 && matched != true ;
++tob2) {
if( parType_t((*tob2)->Et()) <= p_MinET2[i]) continue; // ET cut
- if( parType_t(fabs((*tob2)->eta())) > p_EtaMax2[i] ) continue; // Eta cut
- if( parType_t(fabs((*tob2)->eta())) < p_EtaMin2[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) > p_EtaMax2[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) < p_EtaMin2[i] ) continue; // Eta cut
// test DeltaR2Min, DeltaR2Max
deltaR2 = calcDeltaR2BW( *tob1, *tob2 );
if (deltaR2 <= p_DRCut[i]) matched = true;
@@ -177,16 +177,16 @@ TCS::NotMatch::process( const std::vector<TCS::TOBArray const *> & input,
++tob1)
{
if( parType_t((*tob1)->Et()) <= p_MinET1[i]) continue; // ET cut
- if( parType_t(fabs((*tob1)->eta())) > p_EtaMax1[i] ) continue; // Eta cut
- if( parType_t(fabs((*tob1)->eta())) < p_EtaMin1[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) > p_EtaMax1[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) < p_EtaMin1[i] ) continue; // Eta cut
matched = false;
deltaR2 = 999;
for( TCS::TOBArray::const_iterator tob2 = input[1]->begin();
tob2 != input[1]->end() && distance(input[1]->begin(), tob2) < p_NumberLeading2 && matched != true ;
++tob2) {
if( parType_t((*tob2)->Et()) <= p_MinET2[i]) continue; // ET cut
- if( parType_t(fabs((*tob2)->eta())) > p_EtaMax2[i] ) continue; // Eta cut
- if( parType_t(fabs((*tob2)->eta())) < p_EtaMin2[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) > p_EtaMax2[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) < p_EtaMin2[i] ) continue; // Eta cut
// test DeltaR2Min, DeltaR2Max
deltaR2 = calcDeltaR2( *tob1, *tob2 );
if (deltaR2 <= p_DRCut[i]) matched = true;
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx
index 37ce171f4ecab9cf1ce9bb08e8f218c37f683f25..5a9dfcad8ebfe28ea3afbed2774f4036880933f1 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* Ratio.cpp
@@ -100,8 +100,8 @@ TCS::Ratio::process( const std::vector<TCS::TOBArray const *> & input,
for( TCS::GenericTOB * tob : *input[1]) {
- if( parType_t(fabs(tob->eta())) > p_EtaMax ) continue; // Eta cut
- if( parType_t(fabs(tob->eta())) < p_EtaMin ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) > p_EtaMax ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) < p_EtaMin ) continue; // Eta cut
if( tob->Et() <= p_MinET2 ) continue; // E_T cut
TRG_MSG_DEBUG("Jet ET = " << tob->Et());
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx
index befccb97171949780b5ddc0a64ba744ac2f966fd..200156b1e2a6003b1481c40df31565f266474179 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* Ratio2.cpp
@@ -95,8 +95,8 @@ TCS::Ratio2::process( const std::vector<TCS::TOBArray const *> & input,
for( TCS::GenericTOB * tob : *input[1]) {
- if( parType_t(fabs(tob->eta())) > p_EtaMax ) continue; // Eta cut
- if( parType_t(fabs(tob->eta())) < p_EtaMin ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) > p_EtaMax ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) < p_EtaMin ) continue; // Eta cut
if( tob->Et() <= p_MinET2 ) continue; // E_T cut
TRG_MSG_DEBUG("Jet : ET = " << tob->Et());
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx
index 687f150a67178b874b9b3db8dcff76e0dd20308a..0900ad4a3a772a24d6bf91be559bb3716b6235c7 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* RatioSum.cpp
@@ -199,8 +199,8 @@ TCS::RatioSum::process( const std::vector<TCS::TOBArray const *> & input,
unsigned int objC(0);
for( TCS::GenericTOB * tob : *input[1]) {
- if( parType_t(fabs(tob->eta())) > p_EtaMax2 ) continue; // Eta cut
- if( parType_t(fabs(tob->eta())) < p_EtaMin2 ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) > p_EtaMax2 ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) < p_EtaMin2 ) continue; // Eta cut
if( tob->Et() <= p_MinET2 ) continue; // E_T cut
TRG_MSG_DEBUG("Jet : ET = " << tob->Et());
@@ -216,8 +216,8 @@ TCS::RatioSum::process( const std::vector<TCS::TOBArray const *> & input,
++tob1)
{
- if( parType_t(fabs((*tob1)->eta())) > p_EtaMax3 ) continue; // Eta cut
- if( parType_t(fabs((*tob1)->eta())) < p_EtaMin3 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) > p_EtaMax3 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) < p_EtaMin3 ) continue; // Eta cut
if( (*tob1)->Et() <= p_MinET3 ) continue; // E_T cut
sumET += (*tob1)->Et() ;
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx
index 4adc595020758ab34e57bfa6fcaf65e6d0db9cfc..2be36ed6ca8a64687c87a3a825e94cf2cb05df18 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* SimpleCone.cpp
@@ -110,8 +110,8 @@ TCS::SimpleCone::process( const std::vector<TCS::TOBArray const *> & input,
tob != input[0]->end() && distance(input[0]->begin(), tob) < p_NumberLeading1;
++tob) {
- if( parType_t(fabs((*tob)->eta())) > p_EtaMax ) continue; // Eta cut
- if( parType_t(fabs((*tob)->eta())) < p_EtaMin ) continue; // Eta cut
+ if( parType_t(std::abs((*tob)->eta())) > p_EtaMax ) continue; // Eta cut
+ if( parType_t(std::abs((*tob)->eta())) < p_EtaMin ) continue; // Eta cut
if( parType_t((*tob)->Et()) <= p_MinET ) continue; // E_T cut
TRG_MSG_DEBUG("Jet : ET = " << (*tob)->Et());
@@ -123,8 +123,8 @@ TCS::SimpleCone::process( const std::vector<TCS::TOBArray const *> & input,
++tob1) {
if( tob1 == tob ) continue; // Avoid double counting of central jet
- if( parType_t(fabs((*tob1)->eta())) > p_EtaMax ) continue; // Eta cut
- if( parType_t(fabs((*tob1)->eta())) < p_EtaMin ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) > p_EtaMax ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) < p_EtaMin ) continue; // Eta cut
if( parType_t((*tob1)->Et()) <= p_MinET ) continue; // E_T cut
double deta = ( (*tob)->etaDouble() - (*tob1)->etaDouble() );