Merge branch 'cherry-pick-e8584cdb-22.0' into '22.0'

Sweeping !55775 from master to 22.0.
MuonPrdSelector+MuonPRDTest+MuonTesterTree: enable thread-checker and fix warnings

See merge request atlas/athena!55898

MuonSpectrometer/MuonCnv/MuonPrdSelector/MuonPrdSelector/ATLAS_CHECK_THREAD_SAFETY

+MuonSpectrometer/MuonCnv/MuonPrdSelector

MuonSpectrometer/MuonCnv/MuonPrdSelector/src/MuonPrdSelectorAlg.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "MuonPrdSelector/MuonPrdSelectorAlg.h"
@@ -442,8 +442,8 @@ void MuonPrdSelectorAlg::print(){
     ATH_MSG_DEBUG( "CSC OUT Collection(" << std::setw(2) << i_coll << ") : " << ID  );
   }
 
-  const DataHandle<Muon::MdtPrepDataCollection> mdtCollection;
-  const DataHandle<Muon::MdtPrepDataCollection> lastColl;
+  SG::ConstIterator<Muon::MdtPrepDataCollection> mdtCollection;
+  SG::ConstIterator<Muon::MdtPrepDataCollection> lastColl;
   i_coll = 0;
   if (evtStore()->retrieve(mdtCollection,lastColl) ==StatusCode::SUCCESS) {
     for ( ; mdtCollection != lastColl ; ++mdtCollection ) {

MuonSpectrometer/MuonValidation/MuonPRDTest/MuonPRDTest/ATLAS_CHECK_THREAD_SAFETY

+MuonSpectrometer/MuonValidation/MuonPRDTest/

MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx

@@ -17,6 +17,9 @@
 #include "EventInfo/EventInfo.h"
 #include "GaudiKernel/ITHistSvc.h"
 #include "TGCcablingInterface/ITGCcablingServerSvc.h"
+
+#include <mutex>
+
 using namespace MuonPRDTest;
 NSWPRDValAlg::NSWPRDValAlg(const std::string& name, ISvcLocator* pSvcLocator) : AthHistogramAlgorithm(name, pSvcLocator) {}
 
@@ -285,15 +288,13 @@ StatusCode NSWPRDValAlg::NSWMatchingAlg(EDM_object data0, EDM_object data1) {
                 }
             }
             ATH_MSG_VERBOSE("Total Number of matches found: " << nMatch << " " << data1.getName() << " for a single " << data0.getName());
-            static bool warningPrinted = false;
             if (nMatch == 0) {
                 if (m_noMatchWarning) {
-                    if (!warningPrinted) {
-                        ATH_MSG_WARNING(
-                            "No match found! Will now disable this kind of WARNING but please be aware that you are running with "
-                            "suppressNoMatchWarning set to true!");
-                        warningPrinted = true;
-                    }
+                    static std::once_flag flag;
+                    std::call_once(flag, [&]() {
+                        ATH_MSG_WARNING("No match found! Will now disable this kind of WARNING but please be "
+                                        "aware that you are running with suppressNoMatchWarning set to true!");
+                    });
                 } else {
                     ATH_MSG_DEBUG("No match found!");
                 }

MuonSpectrometer/MuonValidation/MuonTesterTree/MuonTesterTree/ATLAS_CHECK_THREAD_SAFETY

+MuonSpectrometer/MuonValidation/MuonTesterTree

MuonSpectrometer/MuonValidation/MuonTesterTree/MuonTesterTree/MuonTesterBranch.h

@@ -29,7 +29,7 @@ public:
     /// of the addToTree method
     bool initialized() const;
     /// Returns the underlying TTree object
-    TTree* tree() const;
+    const TTree* tree() const;
     /// Returns the data dependencies needed by the MuonTesterBranch
     std::vector<DataDependency> data_dependencies() override final;
 

MuonSpectrometer/MuonValidation/MuonTesterTree/Root/MuonTesterBranch.cxx

@@ -46,7 +46,7 @@ MuonTesterBranch::~MuonTesterBranch() {
 MuonTesterBranch::MuonTesterBranch(TTree* tree, const std::string& br_name) : m_tree(tree), m_name(br_name) {}
 std::string MuonTesterBranch::name() const { return m_name; }
 bool MuonTesterBranch::initialized() const { return m_init; }
-TTree* MuonTesterBranch::tree() const { return m_tree; }
+const TTree* MuonTesterBranch::tree() const { return m_tree; }
 
 std::string MuonTesterBranch::eraseWhiteSpaces(const std::string& In) {
     std::string out = In;