AtlasTest/CITest/Athena.cmake

@@ -48,7 +48,7 @@ atlas_add_citest( OverlayRun3MC_CAConfig
 #################################################################################
 
 atlas_add_citest( RecoRun2Data
-   SCRIPT RunWorkflowTests_Run2.py --CI -r -w DataReco -e '--maxEvents 25' --no-output-checks )
+   SCRIPT RunWorkflowTests_Run2.py --CI -r -w DataReco -e '--maxEvents 25' )
 
 atlas_add_citest( RecoRun2Data_CAConfig
    SCRIPT RunWorkflowTests_Run2.py --CI -r -w DataReco -e '--CA --maxEvents 25' --no-output-checks )
@@ -66,7 +66,7 @@ atlas_add_citest( RecoRun2Data_DAODPHYSLite
    DEPENDS_SUCCESS RecoRun2Data )
 
 atlas_add_citest( RecoRun2MC
-   SCRIPT RunWorkflowTests_Run2.py --CI -r -w MCReco -e '--maxEvents 25' --threads 0 --no-output-checks )
+   SCRIPT RunWorkflowTests_Run2.py --CI -r -w MCReco --threads 0 -e '--maxEvents 25' )
 
 atlas_add_citest( RecoRun2MC_CAConfig
    SCRIPT RunWorkflowTests_Run2.py --CI -r -w MCReco -e '--CA --maxEvents 25' --no-output-checks )
@@ -80,11 +80,11 @@ atlas_add_citest( RecoRun2MC_PileUp
    DEPENDS_SUCCESS PileUpPresamplingRun2 )
 
 atlas_add_citest( RecoRun3Data
-   SCRIPT RunWorkflowTests_Run3.py --CI -r -w DataReco -a q449 --threads 8 -e '--maxEvents 100' --run-only --no-output-checks
+   SCRIPT RunWorkflowTests_Run3.py --CI -r -w DataReco -a q449 --threads 8 -e '--maxEvents 100' --run-only
    PROPERTIES PROCESSORS 8 )
 
 atlas_add_citest( RecoRun3Data_Checks
-   SCRIPT RunWorkflowTests_Run3.py --CI -r -w DataReco -a q449 --threads 8 -e '--maxEvents 100' --checks-only --output-path ../RecoRun3Data --no-output-checks
+   SCRIPT RunWorkflowTests_Run3.py --CI -r -w DataReco -a q449 --threads 8 -e '--maxEvents 100' --checks-only --output-path ../RecoRun3Data
    DEPENDS_SUCCESS RecoRun3Data )
 
 atlas_add_citest( RecoRun3Data_CAConfig

AtlasTest/CITest/test/RecoRun3MC.sh

@@ -5,5 +5,4 @@
 # Once ATLASDQ-879 is fixed, this script can be deleted and the test defintion
 # (without the --preExec) moved to Athena.cmake.
 
-RunWorkflowTests_Run3.py --CI -r -w MCReco -e '--maxEvents 25 --preExec="all:from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.AODEDMSet=\"AODFULL\""' --no-output-checks
-
+RunWorkflowTests_Run3.py --CI -r -w MCReco -e '--maxEvents 25 --preExec="all:from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.AODEDMSet=\"AODFULL\""'

Generators/Herwig7_i/CMakeLists.txt

-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Herwig7_i )
@@ -24,7 +24,7 @@ atlas_add_library ( powhegHerwig
    NO_PUBLIC_HEADERS
    SHARED
    INCLUDE_DIRS ${THEPEG_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS}
-   LINK_LIBRARIES ${THEPEG_LIBRARIES} ${GSL_LIBRARIES} )
+   LINK_LIBRARIES ${THEPEG_LIBRARIES} ${GSL_LIBRARIES} CxxUtils )
 
 # Component(s) in the package:
 if (HEPMC3_USE)

Generators/Herwig7_i/Herwig7_i/ATLAS_CHECK_THREAD_SAFETY

+Generators/Herwig7_i

Generators/Herwig7_i/Herwig7_i/Herwig7.h

@@ -83,14 +83,13 @@ public:
     std::cerr << "=================================\n";
     std::cerr << "HERE I CAN PUT SOME ERROR MESSAGE\n";
     std::cerr << "=================================\n";
-    ThePEG::Repository::cleanup();
-    exit( EXIT_FAILURE );
+    quit();
   }
 
   /// Bail out and be quiet
   virtual void quit() const {
     ThePEG::Repository::cleanup();
-    exit( EXIT_FAILURE );
+    std::abort();
   }
 
   /// Return the standard out stream to be used

Generators/Herwig7_i/Herwig7_i/PowhegLesHouchesFileReader.h

@@ -10,6 +10,7 @@
 #define THEPEG_powhegLesHouchesFileReader_H
 // This is the declaration of the powhegLesHouchesFileReader class.
 
+#include "CxxUtils/checker_macros.h"
 #include "ThePEG/LesHouches/LesHouchesReader.h"
 #include "Herwig7_i/PowhegLesHouchesFileReader.fh"
 #include "ThePEG/PDT/Decayer.h"
@@ -128,7 +129,7 @@ public:
   /**
    * Standard Init function used to initialize the interfaces.
    */
-  static void Init();
+  static void Init ATLAS_NOT_THREAD_SAFE ();
 
 
   /** 
@@ -276,7 +277,7 @@ private:
   /**
    * Describe an abstract base class with persistent data.
    */
-  static ClassDescription<powhegLesHouchesFileReader> m_initpowhegLesHouchesFileReader;
+  static const ClassDescription<powhegLesHouchesFileReader> m_initpowhegLesHouchesFileReader;
 
   /**
    * Private and non-existent assignment operator.

Generators/Herwig7_i/src/PowhegLesHouchesFileReader.cxx

@@ -829,11 +829,11 @@ void powhegLesHouchesFileReader::persistentInput(PersistentIStream & is, int) {
   m_ieve = 0;
 }
 
-ClassDescription<powhegLesHouchesFileReader>
+const ClassDescription<powhegLesHouchesFileReader>
 powhegLesHouchesFileReader::m_initpowhegLesHouchesFileReader;
 // Definition of the static class description member.
 
-void powhegLesHouchesFileReader::Init() {
+void powhegLesHouchesFileReader::Init ATLAS_NOT_THREAD_SAFE () {
 
   static ClassDocumentation<powhegLesHouchesFileReader> documentation
     ("ThePEG::powhegLesHouchesFileReader is an base class to be used for objects "

InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx

@@ -1985,7 +1985,7 @@ StatusCode IDAlignMonGenericTracks::fillHistograms() {
     const Trk::Perigee* measPer = (*trksItr)->perigeeParameters();
     const AmgSymMatrix(5) * covariance = measPer ? measPer->covariance() : nullptr;
 
-    const Trk::ImpactParametersAndSigma* myIPandSigma = nullptr;
+    std::unique_ptr<Trk::ImpactParametersAndSigma> myIPandSigma = nullptr;
 
 
     if (m_doIP) {
@@ -2488,11 +2488,6 @@ StatusCode IDAlignMonGenericTracks::fillHistograms() {
       chargefirst = (int) charge;
     }
 
-
-    //
-
-    delete myIPandSigma;
-    myIPandSigma = nullptr;
   } // end of loop on trks
 
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Number of good tracks from TrackCollection: " << ngTracks << endmsg;

InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonPVBiases.cxx

@@ -589,7 +589,7 @@ StatusCode IDAlignMonPVBiases::fillHistograms() {
     // require at least 10 tracks associated
     if (foundVertex->nTrackParticles() < 10) continue;
 
-    const Trk::ImpactParametersAndSigma* myIPandSigma(nullptr);
+    std::unique_ptr<Trk::ImpactParametersAndSigma> myIPandSigma(nullptr);
     myIPandSigma = m_trackToVertexIPEstimatorTool->estimate(*track_itr, foundVertex, true);
 
     // require d0_pv to be smaller than 4

InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx

@@ -292,7 +292,7 @@ StatusCode IDAlignMonGenericTracksAlg::fillHistograms( const EventContext& ctx )
     const Trk::Perigee* measPer = trksItr->perigeeParameters();
     const AmgSymMatrix(5)* covariance = measPer ? measPer->covariance() : nullptr;
 
-    const Trk::ImpactParametersAndSigma* myIPandSigma=nullptr;
+    std::unique_ptr<Trk::ImpactParametersAndSigma> myIPandSigma=nullptr;
     
 
     if (m_doIP){
@@ -455,8 +455,6 @@ StatusCode IDAlignMonGenericTracksAlg::fillHistograms( const EventContext& ctx )
     auto p_m = Monitored::Scalar<float>( "m_p", trkP );
     fill(genericTrackGroup, p_m);
 
-    delete myIPandSigma;
-    myIPandSigma=nullptr;
   } // end of loop on trks
 
   ATH_MSG_DEBUG("Number of good tracks from TrackCollection: " << ngTracks);

InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/ElectronEoverPTracking.py

@@ -65,9 +65,7 @@ import MagFieldServices.SetupField
 #
 
 #
-print (' == ElectronEoverPTracking.py == setting up geometry (new cond alg, rel22)')  
-geom_svc=None
-geom_cond_key=''
+print (' == ElectronEoverPTracking.py == setting up geometry')  
 cond_alg = TrackingCommon.createAndAddCondAlg(TrackingCommon.getTrackingGeometryCondAlg, "AtlasTrackingGeometryCondAlg", name="AtlasTrackingGeometryCondAlg")
 geom_cond_key = cond_alg.TrackingGeometryWriteKey
 
@@ -88,10 +86,8 @@ ToolSvc += ElectronTrkStepPropagator
 #
 from TrkExTools.TrkExToolsConf import Trk__Navigator
 ElectronTrkNavigator = Trk__Navigator(name = 'ElectronTrkNavigator',
-                                      TrackingGeometrySvc = geom_svc,
                                       TrackingGeometryKey = geom_cond_key
-                                      #TrackingGeometrySvc = AtlasTrackingGeometrySvc
-                                  )
+                                      )
 ToolSvc += ElectronTrkNavigator
 #
 # Setup the MaterialEffectsUpdator

InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonZmumu.cxx

@@ -1724,7 +1724,7 @@ StatusCode IDPerfMonZmumu::FillRecParametersTP(const xAOD::TrackParticle* trackp
   }
 
   if (m_doIP && vertex != nullptr && m_trackToVertexIPEstimator){
-    const Trk::ImpactParametersAndSigma* iPandSigma(nullptr);
+    std::unique_ptr<Trk::ImpactParametersAndSigma> iPandSigma(nullptr);
     ATH_MSG_DEBUG("-- using the trackToVertexIPEstimator --");
     
     //Calling the estimate(trackp,newtrackp,vertex,doRemoval)
@@ -1900,7 +1900,7 @@ StatusCode IDPerfMonZmumu::FillRecParameters(const Trk::Track* track, const xAOD
   float z0bscorr = trkz0 - bsZ;
   
   if(m_doIP && vertex && track->perigeeParameters()){ //I assume that the vertex is the same of the original track
-    const Trk::ImpactParametersAndSigma* iPandSigma(nullptr);
+    std::unique_ptr<Trk::ImpactParametersAndSigma> iPandSigma(nullptr);
     if (!m_skipMS) iPandSigma = m_trackToVertexIPEstimator->estimate(trk_for_unbiasPerigee,trkPerigee,vertex,m_doRemoval);
     else iPandSigma = m_trackToVertexIPEstimator->estimate(trkPerigee,vertex);
     if( iPandSigma==0 ){
@@ -2729,4 +2729,4 @@ void IDPerfMonZmumu::ExtractIDHitsInformation(const xAOD::Muon* muon_pos, const
 
   }
   return;
-}
\ No newline at end of file
+}

InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetAdaptiveMultiPriVxFinderTool.cxx

@@ -1140,14 +1140,13 @@ InDetAdaptiveMultiPriVxFinderTool::ipSignificance(
   v.setFitQuality(0., 0.);
 
   double significance = 0.0;
-  const Trk::ImpactParametersAndSigma* ipas =
+  std::unique_ptr<Trk::ImpactParametersAndSigma> ipas =
     m_ipEstimator->estimate(params, &v);
   if (ipas != nullptr) {
     if (ipas->sigmad0 > 0 && ipas->sigmaz0 > 0) {
       significance = std::sqrt(std::pow(ipas->IPd0 / ipas->sigmad0, 2) +
                                std::pow(ipas->IPz0 / ipas->sigmaz0, 2));
     }
-    delete ipas;
   }
   return significance;
 }

LArCalorimeter/LArCalibDataQuality/LArCalibDataQuality/LArCalibValidationAlg.icc

@@ -552,7 +552,7 @@ bool LArCalibValidationAlg<CONDITIONSCONTAINER>::patchMissingFEBs(const FEBANDGA
 }
 
 template<class CONDITIONSCONTAINER>
-bool LArCalibValidationAlg<CONDITIONSCONTAINER>::patchMissingCalibBoards(const CBANDCHANANDGAIN_t& CBAndGain, const LArOnOffIdMapping *cabling, const LArCalibLineMapping *clCont) {
+bool LArCalibValidationAlg<CONDITIONSCONTAINER>::patchMissingCalibBoards(const CBANDCHANANDGAIN_t& CBAndGain, const LArOnOffIdMapping *cabling, const LArCalibLineMapping */*clCont*/) {
   unsigned nGood=0;
   unsigned nMissing=0;
   CBANDCHANANDGAIN_t::const_iterator missingIt=CBAndGain.begin();

LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrDecoderTool.h

 //Dear emacs, this is -*- C++ -*-
 
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -10,28 +10,23 @@
 
 #include "LArElecCalib/ILArAutoCorrDecoderTool.h"
 
-#include "GaudiKernel/ToolHandle.h"
-
 #include "LArElecCalib/ILArAutoCorr.h"
 #include <Eigen/Dense>
 
 #include "LArIdentifier/LArOnlineID.h"
 #include "LArIdentifier/LArOnline_SuperCellID.h"
 
-#include "LArRawConditions/LArConditionsContainer.h"
-
 #include "AthenaBaseComps/AthAlgTool.h"
 
-class LArAutoCorrDecoderTool: public AthAlgTool,
-			      virtual public ILArAutoCorrDecoderTool
+class LArAutoCorrDecoderTool: 
+        public extends<AthAlgTool,ILArAutoCorrDecoderTool>
 
 {
  public:
   
   // constructor
-  LArAutoCorrDecoderTool(const std::string& type, 
-			 const std::string& name, 
-			 const IInterface* parent); 
+  using base_class::base_class;
+
   
   // destructor 
   virtual ~LArAutoCorrDecoderTool();
@@ -48,19 +43,16 @@ class LArAutoCorrDecoderTool: public AthAlgTool,
 
  private:
 
-  unsigned m_decodemode;
-
-  bool m_alwaysHighGain;
+  //Properties:
+  Gaudi::Property<unsigned> m_decodemode{"DecodeMode",0};
+  Gaudi::Property<bool> m_alwaysHighGain{"UseAlwaysHighGain",false};
+  Gaudi::Property<bool> m_isSC{"isSC",false};
+  Gaudi::Property<std::string> m_keyAutoCorr{"KeyAutoCorr","LArAutoCorr"};
 
   const Eigen::MatrixXd ACDiagonal( const HWIdentifier&  CellID, int gain, unsigned nSamples) const;
   const Eigen::MatrixXd ACPhysics( const HWIdentifier&  CellID, int gain, unsigned nSamples) const;
 
-  const LArOnlineID_Base*  m_onlineID;
-
-  std::string m_keyAutoCorr;
-
-  // Running on cells or supercells?
-  bool m_isSC;
+  const LArOnlineID_Base*  m_onlineID=nullptr;
 };
 
 #endif

LArCalorimeter/LArCalibUtils/src/LArAutoCorrDecoderTool.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArCalibUtils/LArAutoCorrDecoderTool.h"
-
-#include "GaudiKernel/MsgStream.h"
 #include "AthenaKernel/errorcheck.h"
 
-#include "LArElecCalib/LArConditionsException.h"
-
-
-LArAutoCorrDecoderTool::LArAutoCorrDecoderTool(const std::string& type, 
-					       const std::string& name, 
-					       const IInterface* parent) 
-  : 
-  AthAlgTool(type, name, parent),
-  m_onlineID(0)
-{
-  declareInterface<ILArAutoCorrDecoderTool>(this);
-  declareProperty("KeyAutoCorr",m_keyAutoCorr="LArAutoCorr");
-  declareProperty("DecodeMode", m_decodemode=0);
-  declareProperty("UseAlwaysHighGain", m_alwaysHighGain=false);
-  declareProperty("isSC",       m_isSC=false);
-}
-
-
-LArAutoCorrDecoderTool::~LArAutoCorrDecoderTool() 
-{}
+LArAutoCorrDecoderTool::~LArAutoCorrDecoderTool() {};
 
 StatusCode LArAutoCorrDecoderTool::initialize() 
 {

MuonSpectrometer/MuonValidation/MuonTesterTree/MuonTesterTree/EventInfoBranch.h

@@ -26,6 +26,7 @@ private:
     ScalarBranch<uint32_t>& m_runNumber{m_parent.newScalar<uint32_t>("runNumber")};
     ScalarBranch<uint32_t>& m_lbNumber{m_parent.newScalar<uint32_t>("lbNumber")};
     ScalarBranch<uint32_t>& m_l1id{m_parent.newScalar<uint32_t>("l1id")};
+    ScalarBranch<uint32_t>& m_bcid{m_parent.newScalar<uint32_t>("bcid")};
 
     ScalarBranch<uint32_t>& m_mcChannel{m_parent.newScalar<uint32_t>("mcChanneNumber")};
     ScalarBranch<double>& m_weight{m_parent.newScalar<double>("evtWeight")};

MuonSpectrometer/MuonValidation/MuonTesterTree/Root/EventInfoBranch.cxx

@@ -25,6 +25,7 @@ bool EventInfoBranch::fill(const EventContext& ctx) {
     m_runNumber = evt_info->runNumber();
     m_lbNumber = evt_info->lumiBlock();
     m_l1id = evt_info->extendedLevel1ID();
+    m_bcid = evt_info->bcid();
     if (m_ismc) {
         m_mcChannel = evt_info->mcChannelNumber();
         m_weight = evt_info->mcEventWeight(0);

PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackToVertexWrapper.cxx

@@ -90,8 +90,8 @@ namespace DerivationFramework {
       track_decorators = createDecorators<xAOD::TrackParticleContainer,float>(m_trackFloatDecorKeys,ctx);
     // Run tool for each element and calculate the impact parameters/errors 
     for (const auto *trItr : *tracks) {
-      std::unique_ptr<const Trk::ImpactParametersAndSigma> iPandSigma;
-      std::unique_ptr<const Trk::ImpactParametersAndSigma> iPandSigmaBiased;
+      std::unique_ptr<Trk::ImpactParametersAndSigma> iPandSigma;
+      std::unique_ptr<Trk::ImpactParametersAndSigma> iPandSigmaBiased;
       const xAOD::Vertex* foundVertex { nullptr };
       for (const auto *const vx : *vertices) {
         for (const auto& tpLink : vx->trackParticleLinks()) {
@@ -103,8 +103,8 @@ namespace DerivationFramework {
         if (foundVertex) break;
       }
       if ( foundVertex ) {
-        iPandSigma.reset(m_tool->estimate(trItr,foundVertex,true));
-        iPandSigmaBiased.reset(m_tool->estimate(trItr,foundVertex,false));
+        iPandSigma= m_tool->estimate(trItr,foundVertex,true);
+        iPandSigmaBiased = m_tool->estimate(trItr,foundVertex,false);
         if( !iPandSigma )       ATH_MSG_WARNING ("trackToVertexIPEstimator failed !");
         if( !iPandSigmaBiased ) ATH_MSG_WARNING ("trackToVertexIPEstimator biased IP failed !");
       }

PhysicsAnalysis/JetTagging/JetTagTools/src/IPTag.cxx

@@ -522,7 +522,7 @@ namespace Analysis {
       double z0ErrwrtPriVtx(1.);
 
       /** use new Tool for "unbiased" IP estimation */
-      const Trk::ImpactParametersAndSigma* myIPandSigma(0);
+      std::unique_ptr<Trk::ImpactParametersAndSigma> myIPandSigma = nullptr;
       if (m_trackToVertexIPEstimator) { 
         myIPandSigma = m_trackToVertexIPEstimator->estimate(trk, &priVtx, m_unbiasIPEstimation);
       }
@@ -533,8 +533,6 @@ namespace Analysis {
         d0ErrwrtPriVtx=myIPandSigma->sigmad0;
         z0wrtPriVtx=myIPandSigma->IPz0SinTheta;
         z0ErrwrtPriVtx=myIPandSigma->sigmaz0SinTheta;
-        delete myIPandSigma;
-        myIPandSigma=0;
       }
 
       /** sign of the impact parameter */