From bcf22f04a2e18c4ed11eef629b63dd884444df3f Mon Sep 17 00:00:00 2001
From: charles leggett <leggett@cern.ch>
Date: Wed, 14 Feb 2018 10:45:08 -0800
Subject: [PATCH] remove ThreadGaudi and GaudiMT components
Former-commit-id: 98866d9ca3f7d1e3f3b49f1446bc4b5f97149d64
---
.../LArCnv/LArByteStream/src/Hid2RESrcID.cxx | 4 +---
.../LArRecUtils/src/MakeLArCellFromRaw.cxx | 6 +-----
.../TileIdentifier/src/TileRodIdHash.cxx | 1 -
.../TileSvc/TileByteStream/src/TileHid2RESrcID.cxx | 7 ++-----
.../TrigEFMissingET/src/EFMissingETFromHelper.cxx | 1 -
.../TrigGenericAlgs/src/AcceptL1TopoMonitor.cxx | 3 +--
.../TrigT2CaloCommon/src/LArCellCont.cxx | 6 ++----
.../TrigT2CaloCommon/src/LArRodIdHash.cxx | 4 +---
.../TrigT2CaloJet/src/T2CaloJetGridFromCells.cxx | 3 +--
.../src/T2CaloJetGridFromFEBHeader.cxx | 3 +--
.../src/TrigROBDataProviderSvc.cxx | 3 +--
.../src/TrigROBDataProviderSvc_RTT.cxx | 3 +--
.../src/TrigGenericMonitoringTool.cxx | 1 -
.../TrigMonitorBase/src/TrigHLTBaseTreeTool.cxx | 3 +--
.../TrigSteerMonitor/src/TrigRateMoni.cxx | 1 -
.../TrigSteerMonitor/src/TrigSteerMoni.cxx | 2 --
.../TrigTimeMonitor/src/TrigTimeHistTool.cxx | 3 +--
.../TrigTimeMonitor/src/TrigTimeTreeTool.cxx | 3 +--
.../TrigSteer/TrigSteering/src/Lvl1Converter.cxx | 13 ++++++-------
Trigger/TrigSteer/TrigSteering/src/Sequence.cxx | 1 -
Trigger/TrigSteer/TrigSteering/src/TopoSequence.cxx | 1 -
21 files changed, 21 insertions(+), 51 deletions(-)
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/Hid2RESrcID.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/Hid2RESrcID.cxx
index d5e7bad58a4..be679b533ba 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/Hid2RESrcID.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/Hid2RESrcID.cxx
@@ -10,7 +10,6 @@
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include <iostream>
@@ -44,9 +43,8 @@ StatusCode Hid2RESrcID::initialize()
MsgStream log(msgSvc, "Hid2RESrcID");
// Cabling Service
- ThreadGaudi* threadGaudi = ThreadGaudi::instance();
IToolSvc* toolSvc;
- sc = Gaudi::svcLocator()->service("ToolSvc"+threadGaudi->getThreadID(),toolSvc );
+ sc = Gaudi::svcLocator()->service("ToolSvc",toolSvc );
if(sc.isSuccess())
{
sc = toolSvc->retrieveTool("LArCablingService",m_cablingSvc);
diff --git a/LArCalorimeter/LArRecUtils/src/MakeLArCellFromRaw.cxx b/LArCalorimeter/LArRecUtils/src/MakeLArCellFromRaw.cxx
index 7a643243ffd..86e7307b409 100755
--- a/LArCalorimeter/LArRecUtils/src/MakeLArCellFromRaw.cxx
+++ b/LArCalorimeter/LArRecUtils/src/MakeLArCellFromRaw.cxx
@@ -20,7 +20,6 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "StoreGate/StoreGateSvc.h"
@@ -68,11 +67,8 @@ void MakeLArCellFromRaw::initialize( const LArRoI_Map* roiMap ,
const CaloDetDescrManager* man = CaloDetDescrManager::instance();
- ThreadGaudi* threadGaudi = ThreadGaudi::instance();
-
IToolSvc* p_toolSvc;
- StatusCode status = svcLoc->service( "ToolSvc"+threadGaudi->getThreadID(),p_toolSvc );
- //StatusCode status = svcLoc->service( "ToolSvc",p_toolSvc );
+ StatusCode status = svcLoc->service( "ToolSvc",p_toolSvc );
if(status.isFailure())
{
log <<MSG::ERROR << "cannot find ToolSvc in MakeLArCellFromRaw " << endmsg;
diff --git a/TileCalorimeter/TileIdentifier/src/TileRodIdHash.cxx b/TileCalorimeter/TileIdentifier/src/TileRodIdHash.cxx
index 454203b53cc..c30add65da1 100755
--- a/TileCalorimeter/TileIdentifier/src/TileRodIdHash.cxx
+++ b/TileCalorimeter/TileIdentifier/src/TileRodIdHash.cxx
@@ -6,7 +6,6 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include <iostream>
// This class converts a TileReadoutModuleID into an integer,
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx
index 9399952d32f..7124430c351 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx
@@ -16,7 +16,6 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "GaudiKernel/MsgStream.h"
#include "eformat/SourceIdentifier.h"
@@ -343,9 +342,8 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
// only frag5 in the data - make sure that TileROD_Decoder is configured properly
StatusCode sc;
ISvcLocator* svcLoc = Gaudi::svcLocator( );
- ThreadGaudi* threadGaudi = ThreadGaudi::instance();
IToolSvc* toolSvc;
- sc = svcLoc->service( "ToolSvc"+threadGaudi->getThreadID(),toolSvc);
+ sc = svcLoc->service( "ToolSvc",toolSvc);
if(sc.isFailure()){
log << MSG::WARNING << "TileHid2RESrcID: Can not retrieve ToolSvc" << endmsg;
return;
@@ -400,9 +398,8 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
if (nDataFrag[0] == 0 && (do_merge || nDataFrag[2]+nDataFrag[3]+nDataFrag[4] > 0) && nDataFrag[5] == 0 ) {
StatusCode sc;
ISvcLocator* svcLoc = Gaudi::svcLocator( );
- ThreadGaudi* threadGaudi = ThreadGaudi::instance();
IToolSvc* toolSvc;
- sc = svcLoc->service( "ToolSvc"+threadGaudi->getThreadID(),toolSvc);
+ sc = svcLoc->service( "ToolSvc",toolSvc);
if(sc.isFailure()){
log << MSG::WARNING << "TileHid2RESrcID: Can not retrieve ToolSvc" << endmsg;
return;
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromHelper.cxx b/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromHelper.cxx
index 8b0d57dc7af..5cab90ff0c1 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromHelper.cxx
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromHelper.cxx
@@ -24,7 +24,6 @@ is computed from components using the DK calibration
#include "TrigEFMissingET/EFMissingETFromHelper.h"
#include "TrigTimeAlgs/TrigTimerSvc.h"
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "CxxUtils/StrFormat.h"
//#include "GaudiKernel/MsgStream.h"
//#include "GaudiKernel/IToolSvc.h"
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/AcceptL1TopoMonitor.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/AcceptL1TopoMonitor.cxx
index cf90ef93bc0..c70a461d5e9 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/AcceptL1TopoMonitor.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/AcceptL1TopoMonitor.cxx
@@ -23,7 +23,6 @@
#include "xAODTrigger/TrigComposite.h"
#include "xAODTrigger/TrigCompositeContainer.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "AthenaKernel/Timeout.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
//#include "TrigROBDataProviderSvc/ITrigROBDataProviderSvc.h"
@@ -302,7 +301,7 @@ bool AcceptL1TopoMonitor::bookAndRegisterHist(ServiceHandle<ITHistSvc>& rootHist
bool AcceptL1TopoMonitor::bookAndRegisterHist(ServiceHandle<ITHistSvc>& rootHistSvc, TH1F*& hist, std::string hName, std::string hTitle, int bins, float lowEdge, float highEdge)
{
// booking path
- std::string path = std::string("/EXPERT/")+getGaudiThreadGenericName(name())+"/";
+ std::string path = std::string("/EXPERT/")+name()+"/";
ATH_MSG_VERBOSE( "Booking monitoring histogram "<<hName );
hist = new TH1F(hName.c_str(), hTitle.c_str(), bins, lowEdge, highEdge);
if (hist) {
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/LArCellCont.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/LArCellCont.cxx
index 94d991fc6c4..1752f2135fa 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/LArCellCont.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/LArCellCont.cxx
@@ -8,7 +8,6 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "LArRawUtils/LArRoI_Map.h"
#include "LArRecUtils/MakeLArCellFromRaw.h"
#include "LArRecConditions/ILArBadChannelMasker.h"
@@ -34,16 +33,15 @@ std::cout << "LArCellCont \t\t DEBUG \t in initialize" << std::endl;
StatusCode sc;
ISvcLocator* svcLoc = Gaudi::svcLocator( );
- ThreadGaudi* threadGaudi = ThreadGaudi::instance();
IToolSvc* toolSvc;
- sc = svcLoc->service( "ToolSvc"+threadGaudi->getThreadID(),toolSvc);
+ sc = svcLoc->service( "ToolSvc",toolSvc);
if(sc.isFailure()){
std::cout << "LArCellCont:initialize ERROR: Can not retrieve ToolSvc" << std::endl;
return StatusCode::FAILURE;
}
StoreGateSvc* detStore;
- sc=svcLoc->service("DetectorStore"+threadGaudi->getThreadID(),detStore);
+ sc=svcLoc->service("DetectorStore",detStore);
if(sc.isFailure()){
std::cout << "LArCellCont:initialize ERROR: Can not retrieve DetectorStore" << std::endl;
return StatusCode::FAILURE;
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/LArRodIdHash.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/LArRodIdHash.cxx
index 1c6a504d22d..d6fb4d64ae6 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/LArRodIdHash.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/LArRodIdHash.cxx
@@ -7,7 +7,6 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include <iostream>
#include "eformat/SourceIdentifier.h"
@@ -34,9 +33,8 @@ void LArRodIdHash::initialize( int offset ) {
m_offset = offset;
ISvcLocator* svcLoc = Gaudi::svcLocator( );
- ThreadGaudi* threadGaudi = ThreadGaudi::instance();
IToolSvc* toolSvc;
- StatusCode sc = svcLoc->service( "ToolSvc"+threadGaudi->getThreadID(),toolSvc);
+ StatusCode sc = svcLoc->service( "ToolSvc",toolSvc);
//StatusCode sc = svcLoc->service( "ToolSvc",toolSvc );
if(sc.isFailure())
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloJet/src/T2CaloJetGridFromCells.cxx b/Trigger/TrigAlgorithms/TrigT2CaloJet/src/T2CaloJetGridFromCells.cxx
index c91988e5403..e65d61d84e5 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloJet/src/T2CaloJetGridFromCells.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloJet/src/T2CaloJetGridFromCells.cxx
@@ -19,7 +19,6 @@ PURPOSE: Data preparation from Cells
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ThreadGaudi.h"
// should use this, but needs fixes
//#include "TrigT2CaloCommon/ITrigDataAccess.h"
@@ -86,7 +85,7 @@ StatusCode T2CaloJetGridFromCells::initialize()
}
else{
- std::string prefix = getGaudiThreadGenericName(name()) + ":";
+ std::string prefix = name() + ":";
// Define now the timers:
std::string label = prefix+"LArUnpck";
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloJet/src/T2CaloJetGridFromFEBHeader.cxx b/Trigger/TrigAlgorithms/TrigT2CaloJet/src/T2CaloJetGridFromFEBHeader.cxx
index 3c1d730137e..1039d73c23f 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloJet/src/T2CaloJetGridFromFEBHeader.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloJet/src/T2CaloJetGridFromFEBHeader.cxx
@@ -21,7 +21,6 @@ PURPOSE: Data preparation from FEB Header (Ex,Ey,Ez)
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "TrigT2CaloCommon/TrigDataAccess.h"
#include "AthenaKernel/Timeout.h"
@@ -61,7 +60,7 @@ StatusCode T2CaloJetGridFromFEBHeader::initialize()
}
else{
- std::string prefix = getGaudiThreadGenericName(name()) + ":";
+ std::string prefix = name() + ":";
// Define now the timers:
std::string label = prefix+"LArUnpck";
diff --git a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.cxx b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.cxx
index e9d52353d91..977819c2ff9 100755
--- a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.cxx
+++ b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.cxx
@@ -15,7 +15,6 @@
#include "TrigMonitorBase/TrigLockedHist.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/Property.h"
@@ -1255,7 +1254,7 @@ void TrigROBDataProviderSvc::handle(const Incident& incident) {
}
// *-- booking path
- std::string path = std::string("/EXPERT/")+getGaudiThreadGenericName(name())+"/";
+ std::string path = std::string("/EXPERT/")+name()+"/";
// *-- number of bins for sub detector plots (55 SubDet max.)
uint32_t n_bins_partEBSubDet = eformat::helper::SubDetectorDictionary.size();
diff --git a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.cxx b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.cxx
index 8ba1e9172fb..07523ce449b 100644
--- a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.cxx
+++ b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.cxx
@@ -4,7 +4,6 @@
#include "TrigROBDataProviderSvc_RTT.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/Property.h"
@@ -560,7 +559,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident)
// *-- booking path
- std::string path = std::string("/EXPERT/")+getGaudiThreadGenericName(name())+"/";
+ std::string path = std::string("/EXPERT/")+name()+"/";
//
m_hist_missingRequestedROBsPerAlgo = new TH1F (m_histProp_missingRequestedROBsPerAlgo.value().title().c_str(),
(m_histProp_missingRequestedROBsPerAlgo.value().title()+";").c_str(),
diff --git a/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigGenericMonitoringTool.cxx b/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigGenericMonitoringTool.cxx
index b54f9ec3014..78d72cd1807 100755
--- a/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigGenericMonitoringTool.cxx
+++ b/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigGenericMonitoringTool.cxx
@@ -18,7 +18,6 @@
#include <boost/lexical_cast.hpp>
#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "TrigInterfaces/Algo.h"
#include "TrigInterfaces/IMonitoredAlgo.h"
#include "TrigGenericMonitoringTool.h"
diff --git a/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigHLTBaseTreeTool.cxx b/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigHLTBaseTreeTool.cxx
index 4c8b56f745c..2522ee0523b 100755
--- a/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigHLTBaseTreeTool.cxx
+++ b/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigHLTBaseTreeTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/ThreadGaudi.h"
#include "TrigHLTBaseTreeTool.h"
#include <TTree.h>
#include "TrigInterfaces/Algo.h"
@@ -31,7 +30,7 @@ StatusCode TrigHLTBaseTreeTool::bookHists() {
// find out for whom we are running (i.e. Algo)
const HLT::Algo *parentAlg = dynamic_cast<const HLT::Algo*>(parent());
if ( parentAlg ) {
- m_parentName = getGaudiThreadGenericName(parentAlg->name());
+ m_parentName = parentAlg->name();
m_algo = const_cast<HLT::Algo*>(parentAlg);
} else {
ATH_MSG_WARNING("Not a HLT::Algo class");
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigRateMoni.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigRateMoni.cxx
index e6e9883138e..1d6ca08df06 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigRateMoni.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigRateMoni.cxx
@@ -17,7 +17,6 @@
#include "GaudiKernel/Algorithm.h"
#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/Property.h"
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSteerMoni.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSteerMoni.cxx
index 25a94195a69..1db4d309c0f 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSteerMoni.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSteerMoni.cxx
@@ -3,8 +3,6 @@
*/
#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/ThreadGaudi.h"
-
#include "TrigSteerMoni.h"
diff --git a/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeHistTool.cxx b/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeHistTool.cxx
index e5256363cb3..7df3776e422 100755
--- a/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeHistTool.cxx
+++ b/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeHistTool.cxx
@@ -3,7 +3,6 @@
*/
#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "TrigTimeAlgs/ITrigTimerSvc.h"
#include "TrigTimeAlgs/TrigTimer.h"
@@ -69,7 +68,7 @@ StatusCode TrigTimeHistTool::bookHists()
// find out for whom we are running (i.e. Algo)
const Algorithm *parentAlg = dynamic_cast<const Algorithm*>(parent());
if ( parentAlg )
- m_parentName = getGaudiThreadGenericName(parentAlg->name());
+ m_parentName = parentAlg->name();
std::string path = (m_path == "") ? m_parentName : m_path;
diff --git a/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeTreeTool.cxx b/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeTreeTool.cxx
index 968c4c5063b..f0cb0cc9433 100755
--- a/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeTreeTool.cxx
+++ b/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeTreeTool.cxx
@@ -3,7 +3,6 @@
*/
#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "TrigTimeAlgs/TrigTimer.h"
#include "TrigTimeAlgs/ITrigTimerSvc.h"
@@ -50,7 +49,7 @@ StatusCode TrigTimeTreeTool::bookHists() {
// find out for whom we are running (i.e. Algo)
const Algorithm *parentAlg = dynamic_cast<const Algorithm*>(parent());
if ( parentAlg )
- m_parentName = getGaudiThreadGenericName(parentAlg->name());
+ m_parentName = parentAlg->name();
std::string treeName = m_path + m_parentName;
// try to get global tree make my own tree if can not get global
diff --git a/Trigger/TrigSteer/TrigSteering/src/Lvl1Converter.cxx b/Trigger/TrigSteer/TrigSteering/src/Lvl1Converter.cxx
index b1d4b882a8e..ec8f09308a1 100755
--- a/Trigger/TrigSteer/TrigSteering/src/Lvl1Converter.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/Lvl1Converter.cxx
@@ -50,7 +50,6 @@
#include "TrigSteering/Lvl1ConsistencyChecker.h"
#include "TrigTimeAlgs/TrigTimerSvc.h"
-#include "GaudiKernel/ThreadGaudi.h"
using namespace HLT;
@@ -108,12 +107,12 @@ ErrorCode Lvl1Converter::hltInitialize()
return HLT::ERROR;
}
ATH_MSG_ERROR("Got timing service TrigTimerSvc");
- m_totalTime = m_timerSvc->addItem(getGaudiThreadGenericName(name())+":TotalTime");
- m_sgTime = m_timerSvc->addItem(getGaudiThreadGenericName(name())+":RetrievalTime");
- m_lvl1ItemsTime = m_timerSvc->addItem(getGaudiThreadGenericName(name())+":ItemsTime");
- m_caloTime = m_timerSvc->addItem(getGaudiThreadGenericName(name())+":EMTauTime");
- m_muonTime = m_timerSvc->addItem(getGaudiThreadGenericName(name())+":MuonTime");
- m_jetTime = m_timerSvc->addItem(getGaudiThreadGenericName(name())+":JetEnergyTime");
+ m_totalTime = m_timerSvc->addItem(name()+":TotalTime");
+ m_sgTime = m_timerSvc->addItem(name()+":RetrievalTime");
+ m_lvl1ItemsTime = m_timerSvc->addItem(name()+":ItemsTime");
+ m_caloTime = m_timerSvc->addItem(name()+":EMTauTime");
+ m_muonTime = m_timerSvc->addItem(name()+":MuonTime");
+ m_jetTime = m_timerSvc->addItem(name()+":JetEnergyTime");
}
sc = m_lvl1Tool->updateConfig(m_useL1Muon, m_useL1Calo, m_useL1JetEnergy);
diff --git a/Trigger/TrigSteer/TrigSteering/src/Sequence.cxx b/Trigger/TrigSteer/TrigSteering/src/Sequence.cxx
index aaac242b6b7..146f79ba421 100755
--- a/Trigger/TrigSteer/TrigSteering/src/Sequence.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/Sequence.cxx
@@ -27,7 +27,6 @@
#include "TrigNavigation/TriggerElement.h"
#include "AthenaKernel/Timeout.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "GaudiKernel/GaudiException.h"
#include "eformat/Issue.h"
diff --git a/Trigger/TrigSteer/TrigSteering/src/TopoSequence.cxx b/Trigger/TrigSteer/TrigSteering/src/TopoSequence.cxx
index 4280f7fa1cb..e92650f28de 100755
--- a/Trigger/TrigSteer/TrigSteering/src/TopoSequence.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/TopoSequence.cxx
@@ -29,7 +29,6 @@
#include "TrigNavigation/TriggerElement.h"
#include "AthenaKernel/Timeout.h"
-#include "GaudiKernel/ThreadGaudi.h"
#include "GaudiKernel/GaudiException.h"
#include "eformat/Issue.h"
--
GitLab