diff --git a/Tr/TrackMonitors/CMakeLists.txt b/Tr/TrackMonitors/CMakeLists.txt index e44c825fdd085952ff155dd8cce716fe1efeeb4e..06d457badaa35c651395ebc26c96581e4434b6ef 100644 --- a/Tr/TrackMonitors/CMakeLists.txt +++ b/Tr/TrackMonitors/CMakeLists.txt @@ -26,7 +26,6 @@ gaudi_add_module(TrackMonitors src/TrackCaloMatchMonitor.cpp src/TrackFitMatchMonitor.cpp src/TrackMonitor.cpp - src/TrackMonitorBase.cpp src/TrackMonitorTupleBase.cpp src/TrackMuonMatchMonitor.cpp src/TrackPV2HalfMonitor.cpp diff --git a/Tr/TrackMonitors/src/TrackMonitorBase.cpp b/Tr/TrackMonitors/src/TrackMonitorBase.cpp deleted file mode 100644 index 450c791d5c0627f53680a835dcf16bd229df5967..0000000000000000000000000000000000000000 --- a/Tr/TrackMonitors/src/TrackMonitorBase.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/*****************************************************************************\ -* (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration * -* * -* This software is distributed under the terms of the GNU General Public * -* Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". * -* * -* In applying this licence, CERN does not waive the privileges and immunities * -* granted to it by virtue of its status as an Intergovernmental Organization * -* or submit itself to any jurisdiction. * -\*****************************************************************************/ -// Include files -#include "TrackMonitorBase.h" - -//============================================================================= -// Initialization. Check parameters -//============================================================================= -StatusCode TrackMonitorBase::initialize() { - return GaudiHistoAlg::initialize().andThen( [&] { - if ( histoTopDir().empty() ) setHistoTopDir( "Track/" ); - } ); -} diff --git a/Tr/TrackMonitors/src/TrackMonitorBase.h b/Tr/TrackMonitors/src/TrackMonitorBase.h deleted file mode 100644 index 8f5122eb264ae3f265923be67454a8ac71c0406b..0000000000000000000000000000000000000000 --- a/Tr/TrackMonitors/src/TrackMonitorBase.h +++ /dev/null @@ -1,45 +0,0 @@ -/*****************************************************************************\ -* (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration * -* * -* This software is distributed under the terms of the GNU General Public * -* Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". * -* * -* In applying this licence, CERN does not waive the privileges and immunities * -* granted to it by virtue of its status as an Intergovernmental Organization * -* or submit itself to any jurisdiction. * -\*****************************************************************************/ -#pragma once -#include "Event/Track.h" -#include "GaudiAlg/GaudiHistoAlg.h" -#include "Kernel/ITrajPoca.h" -#include "TrackInterfaces/ITrackExtrapolator.h" -#include <map> -#include <string> - -/** @class TrackMonitorBase TrackMonitorBase.h "TrackCheckers/TrackMonitorBase" - * - * Base class for track monitoring: essentially a 'box' of common tools - - * @author M. Needham. - * @date 6-5-2007 - */ - -class TrackMonitorBase : public GaudiHistoAlg { - -public: - /** Standard construtor */ - using GaudiHistoAlg::GaudiHistoAlg; - - /** Algorithm initialization */ - StatusCode initialize() override; - -protected: - /** Get a pointer to the track extrapolator - * @return extrapolator - */ - const ITrackExtrapolator* extrapolator() const { return m_extrapolator.get(); } - -private: - ToolHandle<ITrackExtrapolator> m_extrapolator{this, "Extrapolator", - "TrackMasterExtrapolator"}; ///< Pointer to extrapolator -}; diff --git a/Tr/TrackMonitors/src/UTTrackMonitor.cpp b/Tr/TrackMonitors/src/UTTrackMonitor.cpp index afe9d3655a18cc24b661fc700f4f3cc913c308d8..529acfc1ae9cce43bfd95db718efd5d6bfbc7dd0 100644 --- a/Tr/TrackMonitors/src/UTTrackMonitor.cpp +++ b/Tr/TrackMonitors/src/UTTrackMonitor.cpp @@ -28,8 +28,6 @@ #include "Kernel/UTNames.h" #include "UTDAQ/UTInfo.h" -#include "TrackMonitorBase.h" - #include "LHCbAlgs/Consumer.h" using namespace LHCb; @@ -42,7 +40,7 @@ namespace { namespace LHCb { class UTTrackMonitor : public LHCb::Algorithm::Consumer<void( LHCb::Track::Range const&, UTHitClusters const&, DeUTDetector const& ), - LHCb::DetDesc::usesBaseAndConditions<TrackMonitorBase, DeUTDetector>> { + LHCb::DetDesc::usesConditions<DeUTDetector>> { public: UTTrackMonitor( const std::string& name, ISvcLocator* pSvcLocator );