From 6f306a6e02e26ba79dfbd0101c7466f765b054e3 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 23 Oct 2019 13:40:43 +0200 Subject: [PATCH 1/9] TrigBjetHypo: Remove INFO messages during initialize/finalize Remove useless INFO messages during initialize/finalize. Also remove empty destructors and finalize methods. --- .../TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx | 15 ++------------- .../TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h | 7 +------ .../TrigBjetHypo/src/TrigBjetBtagHypoTool.cxx | 16 ---------------- .../TrigBjetHypo/src/TrigBjetBtagHypoTool.h | 17 ++--------------- .../TrigBjetHypo/src/TrigBjetEtHypoAlgEVMT.cxx | 2 -- .../TrigBjetHypo/src/TrigBjetEtHypoAlgEVMT.h | 3 +-- .../TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx | 5 ----- .../TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h | 1 - .../TrigBjetHypo/src/TrigBjetEtHypoTool.cxx | 16 +++------------- .../TrigBjetHypo/src/TrigBjetEtHypoTool.h | 18 +++--------------- 10 files changed, 12 insertions(+), 88 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx index dc6b1d5792c..98601393f9e 100644 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #include "TrigBjetBtagHypoAlgMT.h" @@ -9,16 +9,10 @@ TrigBjetBtagHypoAlgMT::TrigBjetBtagHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ) : TrigBjetHypoAlgBaseMT( name, pSvcLocator ) {} -TrigBjetBtagHypoAlgMT::~TrigBjetBtagHypoAlgMT() {} - StatusCode TrigBjetBtagHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); - ATH_MSG_DEBUG( "Initializing Tools" ); ATH_CHECK( m_hypoTools.retrieve() ); - - ATH_MSG_DEBUG( "Initializing HandleKeys" ); CHECK( m_bTagKey.initialize() ); ATH_MSG_DEBUG( "declareProperty review:" ); @@ -27,12 +21,7 @@ StatusCode TrigBjetBtagHypoAlgMT::initialize() { return StatusCode::SUCCESS; } -StatusCode TrigBjetBtagHypoAlgMT::finalize() { - ATH_MSG_INFO( "Finalizing " << name() <<" ... " ); - return StatusCode::SUCCESS; -} - -StatusCode TrigBjetBtagHypoAlgMT::execute( const EventContext& context ) const { +StatusCode TrigBjetBtagHypoAlgMT::execute( const EventContext& context ) const { ATH_MSG_DEBUG ( "Executing " << name() << "..." ); // ========================================================================================================================== diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h index 7a787a23b6b..d4b73100156 100644 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #ifndef TRIGBJETHYPO_TRIGBJETBTAGHYPOALGMT_H @@ -24,15 +24,10 @@ class TrigBjetBtagHypoAlgMT : public TrigBjetHypoAlgBaseMT { public: TrigBjetBtagHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigBjetBtagHypoAlgMT(); - virtual StatusCode initialize(); virtual StatusCode execute( const EventContext& context ) const; - virtual StatusCode finalize(); private: - TrigBjetBtagHypoAlgMT(); - StatusCode retrieveBtagging( const EventContext&, ElementLinkVector< xAOD::BTaggingContainer >&, const SG::ReadHandleKey< xAOD::BTaggingContainer >&, diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.cxx index d36b0718365..2243006355b 100644 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.cxx @@ -26,29 +26,13 @@ TrigBjetBtagHypoTool::TrigBjetBtagHypoTool( const std::string& type, // ----------------------------------------------------------------------------------------------------------------- -TrigBjetBtagHypoTool::~TrigBjetBtagHypoTool() {} - -// ----------------------------------------------------------------------------------------------------------------- - StatusCode TrigBjetBtagHypoTool::initialize() { - // Get message service - - ATH_MSG_INFO("Initializing " << name() << " ..." ); - ATH_MSG_DEBUG( "declareProperty review:" ); ATH_MSG_DEBUG( " " << m_acceptAll ); ATH_MSG_DEBUG( " " << m_methodTag ); ATH_MSG_DEBUG( " " << m_bTaggingCut ); - // Retrieve Tools - // ATH_CHECK( m_monTool.retrieve() ); - - return StatusCode::SUCCESS; -} - -StatusCode TrigBjetBtagHypoTool::finalize() { - ATH_MSG_INFO( "Finalizing " << name() <<" ..." ); return StatusCode::SUCCESS; } diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.h index eb5a1edb537..ebc5d0db81b 100755 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.h +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ // ************************************************ @@ -31,9 +31,6 @@ #include "AthenaBaseComps/AthAlgTool.h" #include "BeamSpotConditionsData/BeamSpotData.h" -static const InterfaceID IID_TrigBjetBtagHypoTool("TrigBjetBtagHypoTool", 1, 0); - - class TrigBjetBtagHypoTool : virtual public ::AthAlgTool { public: @@ -50,13 +47,9 @@ class TrigBjetBtagHypoTool : virtual public ::AthAlgTool { TrigBjetBtagHypoTool (const std::string& type, const std::string& name, const IInterface* parent ); - /** @brief Destructor. */ - virtual ~TrigBjetBtagHypoTool (); - StatusCode initialize() override; - StatusCode finalize() override; + virtual StatusCode initialize() override; - static const InterfaceID& interfaceID(); TrigCompositeUtils::DecisionID decisionId() const; const HLT::Identifier getId() const; @@ -82,10 +75,4 @@ class TrigBjetBtagHypoTool : virtual public ::AthAlgTool { // ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" }; Temporary commenting this out }; -inline const InterfaceID& TrigBjetBtagHypoTool::interfaceID() -{ - return IID_TrigBjetBtagHypoTool; -} - #endif // !TRIGBJETHYPO_TRIGBJETHYPOTOOL_H - diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgEVMT.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgEVMT.cxx index aee08b77c9f..5c333410480 100644 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgEVMT.cxx +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgEVMT.cxx @@ -8,10 +8,8 @@ TrigBjetEtHypoAlgEVMT::TrigBjetEtHypoAlgEVMT( const std::string& name, ISvcLocator* pSvcLocator ) : ::TrigBjetEtHypoAlgMT( name,pSvcLocator ) {} -TrigBjetEtHypoAlgEVMT::~TrigBjetEtHypoAlgEVMT() {} StatusCode TrigBjetEtHypoAlgEVMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); CHECK( TrigBjetEtHypoAlgMT::initialize() ); CHECK( m_inputTracksKey.initialize() ); diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgEVMT.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgEVMT.h index 0d8cd9ea01c..e6eeefce6bf 100644 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgEVMT.h +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgEVMT.h @@ -10,9 +10,8 @@ class TrigBjetEtHypoAlgEVMT : public TrigBjetEtHypoAlgMT { public: TrigBjetEtHypoAlgEVMT( const std::string& name, ISvcLocator* pSvLocator ); - virtual ~TrigBjetEtHypoAlgEVMT(); - virtual StatusCode initialize(); + virtual StatusCode initialize() override; protected: TrigBjetEtHypoAlgEVMT(); diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx index 334740112b7..68eec11705a 100644 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx @@ -10,20 +10,15 @@ TrigBjetEtHypoAlgMT::TrigBjetEtHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ) : TrigBjetHypoAlgBaseMT( name, pSvcLocator ) {} -TrigBjetEtHypoAlgMT::~TrigBjetEtHypoAlgMT() {} - StatusCode TrigBjetEtHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); ATH_MSG_DEBUG( "declareProperty review:" ); ATH_MSG_DEBUG( " " << m_roiLink ); ATH_MSG_DEBUG( " " << m_prmVtxLink ); - ATH_MSG_DEBUG( "Initializing Tools" ); ATH_CHECK( m_hypoTools.retrieve() ); - ATH_MSG_DEBUG( "Initializing HandleKeys" ); CHECK( m_inputJetsKey.initialize() ); CHECK( m_inputRoIKey.initialize() ); CHECK( m_inputPrmVtx.initialize() ); diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h index 11c2a6ab2a2..a4a28c97642 100644 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h @@ -16,7 +16,6 @@ class TrigBjetEtHypoAlgMT : public TrigBjetHypoAlgBaseMT { public: TrigBjetEtHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigBjetEtHypoAlgMT(); virtual StatusCode initialize(); virtual StatusCode execute( const EventContext& context ) const; diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoTool.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoTool.cxx index 1edbadc9c67..b66e6af6eae 100755 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoTool.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ // ************************************************ @@ -22,13 +22,8 @@ TrigBjetEtHypoTool::TrigBjetEtHypoTool( const std::string& type, // ----------------------------------------------------------------------------------------------------------------- -TrigBjetEtHypoTool::~TrigBjetEtHypoTool() {} - -// ----------------------------------------------------------------------------------------------------------------- - StatusCode TrigBjetEtHypoTool::initialize() { - ATH_MSG_INFO("Initializing " << name() << "... " ); - + ATH_MSG_DEBUG( "declareProperty review:" ); ATH_MSG_DEBUG( " " << m_acceptAll ); ATH_MSG_DEBUG( " " << m_etThreshold ); @@ -39,12 +34,7 @@ StatusCode TrigBjetEtHypoTool::initialize() { return StatusCode::SUCCESS; } -StatusCode TrigBjetEtHypoTool::finalize() { - ATH_MSG_INFO( "Finalizing " << name() << "... " ); - return StatusCode::SUCCESS; -} - -// ----------------------------------------------------------------------------------------------------------------- +// ----------------------------------------------------------------------------------------------------------------- StatusCode TrigBjetEtHypoTool::decide( std::vector< TrigBjetEtHypoToolInfo >& bJetInfos ) const { diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoTool.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoTool.h index 44b55f7d6ca..878d2fafb75 100755 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoTool.h +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoTool.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ // ************************************************ @@ -24,9 +24,6 @@ #include "xAODJet/JetContainer.h" #include "xAODJet/JetAuxContainer.h" -static const InterfaceID IID_TrigBjetEtHypoTool("TrigBjetEtHypoTool",1,0); - - class TrigBjetEtHypoTool : virtual public ::AthAlgTool { public: @@ -42,13 +39,8 @@ class TrigBjetEtHypoTool : virtual public ::AthAlgTool { TrigBjetEtHypoTool (const std::string& type, const std::string& name, const IInterface* parent ); - /** @brief Destructor. */ - virtual ~TrigBjetEtHypoTool (); - - StatusCode initialize() override; - StatusCode finalize() override; - static const InterfaceID& interfaceID(); + virtual StatusCode initialize() override; TrigCompositeUtils::DecisionID decisionId() const; const HLT::Identifier getId() const; @@ -68,8 +60,4 @@ class TrigBjetEtHypoTool : virtual public ::AthAlgTool { Gaudi::Property< float > m_maxEtaThreshold {this,"MaxEtaThreshold",0.0,"Max Eta threshold cut"}; }; -inline const InterfaceID& TrigBjetEtHypoTool::interfaceID() { return IID_TrigBjetEtHypoTool; } - - -#endif // !TRIGBJETHYPO_TRIGBJETETHYPOTOOL_H - +#endif // !TRIGBJETHYPO_TRIGBJETETHYPOTOOL_H -- GitLab From 42c186e706b452244cad1a5e646bc65298bdd969 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 23 Oct 2019 13:40:44 +0200 Subject: [PATCH 2/9] TrigEgammaHypo: Remove INFO messages during initialize/finalize Remove useless INFO messages during initialize/finalize. Also remove empty destructors and finalize methods. --- .../src/TrigEgammaPrecisionCaloHypoAlgMT.cxx | 11 +---------- .../src/TrigEgammaPrecisionCaloHypoAlgMT.h | 6 +----- .../TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx | 7 ------- .../TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h | 12 +++--------- .../src/TrigL2ElectronHypoAlgMT.cxx | 16 ++-------------- .../TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.h | 11 +---------- .../TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx | 13 ++----------- .../TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.h | 8 +------- 8 files changed, 11 insertions(+), 73 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx index 35b6a717328..2923bf7ae1d 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx @@ -14,12 +14,8 @@ TrigEgammaPrecisionCaloHypoAlgMT::TrigEgammaPrecisionCaloHypoAlgMT( const std::s ISvcLocator* pSvcLocator ) : ::HypoBase( name, pSvcLocator ) {} -TrigEgammaPrecisionCaloHypoAlgMT::~TrigEgammaPrecisionCaloHypoAlgMT() {} StatusCode TrigEgammaPrecisionCaloHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); - - ATH_CHECK( m_hypoTools.retrieve() ); ATH_CHECK( m_clustersKey.initialize() ); @@ -28,12 +24,7 @@ StatusCode TrigEgammaPrecisionCaloHypoAlgMT::initialize() { return StatusCode::SUCCESS; } -StatusCode TrigEgammaPrecisionCaloHypoAlgMT::finalize() { - return StatusCode::SUCCESS; -} - - -StatusCode TrigEgammaPrecisionCaloHypoAlgMT::execute( const EventContext& context ) const { +StatusCode TrigEgammaPrecisionCaloHypoAlgMT::execute( const EventContext& context ) const { ATH_MSG_DEBUG ( "Executing " << name() << "..." ); auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context ); if( not previousDecisionsHandle.isValid() ) {//implicit diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.h index 52367c2a4c2..f7ef5ec2333 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.h @@ -26,14 +26,10 @@ class TrigEgammaPrecisionCaloHypoAlgMT : public ::HypoBase { TrigEgammaPrecisionCaloHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigEgammaPrecisionCaloHypoAlgMT(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: - TrigEgammaPrecisionCaloHypoAlgMT(); ToolHandleArray< ITrigEgammaPrecisionCaloHypoTool > m_hypoTools { this, "HypoTools", {}, "Hypo tools" }; SG::ReadHandleKey< xAOD::CaloClusterContainer > m_clustersKey { this, "CaloClusters", "CaloClusters", "CaloClusters in roi" }; diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx index 91551da7e0f..905656d78b9 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx @@ -14,12 +14,9 @@ TrigL2CaloHypoAlgMT::TrigL2CaloHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ) : ::HypoBase( name, pSvcLocator ) {} -TrigL2CaloHypoAlgMT::~TrigL2CaloHypoAlgMT() {} StatusCode TrigL2CaloHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); - ATH_CHECK( m_hypoTools.retrieve() ); ATH_CHECK( m_clustersKey.initialize() ); @@ -28,10 +25,6 @@ StatusCode TrigL2CaloHypoAlgMT::initialize() { return StatusCode::SUCCESS; } -StatusCode TrigL2CaloHypoAlgMT::finalize() { - return StatusCode::SUCCESS; -} - StatusCode TrigL2CaloHypoAlgMT::execute( const EventContext& context ) const { ATH_MSG_DEBUG ( "Executing " << name() << "..." ); diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h index a7a7d4697ba..fd7b645b995 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.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 */ #ifndef TRIGEGAMMAHYPO_TRIGL2CALOHYPOALGMT_H #define TRIGEGAMMAHYPO_TRIGL2CALOHYPOALGMT_H 1 @@ -24,19 +24,13 @@ class TrigL2CaloHypoAlgMT : public ::HypoBase { TrigL2CaloHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigL2CaloHypoAlgMT(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: - TrigL2CaloHypoAlgMT(); ToolHandleArray< ITrigL2CaloHypoTool > m_hypoTools { this, "HypoTools", {}, "Hypo tools" }; - SG::ReadHandleKey< xAOD::TrigEMClusterContainer > m_clustersKey { this, "CaloClusters", "CaloClusters", "CaloClusters in view" }; - - + SG::ReadHandleKey< xAOD::TrigEMClusterContainer > m_clustersKey { this, "CaloClusters", "CaloClusters", "CaloClusters in view" }; }; #endif //> !TRIGEGAMMAHYPO_TESTTRIGL2CALOHYPOALG_H diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx index f19362395fb..c593e16bfb2 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx @@ -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 */ #include #include "GaudiKernel/Property.h" @@ -23,11 +23,8 @@ TrigL2ElectronHypoAlgMT::TrigL2ElectronHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ) : ::HypoBase( name, pSvcLocator ) {} -TrigL2ElectronHypoAlgMT::~TrigL2ElectronHypoAlgMT() {} StatusCode TrigL2ElectronHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); - CHECK( m_hypoTools.retrieve() ); CHECK( m_electronsKey.initialize() ); @@ -36,12 +33,7 @@ StatusCode TrigL2ElectronHypoAlgMT::initialize() { return StatusCode::SUCCESS; } - StatusCode TrigL2ElectronHypoAlgMT::finalize() { - ATH_MSG_INFO( "Finalizing " << name() << "..." ); - return StatusCode::SUCCESS; - } - -StatusCode TrigL2ElectronHypoAlgMT::execute( const EventContext& context ) const { +StatusCode TrigL2ElectronHypoAlgMT::execute( const EventContext& context ) const { ATH_MSG_DEBUG ( "Executing " << name() << "..." ); auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context ); if( not previousDecisionsHandle.isValid() ) {//implicit @@ -117,7 +109,3 @@ StatusCode TrigL2ElectronHypoAlgMT::execute( const EventContext& context ) const return StatusCode::SUCCESS; } - - - - diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.h index 530a4f1970d..0f5b321c73d 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.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 */ #ifndef TRIGEGAMMAHYPO_TRIGL2ELECTRONHYPOALGMT_H #define TRIGEGAMMAHYPO_TRIGL2ELECTRONHYPOALGMT_H 1 @@ -27,23 +27,14 @@ class TrigL2ElectronHypoAlgMT : public ::HypoBase TrigL2ElectronHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigL2ElectronHypoAlgMT(); - virtual StatusCode initialize() override; virtual StatusCode execute(const EventContext& context) const override; - virtual StatusCode finalize() override; - - private: - TrigL2ElectronHypoAlgMT(); ToolHandleArray< TrigL2ElectronHypoTool > m_hypoTools {this, "HypoTools", {}, "Tools to perfrom selection"}; Gaudi::Property< bool > m_runInView { this, "RunInView", false , "Set input DH for running in views" }; // internally used to getch from views SG::ReadHandleKey< xAOD::TrigElectronContainer > m_electronsKey {this, "Electrons", "L2ElectronContainer", "Input"}; - - - }; #endif //> !TRIGEGAMMAHYPO_TRIGL2ELECTRONHYPOALGMT_H diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx index 1e36a43a2c1..d2bcf2a6b0d 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx @@ -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 */ #include "GaudiKernel/Property.h" @@ -21,12 +21,8 @@ TrigL2PhotonHypoAlgMT::TrigL2PhotonHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ) : ::HypoBase( name, pSvcLocator ) {} -TrigL2PhotonHypoAlgMT::~TrigL2PhotonHypoAlgMT() {} StatusCode TrigL2PhotonHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); - - ATH_CHECK( m_hypoTools.retrieve() ); ATH_CHECK( m_photonsKey.initialize() ); @@ -35,12 +31,7 @@ StatusCode TrigL2PhotonHypoAlgMT::initialize() { return StatusCode::SUCCESS; } -StatusCode TrigL2PhotonHypoAlgMT::finalize() { - return StatusCode::SUCCESS; -} - - -StatusCode TrigL2PhotonHypoAlgMT::execute( const EventContext& context ) const { +StatusCode TrigL2PhotonHypoAlgMT::execute( const EventContext& context ) const { ATH_MSG_DEBUG ( "Executing " << name() << "..." ); auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context ); if( not previousDecisionsHandle.isValid() ) {//implicit diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.h index 2961c2f5ef6..673b7d89fdb 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.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 */ #ifndef TRIGEGAMMAHYPO_TRIGL2PHOTONHYPOALGMT_H @@ -30,16 +30,10 @@ class TrigL2PhotonHypoAlgMT : public ::HypoBase TrigL2PhotonHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigL2PhotonHypoAlgMT(); - virtual StatusCode initialize() override; virtual StatusCode execute(const EventContext& context) const override; - virtual StatusCode finalize() override; - - private: - TrigL2PhotonHypoAlgMT(); ToolHandleArray< TrigL2PhotonHypoTool > m_hypoTools {this, "HypoTools", {}, "Tools to perfrom selection"}; Gaudi::Property< bool > m_runInView { this, "RunInView", false , "Set input DH for running in views" }; // internally used to getch from views -- GitLab From 912327a746e6704bf219c744ec8d7e152a6bacde Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 23 Oct 2019 13:40:45 +0200 Subject: [PATCH 3/9] TrigHLTJetHypo: Remove INFO messages during initialize/finalize Remove useless INFO messages during initialize/finalize. Also remove empty destructors and finalize methods. --- .../TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx | 9 --------- .../TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h | 5 +---- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx index 4a29582dfcb..36773f68138 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx @@ -16,17 +16,8 @@ TrigJetHypoAlgMT::TrigJetHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ) : ::HypoBase( name, pSvcLocator ) {} -TrigJetHypoAlgMT::~TrigJetHypoAlgMT() {} - -StatusCode TrigJetHypoAlgMT::finalize() { - return StatusCode::SUCCESS; -} - StatusCode TrigJetHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); - - CHECK( m_hypoTools.retrieve() ); CHECK( m_jetsKey.initialize() ); diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h index 5b3e8851746..bd572eb4491 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h @@ -23,12 +23,9 @@ class TrigJetHypoAlgMT : public ::HypoBase { TrigJetHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigJetHypoAlgMT(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: /** -- GitLab From 613588a306ccd5983ba8da93a848383ecd492627 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 23 Oct 2019 13:40:46 +0200 Subject: [PATCH 4/9] TrigMissingETHypo: Remove INFO messages during initialize/finalize Remove useless INFO messages during initialize/finalize. Also remove empty destructors and finalize methods. --- .../TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx | 9 +-------- .../TrigMissingETHypo/src/TrigMissingETHypoAlgMT.h | 5 +---- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx index 9ae00b6a46e..6901ec6b9ed 100644 --- a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #include "TrigMissingETHypoAlgMT.h" @@ -15,15 +15,8 @@ TrigMissingETHypoAlgMT::TrigMissingETHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ) : ::HypoBase( name, pSvcLocator ) {} -TrigMissingETHypoAlgMT::~TrigMissingETHypoAlgMT() {} - -StatusCode TrigMissingETHypoAlgMT::finalize() { - return StatusCode::SUCCESS; -} - StatusCode TrigMissingETHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); CHECK( m_hypoTools.retrieve() ); CHECK( m_metKey.initialize() ); diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.h b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.h index 5350a1d6e24..650355ce289 100644 --- a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.h @@ -23,12 +23,9 @@ class TrigMissingETHypoAlgMT : public ::HypoBase { TrigMissingETHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigMissingETHypoAlgMT(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: // TODO: Consider taking muonContainer etc in case they are needed in future. -- GitLab From faefbae7a2cea20513b22bca02a71c7215e1e2ac Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 23 Oct 2019 13:40:47 +0200 Subject: [PATCH 5/9] TrigMultiVarHypo: Remove INFO messages during initialize/finalize Remove useless INFO messages during initialize/finalize. Also remove empty destructors and finalize methods. --- .../src/TrigL2CaloRingerHypoAlgMT.cxx | 14 +++----------- .../src/TrigL2CaloRingerHypoAlgMT.h | 5 ++--- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.cxx index b0c5f188fff..326892164c5 100644 --- a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #include #include "GaudiKernel/Property.h" @@ -26,13 +26,9 @@ TrigL2CaloRingerHypoAlgMT::TrigL2CaloRingerHypoAlgMT( const std::string& name, ::HypoBase( name, pSvcLocator ) {} -TrigL2CaloRingerHypoAlgMT::~TrigL2CaloRingerHypoAlgMT() {} - - StatusCode TrigL2CaloRingerHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); - ATH_CHECK( m_hypoTools.retrieve() ); + ATH_CHECK( m_hypoTools.retrieve() ); ATH_CHECK( m_ringsKey.initialize()); ATH_CHECK( m_clustersKey.initialize()); renounce(m_clustersKey); @@ -41,11 +37,7 @@ StatusCode TrigL2CaloRingerHypoAlgMT::initialize() { return StatusCode::SUCCESS; } -StatusCode TrigL2CaloRingerHypoAlgMT::finalize() { - return StatusCode::SUCCESS; -} - -StatusCode TrigL2CaloRingerHypoAlgMT::execute( const EventContext& context ) const { +StatusCode TrigL2CaloRingerHypoAlgMT::execute( const EventContext& context ) const { ATH_MSG_DEBUG ( "Executing " << name() << "..." ); auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context ); diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.h b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.h index 554b0a23a80..2fae4aee19c 100644 --- a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #ifndef TRIGL2CALORINGERHYPOALGMT_H #define TRIGL2CALORINGERHYPOALGMT_H 1 @@ -23,9 +23,8 @@ class TrigL2CaloRingerHypoAlgMT public: TrigL2CaloRingerHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigL2CaloRingerHypoAlgMT(); + virtual StatusCode initialize() override; - virtual StatusCode finalize() override; virtual StatusCode execute(const EventContext& context) const override; -- GitLab From b71db3e822e2245f0c496131f520333115c93f76 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 23 Oct 2019 13:40:48 +0200 Subject: [PATCH 6/9] TrigMuonHypoMT: Remove INFO messages during initialize/finalize Remove useless INFO messages during initialize/finalize. Also remove empty destructors and finalize methods. --- .../src/TrigL2MuonOverlapRemoverMucombAlg.h | 1 - .../src/TrigL2MuonOverlapRemoverMufastAlg.h | 1 - .../src/TrigL2MuonOverlapRemoverTool.h | 1 - .../TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx | 15 --------------- .../TrigMuonHypoMT/src/TrigMufastHypoAlg.h | 11 +++-------- .../TrigMuonHypoMT/src/TrigMufastHypoTool.h | 5 ++--- .../TrigMuonHypoMT/src/TrigMuisoHypoAlg.cxx | 15 --------------- .../TrigMuonHypoMT/src/TrigMuisoHypoAlg.h | 11 +++-------- .../TrigMuonHypoMT/src/TrigMuisoHypoTool.h | 5 ++--- .../src/TrigMuonEFCombinerHypoAlg.cxx | 15 --------------- .../src/TrigMuonEFCombinerHypoAlg.h | 10 +++------- .../src/TrigMuonEFCombinerHypoTool.cxx | 2 +- .../src/TrigMuonEFCombinerHypoTool.h | 5 ++--- .../src/TrigMuonEFInvMassHypoAlg.cxx | 0 .../src/TrigMuonEFInvMassHypoAlg.h | 5 ++--- .../src/TrigMuonEFInvMassHypoTool.h | 5 ++--- .../src/TrigMuonEFMSonlyHypoAlg.cxx | 15 --------------- .../src/TrigMuonEFMSonlyHypoAlg.h | 11 +++-------- .../src/TrigMuonEFMSonlyHypoTool.cxx | 2 +- .../src/TrigMuonEFMSonlyHypoTool.h | 5 ++--- .../src/TrigMuonEFTrackIsolationHypoAlg.cxx | 16 ---------------- .../src/TrigMuonEFTrackIsolationHypoAlg.h | 11 +++-------- .../src/TrigMuonEFTrackIsolationHypoTool.h | 5 ++--- .../TrigMuonHypoMT/src/TrigmuCombHypoAlg.cxx | 17 ----------------- .../TrigMuonHypoMT/src/TrigmuCombHypoAlg.h | 11 +++-------- .../TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx | 5 ----- .../TrigMuonHypoMT/src/TrigmuCombHypoTool.h | 5 ++--- 27 files changed, 36 insertions(+), 174 deletions(-) mode change 100755 => 100644 Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx mode change 100755 => 100644 Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.cxx mode change 100755 => 100644 Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoAlg.cxx mode change 100755 => 100644 Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.cxx mode change 100755 => 100644 Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.cxx diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMucombAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMucombAlg.h index 3947fc83612..5841c249edf 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMucombAlg.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMucombAlg.h @@ -8,7 +8,6 @@ #include "TrigL2MuonOverlapRemoverTool.h" #include "DecisionHandling/HypoBase.h" -class TriggerElement; // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMufastAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMufastAlg.h index 3cca8cf1695..7ee2c9bc8b3 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMufastAlg.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMufastAlg.h @@ -8,7 +8,6 @@ #include "TrigL2MuonOverlapRemoverTool.h" #include "DecisionHandling/HypoBase.h" -class TriggerElement; // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.h index 4277ddd633f..e1ab88d36bf 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.h @@ -13,7 +13,6 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration #include "AthenaMonitoring/GenericMonitoringTool.h" class StoreGateSvc; -class TriggerElement; // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx old mode 100755 new mode 100644 index 443116733d1..cf7c46cf7e4 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx @@ -19,31 +19,16 @@ TrigMufastHypoAlg::TrigMufastHypoAlg( const std::string& name, {} -TrigMufastHypoAlg::~TrigMufastHypoAlg() -{} - // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- StatusCode TrigMufastHypoAlg::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); ATH_CHECK(m_hypoTools.retrieve()); renounce(m_muFastKey); ATH_CHECK(m_muFastKey.initialize()); - - ATH_MSG_INFO( "Initialization completed successfully" ); - return StatusCode::SUCCESS; -} - -// -------------------------------------------------------------------------------- -// -------------------------------------------------------------------------------- -StatusCode TrigMufastHypoAlg::finalize() -{ - ATH_MSG_INFO( "Finalizing " << name() << "..." ); - ATH_MSG_INFO( "Finalization completed successfully" ); return StatusCode::SUCCESS; } diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.h index d3a7349dd34..0dfd84c09d0 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.h @@ -2,14 +2,12 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUFASTHYPO_TRIGMUFASTHYPOALG_H -#define TRIGMUFASTHYPO_TRIGMUFASTHYPOALG_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUFASTHYPOALG_H +#define TRIGMUONHYPOMT_TRIGMUFASTHYPOALG_H 1 #include "TrigMufastHypoTool.h" #include "DecisionHandling/HypoBase.h" -class TriggerElement; - // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- @@ -20,12 +18,9 @@ class TrigMufastHypoAlg TrigMufastHypoAlg( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigMufastHypoAlg(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: ToolHandleArray m_hypoTools {this, "HypoTools", {}, "Tools to perform selection"}; diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h index 62829601803..8cc103318c1 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h @@ -2,8 +2,8 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUFASTHYPO_TRIGMUFASTHYPOTOOL_H -#define TRIGMUFASTHYPO_TRIGMUFASTHYPOTOOL_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUFASTHYPOTOOL_H +#define TRIGMUONHYPOMT_TRIGMUFASTHYPOTOOL_H 1 #include "DecisionHandling/HLTIdentifier.h" #include "CLHEP/Units/SystemOfUnits.h" @@ -14,7 +14,6 @@ #include "AthenaMonitoring/GenericMonitoringTool.h" class StoreGateSvc; -class TriggerElement; // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.cxx index d8f9f2d0d5b..6da4d9da907 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.cxx @@ -16,16 +16,11 @@ TrigMuisoHypoAlg::TrigMuisoHypoAlg( const std::string& name, {} -TrigMuisoHypoAlg::~TrigMuisoHypoAlg() -{} - // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- StatusCode TrigMuisoHypoAlg::initialize() { - ATH_MSG_INFO( "Initializing " << name()); - ATH_CHECK(m_hypoTools.retrieve()); renounce( m_muIsoKey ); @@ -35,16 +30,6 @@ StatusCode TrigMuisoHypoAlg::initialize() } -// -------------------------------------------------------------------------------- -// -------------------------------------------------------------------------------- - -StatusCode TrigMuisoHypoAlg::finalize() -{ - ATH_MSG_INFO( "Finalizing " << name() << "..." ); - return StatusCode::SUCCESS; -} - - StatusCode TrigMuisoHypoAlg::execute( const EventContext& context) const { // common for all Hypos, to move in the base class diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.h index e7c9c102219..82d83c5bcf9 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.h @@ -10,14 +10,12 @@ // PURPOSE: LVL2 Muon Isolation Hypothesis Algorithm: V4.0 // for athenaMT // ******************************************************************** -#ifndef TRIGMUISOHYPO_TRIGMUISOHYPOALG_H -#define TRIGMUISOHYPO_TRIGMUISOHYPOALG_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUISOHYPOALG_H +#define TRIGMUONHYPOMT_TRIGMUISOHYPOALG_H 1 #include "DecisionHandling/HypoBase.h" #include "TrigMuisoHypoTool.h" -class TriggerElement; - // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- @@ -29,12 +27,9 @@ class TrigMuisoHypoAlg TrigMuisoHypoAlg( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigMuisoHypoAlg(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: ToolHandleArray m_hypoTools {this, "HypoTools", {}, "Tools to perform selection"}; diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.h index 0c533bf17b9..531180fab05 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.h @@ -2,8 +2,8 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUISOHYPO_TRIGMUISOHYPOTOOL_H -#define TRIGMUISOHYPO_TRIGMUISOHYPOTOOL_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUISOHYPOTOOL_H +#define TRIGMUONHYPOMT_TRIGMUISOHYPOTOOL_H 1 #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" @@ -12,7 +12,6 @@ class StoreGateSvc; -class TriggerElement; // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.cxx old mode 100755 new mode 100644 index 5c5a6f34f5a..f1529b7a89b --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.cxx @@ -18,31 +18,16 @@ TrigMuonEFCombinerHypoAlg::TrigMuonEFCombinerHypoAlg( const std::string& name, } -TrigMuonEFCombinerHypoAlg::~TrigMuonEFCombinerHypoAlg() -{} - // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- StatusCode TrigMuonEFCombinerHypoAlg::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); ATH_CHECK(m_hypoTools.retrieve()); renounce(m_muonKey); ATH_CHECK(m_muonKey.initialize()); - ATH_MSG_INFO( "Initialization completed successfully" ); - return StatusCode::SUCCESS; -} - -// -------------------------------------------------------------------------------- -// -------------------------------------------------------------------------------- - -StatusCode TrigMuonEFCombinerHypoAlg::finalize() -{ - ATH_MSG_INFO( "Finalizing " << name() << "..." ); - ATH_MSG_INFO( "Finalization completed successfully" ); return StatusCode::SUCCESS; } diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.h index 91212e4a80f..d082295ab28 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.h @@ -2,13 +2,12 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUONEFCOMBINERHYPO_TRIGMUONEFCOMBINERHYPOALG_H -#define TRIGMUONEFCOMBINERHYPO_TRIGMUONEFCOMBINERHYPOALG_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUONEFCOMBINERHYPOALG_H +#define TRIGMUONHYPOMT_TRIGMUONEFCOMBINERHYPOALG_H 1 #include "TrigMuonEFCombinerHypoTool.h" #include "DecisionHandling/HypoBase.h" -class TriggerElement; // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- @@ -20,12 +19,9 @@ class TrigMuonEFCombinerHypoAlg TrigMuonEFCombinerHypoAlg( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigMuonEFCombinerHypoAlg(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: ToolHandleArray m_hypoTools {this, "HypoTools", {}, "Tools to perform selection"}; diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.cxx index eb353ff8401..8820a702bc4 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.cxx @@ -36,7 +36,7 @@ StatusCode TrigMuonEFCombinerHypoTool::initialize(){ ATH_CHECK( m_monTool.retrieve() ); ATH_MSG_DEBUG("MonTool name: " << m_monTool); } - ATH_MSG_INFO("Initialization completed successfully"); + return StatusCode::SUCCESS; } bool TrigMuonEFCombinerHypoTool::decideOnSingleObject(TrigMuonEFCombinerHypoTool::MuonEFInfo& input, size_t cutIndex) const{ diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.h index 9dc7d324e42..a87ca35fb44 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.h @@ -2,15 +2,14 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUONEFCOMBINERHYPO_TRIGMUONEFCOMBINERHYPOTOOL_H -#define TRIGMUONEFCOMBINERHYPO_TRIGMUONEFCOMBINERHYPOTOOL_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUONEFCOMBINERHYPOTOOL_H +#define TRIGMUONHYPOMT_TRIGMUONEFCOMBINERHYPOTOOL_H 1 #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "AthenaMonitoring/GenericMonitoringTool.h" #include "xAODMuon/MuonContainer.h" #include "CLHEP/Units/SystemOfUnits.h" class StoreGateSvc; -class TriggerElement; class TrigMuonEFCombinerHypoTool: public ::AthAlgTool { enum { MaxNumberTools = 20 }; public: diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoAlg.cxx old mode 100755 new mode 100644 diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoAlg.h index 1c47c77079a..4ec35ca1187 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoAlg.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoAlg.h @@ -2,8 +2,8 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUONEFINVMASSHYPO_TRIGMUONEFINVMASSHYPOALG_H -#define TRIGMUONEFINVMASSHYPO_TRIGMUONEFINVMASSHYPOALG_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUONEFINVMASSHYPOALG_H +#define TRIGMUONHYPOMT_TRIGMUONEFINVMASSHYPOALG_H 1 #include @@ -12,7 +12,6 @@ #include "DecisionHandling/HypoBase.h" class StoreGateSvc; -class TriggerElement; // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.h index dadbf2c5338..a210e7646b4 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.h @@ -2,8 +2,8 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUONEFINVMASSHYPO_TRIGMUONEFINVMASSHYPOTOOL_H -#define TRIGMUONEFINVMASSHYPO_TRIGMUONEFINVMASSHYPOTOOL_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUONEFINVMASSHYPOTOOL_H +#define TRIGMUONHYPOMT_TRIGMUONEFINVMASSHYPOTOOL_H 1 #include #include "AthenaBaseComps/AthAlgTool.h" #include "DecisionHandling/HLTIdentifier.h" @@ -12,7 +12,6 @@ #include "xAODMuon/MuonContainer.h" class StoreGateSvc; -class TriggerElement; class TrigMuonEFInvMassHypoTool: public ::AthAlgTool { enum { MaxNumberTools = 20 }; public: diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.cxx old mode 100755 new mode 100644 index cb0b24c9360..40da41431e7 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.cxx @@ -17,31 +17,16 @@ TrigMuonEFMSonlyHypoAlg::TrigMuonEFMSonlyHypoAlg( const std::string& name, } -TrigMuonEFMSonlyHypoAlg::~TrigMuonEFMSonlyHypoAlg() -{} - // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- StatusCode TrigMuonEFMSonlyHypoAlg::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); ATH_CHECK(m_hypoTools.retrieve()); renounce(m_muonKey); ATH_CHECK(m_muonKey.initialize()); - ATH_MSG_INFO( "Initialization completed successfully" ); - return StatusCode::SUCCESS; -} - -// -------------------------------------------------------------------------------- -// -------------------------------------------------------------------------------- - -StatusCode TrigMuonEFMSonlyHypoAlg::finalize() -{ - ATH_MSG_INFO( "Finalizing " << name() << "..." ); - ATH_MSG_INFO( "Finalization completed successfully" ); return StatusCode::SUCCESS; } diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.h index f4163515e15..21fdf3c37b3 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.h @@ -2,14 +2,12 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUONEFMSONLYHYPO_TRIGMUONEFMSONLYHYPOALG_H -#define TRIGMUONEFMSONLYHYPO_TRIGMUONEFMSONLYHYPOALG_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUONEFMSONLYHYPOALG_H +#define TRIGMUONHYPOMT_TRIGMUONEFMSONLYHYPOALG_H 1 #include "TrigMuonEFMSonlyHypoTool.h" #include "DecisionHandling/HypoBase.h" -class TriggerElement; - // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- @@ -20,12 +18,9 @@ class TrigMuonEFMSonlyHypoAlg TrigMuonEFMSonlyHypoAlg( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigMuonEFMSonlyHypoAlg(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: ToolHandleArray m_hypoTools {this, "HypoTools", {}, "Tools to perform selection"}; diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.cxx index 8ca7574e9f0..c0f90b91fb8 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.cxx @@ -36,7 +36,7 @@ StatusCode TrigMuonEFMSonlyHypoTool::initialize(){ ATH_CHECK( m_monTool.retrieve() ); ATH_MSG_DEBUG("MonTool name: " << m_monTool); } - ATH_MSG_INFO("Initialization completed successfully"); + return StatusCode::SUCCESS; } bool TrigMuonEFMSonlyHypoTool::decideOnSingleObject(TrigMuonEFMSonlyHypoTool::MuonEFInfo& input, size_t cutIndex) const{ diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.h index dfb6af4f769..6615c340ab5 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.h @@ -2,8 +2,8 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUONEFMSONLYHYPO_TRIGMUONEFMSONLYHYPOTOOL_H -#define TRIGMUONEFMSONLYHYPO_TRIGMUONEFMSONLYHYPOTOOL_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUONEFMSONLYHYPOTOOL_H +#define TRIGMUONHYPOMT_TRIGMUONEFMSONLYHYPOTOOL_H 1 #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "AthenaMonitoring/GenericMonitoringTool.h" @@ -11,7 +11,6 @@ #include "xAODMuon/MuonContainer.h" #include "CLHEP/Units/SystemOfUnits.h" class StoreGateSvc; -class TriggerElement; class TrigMuonEFMSonlyHypoTool: public ::AthAlgTool { enum { MaxNumberTools = 20 }; public: diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.cxx old mode 100755 new mode 100644 index c787e6c562d..8fbfcab279b --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.cxx @@ -16,32 +16,16 @@ TrigMuonEFTrackIsolationHypoAlg::TrigMuonEFTrackIsolationHypoAlg( const std::str {} -TrigMuonEFTrackIsolationHypoAlg::~TrigMuonEFTrackIsolationHypoAlg() -{} - // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- StatusCode TrigMuonEFTrackIsolationHypoAlg::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); - ATH_CHECK( m_hypoTools.retrieve() ); renounce( m_muonKey ); ATH_CHECK( m_muonKey.initialize() ); - - ATH_MSG_INFO( "Initialization completed successfully" ); - return StatusCode::SUCCESS; -} - -// -------------------------------------------------------------------------------- -// -------------------------------------------------------------------------------- -StatusCode TrigMuonEFTrackIsolationHypoAlg::finalize() -{ - ATH_MSG_INFO( "Finalizing " << name() << "..." ); - ATH_MSG_INFO( "Finalization completed successfully" ); return StatusCode::SUCCESS; } diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.h index d3034a284f2..6e309c09a1c 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.h @@ -2,14 +2,12 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUFASTHYPO_TRIGMUONEFTRACKISOLATIONHYPOALG_H -#define TRIGMUFASTHYPO_TRIGMUONEFTRACKISOLATIONHYPOALG_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUONEFTRACKISOLATIONHYPOALG_H +#define TRIGMUONHYPOMT_TRIGMUONEFTRACKISOLATIONHYPOALG_H 1 #include "TrigMuonEFTrackIsolationHypoTool.h" #include "DecisionHandling/HypoBase.h" -class TriggerElement; - // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- @@ -20,12 +18,9 @@ class TrigMuonEFTrackIsolationHypoAlg TrigMuonEFTrackIsolationHypoAlg( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigMuonEFTrackIsolationHypoAlg(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: ToolHandleArray m_hypoTools { this, "HypoTools", {}, "Tools to perform selection" }; diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.h index 5d24d79abd8..9e9c3a39934 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.h @@ -2,8 +2,8 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUONEFTRACKISOLATIONHYPO_TRIGMUONEFTRACKISOLATIONHYPOTOOL_H -#define TRIGMUONEFTRACKISOLATIONHYPO_TRIGMUONEFTRACKISOLATIONHYPOTOOL_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUONEFTRACKISOLATIONHYPOTOOL_H +#define TRIGMUONHYPOMT_TRIGMUONEFTRACKISOLATIONHYPOTOOL_H 1 #include "DecisionHandling/HLTIdentifier.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" @@ -14,7 +14,6 @@ class StoreGateSvc; -class TriggerElement; // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.cxx index 9933c3cc071..35491d319c0 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.cxx @@ -16,31 +16,14 @@ TrigmuCombHypoAlg::TrigmuCombHypoAlg( const std::string& name, ::HypoBase( name, pSvcLocator ) {} -TrigmuCombHypoAlg::~TrigmuCombHypoAlg() -{} - -// -------------------------------------------------------------------------------- -// -------------------------------------------------------------------------------- StatusCode TrigmuCombHypoAlg::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); ATH_CHECK(m_hypoTools.retrieve()); renounce(m_muCombKey); ATH_CHECK(m_muCombKey.initialize()); - ATH_MSG_INFO( "Initialization completed successfully" ); - return StatusCode::SUCCESS; -} - -// -------------------------------------------------------------------------------- -// -------------------------------------------------------------------------------- - -StatusCode TrigmuCombHypoAlg::finalize() -{ - ATH_MSG_INFO( "Finalizing " << name() << "..." ); - ATH_MSG_INFO( "Finalization completed successfully" ); return StatusCode::SUCCESS; } diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.h index de10394cea7..6dd01ecc4e0 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.h @@ -2,14 +2,12 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUCOMBHYPO_TRIGMUCOMBHYPOALG_H -#define TRIGMUCOMBHYPO_TRIGMUCOMBHYPOALG_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUCOMBHYPOALG_H +#define TRIGMUONHYPOMT_TRIGMUCOMBHYPOALG_H 1 #include "TrigmuCombHypoTool.h" #include "DecisionHandling/HypoBase.h" -class TriggerElement; - // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- @@ -20,12 +18,9 @@ class TrigmuCombHypoAlg TrigmuCombHypoAlg( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigmuCombHypoAlg(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: ToolHandleArray m_hypoTools {this, "HypoTools", {}, "Tools to perform selection"}; diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx index 1ef1141e03e..e573c8c75dd 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx @@ -27,12 +27,9 @@ TrigmuCombHypoTool::~TrigmuCombHypoTool(){ StatusCode TrigmuCombHypoTool::initialize() { - ATH_MSG_INFO("Initializing " << name()); - ATH_MSG_DEBUG( "Tool configured for chain/id: " << m_decisionId ); if (m_acceptAll) { - ATH_MSG_DEBUG("AcceptAll = True"); ATH_MSG_INFO("Accepting all the events!"); } else { ATH_MSG_DEBUG("AcceptAll = False"); @@ -57,8 +54,6 @@ StatusCode TrigmuCombHypoTool::initialize() ATH_MSG_DEBUG("MonTool name: " << m_monTool); } - ATH_MSG_INFO("Initializing" << name() << "successfully"); - return StatusCode::SUCCESS; } diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h index f0c7b6bb091..390c9d31695 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h @@ -2,8 +2,8 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#ifndef TRIGMUCOMBHYPO_TRIGMUCOMBHYPOTOOL_H -#define TRIGMUCOMBHYPO_TRIGMUCOMBHYPOTOOL_H 1 +#ifndef TRIGMUONHYPOMT_TRIGMUCOMBHYPOTOOL_H +#define TRIGMUONHYPOMT_TRIGMUCOMBHYPOTOOL_H 1 #include "DecisionHandling/HLTIdentifier.h" #include "CLHEP/Units/SystemOfUnits.h" @@ -13,7 +13,6 @@ #include "AthenaMonitoring/GenericMonitoringTool.h" class StoreGateSvc; -class TriggerElement; // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- -- GitLab From 97defbd2e888b0c7d8bd7670307e38d6bd2077e8 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 23 Oct 2019 13:40:48 +0200 Subject: [PATCH 7/9] TrigStreamerHypo: Remove INFO messages during initialize/finalize Remove useless INFO messages during initialize/finalize. Also remove empty destructors and finalize methods. --- Trigger/TrigHypothesis/TrigStreamerHypo/CMakeLists.txt | 1 - .../TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx | 7 ------- .../TrigStreamerHypo/src/TrigStreamerHypoAlgMT.h | 5 +---- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigStreamerHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigStreamerHypo/CMakeLists.txt index 51d0700be3d..98c33a036e7 100644 --- a/Trigger/TrigHypothesis/TrigStreamerHypo/CMakeLists.txt +++ b/Trigger/TrigHypothesis/TrigStreamerHypo/CMakeLists.txt @@ -24,7 +24,6 @@ atlas_add_component( TrigStreamerHypo # Install files from the package: atlas_install_python_modules( python/*.py ) -atlas_install_joboptions( share/TriggerConfig_*.py ) # Unit tests: atlas_add_test( TrigStreamerHypoConfigMT SCRIPT python -m TrigStreamerHypo.TrigStreamerHypoConfigMT diff --git a/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx index 82954028a21..0bbcbfe77ec 100644 --- a/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx @@ -13,15 +13,8 @@ TrigStreamerHypoAlgMT::TrigStreamerHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ) : ::HypoBase( name, pSvcLocator ) {} -TrigStreamerHypoAlgMT::~TrigStreamerHypoAlgMT() {} - -StatusCode TrigStreamerHypoAlgMT::finalize() { - return StatusCode::SUCCESS; -} - StatusCode TrigStreamerHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); CHECK( m_hypoTools.retrieve() ); return StatusCode::SUCCESS; diff --git a/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.h b/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.h index 03bde881cbf..da9af58845a 100644 --- a/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.h @@ -20,12 +20,9 @@ class TrigStreamerHypoAlgMT : public ::HypoBase { TrigStreamerHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigStreamerHypoAlgMT(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: ToolHandleArray m_hypoTools { -- GitLab From 4417a64ae449cf2b0c259ac4a6a00aad68324e74 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 23 Oct 2019 13:40:49 +0200 Subject: [PATCH 8/9] TrigTauHypo: Remove INFO messages during initialize/finalize Remove useless INFO messages during initialize/finalize. Also remove empty destructors and finalize methods. --- .../TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx | 6 +----- .../TrigTauHypo/src/TrigEFTauMVHypoAlgMT.h | 6 +----- .../TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx | 5 ----- .../TrigTauHypo/src/TrigTauCaloHypoAlgMT.h | 10 ++-------- .../TrigTauHypo/src/TrigTauCaloRoiUpdaterMT.cxx | 7 ------- .../TrigTauHypo/src/TrigTauCaloRoiUpdaterMT.h | 10 ++++------ .../TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx | 8 +------- .../TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.h | 6 +----- 8 files changed, 10 insertions(+), 48 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx index 84bc346c2d7..af1817d75bd 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx @@ -14,10 +14,9 @@ TrigEFTauMVHypoAlgMT::TrigEFTauMVHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ) : ::HypoBase( name, pSvcLocator ) {} -TrigEFTauMVHypoAlgMT::~TrigEFTauMVHypoAlgMT() {} StatusCode TrigEFTauMVHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); + ATH_CHECK( m_hypoTools.retrieve() ); ATH_CHECK( m_tauJetKey.initialize() ); renounce( m_tauJetKey );// tau candidates are made in views, so they are not in the EvtStore: hide them @@ -25,9 +24,6 @@ StatusCode TrigEFTauMVHypoAlgMT::initialize() { return StatusCode::SUCCESS; } -StatusCode TrigEFTauMVHypoAlgMT::finalize() { - return StatusCode::SUCCESS; -} StatusCode TrigEFTauMVHypoAlgMT::execute( const EventContext& context ) const { ATH_MSG_DEBUG ( "Executing " << name() << "..." ); diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.h index 82bf60b3547..42ef34ae8aa 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.h @@ -20,14 +20,10 @@ class TrigEFTauMVHypoAlgMT : public ::HypoBase { TrigEFTauMVHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigEFTauMVHypoAlgMT(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: - TrigEFTauMVHypoAlgMT(); ToolHandleArray< ITrigEFTauMVHypoTool > m_hypoTools { this, "HypoTools", {}, "Hypo tools" }; SG::ReadHandleKey< xAOD::TauJetContainer > m_tauJetKey { this, "taujetcontainer", "taujetcontainer", "taujets in view" }; diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx index d5dc0b339bb..24a2b9514e7 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx @@ -14,10 +14,8 @@ TrigTauCaloHypoAlgMT::TrigTauCaloHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ) : ::HypoBase( name, pSvcLocator ) {} -TrigTauCaloHypoAlgMT::~TrigTauCaloHypoAlgMT() {} StatusCode TrigTauCaloHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); ATH_CHECK( m_hypoTools.retrieve() ); ATH_CHECK( m_tauJetKey.initialize() ); renounce( m_tauJetKey );// clusters are made in views, so they are not in the EvtStore: hide them @@ -25,9 +23,6 @@ StatusCode TrigTauCaloHypoAlgMT::initialize() { return StatusCode::SUCCESS; } -StatusCode TrigTauCaloHypoAlgMT::finalize() { - return StatusCode::SUCCESS; -} StatusCode TrigTauCaloHypoAlgMT::execute( const EventContext& context ) const { ATH_MSG_DEBUG ( "Executing " << name() << "..." ); diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.h index b0725c89e4e..d9096743f3b 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.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 */ #ifndef TRIGTAUHYPO_TrigTauCaloHypoAlgMT_H #define TRIGTAUHYPO_TrigTauCaloHypoAlgMT_H @@ -24,19 +24,13 @@ class TrigTauCaloHypoAlgMT : public ::HypoBase { TrigTauCaloHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigTauCaloHypoAlgMT(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: - TrigTauCaloHypoAlgMT(); ToolHandleArray< ITrigTauGenericHypoTool > m_hypoTools { this, "HypoTools", {}, "Hypo tools" }; SG::ReadHandleKey< xAOD::TauJetContainer > m_tauJetKey { this, "taujets", "taujets", "taujets in view" }; - - }; #endif //> !TRIGEGAMMAHYPO_TESTTRIGL2TAUCALOHYPOALG_H diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloRoiUpdaterMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloRoiUpdaterMT.cxx index f1bab2406c0..e65d1cc10cf 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloRoiUpdaterMT.cxx +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloRoiUpdaterMT.cxx @@ -17,7 +17,6 @@ TrigTauCaloRoiUpdaterMT::TrigTauCaloRoiUpdaterMT(const std::string & name, ISvcL AthAlgorithm(name, pSvcLocator) {} StatusCode TrigTauCaloRoiUpdaterMT::initialize() { - ATH_MSG_INFO( "Initializing " << name() << " ... " ); ATH_MSG_DEBUG( "declareProperty review:" ); ATH_MSG_DEBUG( " " << m_dRForCenter ); @@ -30,7 +29,6 @@ StatusCode TrigTauCaloRoiUpdaterMT::initialize() { return StatusCode::SUCCESS; } -TrigTauCaloRoiUpdaterMT::~TrigTauCaloRoiUpdaterMT(){} StatusCode TrigTauCaloRoiUpdaterMT::execute() { @@ -112,8 +110,3 @@ StatusCode TrigTauCaloRoiUpdaterMT::execute() { return StatusCode::SUCCESS; } - -StatusCode TrigTauCaloRoiUpdaterMT::finalize() { - ATH_MSG_INFO( "Finalizing " << name() << " ... " ); - return StatusCode::SUCCESS; -} diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloRoiUpdaterMT.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloRoiUpdaterMT.h index 66918c224b0..2ec0668b551 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloRoiUpdaterMT.h +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloRoiUpdaterMT.h @@ -1,6 +1,6 @@ // emacs: this is -*- c++ -*- /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ // // @file TrigRoiBuilderMT.h @@ -25,11 +25,9 @@ class TrigTauCaloRoiUpdaterMT : public AthAlgorithm { public: TrigTauCaloRoiUpdaterMT(const std::string&, ISvcLocator*); - ~TrigTauCaloRoiUpdaterMT(); - - StatusCode initialize(); - StatusCode finalize(); - StatusCode execute(); + + virtual StatusCode initialize() override; + virtual StatusCode execute() override; private: Gaudi::Property< float > m_dRForCenter {this,"dRForCenter",0.2,"Delta R from the center of ROI"}; diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx index d8c8ef1f40e..097c5682f77 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx @@ -14,10 +14,8 @@ TrigTrackPreSelHypoAlgMT::TrigTrackPreSelHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ) : ::HypoBase( name, pSvcLocator ) {} -TrigTrackPreSelHypoAlgMT::~TrigTrackPreSelHypoAlgMT() {} StatusCode TrigTrackPreSelHypoAlgMT::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); ATH_CHECK( m_hypoTools.retrieve() ); ATH_CHECK( m_fastTracksKey.initialize() ); renounce( m_fastTracksKey );// tau candidates are made in views, so they are not in the EvtStore: hide them @@ -25,11 +23,7 @@ StatusCode TrigTrackPreSelHypoAlgMT::initialize() { return StatusCode::SUCCESS; } -StatusCode TrigTrackPreSelHypoAlgMT::finalize() { - return StatusCode::SUCCESS; -} - -StatusCode TrigTrackPreSelHypoAlgMT::execute( const EventContext& context ) const { +StatusCode TrigTrackPreSelHypoAlgMT::execute( const EventContext& context ) const { ATH_MSG_DEBUG ( "Executing " << name() << "..." ); auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context ); if( not previousDecisionsHandle.isValid() ) {//implicit diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.h index 7d9f40216b6..0e278b65919 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.h @@ -20,14 +20,10 @@ class TrigTrackPreSelHypoAlgMT : public ::HypoBase { TrigTrackPreSelHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~TrigTrackPreSelHypoAlgMT(); - virtual StatusCode initialize() override; virtual StatusCode execute( const EventContext& context ) const override; - virtual StatusCode finalize() override; - + private: - TrigTrackPreSelHypoAlgMT(); ToolHandleArray< ITrigTrackPreSelHypoTool > m_hypoTools { this, "HypoTools", {}, "Hypo tools" }; SG::ReadHandleKey< TrackCollection > m_fastTracksKey { this, "trackcollection", "trackcollection", "fast tracks in view" }; -- GitLab From 3f98da51e9f3e3a06c58bea2e3201f89ea43fd98 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 23 Oct 2019 13:40:50 +0200 Subject: [PATCH 9/9] DecisionHandling: Remove INFO messages during initialize/finalize Remove useless INFO messages during initialize/finalize. Also remove empty destructors and finalize methods. --- .../DecisionHandling/src/DumpDecisions.cxx | 16 +++--------- .../DecisionHandling/src/DumpDecisions.h | 26 +++++-------------- .../DecisionHandling/src/InputMakerForRoI.cxx | 15 +---------- .../DecisionHandling/src/InputMakerForRoI.h | 7 ++--- .../DecisionHandling/src/RoRSeqFilter.cxx | 8 +----- .../DecisionHandling/src/RoRSeqFilter.h | 11 ++------ 6 files changed, 15 insertions(+), 68 deletions(-) diff --git a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx index 46fb361a6da..74aa0f85fbe 100644 --- a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx +++ b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx @@ -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 */ // DecisionHandling includes @@ -22,27 +22,17 @@ DumpDecisions::DumpDecisions( const std::string& name, : AthReentrantAlgorithm( name, pSvcLocator ) {} -// Destructor -/////////////// -DumpDecisions::~DumpDecisions() -{} // Athena Algorithm's Hooks //////////////////////////// StatusCode DumpDecisions::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); + ATH_MSG_DEBUG ( "Initializing " << name() << "..." ); CHECK( m_decisionKey.initialize() ); return StatusCode::SUCCESS; } -StatusCode DumpDecisions::finalize() { - ATH_MSG_INFO ( "Finalizing " << name() << "..." ); - - return StatusCode::SUCCESS; -} - -StatusCode DumpDecisions:: execute( const EventContext& ctx ) const { +StatusCode DumpDecisions:: execute( const EventContext& ctx ) const { using namespace TrigCompositeUtils; // DecisionInput decisionInput; auto decisionInput = SG::makeHandle( m_decisionKey, ctx ); diff --git a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.h b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.h index dc0af6a2977..68854b2296b 100644 --- a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.h +++ b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.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 */ #ifndef DECISIONHANDLING_DUMPDECISIONS_H #define DECISIONHANDLING_DUMPDECISIONS_H 1 @@ -10,8 +10,6 @@ // FrameWork includes #include "AthenaBaseComps/AthReentrantAlgorithm.h" - - class DumpDecisions : public ::AthReentrantAlgorithm { @@ -20,31 +18,19 @@ class DumpDecisions // Public methods: /////////////////////////////////////////////////////////////////// public: - - // Copy constructor: - - /// Constructor with parameters: + /// Constructor with parameters: DumpDecisions( const std::string& name, ISvcLocator* pSvcLocator ); - /// Destructor: - virtual ~DumpDecisions(); - // Athena algorithm's Hooks - StatusCode initialize() override; - StatusCode execute( const EventContext& ctx ) const override; - StatusCode finalize() override; + virtual StatusCode initialize() override; + virtual StatusCode execute( const EventContext& ctx ) const override; + private: SG::ReadHandleKey m_decisionKey{ this, "Decisions", "Unspecified", "Input Decisions to dump" }; Gaudi::Property m_verbosityLevel{ "VerbosityLevel", 3, "3 - tries to print as much possible, 2 - only list of objects and their decisions, 1 - only list of active objects" }; - /// Default constructor: - DumpDecisions(); - - - - -}; +}; #endif //> !DECISIONHANDLING_DUMPDECISIONS_H diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx index 12e554727a6..1907b463a2e 100644 --- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx +++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx @@ -19,23 +19,13 @@ InputMakerForRoI:: InputMakerForRoI( const std::string& name, : InputMakerBase( name, pSvcLocator ) {} -InputMakerForRoI::~ InputMakerForRoI() {} - StatusCode InputMakerForRoI::initialize() { - ATH_MSG_INFO ("Initializing " << name() << "..."); - - // specific: ATH_MSG_DEBUG("Will produce output RoI collections: " << m_RoIs); CHECK( m_RoIs.initialize() ); return StatusCode::SUCCESS; } -StatusCode InputMakerForRoI::finalize() { - return StatusCode::SUCCESS; -} - - -StatusCode InputMakerForRoI::execute( const EventContext& context ) const { +StatusCode InputMakerForRoI::execute( const EventContext& context ) const { ATH_MSG_DEBUG( "Executing " << name() << "..." ); // call base class helper method to read input decisions, loop over them create outputs and connect them, returns with outputHandles filled @@ -93,6 +83,3 @@ StatusCode InputMakerForRoI::execute( const EventContext& context ) const { return StatusCode::SUCCESS; } - - - diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h index 950960cb295..3cea7e6f60f 100644 --- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h +++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #ifndef TRIGUPGRADETEST_INPUTMAKERFORROI_H #define TRIGUPGRADETEST_INPUTMAKERFORROI_H @@ -21,14 +21,11 @@ class InputMakerForRoI : public ::InputMakerBase { public: InputMakerForRoI( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~ InputMakerForRoI(); + virtual StatusCode initialize() override; virtual StatusCode execute(const EventContext&) const override; - virtual StatusCode finalize() override; private: - InputMakerForRoI(); - SG::WriteHandleKey m_RoIs {this,"RoIs", "Unspecified", "Nam eof the RoIs extracted from the decisions"}; // want to try also const? //SG::WriteHandleKey< ConstDataVector > m_RoIs{ this, "RoIs", "Unspecified", "Name of the RoIs extracted from the decisions" }; diff --git a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx index d0ac51e6746..ad4758466c8 100644 --- a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx +++ b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx @@ -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 */ // DecisionHandling includes @@ -21,12 +21,9 @@ RoRSeqFilter::RoRSeqFilter( const std::string& name, ::AthAlgorithm( name, pSvcLocator ) {} -RoRSeqFilter::~RoRSeqFilter() -{} StatusCode RoRSeqFilter::initialize() { - ATH_MSG_INFO ( "Initializing " << name() << "..." ); CHECK( not m_inputKeys.empty() ); CHECK( not m_outputKeys.empty() ); @@ -69,9 +66,6 @@ StatusCode RoRSeqFilter::initialize() return StatusCode::SUCCESS; } -StatusCode RoRSeqFilter::finalize() { - return StatusCode::SUCCESS; -} StatusCode RoRSeqFilter::execute() { ATH_MSG_DEBUG ( "Executing " << name() << "..." ); diff --git a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.h b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.h index e104ac6659e..54b6825dc1e 100644 --- a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.h +++ b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.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 */ #ifndef DECISIONHANDLING_RORSEQFILTER_H #define DECISIONHANDLING_RORSEQFILTER_H 1 @@ -49,8 +49,6 @@ class RoRSeqFilter public: RoRSeqFilter( const std::string& name, ISvcLocator* pSvcLocator ); - virtual ~RoRSeqFilter(); - /** * @brief Setup input and output handles. Renounce all input handles. Get IDs for all configured chains. **/ @@ -62,12 +60,7 @@ class RoRSeqFilter **/ virtual StatusCode execute() override; -/** - * @brief Currently a noop - **/ - virtual StatusCode finalize() override; - - private: + private: RoRSeqFilter(); SG::ReadHandleKeyArray m_inputKeys{ this, "Input", {}, "Inputs to the filter" }; SG::WriteHandleKeyArray m_outputKeys{ this, "Output", {}, "Output" }; -- GitLab