Merge branch 'TowerContainer_findTower_bug' into 'master'

Changing eFEX FindTower function and eTowerContainer map

See merge request !46363

Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/eTowerContainer.h

@@ -27,6 +27,8 @@
 #include "CxxUtils/CachedValue.h"
 #include "AthLinks/tools/findInContainer.h"
 
+#include <unordered_map>
+
 namespace LVL1 {
 
 class eTowerContainer : public DataVector<LVL1::eTower>
@@ -74,7 +76,7 @@ class eTowerContainer : public DataVector<LVL1::eTower>
   IMessageSvc* msgSvc() const;
 
   //* @brief Keeps track of the towerID of each eTower associated to each MAP index *.
-  std::map<int,int> m_map_towerID_containerIndex;
+  std::unordered_map<int,int> m_map_towerID_containerIndex;
 };
 
 }

Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/eTowerContainer.cxx

@@ -29,24 +29,24 @@ void eTowerContainer::print() const {
 }
 
 
-const LVL1::eTower * eTowerContainer::findTower(int towerID) const
-{
-  int container_index = -1;
-  container_index = m_map_towerID_containerIndex.find(towerID)->second;
-  if(container_index >= 0){
+const LVL1::eTower * eTowerContainer::findTower(int towerID) const{
+    const auto it = m_map_towerID_containerIndex.find(towerID);
+
+    const int container_index = it->second;
+    if (container_index < 0) {
+        return nullptr;
+    }
     return (*this)[container_index];
-  }
-  return nullptr;
 }
 
-LVL1::eTower * eTowerContainer::findTower(int towerID)
-{
-  int container_index = -1;
-  container_index = m_map_towerID_containerIndex.find(towerID)->second;
-  if(container_index >= 0){
+LVL1::eTower * eTowerContainer::findTower(int towerID){
+    const auto it = m_map_towerID_containerIndex.find(towerID);
+
+    const int container_index = it->second;
+    if (container_index < 0) {
+        return nullptr;
+    }
     return (*this)[container_index];
-  }
-  return nullptr;
 }
 
 void eTowerContainer::clearContainerMap()