diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/Hid2RESrcID.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/Hid2RESrcID.cxx
index d5e7bad58a48ab0db21d4c1452a98873043272d0..be679b533ba1034cfd4df3280a2651a519962559 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 7a643243ffdc4cc0237249028e43cbcfc52de317..86e7307b4095af7b1aeec8a87cafeda37b6cb31e 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 454203b53ccfaf42c275de0493906cc1767c8207..c30add65da11e81f432bfc864c65d2cef1cbbe95 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 9399952d32f695f884e865892ff6a11abbf719f7..7124430c3517a2066fe2d98d10e67a0710cd346e 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 8b0d57dc7afc7caae3d4abe294a9f403c217354c..5cab90ff0c1c00770476f66a68312cfb4ac5d0f4 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 cf90ef93bc052196169fb9c96e811ad0ffc7bdc9..c70a461d5e96d386901231bfb705d454737d9494 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 94d991fc6c4819e6d6003720c9ed90b5f991b14e..1752f2135fa614f301d42ea888cbda7961d3351a 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 1c6a504d22d461ebcca132c7cdbfb1fa9581a55f..d6fb4d64ae66cfb57257d6928720910760c979a8 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 c91988e5403dc7bdfa1b7a1ee084a0165864dcea..e65d61d84e52bd079d3d57f4b62c5c8350d6bbdc 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 3c1d730137eebe8f1972af95027b2119eb447075..1039d73c23f2cc33802e819059aa4f9384a72216 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 e9d52353d91227f272ac612d00f201e5d40d06a0..977819c2ff9a76f771c74632dcd805f8e92eb6b3 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 8ba1e9172fb40a1a9e5877f6883a2388dccea110..07523ce449b62696e97b8d7341bddde3c7ff6210 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 b54f9ec3014c94471be83913a1698d51b45edb63..78d72cd18070447f1db4bb03a879dd3bc8224c1f 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 4c8b56f745c66dedbd3ff10f16aa64629a318900..2522ee0523b7dec40b32353d5b28bdea32c3dab3 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 e6e9883138e3c6d1e2fc86e3c8432ae8bb442bb2..1d6ca08df068bf218002d7849c2a3e94ae193995 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 25a94195a6976281f8460475d0b14ad792d9cb3b..1db4d309c0fe417b91c661213470a66fdf2db9c4 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 e5256363cb3dd1002c1ffbfe79a170842f49d168..7df3776e4220f5f5aead1158b47c60e32b5893ef 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 968c4c5063b341f6f3df8ee26f3fa30c494352ce..f0cb0cc94334029ebb4b4eeae4d2f01791baf6a5 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 b1d4b882a8e5fe82b757019a67d5059f3d4c208f..ec8f09308a1bc3307fb02482f832489740d2b919 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 aaac242b6b76a69f2c9f6fa1fa7a606ab0c61ad7..146f79ba42139c978abe9d4772ad74ef5fe00494 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 4280f7fa1cb61ea29b4ff21a1c01f27fd06f107c..e92650f28def1ccbcf42efef5125c87d65502233 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"