From 5f39065d9019597fe5e1d0ece81cbb60452c777b Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 21 Dec 2016 22:09:09 +0100
Subject: [PATCH] 'Avoid some FP divisions by constants.'
(TrigT1CaloTools-03-06-45)
* Tagging TrigT1CaloTools-03-06-45.
* Avoid some FP divisions by constants.
* Tagging TrigT1CaloTools-03-06-44.
* Avoid using directives in headers.
* Tagging TrigT1CaloTools-03-06-43.
* Comply with ATLAS naming conventions.
* Tagging TrigT1CaloTools-03-06-42.
* clang warning: unused variable.
* Tagging TrigT1CaloTools-03-06-41.
* clang warning: Missing override keywords.
* Tagging TrigT1CaloTools-03-06-40.
* Const fixes.
* Tagging TrigT1CaloTools-03-06-39.
* Fix gaudi deprecated method warning.
* Tagging TrigT1CaloTools-03-06-38.
* endreq -> endmsg.
Former-commit-id: b2ef5a979177d3928eb7ab660ce27f26ab9855c7
---
.../TrigT1CaloTools/L1CPMTools.h | 14 +++----
.../L1DynamicPedestalProviderTxt.h | 4 +-
.../TrigT1CaloTools/L1EmTauTools.h | 16 ++++----
.../TrigT1CaloTools/L1EtTools.h | 8 ++--
.../TrigT1CaloTools/L1JEPEtSumsTools.h | 2 +-
.../TrigT1CaloTools/L1JetElementTools.h | 2 +-
.../TrigT1CaloTools/L1JetEtTools.h | 2 +-
.../TrigT1CaloTools/src/L1CPCMXTools.cxx | 12 +++---
.../TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx | 30 +++++++-------
.../TrigT1CaloTools/src/L1CPMTowerTools.cxx | 39 ++++++++++---------
.../src/L1DynamicPedestalProviderTxt.cxx | 18 ++++-----
.../TrigT1CaloTools/src/L1EmTauTools.cxx | 38 +++++++++---------
.../TrigT1CaloTools/src/L1EnergyCMXTools.cxx | 13 +++----
.../TrigT1/TrigT1CaloTools/src/L1EtTools.cxx | 14 +++----
.../TrigT1CaloTools/src/L1JEPEtSumsTools.cxx | 11 +++---
.../TrigT1CaloTools/src/L1JetCMXTools.cxx | 14 +++----
.../TrigT1CaloTools/src/L1JetElementTools.cxx | 18 +++++----
.../TrigT1CaloTools/src/L1JetEtTools.cxx | 2 +
.../src/L1TriggerTowerTool.cxx | 18 ++++-----
19 files changed, 140 insertions(+), 135 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h
index 59a6b8a7fd8..17f033ede65 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h
@@ -60,17 +60,17 @@ namespace LVL1
/** Tool-based EM/tau algorithm implementation */
/** Map CPMTowers from user-supplied DataVector of inputs */
- virtual void mapTowers(const DataVector<xAOD::CPMTower>* cpmts, std::map<int, xAOD::CPMTower*>* towers);
+ virtual void mapTowers(const DataVector<xAOD::CPMTower>* cpmts, xAOD::CPMTowerMap_t* towers);
/** Find RoIs in user-supplied map of input towers */
- virtual void findRoIs(const std::map<int, xAOD::CPMTower*>* towers, DataVector<CPMTobAlgorithm>* tobs, int slice = -1);
+ virtual void findRoIs(const xAOD::CPMTowerMap_t* towers, DataVector<CPMTobAlgorithm>* tobs, int slice = -1);
/** Find RoIs in user-supplied DataVector of input towers */
virtual void findRoIs(const DataVector<xAOD::CPMTower>* cpmts, DataVector<CPMTobAlgorithm>* tobs, int slice = -1);
/** Form CPM results for specified crate/module using user-supplied map of input towers
This version fills a vector of CPMTobRoI for the whole detector */
- virtual void findCPMTobRoIs(const std::map<int, xAOD::CPMTower*>* towers, xAOD::CPMTobRoIContainer* rois, int slice = -1);
+ virtual void findCPMTobRoIs(const xAOD::CPMTowerMap_t* towers, xAOD::CPMTobRoIContainer* rois, int slice = -1);
/** Form CPM results for specified crate/module using user-supplied vector of input towers
This version fills a vector of CPMTobRoI for the whole detector */
@@ -78,16 +78,16 @@ namespace LVL1
/** Form CPM results for specified crate/module using user-supplied map of input towers
This version adds to DataVector of CPMTobRoI and returns backplane data words*/
- virtual void findCPMResults(const std::map<int, xAOD::CPMTower*>* towers, int crate, int module,
+ virtual void findCPMResults(const xAOD::CPMTowerMap_t* towers, int crate, int module,
DataVector<CPMTobRoI>* rois, std::vector<unsigned int>& emCMXData,
std::vector<unsigned int>& tauCMXData, int slice = -1);
/** Return RoI object for a specified location */
- virtual CPMTobAlgorithm findRoI(double RoIeta, double RoIphi, const std::map<int, xAOD::CPMTower*>* towers, int slice = -1) ;
+ virtual CPMTobAlgorithm findRoI(double RoIeta, double RoIphi, const xAOD::CPMTowerMap_t* towers, int slice = -1) ;
/** Form cluster/isolation sums for a given RoI location */
- virtual void formSums(double RoIeta, double RoIphi, const std::map<int, xAOD::CPMTower*>* towers, int slice = -1) ;
- virtual void formSums(uint32_t roiWord, const std::map<int, xAOD::CPMTower*>* towers, int slice = -1) ;
+ virtual void formSums(double RoIeta, double RoIphi, const xAOD::CPMTowerMap_t* towers, int slice = -1) ;
+ virtual void formSums(uint32_t roiWord, const xAOD::CPMTowerMap_t* towers, int slice = -1) ;
/** Methods to return the cluster/isolation ET values */
virtual int Core() const;
virtual int EMCore() const;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
index e9021614f9c..eedfd56017d 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
@@ -58,12 +58,12 @@ namespace LVL1
virtual ~L1DynamicPedestalProviderTxt();
/** standard Athena-Algorithm method */
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
void handle(const Incident&) override;
/** retrieve the bcidCorrection value */
- virtual int dynamicPedestal(int iEta, int layer, int pedestal, int iBCID, float mu);
+ virtual int dynamicPedestal(int iEta, int layer, int pedestal, int iBCID, float mu) override;
// forward declaration for a function that evaluates the correction as function of mu
class ParamFunc;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h
index 92d843db2ad..f2ba91d7423 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h
@@ -61,24 +61,24 @@ namespace LVL1
/** Tool-based EM/tau algorithm implementation */
/** Find RoIs in user-supplied map of input towers */
- virtual void findRoIs(const std::map<int, CPMTower*>* towers, DataVector<CPAlgorithm>* rois, int slice = -1);
- virtual void findRoIs(const std::map<int, TriggerTower*>* tts, DataVector<CPAlgorithm>* rois, int slice = -1);
+ virtual void findRoIs(const CPMTowerMap_t* towers, DataVector<CPAlgorithm>* rois, int slice = -1);
+ virtual void findRoIs(const TriggerTowerMap_t* tts, DataVector<CPAlgorithm>* rois, int slice = -1);
/** Find RoIs in user-supplied DataVector of input towers */
virtual void findRoIs(const DataVector<CPMTower>* cpmts, DataVector<CPAlgorithm>* rois, int slice = -1);
virtual void findRoIs(const DataVector<TriggerTower>* tts, DataVector<CPAlgorithm>* rois, int slice = -1);
/** Map CPMTowers from user-supplied DataVector of inputs */
- virtual void mapTowers(const DataVector<TriggerTower>* tts, std::map<int, CPMTower*>* towers);
- virtual void mapTowers(const DataVector<CPMTower>* cpmts, std::map<int, CPMTower*>* towers);
+ virtual void mapTowers(const DataVector<TriggerTower>* tts, CPMTowerMap_t* towers);
+ virtual void mapTowers(const DataVector<CPMTower>* cpmts, CPMTowerMap_t* towers);
/** Map of CPMTowers from user-supplied map of TriggerTowers */
- virtual void mapTowers(const std::map<int, TriggerTower*>* tts, std::map<int, CPMTower*>* towers);
+ virtual void mapTowers(const TriggerTowerMap_t* tts, CPMTowerMap_t* towers);
/** Return RoI object for a specified location */
- virtual CPAlgorithm findRoI(double RoIeta, double RoIphi, const std::map<int, CPMTower*>* towers, int slice = -1) ;
+ virtual CPAlgorithm findRoI(double RoIeta, double RoIphi, const CPMTowerMap_t* towers, int slice = -1) ;
/** Form cluster/isolation sums for a given RoI location */
- virtual void formSums(double RoIeta, double RoIphi, const std::map<int, CPMTower*>* towers, int slice = -1) ;
- virtual void formSums(uint32_t roiWord, const std::map<int, CPMTower*>* towers, int slice = -1) ;
+ virtual void formSums(double RoIeta, double RoIphi, const CPMTowerMap_t* towers, int slice = -1) ;
+ virtual void formSums(uint32_t roiWord, const CPMTowerMap_t* towers, int slice = -1) ;
/** Methods to return the cluster/isolation ET values */
virtual int Core() const;
virtual int EMClus() const;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h
index 8fe8074044c..6b25b9cec65 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h
@@ -73,7 +73,7 @@ namespace LVL1
/** Returns a vector of LVL1::ModuleEnergy objects */
virtual void moduleSums(const xAOD::JetElementContainer* jetelements,
DataVector<ModuleEnergy>* modules, int slice = -1) ;
- virtual void moduleSums(const std::map<int, xAOD::JetElement*>* jemap,
+ virtual void moduleSums(const xAOD::JetElementMap_t* jemap,
DataVector<ModuleEnergy>* modules, int slice = -1) ;
/** Returns a vector of LVL1::CrateEnergy objects */
virtual void crateSums(const DataVector<ModuleEnergy>* modules,
@@ -83,19 +83,19 @@ namespace LVL1
/** Directly obtain LVL1::CrateEnergy objects */
virtual void crateSums(const xAOD::JetElementContainer* jetelements,
DataVector<CrateEnergy>* crates, int slice = -1, float etaMaxXE = 5., float etaMaxTE = 5., bool restricted = false) ;
- virtual void crateSums(const std::map<int, xAOD::JetElement*>* jemap,
+ virtual void crateSums(const xAOD::JetElementMap_t* jemap,
DataVector<CrateEnergy>* crates, int slice = -1, float etaMaxXE = 5., float etaMaxTE = 5., bool restricted = false) ;
/** Returns a LVL1::SystemEnergy object */
virtual SystemEnergy systemSums(const DataVector<CrateEnergy>* crates) ;
/** Directly obtain a LVL1::SystemEnergy object */
virtual SystemEnergy systemSums(const xAOD::JetElementContainer* jetelements, int slice = -1, float etaMaxXE = 5., float etaMaxTE = 5., bool restricted = false) ;
- virtual SystemEnergy systemSums(const std::map<int, xAOD::JetElement*>* jemap, int slice = -1, float etaMaxXE = 5., float etaMaxTE = 5., bool restricted = false) ;
+ virtual SystemEnergy systemSums(const xAOD::JetElementMap_t* jemap, int slice = -1, float etaMaxXE = 5., float etaMaxTE = 5., bool restricted = false) ;
private:
/** Return a map of JetElements */
void mapJetElements(const xAOD::JetElementContainer* jetelements,
- std::map<int, xAOD::JetElement*>* m_jeContainer);
+ xAOD::JetElementMap_t* m_jeContainer);
/** Fill masked out JetElements map */
void fillMaskedOutMap();
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h
index 6444f06c0f6..8ced01523bb 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h
@@ -28,7 +28,7 @@
namespace LVL1
{
-using namespace xAOD;
+ //using namespace xAOD;
class CMMEtSums;
class JEMEtSums;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetElementTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetElementTools.h
index 5b38b07fdd9..b7015bbd2cb 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetElementTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetElementTools.h
@@ -52,7 +52,7 @@ namespace LVL1
/** Fill DataVector of JetElements from user-supplied TriggerTowers */
virtual void makeJetElements(const xAOD::TriggerTowerContainer* tts, xAOD::JetElementContainer* jetElements);
- virtual void mapJetElements(const xAOD::JetElementContainer* jetElements, std::map<int, xAOD::JetElement*>* map);
+ virtual void mapJetElements(const xAOD::JetElementContainer* jetElements, xAOD::JetElementMap_t* map);
// @DEPRICATED(amazurov)
virtual void makeJetElements(const DataVector<TriggerTower>* tts, DataVector<JetElement>* jetElements);
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h
index 8f93de45b85..59a5c1ed034 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h
@@ -21,7 +21,7 @@
namespace LVL1
{
-using namespace TrigConf;
+ //using namespace TrigConf;
/** @class L1JetEtTools
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx
index 378b509501d..b4f75df625a 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx
@@ -50,13 +50,13 @@ StatusCode L1CPCMXTools::initialize() {
StatusCode sc = m_configSvc.retrieve();
if (sc.isFailure()) {
msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName()
- << endreq;
+ << endmsg;
return sc;
} else if (m_debug) {
- msg(MSG::DEBUG) << "Connected to " << m_configSvc.typeAndName() << endreq;
+ msg(MSG::DEBUG) << "Connected to " << m_configSvc.typeAndName() << endmsg;
}
- msg(MSG::INFO) << "Initialization completed" << endreq;
+ msg(MSG::INFO) << "Initialization completed" << endmsg;
return sc;
}
@@ -579,7 +579,7 @@ unsigned int L1CPCMXTools::addHits(unsigned int hitMult, unsigned int hitVec,
int multBits, int vecBits) const {
if (m_debug)
msg() << MSG::DEBUG << "addHits: Original hitMult = " << std::hex << hitMult
- << ". Add hitWord = " << hitVec << std::dec << endreq;
+ << ". Add hitWord = " << hitVec << std::dec << endmsg;
// Results transmitted in 2 words, each reporting half of the CP thresholds
int nthresh = TrigT1CaloDefs::numOfCPThresholds / 2;
@@ -588,7 +588,7 @@ unsigned int L1CPCMXTools::addHits(unsigned int hitMult, unsigned int hitVec,
int nbitsIn = vecBits / nthresh;
if (m_debug)
- msg() << MSG::DEBUG << " Bits per threshold = " << nbitsOut << endreq;
+ msg() << MSG::DEBUG << " Bits per threshold = " << nbitsOut << endmsg;
int max = (1 << nbitsOut) - 1;
unsigned int multMask = max;
@@ -609,7 +609,7 @@ unsigned int L1CPCMXTools::addHits(unsigned int hitMult, unsigned int hitVec,
if (m_debug)
msg() << MSG::DEBUG << "addHits returning hitMult = " << std::hex << hits
- << std::dec << endreq;
+ << std::dec << endmsg;
return hits;
}
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx
index da8ce6c15fd..20913c711bc 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx
@@ -53,7 +53,7 @@ StatusCode L1CPMTools::finalize()
/** Form results for a specified module*/
-void L1CPMTools::findCPMResults(const std::map<int, xAOD::CPMTower*>* towers, int crate, int module,
+void L1CPMTools::findCPMResults(const xAOD::CPMTowerMap_t* towers, int crate, int module,
DataVector<CPMTobRoI>* rois, std::vector<unsigned int>& emCMXData,
std::vector<unsigned int>& tauCMXData, int slice) {
@@ -209,14 +209,14 @@ void L1CPMTools::findCPMResults(const std::map<int, xAOD::CPMTower*>* towers, in
void L1CPMTools::findCPMTobRoIs(const DataVector<xAOD::CPMTower>* cpmts, xAOD::CPMTobRoIContainer* rois, int slice) {
/** Need a map of CPMTowers as input */
- std::map<int, xAOD::CPMTower*>* towers = new std::map<int, xAOD::CPMTower*>;
+ xAOD::CPMTowerMap_t* towers = new xAOD::CPMTowerMap_t;
mapTowers(cpmts, towers);
/** Now find the RoIs in this map */
findCPMTobRoIs(towers, rois, slice);
/** Clean up */
- for (std::map<int, xAOD::CPMTower*>::iterator it = towers->begin(); it != towers->end(); ++it) {
+ for (xAOD::CPMTowerMap_t::iterator it = towers->begin(); it != towers->end(); ++it) {
delete (*it).second;
}
delete towers;
@@ -225,7 +225,7 @@ void L1CPMTools::findCPMTobRoIs(const DataVector<xAOD::CPMTower>* cpmts, xAOD::C
/** Find all CPMTobRoIs in the event */
-void L1CPMTools::findCPMTobRoIs(const std::map<int, xAOD::CPMTower*>* towers, xAOD::CPMTobRoIContainer* rois, int slice) {
+void L1CPMTools::findCPMTobRoIs(const xAOD::CPMTowerMap_t* towers, xAOD::CPMTobRoIContainer* rois, int slice) {
/** Clear results vector to be safe */
rois->clear();
@@ -237,7 +237,7 @@ void L1CPMTools::findCPMTobRoIs(const std::map<int, xAOD::CPMTower*>* towers, xA
TriggerTowerKey testKey(0.0, 0.0);
std::map<int, int> analysed;
- std::map<int, xAOD::CPMTower*>::const_iterator cpmt = towers->begin();
+ xAOD::CPMTowerMap_t::const_iterator cpmt = towers->begin();
for ( ; cpmt != towers->end(); ++cpmt) {
double eta = (*cpmt).second->eta();
double phi = (*cpmt).second->phi();
@@ -276,14 +276,14 @@ void L1CPMTools::findCPMTobRoIs(const std::map<int, xAOD::CPMTower*>* towers, xA
void L1CPMTools::findRoIs(const DataVector<xAOD::CPMTower>* cpmts, DataVector<CPMTobAlgorithm>* tobs, int slice){
/** Need a map of CPMTowers as input */
- std::map<int, xAOD::CPMTower*>* towers = new std::map<int, xAOD::CPMTower*>;
+ xAOD::CPMTowerMap_t* towers = new xAOD::CPMTowerMap_t;
mapTowers(cpmts, towers);
/** Now find the RoIs in this map */
findRoIs(towers, tobs, slice);
/** Clean up */
- for (std::map<int, xAOD::CPMTower*>::iterator it = towers->begin(); it != towers->end(); ++it) {
+ for (xAOD::CPMTowerMap_t::iterator it = towers->begin(); it != towers->end(); ++it) {
delete (*it).second;
}
delete towers;
@@ -291,7 +291,7 @@ void L1CPMTools::findRoIs(const DataVector<xAOD::CPMTower>* cpmts, DataVector<CP
/** Find list of TOBs from user-supplied map of CPMTowers */
-void L1CPMTools::findRoIs(const std::map<int, xAOD::CPMTower*>* towers, DataVector<CPMTobAlgorithm>* tobs, int slice){
+void L1CPMTools::findRoIs(const xAOD::CPMTowerMap_t* towers, DataVector<CPMTobAlgorithm>* tobs, int slice){
/** Clear results vector to be safe */
tobs->clear();
@@ -303,7 +303,7 @@ void L1CPMTools::findRoIs(const std::map<int, xAOD::CPMTower*>* towers, DataVect
TriggerTowerKey testKey(0.0, 0.0);
std::map<int, int> analysed;
- std::map<int, xAOD::CPMTower*>::const_iterator cpmt = towers->begin();
+ xAOD::CPMTowerMap_t::const_iterator cpmt = towers->begin();
for ( ; cpmt != towers->end(); ++cpmt) {
double eta = (*cpmt).second->eta();
double phi = (*cpmt).second->phi();
@@ -327,7 +327,7 @@ void L1CPMTools::findRoIs(const std::map<int, xAOD::CPMTower*>* towers, DataVect
}
/** CPMTower map from user-supplied vector of CPMTowers */
-void L1CPMTools::mapTowers(const DataVector<xAOD::CPMTower>* cpmts, std::map<int, xAOD::CPMTower*>* towers){
+void L1CPMTools::mapTowers(const DataVector<xAOD::CPMTower>* cpmts, xAOD::CPMTowerMap_t* towers){
// Clear map before filling
towers->clear();
@@ -341,7 +341,7 @@ void L1CPMTools::mapTowers(const DataVector<xAOD::CPMTower>* cpmts, std::map<int
if (fabs(TriggerTowerEta) < 2.5) { // limit of em/tau coverage
double TriggerTowerPhi=(*it)->phi();
int key = testKey.ttKey(TriggerTowerPhi,TriggerTowerEta);
- std::map<int, xAOD::CPMTower *>::iterator test=towers->find( key );
+ xAOD::CPMTowerMap_t::iterator test=towers->find( key );
if (test != towers->end()){
ATH_MSG_ERROR( "ERROR: tower already in map!" );
}
@@ -353,7 +353,7 @@ void L1CPMTools::mapTowers(const DataVector<xAOD::CPMTower>* cpmts, std::map<int
if ((*it2) > 0) nonZero = true;
for (std::vector<uint8_t>::iterator it2 = hadEt.begin(); it2 != hadEt.end(); ++it2)
if ((*it2) > 0) nonZero = true;
- if (nonZero) towers->insert(std::map<int, xAOD::CPMTower*>::value_type(key,(*it)));
+ if (nonZero) towers->insert(xAOD::CPMTowerMap_t::value_type(key,(*it)));
}
}
}//endfor
@@ -363,7 +363,7 @@ void L1CPMTools::mapTowers(const DataVector<xAOD::CPMTower>* cpmts, std::map<int
/** Return RoI for given coordinates */
-CPMTobAlgorithm L1CPMTools::findRoI(double RoIeta, double RoIphi, const std::map<int, xAOD::CPMTower*>* towers, int slice) {
+CPMTobAlgorithm L1CPMTools::findRoI(double RoIeta, double RoIphi, const xAOD::CPMTowerMap_t* towers, int slice) {
// Performs all processing for this location
CPMTobAlgorithm roi(RoIeta, RoIphi, towers, m_configSvc, slice);
@@ -374,7 +374,7 @@ CPMTobAlgorithm L1CPMTools::findRoI(double RoIeta, double RoIphi, const std::map
/** Form clusters for given coordinates */
-void L1CPMTools::formSums(double RoIeta, double RoIphi, const std::map<int, xAOD::CPMTower*>* towers, int slice) {
+void L1CPMTools::formSums(double RoIeta, double RoIphi, const xAOD::CPMTowerMap_t* towers, int slice) {
// Leak prevention
if (m_RoI != 0) delete m_RoI;
@@ -386,7 +386,7 @@ void L1CPMTools::formSums(double RoIeta, double RoIphi, const std::map<int, xAOD
/** Form sums for given RoI */
-void L1CPMTools::formSums(uint32_t roiWord, const std::map<int, xAOD::CPMTower*>* towers, int slice) {
+void L1CPMTools::formSums(uint32_t roiWord, const xAOD::CPMTowerMap_t* towers, int slice) {
// Leak prevention
if (m_RoI != 0) delete m_RoI;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx
index 881d1cbcbc9..f7a469b7c7c 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx
@@ -10,6 +10,9 @@
namespace LVL1 {
+typedef std::vector<TriggerTowerMap_t::mapped_type> TriggerTowerVector_t;
+typedef std::vector<xAOD::TriggerTowerMap_t::mapped_type> xAODTriggerTowerVector_t;
+
/** Constructor */
L1CPMTowerTools::L1CPMTowerTools(const std::string& t,
@@ -55,7 +58,7 @@ void L1CPMTowerTools::makeCPMTowers(const DataVector<TriggerTower>* triggerTower
towers to correct element
Right now this is redundant, but when TT becomes a single-layer object <br>
we'll need this bit */
- std::map< int, std::vector<TriggerTower*> > Sums;
+ std::map< int, TriggerTowerVector_t > Sums;
// Step over all TriggerTowers, and put into map
TTCollection::const_iterator it ;
@@ -68,16 +71,16 @@ void L1CPMTowerTools::makeCPMTowers(const DataVector<TriggerTower>* triggerTower
// Find TriggerTowerKey for this TriggerTower
int key = testKey.ttKey((*it)->phi(),(*it)->eta());
// Does the map already contain an entry for this CPMTower?
- std::map< int, std::vector<TriggerTower*> >::iterator mapIt=Sums.find(key);
+ std::map< int, TriggerTowerVector_t >::iterator mapIt=Sums.find(key);
if (mapIt != Sums.end()) {
// Add pointer to this tower to the list
(mapIt->second).push_back((*it));
}
else {
// New entry in map.
- std::vector<TriggerTower*> vec;
+ TriggerTowerVector_t vec;
vec.push_back((*it));
- Sums.insert(std::map< int, std::vector<TriggerTower*> >::value_type(key,vec));
+ Sums.insert(std::map< int, TriggerTowerVector_t >::value_type(key,vec));
}
} // end of loop over towers
@@ -89,11 +92,11 @@ void L1CPMTowerTools::makeCPMTowers(const DataVector<TriggerTower>* triggerTower
the same lengths. In this case, we need to be careful how we combine <br>
them. */
- for (std::map< int, std::vector<TriggerTower*> >::iterator mapIt = Sums.begin();
+ for (std::map< int, TriggerTowerVector_t >::iterator mapIt = Sums.begin();
mapIt != Sums.end(); ++mapIt) {
// Get first TT for this CPMT
- std::vector<TriggerTower*>::iterator it = (mapIt->second).begin();
+ TriggerTowerVector_t::iterator it = (mapIt->second).begin();
if (it != (mapIt->second).end()) {
// Get CPMT eta, phi using first tower in vector (either tower in CPMT should do)
double phi = (*it)->phi();
@@ -143,7 +146,7 @@ void L1CPMTowerTools::makeCPMTowers(const DataVector<xAOD::TriggerTower>* trigge
towers to correct element
Right now this is redundant, but when TT becomes a single-layer object <br>
we'll need this bit */
- std::map< int, std::vector<xAOD::TriggerTower*> > Sums;
+ std::map< int, xAODTriggerTowerVector_t > Sums;
// Step over all TriggerTowers, and put into map
xAODTTCollection::const_iterator it ;
@@ -156,16 +159,16 @@ void L1CPMTowerTools::makeCPMTowers(const DataVector<xAOD::TriggerTower>* trigge
// Find TriggerTowerKey for this TriggerTower
int key = testKey.ttKey((*it)->phi(),(*it)->eta());
// Does the map already contain an entry for this CPMTower?
- std::map< int, std::vector<xAOD::TriggerTower*> >::iterator mapIt=Sums.find(key);
+ std::map< int, xAODTriggerTowerVector_t >::iterator mapIt=Sums.find(key);
if (mapIt != Sums.end()) {
// Add pointer to this tower to the list
(mapIt->second).push_back((*it));
}
else {
// New entry in map.
- std::vector<xAOD::TriggerTower*> vec;
+ xAODTriggerTowerVector_t vec;
vec.push_back((*it));
- Sums.insert(std::map< int, std::vector<xAOD::TriggerTower*> >::value_type(key,vec));
+ Sums.insert(std::map< int, xAODTriggerTowerVector_t >::value_type(key,vec));
}
} // end of loop over towers
@@ -177,7 +180,7 @@ void L1CPMTowerTools::makeCPMTowers(const DataVector<xAOD::TriggerTower>* trigge
the same lengths. In this case, we need to be careful how we combine <br>
them. */
- for (std::map< int, std::vector<xAOD::TriggerTower*> >::iterator mapIt = Sums.begin();
+ for (std::map< int, xAODTriggerTowerVector_t >::iterator mapIt = Sums.begin();
mapIt != Sums.end(); ++mapIt) {
// create empty result vectors containing a single element
@@ -190,7 +193,7 @@ void L1CPMTowerTools::makeCPMTowers(const DataVector<xAOD::TriggerTower>* trigge
int Peak = 0;
// Get first TT for this CPMT
- std::vector<xAOD::TriggerTower*>::iterator it = (mapIt->second).begin();
+ xAODTriggerTowerVector_t::iterator it = (mapIt->second).begin();
if (it != (mapIt->second).end()) {
// Get CPMT eta, phi using first tower in vector (either tower in CPMT should do)
double phi = (*it)->phi();
@@ -236,7 +239,7 @@ void L1CPMTowerTools::makeCPMTowers(const DataVector<xAOD::TriggerTower>* trigge
towers to correct element
Right now this is redundant, but when TT becomes a single-layer object <br>
we'll need this bit */
- std::map< int, std::vector<xAOD::TriggerTower*> > Sums;
+ std::map< int, xAODTriggerTowerVector_t > Sums;
// Step over all TriggerTowers, and put into map
xAODTTCollection::const_iterator it ;
@@ -249,16 +252,16 @@ void L1CPMTowerTools::makeCPMTowers(const DataVector<xAOD::TriggerTower>* trigge
// Find TriggerTowerKey for this TriggerTower
int key = testKey.ttKey((*it)->phi(),(*it)->eta());
// Does the map already contain an entry for this CPMTower?
- std::map< int, std::vector<xAOD::TriggerTower*> >::iterator mapIt=Sums.find(key);
+ std::map< int, xAODTriggerTowerVector_t >::iterator mapIt=Sums.find(key);
if (mapIt != Sums.end()) {
// Add pointer to this tower to the list
(mapIt->second).push_back((*it));
}
else {
// New entry in map.
- std::vector<xAOD::TriggerTower*> vec;
+ xAODTriggerTowerVector_t vec;
vec.push_back((*it));
- Sums.insert(std::map< int, std::vector<xAOD::TriggerTower*> >::value_type(key,vec));
+ Sums.insert(std::map< int, xAODTriggerTowerVector_t >::value_type(key,vec));
}
} // end of loop over towers
@@ -270,7 +273,7 @@ void L1CPMTowerTools::makeCPMTowers(const DataVector<xAOD::TriggerTower>* trigge
the same lengths. In this case, we need to be careful how we combine <br>
them. */
- for (std::map< int, std::vector<xAOD::TriggerTower*> >::iterator mapIt = Sums.begin();
+ for (std::map< int, xAODTriggerTowerVector_t >::iterator mapIt = Sums.begin();
mapIt != Sums.end(); ++mapIt) {
// create empty result vectors containing a single element
@@ -283,7 +286,7 @@ void L1CPMTowerTools::makeCPMTowers(const DataVector<xAOD::TriggerTower>* trigge
int Peak = 0;
// Get first TT for this CPMT
- std::vector<xAOD::TriggerTower*>::iterator it = (mapIt->second).begin();
+ xAODTriggerTowerVector_t::iterator it = (mapIt->second).begin();
if (it != (mapIt->second).end()) {
// Get CPMT eta, phi using first tower in vector (either tower in CPMT should do)
double phi = (*it)->phi();
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
index ace02143d5f..39e884292a5 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
@@ -37,18 +37,18 @@ public:
class ParamFuncPol2 : public L1DynamicPedestalProviderTxt::ParamFunc {
public:
- ParamFuncPol2(double p0, double p1, double p2) : p_{p0, p1, p2} {}
- virtual double operator()(double mu) { return p_[0] + p_[1]*mu + p_[2]*mu*mu; }
+ ParamFuncPol2(double p0, double p1, double p2) : m_p{{p0, p1, p2}} {}
+ virtual double operator()(double mu) { return m_p[0] + m_p[1]*mu + m_p[2]*mu*mu; }
private:
- std::array<double, 3> p_;
+ std::array<double, 3> m_p;
};
class ParamFuncExp : public L1DynamicPedestalProviderTxt::ParamFunc {
public:
- ParamFuncExp(double p0, double p1, double p2) : p_{p0, p1, p2} {}
- virtual double operator()(double mu) { return p_[0]*(1-exp(-p_[1]*mu)) + p_[2]*mu; }
+ ParamFuncExp(double p0, double p1, double p2) : m_p{{p0, p1, p2}} {}
+ virtual double operator()(double mu) { return m_p[0]*(1-exp(-m_p[1]*mu)) + m_p[2]*mu; }
private:
- std::array<double, 3> p_;
+ std::array<double, 3> m_p;
};
//================ Constructor ================================================
@@ -175,15 +175,15 @@ void printPatternParsingInfo(Log& log, const Tool& tool, const ResultVector& res
log << MSG::VERBOSE << "Filled ";
for(bcid_t j = bcid; j != std::min(MAX_BCID, bcid+20); ++j) log << std::setw(3) << tool->isFilled(j) << " ";
- log << endreq;
+ log << endmsg;
log << MSG::VERBOSE << "Distance ";
for(bcid_t j = bcid; j != std::min(MAX_BCID, bcid+20); ++j) log << std::setw(3) << result[j].second << " ";
- log << endreq;
+ log << endmsg;
log << MSG::VERBOSE << "LongGap? ";
for(bcid_t j = bcid; j != std::min(MAX_BCID, bcid+20); ++j) log << std::setw(3) << result[j].first << " ";
- log << endreq;
+ log << endmsg;
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx
index 449986d1aeb..24d8e12d25e 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx
@@ -51,7 +51,7 @@ StatusCode L1EmTauTools::finalize()
/** Find list of RoIs passing at least 1 threshold */
-void L1EmTauTools::findRoIs(const std::map<int, CPMTower*>* towers, DataVector<CPAlgorithm>* rois, int slice){
+void L1EmTauTools::findRoIs(const CPMTowerMap_t* towers, DataVector<CPAlgorithm>* rois, int slice){
// Start with an empty DataVector
rois->clear();
@@ -63,7 +63,7 @@ void L1EmTauTools::findRoIs(const std::map<int, CPMTower*>* towers, DataVector<C
TriggerTowerKey testKey(0.0, 0.0);
std::map<int, int> analysed;
- std::map<int, CPMTower*>::const_iterator cpmt = towers->begin();
+ CPMTowerMap_t::const_iterator cpmt = towers->begin();
for ( ; cpmt != towers->end(); ++cpmt) {
double eta = (*cpmt).second->eta();
double phi = (*cpmt).second->phi();
@@ -90,17 +90,17 @@ void L1EmTauTools::findRoIs(const std::map<int, CPMTower*>* towers, DataVector<C
}
/** Find list of RoIs from user-supplied map of TriggerTowers */
-void L1EmTauTools::findRoIs(const std::map<int, TriggerTower*>* tts, DataVector<CPAlgorithm>* rois, int slice){
+void L1EmTauTools::findRoIs(const TriggerTowerMap_t* tts, DataVector<CPAlgorithm>* rois, int slice){
/** Need a map of CPMTowers as input */
- std::map<int, CPMTower*>* towers = new std::map<int, CPMTower*>;
+ CPMTowerMap_t* towers = new CPMTowerMap_t;
mapTowers(tts, towers);
/** Now find the RoIs in this map */
findRoIs(towers, rois, slice);
/** Clean up CPMTowers */
- for (std::map<int, CPMTower*>::iterator it = towers->begin(); it != towers->end(); ++it) {
+ for (CPMTowerMap_t::iterator it = towers->begin(); it != towers->end(); ++it) {
delete (*it).second;
}
delete towers;
@@ -110,7 +110,7 @@ void L1EmTauTools::findRoIs(const std::map<int, TriggerTower*>* tts, DataVector<
void L1EmTauTools::findRoIs(const DataVector<CPMTower>* cpmts, DataVector<CPAlgorithm>* rois, int slice){
/** Need a map of CPMTowers as input */
- std::map<int, CPMTower*>* towers = new std::map<int, CPMTower*>;
+ CPMTowerMap_t* towers = new CPMTowerMap_t;
mapTowers(cpmts, towers);
/** Now find the RoIs in this map */
@@ -124,21 +124,21 @@ void L1EmTauTools::findRoIs(const DataVector<CPMTower>* cpmts, DataVector<CPAlgo
void L1EmTauTools::findRoIs(const DataVector<TriggerTower>* tts, DataVector<CPAlgorithm>* rois, int slice){
/** Need a map of CPMTowers as input */
- std::map<int, CPMTower*>* towers = new std::map<int, CPMTower*>;
+ CPMTowerMap_t* towers = new CPMTowerMap_t;
mapTowers(tts, towers);
/** Now find the RoIs in this map */
findRoIs(towers, rois, slice);
/** Clean up CPMTowers */
- for (std::map<int, CPMTower*>::iterator it = towers->begin(); it != towers->end(); ++it) {
+ for (CPMTowerMap_t::iterator it = towers->begin(); it != towers->end(); ++it) {
delete (*it).second;
}
delete towers;
}
/** CPMTower map from user-supplied vector of TriggerTowers */
-void L1EmTauTools::mapTowers(const DataVector<TriggerTower>* tts, std::map<int, CPMTower*>* towers){
+void L1EmTauTools::mapTowers(const DataVector<TriggerTower>* tts, CPMTowerMap_t* towers){
// Clear map before filling
towers->clear();
@@ -153,7 +153,7 @@ void L1EmTauTools::mapTowers(const DataVector<TriggerTower>* tts, std::map<int,
if (fabs(TriggerTowerEta) < 2.5) { // limit of em/tau coverage
double TriggerTowerPhi=(*it)->phi();
int key = testKey.ttKey(TriggerTowerPhi,TriggerTowerEta);
- std::map<int, CPMTower *>::iterator test=towers->find( key );
+ CPMTowerMap_t::iterator test=towers->find( key );
if (test != towers->end()){
ATH_MSG_ERROR( "ERROR: tower already in map!" );
}
@@ -182,7 +182,7 @@ void L1EmTauTools::mapTowers(const DataVector<TriggerTower>* tts, std::map<int,
}
/** CPMTower map from user-supplied vector of CPMTowers */
-void L1EmTauTools::mapTowers(const DataVector<CPMTower>* cpmts, std::map<int, CPMTower*>* towers){
+void L1EmTauTools::mapTowers(const DataVector<CPMTower>* cpmts, CPMTowerMap_t* towers){
// Clear map before filling
towers->clear();
@@ -196,7 +196,7 @@ void L1EmTauTools::mapTowers(const DataVector<CPMTower>* cpmts, std::map<int, CP
if (fabs(TriggerTowerEta) < 2.5) { // limit of em/tau coverage
double TriggerTowerPhi=(*it)->phi();
int key = testKey.ttKey(TriggerTowerPhi,TriggerTowerEta);
- std::map<int, CPMTower *>::iterator test=towers->find( key );
+ CPMTowerMap_t::iterator test=towers->find( key );
if (test != towers->end()){
ATH_MSG_ERROR( "ERROR: tower already in map!" );
}
@@ -208,7 +208,7 @@ void L1EmTauTools::mapTowers(const DataVector<CPMTower>* cpmts, std::map<int, CP
if ((*it2) > 0) nonZero = true;
for (std::vector<int>::iterator it2 = hadEt.begin(); it2 != hadEt.end(); ++it2)
if ((*it2) > 0) nonZero = true;
- if (nonZero) towers->insert(std::map<int, CPMTower*>::value_type(key,(*it)));
+ if (nonZero) towers->insert(CPMTowerMap_t::value_type(key,(*it)));
}
}
}//endfor
@@ -217,13 +217,13 @@ void L1EmTauTools::mapTowers(const DataVector<CPMTower>* cpmts, std::map<int, CP
}
/** CPMTower map from user-supplied TriggerTower map */
-void L1EmTauTools::mapTowers(const std::map<int, TriggerTower*>* tts, std::map<int, CPMTower*>* towers){
+void L1EmTauTools::mapTowers(const TriggerTowerMap_t* tts, CPMTowerMap_t* towers){
// Clear map before filling
towers->clear();
// Step over all TriggerTowers, and put into map
- std::map<int, TriggerTower*>::const_iterator it ;
+ TriggerTowerMap_t::const_iterator it ;
TriggerTowerKey testKey(0.0, 0.0);
CPMTower* cpmTower;
@@ -232,7 +232,7 @@ void L1EmTauTools::mapTowers(const std::map<int, TriggerTower*>* tts, std::map<i
if (fabs(TriggerTowerEta) < 2.5) { // limit of em/tau coverage
double TriggerTowerPhi=(*it).second->phi();
int key = testKey.ttKey(TriggerTowerPhi,TriggerTowerEta);
- std::map<int, CPMTower *>::iterator test=towers->find( key );
+ CPMTowerMap_t::iterator test=towers->find( key );
if (test != towers->end()){
ATH_MSG_ERROR( "ERROR: tower already in map!" );
}
@@ -262,7 +262,7 @@ void L1EmTauTools::mapTowers(const std::map<int, TriggerTower*>* tts, std::map<i
/** Return RoI for given coordinates */
-CPAlgorithm L1EmTauTools::findRoI(double RoIeta, double RoIphi, const std::map<int, CPMTower*>* towers, int slice) {
+CPAlgorithm L1EmTauTools::findRoI(double RoIeta, double RoIphi, const CPMTowerMap_t* towers, int slice) {
// Performs all processing for this location
CPAlgorithm roi(RoIeta, RoIphi, towers, m_configSvc, slice);
@@ -273,7 +273,7 @@ CPAlgorithm L1EmTauTools::findRoI(double RoIeta, double RoIphi, const std::map<i
/** Form clusters for given coordinates */
-void L1EmTauTools::formSums(double RoIeta, double RoIphi, const std::map<int, CPMTower*>* towers, int slice) {
+void L1EmTauTools::formSums(double RoIeta, double RoIphi, const CPMTowerMap_t* towers, int slice) {
// Leak prevention
if (m_RoI != 0) delete m_RoI;
@@ -285,7 +285,7 @@ void L1EmTauTools::formSums(double RoIeta, double RoIphi, const std::map<int, CP
/** Form sums for given RoI */
-void L1EmTauTools::formSums(uint32_t roiWord, const std::map<int, CPMTower*>* towers, int slice) {
+void L1EmTauTools::formSums(uint32_t roiWord, const CPMTowerMap_t* towers, int slice) {
// Leak prevention
if (m_RoI != 0) delete m_RoI;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
index ce8bd032a83..6c421738d7b 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
@@ -123,16 +123,15 @@ void L1EnergyCMXTools::formJEMEtSums(
}
}
// Process each slice
- std::map<int, xAOD::JetElement *> *jeMap = new std::map<int, xAOD::JetElement *>;
- m_jeTool->mapJetElements(jetElementVec, jeMap);
+ xAOD::JetElementMap_t jeMap;
+ m_jeTool->mapJetElements(jetElementVec, &jeMap);
MultiSliceModuleEnergy modulesVec;
for (unsigned int slice = 0; slice < nslices; ++slice)
{
DataVector<ModuleEnergy> *modules = new DataVector<ModuleEnergy>;
modulesVec.push_back(modules);
- m_etTool->moduleSums(jeMap, modules, slice);
+ m_etTool->moduleSums(&jeMap, modules, slice);
}
- delete jeMap;
// Convert to JEMEtSums
moduleEnergyToEtSums(modulesVec, jemEtSumsVec, peak);
MultiSliceModuleEnergy::iterator miter = modulesVec.begin();
@@ -500,7 +499,7 @@ void L1EnergyCMXTools::moduleEnergyToEtSums(
DataVector<ModuleEnergy>::const_iterator pose = modules->end();
for (; pos != pose; ++pos)
{
- ModuleEnergy *energy = *pos;
+ const ModuleEnergy *energy = *pos;
//unsigned int ex = energy->exCompressed();
//unsigned int ey = energy->eyCompressed();
//unsigned int et = energy->etCompressed();
@@ -554,7 +553,7 @@ void L1EnergyCMXTools::crateEnergyToEtSums(
DataVector<CrateEnergy>::const_iterator pose = crates->end();
for (; pos != pose; ++pos)
{
- CrateEnergy *energy = *pos;
+ const CrateEnergy *energy = *pos;
unsigned int ex = energy->exTC();
unsigned int ey = energy->eyTC();
unsigned int et = energy->et();
@@ -651,7 +650,7 @@ void L1EnergyCMXTools::crateEnergyToEtSums(
for (auto pos : *crates)
{
int source = origSource;
- CrateEnergy *energy = pos;
+ const CrateEnergy *energy = pos;
unsigned int ex = energy->exTC();
unsigned int ey = energy->eyTC();
unsigned int et = energy->et();
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx
index 092aa05201c..8f24d04929b 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx
@@ -98,7 +98,7 @@ void L1EtTools::fillMaskedOutMap() {
//================ Having map of JetElements facilitates JE->JEM association =====
void L1EtTools::mapJetElements(const xAOD::JetElementContainer* jetelements,
- std::map<int, xAOD::JetElement*>* jeContainer){
+ xAOD::JetElementMap_t* jeContainer){
// Clear map before filling
jeContainer->clear();
@@ -111,10 +111,10 @@ void L1EtTools::mapJetElements(const xAOD::JetElementContainer* jetelements,
double jetElementPhi=(*it)->phi();
double jetElementEta=(*it)->eta();
int key = testKey.jeKey(jetElementPhi,jetElementEta);
- std::map<int, xAOD::JetElement*>::iterator test=jeContainer->find( key );
+ xAOD::JetElementMap_t::iterator test=jeContainer->find( key );
if (test == jeContainer->end()){
// add it to the map
- jeContainer->insert(std::map<int, xAOD::JetElement*>::value_type(key,*it)); //and put it in the map.
+ jeContainer->insert(xAOD::JetElementMap_t::value_type(key,*it)); //and put it in the map.
}
else{
ATH_MSG_ERROR( "JetElement already in map (shouldn't happen!) ");
@@ -134,7 +134,7 @@ void L1EtTools::moduleSums(const xAOD::JetElementContainer* jetelements,
//if (!m_TEMasks) fillMaskedOutMap();
// Need map of JetElements as input to ModuleEnergy class creator
- std::map<int, xAOD::JetElement*>* jeContainer = new std::map<int, xAOD::JetElement*>;
+ xAOD::JetElementMap_t* jeContainer = new xAOD::JetElementMap_t;
mapJetElements(jetelements, jeContainer);
// Loop over crates, modules and create set of ModuleEnergy objects
@@ -151,7 +151,7 @@ void L1EtTools::moduleSums(const xAOD::JetElementContainer* jetelements,
//=====================Form JEM ET sums ====================
-void L1EtTools::moduleSums(const std::map<int, xAOD::JetElement*>* jemap,
+void L1EtTools::moduleSums(const xAOD::JetElementMap_t* jemap,
DataVector<ModuleEnergy>* modules, int slice) {
modules->clear();
@@ -228,7 +228,7 @@ void L1EtTools::crateSums(const xAOD::JetElementContainer* jetelements,
//=====================Return JE Crate ET sums directly =============
-void L1EtTools::crateSums(const std::map<int, xAOD::JetElement*>* jemap,
+void L1EtTools::crateSums(const xAOD::JetElementMap_t* jemap,
DataVector<CrateEnergy>* crates, int slice, float etaMaxXE, float etaMaxTE, bool restricted) {
crates->clear();
@@ -266,7 +266,7 @@ SystemEnergy L1EtTools::systemSums(const xAOD::JetElementContainer* jetelements,
//=====================Return final System ET sums directly =============
-SystemEnergy L1EtTools::systemSums(const std::map<int, xAOD::JetElement*>* jemap, int slice, float etaMaxXE, float etaMaxTE, bool restricted) {
+SystemEnergy L1EtTools::systemSums(const xAOD::JetElementMap_t* jemap, int slice, float etaMaxXE, float etaMaxTE, bool restricted) {
// First need to form modules and crates
DataVector<CrateEnergy>* crates = new DataVector<CrateEnergy>;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx
index 397666dfbf5..6eb1ec3ef15 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx
@@ -105,15 +105,14 @@ void L1JEPEtSumsTools::formJEMEtSums(
}
}
// Process each slice
- std::map<int, xAOD::JetElement*>* jeMap = new std::map<int, xAOD::JetElement*>;
- m_jeTool->mapJetElements(jetElementVec, jeMap);
+ xAOD::JetElementMap_t jeMap;
+ m_jeTool->mapJetElements(jetElementVec, &jeMap);
MultiSliceModuleEnergy modulesVec;
for (unsigned int slice = 0; slice < nslices; ++slice) {
DataVector<ModuleEnergy>* modules = new DataVector<ModuleEnergy>;
modulesVec.push_back(modules);
- m_etTool->moduleSums(jeMap, modules, slice);
+ m_etTool->moduleSums(&jeMap, modules, slice);
}
- delete jeMap;
// Convert to JEMEtSums
moduleEnergyToEtSums(modulesVec, jemEtSumsVec, peak);
MultiSliceModuleEnergy::iterator miter = modulesVec.begin();
@@ -373,7 +372,7 @@ void L1JEPEtSumsTools::moduleEnergyToEtSums(
DataVector<ModuleEnergy>::const_iterator pos = modules->begin();
DataVector<ModuleEnergy>::const_iterator pose = modules->end();
for (; pos != pose; ++pos) {
- ModuleEnergy* energy = *pos;
+ const ModuleEnergy* energy = *pos;
unsigned int ex = energy->ex();
unsigned int ey = energy->ey();
unsigned int et = energy->et();
@@ -416,7 +415,7 @@ void L1JEPEtSumsTools::crateEnergyToEtSums(
DataVector<CrateEnergy>::const_iterator pos = crates->begin();
DataVector<CrateEnergy>::const_iterator pose = crates->end();
for (; pos != pose; ++pos) {
- CrateEnergy* energy = *pos;
+ const CrateEnergy* energy = *pos;
unsigned int ex = energy->exTC();
unsigned int ey = energy->eyTC();
unsigned int et = energy->et();
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx
index 6b27a66a25d..8c4c087fbd3 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx
@@ -52,13 +52,13 @@ StatusCode L1JetCMXTools::initialize() {
StatusCode sc = m_configSvc.retrieve();
if (sc.isFailure()) {
msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName()
- << endreq;
+ << endmsg;
return sc;
} else if (m_debug) {
- msg(MSG::DEBUG) << "Connected to " << m_configSvc.typeAndName() << endreq;
+ msg(MSG::DEBUG) << "Connected to " << m_configSvc.typeAndName() << endmsg;
}
- msg(MSG::INFO) << "Initialization completed" << endreq;
+ msg(MSG::INFO) << "Initialization completed" << endmsg;
return sc;
}
@@ -360,7 +360,7 @@ void L1JetCMXTools::getHits(const xAOD::CMXJetTob *tob, HitsVector &hit10,
std::vector<TrigConf::TriggerThreshold *> thresholds =
m_configSvc->ctpConfig()->menu().thresholdVector();
std::vector<TriggerThreshold *>::const_iterator it;
- std::vector<TriggerThreshold *>::const_iterator itE = thresholds.end();
+ //std::vector<TriggerThreshold *>::const_iterator itE = thresholds.end();
for (int slice = 0; slice < timeslices; ++slice) {
if (err.get(LVL1::DataError::Overflow)) {
hit10[slice] = 0x7fff;
@@ -449,13 +449,13 @@ unsigned int L1JetCMXTools::addHits(unsigned int hitMult, unsigned int hitVec,
int nthresh) const {
if (m_debug)
msg(MSG::DEBUG) << "addHits: Original hitMult = " << std::hex << hitMult
- << ". Add hitWord = " << hitVec << std::dec << endreq;
+ << ". Add hitWord = " << hitVec << std::dec << endmsg;
int nbitsOut = multBits / nthresh;
int nbitsIn = vecBits / nthresh;
if (m_debug)
- msg(MSG::DEBUG) << " Bits per threshold = " << nbitsOut << endreq;
+ msg(MSG::DEBUG) << " Bits per threshold = " << nbitsOut << endmsg;
int max = (1 << nbitsOut) - 1;
unsigned int multMask = max;
@@ -476,7 +476,7 @@ unsigned int L1JetCMXTools::addHits(unsigned int hitMult, unsigned int hitVec,
if (m_debug)
msg(MSG::DEBUG) << "addHits returning hitMult = " << std::hex << hits
- << std::dec << endreq;
+ << std::dec << endmsg;
return hits;
}
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx
index 88b434a8c37..f5a10adb6f2 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx
@@ -14,6 +14,8 @@
namespace LVL1 {
+typedef std::vector<TriggerTowerMap_t::mapped_type> TriggerTowerVector_t;
+
/** Constructor */
L1JetElementTools::L1JetElementTools(const std::string& t,
@@ -128,7 +130,7 @@ void L1JetElementTools::makeJetElements(const xAOD::TriggerTowerContainer* tts,
/** Fill map of JetElements from user-supplied vector of TriggerTowers */
-void L1JetElementTools::mapJetElements(const xAOD::JetElementContainer* jetElements, std::map<int, xAOD::JetElement*>* map){
+void L1JetElementTools::mapJetElements(const xAOD::JetElementContainer* jetElements, xAOD::JetElementMap_t* map){
// Clear map before filling
map->clear();
@@ -139,7 +141,7 @@ void L1JetElementTools::mapJetElements(const xAOD::JetElementContainer* jetEleme
it != jetElements->end(); ++it) {
// As long as JetElement contains the key value, lazy (& quick) option is to use it
int key = (*it)->key();
- map->insert(std::map<int, xAOD::JetElement*>::value_type(key,(*it)));
+ map->insert(std::make_pair(key,(*it)));
}
return;
@@ -155,7 +157,7 @@ void L1JetElementTools::makeJetElements(const DataVector<TriggerTower>* tts, Dat
Store these in a vector for each JetElement <br>
Keep vectors of pointers in a std::map so can easily locate and add more <br>
towers to correct element */
- std::map< int, std::vector<TriggerTower*> > Sums;
+ std::map< int, TriggerTowerVector_t> Sums;
// Step over all TriggerTowers, and put into map
DataVector<TriggerTower>::const_iterator it ;
@@ -165,16 +167,16 @@ void L1JetElementTools::makeJetElements(const DataVector<TriggerTower>* tts, Dat
// Find JetElementKey for this TriggerTower
int key = testKey.jeKey((*it)->phi(),(*it)->eta());
// Does the map already contain an entry for this JetElement?
- std::map< int, std::vector<TriggerTower*> >::iterator mapIt=Sums.find(key);
+ std::map< int, TriggerTowerVector_t>::iterator mapIt=Sums.find(key);
if (mapIt != Sums.end()) {
// Add pointer to this tower to the list
(mapIt->second).push_back((*it));
}
else {
// New entry in map.
- std::vector<TriggerTower*> vec;
+ TriggerTowerVector_t vec;
vec.push_back((*it));
- Sums.insert(std::map< int, std::vector<TriggerTower*> >::value_type(key,vec));
+ Sums.insert(std::map< int, TriggerTowerVector_t >::value_type(key,vec));
}
} // end of loop over towers
@@ -186,11 +188,11 @@ void L1JetElementTools::makeJetElements(const DataVector<TriggerTower>* tts, Dat
the same lengths. In this case, we need to be careful how we combine <br>
them. */
- for (std::map< int, std::vector<TriggerTower*> >::iterator mapIt = Sums.begin();
+ for (std::map< int, TriggerTowerVector_t >::iterator mapIt = Sums.begin();
mapIt != Sums.end(); ++mapIt) {
// Get first TT for this JE
- std::vector<TriggerTower*>::iterator it = (mapIt->second).begin();
+ TriggerTowerVector_t::iterator it = (mapIt->second).begin();
if (it != (mapIt->second).end()) {
// Get JE eta, phi using first tower in vector (any tower in JE should do)
unsigned int key = testKey.jeKey((*it)->phi(),(*it)->eta());
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx
index 2bdb3db5fc6..14d7023d5fa 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx
@@ -13,6 +13,8 @@
#include "TrigConfL1Data/L1DataDef.h"
#include <cmath>
+using namespace TrigConf;
+
namespace LVL1 {
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
index b79f3ac79ef..6909e1811e4 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
@@ -152,8 +152,8 @@ void L1TriggerTowerTool::handle(const Incident& inc)
return;
}
// determine whether this is Run-1 or Run-2 to get the correct conditions later on
- EventID* pei = pevt->event_ID();
- EventType* pet = pevt->event_type();
+ const EventID* pei = pevt->event_ID();
+ const EventType* pet = pevt->event_type();
if(pei == 0 || pet == 0) {
ATH_MSG_WARNING("Cannot determine run");
return;
@@ -1142,8 +1142,8 @@ void L1TriggerTowerTool::bcidParams(const L1CaloCoolChannelId& channelId, int &e
} else ATH_MSG_WARNING( "::bcid:Params No Conditions Container retrieved" );
ATH_MSG_VERBOSE( "::bcidParams: satLevel: " << satLevel
- << " satLow: " << satLow << " satHigh: " << satHigh << endreq
- << " energyLow: " << energyLow << " energyHigh: " << energyHigh << endreq
+ << " satLow: " << satLow << " satHigh: " << satHigh << endmsg
+ << " energyLow: " << energyLow << " energyHigh: " << energyHigh << endmsg
<< " decisionSource: " << decisionSource << " peakFinderStrategy: "
<< peakFinderStrategy );
@@ -1309,15 +1309,15 @@ L1CaloCoolChannelId L1TriggerTowerTool::channelID(double eta, double phi, int la
int index = 0;
if (absEta < 2.5) {
const int etaBin = 10.*absEta;
- const int phiBin = phi/(M_PI/32.);
+ const int phiBin = phi*(32/M_PI);
index = (etaBin<<6) + phiBin;
} else if (absEta < 3.2) {
const int etaBin = 5.*(absEta - 2.5);
- const int phiBin = phi/(M_PI/16.);
+ const int phiBin = phi*(16./M_PI);
index = 1600 + (etaBin<<5) + phiBin;
} else {
- const int etaBin = (absEta - 3.2)/0.425;
- const int phiBin = phi/(M_PI/8.);
+ const int etaBin = (absEta - 3.2)*(1./0.425);
+ const int phiBin = phi*(8./M_PI);
index = 1728 + (etaBin<<4) + phiBin;
}
if (eta < 0.) index += 1792;
@@ -1512,7 +1512,7 @@ StatusCode L1TriggerTowerTool::loadFTRefs()
if (m_l1CondSvc) {
ATH_MSG_VERBOSE( "Retrieving FineTimeReferences Containers" );
- bool verbose = outputLevel() <= MSG::VERBOSE;
+ bool verbose = msgLvl(MSG::VERBOSE);
sc = m_l1CondSvc->retrieve(m_dbFineTimeRefsTowers);
--
GitLab