diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCAL_ChannelMap.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCAL_ChannelMap.h index a7e221b9e967dc71305c34376133fe805ff2201d..e2420897724e395bc042a0cddd05e45e04968036 100755 --- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCAL_ChannelMap.h +++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCAL_ChannelMap.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration */ // *************************************************************************** @@ -47,7 +47,7 @@ public: class TubePosition { // public: // TubePosition(); // - TubePosition(tileName_t name, float x, float y, std::string hvFT);// + TubePosition(tileName_t name, float x, float y, const std::string& hvFT);// tileName_t get_tileName() const; // float x() const; // float y() const; // @@ -186,7 +186,7 @@ FCAL_ChannelMap::TubePosition::TubePosition() {} inline -FCAL_ChannelMap::TubePosition::TubePosition(tileName_t name, float x, float y, std::string hvFT) +FCAL_ChannelMap::TubePosition::TubePosition(tileName_t name, float x, float y, const std::string& hvFT) : m_tileName(name), m_x(x), diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx index 1849d44918d320c6aada14fe5d9ea5515b9bad00..3cfd6ec4ac75ecf158be3850283afc651ceadd2b 100755 --- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx +++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration */ #include "GaudiKernel/MsgStream.h" @@ -146,6 +146,7 @@ const EMECHVManager& EMECDetectorManager::getHVManager (EMECHVManager::IOType io m_HVManager[io].set (&(manager->getEMECHVManager(io))); } } + // cppcheck-suppress nullPointerRedundantCheck; false positive return *(m_HVManager[io].get()); }