Calorimeter/CaloRec/src/CaloClusterMomentsMaker.cxx

@@ -4,7 +4,6 @@
 
 //-----------------------------------------------------------------------
 // File and Version Information:
-// $Id: CaloClusterMomentsMaker.cxx,v 1.23 2009-04-22 19:50:46 ssnyder Exp $
 //
 // Description: see CaloClusterMomentsMaker.h
 // 
@@ -160,12 +159,8 @@ CaloClusterMomentsMaker::CaloClusterMomentsMaker(const std::string& type,
   declareProperty("TwoGaussianNoise",m_twoGaussianNoise);
   declareProperty("LArHVFraction",m_larHVFraction,"Tool Handle for LArHVFraction");
 
-  /// Not used anymore (with xAOD), but required to when configured from 
-  /// COOL via CaloRunClusterCorrections.
+  /// Not used anymore (with xAOD), but required when configured from  COOL.
   declareProperty("AODMomentsNames",m_momentsNamesAOD);
-  /// Not used by this tool, but required to use this
-  /// with CaloRunClusterCorrections.
-  declareProperty("order", m_order = 0);
   // Use weighting of neg. clusters option?
   declareProperty("WeightingOfNegClusters", m_absOpt);
 

Calorimeter/CaloRec/src/CaloClusterMomentsMaker.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 //Dear emacs, this is -*-c++-*-
@@ -7,7 +7,6 @@
 #define CALOCLUSTERMOMENTSMAKER_H
 /**
  * @class CaloClusterMomentsMaker
- * @version \$Id: CaloClusterMomentsMaker.h,v 1.10 2009-04-22 19:50:46 ssnyder Exp $
  * @author Sven Menke <menke@mppmu.mpg.de>
  * @date 28-February-2005
  * @brief Calculate moments for CaloCluster objects
@@ -127,19 +126,13 @@ class CaloClusterMomentsMaker: public AthAlgTool, virtual public CaloClusterColl
 
   ToolHandle<ILArHVFraction> m_larHVFraction;
 
-  /// Not used anymore (with xAOD), but required to when configured from 
-  /// COOL via CaloRunClusterCorrections.
+  /// Not used anymore (with xAOD), but required when configured from COOL.
   std::string m_momentsNamesAOD;
   
   /**
    * @brief if set to true use abs E value of cells to calculate 
    * cluster moments */
    bool m_absOpt;
-  
-
-  /// Not used by this tool, but required to use this
-  /// with CaloRunClusterCorrections.
-  int m_order;
 };
 
 #endif // CALOCLUSTERMOMENTSMAKER_H

Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx

@@ -3,7 +3,6 @@
 */
 //-----------------------------------------------------------------------
 // File and Version Information:
-// $Id: CaloClusterMomentsMaker.cxx,v 1.23 2009-04-22 19:50:46 ssnyder Exp $
 //
 // Description: see CaloClusterMomentsMaker.h
 // 
@@ -158,12 +157,8 @@ CaloClusterMomentsMaker_DigiHSTruth::CaloClusterMomentsMaker_DigiHSTruth(const s
   declareProperty("LArHVFraction",m_larHVFraction,"Tool Handle for LArHVFraction");
   declareProperty("WeightingOfNegClusters", m_absOpt);
 
-  /// Not used anymore (with xAOD), but required to when configured from 
-  /// COOL via CaloRunClusterCorrections.
+  /// Not used anymore (with xAOD), but required when configured from COOL.
   declareProperty("AODMomentsNames",m_momentsNamesAOD);
-  /// Not used by this tool, but required to use this
-  /// with CaloRunClusterCorrections.
-  declareProperty("order", m_order = 0);
 }
 
 //###############################################################################

Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.h

@@ -6,7 +6,6 @@
 #define CALOCLUSTERMOMENTSMAKER_DigiHSTruth_H
 /**
  * @class CaloClusterMomentsMaker
- * @version \$Id: CaloClusterMomentsMaker.h,v 1.10 2009-04-22 19:50:46 ssnyder Exp $
  * @author Sven Menke <menke@mppmu.mpg.de>
  * @date 28-February-2005
  * @brief Calculate moments for CaloCluster objects
@@ -128,17 +127,12 @@ class CaloClusterMomentsMaker_DigiHSTruth final: public extends<AthAlgTool, Calo
   SG::ReadCondHandleKey<CaloNoise> m_noiseCDOKey{this,"CaloNoiseKey","totalNoise","SG Key of CaloNoise data object"};
   ToolHandle<ILArHVFraction> m_larHVFraction;
 
-  /// Not used anymore (with xAOD), but required to when configured from 
-  /// COOL via CaloRunClusterCorrections.
+  /// Not used anymore (with xAOD), but required when configured from COOL.
   std::string m_momentsNamesAOD;
   /**
  *    * @brief if set to true use abs E value of cells to calculate 
  *       * cluster moments */
    bool m_absOpt;
-
-  /// Not used by this tool, but required to use this
-  /// with CaloRunClusterCorrections.
-  int m_order;
 };
 
 #endif // CALOCLUSTERMOMENTSMAKER_H

Calorimeter/CaloRec/src/ToolConstantsCondAlg.h

@@ -61,7 +61,7 @@ private:
   { this, "COOLFolderKey", "", "Name of COOL folder" };
 
   StringProperty m_detStoreKey
-  { this, "DetStoreKey", "", "Key in DetetorStore of ToolConstants object." };
+  { this, "DetStoreKey", "", "Key in DetectorStore of ToolConstants object." };
 
   SG::WriteCondHandleKey<CaloRec::ToolConstants> m_toolConstantsKey
   { this, "ToolConstantsKey", "", "SG key of output ToolConstants object" };

Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h

@@ -8,7 +8,7 @@
  * @date Apr, 2020
  * @brief Hold constants for a tool.
  *
- * An extension to Gaudi componts to manage a set of Constants,
+ * An extension to Gaudi components to manage a set of Constants,
  * which are like properties but are set from COOL with the possibility
  * of overriding them from job options.
  *

Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.icc

@@ -232,7 +232,7 @@ StatusCode ToolConstant<T>::CProperty::fromString( const std::string& value )
     throw ExcConstantReset (m_impl.m_toolName, this->name());
   }
 
-  // Convert from string and sae as the value of the property.
+  // Convert from string and save as the value of the property.
   CaloRec::Arrayrep rep (value, m_impl.m_toolName);
   m_impl.m_constants.setrep (this->name(), rep);
   T val;

Control/AthenaServices/src/AthenaOutputStream.cxx

@@ -874,7 +874,6 @@ void AthenaOutputStream::addItemObjects(const SG::FolderItem& item,
                     // Get a handle on the compression information for this store
                     std::string key = item_key;
                     key.erase (key.size()-4, 4);
-                    SG::ThinningInfo::compression_map_t& compMap = compInfo[key];
 
                     // Build the compression list, retrieve the relevant AuxIDs and
                     // store it in the relevant map that is going to be inserted into
@@ -882,16 +881,15 @@ void AthenaOutputStream::addItemObjects(const SG::FolderItem& item,
                     xAOD::AuxCompression compression;
                     compression.setCompressedAuxIDs( comp_attr_map );
                     for( const auto& it : compression.getCompressedAuxIDs( allVars ) ) {
-                      if( it.second.size() > 0 ) // insert only if the set is non-empty
-                        compMap[ it.first ] = it.second;
-                    }
-
-                    for( const auto& it : compMap ) {
-                      ATH_MSG_DEBUG( "Lossy float compression level " << it.first <<
-                                     " contains " << it.second.size() <<  " elements"
-                                     " for container " << key );
-                    }
-                  }
+                      if( it.second.size() > 0 ) { // insert only if the set is non-empty
+                        compInfo[ key ][ it.first ] = it.second;
+                        ATH_MSG_DEBUG( "Container " << key << " has " << it.second.size() <<
+                                       " variables that'll be lossy float compressed"
+                                       " with " << it.first << " mantissa bits" );
+                      }
+                    } // End of loop over variables to be lossy float compressed
+                  } // End of lossy float compression logic
+
                }
 
                added = true;

Control/AthenaServices/test/AthenaOutputStream_test.cxx

@@ -131,9 +131,10 @@ int main() {
 
   const SG::CompressionInfo* compInfo = nullptr;
   assert (pStore->retrieve (compInfo, "CompressionInfo_AthenaOutputStream").isSuccess());
-  assert (compInfo->size() == 2); // 2 levels of compression as high/low
+  assert (compInfo->size() == 1); // A single container has variables to be compressed
   auto val = compInfo->find("comp");
   assert (val != compInfo->end());
+  assert (val->second.size() == 2); // 2 levels of compression as high/low
   assert (val->second.at(10).test(foo.auxid()));  // compress foo high
   assert (!val->second.at(10).test(bar.auxid())); // don't compress bar since it's double
   assert (val->second.at(16).test(zzz.auxid()));  // compress zzz low

Control/CxxUtils/CxxUtils/bitscan.h

@@ -130,7 +130,7 @@ namespace CxxUtils {
    * @param x Number to check
    * @return Number of bits set in x.
    */
-#if defined(__x86_64__) && HAVE_GCC_INTRINSICS
+#if defined(__x86_64__) && HAVE_TARGET_CLONES
   // We want to use the popcnt instruction for this if it's available.
   // However, we're still compiling for a Model-T x86_64 by default.
   // Use the target attribute and function multiversioning to use
@@ -146,7 +146,7 @@ namespace CxxUtils {
 #endif
   }
 
-#if defined(__x86_64__) && HAVE_GCC_INTRINSICS
+#if defined(__x86_64__) && HAVE_TARGET_CLONES
   __attribute__ ((target_clones ("popcnt,default")))
 #endif
   inline unsigned count_ones(unsigned long x) {
@@ -158,7 +158,7 @@ namespace CxxUtils {
   }
 
 
-#if defined(__x86_64__) && HAVE_GCC_INTRINSICS
+#if defined(__x86_64__) && HAVE_TARGET_CLONES
   __attribute__ ((target_clones ("popcnt,default")))
 #endif
   inline unsigned count_ones(unsigned long long x) {

Control/CxxUtils/CxxUtils/features.h

@@ -65,4 +65,13 @@
 # define HAVE_VECTOR_SIZE_ATTRIBUTE 0
 #endif
 
+// Do we additionally support the ternary operator for vectorizes types.
+// GCC and llvm clang >=10
+#if HAVE_VECTOR_SIZE_ATTRIBUTE &&                                              \
+  !(defined(__clang__) && ((__clang_major__ < 10) || defined(__APPLE__)))
+#define HAVE_VECTOR_TERNARY_OPERATOR 1
+#else
+#define HAVE_VECTOR_TERNARY_OPERATOR 0
+#endif
+
 #endif // not CXXUTILS_FEATURES_H

Control/CxxUtils/CxxUtils/vec.h

@@ -448,10 +448,7 @@ template<typename VEC>
 inline void
 vselect(VEC& dst, const VEC& a, const VEC& b, const mask_type_t<VEC>& mask)
 {
-// clang supports the ternary operator (:?)for GCC vector types
-// only for llvm version 10 and above.
-#if (defined(__clang__) && ((__clang_major__ < 10) || defined(__APPLE__))) ||  \
-  !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
+#if !HAVE_VECTOR_TERNARY_OPERATOR || 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];
@@ -469,8 +466,7 @@ template<typename VEC>
 inline void
 vmin(VEC& dst, const VEC& a, const VEC& b)
 {
-#if (defined(__clang__) && ((__clang_major__ < 10) || defined(__APPLE__))) ||  \
-  !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
+#if !HAVE_VECTOR_TERNARY_OPERATOR || 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];
@@ -488,8 +484,7 @@ template<typename VEC>
 inline void
 vmax(VEC& dst, const VEC& a, const VEC& b)
 {
-#if (defined(__clang__) && ((__clang_major__ < 10) || defined(__APPLE__))) ||  \
-  !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
+#if !HAVE_VECTOR_TERNARY_OPERATOR || 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];
@@ -509,7 +504,7 @@ template<typename VEC>
 inline void
 vpermute(VEC& dst, const VEC& src, const mask_type_t<VEC>& mask)
 {
-#if defined(__clang__) || !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
+#if !HAVE_GCC_INTRINSICS || !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
   // clang can vectorize this at O2
   constexpr size_t N = vec_size<VEC>();
   for (size_t i = 0; i < N; ++i) {

Control/DataModelAthenaPool/DataModelAthenaPool/ATLAS_CHECK_THREAD_SAFETY

+Control/DataModelAthenaPool

Control/DataModelAthenaPool/src/DataVectorConvert.cxx

@@ -14,6 +14,7 @@
 #include "TClass.h"
 #include "TBuffer.h"
 #include "RootUtils/TClassEditRootUtils.h"
+#include "CxxUtils/checker_macros.h"
 #include "TMemberStreamer.h"
 #include "TStreamerElement.h"
 #include "TStreamerInfo.h"
@@ -26,6 +27,7 @@
 #include <sstream>
 #include <cstring>
 #include <algorithm>
+#include <mutex>
 
 
 namespace {
@@ -421,10 +423,6 @@ void test_dv (RootUtils::ILogger* logfn,
 }
 
 
-// List of classes we've already processed.
-std::vector<TClass*> s_seen;
-
-
 } // anonymous namespace
 
 
@@ -443,6 +441,12 @@ namespace DataModelAthenaPool {
  */
 void DataVectorConvert::initialize (RootUtils::ILogger* logfn /* = 0*/)
 {
+  static std::mutex m;
+  std::lock_guard<std::mutex> lock (m);
+
+  // List of classes we've already processed.
+  static std::vector<TClass*> s_seen ATLAS_THREAD_SAFE;
+
   TIter next (gROOT->GetListOfClasses());
   while (TClass* cls = dynamic_cast<TClass*> (next())) {
     if (std::strncmp (cls->GetName(), "DataVector<", 11) == 0) {

Control/DataModelAthenaPool/test/DataLink_p2_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -53,7 +53,7 @@ void test1()
 
 int main()
 {
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   return 0;
 }

Control/DataModelAthenaPool/test/ElementLinkCnv_p1_test.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
 */
 /**
  * @file  DataModelAthenaPool/test/ElementLinkCnv_p1_test.cxx
@@ -80,7 +80,7 @@ void test1()
 int main()
 {
   std::cout << "DataModelAthenaPool/ElementLinkCnv_p1_test\n";
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   return 0;
 }

Control/DataModelAthenaPool/test/ElementLinkCnv_p2_test.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
 */
 /**
  * @file  DataModelAthenaPool/test/ElementLinkCnv_p2_test.cxx
@@ -91,7 +91,7 @@ void test1()
 int main()
 {
   std::cout << "DataModelAthenaPool/ElementLinkCnv_p2_test\n";
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   return 0;
 }

Control/DataModelAthenaPool/test/ElementLinkCnv_p3_test.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
 */
 /**
  * @file  DataModelAthenaPool/test/ElementLinkCnv_p3_test.cxx
@@ -77,7 +77,7 @@ void test1()
 int main()
 {
   std::cout << "DataModelAthenaPool/ElementLinkCnv_p3_test\n";
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   return 0;
 }

Control/DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.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
 */
 /**
  * @file  DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.cxx
@@ -109,7 +109,7 @@ void test1()
 int main()
 {
   std::cout << "DataModelAthenaPool/ElementLinkVectorCnv_p1_test\n";
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   return 0;
 }

Control/DataModelAthenaPool/test/NavigableCnv_p1_test.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
 */
 /**
  * @file  DataModelAthenaPool/test/NavigableCnv_p1_test.cxx
@@ -150,7 +150,7 @@ void test2()
 int main()
 {
   std::cout << "DataModelAthenaPool/NavigableCnv_p1_test\n";
-  SGTest::initTestStore();
+  std::unique_ptr<SGTest::TestStore> testStore = SGTest::getTestStore();
   test1();
   test2();
   return 0;