Calorimeter/CaloEvent/src/CaloCellContainer.cxx

@@ -15,7 +15,7 @@
 #include "CaloDetDescr/CaloDetDescriptor.h"
 #include "AthenaKernel/errorcheck.h"
 #include "CLHEP/Geometry/Vector3D.h"
-#include <boost/algorithm/cxx11/partition_point.hpp>
+#include <algorithm>
 #include <atomic>
 
 
@@ -258,7 +258,7 @@ CaloCellContainer::updateCaloIteratorsOrdered (CaloCellContainer::iterator beg,
   }
   else {
     CaloCellContainer::iterator beg2 =
-      boost::algorithm::partition_point (beg, end, is_calo (beg_calo));
+      std::partition_point (beg, end, is_calo (beg_calo));
     updateCaloIteratorsOrdered (beg, beg2);
     updateCaloIteratorsOrdered (beg2, end);
   }

Calorimeter/CaloUtils/CaloUtils/CaloLCCoeffHelper.h

@@ -7,10 +7,9 @@
 
 #include <fstream>
 #include <string>
-
+#include <optional>
 #include "CaloConditions/CaloLocalHadCoeff.h"
 #include "CaloConditions/CaloLocalHadDefs.h"
-//#include "CaloLocalHadCoeff.h"
 
 
 class CaloLCCoeffHelper {
@@ -19,7 +18,7 @@ class CaloLCCoeffHelper {
     CaloLCCoeffHelper();
     virtual ~CaloLCCoeffHelper();
 
-    static CaloLocalHadCoeff *InitDataFromFile(const char *fname);
+    static std::optional<CaloLocalHadCoeff> InitDataFromFile(const char *fname);
     static void PrintData(CaloLocalHadCoeff *m_data, std::ostream &fout);
     static void PrintData(CaloLocalHadCoeff *m_data, const char *fname);
 
@@ -87,7 +86,7 @@ class CaloLCCoeffHelper {
     }
 
   private:
-    static CaloLocalHadCoeff::LocalHadDimension *parse_dim(std::string &sLine);
+    static std::optional<CaloLocalHadCoeff::LocalHadDimension> parse_dim(const std::string &sLine);
 
 };
 

Calorimeter/CaloUtils/src/CaloLCCoeffHelper.cxx

@@ -53,9 +53,9 @@ const CaloLocalHadCoeff::LocalHadArea * CaloLCCoeffHelper::getAreaFromName(const
 /* ****************************************************************************
 To read set of local hadronic coefficients from text file
 **************************************************************************** */
-CaloLocalHadCoeff *CaloLCCoeffHelper::InitDataFromFile(const char *filename)
+std::optional<CaloLocalHadCoeff> CaloLCCoeffHelper::InitDataFromFile(const char *filename)
 {
-  CaloLocalHadCoeff *data = new CaloLocalHadCoeff();
+  std::optional<CaloLocalHadCoeff> data=std::make_optional<CaloLocalHadCoeff>();
 
   char cLine[1024];
 
@@ -65,7 +65,7 @@ CaloLocalHadCoeff *CaloLCCoeffHelper::InitDataFromFile(const char *filename)
   std::ifstream fin(filename);
   if ( !fin ) {
     std::cout << "CaloLCCoeffHelper::InitDataFromFile - Can't open file '" << filename << "'." << std::endl;
-    delete data; return nullptr;
+    return std::nullopt;
   }
 
   std::string sLine;
@@ -80,7 +80,7 @@ CaloLocalHadCoeff *CaloLCCoeffHelper::InitDataFromFile(const char *filename)
     int area_indx(0), area_type(0), area_npars(0);
     if( !(ist >> sdummy >> area_indx >> area_title >> area_type >> area_npars) ) {
       std::cout << "CaloLCCoeffHelper::initDataFromFile() -> Error! Could not parse line '" << cLine << "' at p1." << std::endl;
-      delete data; return nullptr;
+      return std::nullopt;
     }
 
     CaloLocalHadCoeff::LocalHadArea theArea(area_title.c_str(), area_type, area_npars);
@@ -92,22 +92,20 @@ CaloLocalHadCoeff *CaloLCCoeffHelper::InitDataFromFile(const char *filename)
       if(sLine.find("break") != std::string::npos) {
         break;
       }
-      CaloLocalHadCoeff::LocalHadDimension *dim = parse_dim(sLine);
+      auto dim = parse_dim(sLine);
       if( !dim ) {
         std::cout << "CaloLCCoeffHelper::initDataFromFile() ->Error! Could not parse line '" << sLine << "' at p2a." << std::endl;
-        delete data; return nullptr;
+        return std::nullopt;
       }
       theArea.addDimension(*dim);
-      delete dim;
     }
-
     data->addArea(theArea);
 
     // now reading parameters
     for(int i_len=0; i_len<theArea.getLength(); i_len++){
       if(!fin.getline(cLine,sizeof(cLine)-1)) {
         std::cout << "panic " << std::endl;
-        delete data; return nullptr;
+        return std::nullopt;
       }
       sLine = cLine;
       ist.clear(); ist.str(sLine);
@@ -118,12 +116,12 @@ CaloLocalHadCoeff *CaloLCCoeffHelper::InitDataFromFile(const char *filename)
       }
       if(idummy != theArea.getOffset()+i_len){
         std::cout << "CaloLCCoeffHelper::initDataFromFile() ->Error! Could not parse line '" << cLine << "' at p3." << std::endl;
-        delete data; return nullptr;
+        return std::nullopt;
       }
       for(int j=0; j<theArea.getNdim(); j++) {
         if(!(ist >> idummy)) {
           std::cout << "CaloLCCoeffHelper::initDataFromFile() -> panic!" << std::endl;
-          delete data; return nullptr;
+          return std::nullopt;
         }
       }
       CaloLocalHadCoeff::LocalHadCoeff pars;
@@ -132,7 +130,7 @@ CaloLocalHadCoeff *CaloLCCoeffHelper::InitDataFromFile(const char *filename)
         if( !(ist >> pars[j]) ) {
           std::cout << "CaloLCCoeffHelper::initDataFromFile() ->Error! Could not parse line '" << cLine << "' at p4." << std::endl;
           std::cout << " dmArea.m_title" << theArea.getTitle() << std::endl;
-          delete data; return nullptr;
+          return std::nullopt;
         }
       }
       data->setCoeff(theArea.getOffset()+i_len, pars);
@@ -340,9 +338,9 @@ bool CaloLCCoeffHelper::Interpolate(const CaloLocalHadCoeff *data, const unsigne
 /* **************************************************************************
 parsing dimension string  of type 'ener   8   3.1    6.3'
 *************************************************************************** */
-CaloLocalHadCoeff::LocalHadDimension *CaloLCCoeffHelper::parse_dim(std::string &sLine)
+std::optional<CaloLocalHadCoeff::LocalHadDimension> CaloLCCoeffHelper::parse_dim(const std::string &sLine)
 {
-  CaloLocalHadCoeff::LocalHadDimension *dim = nullptr;
+  std::optional<CaloLocalHadCoeff::LocalHadDimension> dim;
   std::istringstream ist(sLine.c_str());
 
   std::string dim_title;
@@ -352,7 +350,7 @@ CaloLocalHadCoeff::LocalHadDimension *CaloLCCoeffHelper::parse_dim(std::string &
 
   if( !(ist >> dim_title >> dim_nbins >> dim_xmin >> dim_xmax >> stype) ){
     std::cout << "CaloHadDMCoeffHelper::parse_dim() -> Error! Could not parse line '" << sLine << "' at p1." << std::endl;
-    return nullptr;
+    return std::nullopt;
   }
 
   // Check nbins for reasonableness --- prevents a coverity warning.
@@ -363,7 +361,7 @@ CaloLocalHadCoeff::LocalHadDimension *CaloLCCoeffHelper::parse_dim(std::string &
 
   if(stype.find("flat") != std::string::npos) {
     // equidistant binning
-    dim = new CaloLocalHadCoeff::LocalHadDimension(dim_title.c_str(), dim_type, dim_nbins, dim_xmin, dim_xmax);
+    dim.emplace(dim_title.c_str(), dim_type, dim_nbins, dim_xmin, dim_xmax);
   }else if(stype.find("hand") != std::string::npos) {
     // user defined binning
     std::vector<float> x_bins;
@@ -371,15 +369,15 @@ CaloLocalHadCoeff::LocalHadDimension *CaloLCCoeffHelper::parse_dim(std::string &
     for(int i=0; i<dim_nbins+1; i++) {
       if( !(ist >> e) ) {
         std::cout << "CaloHadDMCoeffHelper::parse_dim() -> Error! Could not parse line '" << sLine << "' at p2." << std::endl;
-        return nullptr;
+        return std::nullopt;
       }else{
         x_bins.push_back(e);
       }
     }
-    dim = new CaloLocalHadCoeff::LocalHadDimension(dim_title.c_str(), dim_type, x_bins);
+    dim.emplace(dim_title.c_str(), dim_type, x_bins);
   }else{
     std::cout << "CaloHadDMCoeffHelper::parse_dim() -> Error! Could not parse line '" << sLine << "' at p3." << std::endl;
-    return nullptr;
+    return std::nullopt;
   }
   return dim;
 }

Control/AthenaServices/src/AthenaEventLoopMgr.cxx

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 */
 
 #define  GAUDISVC_EVENTLOOPMGR_CPP
@@ -717,11 +717,7 @@ StatusCode AthenaEventLoopMgr::executeEvent(EventContext&& ctx)
   // Call any attached tools to reject events early
   unsigned int toolCtr=0;
   if(m_useTools) {
-    if (pEvent == nullptr) {
-      ATH_MSG_ERROR ( "Tools for event selection work only with old-style EventInfo!"  );
-      return StatusCode::FAILURE;
-    }
-
+    //note: pEvent cannot be nullptr here, it has already been dereferenced
     tool_store::iterator theTool = m_tools.begin();
     tool_store::iterator lastTool  = m_tools.end();
     while(toolsPassed && theTool!=lastTool ) 

Control/AthenaServices/src/AthenaOutputStream.cxx

@@ -572,8 +572,8 @@ StatusCode AthenaOutputStream::write() {
          IAlgTool* st = AlgTool::Factory::create( m_streamer->type(), m_streamer->type(), m_streamer->name(), this ).release();
          st->addRef();
          streamer = dynamic_cast<IAthenaOutputStreamTool*>( st );
-         if( streamer->initialize().isFailure()
-             || streamer->connectServices(m_dataStore.typeAndName(), m_persName, m_extendProvenanceRecord).isFailure() ) {
+         if( !streamer or streamer->initialize().isFailure()
+             or streamer->connectServices(m_dataStore.typeAndName(), m_persName, m_extendProvenanceRecord).isFailure() ) {
             ATH_MSG_FATAL("Unable to initialize OutputStreamTool for " << outputFN );
             return StatusCode::FAILURE;
          }

Control/AthenaServices/test/MetaDataSvc_test.cxx

@@ -12,7 +12,7 @@
 
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#define BOOST_TEST_MODULE TEST_IOVDBSVC
+#define BOOST_TEST_MODULE TEST_METADATASVC
 
 #include "TestTools/initGaudi.h"
 #include "TInterpreter.h"
@@ -43,7 +43,9 @@ struct GaudiKernelFixture{
     std::scoped_lock lock (m);
     if (svcLoc==nullptr){
       std::string fullJobOptsName="AthenaServices/" + jobOpts;
-      Athena_test::initGaudi(fullJobOptsName, svcLoc);
+      if (not Athena_test::initGaudi(fullJobOptsName, svcLoc)){
+        throw ("The MetaDataSvc tests cannot be run");
+      };
     }
   }
 };

Control/PileUpTools/PileUpTools/PileUpMergeSvc.icc

@@ -8,7 +8,6 @@
 #include <cassert>
 #include <string>
 
-/* #include "boost/concept_check.hpp" */
 #include "GaudiKernel/System.h"
 #include "GaudiKernel/StatusCode.h"
 

Database/APR/RootCollection/src/RootCollection.cpp

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "RootCollection.h"
@@ -92,7 +92,7 @@ namespace pool {
            }
            m_poolOut << coral::Info << "File " << m_fileName << " opened in " << method <<  coral::MessageStream::endmsg;
  
-           m_tree->SetDirectory(gDirectory);
+           m_tree->SetDirectory(m_file);
            m_schemaEditor->writeSchema();
         }
      }
@@ -279,8 +279,7 @@ namespace pool {
         }
       }
 
-      TDirectory *dirsav = gDirectory;
-
+      TDirectory::TContext dirctxt;
       if( m_session == 0 || m_mode == ICollection::READ || m_mode == ICollection::UPDATE ) {
          // first step: Try to open the file
          m_poolOut << coral::Info << "Opening Collection File " << m_fileName << " in mode: "
@@ -301,20 +300,16 @@ namespace pool {
                root_mode = "UPDATE";
 	       io_mode = (Io::WRITE | Io::APPEND);
             }
-	    
-	    if (m_fileMgr == 0) {
-	      IService *is(0);
-
-	      if (Gaudi::svcLocator()->getService("FileMgr",is,true).isFailure()) {
-		m_poolOut << coral::Error 
-			  << "unable to get the FileMgr, will not manage TFiles"
-			  << coral::MessageStream::endmsg;
-	      } else {
-		m_fileMgr = dynamic_cast<IFileMgr*>(is);
-	      }
-
+	    if( m_fileMgr == 0 ) {
+               IService *is(0);
+               if (Gaudi::svcLocator()->getService("FileMgr",is,true).isFailure()) {
+                  m_poolOut << coral::Error 
+                            << "unable to get the FileMgr, will not manage TFiles"
+                            << coral::MessageStream::endmsg;
+               } else {
+                  m_fileMgr = dynamic_cast<IFileMgr*>(is);
+               }
 	    }
-
 	    // FIXME: hack to avoid issue with setting up RecExCommon links
 	    if (m_fileMgr != 0 && 
 		m_fileMgr->hasHandler(Io::ROOT).isFailure()) {
@@ -395,7 +390,7 @@ namespace pool {
       m_tree->SetAutoFlush(TTREE_AUTO_FLUSH);
 
       if( m_session && m_mode == ICollection::UPDATE ) {
-        m_tree->SetDirectory(dirsav);
+        m_tree->SetDirectory(0);
 
 	int n(0);
 	if (m_fileMgr == 0) {

Event/xAOD/xAODTrackingCnv/python/xAODTrackingCnvConfig.py

@@ -145,6 +145,65 @@ def TrackParticleCnvAlgCfg(flags, name="TrackParticleCnvAlg",
     result.addEventAlgo(CompFactory.xAODMaker.TrackParticleCnvAlg(name, **kwargs))
     return result
 
+
+def TrigTrackParticleCnvAlgCfg(flags, name="TrigTrackParticleCnvAlg",
+                               ClusterSplitProbabilityName = "",
+                               AssociationMapName = "",
+                               **kwargs):
+    
+    if flags.Detector.GeometryITk:
+        name = name.replace("InDet", "ITk")
+        return ITkTrackParticleCnvAlgCfg(flags, name,
+                                         ClusterSplitProbabilityName,
+                                         AssociationMapName,
+                                         **kwargs)
+
+    kwargs.setdefault("ConvertTracks", True)
+    kwargs.setdefault("ConvertTrackParticles", False)
+    kwargs.setdefault("TrackContainerName", "CombinedInDetTracks")
+    kwargs.setdefault("xAODTrackParticlesFromTracksContainerName", "InDetTrackParticles")
+    kwargs.setdefault("AddTruthLink", False)
+    
+    result = ComponentAccumulator()
+    
+    if "TrackParticleCreator" not in kwargs:
+        from TrkConfig.TrkParticleCreatorConfig import InDetTrigParticleCreatorToolCfg, \
+            InDetTrigParticleCreatorToolTRTPidCfg
+        
+        if flags.Tracking.ActiveConfig.electronPID:
+            partCreatorToolCfg = InDetTrigParticleCreatorToolTRTPidCfg
+        else:
+            partCreatorToolCfg = InDetTrigParticleCreatorToolCfg
+
+        
+        kwargs.setdefault("TrackParticleCreator", result.popToolsAndMerge(
+            partCreatorToolCfg(
+                flags,
+                name = kwargs["xAODTrackParticlesFromTracksContainerName"] + "CreatorTool",
+                ClusterSplitProbabilityName = ClusterSplitProbabilityName,
+                AssociationMapName = AssociationMapName)
+        ))
+
+    if "TrackCollectionCnvTool" not in kwargs:
+        result.addPublicTool(kwargs["TrackParticleCreator"])
+        kwargs.setdefault("TrackCollectionCnvTool", result.popToolsAndMerge(
+            TrackCollectionCnvToolCfg(
+                flags,
+                TrackParticleCreator = kwargs["TrackParticleCreator"])))
+
+
+    if flags.Tracking.perigeeExpression == "Vertex":
+        kwargs.setdefault("PrimaryVerticesName", "PrimaryVertices")
+
+    result.merge(TrackParticleCnvAlgCfg(flags, name,
+                                        ClusterSplitProbabilityName,
+                                        AssociationMapName,
+                                        **kwargs)
+                 )
+    
+    return result
+
+
 def BeamLineTrackParticleCnvAlgCfg(flags, name="BeamLineTrackParticleCnvAlg",
                                    ClusterSplitProbabilityName = "",
                                    AssociationMapName = "",

ForwardDetectors/ALFA/ALFA_BeamTransport/CMakeLists.txt

@@ -11,7 +11,7 @@ atlas_add_component( ALFA_BeamTransport
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS  ${ROOT_INCLUDE_DIRS} 
-                     LINK_LIBRARIES  ${ROOT_LIBRARIES} AtlasHepMCLib AthenaBaseComps FPTracker GaudiKernel StoreGateLib xAODEventInfo GeneratorObjects FPTracker )
+                     LINK_LIBRARIES  ${ROOT_LIBRARIES} AtlasHepMCLib TruthUtils AthenaBaseComps FPTracker GaudiKernel StoreGateLib xAODEventInfo GeneratorObjects FPTracker )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )

ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx

@@ -22,6 +22,7 @@
 #include "AtlasHepMC/GenEvent.h"
 #include "AtlasHepMC/SimpleVector.h"
 #include "AtlasHepMC/GenParticle.h"
+#include "TruthUtils/HepMCHelpers.h"
 
 //ROOT headers
 #include "TFile.h"
@@ -281,10 +282,10 @@ int ALFA_BeamTransport::TransportSelectedParticle(HepMC::GenEvent& evt, int evt_
        theta = std::acos(std::abs(p->momentum().pz()) / mom);
        eta = -std::log(std::tan(theta / 2));
 
-       if ((p->status() == 1) &&
+       if (MC::isStable(p) &&
            (!p->end_vertex())) { // TODO What is end_vertex()???
          // Change the status code from Pythia (1) to 201 //added 120124
-         p->set_status(201);
+         p->set_status(HepMC::PYTHIA8NOENDVERTEXSTATUS);
 
          int pid = p->pdg_id();
          if (eta > m_EtaCut &&

Generators/EvgenProdTools/src/FixHepMC.cxx

@@ -152,7 +152,8 @@ StatusCode FixHepMC::execute() {
 
     /// AV: In case we have 3 particles, we try to add a vertex 
     /// that corresponds to 1->2 and 1->1 splitting.
-    if (semi_disconnected.size() == 3 || semi_disconnected.size() == 2) {
+    /// AV: In case we have 4 particles, we can try to do that as well.
+    if ( semi_disconnected.size() == 4 || semi_disconnected.size() == 3 || semi_disconnected.size() == 2) {
       size_t no_endv = 0;
       size_t no_prov = 0;
       HepMC::FourVector sum(0,0,0,0);
@@ -303,7 +304,8 @@ StatusCode FixHepMC::execute() {
     }
 
     /// AV: In case we have 3 particles, we try to add a vertex that correspond to 1->2 and 1->1 splitting.
-    if (semi_disconnected.size() == 3 || semi_disconnected.size() == 2) {
+    /// AV: we can try to do that for 4 particles as well.
+    if (semi_disconnected.size() == 4 ||semi_disconnected.size() == 3 || semi_disconnected.size() == 2) {
       size_t no_endv = 0;
       size_t no_prov = 0;
       double vsum[4] = {0,0,0,0};

Generators/EvtGen_i/src/EvtInclusiveDecay.cxx

@@ -35,6 +35,7 @@
 #include "AtlasHepMC/GenVertex.h"
 #include "AtlasHepMC/GenParticle.h"
 #include "TruthUtils/MagicNumbers.h"
+#include "TruthUtils/HepMCHelpers.h"
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ISvcLocator.h"
@@ -851,8 +852,8 @@ std::string EvtInclusiveDecay::pdgName(HepMC::ConstGenParticlePtr p, bool status
     if ( ((barcodeList!=0) && (inlist)) ||
          ((barcodeList==0) && isToBeDecayed(p,false)) )
       buf << "\033[7m";   // reverse
-    if (p->status() != 1) {
-      if (p->status() == 2)
+    if (!MC::isStable(p)) {
+      if (MC::isDecayed(p))
         buf << "\033[33m";   // yellow
       else
         buf << "\033[31m";   // red
@@ -872,8 +873,8 @@ std::string EvtInclusiveDecay::pdgName(HepMC::ConstGenParticlePtr p, bool status
     if ( ((barcodeList!=0) && (barcodeList->find(HepMC::barcode(p)) != barcodeList->end())) ||
          ((barcodeList==0) && isToBeDecayed(p,false)) )
       buf << "\033[7m";   // reverse
-    if (p->status() != 1) {
-      if (p->status() == 2)
+    if (!MC::isStable(p)) {
+      if (MC::isDecayed(p))
         buf << "\033[33m";   // yellow
       else
         buf << "\033[31m";   // red

Generators/TruthUtils/TruthUtils/HepMCHelpers.h

@@ -105,7 +105,7 @@ namespace MC
 
   template <class T> inline bool egammaTruthAlg_isGenInteracting (const T& p){
     const int status = p->status();
-    const int apid = abs(p->pdg_id());
+    const int apid = std::abs(p->pdg_id());
     const auto vertex = p->end_vertex();
   // we want to keep primary particle with status==2 but without vertex in HepMC
     return
@@ -121,26 +121,51 @@ namespace MC
        (apid==5000039 &&  status==1 ))
      );
   }
+  template <class T> inline bool ThinGeantTruthAlg_isStatus1BSMParticle(const T& p)  {
+
+  int pdg = p->pdg_id();
+  bool status1 = (p->status() == 1);
+  bool isBSM(false);
+
+  if ((31 < std::abs(pdg) && std::abs(pdg) < 38) || // BSM Higgs / W' / Z' / etc
+      std::abs(pdg) == 39 || std::abs(pdg) == 41 || std::abs(pdg) == 42 ||
+      std::abs(pdg) == 7 ||                      // 4th gen beauty
+      std::abs(pdg) == 8 ||                      // 4th gen top
+      (600 < abs(pdg) && std::abs(pdg) < 607) || // scalar leptoquarks
+      (1000000 < std::abs(pdg) &&
+       std::abs(pdg) < 2000000) || // left-handed SUSY (including R-Hadrons)
+      (2000000 < std::abs(pdg) &&
+       std::abs(pdg) < 3000000) || // right-handed SUSY (including R-Hadrons)
+      std::abs(pdg) == 6000005 ||  // X5/3
+      std::abs(pdg) == 6000006 ||  // T2/3
+      std::abs(pdg) == 6000007 ||  // B-1/3
+      std::abs(pdg) == 6000008 ||  // Y-4/3
+      ((std::abs(pdg) >= 10000100) && (std::abs(pdg) <= 10001000)) // multi-charged
+  )
+    isBSM = true;
+
+  return status1 && isBSM;
+}
 
 
   template <class T> inline bool MenuTruthThinning_isBSM(const T& p) {
     
     int pdg = p->pdg_id();
     
-    if ( (31<abs(pdg) && abs(pdg)<38) || // BSM Higgs / W' / Z' / etc
-        abs(pdg)==39 ||
-        abs(pdg)==41 ||
-        abs(pdg)==42 ||
-        abs(pdg)== 7 || // 4th gen beauty
-        abs(pdg)== 8 || // 4th gen top
-        (600 < abs(pdg) && abs(pdg) < 607) || // scalar leptoquarks
-        (1000000<abs(pdg) && abs(pdg)<1000040) || // left-handed SUSY
-        (2000000<abs(pdg) && abs(pdg)<2000040) || // right-handed SUSY
-        abs(pdg)==6000005 || // X5/3
-        abs(pdg)==6000006 || // T2/3
-        abs(pdg)==6000007 || // B-1/3
-        abs(pdg)==6000008 || // Y-4/3
-        ( (abs(pdg)>=10000100) && (abs(pdg)<=10001000) ) // multi-charged
+    if ( (31<std::abs(pdg) && std::abs(pdg)<38) || // BSM Higgs / W' / Z' / etc
+        std::abs(pdg)==39 ||
+        std::abs(pdg)==41 ||
+        std::abs(pdg)==42 ||
+        std::abs(pdg)== 7 || // 4th gen beauty
+        std::abs(pdg)== 8 || // 4th gen top
+        (600 < std::abs(pdg) && std::abs(pdg) < 607) || // scalar leptoquarks
+        (1000000<std::abs(pdg) && std::abs(pdg)<1000040) || // left-handed SUSY
+        (2000000<std::abs(pdg) && std::abs(pdg)<2000040) || // right-handed SUSY
+        std::abs(pdg)==6000005 || // X5/3
+        std::abs(pdg)==6000006 || // T2/3
+        std::abs(pdg)==6000007 || // B-1/3
+        std::abs(pdg)==6000008 || // Y-4/3
+        ( (std::abs(pdg)>=10000100) && (std::abs(pdg)<=10001000) ) // multi-charged
         )
         return true;
     

Generators/TruthUtils/TruthUtils/MagicNumbers.h

@@ -33,6 +33,7 @@ constexpr int SPECIALSTATUS = 10902;
 constexpr int EVTGENUNDECAYEDSTATUS = 899;
 constexpr int PYTHIA8LHESTATUS = 1003;
 constexpr int HERWIG7INTERMEDIATESTATUS = 11;
+constexpr int PYTHIA8NOENDVERTEXSTATUS = 201;
 
 /// @brief This barcode is used by objects matched to particles from pile-up interactions in standard MC Production
 constexpr int crazyParticleBarcode(std::numeric_limits<int32_t>::max());

InnerDetector/InDetConfig/python/TRT_ElectronPidToolsConfig.py

@@ -51,45 +51,55 @@ def TRTOccupancyIncludeCfg(flags, name="TRTOccupancyInclude", **kwargs):
     return acc
 
 
-def TRT_dEdxToolCfg(flags, name="TRT_dEdxTool", **kwargs):
+def __TRT_dEdxToolBaseCfg(flags, name, **kwargs):
+    """internal function to avoid code duplication,
+    it does not  deal with LumiBlockMuWriterCfg dependancy correctly
+    """
+
     from TRT_ConditionsAlgs.TRT_ConditionsAlgsConfig import TRTToTCondAlgCfg
     acc = TRTToTCondAlgCfg(flags)
 
-    if not flags.Input.isMC:
-        from LumiBlockComps.LumiBlockMuWriterConfig import LumiBlockMuWriterCfg
-        acc.merge(LumiBlockMuWriterCfg(flags))
-
     kwargs.setdefault("TRT_dEdx_isData", not flags.Input.isMC)
-    kwargs.setdefault("TRT_LocalOccupancyTool", acc.popToolsAndMerge(TRT_LocalOccupancyCfg(flags)))
     
-    acc.setPrivateTools(CompFactory.TRT_ToT_dEdx(name, **kwargs))
-    return acc
+    if "TRT_LocalOccupancyTool" not in kwargs:
+        kwargs.setdefault("TRT_LocalOccupancyTool", acc.popToolsAndMerge(TrigTRT_LocalOccupancyCfg(flags)))
 
-def TrigTRT_dEdxToolCfg(flags, name="TrigTRT_dEdxTool", **kwargs):
-    acc = ComponentAccumulator()
+    if "AssociationTool" not in kwargs:
+        from InDetConfig.InDetAssociationToolsConfig import TrigPrdAssociationToolCfg
+        kwargs.setdefault("AssociationTool", acc.popToolsAndMerge(TrigPrdAssociationToolCfg(flags)))
 
-    kwargs.setdefault("TRT_dEdx_isData", not flags.Input.isMC)
-    kwargs.setdefault("TRT_LocalOccupancyTool", acc.popToolsAndMerge(TrigTRT_LocalOccupancyCfg(flags)))
+    acc.setPrivateTools(CompFactory.TRT_ToT_dEdx(name,**kwargs))
+    return acc
 
-    from InDetConfig.InDetAssociationToolsConfig import TrigPrdAssociationToolCfg
-    kwargs.setdefault("AssociationTool", acc.popToolsAndMerge(TrigPrdAssociationToolCfg(flags)))
+def TRT_dEdxToolCfg(flags, name="TRT_dEdxTool", **kwargs):
+    acc = __TRT_dEdxToolBaseCfg(flags, name, **kwargs)
+    
+    if not flags.Input.isMC:
+        from LumiBlockComps.LumiBlockMuWriterConfig import LumiBlockMuWriterCfg
+        acc.merge(LumiBlockMuWriterCfg(flags))
 
-    acc.setPrivateTools(acc.popToolsAndMerge(TRT_dEdxToolCfg(flags,name,**kwargs)))
     return acc
 
+def TrigTRT_dEdxToolCfg(flags, name="TrigTRT_dEdxTool", **kwargs):
+    """trigger version should not add LumiBlockMuWriterCfg to views as it is scheduled globally""" 
+    return __TRT_dEdxToolBaseCfg(flags, name, **kwargs)
 
 def TRT_ElectronPidToolCfg(flags, name="TRT_ElectronPidTool", **kwargs):
     from TRT_ConditionsAlgs.TRT_ConditionsAlgsConfig import TRTHTCondAlgCfg, TRTPIDNNCondAlgCfg
     acc = TRTHTCondAlgCfg(flags)
     acc.merge(TRTPIDNNCondAlgCfg(flags))
 
-    from TRT_ConditionsServices.TRT_ConditionsServicesConfig import TRT_StrawStatusSummaryToolCfg
-    StrawStatusTool = acc.popToolsAndMerge(TRT_StrawStatusSummaryToolCfg(flags))
-    acc.addPublicTool(StrawStatusTool)  # public as it is has many clients to save some memory
-    kwargs.setdefault("TRTStrawSummaryTool", StrawStatusTool)
+    if "TRTStrawSummaryTool" not in kwargs:
+        from TRT_ConditionsServices.TRT_ConditionsServicesConfig import TRT_StrawStatusSummaryToolCfg
+        StrawStatusTool = acc.popToolsAndMerge(TRT_StrawStatusSummaryToolCfg(flags))
+        acc.addPublicTool(StrawStatusTool)  # public as it is has many clients to save some memory
+        kwargs.setdefault("TRTStrawSummaryTool", StrawStatusTool)
 
-    kwargs.setdefault("TRT_LocalOccupancyTool", acc.popToolsAndMerge(TRT_LocalOccupancyCfg(flags)))
-    kwargs.setdefault("TRT_ToT_dEdx_Tool", acc.popToolsAndMerge(TRT_dEdxToolCfg(flags)))
+    if "TRT_LocalOccupancyTool" not in kwargs:
+        kwargs.setdefault("TRT_LocalOccupancyTool", acc.popToolsAndMerge(TRT_LocalOccupancyCfg(flags)))
+    
+    if "TRT_ToT_dEdx_Tool" not in kwargs:
+        kwargs.setdefault("TRT_ToT_dEdx_Tool", acc.popToolsAndMerge(TRT_dEdxToolCfg(flags)))
 
     kwargs.setdefault("CalculateNNPid", True)
 

InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.h

@@ -26,6 +26,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
+#include <array>
 
 class IdentifierHash;
 
@@ -145,7 +146,7 @@ class SCT_RodDecoder : public extends<AthAlgTool, ISCT_RodDecoder>
     int oldStrip {INVALID_STRIP};
     int linkNumber{0}; // Determined from header and may be changed for links using Rx redundancy
 
-    std::array<bool, N_STRIPS_PER_SIDE*N_SIDES> saved;
+    std::array<bool, N_STRIPS_PER_SIDE*N_SIDES> saved{};//defaults to false
 
     // For MissingLinkHeaderError
     bool foundMissingLinkHeaderError{false};

InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/run_EoverP.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef __CINT__
@@ -952,7 +952,7 @@ void makeScalingHist(TString inputDir)
 
 
   //Need to obtain the mean pt either from a histogram or from hardcoded values 
-  double pt[1000];
+  double pt[1000]={};
 
   TH2F* meanPtVsEta =  (TH2F*) file0->Get("meanPtVsEta");
   if(!meanPtVsEta){

InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt

@@ -12,8 +12,9 @@ atlas_add_library( InDetConversionFinderToolsLib
                    PUBLIC_HEADERS InDetConversionFinderTools
                    PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES AthenaBaseComps GaudiKernel GeoPrimitives InDetRecToolInterfaces Particle TrkEventPrimitives TrkParameters TrkParticleBase TrkToolInterfaces TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib xAODTracking
-                    PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES}  AthLinks InDetPrepRawData TrkMeasurementBase TrkRIO_OnTrack TrkSurfaces VxVertex )
+                   LINK_LIBRARIES AthenaBaseComps GaudiKernel GeoPrimitives InDetRecToolInterfaces Particle TrkEventPrimitives 
+                   TrkParameters TrkToolInterfaces TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib xAODTracking
+                   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES}  AthLinks InDetPrepRawData TrkMeasurementBase TrkRIO_OnTrack TrkSurfaces VxVertex )
 
 atlas_add_component( InDetConversionFinderTools
                      src/components/*.cxx

InnerDetector/InDetRecTools/InDetConversionFinderTools/InDetConversionFinderTools/ConversionFinderUtils.h

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef INDETCONVERSIONFINDERTOOLS_CONVERSIONFINDERUTILS_H
@@ -57,9 +57,6 @@ namespace InDet {
                                            const Trk::Perigee* mp) ;
     /** Correct VxCandidate with respect to a user defined vertex.  */
     static xAOD::Vertex* correctVxCandidate(xAOD::Vertex*, Amg::Vector3D) ;
-    /** Get measured track parameters at first hit. Trk::TrackParticleBase interface. */
-    static const Trk::TrackParameters* getTrkParticleParameters(
-      const Trk::TrackParticleBase*) ;
 
   };