Commit fac80516 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'gcc12.TrigT1CaloMonitoring-20220113' into 'master'

TrigT1CaloMonitoring: Fix gcc12 warnings.

See merge request atlas/athena!49648
parents bba332ea 2b2d773a
......@@ -1927,7 +1927,7 @@ void CPSimMon::simulate(const CpmTowerMap *towers, const CpmTowerMap *towersOv,
// CpmTowerMap::const_iterator iter = towers->begin();
// CpmTowerMap::iterator iterE = towers->end();
// for (; iter != iterE; ++iter) {
for (const auto iter : *towers) {
for (const auto& iter : *towers) {
CpmTowerMap::mapped_type tt = ttCheck(iter.second, tempColl);
const LVL1::Coordinate coord(tt->phi(), tt->eta());
const int crate = converter.cpCrate(coord);
......@@ -1938,7 +1938,7 @@ void CPSimMon::simulate(const CpmTowerMap *towers, const CpmTowerMap *towersOv,
// If overlap data not present take from core data
// iter = (m_overlapPresent) ? towersOv.begin() : towers->begin();
// iterE = (m_overlapPresent) ? towersOv.end() : towers->end();
for (const auto iter : ((m_overlapPresent) ? *towersOv : *towers)) {
for (const auto& iter : ((m_overlapPresent) ? *towersOv : *towers)) {
//for (; iter != iterE; ++iter) {
CpmTowerMap::mapped_type tt = ttCheck(iter.second, tempColl);
const LVL1::Coordinate coord(tt->phi(), tt->eta());
......
......@@ -1836,7 +1836,7 @@ void CpmSimMonitorAlgorithm::simulate(const CpmTowerMap *towers, const CpmTowerM
std::unique_ptr<xAOD::CPMTowerAuxContainer> tempCollAux = std::make_unique<xAOD::CPMTowerAuxContainer>();
tempColl.get()->setStore(tempCollAux.get());
for (const auto iter : *towers) {
for (const auto& iter : *towers) {
CpmTowerMap::mapped_type tt = ttCheck(iter.second, tempColl.get());
const LVL1::Coordinate coord(tt->phi(), tt->eta());
const int crate = converter.cpCrate(coord);
......@@ -1845,7 +1845,7 @@ void CpmSimMonitorAlgorithm::simulate(const CpmTowerMap *towers, const CpmTowerM
crateMaps[crate].insert(std::make_pair(iter.first, tt));
}
// If overlap data not present take from core data
for (const auto iter : ((m_overlapPresent) ? *towersOv : *towers)) {
for (const auto& iter : ((m_overlapPresent) ? *towersOv : *towers)) {
CpmTowerMap::mapped_type tt = ttCheck(iter.second, tempColl.get());
const LVL1::Coordinate coord(tt->phi(), tt->eta());
const int crate = converter.cpCrateOverlap(coord);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment