From 6ae34fce335d6d0bc45b9a89878091ffb8ca28c2 Mon Sep 17 00:00:00 2001
From: Tigran Mkrtchyan <tmkrtchy@pcatl01.cern.ch>
Date: Tue, 15 Jan 2019 09:32:10 +0100
Subject: [PATCH] update
---
.../TileCalibAlgs/TileCisDefaultCalibTool.h | 4 ++--
.../TileCalibAlgs/TileDigiNoiseCalibAlg.h | 2 +-
.../TileCalibAlgs/TileCalibAlgs/TileExpertDump.h | 5 +++++
.../TileCalibAlgs/TileCalibAlgs/TileInfoDump.h | 5 +++++
.../TileCalibAlgs/TileLaserDefaultCalibTool.h | 4 ++--
.../TileCalibAlgs/TileLaserLinearityCalibTool.h | 4 ++--
.../TileCalibAlgs/TileLaserTimingTool.h | 7 +++++--
.../TileCalibAlgs/TileCalibAlgs/TileOFC2DBAlg.h | 6 ++++++
.../TileCalibAlgs/TileCalibAlgs/TileTOFTool.h | 2 +-
.../TileCalibAlgs/TileTriggerDefaultCalibTool.h | 4 ++--
.../TileCalibAlgs/src/TileCisDefaultCalibTool.cxx | 10 ++++------
.../TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx | 10 +++++-----
.../TileCalib/TileCalibAlgs/src/TileExpertDump.cxx | 8 ++++++--
.../TileCalib/TileCalibAlgs/src/TileInfoDump.cxx | 8 ++++++--
.../TileCalibAlgs/src/TileLaserDefaultCalibTool.cxx | 8 ++++----
.../src/TileLaserLinearityCalibTool.cxx | 8 ++++----
.../TileCalibAlgs/src/TileLaserTimingTool.cxx | 13 +++++++------
.../TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx | 8 ++++++--
.../TileCalib/TileCalibAlgs/src/TileTOFTool.cxx | 4 ++--
.../src/TileTriggerDefaultCalibTool.cxx | 8 ++++----
20 files changed, 79 insertions(+), 49 deletions(-)
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileCisDefaultCalibTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileCisDefaultCalibTool.h
index 8991ef4f47bb..e5f115e6cae4 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileCisDefaultCalibTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileCisDefaultCalibTool.h
@@ -91,9 +91,9 @@ class TileCisDefaultCalibTool: public AthAlgTool
ToolHandle<ITileStuckBitsProbsTool> m_stuckBitsProbs;
SG::ReadHandleKey<TileDQstatus> m_dqStatusKey;
- SG::ReadHandleKey<TileDigitsContainer> m_DigitsContainerKey{this,
+ SG::ReadHandleKey<TileDigitsContainer> m_digitsContainerKey{this,
"TileDigitsContainer", "TileDigitsContainer", "Input Tile digits container"};
- SG::ReadHandleKey<TileRawChannelContainer> m_RawChannelContainerKey{this,
+ SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this,
"TileRawChannelContainer", "TileRawChannelContainer", "Input Tile raw channel container"};
// jobOptions
std::string m_rawChannelContainerName;
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileDigiNoiseCalibAlg.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileDigiNoiseCalibAlg.h
index 23978ed5e096..370c92e432cc 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileDigiNoiseCalibAlg.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileDigiNoiseCalibAlg.h
@@ -84,7 +84,7 @@ class TileDigiNoiseCalibAlg: public AthAlgorithm {
bool m_doRobustCov;
SG::ReadHandleKey<TileDQstatus> m_dqStatusKey;
- SG::ReadHandleKey<TileDigitsContainer> m_DigitsContainerKey{this,
+ SG::ReadHandleKey<TileDigitsContainer> m_digitsContainerKey{this,
"TileDigitsContainer", "TileDigitsContainer", "Input Tile digits container"};
// Tools / storegate info
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileExpertDump.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileExpertDump.h
index 4c7ebd68cee0..e517aa3e91c5 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileExpertDump.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileExpertDump.h
@@ -20,6 +20,8 @@
// Athena includes
#include "AthenaBaseComps/AthAlgorithm.h"
+#include "xAODEventInfo/EventInfo.h"
+#include "StoreGate/ReadHandleKey.h"
#include "TileIdentifier/TileEmscaleCalibOptions.h"
@@ -63,6 +65,9 @@ class TileExpertDump: public AthAlgorithm {
bool m_printExpertEmscale;
bool m_printExpertEmscaleOnl;
+ SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this,
+ "EventInfo", "EventInfo", "EventInfo key"};
+
//=== non-property members
ToolHandle<TileExpertToolEmscale> m_tileExpertToolEmscale;
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileInfoDump.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileInfoDump.h
index 8d4c04c0b22b..e1f1ae5f978b 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileInfoDump.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileInfoDump.h
@@ -20,6 +20,8 @@
// Athena includes
#include "AthenaBaseComps/AthAlgorithm.h"
+#include "xAODEventInfo/EventInfo.h"
+#include "StoreGate/ReadHandleKey.h"
class ITileBadChanTool;
class TileCondToolEmscale;
@@ -91,6 +93,9 @@ class TileInfoDump: public AthAlgorithm {
void print1gNoise();
bool m_print1gNoise;
+ SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this,
+ "EventInfo", "EventInfo", "EventInfo key"};
+
//=== Non-property members
ToolHandle<ITileBadChanTool> m_tileBadChanTool;
ToolHandle<TileCondToolEmscale> m_tileToolEmscale;
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.h
index 3204d60f4d85..f5a26d59c521 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.h
@@ -78,9 +78,9 @@ class TileLaserDefaultCalibTool : public AthAlgTool, virtual public ITileCalibTo
ToolHandle<ITileStuckBitsProbsTool> m_stuckBitsProbs;
SG::ReadHandleKey<TileDQstatus> m_dqStatusKey;
- SG::ReadHandleKey<TileRawChannelContainer> m_RawChannelContainerKey{this,
+ SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this,
"TileRawChannelContainer", "TileRawChannelContainer", "Input Tile raw channel container"};
- SG::ReadHandleKey<TileLaserObject> m_LaserContainerKey{this,
+ SG::ReadHandleKey<TileLaserObject> m_laserContainerKey{this,
"TileLaserObject", "TileLaserObject", "Input Tile laser object"};
ToolHandle<ITileDCSTool> m_tileDCS{this, "TileDCSTool", "TileDCSTool", "Tile DCS tool"};
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserLinearityCalibTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserLinearityCalibTool.h
index 471c6d431919..44c826eb60ec 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserLinearityCalibTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserLinearityCalibTool.h
@@ -47,9 +47,9 @@ class TileLaserLinearityCalibTool : public AthAlgTool, virtual public ITileCalib
std::string m_laserContainerName;
SG::ReadHandleKey<TileDQstatus> m_dqStatusKey;
- SG::ReadHandleKey<TileRawChannelContainer> m_RawChannelContainerKey{this,
+ SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this,
"TileRawChannelContainer", "TileRawChannelContainer", "Input Tile raw channel container"};
- SG::ReadHandleKey<TileLaserObject> m_LaserContainerKey{this,
+ SG::ReadHandleKey<TileLaserObject> m_laserContainerKey{this,
"TileLaserObject", "TileLaserObject", "Input Tile laser object"};
const TileHWID* m_tileHWID;
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserTimingTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserTimingTool.h
index 5115b8132e9a..52deb269a8a9 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserTimingTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserTimingTool.h
@@ -36,6 +36,7 @@
// Athena includes
#include "AthenaBaseComps/AthAlgTool.h"
#include "Identifier/HWIdentifier.h"
+#include "xAODEventInfo/EventInfo.h"
#include "StoreGate/ReadHandleKey.h"
// Tile includes
@@ -234,9 +235,11 @@ class TileLaserTimingTool: public AthAlgTool, virtual public ITileCalibTool {
}
//StoreGate
- SG::ReadHandleKey<TileRawChannelContainer> m_RawChannelContainerKey{this,
+ SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this,
+ "EventInfo", "EventInfo", "EventInfo key"};
+ SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this,
"TileRawChannelContainer", "TileRawChannelContainer", "Input Tile raw channel container"};
- SG::ReadHandleKey<TileDigitsContainer> m_DigitsContainerKey{this,
+ SG::ReadHandleKey<TileDigitsContainer> m_digitsContainerKey{this,
"TileDigitsContainer", "TileDigitsContainer", "Input Tile digits container"};
// Tools info
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileOFC2DBAlg.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileOFC2DBAlg.h
index 903ac0bc76ca..3b42b7aefd15 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileOFC2DBAlg.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileOFC2DBAlg.h
@@ -21,6 +21,8 @@
// Athena includes
#include "AthenaBaseComps/AthAlgorithm.h"
+#include "xAODEventInfo/EventInfo.h"
+#include "StoreGate/ReadHandleKey.h"
// Tile includes
#include "TileConditions/ITileCondToolOfc.h"
@@ -46,6 +48,10 @@ class TileOFC2DBAlg: public AthAlgorithm {
StatusCode registerCondObjects();
StatusCode printCondObjects();
+ //=== storegate
+ SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this,
+ "EventInfo", "EventInfo", "EventInfo key"};
+
//=== properties
UnsignedIntegerProperty m_runIOVSince;
UnsignedIntegerProperty m_runIOVUntil;
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTOFTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTOFTool.h
index 3c77d4a0977b..2e4a18aa144c 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTOFTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTOFTool.h
@@ -38,7 +38,7 @@ class TileTOFTool : public AthAlgTool, virtual public ITileCalibTool
private:
- SG::ReadHandleKey<CaloCellContainer> m_CaloCellContainerKey{this,
+ SG::ReadHandleKey<CaloCellContainer> m_caloCellContainerKey{this,
"CaloCellContainer", "CaloCellContainer", "Calo cell container"};
float timeCor(int mod_ref1, int mod_ref2, int part_ref1, int part_ref2);
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTriggerDefaultCalibTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTriggerDefaultCalibTool.h
index ecedb377fbb3..c7d7b8740647 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTriggerDefaultCalibTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTriggerDefaultCalibTool.h
@@ -60,9 +60,9 @@ class TileTriggerDefaultCalibTool : public AthAlgTool, virtual public ITileCalib
const TileCablingService* m_tileCablingService;
ToolHandle<TileCondToolEmscale> m_tileToolEmscale; //!< main Tile Calibration tool
SG::ReadHandleKey<TileDQstatus> m_dqStatusKey;
- SG::ReadHandleKey<TileRawChannelContainer> m_RawChannelContainerKey{this,
+ SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this,
"TileRawChannelContainer", "TileRawChannelContainer", "Input Tile raw channel container"};
- SG::ReadHandleKey<xAOD::TriggerTowerContainer> m_TriggerTowerContainerKey{this,
+ SG::ReadHandleKey<xAOD::TriggerTowerContainer> m_triggerTowerContainerKey{this,
"TriggerTowerContainer", "TriggerTowerContainer", "Trigger Tower container"};
// Results Tile
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileCisDefaultCalibTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileCisDefaultCalibTool.cxx
index 6f89baa931a8..a136b6fb1612 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileCisDefaultCalibTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileCisDefaultCalibTool.cxx
@@ -49,7 +49,6 @@ TileCisDefaultCalibTool::TileCisDefaultCalibTool(const std::string& type, const
{
declareInterface<ITileCalibTool>(this);
- //declareProperty("rawChannelContainer", m_rawChannelContainerName = "TileRawChannelFit");
declareProperty("NtupleID", m_ntupleID = "h3000");
declareProperty("removePed", m_removePed = false);
@@ -65,7 +64,6 @@ TileCisDefaultCalibTool::TileCisDefaultCalibTool(const std::string& type, const
declareProperty("linfitMinLo", m_linfitMinLo = 300.0);
declareProperty("doSampleChecking", m_doSampleChecking = true); // do sample checking by default
- //declareProperty("DigitsContainer", m_DigitsContainerName = "TileDigitsCnt");
declareProperty("StuckBitsProbsTool", m_stuckBitsProbs);
declareProperty("TileDQstatus", m_dqStatusKey = "TileDQstatus");
}
@@ -100,8 +98,8 @@ StatusCode TileCisDefaultCalibTool::initialize() {
CHECK( m_dqStatusKey.initialize() );
- ATH_CHECK( m_RawChannelContainerKey.initialize() );
- ATH_CHECK( m_DigitsContainerKey.initialize() );
+ ATH_CHECK( m_rawChannelContainerKey.initialize() );
+ ATH_CHECK( m_digitsContainerKey.initialize() );
return StatusCode::SUCCESS;
}
@@ -142,7 +140,7 @@ StatusCode TileCisDefaultCalibTool::execute() {
: (double) dac * c_dac2ChargeSmall;
// Get TileRawChannelContainer
- SG::ReadHandle<TileRawChannelContainer> container(m_RawChannelContainerKey);
+ SG::ReadHandle<TileRawChannelContainer> container(m_rawChannelContainerKey);
ATH_CHECK( container.isValid() );
// Create iterator over RawChannelContainer
@@ -230,7 +228,7 @@ StatusCode TileCisDefaultCalibTool::execute() {
if (m_doSampleChecking) {
// Get TileDigitsContainer
- SG::ReadHandle<TileDigitsContainer> digContainer(m_DigitsContainerKey);
+ SG::ReadHandle<TileDigitsContainer> digContainer(m_digitsContainerKey);
ATH_CHECK( digContainer.isValid() );
// Create iterator over RawDigitsContainer
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx
index 131b7e6d91a6..9d7f8cf0bea8 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx
@@ -121,7 +121,7 @@ StatusCode TileDigiNoiseCalibAlg::FirstEvt_initialize() {
m_cabling = TileCablingService::getInstance();
// TileDigitsContainer initialization
- ATH_CHECK( m_DigitsContainerKey.initialize() );
+ ATH_CHECK( m_digitsContainerKey.initialize() );
// retrieve TileID helper from det store
CHECK( detStore()->retrieve(m_tileID) );
@@ -349,11 +349,11 @@ void TileDigiNoiseCalibAlg::StoreRunInfo (const TileDQstatus* dqStatus) {
StatusCode TileDigiNoiseCalibAlg::fillDigits (const TileDQstatus* theDQstatus) {
/*---------------------------------------------------------*/
- SG::ReadHandle<TileDigitsContainer> DigitsCnt(m_DigitsContainerKey);
- ATH_CHECK( DigitsCnt.isValid() );
+ SG::ReadHandle<TileDigitsContainer> digitsCnt(m_digitsContainerKey);
+ ATH_CHECK( digitsCnt.isValid() );
- TileDigitsContainer::const_iterator collItr = DigitsCnt->begin();
- TileDigitsContainer::const_iterator lastColl = DigitsCnt->end();
+ TileDigitsContainer::const_iterator collItr = digitsCnt->begin();
+ TileDigitsContainer::const_iterator lastColl = digitsCnt->end();
for (; collItr != lastColl; ++collItr) {
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileExpertDump.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileExpertDump.cxx
index 3b8ed61024a7..2fc3aa94bcdd 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileExpertDump.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileExpertDump.cxx
@@ -5,6 +5,7 @@
// Athena includes
#include "AthenaKernel/errorcheck.h"
#include "xAODEventInfo/EventInfo.h"
+#include "StoreGate/ReadHandle.h"
// Tile includes
#include "TileCalibAlgs/TileExpertDump.h"
@@ -59,6 +60,9 @@ StatusCode TileExpertDump::initialize() {
ATH_MSG_DEBUG( "in initialize()" );
+ //=== EventInfo key
+ ATH_CHECK( m_eventInfoKey.initialize() );
+
//=== Get TileHWID
CHECK( detStore()->retrieve(m_tileHWID, "TileHWID") );
@@ -102,8 +106,8 @@ StatusCode TileExpertDump::execute() {
ATH_MSG_DEBUG( " in execute()" );
- const xAOD::EventInfo* eventInfo(0);
- CHECK( evtStore()->retrieve(eventInfo) );
+ SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
+ ATH_CHECK( eventInfo.isValid() );
ATH_MSG_DEBUG( "Event: ["
<< eventInfo->runNumber() << ", "
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileInfoDump.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileInfoDump.cxx
index 5b0d0f69b1c5..75261961424d 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileInfoDump.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileInfoDump.cxx
@@ -9,6 +9,7 @@
#include "xAODEventInfo/EventInfo.h"
#include "Identifier/IdentifierHash.h"
#include "AthenaKernel/errorcheck.h"
+#include "StoreGate/ReadHandle.h"
// Calo includes
#include "CaloIdentifier/TileID.h"
@@ -102,6 +103,9 @@ StatusCode TileInfoDump::initialize() {
ATH_MSG_DEBUG( "in initialize()" );
+ //=== EventInfo key
+ ATH_CHECK( m_eventInfoKey.initialize() );
+
//=== Get TileHWID
CHECK( detStore()->retrieve(m_tileHWID, "TileHWID") );
@@ -168,8 +172,8 @@ StatusCode TileInfoDump::execute() {
ATH_MSG_DEBUG( " in execute()" );
- const xAOD::EventInfo* eventInfo(0);
- CHECK( evtStore()->retrieve(eventInfo) );
+ SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
+ ATH_CHECK( eventInfo.isValid() );
ATH_MSG_DEBUG( "Event: ["
<< eventInfo->runNumber() << ", "
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserDefaultCalibTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserDefaultCalibTool.cxx
index e07bf98b6111..c56ad6c048b8 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserDefaultCalibTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserDefaultCalibTool.cxx
@@ -268,8 +268,8 @@ StatusCode TileLaserDefaultCalibTool::initialize(){
ATH_CHECK( m_tileToolEmscale.retrieve() );
ATH_CHECK( m_tileBadChanTool.retrieve() );
- ATH_CHECK( m_RawChannelContainerKey.initialize() );
- ATH_CHECK( m_LaserContainerKey.initialize() );
+ ATH_CHECK( m_rawChannelContainerKey.initialize() );
+ ATH_CHECK( m_laserContainerKey.initialize() );
ATH_CHECK( m_tileDCS.retrieve() );
@@ -296,8 +296,8 @@ StatusCode TileLaserDefaultCalibTool::execute(){
// Store laser object and rawchannel information into maps
ATH_MSG_DEBUG ( "execute() TileLaserDefaultCalibTool" );
- SG::ReadHandle<TileRawChannelContainer> rawCnt(m_RawChannelContainerKey);
- SG::ReadHandle<TileLaserObject> laserObj(m_LaserContainerKey);
+ SG::ReadHandle<TileRawChannelContainer> rawCnt(m_rawChannelContainerKey);
+ SG::ReadHandle<TileLaserObject> laserObj(m_laserContainerKey);
ATH_CHECK( rawCnt.isValid() );
ATH_CHECK( laserObj.isValid() );
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserLinearityCalibTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserLinearityCalibTool.cxx
index 34c6154aa9e7..23f8bb7d9c53 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserLinearityCalibTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserLinearityCalibTool.cxx
@@ -189,8 +189,8 @@ StatusCode TileLaserLinearityCalibTool::initialize()
ATH_CHECK( detStore()->retrieve(m_tileHWID) );
ATH_CHECK( m_tileToolEmscale.retrieve() );
- ATH_CHECK( m_RawChannelContainerKey.initialize() );
- ATH_CHECK( m_LaserContainerKey.initialize() );
+ ATH_CHECK( m_rawChannelContainerKey.initialize() );
+ ATH_CHECK( m_laserContainerKey.initialize() );
m_cabling = TileCablingService::getInstance();
@@ -237,8 +237,8 @@ StatusCode TileLaserLinearityCalibTool::execute()
ATH_MSG_DEBUG ( "Retrieving the LASER object and RawChannel" );
- SG::ReadHandle<TileRawChannelContainer> rawCnt(m_RawChannelContainerKey);
- SG::ReadHandle<TileLaserObject> laserObj(m_LaserContainerKey);
+ SG::ReadHandle<TileRawChannelContainer> rawCnt(m_rawChannelContainerKey);
+ SG::ReadHandle<TileLaserObject> laserObj(m_laserContainerKey);
ATH_CHECK( rawCnt.isValid() );
ATH_CHECK( laserObj.isValid() );
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserTimingTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserTimingTool.cxx
index 51fd23925062..6f02a6afcbf8 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserTimingTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserTimingTool.cxx
@@ -238,8 +238,9 @@ StatusCode TileLaserTimingTool::initialize() {
}
}
- ATH_CHECK( m_RawChannelContainerKey.initialize() );
- ATH_CHECK( m_DigitsContainerKey.initialize() );
+ ATH_CHECK( m_eventInfoKey.initialize() );
+ ATH_CHECK( m_rawChannelContainerKey.initialize() );
+ ATH_CHECK( m_digitsContainerKey.initialize() );
// gauss fit function
m_gaussf = new TF1("GainGauss", "[0]*exp(- (x-[1])*(x-[1])/(2*[2]*[2]))", -60, 60);
@@ -286,9 +287,9 @@ StatusCode TileLaserTimingTool::execute() {
// QQQ: const uint32_t cap = cispar[7];
// Get EventInfo
- const xAOD::EventInfo* eventInfo(0);
+ SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
+ ATH_CHECK( eventInfo.isValid() );
- CHECK(evtStore()->retrieve(eventInfo) );
// QQQ: const unsigned runNumber = eventInfo->runNumber();
// QQQ: const unsigned eventNumber = eventInfo->eventNumber();
@@ -297,11 +298,11 @@ StatusCode TileLaserTimingTool::execute() {
bool pass = true;
// Get TileRawChannelContainer
- SG::ReadHandle<TileRawChannelContainer> container(m_RawChannelContainerKey);
+ SG::ReadHandle<TileRawChannelContainer> container(m_rawChannelContainerKey);
ATH_CHECK( container.isValid() );
// Get TileDigitsContainer
- SG::ReadHandle<TileDigitsContainer> digitsCnt(m_DigitsContainerKey);
+ SG::ReadHandle<TileDigitsContainer> digitsCnt(m_digitsContainerKey);
ATH_CHECK( digitsCnt.isValid() );
// Create iterator over RawChannelContainer
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx
index 18beaec22dff..5b75f30427d7 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx
@@ -55,6 +55,9 @@ StatusCode TileOFC2DBAlg::initialize() {
ATH_MSG_INFO( "Initializing for " << m_runType );
+ //=== EventInfo key
+ ATH_CHECK( m_eventInfoKey.initialize() );
+
//=== get TileToolTiming
CHECK( m_tileToolTiming.retrieve() );
@@ -86,8 +89,9 @@ StatusCode TileOFC2DBAlg::initialize() {
StatusCode TileOFC2DBAlg::execute() {
//=== print run/evt/lbn/time info for each event
- const xAOD::EventInfo* eventInfo(0);
- CHECK( evtStore()->retrieve(eventInfo) );
+ SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
+ ATH_CHECK( eventInfo.isValid() );
+
ATH_MSG_DEBUG( "Event: ["
<< eventInfo->runNumber() << ","
<< eventInfo->eventNumber() << ":"
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTOFTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTOFTool.cxx
index 8e7b427691ce..7ee8a4568328 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTOFTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTOFTool.cxx
@@ -46,7 +46,7 @@ StatusCode TileTOFTool::initialize()
{
ATH_MSG_INFO ( "initialize()" );
- ATH_CHECK( m_CaloCellContainerKey.initialize() );
+ ATH_CHECK( m_caloCellContainerKey.initialize() );
return StatusCode::SUCCESS;
}
@@ -61,7 +61,7 @@ StatusCode TileTOFTool::execute()
{
ATH_MSG_INFO ( "execute()" );
- SG::ReadHandle<CaloCellContainer> cellCONT(m_CaloCellContainerKey);
+ SG::ReadHandle<CaloCellContainer> cellCONT(m_caloCellContainerKey);
ATH_CHECK( cellCONT.isValid() );
ATH_MSG_DEBUG ( "Cell container found" );
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTriggerDefaultCalibTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTriggerDefaultCalibTool.cxx
index 663f1873058d..9ee14b0bd7ec 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTriggerDefaultCalibTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTriggerDefaultCalibTool.cxx
@@ -110,8 +110,8 @@ StatusCode TileTriggerDefaultCalibTool::initialize()
m_ipmtOld = 0;
m_ipmtCount = 0;
- ATH_CHECK( m_RawChannelContainerKey.initialize() );
- ATH_CHECK( m_TriggerTowerContainerKey.initialize() );
+ ATH_CHECK( m_rawChannelContainerKey.initialize() );
+ ATH_CHECK( m_triggerTowerContainerKey.initialize() );
ATH_CHECK( m_l1CaloTTIdTools.retrieve() );
ATH_MSG_DEBUG("L1CaloTTIdTools retrieved");
@@ -144,7 +144,7 @@ StatusCode TileTriggerDefaultCalibTool::execute()
const TileDQstatus* dqStatus = SG::makeHandle (m_dqStatusKey, ctx).get();
// Get TileRawChannelContainer
- SG::ReadHandle<TileRawChannelContainer> container(m_RawChannelContainerKey);
+ SG::ReadHandle<TileRawChannelContainer> container(m_rawChannelContainerKey);
ATH_CHECK( container.isValid() );
ATH_MSG_DEBUG ( "second executeTrigger()" );
@@ -279,7 +279,7 @@ StatusCode TileTriggerDefaultCalibTool::execute()
} // end of loop over raw channels for Tile
// loop over all L1Calo trigger channels, calculate the average and RMS
- SG::ReadHandle<xAOD::TriggerTowerContainer> triggerTowers(m_TriggerTowerContainerKey);
+ SG::ReadHandle<xAOD::TriggerTowerContainer> triggerTowers(m_triggerTowerContainerKey);
ATH_CHECK( triggerTowers.isValid() );
int ntt = 0;
--
GitLab