AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadDoubleSelector.py

@@ -23,6 +23,11 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 ## get a handle to the ApplicationManager
 from AthenaCommon.AppMgr import theApp
 
+# Set that we are running MC+MC overlay in MT mode
+from OverlayCommonAlgs.OverlayFlags import overlayFlags
+overlayFlags.isDataOverlay.set_Value_and_Lock(False)
+overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+
 #--------------------------------------------------------------
 # Load POOL support for DoubleEventSelector
 #--------------------------------------------------------------

AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py

@@ -24,6 +24,11 @@ from AthenaCommon.AppMgr import theApp
 ## get a handle to the ServiceManager
 from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 
+# Set that we are running MC+MC overlay in MT mode
+from OverlayCommonAlgs.OverlayFlags import overlayFlags
+overlayFlags.isDataOverlay.set_Value_and_Lock(False)
+overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+
 #--------------------------------------------------------------
 # Load POOL support for DoubleEventSelector
 #--------------------------------------------------------------

AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py

@@ -23,6 +23,11 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 # get a handle to the ApplicationManager
 from AthenaCommon.AppMgr import theApp
 
+# Set that we are running MC+MC overlay in MT mode
+from OverlayCommonAlgs.OverlayFlags import overlayFlags
+overlayFlags.isDataOverlay.set_Value_and_Lock(False)
+overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+
 #--------------------------------------------------------------
 # Load POOL support for DoubleEventSelector
 #--------------------------------------------------------------

AtlasTest/DatabaseTest/AthenaPoolTest/share/ReadRDODoubleSelector.py

@@ -23,6 +23,11 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 ## get a handle to the ApplicationManager
 from AthenaCommon.AppMgr import theApp
 
+# Set that we are running MC+MC overlay in MT mode
+from OverlayCommonAlgs.OverlayFlags import overlayFlags
+overlayFlags.isDataOverlay.set_Value_and_Lock(False)
+overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+
 #--------------------------------------------------------------
 # Load POOL support for DoubleEventSelector
 #--------------------------------------------------------------

Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt

-################################################################################
-# Package: CaloDetMgrDetDescrCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( CaloDetMgrDetDescrCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/DetDescrCnvSvc
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloIdentifier
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          LArCalorimeter/LArGeoModel/LArReadoutGeometry
-                          TileCalorimeter/TileDetDescr )
-
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-
 # Component(s) in the package:
 atlas_add_component( CaloDetMgrDetDescrCnv
                      src/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} DetDescrCnvSvcLib Identifier GaudiKernel CaloDetDescrLib CaloIdentifier AthenaKernel StoreGateLib SGtests GeoModelUtilities LArReadoutGeometry TileDetDescr )
+                     LINK_LIBRARIES DetDescrCnvSvcLib Identifier GaudiKernel CaloDetDescrLib CaloIdentifier AthenaKernel StoreGateLib SGtests GeoModelUtilities LArReadoutGeometry TileDetDescr )
 
 # Install files from the package:
-atlas_install_headers( CaloDetMgrDetDescrCnv )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 

Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloCellVolumes.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "CaloDetMgrDetDescrCnv/CaloCellVolumes.h"
+#include "CaloCellVolumes.h"
 
 #include "Identifier/Identifier.h"
 #include "CaloIdentifier/CaloCell_ID.h"

Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
-#include "CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h"
-#include "CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h"
+#include "CaloMgrDetDescrCnv.h"
+#include "CaloSuperCellMgrDetDescrCnv.h"
 
 DECLARE_CONVERTER( CaloMgrDetDescrCnv )
 DECLARE_CONVERTER( CaloSuperCellMgrDetDescrCnv )

Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h"
-#include "CaloDetMgrDetDescrCnv/CaloCellVolumes.h"
+#include "CaloMgrDetDescrCnv.h"
+#include "CaloCellVolumes.h"
 
 #include "DetDescrCnvSvc/DetDescrConverter.h"
 #include "DetDescrCnvSvc/DetDescrAddress.h"

Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloSuperCellMgrDetDescrCnv.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -15,7 +15,7 @@
 #undef NDEBUG
 
 
-#include "CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h"
+#include "CaloSuperCellMgrDetDescrCnv.h"
 #include "CaloDetDescr/ICaloSuperCellIDTool.h"
 #include "TileDetDescr/TileDetDescrManager.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"

Calorimeter/CaloUtils/CMakeLists.txt

-################################################################################
-# Package: CaloUtils
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( CaloUtils )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Calorimeter/CaloConditions
-   Calorimeter/CaloDetDescr
-   Calorimeter/CaloEvent
-   Calorimeter/CaloGeoHelpers
-   Calorimeter/CaloIdentifier
-   Calorimeter/CaloInterface
-   Control/AthenaBaseComps
-   Control/AthenaKernel
-   Control/Navigation
-   Control/StoreGate
-   Control/CxxUtils
-   Event/FourMom
-   Event/xAOD/xAODCaloEvent
-   Event/xAOD/xAODCore
-   GaudiKernel
-   PRIVATE
-   AtlasTest/TestTools
-   Control/SGTools
-   DetectorDescription/GeoModel/GeoModelInterfaces
-   DetectorDescription/IdDictParser
-   DetectorDescription/Identifier )
-
 # External dependencies:
 find_package( Boost )
 find_package( CLHEP )
@@ -93,7 +66,7 @@ atlas_add_test( CaloTowerStore_test
 atlas_add_test( CaloTowerBuilderTool_test
    SCRIPT test/CaloTowerBuilderTool_test.sh
    LOG_IGNORE_PATTERN "Reading file|Unable to locate catalog|Cache alignment"
-   ENVIRONMENT "ATLAS_REFERENCE_TAG=CaloUtils/CaloUtils-01-00-11"
+   ENVIRONMENT "ATLAS_REFERENCE_TAG=CaloUtils/CaloUtils-01-00-12"
    PROPERTIES TIMEOUT 500 )
 
 atlas_add_test( ToolWithConstants_test

Calorimeter/CaloUtils/share/CaloTowerStore_test.ref

@@ -31,7 +31,6 @@ StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
 ClassIDSvc           INFO  getRegistryEntries: read 3542 CLIDRegistry entries for module ALL
-CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
 AthenaPoolCnvSvc     INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00

Control/AthenaConfiguration/python/AllConfigFlags.py

@@ -198,6 +198,11 @@ def _createCfgFlags():
         return dqf
     _addFlagsCategory(acf, "DQ", __dq, 'AthenaMonitoring' )
 
+    def __perfmon():
+        from PerfMonComps.PerfMonConfigFlags import createPerfMonConfigFlags
+        return createPerfMonConfigFlags()
+    _addFlagsCategory(acf, "PerfMon", __perfmon, 'PerfMonComps')
+
     return acf
 
 

Control/CxxUtils/CxxUtils/vec.h

@@ -24,16 +24,35 @@
  * attribute is supported or a fallback C++ class intended to be
  * (mostly) functionally equivalent.
  *
- * We also support these additional operations:
+ * We also support additional operations.
  *
+ * Deducing useful types:
  *  - @c CxxUtils::vec_type_t<VEC> is the element type of @c VEC.
+ *  - @c CxxUtils::mask_type_t<VEC> is the vector type return by relational
+ *                                  operations.
+ *
+ * Deducing the num of elements in a vectorized type:
  *  - @c CxxUtils::vec_size<VEC>() is the number of elements in @c VEC.
  *  - @c CxxUtils::vec_size(const VEC&) is the number of elements in @c VEC.
+ *
+ * Methods providing similar functionality to certain x86-64 SIMD intrinics
  *  - @c CxxUtils::vbroadcast (VEC& v, T x) initializes each element of
  *                                          @c v with @c x.
+ *  - @c CxxUtils::vload (VEC& dst, vec_type_t<VEC>* mem_addr)
+ *                                          loads elements from @c mem_addr
+ *                                          to @c dst
+ *  - @c CxxUtils::vstore (vec_type_t<VEC>* mem_addr, VEC& src)
+ *                                          stores elements from @c src
+ *                                          to @c mem_addr
+ *  - @c CxxUtils::vselect (VEC& dst, const VEC& a, const VEC& b, const
+ *                          mask_type_t<VEC>& mask)
+ *                          copies elements from @c a or @b, depending
+ *                          on the value @c of mask to @c dst.
+ *  - @c CxxUtils::vmin   (VEC& dst, const VEC& a, const VEC& b)
+ *                         copies to @c dst[i]  the min(a[i],b[i])
+ *
  */
 
-
 #ifndef CXXUTILS_VEC_H
 #define CXXUTILS_VEC_H
 
@@ -41,6 +60,7 @@
 #include "CxxUtils/features.h"
 #include "boost/integer.hpp"
 #include <cstdlib>
+#include <cstring>
 #include <initializer_list>
 #include <algorithm>
 #include <type_traits>
@@ -177,7 +197,7 @@ UNOP(~)
 
 
 #undef UNOP
-  
+
 
 // Define relational operations.
 
@@ -330,13 +350,30 @@ constexpr size_t vec_size(const VEC&)
   return sizeof(VEC) / sizeof(ELT);
 }
 
+/**
+ * brief Deduce the type of a mask , type returned by relational operations,
+ * for a vectorized type.
+ */
+template<class VEC>
+struct mask_type
+{
+  static auto maskt(const VEC& v1, const VEC& v2) -> decltype(v1 < v2);
+  typedef
+    typename std::invoke_result<decltype(maskt), const VEC&, const VEC&>::type
+      type1;
+  typedef std::remove_cv_t<std::remove_reference_t<type1>> type;
+};
+template<class VEC>
+/// Deduce the mask type for a vectorized type.
+using mask_type_t = typename mask_type<VEC>::type;
 
 /**
  * brief Copy a scalar to each element of a vectorized type.
+ * Similar functionality to _mm_set/_mm_broadcast x86-64 intrinsics.
  */
-template <typename VEC, typename T>
-inline
-void vbroadcast (VEC& v, T x)
+template<typename VEC, typename T>
+inline void
+vbroadcast(VEC& v, T x)
 {
   // This may look inefficient, but the loop goes away when we
   // compile with optimization.
@@ -346,6 +383,66 @@ void vbroadcast (VEC& v, T x)
   }
 }
 
+/*
+ * @brief load elements from  memory address (C-array)
+ * to a vectorized type. Similar to _mm_load intrinsics
+ */
+template<typename VEC>
+inline void
+vload(VEC& dst, vec_type_t<VEC>* mem_addr)
+{
+  std::memcpy(&dst, mem_addr, sizeof(VEC));
+}
+
+/*
+ * @brief load elements from a vectorized type to
+ * a memory address (C-array).
+ * Similar to _mm_store intrinsics
+ */
+template<typename VEC>
+inline void
+vstore(vec_type_t<VEC>* mem_addr, VEC& src)
+{
+  std::memcpy(mem_addr, &src, sizeof(VEC));
+}
+
+/*
+ * @brief select/blend function.
+ * Similar _mm_blend X86-64 intrinsics
+ */
+template<typename VEC>
+inline void
+vselect(VEC& dst, const VEC& a, const VEC& b, const mask_type_t<VEC>& mask)
+{
+#if (defined(__clang__) && (__clang_major__ < 10)) ||                          \
+  !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
+  constexpr size_t N = vec_size<VEC>();
+  for (size_t i = 0; i < N; i++) {
+    dst[i] = mask[i] ? a[i] : b[i];
+  }
+#else
+  dst = mask ? a : b;
+#endif
+}
+
+/*
+ * @brief vectorized min.
+ * Similar to _mm_min intrinsics
+ */
+template<typename VEC>
+inline void
+vmin(VEC& dst, const VEC& a, const VEC& b)
+{
+#if (defined(__clang__) && (__clang_major__ < 10)) ||                          \
+  !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
+  constexpr size_t N = vec_size<VEC>();
+  for (size_t i = 0; i < N; i++) {
+    dst[i] = a[i] < b[i] ? a[i] : b[i];
+  }
+#else
+  dst = a < b ? a : b;
+#endif
+}
 
 } // namespace CxxUtils
 

Control/CxxUtils/test/vec_test.cxx

@@ -22,7 +22,7 @@
 #include <type_traits>
 #include <limits>
 
-
+#include <array>
 #include <valarray>
 
 
@@ -269,6 +269,66 @@ void test_broadcast (const VEC& v1)
   }
 }
 
+template<class VEC>
+void
+test_storeload(const VEC& v1)
+{
+
+  std::array<CxxUtils::vec_type_t<VEC>, CxxUtils::vec_size<VEC>()> buffer{};
+  CxxUtils::vec_type_t<VEC>* mem_addr = buffer.data();
+
+  CxxUtils::vstore(mem_addr, v1);
+  size_t N = CxxUtils::vec_size<VEC>();
+  for (size_t i = 0; i < N; i++) {
+    assert(v1[i] == mem_addr[i]);
+  }
+
+  VEC v2;
+  CxxUtils::vload(v2, mem_addr);
+  for (size_t i = 0; i < N; i++) {
+    assert(v2[i] == mem_addr[i]);
+  }
+}
+
+template<class VEC>
+void
+test_select(const VEC& v1)
+{
+
+  const VEC v2 = 2 * v1;
+  CxxUtils::mask_type_t<VEC> greater;
+  CxxUtils::mask_type_t<VEC> less;
+  size_t N = CxxUtils::vec_size<VEC>();
+  for (size_t i = 0; i < N; i++) {
+    greater[i] = v1[i] > v2[i];
+    less[i] = v1[i] < v2[i];
+  }
+
+  VEC selectGreater;
+  CxxUtils::vselect(selectGreater, v1, v2, greater);
+  VEC selectLess;
+  CxxUtils::vselect(selectLess, v1, v2, less);
+
+  for (size_t i = 0; i < N; i++) {
+    assert(selectGreater[i] == v2[i]);
+    assert(selectLess[i] == v1[i]);
+  }
+}
+
+template<class VEC>
+void
+test_min(const VEC& v1)
+{
+
+  const VEC v2 = v1 + 1;
+
+  VEC min;
+  CxxUtils::vmin(min, v1, v2);
+  size_t N = CxxUtils::vec_size<VEC>();
+  for (size_t i = 0; i < N; i++) {
+    assert(min[i] == v1[i]);
+  }
+}
 
 template <template <class T, size_t N> class VEC>
 void test1a()
@@ -279,13 +339,16 @@ void test1a()
   assert (CxxUtils::vec_size(v) == 4);
 
 #define ELT(r,data,elem) elem,
-#define INITN(N, ...) { BOOST_PP_LIST_FOR_EACH(ELT, _, BOOST_PP_LIST_FIRST_N(N, BOOST_PP_VARIADIC_TO_LIST(__VA_ARGS__)))  } 
+#define INITN(N, ...) { BOOST_PP_LIST_FOR_EACH(ELT, _, BOOST_PP_LIST_FIRST_N(N, BOOST_PP_VARIADIC_TO_LIST(__VA_ARGS__)))  }
 
 #define TEST_FLOAT(T, N)                                                \
   do {                                                                  \
     test_arith (VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
     test_relops (VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
     test_broadcast (VEC<T, N> INITN(N, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5)); \
+    test_storeload (VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
+    test_select (VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
+    test_min (VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
   } while(0)
 
   TEST_FLOAT(float, 1);
@@ -303,6 +366,9 @@ void test1a()
     test_arith (VEC<T, N> INITN(N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
     test_relops (VEC<T, N> INITN(N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
     test_broadcast (VEC<T, N> INITN(N, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3)); \
+    test_storeload (VEC<T, N> INITN(N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
+    test_select (VEC<T, N> INITN(N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
+    test_min (VEC<T, N> INITN(N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
     test_int (VEC<T, N> INITN(N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
     test_logops (VEC<T, N> INITN(N, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1)); \
   } while(0)

Control/PerformanceMonitoring/PerfMonComps/python/PerfMonCompsConfig.py

+#!/usr/bin/env python
+
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaCommon.Logging import logging
+
+## A minimal new-style configuration for PerfMonMTSvc
+def PerfMonMTSvcCfg(flags, **kwargs):
+    """ Configuring PerfMonMTSvc """
+   
+    # Get the logger
+    log = logging.getLogger("PerfMonMTSvcCfg")
+    log.info("Configuring PerfMonMTSvc with flags:")
+    log.info("  >> doFastMonMT {}".format(flags.PerfMon.doFastMonMT))
+    log.info("  >> doFullMonMT {}".format(flags.PerfMon.doFullMonMT))
+
+    # Check if basic monitoring is asked for
+    if not flags.PerfMon.doFastMonMT and not flags.PerfMon.doFullMonMT:
+        log.info("Nothing to be done...")
+        return ComponentAccumulator()
+
+    # Hook to PerfMonMTSvc
+    PerfMonMTSvc = CompFactory.PerfMonMTSvc
+
+    # Set the main properties for the service
+    import os,psutil
+    kwargs.setdefault("wallTimeOffset",
+                      psutil.Process(os.getpid()).create_time() * 1000)
+    kwargs.setdefault("numberOfThreads",
+                      max(1,flags.Concurrency.NumThreads))
+    kwargs.setdefault("numberOfSlots",
+                      max(1,flags.Concurrency.NumConcurrentEvents))
+    kwargs.setdefault("doComponentLevelMonitoring",
+                      flags.PerfMon.doFullMonMT)
+
+    # Get CA and add the service 
+    acc = ComponentAccumulator()
+    acc.addService(PerfMonMTSvc(**kwargs), create=True)
+
+    # Enable the auditors that are necessarry for the service
+    acc.setAppProperty("AuditAlgorithms", True)
+    acc.setAppProperty("AuditTools", True)
+    acc.setAppProperty("AuditServices", True)
+
+    # Add the algorithm that is necessary for the service
+    PerfMonMTAlg = CompFactory.PerfMonMTAlg
+    acc.addEventAlgo(PerfMonMTAlg(), sequenceName='AthAlgSeq')
+    
+    # Return the CA
+    return acc

Control/PerformanceMonitoring/PerfMonComps/python/PerfMonConfigFlags.py

+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.AthConfigFlags import AthConfigFlags
+
+def createPerfMonConfigFlags():
+    pcf = AthConfigFlags()
+
+    # Two basic flags for PerfMonMT
+    pcf.addFlag('PerfMon.doFastMonMT', False)
+    pcf.addFlag('PerfMon.doFullMonMT', False)
+    
+    return pcf

Control/SGTools/CMakeLists.txt

-################################################################################
-# Package: SGTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SGTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Control/CxxUtils
-                          GaudiKernel
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Control/SGMon/SGAudCore )
-
 # External dependencies:
-find_package( Boost COMPONENTS thread filesystem system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost )
 
 # Component(s) in the package:
 atlas_add_library( SGTools
                    src/*.cxx
                    PUBLIC_HEADERS SGTools
                    INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                    LINK_LIBRARIES ${Boost_LIBRARIES} AthenaKernel CxxUtils GaudiKernel
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools SGAudCore )
+                   PRIVATE_LINK_LIBRARIES SGAudCore )
 
 atlas_add_dictionary( SGToolsDict
                       SGTools/SGToolsDict.h
                       SGTools/selection.xml
-                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+                      LINK_LIBRARIES SGTools )
 
+# Tests in the package:
 atlas_add_test( VersionedKey_test
                 SOURCES
                 test/VersionedKey_test.cxx
-                INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+                LINK_LIBRARIES SGTools )
 
 atlas_add_test( safe_clid_test
                 SOURCES
                 test/safe_clid_test.cxx
-                INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+                LINK_LIBRARIES SGTools )
 
 atlas_add_test( exceptions_test
                 SOURCES
                 test/exceptions_test.cxx
-                INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+                LINK_LIBRARIES SGTools )
 
 atlas_add_test( StringPool_test
                 SOURCES
                 test/StringPool_test.cxx
-                INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+                LINK_LIBRARIES SGTools )
 
 atlas_add_test( DataProxy_test
                 SOURCES
                 test/DataProxy_test.cxx
-                INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+                LINK_LIBRARIES SGTools )
 
 atlas_add_test( DataStore_test
                 SOURCES
                 test/DataStore_test.cxx
-                INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+                LINK_LIBRARIES SGTools )
 
 atlas_add_test( TransientAddress_test
                 SOURCES
                 test/TransientAddress_test.cxx
-                INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+                LINK_LIBRARIES SGTools )
 
 atlas_add_test( CurrentEventStore_test
                 SOURCES
                 test/CurrentEventStore_test.cxx
-                INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+                LINK_LIBRARIES SGTools )
 
 atlas_add_test( SGFolderItem_test
                 SOURCES
                 test/SGFolderItem_test.cxx
-                INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
-
+                LINK_LIBRARIES SGTools )