From 1a6abc4db2d048f26c6cea649c06cc57e3faa10a Mon Sep 17 00:00:00 2001
From: Susumu Oda <susumu.oda@cern.ch>
Date: Thu, 18 Apr 2019 17:13:08 +0000
Subject: [PATCH] Move initialization to header files (SCT_CalibAlgs package)
---
.../SCT_CalibAlgs/ISCT_CalibHistoTool.h | 10 +--
.../SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h | 12 +--
.../SCT_CalibAlgs/SCTCalibWriteTool.h | 83 +++++++++----------
.../SCT_CalibAlgs/src/ISCT_CalibHistoTool.cxx | 8 +-
.../SCT_CalibAlgs/src/SCTCalib.cxx | 8 +-
.../SCT_CalibAlgs/src/SCTCalibWriteTool.cxx | 47 +----------
.../src/SCT_CalibBsErrorTool.cxx | 10 +--
.../SCT_CalibAlgs/src/SCT_CalibBsErrorTool.h | 18 ++--
.../SCT_CalibAlgs/src/SCT_CalibEventInfo.cxx | 20 +----
.../SCT_CalibAlgs/src/SCT_CalibEventInfo.h | 29 +++----
.../SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx | 7 +-
.../SCT_CalibAlgs/src/SCT_CalibHitmapTool.h | 10 +--
.../SCT_CalibAlgs/src/SCT_CalibHvTool.cxx | 18 +---
.../SCT_CalibAlgs/src/SCT_CalibHvTool.h | 24 +++---
.../SCT_CalibAlgs/src/SCT_CalibLbTool.cxx | 12 +--
.../SCT_CalibAlgs/src/SCT_CalibLbTool.h | 18 ++--
.../src/SCT_CalibModuleListTool.cxx | 4 +-
.../src/SCT_CalibModuleListTool.h | 4 +-
18 files changed, 117 insertions(+), 225 deletions(-)
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibHistoTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibHistoTool.h
index bd16f81542b..aea66287cc8 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibHistoTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibHistoTool.h
@@ -60,11 +60,11 @@ class ISCT_CalibHistoTool: virtual public IAlgTool {
protected:
std::vector<TH1F*> m_phistoVector;
std::vector<TH2F*> m_phistoVector2D;
- TH1I* m_numberOfEventsHisto;
- ITHistSvc* m_thistSvc;
- const SCT_ID* m_pSCTHelper;
- int m_nLb;
- int m_nLbMerge;
+ TH1I* m_numberOfEventsHisto{nullptr};
+ ITHistSvc* m_thistSvc{nullptr};
+ const SCT_ID* m_pSCTHelper{nullptr};
+ int m_nLb{0};
+ int m_nLbMerge{0};
//
bool init();
template<class T>
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h
index 9d1c27895d5..48c46de14e3 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h
@@ -94,7 +94,7 @@ class SCTCalib : public AthAlgorithm {
n_BSErrorType = 15, firstBSErrorType = 0, lastBSErrorType = 14
};
- const SCT_ID* m_pSCTHelper;
+ const SCT_ID* m_pSCTHelper{nullptr};
SG::ReadCondHandleKey<InDetDD::SiDetectorElementCollection> m_SCTDetEleCollKey{this, "SCTDetEleCollKey", "SCT_DetectorElementCollection", "Key of SiDetectorElementCollection for SCT"};
SG::ReadHandleKey<EventInfo> m_eventInfoKey{this, "EventInfoKey", "ByteStreamEventInfo"};
@@ -230,17 +230,17 @@ class SCTCalib : public AthAlgorithm {
StringProperty m_LorentzAngleSummaryFile{this, "LorentzAngleSummaryFile", "LorentzAngleSummaryFile.xml", "Output XML for summary of lorentz angle"};
// Event related
- int m_numOfLBsProcessed;
- unsigned long long m_numberOfEvents;
- unsigned long long m_numberOfEventsHist; // For number of events from HIST
+ int m_numOfLBsProcessed{0};
+ unsigned long long m_numberOfEvents{0};
+ unsigned long long m_numberOfEventsHist{0}; // For number of events from HIST
std::string m_utcBegin;
std::string m_utcEnd;
- int m_LBRange;
+ int m_LBRange{-999};
IOVTime m_iovStart;
IOVTime m_iovStop;
// Input
- TFile* m_inputHist; // Monitoring histograms
+ TFile* m_inputHist{nullptr}; // Monitoring histograms
bool m_readHIST; // True if HIST is used
// Histograms
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalibWriteTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalibWriteTool.h
index 49061504086..d4fb6b6ef84 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalibWriteTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalibWriteTool.h
@@ -17,11 +17,11 @@
// Athena includes
#include "AthenaBaseComps/AthAlgTool.h"
+#include "AthenaKernel/IOVTime.h"
#include "EventInfo/EventInfo.h"
#include "Identifier/Identifier.h"
#include "InDetConditionsSummaryService/InDetHierarchy.h"
#include "StoreGate/ReadHandleKey.h"
-#include "StoreGate/StoreGate.h"
#include "CoralBase/AttributeListSpecification.h"
@@ -45,7 +45,6 @@ class SCT_ID;
class IIOVRegistrationSvc;
class IAthenaOutputStreamTool;
class CondAttrListCollection;
-class StoreGateSvc;
/**
** Algorithm to test writing conditions data and reading them back.
@@ -137,7 +136,7 @@ public:
StatusCode wrapUpLorentzAngle();
private:
- SG::ReadHandleKey<EventInfo> m_eventInfoKey;
+ SG::ReadHandleKey<EventInfo> m_eventInfoKey{this, "EventInfo", "ByteStreamEventInfo"};
int stringToInt(const std::string& s) const;
@@ -168,46 +167,46 @@ private:
static const std::string s_LAFolderName;
// cache for the Collections, access by foldername
- mutable std::mutex m_mutex;
+ mutable std::mutex m_mutex{};
mutable std::map<const std::string, const CondAttrListCollection*> m_attrListCollectionMap ATLAS_THREAD_SAFE; // Guarded by m_mutex
- CondAttrListCollection* m_attrListColl;
- CondAttrListCollection* m_attrListColl_deadStrip;
- CondAttrListCollection* m_attrListColl_deadChip;
- CondAttrListCollection* m_attrListColl_eff;
- CondAttrListCollection* m_attrListColl_no;
- CondAttrListCollection* m_attrListColl_RawOccu;
- CondAttrListCollection* m_attrListColl_BSErr;
- CondAttrListCollection* m_attrListColl_LA;
- BooleanProperty m_writeCondObjs;
- BooleanProperty m_regIOV;
- BooleanProperty m_readWriteCool;
- BooleanProperty m_twoStepWriteReg;
- BooleanProperty m_manualiov;
- IntegerProperty m_version;
- IntegerProperty m_beginRun;
- IntegerProperty m_endRun;
- StringProperty m_streamName;
- std::string m_tagID4NoisyStrips;
- std::string m_tagID4DeadStrips;
- std::string m_tagID4DeadChips;
- std::string m_tagID4Efficiency;
- std::string m_tagID4NoiseOccupancy;
- std::string m_tagID4RawOccupancy;
- std::string m_tagID4BSErrors;
- std::string m_tagID4LorentzAngle;
-
- IIOVRegistrationSvc* m_regSvc;
- IAthenaOutputStreamTool* m_streamer;
-
- bool m_defectRecorded;
- bool m_deadStripRecorded;
- bool m_deadChipRecorded;
- bool m_effRecorded;
- bool m_noRecorded;
- bool m_RawOccuRecorded;
- bool m_BSErrRecorded;
- bool m_LARecorded;
- const SCT_ID* m_pHelper;
+ CondAttrListCollection* m_attrListColl{nullptr};
+ CondAttrListCollection* m_attrListColl_deadStrip{nullptr};
+ CondAttrListCollection* m_attrListColl_deadChip{nullptr};
+ CondAttrListCollection* m_attrListColl_eff{nullptr};
+ CondAttrListCollection* m_attrListColl_no{nullptr};
+ CondAttrListCollection* m_attrListColl_RawOccu{nullptr};
+ CondAttrListCollection* m_attrListColl_BSErr{nullptr};
+ CondAttrListCollection* m_attrListColl_LA{nullptr};
+ BooleanProperty m_writeCondObjs{this, "WriteCondObjs", true};
+ BooleanProperty m_regIOV{this, "RegisterIOV", true};
+ BooleanProperty m_readWriteCool{this, "ReadWriteCool", true};
+ BooleanProperty m_twoStepWriteReg{this, "TwoStepWriteReg", false};
+ BooleanProperty m_manualiov{this, "ManualIOV", true};
+ IntegerProperty m_version{this, "Version", 0};
+ IntegerProperty m_beginRun{this, "BeginRun", IOVTime::MINRUN};
+ IntegerProperty m_endRun{this, "EndRun", IOVTime::MAXRUN};
+ StringProperty m_streamName{this, "StreamName", "CondStreamTest"};
+ StringProperty m_tagID4NoisyStrips{this, "TagID4NoisyStrips", ""};
+ StringProperty m_tagID4DeadStrips{this, "TagID4DeadStrips", ""};
+ StringProperty m_tagID4DeadChips{this, "TagID4DeadChips", ""};
+ StringProperty m_tagID4Efficiency{this, "TagID4Efficiency", ""};
+ StringProperty m_tagID4NoiseOccupancy{this, "TagID4NoiseOccupancy", ""};
+ StringProperty m_tagID4RawOccupancy{this, "TagID4RawOccupancy", ""};
+ StringProperty m_tagID4BSErrors{this, "TagID4BSErrors", ""};
+ StringProperty m_tagID4LorentzAngle{this, "TagID4LorentzAngle", ""};
+
+ IIOVRegistrationSvc* m_regSvc{nullptr};
+ IAthenaOutputStreamTool* m_streamer{nullptr};
+
+ bool m_defectRecorded{false};
+ bool m_deadStripRecorded{false};
+ bool m_deadChipRecorded{false};
+ bool m_effRecorded{false};
+ bool m_noRecorded{false};
+ bool m_RawOccuRecorded{false};
+ bool m_BSErrRecorded{false};
+ bool m_LARecorded{false};
+ const SCT_ID* m_pHelper{nullptr};
};
inline const InterfaceID& SCTCalibWriteTool::interfaceID() {
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/ISCT_CalibHistoTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/ISCT_CalibHistoTool.cxx
index 9670b6aabe9..f2bdd5a4f18 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/ISCT_CalibHistoTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/ISCT_CalibHistoTool.cxx
@@ -15,13 +15,7 @@
#include "TMath.h"
#include <stdexcept> // out_of_range exception
-ISCT_CalibHistoTool::ISCT_CalibHistoTool():
- m_numberOfEventsHisto{0},
- m_thistSvc{nullptr},
- m_pSCTHelper{nullptr},
- m_nLb{0},
- m_nLbMerge{0} {
- //nop
+ISCT_CalibHistoTool::ISCT_CalibHistoTool() {
}
int
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx
index 5806d391fe7..7ffa3bdbac6 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx
@@ -134,13 +134,7 @@ namespace {
//////////////////////////////////////////////////////////////////////////////////////
SCTCalib::SCTCalib(const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm(name, pSvcLocator),
- m_pSCTHelper{nullptr},
- m_numOfLBsProcessed{0},
- m_numberOfEvents{0},
- m_numberOfEventsHist{0},
- m_LBRange{-999},
- m_inputHist{nullptr}
+ AthAlgorithm(name, pSvcLocator)
{
m_readHIST = m_doNoiseOccupancy or m_doRawOccupancy or m_doEfficiency or m_doBSErrorDB or m_doLorentzAngle;
}
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteTool.cxx
index 9bc1e38ff96..cc92f071806 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteTool.cxx
@@ -56,50 +56,9 @@ const bool becCapsFormat{true};
const bool becUnderscoreFormat{false};
SCTCalibWriteTool::SCTCalibWriteTool(const std::string& type, const std::string& name, const IInterface* parent) :
- AthAlgTool(type, name, parent),
- m_eventInfoKey{"ByteStreamEventInfo"},
- m_mutex{},
- m_attrListColl{nullptr},
- m_attrListColl_deadStrip{nullptr},
- m_attrListColl_deadChip{nullptr},
- m_attrListColl_eff{nullptr},
- m_attrListColl_no{nullptr},
- m_attrListColl_RawOccu{nullptr},
- m_attrListColl_BSErr{nullptr},
- m_attrListColl_LA{nullptr},
- m_version{0},
- m_regSvc{nullptr},
- m_streamer{nullptr},
- m_defectRecorded{false},
- m_deadStripRecorded{false},
- m_deadChipRecorded{false},
- m_effRecorded{false},
- m_noRecorded{false},
- m_RawOccuRecorded{false},
- m_BSErrRecorded{false},
- m_LARecorded{false},
- m_pHelper{nullptr}
- {
- declareProperty("WriteCondObjs", m_writeCondObjs=true);
- declareProperty("RegisterIOV", m_regIOV=true);
- declareProperty("ReadWriteCool", m_readWriteCool=true);
- declareProperty("TwoStepWriteReg", m_twoStepWriteReg=false);
- declareProperty("ManualIOV", m_manualiov=true);
-
- declareProperty("BeginRun", m_beginRun=IOVTime::MINRUN);
- declareProperty("EndRun", m_endRun=IOVTime::MAXRUN);
- //string properties:
- declareProperty("StreamName", m_streamName="CondStreamTest");
- declareProperty("TagID4NoisyStrips", m_tagID4NoisyStrips);
- declareProperty("TagID4DeadStrips", m_tagID4DeadStrips);
- declareProperty("TagID4DeadChips", m_tagID4DeadChips);
- declareProperty("TagID4Efficiency", m_tagID4Efficiency);
- declareProperty("TagID4NoiseOccupancy", m_tagID4NoiseOccupancy);
- declareProperty("TagID4RawOccupancy", m_tagID4RawOccupancy);
- declareProperty("TagID4BSErrors", m_tagID4BSErrors);
- declareProperty("TagID4LorentzAngle", m_tagID4LorentzAngle);
-
- }
+ AthAlgTool(type, name, parent)
+{
+}
///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.cxx
index f8bf2271855..210852babeb 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.cxx
@@ -36,15 +36,7 @@ static const int firstBSErrorType{0};
static const int lastBSErrorType{14};
SCT_CalibBsErrorTool::SCT_CalibBsErrorTool(const std::string& type, const std::string& name, const IInterface* parent) :
- base_class(type, name, parent),
- m_pSCTHelper{nullptr},
- m_scterr_bec{0},
- m_scterr_layer{0},
- m_scterr_eta{0},
- m_scterr_phi{0},
- m_scterr_side{0},
- m_scterr_type{0},
- m_maxHash{0}
+ base_class(type, name, parent)
{
}
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.h
index 183b25c52f0..834b0d47334 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.h
@@ -49,21 +49,21 @@ class SCT_CalibBsErrorTool : public extends<AthAlgTool, ISCT_CalibHistoTool>
private:
ToolHandle<ISCT_ByteStreamErrorsTool> m_bytestreamErrorsTool{this, "SCT_ByteStreamErrorsTool", "SCT_ByteStreamErrorsTool", "Tool to retrieve SCT ByteStream Errors"};
- const SCT_ID* m_pSCTHelper;
+ const SCT_ID* m_pSCTHelper{nullptr};
// SCT specific numbers
SCT_ID::const_id_iterator m_waferItrBegin;
SCT_ID::const_id_iterator m_waferItrEnd;
typedef std::vector<int> VecInt;
- VecInt* m_scterr_bec;
- VecInt* m_scterr_layer;
- VecInt* m_scterr_eta;
- VecInt* m_scterr_phi;
- VecInt* m_scterr_side;
- VecInt* m_scterr_type;
- int m_maxHash;
+ VecInt* m_scterr_bec{nullptr};
+ VecInt* m_scterr_layer{nullptr};
+ VecInt* m_scterr_eta{nullptr};
+ VecInt* m_scterr_phi{nullptr};
+ VecInt* m_scterr_side{nullptr};
+ VecInt* m_scterr_type{nullptr};
+ int m_maxHash{0};
- void fillBsErrorsForWafer(const Identifier & waferId, const int type);
+ void fillBsErrorsForWafer(const Identifier& waferId, const int type);
};
#endif
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.cxx
index 6a7bf37050e..59e81637453 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.cxx
@@ -16,30 +16,12 @@
#include "CoralBase/TimeStamp.h"
-#include <limits>
-
namespace {
- const int INTMIN{std::numeric_limits<int>::min()};
- const int INTMAX{std::numeric_limits<int>::max()};
const long long oneBillion{1000000000LL};
}
SCT_CalibEventInfo::SCT_CalibEventInfo(const std::string& type, const std::string& name, const IInterface* parent):
- base_class(type, name, parent),
- m_timeStampBegin{INTMAX},
- m_tsBeginString{""},
- m_tsEndString{""},
- m_timeStampEnd{INTMIN},
- m_duration{0},
- m_LBBegin{INTMAX},
- m_LBEnd{INTMIN},
- m_numLB{0},
- m_source{"UNKNOWN"},
- m_runNumber{0},
- m_lumiBlock{0},
- m_timeStamp{0},
- m_bunchCrossing{0},
- m_counter{0}
+ base_class(type, name, parent)
{
}
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.h
index 15c6e755dd9..a37a2feb8c8 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.h
@@ -17,6 +17,7 @@
#include "GaudiKernel/ToolHandle.h"
+#include <limits>
#include <string>
class StatusCode;
@@ -63,22 +64,22 @@ class SCT_CalibEventInfo: public extends<AthAlgTool, ISCT_CalibEvtInfo>
private:
- int m_timeStampBegin;
- std::string m_tsBeginString;
- std::string m_tsEndString;
- int m_timeStampEnd;
- int m_duration;
- int m_LBBegin;
- int m_LBEnd;
- int m_numLB;
- std::string m_source;
+ std::string m_tsBeginString{""};
+ std::string m_tsEndString{""};
+ int m_timeStampBegin{std::numeric_limits<int>::max()};
+ int m_timeStampEnd{std::numeric_limits<int>::min()};
+ int m_duration{0};
+ int m_LBBegin{std::numeric_limits<int>::max()};
+ int m_LBEnd{std::numeric_limits<int>::min()};
+ int m_numLB{0};
+ std::string m_source{"UNKNOWN"};
//
- int m_runNumber;
- int m_lumiBlock;
- int m_timeStamp;
- int m_bunchCrossing;
- int m_counter;
+ int m_runNumber{0};
+ int m_lumiBlock{0};
+ int m_timeStamp{0};
+ int m_bunchCrossing{0};
+ int m_counter{0};
std::string toUtc(const int timestamp) const;
};
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx
index 2289686944e..b8d38f97b72 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx
@@ -35,12 +35,7 @@ static const string detectorNames[]{"negativeEndcap", "barrel", "positiveEndcap"
static const string detectorPaths[]{"SCTEC/", "SCTB/","SCTEA/"};
SCT_CalibHitmapTool::SCT_CalibHitmapTool(const std::string& type, const std::string& name, const IInterface* parent):
- base_class(type, name, parent),
- m_pSCTHelper{nullptr},
- m_sct_waferHash{0},
- m_sct_firstStrip{0},
- m_sct_rdoGroupSize{0},
- m_rdoContainerKey{"SCT_RDOs"}
+ base_class(type, name, parent)
{
}
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.h
index 46117f6d4c8..5611524bf3d 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.h
@@ -53,15 +53,15 @@ class SCT_CalibHitmapTool : public extends<AthAlgTool, ISCT_CalibHistoTool>
//@}
private:
- const SCT_ID* m_pSCTHelper;
+ const SCT_ID* m_pSCTHelper{nullptr};
SCT_ID::const_id_iterator m_waferItrBegin;
SCT_ID::const_id_iterator m_waferItrEnd;
typedef std::vector<int> VecInt;
- VecInt* m_sct_waferHash;
- VecInt* m_sct_firstStrip;
- VecInt* m_sct_rdoGroupSize;
+ VecInt* m_sct_waferHash{nullptr};
+ VecInt* m_sct_firstStrip{nullptr};
+ VecInt* m_sct_rdoGroupSize{nullptr};
- SG::ReadHandleKey<SCT_RDO_Container> m_rdoContainerKey;
+ SG::ReadHandleKey<SCT_RDO_Container> m_rdoContainerKey{this, "RDOContainer", "SCT_RDOs"};
};
#endif
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.cxx
index 6865c698e46..63057ba9aa3 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.cxx
@@ -29,21 +29,9 @@ namespace {
}
SCT_CalibHvTool::SCT_CalibHvTool(const std::string& type, const std::string& name, const IInterface* parent) :
- base_class(type, name, parent),
- m_pSCTHelper{nullptr},
- m_sct_waferHash{0},
- m_sct_numHitsInWafer{0},
- m_maxq{100},
- m_phvtripPrevTime{0},
- m_phvtripFirstTime{0},
- m_absolutetriplimit{0},
- m_relativetriplimit{0},
- m_tq{0},
- m_evt{0},
- m_outputLowHits{false},
- m_lowHitCut{100}
- {
- }
+ base_class(type, name, parent)
+{
+}
StatusCode
SCT_CalibHvTool::initialize() {
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.h
index 60cd5ff9b15..fc38caa5734 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.h
@@ -63,15 +63,15 @@ class SCT_CalibHvTool : public extends<AthAlgTool, ISCT_CalibHistoTool>
ToolHandle<ISCT_DCSConditionsTool> m_DCSConditionsTool{this, "SCT_DCSConditionsTool", "SCT_DCSConditionsTool", "Tool to retrieve SCT DCS information"};
- const SCT_ID* m_pSCTHelper;
+ const SCT_ID* m_pSCTHelper{nullptr};
SCT_ID::const_id_iterator m_waferItrBegin;
SCT_ID::const_id_iterator m_waferItrEnd;
typedef std::vector<int> VecInt;
- VecInt* m_sct_waferHash;
- VecInt* m_sct_numHitsInWafer;
+ VecInt* m_sct_waferHash{nullptr};
+ VecInt* m_sct_numHitsInWafer{nullptr};
//private use in this class
- int m_maxq;
+ int m_maxq{100};
// For HV trips
std::vector<std::queue<int>> m_phvtripQueue;
std::queue<int> m_prevLBN;
@@ -80,17 +80,17 @@ class SCT_CalibHvTool : public extends<AthAlgTool, ISCT_CalibHistoTool>
VecInt m_phvtripHasItTripped;
VecInt m_phvtripHasItTripped_prev;
//
- int m_phvtripPrevTime;
- int m_phvtripFirstTime;
- double m_absolutetriplimit;
- double m_relativetriplimit;
- int m_tq[100];
+ int m_phvtripPrevTime{0};
+ int m_phvtripFirstTime{0};
+ double m_absolutetriplimit{0};
+ double m_relativetriplimit{0};
+ int m_tq[100]{0};
std::vector<std::vector<std::pair<int, int>>> m_summarytrips;
std::vector<std::vector<std::pair<int, int>>> m_summarytripslb;
- const EventInfo* m_evt;
- bool m_outputLowHits;
- int m_lowHitCut;
+ const EventInfo* m_evt{nullptr};
+ bool m_outputLowHits{false};
+ int m_lowHitCut{100};
///retrieve a tool and report if it failed
template<class T>
bool retrievedTool(T& tool, const std::string& toolName) const {
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.cxx
index 17a1b867018..5b5dd3c23dd 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.cxx
@@ -45,18 +45,8 @@ static const string detectorNames[]{"negativeEndcap", "barrel", "positiveEndcap"
static const string detectorPaths[]{"SCTEC/", "SCTB/","SCTEA/"};
SCT_CalibLbTool::SCT_CalibLbTool(const std::string& type, const std::string& name, const IInterface* parent):
- base_class(type, name, parent),
- m_pSCTHelper{nullptr},
- m_pManager{nullptr},
- m_sct_waferHash{0},
- m_sct_firstStrip{0},
- m_sct_rdoGroupSize{0},
- m_lumiBlock{0},
- m_LbRange{0},
- m_LbsToMerge{0},
- m_rdoContainerKey{"SCT_RDOs"}
+ base_class(type, name, parent)
{
- //nop
}
StatusCode
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.h
index 12f5ccf4a03..7ad41f05729 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.h
@@ -60,22 +60,22 @@ class SCT_CalibLbTool : public extends<AthAlgTool, ISCT_CalibHistoTool>
private:
ToolHandle<ISCT_CalibEvtInfo> m_evtInfo{this, "SCT_CalibEvtInfo", "SCT_CalibEvtInfo"};
- const SCT_ID* m_pSCTHelper;
- const InDetDD::SCT_DetectorManager* m_pManager;
+ const SCT_ID* m_pSCTHelper{nullptr};
+ const InDetDD::SCT_DetectorManager* m_pManager{nullptr};
SCT_ID::const_id_iterator m_waferItrBegin;
SCT_ID::const_id_iterator m_waferItrEnd;
typedef std::vector<int> VecInt;
- VecInt* m_sct_waferHash;
- VecInt* m_sct_firstStrip;
- VecInt* m_sct_rdoGroupSize;
+ VecInt* m_sct_waferHash{nullptr};
+ VecInt* m_sct_firstStrip{nullptr};
+ VecInt* m_sct_rdoGroupSize{nullptr};
- int m_lumiBlock;
+ int m_lumiBlock{0};
//private use in this class
- int m_LbRange;
- int m_LbsToMerge;
+ int m_LbRange{0};
+ int m_LbsToMerge{0};
- SG::ReadHandleKey<SCT_RDO_Container> m_rdoContainerKey;
+ SG::ReadHandleKey<SCT_RDO_Container> m_rdoContainerKey{this, "RDOContainer", "SCT_RDOs"};
void fillLbForWafer(const IdentifierHash& waferHash, const int theFirstStrip, const int groupSize);
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.cxx
index bb5c39831d1..541778bf8f0 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.cxx
@@ -5,9 +5,7 @@
#include "SCT_CalibModuleListTool.h"
SCT_CalibModuleListTool::SCT_CalibModuleListTool(const std::string& type, const std::string& name, const IInterface* parent):
- base_class(type, name, parent),
- m_pSCTHelper{nullptr},
- m_IOVDbSvc{"IOVDbSvc", name}
+ base_class(type, name, parent)
{
}
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.h
index e0ade40160f..aecb9bfd7df 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.h
@@ -46,9 +46,9 @@ class SCT_CalibModuleListTool : public extends<AthAlgTool, ISCT_CalibModuleListT
virtual StatusCode readModuleList(std::map<Identifier, std::set<Identifier>>& moduleList) const;
private:
- const SCT_ID* m_pSCTHelper;
+ const SCT_ID* m_pSCTHelper{nullptr};
ToolHandle<ISCT_MonitorConditionsTool> m_MonitorConditionsTool{this, "SCT_MonitorConditionsTool", "SCT_MonitorConditionsTool/InDetSCT_MonitorConditionsTool", "Tool to retrieve noisy strip information"};
- ServiceHandle<IIOVDbSvc> m_IOVDbSvc;
+ ServiceHandle<IIOVDbSvc> m_IOVDbSvc{this, "IOVDbSvc", "IOVDbSvc"};
};
#endif
--
GitLab