Calorimeter/CaloRec/src/CaloClusterCorrDBWriter.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 //-----------------------------------------------------------------------
@@ -92,6 +92,8 @@ StatusCode CaloClusterCorrDBWriter::finalize()
 
 StatusCode CaloClusterCorrDBWriter::execute (const EventContext& /*ctx*/) const
 {
+  // Make sure the detector store gets created.
+  (void)detStore()->name();
   return StatusCode::SUCCESS;
 }
 

Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
- * Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration.
  */
 /**
  * @file CaloUtils/ToolWithConstants.h
@@ -505,6 +505,19 @@ public:
   virtual int toolVersion() const;
 
 
+  /**
+   * @brief Return the name of the type of this tool.
+   *
+   * A saved set of constants includes both the C++ class name and
+   * a version number.  Normally, the class name is taken from the
+   * Gaudi type() method, but that may be changed by overriding
+   * this method.  This can be used, for example, when there are
+   * tools with distinct C++ classes but which are yet similar enough
+   * to combine together.
+   */
+  virtual const std::string& toolType() const;
+
+
 private:
   // Make this a friend so it can access m_impl.
   template <class T>

Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.icc

 /*
- * Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration.
  */
 /**
  * @file CaloUtils/ToolWithConstants.icc
@@ -306,7 +306,7 @@ ToolWithConstants<BASE>::mergeConstants (CaloRec::ToolConstants& out,
                                          const EventContext& ctx) const
 {
   Context myctx = context (ctx);
-  return m_impl.mergeConstants (this->type(),
+  return m_impl.mergeConstants (toolType(),
                                 toolVersion(),
                                 myctx,
                                 m_isdummy (myctx),
@@ -334,4 +334,22 @@ int ToolWithConstants<BASE>::toolVersion() const
 }
 
 
+/**
+ * @brief Return the name of the type of this tool.
+ *
+ * A saved set of constants includes both the C++ class name and
+ * a version number.  Normally, the class name is taken from the
+ * Gaudi type() method, but that may be changed by overriding
+ * this method.  This can be used, for example, when there are
+ * tools with distinct C++ classes but which are yet similar enough
+ * to combine together.
+ */
+template <class BASE>
+  ATH_TWC_REQUIRES
+const std::string& ToolWithConstants<BASE>::toolType() const
+{
+  return this->type();
+}
+
+
 } // namespace CaloUtils

Control/AthContainers/AthContainers/AuxTypeRegistry.h

@@ -325,7 +325,7 @@ public:
    * @param auxid The aux data item being operated on.
    * @param dst Container for the destination vector.
    *            Declared as a rvalue reference to allow passing a temporary
-   *            here (such as from AuvVectorInterface).
+   *            here (such as from AuxVectorInterface).
    * @param dst_index Index of the first destination element in the vector.
    * @param src Container for the source vector.
    * @param src_index Index of the first source element in the vector.

Control/AthContainers/AthContainers/AuxTypeRegistry.icc

@@ -87,7 +87,7 @@ AuxVarFlags AuxTypeRegistry::getFlags (SG::auxid_t auxid) const
  * @param auxid The aux data item being operated on.
  * @param dst Container for the destination vector.
  *            Declared as a rvalue reference to allow passing a temporary
- *            here (such as from AuvVectorInterface).
+ *            here (such as from AuxVectorInterface).
  * @param dst_index Index of the first destination element in the vector.
  * @param src Container for the source vector.
  * @param src_index Index of the first source element in the vector.

Control/AthContainersInterfaces/AthContainersInterfaces/IAuxTypeVectorFactory.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file AthContainersInterfaces/IAuxTypeVectorFactory.h
@@ -113,7 +113,7 @@ public:
    * @param auxid The aux data item being operated on.
    * @param dst Container for the destination vector.
    *            Declared as a rvalue reference to allow passing a temporary
-   *            here (such as from AuvVectorInterface).
+   *            here (such as from AuxVectorInterface).
    * @param dst_index Index of the first destination element in the vector.
    * @param src Container for the source vector.
    * @param src_index Index of the first source element in the vector.

Control/AthLinks/AthLinks/ElementLink.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -675,6 +675,9 @@ public:
   //   Finish initialization after link has been read.
   //  bool doPersistent()
   //   Prepare this link for writing.
+  //  bool thin()
+  //  bool thin(const SG::ThinningCache* thinningCache)
+  //   Adjust for thinning.
 
 
 private:

Control/AthLinks/AthLinks/GenericElementLinkBase.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -19,8 +19,10 @@
 #include "AthLinks/tools/DataProxyHolder.h"
 #include "AthLinks/tools/selection_ns.h"
 #include "AthLinks/DataLinkBase.h"
+#include "AthenaKernel/getThinningCache.h"
 #include "CxxUtils/CachedValue.h"
 #include "CxxUtils/checker_macros.h"
+#include <concepts>
 
 
 // Forward declaration(s):
@@ -39,6 +41,9 @@ class ElementLinkBaseT_test;
 namespace SG {
 
 
+class ThinningCache;
+
+
 /**
  * @brief Generic base class for ElementLinks.
  *
@@ -190,6 +195,30 @@ public:
   bool toPersistent();
 
 
+  /**
+   * @brief Adjust for thinning.
+   *
+   * If this link points to a container that has been thinned,
+   * it will be adjusted accordingly.
+   *
+   * Returns @c true if the link was changed; @c false otherwise.
+   */
+  bool thin();
+
+
+  /**
+   * @brief Adjust for thinning.
+   *
+   * If this link points to a container that has been thinned,
+   * it will be adjusted accordingly.
+   * @param thinningCache Thinning cache for the current stream
+   *                      (may be null).
+   *
+   * Returns @c true if the link was changed; @c false otherwise.
+   */
+  bool thin (const SG::ThinningCache* thinningCache);
+
+
 protected:
   /**
    * @brief Default constructor.  Makes a null link.
@@ -456,6 +485,45 @@ protected:
 
 
 private:
+  /**
+   * @brief Adjust for thinning.
+   *
+   * If this link points to a container that has been thinned,
+   * it will be adjusted accordingly.
+   * @param Index of the element.
+   * @param thinningCache Thinning cache for the current stream
+   *                      (may be null).
+   *
+   * Returns @c true if the link was changed; @c false otherwise.
+   *
+   * This overload will be used for the case where thinning is supported:
+   * the index can be interconverted with size_t.
+   */
+  template <class INDEX>
+  requires (std::convertible_to<INDEX, size_t> &&
+            std::convertible_to<size_t, INDEX>)
+  bool thin1 (INDEX& persIndex,const SG::ThinningCache* thinningCache);
+
+
+  /**
+   * @brief Adjust for thinning.
+   *
+   * If this link points to a container that has been thinned,
+   * it will be adjusted accordingly.
+   * @param Index of the element.
+   * @param thinningCache Thinning cache for the current stream
+   *                      (may be null).
+   *
+   * Returns @c true if the link was changed; @c false otherwise.
+   *
+   * This overload will be used for the case where thinning is not supported.
+   */
+  template <class INDEX>
+  requires (!(std::convertible_to<INDEX, size_t> &&
+              std::convertible_to<size_t, INDEX>))
+  bool thin1 (INDEX& persIndex,const SG::ThinningCache* thinningCache);
+
+
   template <class OTHER_POLICY>
   friend class GenericElementLinkBase;
 

Control/AthLinks/AthLinks/GenericElementLinkBase.icc

 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file AthLinks/GenericElementLinkBase.icc
@@ -34,7 +34,7 @@ inline
 bool
 GenericElementLinkBase<INDEXING_POLICY>::hasCachedElement() const
 {
-  return m_element.isValid();;
+  return m_element.isValid();
 }
 
 
@@ -180,6 +180,99 @@ GenericElementLinkBase<INDEXING_POLICY>::toPersistent()
 }
 
 
+/**
+ * @brief Adjust for thinning.
+ *
+ * If this link points to a container that has been thinned,
+ * it will be adjusted accordingly.
+ *
+ * Returns @c true if the link was changed; @c false otherwise.
+ */
+template <class INDEXING_POLICY>
+inline
+bool GenericElementLinkBase<INDEXING_POLICY>::thin()
+{
+  return thin (SG::getThinningCache());
+}
+
+
+/**
+ * @brief Adjust for thinning.
+ * @param thinningCache Thinning cache for the current stream
+ *                      (may be null).
+ *
+ * If this link points to a container that has been thinned,
+ * it will be adjusted accordingly.
+ *
+ * Returns @c true if the link was changed; @c false otherwise.
+ */
+template <class INDEXING_POLICY>
+inline
+bool GenericElementLinkBase<INDEXING_POLICY>::thin (const SG::ThinningCache* thinningCache)
+{
+  return thin1 (m_index, thinningCache);
+}
+
+
+/**
+ * @brief Adjust for thinning.
+ *
+ * If this link points to a container that has been thinned,
+ * it will be adjusted accordingly.
+ * @param Index of the element.
+ * @param thinningCache Thinning cache for the current stream
+ *                      (may be null).
+ *
+ * Returns @c true if the link was changed; @c false otherwise.
+ *
+ * This overload will be used for the case where thinning is supported:
+ * the index can be interconverted with size_t.
+ */
+template <class INDEXING_POLICY>
+template <class INDEX>
+requires (std::convertible_to<INDEX, size_t> &&
+          std::convertible_to<size_t, INDEX>)
+inline
+bool GenericElementLinkBase<INDEXING_POLICY>::thin1 (INDEX& persIndex,
+                                                     const SG::ThinningCache* thinningCache)
+{
+  bool ret1 = toPersistent();
+  size_t index = static_cast<size_t>(persIndex);
+  bool ret = m_proxy.thin (m_key, index, thinningCache);
+  if (ret) {
+    persIndex = static_cast<stored_index_type>(index);
+    m_element.reset();
+  }
+  return ret1  || ret;
+}
+
+
+/**
+ * @brief Adjust for thinning.
+ *
+ * If this link points to a container that has been thinned,
+ * it will be adjusted accordingly.
+ * @param Index of the element.
+ * @param thinningCache Thinning cache for the current stream
+ *                      (may be null).
+ *
+ * Returns @c true if the link was changed; @c false otherwise.
+ *
+ * This overload will be used for the case where thinning is not supported.
+ */
+template <class INDEXING_POLICY>
+template <class INDEX>
+requires (!(std::convertible_to<INDEX, size_t> &&
+            std::convertible_to<size_t, INDEX>))
+inline
+bool GenericElementLinkBase<INDEXING_POLICY>::thin1 (INDEX& /*persIndex*/,
+                                                     const SG::ThinningCache* /*thinningCache*/)
+{
+  throwExcBadThinning (this->proxy() ? this->proxy()->clID() : CLID_NULL,
+                       this->dataID(), this->key());
+}
+
+
 /**
  * @brief Default constructor.  Makes a null link.
  */

Control/AthLinks/AthLinks/exceptions.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file AthLinks/exceptions.h
@@ -283,6 +283,40 @@ public:
 };
 
 
+/**
+ * @brief Exception -- Bad thinning request
+ *
+ * thin() was called on an ElementLink with an index type that is not
+ * compatible with an integer.
+ */
+class ExcBadThinning
+  : public std::runtime_error
+{
+public:
+  /**
+   * @brief Constructor.
+   * @param clid CLID of the link.
+   * @param key String key of the link.
+   * @param sgkey Hashed key of the link.
+   */
+  ExcBadThinning (CLID clid,
+                  const std::string& key,
+                  SG::sgkey_t sgkey);
+};
+
+
+/**
+ * @brief Throw a SG::ExcBadThinning exception.
+ * @param clid CLID of the link.
+ * @param key String key of the link.
+ * @param sgkey Hashed key of the link.
+ */
+[[noreturn]]
+void throwExcBadThinning (CLID clid,
+                          const std::string& key,
+                          SG::sgkey_t sgkey);
+
+
 } // namespace SG
 
 

Control/AthLinks/share/GenericElementLinkBase_test.ref

@@ -2,3 +2,4 @@ test1
 test2
 test3
 test4
+test5

Control/AthLinks/share/exceptions_test.ref

@@ -9,3 +9,4 @@ SG::ExcIndexNotFound: test: index not found
 SG::ExcIncomparableEL: Attempt to compare an ElementLink that does not have a SG key or index.
 SG::ExcBadToTransient: toTransient() called on an already-initialized link.
 SG::ExcConstStorable: Tried to retrieve const storable as a non-const pointer [123/key] (765)
+SG::ExcBadThinning: Bad thinning request [123/key] (765)

Control/AthLinks/src/exceptions.cxx

 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file AthLinks/src/exceptions.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -307,4 +305,48 @@ ExcConstStorable::ExcConstStorable (CLID clid,
 }
 
 
+//*************************************************************************
+
+
+/// Helper: format exception error string.
+std::string
+excBadThinning_format (CLID clid, const std::string& key, SG::sgkey_t sgkey)
+{
+  std::ostringstream os;
+  os << "SG::ExcBadThinning: "
+     << "Bad thinning request "
+     << "[" << clid << "/" << key << "] (" << sgkey << ")";
+  return os.str();
+}
+
+
+/**
+ * @brief Constructor.
+ * @param clid CLID of the link.
+ * @param key String key of the link.
+ * @param sgkey Hashed key of the link.
+ */
+ExcBadThinning::ExcBadThinning (CLID clid,
+                                const std::string& key,
+                                SG::sgkey_t sgkey)
+  : std::runtime_error (excBadThinning_format (clid, key, sgkey))
+{
+  AthLinks_error();
+}
+
+
+/**
+ * @brief Throw a SG::ExcBadThinning exception.
+ * @param clid CLID of the link.
+ * @param key String key of the link.
+ * @param sgkey Hashed key of the link.
+ */
+void throwExcBadThinning (CLID clid,
+                          const std::string& key,
+                          SG::sgkey_t sgkey)
+{
+  throw ExcBadThinning (clid, key, sgkey);
+}
+
+
 } // namespace SG

Control/AthLinks/test/ElementLinkBase_test.cxx

 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -506,6 +506,12 @@ void test4 (SGTest::TestStore& store)
   assert (sgkey == sgkey_foo);
   assert (index == 10);
 
+  std::string key = "foo";
+  ElementLinkBase_test link (key, fooclid, 12, &store);
+  link.thin (&cache);
+  assert (link.index() == 12);
+  assert (link.key() == sgkey_foo);
+
   SG::ThinningDecisionBase dec (20);
   dec.thin (7);
   dec.thin (8);
@@ -515,6 +521,10 @@ void test4 (SGTest::TestStore& store)
   assert (h1.thin (sgkey, index, &cache) == true);
   assert (sgkey == sgkey_foo);
   assert (index == 8);
+
+  link.thin (&cache);
+  assert (link.index() == 10);
+  assert (link.key() == sgkey_foo);
 }
 
 

Control/AthLinks/test/GenericElementLinkBase_test.cxx

 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -17,8 +17,10 @@
 #include "SGTools/CurrentEventStore.h"
 #include "AthLinks/tools/MapIndexingPolicy.h"
 #include "AthLinks/tools/SetIndexingPolicy.h"
+#include "AthLinks/tools/ForwardIndexingPolicy.h"
 #include "AthenaKernel/CLASS_DEF.h"
 #include "AthenaKernel/getMessageSvc.h"
+#include "AthenaKernel/ThinningCache.h" 
 #include <map>
 #include <iostream>
 #include <cstdlib>
@@ -534,6 +536,40 @@ void test4 (SGTest::TestStore& store)
 }
 
 
+// Thinning
+void test5 (SGTest::TestStore& store)
+{
+  std::cout << "test5\n";
+
+  SG::ThinningCache cache;
+
+  using intVecLink_t =
+    ElementLinkBaseT_test<SG::ForwardIndexingPolicy<std::vector<int> > >;
+
+  std::string ikey = "icont";
+  intVecLink_t ilink (ikey, 54321, 12, &store);
+  sgkey_t sgkey_ilink = ilink.key();
+
+  ilink.thin (&cache);
+  assert (ilink.index() == 12);
+  assert (ilink.key() == sgkey_ilink);
+
+  SG::ThinningDecisionBase dec (20);
+  dec.thin (7);
+  dec.thin (8);
+  dec.buildIndexMap();
+  cache.addThinning ("icont", {sgkey_ilink}, &dec);
+
+  ilink.thin (&cache);
+  assert (ilink.index() == 10);
+  assert (ilink.key() == sgkey_ilink);
+
+  std::string mkey = "mcont";
+  ElementLinkBase_test mlink (mkey, 54322, "mkey", &store);
+  EXPECT_EXCEPTION (SG::ExcBadThinning, mlink.thin (&cache));
+}
+
+
 int main()
 {
   Athena::getMessageSvcQuiet = true;
@@ -543,5 +579,6 @@ int main()
   test2 (*store);
   test3 (*store);
   test4 (*store);
+  test5 (*store);
   return 0;
 }

Control/AthLinks/test/exceptions_test.cxx

 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file AthLinks/test/exceptions_test.cxx
@@ -28,6 +28,7 @@ void test1()
   std::cout << SG::ExcIncomparableEL().what() << "\n";
   std::cout << SG::ExcBadToTransient().what() << "\n";
   std::cout << SG::ExcConstStorable (123, "key", 765).what() << "\n";
+  std::cout << SG::ExcBadThinning (123, "key", 765).what() << "\n";
 }
 
 

Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/versions/CAuxContainer_v1.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
-
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file DataModelTestDataCommon/versions/CAuxContainer_v1.h
  * @author scott snyder <snyder@bnl.gov>
@@ -33,12 +30,12 @@ public:
   CAuxContainer_v1();
 
 private:
-  std::vector<int> anInt;
-  std::vector<float> aFloat;
-  SG::PackedContainer<unsigned int>  pInt;
-  SG::PackedContainer<float>  pFloat;
-  SG::PackedContainer<std::vector<int> >  pvInt;
-  SG::PackedContainer<std::vector<float> >  pvFloat;
+  AUXVAR_DECL (int, anInt);
+  AUXVAR_DECL (float, aFloat);
+  AUXVAR_PACKEDCONTAINER_DECL (unsigned int, pInt);
+  AUXVAR_PACKEDCONTAINER_DECL (float, pFloat);
+  AUXVAR_PACKEDCONTAINER_DECL (std::vector<int>, pvInt);
+  AUXVAR_PACKEDCONTAINER_DECL (std::vector<float>, pvFloat);
 };
 
 

Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/versions/CInfoAuxContainer_v1.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
-
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file DataModelTestDataCommon/versions/CInfoAuxContainer_v1.h
  * @author scott snyder <snyder@bnl.gov>
@@ -34,8 +31,8 @@ public:
   CInfoAuxContainer_v1();
 
 private:
-  int anInt;
-  float aFloat;
+  AUXVAR_DECL (int, anInt);
+  AUXVAR_DECL (float, aFloat);
 };
 
 

Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/versions/CLinksAuxContainer_v1.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
-   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
  */
 /**
  * @file DataModelTestDataCommon/versions/CLinksAuxContainer_v1.h
@@ -36,8 +36,8 @@ public:
 
 
 private:
-  std::vector<ElementLink<CVec> > link;
-  std::vector<std::vector<ElementLink<CVec> > > links;
+  AUXVAR_DECL (ElementLink<CVec>, link);
+  AUXVAR_DECL (std::vector<ElementLink<CVec> >, links);
 };
 
 

Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/versions/CLinksAuxInfo_v1.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
-   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
  */
 /**
  * @file DataModelTestDataCommon/versions/CLinksAuxInfo_v1.h
@@ -36,8 +36,8 @@ public:
 
 
 private:
-  ElementLink<CVec> link;
-  std::vector<ElementLink<CVec> > links;
+  AUXVAR_DECL (ElementLink<CVec>, link);
+  AUXVAR_DECL (std::vector<ElementLink<CVec> >, links);
 };