Merge branch 'revert-93c91e3c' into 'master'

Revert "Merge branch 'mupattrackbuilder' into 'master'"

Closes ATLASRECTS-5777

See merge request atlas/athena!38427

MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/MuPatTrackBuilder.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "MuPatTrackBuilder.h"
@@ -39,11 +39,11 @@ StatusCode MuPatTrackBuilder::initialize()
   return StatusCode::SUCCESS; 
 }
 
-StatusCode MuPatTrackBuilder::execute(const EventContext& ctx) const
+StatusCode MuPatTrackBuilder::execute()
 {
   typedef std::vector<const Muon::MuonSegment*> MuonSegmentCollection;
 
-  SG::ReadHandle<Trk::SegmentCollection> segmentColl (m_segmentKey, ctx);
+  SG::ReadHandle<Trk::SegmentCollection> segmentColl (m_segmentKey);
   if (!segmentColl.isValid() ) {
     msg(MSG::WARNING) << "Could not find MuonSegmentCollection at " << segmentColl.name() <<endmsg;
     return StatusCode::RECOVERABLE;
@@ -72,7 +72,7 @@ StatusCode MuPatTrackBuilder::execute(const EventContext& ctx) const
   TrackCollection * newtracks = m_trackMaker->find(msc);
   if (!newtracks) newtracks = new TrackCollection();
 
-  SG::WriteHandle<TrackCollection> spectroTracks(m_spectroTrackKey, ctx); 	  
+  SG::WriteHandle<TrackCollection> spectroTracks(m_spectroTrackKey); 	  
   if (spectroTracks.record(std::unique_ptr<TrackCollection>(newtracks)).isFailure()){    
       ATH_MSG_WARNING( "New Track Container " << spectroTracks.name() << " could not be recorded in StoreGate !");
       return StatusCode::RECOVERABLE;

MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/MuPatTrackBuilder.h

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUPATTRACKBUILDER_H
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "TrkSegment/SegmentCollection.h"
@@ -18,13 +18,13 @@
 #include "AthenaMonitoringKernel/GenericMonitoringTool.h"
 #include "AthenaMonitoringKernel/Monitored.h"
 
-class MuPatTrackBuilder : public AthReentrantAlgorithm
+class MuPatTrackBuilder : public AthAlgorithm
 {
  public:
- using AthReentrantAlgorithm::AthReentrantAlgorithm;
+ using AthAlgorithm::AthAlgorithm;
  public:
   virtual StatusCode initialize() override;
-  virtual StatusCode execute(const EventContext& ctx) const override;
+  virtual StatusCode execute() override;
 
  private: