Backport to legacy DataObjectHandles

GaudiExamples/src/Conditions/ConditionAccessorHolder.h

@@ -4,7 +4,7 @@
 #include <utility>
 #include <vector>
 
-#include "GaudiKernel/EventDataHandle.h"
+#include "GaudiKernel/DataObjectHandle.h"
 #include "GaudiKernel/StatusCode.h"
 
 #include "ConditionAccessor.h"
@@ -56,8 +56,8 @@ namespace DemoBackend
 
     // We must also provide a way for a reentrant algorithm to access the
     // condition handling context associated with this event.
-    const ConditionContext& getConditionContext( const EventContext& ctx ) const {
-      return m_ctxHandle.get( ctx );
+    const ConditionContext& getConditionContext( const EventContext& /* ctx */ ) const {
+      return *m_ctxHandle.get();
     }
 
   private:
@@ -74,7 +74,7 @@ namespace DemoBackend
   private:
     // We must declare a dependency on the condition context
     // (which will be produced by the ConditionContextProducer alg).
-    Gaudi::EventReadHandle<ConditionContext> m_ctxHandle{
+    DataObjectReadHandle<ConditionContext> m_ctxHandle{
       detail::CONDITION_CONTEXT_PATH, this };
 
     // We must track some properties of our condition accessors to declare them

GaudiExamples/src/Conditions/ConditionContext.h

@@ -4,6 +4,8 @@
 #include <typeinfo>
 #include <unordered_map>
 
+#include "GaudiKernel/DataObject.h"
+
 #include "ConditionKey.h"
 
 namespace DemoBackend
@@ -19,7 +21,7 @@ namespace DemoBackend
   // Much like the EventContext gives access to event data, a ConditionContext
   // gives access to condition data. For technical reasons, the ConditionContext
   // may be produced during event processing and is stored in the TES.
-  class ConditionContext {
+  class ConditionContext : public DataObject {
   public:
     // Normally, we would tell the backend that we're done processing a given
     // event via RAII, but this is not necessary for this dummy implementation.

GaudiExamples/src/Conditions/ConditionContextProducer.cpp

+#include <memory>
+
 #include "ConditionBackendSvc.h"
 #include "ConditionContextProducer.h"
 #include "EventTimestamp.h"
@@ -15,10 +17,11 @@ namespace DemoBackend
     return StatusCode::SUCCESS;
   }
 
-  StatusCode ConditionContextProducer::execute( const EventContext& ctx ) const {
+  StatusCode ConditionContextProducer::execute( const EventContext& evCtx ) const {
     // For this test, we just use the event number as an event timestamp
-    detail::EventTimestamp eventTime = ctx.evt();
-    m_ctxHandle.put( ctx, m_backendSvc->setupEvent( eventTime ) );
+    detail::EventTimestamp eventTime = evCtx.evt();
+    auto condCtx = std::make_unique<ConditionContext>( m_backendSvc->setupEvent( eventTime ) );
+    m_ctxHandle.put( std::move( condCtx ) );
     return StatusCode::SUCCESS;
   }
 

GaudiExamples/src/Conditions/ConditionContextProducer.h

 #pragma once
 
 #include "GaudiKernel/Algorithm.h"
+#include "GaudiKernel/DataObjectHandle.h"
 #include "GaudiKernel/EventContext.h"
-#include "GaudiKernel/EventDataHandle.h"
 #include "GaudiKernel/IService.h"
 #include "GaudiKernel/SmartIF.h"
 #include "GaudiKernel/StatusCode.h"
@@ -39,7 +39,7 @@ namespace DemoBackend
 
   private:
     // This DataHandle allows us to write down the ConditionContext in the TES
-    Gaudi::EventWriteHandle<ConditionContext> m_ctxHandle{
+    mutable DataObjectWriteHandle<ConditionContext> m_ctxHandle{
       detail::CONDITION_CONTEXT_PATH, this };
 
     // These members allow us to contact the condition storage back-end