diff --git a/TestBeam/TBRec/TBRec/ATLAS_CHECK_THREAD_SAFETY b/TestBeam/TBRec/TBRec/ATLAS_CHECK_THREAD_SAFETY new file mode 100644 index 0000000000000000000000000000000000000000..58986274ed665627b89b9b0f73db3463a0f719ae --- /dev/null +++ b/TestBeam/TBRec/TBRec/ATLAS_CHECK_THREAD_SAFETY @@ -0,0 +1 @@ +TestBeam/TBRec diff --git a/TestBeam/TBRec/src/TBCellNoiseCorrection.cxx b/TestBeam/TBRec/src/TBCellNoiseCorrection.cxx index b0197f7303d6a481eaa80df6e1bb1779f1523032..d66566e81df48a779ab835e58e885ed4daecc64b 100644 --- a/TestBeam/TBRec/src/TBCellNoiseCorrection.cxx +++ b/TestBeam/TBRec/src/TBCellNoiseCorrection.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ #include "TBCellNoiseCorrection.h" @@ -152,8 +152,8 @@ void TBCellNoiseCorrection::MakeCorrection (CaloCell* theCell, // removing this, should use the BadChannel now // if(cid == 810049536) e = 0.; // Not working cell in data for(i = 0; i < size; ++i) { - if((*m_cell_id)[i] == cid) { - e += (*m_cell_energy)[i]; + if(std::as_const(m_cell_id)->at(i) == cid) { + e += std::as_const(m_cell_energy)->at(i); break; } } diff --git a/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.cxx b/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.cxx index d476afb3de21fddceda543029ca0c08e0ec8be01..6791f113dd5ec33f209888f015748ba6a0402666 100644 --- a/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.cxx +++ b/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ @@ -40,7 +40,7 @@ using CLHEP::deg; -unsigned int TBXMLCaloCellWriterTool::m_nCols = 2; +const unsigned int TBXMLCaloCellWriterTool::m_nCols = 2; TBXMLCaloCellWriterTool::TBXMLCaloCellWriterTool(const std::string& type, const std::string& name, diff --git a/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.h b/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.h index 374a5599ebd77ea564edeff17674dd7e5f33a40f..b379ad8437ea95e452f2e44a682bdf5d4b66b6c2 100644 --- a/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.h +++ b/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ #ifndef TBREC_TBXMLCALOCELLWRITERTOOL_H @@ -55,7 +55,7 @@ class TBXMLCaloCellWriterTool : public TBXMLWriterToolBase private: - static unsigned int m_nCols; + static const unsigned int m_nCols; std::vector<std::string> m_includedCalos; std::vector<std::string> m_includedSamplings; diff --git a/TestBeam/TBRec/src/TBXMLWriterToolBase.cxx b/TestBeam/TBRec/src/TBXMLWriterToolBase.cxx index 89d679c689ea9d0acb7e6fd0cb616062643cbe9b..458460a76f6c47455034f532a3165f4e0fe7dbfd 100644 --- a/TestBeam/TBRec/src/TBXMLWriterToolBase.cxx +++ b/TestBeam/TBRec/src/TBXMLWriterToolBase.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ @@ -13,7 +13,7 @@ // XML writer implementation // /////////////////////////////// -std::string TBXMLWriterToolBase::m_doubleQuote = "\042"; +const std::string TBXMLWriterToolBase::m_doubleQuote = "\042"; // dictionary void diff --git a/TestBeam/TBRec/src/TBXMLWriterToolBase.h b/TestBeam/TBRec/src/TBXMLWriterToolBase.h index 602308b8b652b20a691ef777b5467e1650cc91a6..095576a4da4572dd69a6519eb3d3c4aa91ff0bfc 100644 --- a/TestBeam/TBRec/src/TBXMLWriterToolBase.h +++ b/TestBeam/TBRec/src/TBXMLWriterToolBase.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ #ifndef TBREC_TBXMLWRITERTOOLBASE_H @@ -106,6 +106,6 @@ class TBXMLWriterToolBase : public AthAlgTool std::vector<std::string> m_elementList; std::string m_dictionary; - static std::string m_doubleQuote; + static const std::string m_doubleQuote; }; #endif