diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InnerDetProbeCollectorTool.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InnerDetProbeCollectorTool.h
index 2f7088045ad83bbf464ba13d48becb03b0ea79f0..2cc5b45b691a4af14dcf468fd88eacc4d527ca4a 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InnerDetProbeCollectorTool.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InnerDetProbeCollectorTool.h
@@ -32,7 +32,6 @@
#include "AnalysisTriggerEvent/Muon_ROI.h"
#include "TrigMuonEvent/CombinedMuonFeature.h"
#include "TrigMuonEvent/TrigMuonEFContainer.h"
-#include "TrigSteeringEvent/TriggerDecision.h"
/// Track Particles
#include "Particle/TrackParticle.h"
#include "Particle/TrackParticleContainer.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InsituTrackTools.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InsituTrackTools.h
index 9f97dae7d3ef96367c07be44af10579d6e5d7344..d48958c50d90cc2dc32bc09c64c161583b70049f 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InsituTrackTools.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InsituTrackTools.h
@@ -33,7 +33,6 @@
#include "AnalysisTriggerEvent/Muon_ROI.h"
#include "TrigMuonEvent/CombinedMuonFeature.h"
#include "TrigMuonEvent/TrigMuonEFContainer.h"
-#include "TrigSteeringEvent/TriggerDecision.h"
/// Track Particles
#include "Particle/TrackParticle.h"
#include "Particle/TrackParticleContainer.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h
index 0ed8a381bd8bc08ed379760689f057850e14586a..7ac33176b79da35acd070c2740f5c76d3b4ddb38 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h
@@ -33,7 +33,6 @@
#include "AnalysisTriggerEvent/Muon_ROI.h"
#include "TrigMuonEvent/CombinedMuonFeature.h"
#include "TrigMuonEvent/TrigMuonEFContainer.h"
-#include "TrigSteeringEvent/TriggerDecision.h"
/// Track Particles
#include "Particle/TrackParticle.h"
#include "Particle/TrackParticleContainer.h"
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/MessageSvcProvider.h b/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/MessageSvcProvider.h
deleted file mode 100644
index b8aabdad9005ca96aab2b2c698d5c82e9b05c8bb..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/MessageSvcProvider.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#pragma once
-/**
- * @file MessageSvcProvider.h
- * @author Simon George <s.george@rhul.ac.uk>
- * @author Andrew Lowe <a.j.lowe@rhul.ac.uk>
- * @brief Provides message services.
- *
- * Provides a way of using the Gaudi MessageSvc when it is not easily
- * available, e.g. for data classes.
- * Just include this file in any class that requires message services.
- */
-
-/**
- * ==========================================
- * @warning THIS CLASS IS *NOT* THREAD-SAFE!
- * ==========================================
- */
-
-#ifndef TRIGSTEERINGEVENT_MESSAGESVCPROVIDER_H
-#define TRIGSTEERINGEVENT_MESSAGESVCPROVIDER_H
-
-#include <iostream>
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/MsgStream.h"
-
-/**
- * @brief OBSOLETE It is an accessor for messageSvc for objects which were not GAUDI algorithms or tools
- *
- * @warning Usage of this class is obsolete use this: IMessageSvc* Athena::getMessageSvc();
- * See HN thread: https://hypernews.cern.ch/HyperNews/Atlas/get/offlineSWDevelopment/22/1.html
- */
-class MessageSvcProvider {
-
-public:
-
- MessageSvcProvider() : m_pMsgSvc(0) {}
-
- ~MessageSvcProvider(){}
-
- /**
- * @fn IMessageSvc* msgSvc() const
- *
- * @warning If this fails, without cout there is no way to tell the user!
- *
- * @return An IMessageSvc pointer.
- *
- * To use, your class needs a MessageSvcProvider as a member.
- * You can then do:
- * MsgStream log(m_MessageSvcProvider.msgSvc(), m_objectName);
- */
-
- IMessageSvc* msgSvc() const {
- if(!m_pMsgSvc){
- ISvcLocator* serviceLocator = Gaudi::svcLocator();
- IService* theSvc;
-
- StatusCode sc = serviceLocator->getService("MessageSvc", theSvc, true);
- if(sc.isFailure()) exit(1); // Service [MessageSvc] not found
-
- m_pMsgSvc = dynamic_cast<IMessageSvc*>(theSvc);
- if(!m_pMsgSvc) exit(1); // Dynamic cast IService --> IMessageSvc failed
- }
- return m_pMsgSvc;
- }
-
-private:
-
- /**
- * @var IMessageSvc* m_pMsgSvc
- * @see msgSvc()
- */
- mutable IMessageSvc* m_pMsgSvc;
-};
-
-#endif // MESSAGESVCPROVIDER_H
-
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/PhiHelper.h b/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/PhiHelper.h
deleted file mode 100644
index 5f0368c4b45c7433885d58f8126ea50a0d02a1d1..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/PhiHelper.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// emacs: this is -*- c++ -*-
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-//
-// @file phiHelper.h
-//
-//
-// $Id: phiHelper.h, v0.0 Sun 20 Jun 2010 20:21:49 BST sutt $
-
-
-#ifndef PHIHELPER_H
-#define PHIHELPER_H
-
-namespace HLT {
-
-inline double wrapPhi( double phi ) {
- static const double M_2PI = 2*M_PI;
- while (phi> M_PI) phi -= M_2PI;
- while (phi<-M_PI) phi += M_2PI;
- return phi;
-}
-
-
-inline double phiMean( double phimin, double phimax) {
- double phi = 0.5*(phimin+phimax);
- if ( phimin>phimax ) phi += M_PI;
- return wrapPhi(phi);
-}
-
-
-inline double deltaPhi( double phimax, double phimin) {
- return wrapPhi(phimax-phimin);
-}
-
-}
-
-
-#endif // __PHIHELPER_H
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/TriggerDecision.h b/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/TriggerDecision.h
deleted file mode 100644
index 76ff3b3e1396cab9a6fd1fa1174bf5c87f061c8e..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/TriggerDecision.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#pragma once
-#ifndef ANALYSISTRIGGEREVENT_TRIGGERDECISION_H
-#define ANALYSISTRIGGEREVENT_TRIGGERDECISION_H
-
-/**
- * Prototype to provide Trigger Decision to end-user
- *
- * @author M. Wielers
- */
-#include <map>
-#include <string>
-#include <vector>
-
-#include "AthenaKernel/CLASS_DEF.h"
-
-// for message service provider
-#include "TrigSteeringEvent/MessageSvcProvider.h"
-
-/**
- * @brief Sumarises the decision of the trigger in user friendly form.
- * @warning this class is obsolete and is kept only for purpose of data reading done in rel 12 or before
- */
-class TriggerDecision
-{
-public:
-
- enum TrigLevel {L1=1,L2,EF};
-
- TriggerDecision ();
- /**
- * @brief custom c'tor
- * @param l1 enabled LVL1
- * @param l2 enabled LVL2
- * @param ef enabled EF
- */
- TriggerDecision (bool l1, bool l2, bool ef);
-
- ~TriggerDecision ();
-
- // methods
-
- void print() const;
- void printAccepted() const;
-
- bool isDefinedL1() const { return m_L1defined; }
- bool isDefinedL2() const { return m_L2defined; }
- bool isDefinedEF() const { return m_EFdefined; }
- bool isDefined(std::string) const;
- bool isDefined(std::string, unsigned int) const;
-
- bool isTriggerPassed() const; //!< global decision
- bool isPassedL1() const;
- bool isPassedL2() const;
- bool isPassedEF() const;
- /**
- * @brief checks if given signature is satisfied
- * @param name signature name
- */
- bool isTriggered(std::string name) const;
-
- /**
- * @brief checks if given signature is satisfied
- * @param name signature name
- * @param levle further details in which level, @see TrigLevel
- */
- bool isTriggered(std::string name, unsigned int level) const;
-
-
-
- std::vector<std::string> signatures() const; //!< list of all defined signatures
- std::vector<std::string> signatures(unsigned int level) const; //!< list of defined signatures in level @see TrigLevel
-
- /**
- * @brief all signatures to satisfied/unsatisfied map for Lvl1
- * This map contains mapping from signature name to the boolean which is true if given signature was active false otherwise.
- */
- std::map<std::string,bool> L1map() const;
- /**
- * @brief all signatures to satisfied/unsatisfied map for Lvl2
- * @see L1map()
- */
- std::map<std::string,bool> L2map() const;
-
- /**
- * @brief all signatures to satisfied/unsatisfied map for Lvl2
- * @see L1map()
- */
- std::map<std::string,bool> EFmap() const;
-
- /**
- * @brief list of signatures which were ignored during TriggerDecision object creation (do not enter to the map)
- */
- std::vector<std::string> ignoredSigs() const;
-
-
- void set_TriggerItem(std::string, bool, unsigned int); //!< sets the active/inactive state for a signature
- void set_ignore_TriggerItem(std::string); //!< adds signature to the list of this to be ignored
- bool ignore_TriggerItem(std::string); //!< checki if signature is ignored
-
-private:
-
- void print(bool print_all) const; //!< preety print
-
-
- bool m_L1defined, m_L2defined, m_EFdefined; //!< flags for trigger levels
-
-
- std::map<std::string, bool> m_TriggerMapL1; //!< map of activity for Lvl1
- std::map<std::string, bool> m_TriggerMapL2; //!< map of activity for Lvl2
- std::map<std::string, bool> m_TriggerMapEF; //!< map of activity for EF
-
- std::vector<std::string> m_ignore; //!< signatures to ignore
-
- MessageSvcProvider m_messageSvcProvider; //!< needed for printing out messages using the message service
-
-};
-
-CLASS_DEF( TriggerDecision , 28494668, 1 )
-
-#endif
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/doc/packagedoc.h b/Trigger/TrigEvent/TrigSteeringEvent/doc/packagedoc.h
deleted file mode 100644
index ccb7b6d37f239237607818c7423b1c745e188a1a..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigSteeringEvent/doc/packagedoc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-
-
-@page TrigSteeringEvent_page TrigSteeringEvent Package
-
-@section TrigSteeringEvent_TrigSteeringEventIntro Introduction
-
-This package contains utilisties used to stream PESA results.
- - HLT::HLTResult:
- - TriggerDecision:
- - LVL1CTP::Lvl1result:
-
-Here reside also the classe used in the seeding process which holds eta/phi of RoIs:
- - TrigRoiDescriptor:
- - HLT::ErrorCode: which defines basically possible error codes
-
-And some other misc helpers:
- - MessageSvcProvider:
-
-Notice little dependency. It is realy a core package.
-
-
-*/
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/src/TriggerDecision.cxx b/Trigger/TrigEvent/TrigSteeringEvent/src/TriggerDecision.cxx
deleted file mode 100644
index 3fbe900578f042e242ed7f2b0d5adddd0d739519..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigSteeringEvent/src/TriggerDecision.cxx
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/********************************************************************
-
-NAME: TriggerDecision.cxx
-PACKAGE: Trigger/TrigEvent/TrigSteeringEvent/
-
-AUTHORS: M. Wielers
-CREATED: Sep 2005
-
-PURPOSE: temporary class to store the trigger decision
-
-********************************************************************/
-
-// INCLUDE HEADER FILES:
-
-#include "TrigSteeringEvent/TriggerDecision.h"
-#include <iomanip>
-#include <iostream>
-#include <string>
-
-// END OF HEADER FILES INCLUDE
-
-// ----------------------------
-// Constructors
-// ----------------------------
-TriggerDecision::TriggerDecision() :
- m_L1defined(false), m_L2defined(false), m_EFdefined(false)
-{ }
-
-TriggerDecision::TriggerDecision(bool defL1, bool defL2, bool defEF) :
- m_L1defined(defL1), m_L2defined(defL2), m_EFdefined(defEF)
-{ }
-
-// --------------------------
-// Destructor
-// --------------------------
-TriggerDecision::~TriggerDecision()
-{ }
-
-// --------------------------
-// print contents of TriggerDecision map
-// ----------------------------
-// private print method
-void TriggerDecision::print(bool print_all) const
-{
- // to use message service
- std::string thisName("TriggerDecision::print");
- MsgStream log(m_messageSvcProvider.msgSvc(), thisName);
-
- int NoMenuItem = m_TriggerMapL1.size() + m_TriggerMapL2.size()
- + m_TriggerMapEF.size() - m_ignore.size();
-
- log << MSG::INFO << "TriggerDecision: no of TriggerItems defined in this run "
- << NoMenuItem<< endmsg;
-
- // L1
- log << MSG::INFO << "TriggerDecision: Level 1:" <<endmsg;
- std::map<std::string,bool>::const_iterator it1 = m_TriggerMapL1.begin();
- std::map<std::string,bool>::const_iterator it1E = m_TriggerMapL1.end();
- for (; it1!=it1E; ++it1) {
-
- if (print_all || it1->second) {
- log << MSG::INFO << "TriggerDecision: L1 Trigger Item " << it1->first
- << " " << ((it1->second) ? "is fulfilled" : " did not pass") <<endmsg;
- }
- }
- // L2
- log << MSG::INFO << "TriggerDecision: Level 2:" <<endmsg;
- std::map<std::string,bool>::const_iterator it2 = m_TriggerMapL2.begin();
- std::map<std::string,bool>::const_iterator it2E = m_TriggerMapL2.end();
- for (; it2!=it2E; ++it2) {
-
- if (print_all || it2->second) {
- log << MSG::INFO << "TriggerDecision: L2 Trigger Item " << it2->first
- << " " << ((it2->second) ? "is fulfilled" : " did not pass") <<endmsg;
- }
- }
- // EF
- log << MSG::INFO << "TriggerDecision: Event Filter:" <<endmsg;
- std::map<std::string,bool>::const_iterator it = m_TriggerMapEF.begin();
- std::map<std::string,bool>::const_iterator itE = m_TriggerMapEF.end();
- for (; it!=itE; ++it) {
-
- if (print_all || it->second) {
- log << MSG::INFO << "TriggerDecision: EF Trigger Item " << it->first
- << " " << ((it->second) ? "is fulfilled" : " did not pass") <<endmsg;
- }
- }
- if (!print_all && ! isTriggerPassed()) {
- log << MSG::INFO << "TriggerDecision: No trigger item passed " << endmsg;
- }
-}
-
-// print all signatures: public method
-void TriggerDecision::print() const {
- this->print(true);
-}
-
-// print accepted signatures: public method
-void TriggerDecision::printAccepted() const {
- this->print(false);
-}
-
-
-// --------------------------
-// Find if some signature is defined (at any level or at a certain level)
-// ----------------------------
-bool TriggerDecision::isDefined(std::string TriggerItem) const {
- return ( isDefined(TriggerItem, L1) ||
- isDefined(TriggerItem, L2) ||
- isDefined(TriggerItem, EF) );
-}
-
-bool TriggerDecision::isDefined(std::string TriggerItem, unsigned int level) const {
-
- // to use message service
- std::string thisName("TriggerDecision::isDefined");
- MsgStream log(m_messageSvcProvider.msgSvc(), thisName);
-
- std::map<std::string,bool>::const_iterator it;
-
- if (level == L1 && m_L1defined) {
- it = m_TriggerMapL1.find(TriggerItem);
- if (it != m_TriggerMapL1.end()) {
- return true;
- } else {
- log << MSG::VERBOSE << "Trigger Item " << TriggerItem
- << " not defined!!!" << endmsg;
- }
- } else if (level == L2 && m_L2defined) {
- it = m_TriggerMapL2.find(TriggerItem);
- if (it != m_TriggerMapL2.end()) {
- return true;
- } else {
- log << MSG::VERBOSE << "Trigger Item " << TriggerItem
- << " not defined!!!" << endmsg;
- }
- } else if (level == EF && m_EFdefined) {
- it = m_TriggerMapEF.find(TriggerItem);
- if (it != m_TriggerMapEF.end()) {
- return true;
- } else {
- log << MSG::VERBOSE << "Trigger Item " << TriggerItem
- << " not defined!!!" << endmsg;
- }
- } else {
- log << MSG::VERBOSE << "Trigger level enum TrigLevel["
- << level << "] not defined!!!" << endmsg;
- }
- return false;
-}
-
-
-// --------------------------
-// Find if some signature was passed (at some trigger level)
-// ----------------------------
-bool TriggerDecision::isTriggered(std::string TriggerItem) const {
- // to use message service
- std::string thisName("TriggerDecision::isTriggered");
- MsgStream log(m_messageSvcProvider.msgSvc(), thisName);
-
- // look in all levels
- if ( isDefined(TriggerItem,L1) ) {
- return ( isTriggered(TriggerItem,L1) );
- } else if ( isDefined(TriggerItem,L2) ) {
- return ( isTriggered(TriggerItem,L2) );
- } else if ( isDefined(TriggerItem,EF) ) {
- return ( isTriggered(TriggerItem,EF) );
- } else {
- log << MSG::VERBOSE << "Trigger Item " << TriggerItem
- << " not defined!!!" << endmsg;
- }
- return false;
-}
-
-bool TriggerDecision::isTriggered(std::string TriggerItem, unsigned int level) const {
-
- // to use message service
- std::string thisName("TriggerDecision::isTriggered");
- MsgStream log(m_messageSvcProvider.msgSvc(), thisName);
-
- std::map<std::string,bool>::const_iterator it;
-
- if (level == L1 && m_L1defined) {
- it = m_TriggerMapL1.find(TriggerItem);
- if (it != m_TriggerMapL1.end()) {
- return (it->second);
- } else {
- log << MSG::VERBOSE << "Trigger Item " << TriggerItem
- << " not defined!!!" << endmsg;
- return false;
- }
- } else if (level == L2 && m_L2defined) {
- it = m_TriggerMapL2.find(TriggerItem);
- if (it != m_TriggerMapL2.end()) {
- return (it->second);
- } else {
- log << MSG::VERBOSE << "Trigger Item " << TriggerItem
- << " not defined!!!" << endmsg;
- return false;
- }
- } else if (level == EF && m_EFdefined) {
- it = m_TriggerMapEF.find(TriggerItem);
- if (it != m_TriggerMapEF.end()) {
- return (it->second);
- } else {
- log << MSG::VERBOSE << "Trigger Item " << TriggerItem
- << " not defined!!!" << endmsg;
- return false;
- }
- } else {
- log << MSG::VERBOSE << "Trigger level enum TrigLevel["
- << level << "] not defined!!!" << endmsg;
- return false;
- }
- return false;
-}
-
-// --------------------------
-// Find if event passed trigger selection
-// --------------------------
-// at the highest defined trigger level
-bool TriggerDecision::isTriggerPassed() const
-{
- // to use message service
- std::string thisName("TriggerDecision::isTriggerPassed");
- MsgStream log(m_messageSvcProvider.msgSvc(), thisName);
-
- // returns true if EF defined and some EF signature passed
- // if EF not defined, try next level down, and so on
- bool triggered = false;
-
- if (m_EFdefined) {
- triggered = isPassedEF();
- } else if (m_L2defined) {
- triggered = isPassedL2();
- } else if (m_L1defined) {
- triggered = isPassedL1();
- } else {
- log << MSG::VERBOSE << "No Trigger Levels defined!!!" << endmsg;
- }
-
- return (triggered);
-}
-
-// at level 1
-bool TriggerDecision::isPassedL1() const {
-
- bool triggered = false;
- std::map<std::string,bool>::const_iterator it = m_TriggerMapL1.begin();
- std::map<std::string,bool>::const_iterator itE = m_TriggerMapL1.end();
- for (; it!=itE; ++it) {
- if (it->second==true) triggered=true;
- }
- return triggered;
-}
-
-// at level 2
-bool TriggerDecision::isPassedL2() const {
-
- bool triggered = false;
- std::map<std::string,bool>::const_iterator it = m_TriggerMapL2.begin();
- std::map<std::string,bool>::const_iterator itE = m_TriggerMapL2.end();
- for (; it!=itE; ++it) {
- if (it->second==true) triggered=true;
- }
- return triggered;
-}
-
-// at event filter
-bool TriggerDecision::isPassedEF() const {
-
- bool triggered = false;
- std::map<std::string,bool>::const_iterator it = m_TriggerMapEF.begin();
- std::map<std::string,bool>::const_iterator itE = m_TriggerMapEF.end();
- for (; it!=itE; ++it) {
- if (it->second==true) triggered=true;
- }
- return triggered;
-}
-
-
-// ----------------------------------------------------------------
-// Accessors to return list of signatures and copy of internal maps
-// ----------------------------------------------------------------
-
-// return vector with all signature labels for all configured trigger levels
-std::vector<std::string> TriggerDecision::signatures() const
-{
- std::vector<std::string> v_labels;
-
- if (m_L1defined) {
- std::vector<std::string> t_vec = signatures(L1);
- for (unsigned int i=0; i<t_vec.size(); ++i) v_labels.push_back(t_vec[i]);
- }
- if (m_L2defined) {
- std::vector<std::string> t_vec = signatures(L1);
- for (unsigned int i=0; i<t_vec.size(); ++i) v_labels.push_back(t_vec[i]);
- }
- if (m_EFdefined) {
- std::vector<std::string> t_vec = signatures(L1);
- for (unsigned int i=0; i<t_vec.size(); ++i) v_labels.push_back(t_vec[i]);
- }
- return v_labels;
-}
-
-
-// return vector with labels for all signatures defined at a certain level
-std::vector<std::string> TriggerDecision::signatures(unsigned int level) const
-{
- std::map<std::string, bool>::const_iterator it;
- std::map<std::string, bool>::const_iterator end;
- std::vector<std::string> v_labels;
-
- // find which level map should be read
- if (level == L1 && m_L1defined) {
- it = m_TriggerMapL1.begin();
- end = m_TriggerMapL1.end();
- } else if (level == L2 && m_L2defined) {
- it = m_TriggerMapL2.begin();
- end = m_TriggerMapL2.end();
- } else if (level == EF && m_EFdefined) {
- it = m_TriggerMapEF.begin();
- end = m_TriggerMapEF.end();
- } else {
- return v_labels; // no level selected, return empty vector
- }
-
- // loop over map for selected level and fill output vector
- for (; it != end; ++it) {
- // push label into vector
- v_labels.push_back( it->first );
- }
-
- return v_labels;
-
-}
-
-// return copies of the internal maps
-std::map<std::string,bool> TriggerDecision::L1map() const {
- return m_TriggerMapL1;
-}
-
-std::map<std::string,bool> TriggerDecision::L2map() const {
- return m_TriggerMapL2;
-}
-
-std::map<std::string,bool> TriggerDecision::EFmap() const {
- return m_TriggerMapEF;
-}
-
-std::vector<std::string> TriggerDecision::ignoredSigs() const {
- return m_ignore;
-}
-
-
-// --------------------------
-// Methods to fill map
-// --------------------------
-// insert trigger items in map
-void TriggerDecision::set_TriggerItem(std::string TriggerItem, bool triggered, unsigned int level)
-{
- if (level == L1 && m_L1defined) {
- m_TriggerMapL1.insert(std::map<std::string,bool>::value_type(TriggerItem, triggered));
- return;
- } else if (level == L2 && m_L2defined) {
- m_TriggerMapL2.insert(std::map<std::string,bool>::value_type(TriggerItem, triggered));
- return;
- } else if (level == EF && m_EFdefined) {
- m_TriggerMapEF.insert(std::map<std::string,bool>::value_type(TriggerItem, triggered));
- return;
- }
-}
-
-// set ignorable signatures
-void TriggerDecision::set_ignore_TriggerItem(std::string TriggerItem)
-{
- m_ignore.push_back(TriggerItem);
-}
-
-// check if trigger item is ignorable // this is unused anyway
-bool TriggerDecision::ignore_TriggerItem(std::string TriggerItem)
-{
- bool ignore=false;
- for (size_t i=0; i<m_ignore.size();++i) {
- if (m_ignore[i]==TriggerItem) {
- ignore=true;
- break;
- }
- }
- return (ignore);
-}
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/TrigT1CaloCalibUtils/L1CaloPprPhos4ShapeMaker.h b/Trigger/TrigT1/TrigT1CaloCalibUtils/TrigT1CaloCalibUtils/L1CaloPprPhos4ShapeMaker.h
index f637bea17562699a6988eada7fcd5765c0641bb1..023baddd1e554438db278418cca0118f171cb602 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/TrigT1CaloCalibUtils/L1CaloPprPhos4ShapeMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/TrigT1CaloCalibUtils/L1CaloPprPhos4ShapeMaker.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
*/
// ***************************************************************************
@@ -26,8 +26,6 @@
#include "EventInfo/EventID.h"
// Trigger Menu tools
-//#include "TrigDecision/TrigDecisionTool.h"
-#include "TrigSteeringEvent/TriggerDecision.h"
#include "TrigConfL1Data/TriggerItem.h"
#include "TrigConfHLTData/HLTStreamTag.h"
diff --git a/Trigger/TrigTruthEvent/TrigInDetTruthEvent/TrigInDetTruthEvent/TrigInDetTrackTruth.h b/Trigger/TrigTruthEvent/TrigInDetTruthEvent/TrigInDetTruthEvent/TrigInDetTrackTruth.h
index 13f56d4d5808e4d9def4a038ed17bac40473fbbc..50ca026642dd7c0d34adce4fca8dd35f5dd19f8f 100644
--- a/Trigger/TrigTruthEvent/TrigInDetTruthEvent/TrigInDetTruthEvent/TrigInDetTrackTruth.h
+++ b/Trigger/TrigTruthEvent/TrigInDetTruthEvent/TrigInDetTruthEvent/TrigInDetTrackTruth.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,7 +31,6 @@
#include "HepMC/GenVertex.h"
#include "GeneratorObjects/HepMcParticleLink.h"
-#include "TrigSteeringEvent/MessageSvcProvider.h"
#include <iostream>
class TrigInDetTrackTruth {
diff --git a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/TrigTruthEventTPCnv/TrigInDetTrackTruthMap_old.h b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/TrigTruthEventTPCnv/TrigInDetTrackTruthMap_old.h
index 95dc1379f8e6eca11ccecb2eef6c1f674e57e140..c9de21e131043e6566918306f7e1946ac92350ed 100644
--- a/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/TrigTruthEventTPCnv/TrigInDetTrackTruthMap_old.h
+++ b/Trigger/TrigTruthEvent/TrigTruthEventTPCnv/TrigTruthEventTPCnv/TrigInDetTrackTruthMap_old.h
@@ -1,7 +1,7 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -10,7 +10,6 @@
#include "TrigInDetEvent/TrigInDetTrackCollection.h"
#include "TrigInDetTruthEvent/TrigInDetTrackTruth.h"
-//#include "TrigSteeringEvent/MessageSvcProvider.h"
#include "AthLinks/ElementLink.h"
#include <vector>
@@ -19,8 +18,6 @@ class TrigInDetTrackTruthMap_old
public:
std::vector< ElementLink< TrigInDetTrackCollection > > m_elink_vec;
std::vector< TrigInDetTrackTruth > m_truth_vec;
-
- //MessageSvcProvider m_messageSvcProvider;
};