diff --git a/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerHelpers.cxx b/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerHelpers.cxx index a5e4ca3288c36f329c0c404a27f3dfc8a4e258ba..59b8c88544a996646454d43fb9362dd6a17605a8 100644 --- a/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerHelpers.cxx +++ b/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerHelpers.cxx @@ -11,12 +11,12 @@ #include <cmath> std::string CaloRec::Helpers::fmtMsg(const char* fmt,...) { - char _buffer[1024]; + char buffer[1024]; va_list args; va_start(args,fmt); - vsprintf(_buffer,fmt,args); + vsprintf(buffer,fmt,args); va_end(args); - return std::string(_buffer); + return std::string(buffer); } diff --git a/Calorimeter/CaloRec/src/CaloTowerGeometrySvc.cxx b/Calorimeter/CaloRec/src/CaloTowerGeometrySvc.cxx index 9e16b36f74bab443636b61a4a99c7560788348f0..acc274e89f4b4692e4bb481d768a0a07cf86429c 100644 --- a/Calorimeter/CaloRec/src/CaloTowerGeometrySvc.cxx +++ b/Calorimeter/CaloRec/src/CaloTowerGeometrySvc.cxx @@ -4,7 +4,7 @@ #include <cmath> -namespace { constexpr auto _pi = 3.14159265358979323846; } +namespace { constexpr auto pi = 3.14159265358979323846; } CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::m_invalidIndex = index_t(-1); double CaloTowerGeometrySvc::m_invalidValue = -999.; @@ -23,8 +23,8 @@ CaloTowerGeometrySvc::CaloTowerGeometrySvc(const std::string& name,ISvcLocator* , m_towerEtaMax(5.0) //----------------------------------------// , m_adjustEta(true) , m_towerPhiBins(64) - , m_towerPhiMin(-_pi) //----------------------------------------// - , m_towerPhiMax(_pi) // FCal vertical and horizontal cell // + , m_towerPhiMin(-pi) //----------------------------------------// + , m_towerPhiMax(pi) // FCal vertical and horizontal cell // , m_fcal1Xslice(8.) // slicing creates "mini-cells" which are // , m_fcal1Yslice(8.) // then projected onto towers. The mini- // , m_fcal2Xslice(8.) // cell signal is 1/(Nx x Ny) x Ecell, //