diff --git a/DetectorDescription/RegionSelector/src/RegSelSvc.cxx b/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
index a29df3dc6c56d6415e0d504e3560626bc9c2bb28..20f033ab91df365e6c3f53744b06d28a0dcdc83f 100755
--- a/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
+++ b/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
@@ -126,7 +126,7 @@ RegSelSvc::RegSelSvc(const std::string& name, ISvcLocator* sl)
declareProperty( "DisablePixelFromConditions", m_disablePixelFromConditions=true, "disable Pixel modules based on the conditions summary svc");
declareProperty( "DisableSCTFromConditions", m_disableSCTFromConditions=true, "disable SCT modules based on the conditions summary svc");
declareProperty( "DisableTRTFromConditions", m_disableTRTFromConditions=true, "disable TRT modules based on the conditions summary svc");
- declareProperty( "PixConditionsSvc", m_PixConditionsSvc="PixelConditionsSummarySvc", "name of conditions summary svc for the pixels");
+ declareProperty( "PixConditionsTool", m_PixConditionsTool="PixelConditionsSummaryTool/InDetPixelConditionsSummaryTool", "name of conditions summary tool for the pixels");
declareProperty( "SCTConditionsTool", m_SCTConditionsTool="SCT_ConditionsSummaryTool/InDetSCT_ConditionsSummaryTool", "name of conditions summary tool for the SCT");
declareProperty( "TRTConditionsSvc", m_TRTConditionsSvc="TRT_ConditionsSummarySvc", "name of conditions summary svc for the TRT");
}
@@ -380,7 +380,7 @@ void RegSelSvc::disableIDFromConditions(RegSelSiLUT* detector, const std::string
std::vector<IdentifierHash>::iterator mitr(IDList.begin());
std::vector<IdentifierHash>::iterator mend(IDList.end());
- if ( detector==m_newsct ) {
+ if ( detector==m_newpixel or detector==m_newsct ) {
// get ConditionsSummaryTool
ToolHandle<IInDetConditionsTool> condsummary(serviceName, this);
if ( condsummary.retrieve().isFailure() ) {
@@ -2361,7 +2361,7 @@ bool RegSelSvc::reinitialiseInternal() {
// first disable modules from the conditions summary services
// if ( m_disableFromConditions ) disableIDFromConditions(m_newpixel, "PixelConditionsSummarySvc");
- if ( m_disableFromConditions && m_disablePixelFromConditions ) disableIDFromConditions(m_newpixel, m_PixConditionsSvc);
+ if ( m_disableFromConditions && m_disablePixelFromConditions ) disableIDFromConditions(m_newpixel, m_PixConditionsTool);
// now *disable* the modules from robs the user has flagged
if ( m_deleteRobList.size() ) m_newpixel->disableRobList(m_deleteRobList);
diff --git a/DetectorDescription/RegionSelector/src/RegSelSvc.h b/DetectorDescription/RegionSelector/src/RegSelSvc.h
index 66056d0260fcef073d8a071f43845420b27b8a84..57f7966afb9a44cf22d2d65d72fccfc3c27b0b17 100755
--- a/DetectorDescription/RegionSelector/src/RegSelSvc.h
+++ b/DetectorDescription/RegionSelector/src/RegSelSvc.h
@@ -507,7 +507,7 @@ private:
RegSelSiLUT* m_newstgc{nullptr};
- StringProperty m_PixConditionsSvc;
+ StringProperty m_PixConditionsTool;
StringProperty m_SCTConditionsTool;
StringProperty m_TRTConditionsSvc;
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h
index 132abd056f58c03e7f788820c8fd04dd4fb40753..ef84a6ad9607625d60bbd7f1d1affe34e42171fe 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h
@@ -113,8 +113,6 @@ private:
std::string m_prdTruthNamePixel;
PRD_MultiTruthCollection* m_pixPrdTruth; //!< the PRD truth map for Pixel measurements
- // ServiceHandle<IInDetConditionsSvc> m_pixelCondSummarySvc; //!< Handle to pixel conditions service
-
ToolHandle< InDet::PixelGangedAmbiguitiesFinder > m_gangedAmbiguitiesFinder;
std::string m_inputObjectName; //! name of the sub event hit collections.
@@ -154,7 +152,6 @@ private:
SG::ReadCondHandleKey<InDetDD::SiDetectorElementCollection> m_pixelDetEleCollKey
{this, "PixelDetEleCollKey", "PixelDetectorElementCollection", "Key of SiDetectorElementCollection for Pixel"};
- // bool isActiveAndGood(const ServiceHandle<IInDetConditionsSvc> &svc, const IdentifierHash &idHash, const Identifier &id, bool querySingleChannel, const char *elementName, const char *failureMessage = "") const;
bool areNeighbours(const std::vector<Identifier>& group, const Identifier& rdoID, const InDetDD::SiDetectorElement* /*element*/, const PixelID& pixelID) const;
PixelFastDigitizationTool();
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/FEI3SimTool.cxx b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/FEI3SimTool.cxx
index bc0ee3bf6c1926e1804f8ce58b146511fd7f4ecb..3229f66dcd627775a826937e24cb3e2d040dc5f4 100644
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/FEI3SimTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/FEI3SimTool.cxx
@@ -138,7 +138,7 @@ void FEI3SimTool::process(SiChargedDiodeCollection &chargedDiodes,PixelRDO_Colle
if (SiHelper::isMaskOut((*i_chargedDiode).second)) { continue; }
if (SiHelper::isDisabled((*i_chargedDiode).second)) { continue; }
- if (!m_pixelConditionsSvc->isActive(moduleHash,diodeID)) {
+ if (!m_pixelConditionsTool->isActive(moduleHash,diodeID)) {
SiHelper::disabled((*i_chargedDiode).second,true,true);
continue;
}
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/FEI4SimTool.cxx b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/FEI4SimTool.cxx
index edebd4e1b8af73e741de0e4848153bd7b9785a2b..81735ee272e79792b2e86763a47ca33dc4829317 100644
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/FEI4SimTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/FEI4SimTool.cxx
@@ -120,7 +120,7 @@ void FEI4SimTool::process(SiChargedDiodeCollection &chargedDiodes,PixelRDO_Colle
if (SiHelper::isMaskOut((*i_chargedDiode).second)) { continue; }
if (SiHelper::isDisabled((*i_chargedDiode).second)) { continue; }
- if (!m_pixelConditionsSvc->isActive(moduleHash,diodeID)) {
+ if (!m_pixelConditionsTool->isActive(moduleHash,diodeID)) {
SiHelper::disabled((*i_chargedDiode).second,true,true);
continue;
}
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/FrontEndSimTool.h b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/FrontEndSimTool.h
index 6be83de8eec22f70c240c3980bd83e8979979026..58db7bdfb9d297ec4e9ffa4a9b1d642a4f3bb354 100644
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/FrontEndSimTool.h
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/FrontEndSimTool.h
@@ -15,7 +15,7 @@
#include "SiDigitization/SiChargedDiodeCollection.h"
#include "InDetRawData/InDetRawDataCLASS_DEF.h"
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
+#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
#include "InDetSimEvent/SiTotalCharge.h"
#include "PixelCabling/IPixelCablingSvc.h"
@@ -35,7 +35,6 @@ class FrontEndSimTool:public AthAlgTool,virtual public IAlgTool {
m_rndmSvc("AtRndmGenSvc",name),
m_rndmEngineName("PixelDigitization"),
m_rndmEngine(nullptr),
- m_pixelConditionsSvc("PixelConditionsSummarySvc",name),
m_timeBCN(1),
m_timeZero(5.0),
m_timePerBCO(25.0),
@@ -53,7 +52,6 @@ class FrontEndSimTool:public AthAlgTool,virtual public IAlgTool {
declareInterface<FrontEndSimTool>(this);
declareProperty("RndmSvc", m_rndmSvc, "Random number service used in FE simulation");
declareProperty("RndmEngine", m_rndmEngineName, "Random engine name");
- declareProperty("PixelConditionsSummarySvc", m_pixelConditionsSvc);
declareProperty("TimeBCN", m_timeBCN, "Number of BCID");
declareProperty("TimeZero", m_timeZero, "Time zero...?");
declareProperty("TimePerBCO", m_timePerBCO, "Time per BCO - should be 25ns");
@@ -74,7 +72,7 @@ class FrontEndSimTool:public AthAlgTool,virtual public IAlgTool {
CHECK(m_rndmSvc.retrieve());
- CHECK(m_pixelConditionsSvc.retrieve());
+ CHECK(m_pixelConditionsTool.retrieve());
ATH_CHECK(m_pixelCabling.retrieve());
ATH_CHECK(m_chargeDataKey.initialize());
@@ -114,7 +112,7 @@ class FrontEndSimTool:public AthAlgTool,virtual public IAlgTool {
std::string m_rndmEngineName;
CLHEP::HepRandomEngine *m_rndmEngine;
- ServiceHandle<IInDetConditionsSvc> m_pixelConditionsSvc;
+ ToolHandle<IInDetConditionsTool> m_pixelConditionsTool{this, "PixelConditionsTool", "PixelConditionsSummaryTool/InDetPixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"};
ServiceHandle<IPixelCablingSvc> m_pixelCabling{this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service"};
SG::ReadCondHandleKey<PixelChargeCalibCondData> m_chargeDataKey
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/RD53SimTool.cxx b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/RD53SimTool.cxx
index bffd2672433b899f3e692af5c7eddf6de176ef37..f8724cfa19a12a4c24d16ca391c0801af21398a0 100644
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/RD53SimTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/RD53SimTool.cxx
@@ -106,7 +106,7 @@ void RD53SimTool::process(SiChargedDiodeCollection &chargedDiodes,PixelRDO_Colle
if (SiHelper::isMaskOut((*i_chargedDiode).second)) { continue; }
if (SiHelper::isDisabled((*i_chargedDiode).second)) { continue; }
- if (!m_pixelConditionsSvc->isActive(moduleHash,diodeID)) {
+ if (!m_pixelConditionsTool->isActive(moduleHash,diodeID)) {
SiHelper::disabled((*i_chargedDiode).second,true,true);
continue;
}
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.cxx
index bfcf4f39548c356be19ed15887638cb15ed08372..751064613290413dd37de6ae03c4af531e6d4249 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.cxx
@@ -18,10 +18,8 @@ JetTagPixelModCondFillerTool::JetTagPixelModCondFillerTool
const std::string& name,
const IInterface* parent)
: BlockFillerTool<InDetDD::SiDetectorElementCollection> (type, name, parent),
- m_pixId(0),
- m_pixelCondSummarySvc("",name)
+ m_pixId(0)
{
- declareProperty("PixelSummarySvc", m_pixelCondSummarySvc);
declareProperty("MaxDeadModules", m_maxDeadModules=500);
book().ignore(); // Avoid coverity warnings.
@@ -35,14 +33,14 @@ StatusCode JetTagPixelModCondFillerTool::initialize()
{
ATH_CHECK( detStore()->retrieve( m_pixId,"PixelID") );
- if( m_pixelCondSummarySvc.empty() ){
- ATH_MSG_FATAL( "PixelConditionsSummarySvc not configured " );
- ATH_MSG_FATAL( "you need to configure PixelConditionsSummarySvc to be able to dump pixel condition " );
+ if( m_pixelCondSummaryTool.empty() ){
+ ATH_MSG_FATAL( "PixelConditionsSummaryTool not configured " );
+ ATH_MSG_FATAL( "you need to configure PixelConditionsSummaryTool to be able to dump pixel condition " );
return StatusCode::FAILURE;
}
- ATH_CHECK( m_pixelCondSummarySvc.retrieve() );
- ATH_MSG_INFO( "Retrieved service " << m_pixelCondSummarySvc );
+ ATH_CHECK( m_pixelCondSummaryTool.retrieve() );
+ ATH_MSG_INFO( "Retrieved tool " << m_pixelCondSummaryTool );
return StatusCode::SUCCESS;
}
@@ -96,8 +94,8 @@ bool JetTagPixelModCondFillerTool::selectModule(const InDetDD::SiDetectorElement
IdentifierHash id_hash = m_pixId->wafer_hash(ident);
- bool active = m_pixelCondSummarySvc->isActive(id_hash);
- bool good = m_pixelCondSummarySvc->isGood(id_hash);
+ bool active = m_pixelCondSummaryTool->isActive(id_hash);
+ bool good = m_pixelCondSummaryTool->isGood(id_hash);
return active && good;
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.h b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.h
index 2b0d45ec21528fc4d975e72ba3856d91e34cdcae..c19767a68acf9b425a887a3c9ed929bfb9e9ddc9 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.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
*/
/**
@@ -13,7 +13,7 @@
#define JetTagD3PDMaker_JetTagPixelModCondFillerTool_H
#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
+#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
#include <vector>
@@ -59,7 +59,7 @@ private:
bool selectModule(const InDetDD::SiDetectorElement*);
const PixelID* m_pixId;
- ServiceHandle< IInDetConditionsSvc > m_pixelCondSummarySvc;
+ ToolHandle<IInDetConditionsTool> m_pixelCondSummaryTool{this, "PixelConditionsTool", "PixelConditionsSummaryTool/InDetPixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"};
std::vector<short> *m_idHash;
int *m_ndead;
diff --git a/PhysicsAnalysis/JetTagging/JetTagMonitoring/JetTagMonitoring/JetTagMonitoring.h b/PhysicsAnalysis/JetTagging/JetTagMonitoring/JetTagMonitoring/JetTagMonitoring.h
index 94b921f301e59f89a06373b950beb7da4f517c9f..42119158a5d54c99a567f02c41dee37cd7d61f55 100755
--- a/PhysicsAnalysis/JetTagging/JetTagMonitoring/JetTagMonitoring/JetTagMonitoring.h
+++ b/PhysicsAnalysis/JetTagging/JetTagMonitoring/JetTagMonitoring/JetTagMonitoring.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
*/
// *******************************************************
@@ -25,8 +25,6 @@
#include "ITrackToVertex/ITrackToVertex.h"
#include "AthenaMonitoring/ManagedMonitorToolBase.h"
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
-
#include "xAODJet/Jet.h"
#include "TrigDecisionTool/TrigDecisionTool.h" // added by SARA
@@ -456,9 +454,6 @@ private:
MonGroup* m_monGr_shift = nullptr;
MonGroup* m_monGr_LowStat = nullptr;
- //--------------Pixel stuff--------------------------------------
- ServiceHandle <IInDetConditionsSvc> m_pixelCondSummarySvc;
-
//bool m_doModules;
//bool m_doOffline;
bool m_isNewLumiBlock;
diff --git a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitoring.cxx b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitoring.cxx
index 5d689b7318371758d3b72e8d2212980dde20b348..568f69d3475a7884b383f860c17cec9c5248bcc8 100755
--- a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitoring.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitoring.cxx
@@ -72,8 +72,7 @@ JetTagMonitoring::JetTagMonitoring(const std::string & type, const std::string &
m_trackToVertexTool("Reco::TrackToVertex"),
m_trigDecTool("Trig::TrigDecisionTool/TrigDecisionTool"), // added by SARA
m_histogramsCreated(false),
- m_switch_off(false),
- m_pixelCondSummarySvc("PixelConditionsSummarySvc",name)
+ m_switch_off(false)
{
declareProperty("JetContainer", m_jetName = "AntiKt4EMTopoJets");
diff --git a/Trigger/TrigFTK/FastTrackSimWrap/FastTrackSimWrap/DumpSp.h b/Trigger/TrigFTK/FastTrackSimWrap/FastTrackSimWrap/DumpSp.h
index ee9060defd7ec19c7ccb07de8dd4993894bbda61..63c4612d6df91aa1a1ea62f9cda65a9d86cac1c3 100644
--- a/Trigger/TrigFTK/FastTrackSimWrap/FastTrackSimWrap/DumpSp.h
+++ b/Trigger/TrigFTK/FastTrackSimWrap/FastTrackSimWrap/DumpSp.h
@@ -41,7 +41,6 @@
#include "GeneratorObjects/HepMcParticleLink.h"
#include "TrkToolInterfaces/ITruthToTrack.h"
#include "TrigDecisionTool/TrigDecisionTool.h"
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
#include "StoreGate/ReadCondHandleKey.h"