diff --git a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/TrkTrackCollectionMerger/TrackCollectionMerger.h b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/TrkTrackCollectionMerger/TrackCollectionMerger.h index 5d0ac579a6632647d10f9af48a7e6c984c574019..1873ba9324500a6ae2167d93ada9aa64bce81ff1 100644 --- a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/TrkTrackCollectionMerger/TrackCollectionMerger.h +++ b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/TrkTrackCollectionMerger/TrackCollectionMerger.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// @@ -65,7 +65,7 @@ namespace Trk { /////////////////////////////////////////////////////////////////// /** @brief A routine that merges the track collections. */ - StatusCode mergeTrack(const TrackCollection* trackCol, TrackCollection* outputCol) const; + StatusCode mergeTrack(const TrackCollection* trackCol, TrackCollection* outputCol); MsgStream& dumptools(MsgStream& out) const; MsgStream& dumpevent(MsgStream& out) const; diff --git a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/TrackCollectionMerger.cxx b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/TrackCollectionMerger.cxx index ffc442ccace5ff619471ae2fa233c3a0092e1102..9fe7bdaced05264d35da425972e9e69784c131e6 100644 --- a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/TrackCollectionMerger.cxx +++ b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/TrackCollectionMerger.cxx @@ -199,7 +199,7 @@ std::ostream& Trk::operator << // Merge track collections and remove duplicates /////////////////////////////////////////////////////////////////// -StatusCode Trk::TrackCollectionMerger::mergeTrack(const TrackCollection* trackCol, TrackCollection* outputCol) const +StatusCode Trk::TrackCollectionMerger::mergeTrack(const TrackCollection* trackCol, TrackCollection* outputCol) { // loop over forward track, accept them and add them imto association tool if(trackCol && trackCol->size()) {