AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigNew.py

@@ -8,8 +8,6 @@ Elmar Ritsch, 27/09/2013
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
 
-DetDescrDBEnvelopeSvc=CompFactory.DetDescrDBEnvelopeSvc
-
 def EnvelopeDefSvcCfg(ConfigFlags, name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
     result = ComponentAccumulator()
 
@@ -150,7 +148,7 @@ def EnvelopeDefSvcCfg(ConfigFlags, name="AtlasGeometry_EnvelopeDefSvc", **kwargs
     kwargs.setdefault("GeoModelSvc", acc.getService("GeoModelSvc"))
     result.merge(acc)
 
-    result.addService(DetDescrDBEnvelopeSvc(name, **kwargs),primary=True)
+    result.addService(CompFactory.DetDescrDBEnvelopeSvc(name, **kwargs),primary=True)
     return result
 
 

Calorimeter/CaloRec/python/CaloCellMakerConfig.py

@@ -17,10 +17,10 @@ def CaloCellMakerCfg(configFlags):
 
     larCellBuilder     = result.popToolsAndMerge(LArCellBuilderCfg(configFlags))
     larCellCorrectors  = result.popToolsAndMerge(LArCellCorrectorCfg(configFlags))
-    theTileCellBuilder = result.popToolsAndMerge(TileCellBuilderCfg(configFlags))
-    theCellFinalizer  = CompFactory.CaloCellContainerFinalizerTool()
+    tileCellBuilder = result.popToolsAndMerge(TileCellBuilderCfg(configFlags))
+    cellFinalizer  = CompFactory.CaloCellContainerFinalizerTool()
 
-    cellMakerTools=[larCellBuilder,]+larCellCorrectors+[theTileCellBuilder,theCellFinalizer]
+    cellMakerTools=[larCellBuilder,tileCellBuilder,cellFinalizer]+larCellCorrectors
 
     #Add corrections tools that are not LAr or Tile specific:
     if configFlags.Calo.Cell.doPileupOffsetBCIDCorr or configFlags.Cell.doPedestalCorr:

Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx

@@ -193,7 +193,7 @@ Trk::TrackingGeometry* Calo::CaloTrackingGeometryBuilder::trackingGeometry(const
   
   // the return TG
   Trk::TrackingGeometry*       caloTrackingGeometry = nullptr; 
-  const Trk::TrackingVolume*            calorimeter = nullptr;                     
+  Trk::TrackingVolume*            calorimeter = nullptr;                     
 
   // the key dimensions
   RZPairVector keyDim; 
@@ -1210,7 +1210,7 @@ Trk::TrackingGeometry* Calo::CaloTrackingGeometryBuilder::trackingGeometry(const
    //std::cout <<"Combined LAr ready " << std::endl; 
 
    // glue with LAr sector
-   const Trk::TrackingVolume* caloCombined    = nullptr;
+   Trk::TrackingVolume* caloCombined    = nullptr;
    // ++ has 2 sub volumes in R
    std::vector<const Trk::TrackingVolume*> caloVolumes;
    // ++++ (a) -> LAr sector

Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx

@@ -200,7 +200,7 @@ Calo::CaloTrackingGeometryBuilderCond::trackingGeometry(
   
   // the return TG
   Trk::TrackingGeometry* caloTrackingGeometry = nullptr; 
-  const Trk::TrackingVolume*            calorimeter = nullptr;                     
+  Trk::TrackingVolume*            calorimeter = nullptr;                     
 
   // the key dimensions
   RZPairVector keyDim; 
@@ -1226,7 +1226,7 @@ Calo::CaloTrackingGeometryBuilderCond::trackingGeometry(
    //std::cout <<"Combined LAr ready " << std::endl; 
 
    // glue with LAr sector
-   const Trk::TrackingVolume* caloCombined    = nullptr;
+   Trk::TrackingVolume* caloCombined    = nullptr;
    // ++ has 2 sub volumes in R
    std::vector<const Trk::TrackingVolume*> caloVolumes;
    // ++++ (a) -> LAr sector

Control/AthToolSupport/AsgServices/AsgServices/IAsgService.h

@@ -21,7 +21,7 @@
 /// followed by a semicolon, so we need a statement that requires to
 /// be followed by a semi-colon.
 #define DeclareInterfaceID(iface, major, minor) \
-  static constexpr nullptr_t interfaceID = nullptr
+  static constexpr std::nullptr_t interfaceID = nullptr
 #endif
 
 namespace asg

Control/AthenaConfiguration/python/AthConfigFlags.py

@@ -262,7 +262,7 @@ class AthConfigFlags(object):
 
     def _tryModify(self):
         if self._locked:
-            raise RuntimeError("Attemp to modify locked flag container")
+            raise RuntimeError("Attempt to modify locked flag container")
         else:
             # if unlocked then invalidate hash
             self._hash = None

Control/AthenaConfiguration/python/AutoConfigFlags.py

@@ -74,7 +74,9 @@ def _initializeGeometryParameters(geoTag):
     params = { 'Common' : CommonGeoDB.InitializeGeometryParameters(dbGeomCursor),
                'Pixel' : PixelGeoDB.InitializeGeometryParameters(dbGeomCursor),
                'LAr' : LArGeoDB.InitializeGeometryParameters(dbGeomCursor),
-               'Muon' : MuonGeoDB.InitializeGeometryParameters(dbGeomCursor) }
+               'Muon' : MuonGeoDB.InitializeGeometryParameters(dbGeomCursor),
+               'Luminosity' : CommonGeoDB.InitializeLuminosityDetectorParameters(dbGeomCursor),
+             }
 
     return params
 
@@ -104,6 +106,10 @@ def getDefaultDetectors(geoTag):
     if DetDescrInfo(geoTag)['Common']['Run'] == 'RUN4':
         detectors.add('ITkPixel')
         detectors.add('ITkStrip')
+        if DetDescrInfo(geoTag)['Luminosity']['BCMPrime']:
+            pass  # keep disabled for now
+        if DetDescrInfo(geoTag)['Luminosity']['PLR']:
+            detectors.add('PLR')
     else:
         detectors.add('Pixel')
         detectors.add('SCT')

Control/CxxUtils/CMakeLists.txt

@@ -147,7 +147,7 @@ if( ATLAS_RELEASE_MODE )
 endif()
 
 # Install the ubsan.supp file already during the CMake configuration.
-# This is necessary because the file may be needer very early during the
+# This is necessary because the file may be needed very early during the
 # build, and we don't explicitly make everything else wait for this
 # file's installation. Creating a race condition.
 file( INSTALL share/ubsan.supp

Control/CxxUtils/share/ubsan.supp

@@ -20,3 +20,9 @@ vptr_check:holder
 #         T *begin = &(*vec->begin());
 #         buf.ReadFastArray(begin, nvalues);
 null:stl_iterator.h
+
+# Suppress warnings like
+#/cvmfs/sft.cern.ch/lcg/releases/gcc/8.3.0-cebb0/x86_64-centos7/include/c++/8.3.0/bits/shared_ptr_base.h:155:6: runtime error: member call on address 0x000002535540 which does not point to an object of type '_Sp_counted_base'
+#0x000002535540: note: object has invalid vptr
+vptr:shared_ptr_base.h
+

Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt

@@ -9,6 +9,7 @@ find_package( Boost )
 find_package( Python COMPONENTS Development )
 find_package( ROOT COMPONENTS Core ROOTTPython
    cppyy${Python_VERSION_MAJOR}_${Python_VERSION_MINOR} )
+find_package( TBB )
 find_package( nlohmann_json )
 find_package( psutil )
 
@@ -16,9 +17,9 @@ find_package( psutil )
 atlas_add_component( PerfMonComps
    src/*.cxx src/components/*.cxx
    INCLUDE_DIRS ${AIDA_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-   ${Python_INCLUDE_DIRS}
+   ${Python_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
    LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${Python_LIBRARIES}
-   ${CMAKE_DL_LIBS} AthenaBaseComps AthenaKernel RootUtilsPyROOT CxxUtils
+   ${CMAKE_DL_LIBS} ${TBB_LIBRARIES} AthenaBaseComps AthenaKernel RootUtilsPyROOT CxxUtils
    PerfMonEvent PerfMonKernel SGTools StoreGateLib GaudiKernel
    AthDSoCallBacks nlohmann_json::nlohmann_json)
 

Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx

@@ -22,6 +22,9 @@
 #include "boost/filesystem.hpp"
 #include "boost/format.hpp"
 
+// TBB
+#include "tbb/task_arena.h"
+
 /*
  * Constructor
  */
@@ -82,9 +85,8 @@ StatusCode PerfMonMTSvc::initialize() {
     ATH_MSG_INFO("  >> Component-level memory monitoring in the event-loop is disabled in jobs with more than 1 thread");
   }
 
-  // Slot specific component-level data map and locks
-  m_compLevelDataMapVec.resize(m_numberOfSlots); // Default construct
-  m_mutex_slots.resize(m_numberOfSlots); // Default construct
+  // Thread specific component-level data map
+  m_compLevelDataMapVec.resize(m_numberOfThreads+1); // Default construct
 
   // Set wall time offset
   m_eventLevelData.set_wall_time_offset(m_wallTimeOffset);
@@ -226,9 +228,8 @@ void PerfMonMTSvc::stopSnapshotAud(const std::string& stepName, const std::strin
  * Start Component Auditing
  */
 void PerfMonMTSvc::startCompAud(const std::string& stepName, const std::string& compName, const EventContext& ctx) {
-  // Lock for data integrity
-  const unsigned int islot = ctx.valid() ? ctx.slot() : 0;
-  std::lock_guard<std::mutex> lock(m_mutex_slots[islot]);
+  // Get the thread index
+  const unsigned int ithread = (ctx.valid() && tbb::this_task_arena::current_thread_index() > -1) ? tbb::this_task_arena::current_thread_index() : 0;
 
   // Memory measurement is only done outside the loop except when there is only a single thread
   const bool doMem = !ctx.valid() || (m_numberOfThreads == 1);
@@ -237,8 +238,8 @@ void PerfMonMTSvc::startCompAud(const std::string& stepName, const std::string&
   PMonMT::StepComp currentState = generate_state(stepName, compName);
 
   // Check if this is the first time calling if so create the mesurement data if not use the existing one.
-  // Metrics are collected per slot then aggregated before reporting
-  data_map_unique_t& compLevelDataMap = m_compLevelDataMapVec[islot];
+  // Metrics are collected per thread then aggregated before reporting
+  data_map_unique_t& compLevelDataMap = m_compLevelDataMapVec[ithread];
   if(compLevelDataMap.find(currentState) == compLevelDataMap.end()) {
     compLevelDataMap.insert({currentState, std::make_unique<PMonMT::ComponentData>()});
   }
@@ -250,7 +251,7 @@ void PerfMonMTSvc::startCompAud(const std::string& stepName, const std::string&
 
   // Debug
   ATH_MSG_DEBUG("Start Audit: ctx " << ctx.valid() << " evt " << ctx.evt() << " slot " << ctx.slot() <<
-                " component " << compName << " step " << stepName);
+                " thread index " << ithread << " component " << compName << " step " << stepName);
   ATH_MSG_DEBUG("Start CPU " << meas.cpu_time << " VMem " << meas.vmem << " Malloc " << meas.malloc);
 }
 
@@ -258,9 +259,8 @@ void PerfMonMTSvc::startCompAud(const std::string& stepName, const std::string&
  * Stop Component Auditing
  */
 void PerfMonMTSvc::stopCompAud(const std::string& stepName, const std::string& compName, const EventContext& ctx) {
-  // Lock for data integrity
-  const unsigned int islot = ctx.valid() ? ctx.slot() : 0;
-  std::lock_guard<std::mutex> lock(m_mutex_slots[islot]);
+  // Get the thread index
+  const unsigned int ithread = (ctx.valid() && tbb::this_task_arena::current_thread_index() > -1) ? tbb::this_task_arena::current_thread_index() : 0;
 
   // Memory measurement is only done outside the loop except when there is only a single thread
   const bool doMem = !ctx.valid() || (m_numberOfThreads == 1);
@@ -273,7 +273,7 @@ void PerfMonMTSvc::stopCompAud(const std::string& stepName, const std::string& c
   PMonMT::StepComp currentState = generate_state(stepName, compName);
 
   // Store
-  data_map_unique_t& compLevelDataMap = m_compLevelDataMapVec[islot];
+  data_map_unique_t& compLevelDataMap = m_compLevelDataMapVec[ithread];
   compLevelDataMap[currentState]->addPointStop(meas, doMem);
 
   // Once the first time IncidentProcAlg3 is excuted, toggle m_isFirstEvent to false.
@@ -286,7 +286,7 @@ void PerfMonMTSvc::stopCompAud(const std::string& stepName, const std::string& c
 
   // Debug
   ATH_MSG_DEBUG("Stop Audit: ctx " << ctx.valid() << " evt " << ctx.evt() << " slot " << ctx.slot() <<
-                " component " << compName << " step " << stepName);
+                " thread index " << ithread << " component " << compName << " step " << stepName);
   ATH_MSG_DEBUG("Stop CPU " << meas.cpu_time << " VMem " << meas.vmem << " Malloc " << meas.malloc);
   ATH_MSG_DEBUG("  >> Start CPU " << compLevelDataMap[currentState]->m_tmp_cpu << " VMem "
                                  << compLevelDataMap[currentState]->m_tmp_vmem << " Malloc "
@@ -775,9 +775,22 @@ void PerfMonMTSvc::aggregateSlotData() {
       } else {
         m_compLevelDataMap[it.first]->add2CallCount(it.second->getCallCount());
         m_compLevelDataMap[it.first]->add2DeltaCPU(it.second->getDeltaCPU());
+        m_compLevelDataMap[it.first]->add2DeltaWall(it.second->getDeltaWall());
         m_compLevelDataMap[it.first]->add2DeltaVmem(it.second->getDeltaVmem());
         m_compLevelDataMap[it.first]->add2DeltaMalloc(it.second->getDeltaMalloc());
       }
+      // Do a quick consistency check here and print any suspicious measurements.
+      // Timing measurements should always be positive definite
+      if(it.second->getDeltaCPU() < 0) {
+        ATH_MSG_WARNING("Negative CPU-time measurement of " << it.second->getDeltaCPU() <<
+                        " ms for component " << it.first.compName <<
+                        " in step " << it.first.stepName);
+      }
+      if(it.second->getDeltaWall() < 0) {
+        ATH_MSG_WARNING("Negative Wall-time measurement of " << it.second->getDeltaWall() <<
+                        " ms for component " << it.first.compName <<
+                        " in step " << it.first.stepName);
+      }
     }
   }
 }

Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.h

@@ -171,9 +171,6 @@ class PerfMonMTSvc : virtual public IPerfMonMTSvc, virtual public IIncidentListe
   // Lock for capturing event loop measurements
   std::mutex m_mutex_capture;
 
-  // Locks for capturing component measurements
-  std::deque<std::mutex> m_mutex_slots;
-
   // Are we processing the first event?
   std::atomic<bool> m_isFirstEvent;
 

DataQuality/DataQualityUtils/python/detmaskmod.py

@@ -103,7 +103,7 @@ def decodeBlack(mask, defects=False):
     dm = eformat.helper.DetectorMask(mask)
     rv = []
     dmap = detmaskmap if not defects else detmaskmap_defects
-    for keys, value in sorted(dmap.items()):
+    for keys, value in dmap.items():
         if isinstance(keys, str):
             keys = [keys]
         if reduce(operator.and_,

Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx

@@ -77,18 +77,10 @@ StatusCode AthenaPoolCnvSvc::initialize() {
 	   last = m_maxFileSizes.value().end(); iter != last; ++iter) {
       if (auto p = iter->find('='); p != std::string::npos) {
          long long maxFileSize = atoll(iter->data() + (p + 1));
-         if (maxFileSize > 15000000000LL) {
-            ATH_MSG_INFO("Files larger than 15GB are disallowed by ATLAS policy.");
-            ATH_MSG_INFO("They should only be produced for private use or in special cases.");
-         }
          std::string databaseName = iter->substr(0, iter->find_first_of(" 	="));
          m_databaseMaxFileSize.insert(std::make_pair(databaseName, maxFileSize));
       } else {
          m_domainMaxFileSize = atoll(iter->c_str());
-         if (m_domainMaxFileSize > 15000000000LL) {
-            ATH_MSG_INFO("Files larger than 15GB are disallowed by ATLAS policy.");
-            ATH_MSG_INFO("They should only be produced for private use or in special cases.");
-         }
       }
    }
    // Extracting INPUT POOL ItechnologySpecificAttributes for Domain, Database and Container.

Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h

@@ -27,6 +27,7 @@
 #include <vector>
 #include <map>
 #include <mutex>
+#include <limits>
 
 // Forward declarations
 class IAthenaSerializeSvc;
@@ -229,7 +230,7 @@ private: // properties
 
    /// MaxFileSizes, vector with maximum file sizes for Athena POOL output files
    StringArrayProperty m_maxFileSizes{this,"MaxFileSizes",{}};
-   long long m_domainMaxFileSize=15000000000LL;
+   long long m_domainMaxFileSize=std::numeric_limits<long long>::max();
    std::map<std::string, long long> m_databaseMaxFileSize;
 
    /// PersSvcPerOutput,boolean property to use multiple persistency services, one per output stream.

Database/AthenaRoot/AthenaRootKernel/AthenaRootKernel/ATLAS_CHECK_THREAD_SAFETY

+Database/AthenaRoot/AthenaRootKernel

Database/RegistrationServices/python/OutputConditionsAlgConfig.py

@@ -21,6 +21,8 @@ def OutputConditionsAlgCfg(flags, name="OutputConditionsAlg",
     oca.StreamName=name+"Tool"
     condstream.OutputFile=outputFile
     condstream.PoolContainerPrefix="ConditionsContainer"
+    condstream.TopLevelContainerName = "<type>"
+    condstream.SubLevelBranchName = "<key>"
     result.addPublicTool(condstream)
 
     result.addEventAlgo(oca)

DetectorDescription/AtlasDetDescr/src/AtlasDetectorID.cxx

@@ -1050,7 +1050,9 @@ AtlasDetectorID::initLevelsFromDict(const IdDictMgr& dict_mgr)
         top_dict = m_indet_dict;  // save as top_dict
 
         // Check if this is High Luminosity LHC layout
-        m_isHighLuminosityLHC = (m_indet_dict->m_version=="ITkHGTD");
+	//should just use std::string::contains once that is available... (C++23)
+	std::string versionString = m_indet_dict->m_version;
+        m_isHighLuminosityLHC = (versionString.find("ITk") != std::string::npos);
 
         // Get InDet subdets
 

DetectorDescription/GeoModel/AtlasGeoModel/python/CommonGeoDB.py

@@ -19,3 +19,24 @@ def InitializeGeometryParameters(dbGeomCursor):
          params["GeoType"] = dbCommon[key][dbParam.index("GEOTYPE")]
 
    return params
+
+
+def InitializeLuminosityDetectorParameters(dbGeomCursor):
+   """Read luminosity detectors from the DB
+
+   dbGeomCursor: AtlasGeoDBInterface instance
+   """
+
+   dbId, dbCommon, dbParam = dbGeomCursor.GetCurrentLeafContent("LuminositySwitches")
+
+   params = {"BCMPrime" : False,
+             "PLR" : False}
+
+   if len(dbId):
+      key = dbId[0]
+      if "BCMPRIME" in dbParam :
+         params["BCMPrime"] = dbCommon[key][dbParam.index("BCMPRIME")] == 1
+      if "PLR" in dbParam :
+         params["PLR"] = dbCommon[key][dbParam.index("PLR")] == 1
+
+   return params