Louis Henry · 7d57d707 · 7d57d707 · 7d57d707 · 7d57d707 · 7d57d707
--- a/Rec/GlobalReco/src/ChargedProtoParticleMaker.h
+++ b/Rec/GlobalReco/src/ChargedProtoParticleMaker.h
-
-  /// Locations in TES of input Tracks
-  std::vector<std::string> m_tracksPath;
-
+  /// Data handles
+  DataObjectReadHandle<LHCb::Tracks> m_tracks{this, "Inputs", LHCb::TrackLocation::Default};
+  DataObjectWriteHandle<LHCb::ProtoParticles> m_protos{this, "Output", LHCb::ProtoParticleLocation::Charged};
+  /// Track selector tool
+  ToolHandle<ITrackSelector> m_trSel{this, "TrackSelector", "LoKi::Hybrid::TrackSelector"};
  /// Track selector type
  std::string m_trSelType;

-  /// Track selector tool
-  ITrackSelector* m_trSel = nullptr;
-
  /// Append new ProtoParticles
--- a/Rec/GlobalReco/src/ChargedProtoParticleMaker.cpp
+++ b/Rec/GlobalReco/src/ChargedProtoParticleMaker.cpp
  if ( context() == "HLT" || context() == "Hlt" ) {
--- a/Rec/GlobalReco/src/ChargedProtoParticleMaker.cpp
+++ b/Rec/GlobalReco/src/ChargedProtoParticleMaker.cpp
  setFilterPassed( false );
-  for ( const auto& loc : m_tracksPath ) {
+  for ( const auto& loc : tracks ) {
    // Load the Track objects (mandatory - should be there for each event)
-    const auto* tracks = getIfExists<LHCb::Tracks>( loc );
-    if ( !tracks ) {
-      Warning( "No Tracks at '" + loc + "'", StatusCode::SUCCESS ).ignore();
-      continue;
-    }
+    //    const auto* tracks = getIfExists<LHCb::Tracks>( loc );
+    //    if ( !tracks ) {
+    //      Warning( "No Tracks at '" + loc + "'", StatusCode::SUCCESS ).ignore();
+    //      continue;
+    //    }

    setFilterPassed( true );
--- a/Rec/GlobalReco/src/ChargedProtoParticleMaker.cpp
+++ b/Rec/GlobalReco/src/ChargedProtoParticleMaker.cpp
      // Make a proto-particle
      auto* proto = new LHCb::ProtoParticle();

-      if ( m_tracksPath.size() == 1 && !m_append ) {
+      if ( tracks.size() == 1 && !m_append ) {
        // Insert into container, with same key as Track
-        protos->insert( proto, tk->key() );
--- a/Rec/GlobalReco/src/ChargedProtoParticleMaker.cpp
+++ b/Rec/GlobalReco/src/ChargedProtoParticleMaker.cpp
      if ( msgLevel( MSG::VERBOSE ) ) { verbose() << " -> Created ProtoParticle : " << *proto << endmsg; }
      ++count;
--- a/Rec/GlobalReco/src/ChargedProtoParticleMaker.h
+++ b/Rec/GlobalReco/src/ChargedProtoParticleMaker.h
+
  ChargedProtoParticleMaker( const std::string& name, ISvcLocator* pSvcLocator );

  StatusCode initialize() override; ///< Algorithm initialization
-  StatusCode execute() override;    ///< Algorithm execution
+  LHCb::ProtoParticles operator()(const LHCb::Tracks& tracks) const;    ///< Algorithm execution

 private: // data
-  /// Location of the ProtoParticles in the TES
-  std::string m_protoPath{""};
-
-  /// Locations in TES of input Tracks
-  std::vector<std::string> m_tracksPath;
-
+  /// Data handles
+  DataObjectReadHandle<LHCb::Tracks> m_tracks{this, "Inputs", LHCb::TrackLocation::Default};