From e81c7ba527e24dc03e680edef8101bd9bef1d435 Mon Sep 17 00:00:00 2001
From: Vakhtang Tsulaia <Vakhtang.Tsulaia@cern.ch>
Date: Thu, 24 Nov 2016 04:56:28 +0100
Subject: [PATCH] Dropping redundant dependency on IGeoModelSvc
(GeoModelEnvelopes-00-00-07)
* Dropping redundant dependency on IGeoModelSvc
2016-11-18 Vakho Tsulaia <tsulaia@cern.ch>
* Switching ForDetEnvelopeTool to ATH_MSG
---
.../src/ForDetEnvelopeTool.cxx | 26 ++++---------------
1 file changed, 5 insertions(+), 21 deletions(-)
diff --git a/AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.cxx b/AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.cxx
index 3ec7b37462e..6e9d3cb7143 100755
--- a/AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.cxx
+++ b/AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.cxx
@@ -5,12 +5,7 @@
#include "GeoModelEnvelopes/ForDetEnvelopeTool.h"
#include "GeoModelEnvelopes/ForDetEnvelopeFactory.h"
#include "GeoModelEnvelopes/ForDetEnvelopeManager.h"
-
-#include "GeoModelInterfaces/IGeoModelSvc.h"
#include "GeoModelUtilities/GeoModelExperiment.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGateSvc.h"
@@ -32,22 +27,11 @@ ForDetEnvelopeTool::~ForDetEnvelopeTool()
StatusCode ForDetEnvelopeTool::create(StoreGateSvc* detStore)
{
- MsgStream log(msgSvc(), name());
-
- log << MSG::INFO << "Building Forward Detectors Envelope" << endreq;
-
- IGeoModelSvc *geoModel;
- StatusCode sc = service ("GeoModelSvc",geoModel);
- if (sc.isFailure()) {
- log << MSG::FATAL << "Could not locate GeoModelSvc" << endreq;
- return StatusCode::FAILURE;
- }
+ ATH_MSG_INFO("Building Forward Detectors Envelope");
GeoModelExperiment* theExpt;
if (StatusCode::SUCCESS != detStore->retrieve(theExpt,"ATLAS")) {
- log << MSG::ERROR
- << "Could not find GeoModelExperiment ATLAS"
- << endreq;
+ ATH_MSG_ERROR("Could not find GeoModelExperiment ATLAS");
return StatusCode::FAILURE;
}
@@ -59,12 +43,12 @@ StatusCode ForDetEnvelopeTool::create(StoreGateSvc* detStore)
m_manager = theFactory.getDetectorManager();
theExpt->addManager(m_manager);
- sc = detStore->record(m_manager,
+ StatusCode sc = detStore->record(m_manager,
m_manager->getName());
if (sc.isFailure()) {
- log << MSG::ERROR << "Could not register ForDetEnvelope detector manager" << endreq;
- return (StatusCode::FAILURE);
+ ATH_MSG_ERROR("Could not register ForDetEnvelope detector manager");
+ return StatusCode::FAILURE;
}
return StatusCode::SUCCESS;
}
--
GitLab