xAODCaloEvent::setLink , add method passing EventContext, using the...

xAODCaloEvent::setLink , add method passing EventContext, using the ElementLink ctor with EventContext . Additional to the similar IProxyMethods

Event/xAOD/xAODCaloEvent/Root/CaloCluster_v1.cxx

@@ -823,6 +823,23 @@ namespace xAOD {
     accCellLinks(*this)=el;
     return true;
   }
+  bool
+  CaloCluster_v1::setLink(CaloClusterCellLinkContainer* cccl,
+                          const EventContext& ctx)
+  {
+    if (!m_cellLinks || !cccl) {
+      return false;
+    }
+    // The links are now owned by the container
+    cccl->push_back(m_cellLinks.release());
+    const size_t idx = cccl->size() - 1; // Use index for speed
+    static const Accessor<ElementLink<CaloClusterCellLinkContainer>>
+      accCellLinks("CellLink");
+    const CaloClusterCellLinkContainer& ref = *cccl;
+    ElementLink<CaloClusterCellLinkContainer> el(ref, idx, ctx);
+    accCellLinks(*this) = el;
+    return true;
+  }
 
   const CaloClusterCellLink*
   CaloCluster_v1::getCellLinks() const

Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloCluster_v1.h

@@ -46,8 +46,6 @@ namespace xAOD {
    /// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
    /// @author Walter Lampl <Walter.Lampl@cern.ch>
    ///
-   /// $Revision: 794609 $
-   /// $Date: 2017-01-30 16:51:25 +0100 (Mon, 30 Jan 2017) $
    ///
    class CaloCluster_v1 : public IParticle {
      friend class ::CaloClusterChangeSignalState;
@@ -636,6 +634,16 @@ namespace xAOD {
      bool setLink(CaloClusterCellLinkContainer* CCCL,
                   IProxyDict* sg = nullptr);
 
+
+     /**@brief Push the CaloClusterCellLink object into the cell-link container and hand-over ownership to it
+      * @param CCCL pointer to the CaloClusterCellLinkContainer
+      * @param EventContext Explicitly specify the EventContext to use for the ElementLink.
+      * @return true on success
+      */
+     bool setLink(CaloClusterCellLinkContainer* CCCL,
+                  const EventContext& ctx);
+
+
      /**@brief Get a pointer to the CaloClusterCellLink object (const version)
       * @return ptr to CaloClusterCellLink obj, NULL if no valid link
       */

Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.cxx

@@ -13,22 +13,22 @@
 #include "xAODEgamma/ElectronContainer.h"
 #include "xAODEgamma/ElectronAuxContainer.h"
 #include "xAODEgamma/Electron.h"
- 
+
 #include "EgammaAnalysisInterfaces/IAsgForwardElectronIsEMSelector.h"
 #include "PATCore/AcceptData.h"
 
-#include <algorithm> 
+#include <algorithm>
 #include <cmath>
 
-egammaForwardBuilder::egammaForwardBuilder(const std::string& name, ISvcLocator* pSvcLocator): 
+egammaForwardBuilder::egammaForwardBuilder(const std::string& name, ISvcLocator* pSvcLocator):
   AthReentrantAlgorithm(name, pSvcLocator)
-{ 
-} 
+{
+}
 
 
 // ================================================================
 egammaForwardBuilder::~egammaForwardBuilder()
-{ 
+{
 }
 
 // =================================================================
@@ -41,7 +41,7 @@ StatusCode egammaForwardBuilder::initialize()
   m_outClusterContainerCellLinkKey = m_outClusterContainerKey.key() + "_links";
   ATH_CHECK(m_outClusterContainerCellLinkKey.initialize());
 
-  // retrieve object quality tool 
+  // retrieve object quality tool
   if (!m_objectQualityTool.empty()) {
     ATH_CHECK(m_objectQualityTool.retrieve());
   } else {
@@ -56,7 +56,7 @@ StatusCode egammaForwardBuilder::initialize()
   }
 
   ATH_CHECK(m_forwardElectronIsEMSelectors.retrieve());
-  
+
   if (m_forwardElectronIsEMSelectors.size() != m_forwardElectronIsEMSelectorResultNames.size()) {
     ATH_MSG_ERROR("The number of selectors does not match the number of given fwd-electron selector names");
     return StatusCode::FAILURE;
@@ -91,10 +91,10 @@ StatusCode egammaForwardBuilder::execute(const EventContext& ctx) const
   //Topo cluster Container
   SG::ReadHandle<xAOD::CaloClusterContainer> cluster(m_topoClusterKey, ctx);
 
-  // check is only used for serial running; remove when MT scheduler used 
+  // check is only used for serial running; remove when MT scheduler used
   // --used to be a warning with SUCCESS, but that won't work in MT
   if(!cluster.isValid()) {
-    ATH_MSG_FATAL("egammaForwardBuilder::Could not retrieve Cluster container"); 
+    ATH_MSG_FATAL("egammaForwardBuilder::Could not retrieve Cluster container");
     return StatusCode::FAILURE;
   }
 
@@ -103,13 +103,13 @@ StatusCode egammaForwardBuilder::execute(const EventContext& ctx) const
   xAOD::CaloClusterContainer::const_iterator  clus_end   = cluster->end();
 
   for (; clus_begin!=clus_end; clus_begin++) {
-   
+
     //Preselectcion cuts
     if((*clus_begin)->et() < m_ETcut||
        fabs((*clus_begin)->eta())<m_etacut)
       continue;
- 
-    //Save it in the electroncontainer 
+
+    //Save it in the electroncontainer
     xAOD::Electron* el = new xAOD::Electron();
     xaodFrwd->push_back(el);
 
@@ -117,47 +117,44 @@ StatusCode egammaForwardBuilder::execute(const EventContext& ctx) const
 
     xAOD::CaloCluster *newcluster = new xAOD::CaloCluster(**clus_begin);
     outClusterContainer->push_back(newcluster);
-    
+
     int index = outClusterContainer->size() - 1;
-    
-    ElementLink<xAOD::CaloClusterContainer> newclusterElementLink;
-    newclusterElementLink.toIndexedElement( *outClusterContainer, index  );
+
+    ElementLink<xAOD::CaloClusterContainer> newclusterElementLink(
+      *outClusterContainer, index, ctx);
 
     std::vector< ElementLink< xAOD::CaloClusterContainer > > linksToClusters;
     linksToClusters.push_back(newclusterElementLink);
-    el->setCaloClusterLinks(linksToClusters);    
+    el->setCaloClusterLinks(linksToClusters);
 
     //do  Four Momentum
     ATH_CHECK(m_fourMomBuilder->execute(ctx, el));
-    
-    // do object quality 
+
+    // do object quality
     ATH_CHECK( ExecObjectQualityTool(ctx, el) );
-    
-  
+
+
     // FwdSelectors:
     size_t size = m_forwardElectronIsEMSelectors.size();
-    
+
     for (size_t i = 0; i<size;++i) {
       asg::AcceptData accept = m_forwardElectronIsEMSelectors[i]->accept(ctx, el);
       //save the bool result
       el->setPassSelection(static_cast<bool>(accept), m_forwardElectronIsEMSelectorResultNames[i]);
       //save the isem
       el->setSelectionisEM(accept.getCutResultInverted(), "isEM"+m_forwardElectronIsEMSelectorResultNames[i]);
-      
+
     }
   }
-  
+
   // Now finalize the cluster: based on code in CaloClusterStoreHelper::finalizeClusters
-  // Note: I don't specifically set the IProxyDict, since I also don't set it when I create
-  //    data handles, either. 
-  auto *sg = outClusterContainer.storeHandle().get();
   for (xAOD::CaloCluster* cl : *outClusterContainer) {
-    cl->setLink(outClusterContainerCellLink.ptr(), sg);
+    cl->setLink(outClusterContainerCellLink.ptr(), ctx);
   }
 
   return StatusCode::SUCCESS;
-}  
-  
+}
+
 // ===========================================================
 StatusCode egammaForwardBuilder::ExecObjectQualityTool(const EventContext& ctx, xAOD::Egamma *eg) const
 {
@@ -165,7 +162,7 @@ StatusCode egammaForwardBuilder::ExecObjectQualityTool(const EventContext& ctx,
   // execution of the object quality tools
   //
   // protection in case tool is not available
-  // return success as algorithm may be able to run without it 
+  // return success as algorithm may be able to run without it
   // in degraded mode
   if (m_objectQualityTool.name().empty()) return StatusCode::SUCCESS;
 

Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx

@@ -144,15 +144,13 @@ EMClusterTool::contExecute(const EventContext& ctx,
   }
   // Now finalize the cluster: based on code in
   // CaloClusterStoreHelper::finalizeClusters
-  auto *sg = outputClusterContainer.storeHandle().get();
   for (xAOD::CaloCluster* cl : *outputClusterContainer) {
-    cl->setLink(outputClusterContainerCellLink.ptr(), sg);
+    cl->setLink(outputClusterContainerCellLink.ptr(), ctx);
   }
 
   if (m_doTopoSeededContainer) {
-    auto *tssg = outputTopoSeededClusterContainer.storeHandle().get();
     for (xAOD::CaloCluster* cl : *outputTopoSeededClusterContainer) {
-      cl->setLink(outputTopoSeededClusterContainerCellLink.ptr(), tssg);
+      cl->setLink(outputTopoSeededClusterContainerCellLink.ptr(), ctx);
     }
   }