From 2a942b2406a41f7eea883c7f400b93a3e6196897 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Sun, 12 Dec 2021 03:51:06 +0100
Subject: [PATCH] InnerDetector . Init variables (cppcheck/clang-tidy)
---
.../InDetAlignGenAlgs/InDetAlignCog.h | 4 +-
.../InDetAlignTrkInfo/AlignSiHit.h | 16 +-
.../InDetAlignTrkInfo/AlignTrk.h | 18 +-
.../DetailedIDNtupleTool.h | 128 ++++-----
.../src/PixelChargeLUTCalibCondAlg.cxx | 2 +-
.../InDetCosmicsEventPhase.h | 2 +-
.../InDetGeoModelUtils/VolumeSplitterUtils.h | 4 +-
.../src/GeoPixelDetailedStaveSupport.h | 46 +--
.../src/GeoPixelSimpleStaveSupport.h | 4 +-
.../PixelGeoModel/src/OraclePixGeoManager.h | 14 +-
.../PixelGeoModel/src/PixelDetectorDC1DC2.h | 2 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_Barrel.h | 14 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_BaseBoard.h | 10 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_Bracket.h | 8 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_Clamp.h | 8 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_CloseOut.h | 8 +-
.../SCT_GeoModel/SCT_CoolingBlock.h | 8 +-
.../SCT_GeoModel/SCT_CoolingEnd.h | 6 +-
.../SCT_GeoModel/SCT_CoolingPipe.h | 4 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_Dogleg.h | 8 +-
.../SCT_GeoModel/SCT_FSIEndJewel.h | 8 +-
.../SCT_GeoModel/SCT_FSIFibreMask.h | 6 +-
.../SCT_GeoModel/SCT_FSIScorpion.h | 8 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_Flange.h | 10 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_Forward.h | 24 +-
.../SCT_GeoModel/SCT_FwdCoolingBlock.h | 12 +-
.../SCT_GeoModel/SCT_FwdCoolingPipe.h | 8 +-
.../SCT_GeoModel/SCT_FwdCylinderServices.h | 26 +-
.../SCT_GeoModel/SCT_FwdDiscFixation.h | 6 +-
.../SCT_GeoModel/SCT_FwdDiscPowerTape.h | 8 +-
.../SCT_GeoModel/SCT_FwdDiscSupport.h | 8 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_FwdFSI.h | 10 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_FwdHybrid.h | 22 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_FwdModule.h | 36 +--
.../SCT_GeoModel/SCT_FwdModuleConnector.h | 8 +-
.../SCT_GeoModel/SCT_FwdOptoHarness.h | 10 +-
.../SCT_GeoModel/SCT_FwdPPConnector.h | 8 +-
.../SCT_GeoModel/SCT_FwdPPCooling.h | 8 +-
.../SCT_GeoModel/SCT_FwdPatchPanel.h | 10 +-
.../SCT_GeoModel/SCT_FwdPowerTape.h | 8 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_FwdRing.h | 62 ++--
.../SCT_GeoModel/SCT_FwdRingCooling.h | 10 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_FwdSensor.h | 50 ++--
.../SCT_GeoModel/SCT_GeoModel/SCT_FwdSpine.h | 12 +-
.../SCT_GeoModel/SCT_FwdSubSpine.h | 20 +-
.../SCT_GeoModel/SCT_FwdSupportFrame.h | 14 +-
.../SCT_FwdThermalShieldElement.h | 12 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_FwdWheel.h | 40 +--
.../SCT_GeoModel/SCT_GeoModel/SCT_Harness.h | 6 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_Hybrid.h | 8 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_InnerSide.h | 16 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_InterLink.h | 30 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_Layer.h | 48 ++--
.../SCT_GeoModel/SCT_GeoModel/SCT_Module.h | 44 +--
.../SCT_GeoModel/SCT_GeoModel/SCT_OuterSide.h | 18 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_Pigtail.h | 8 +-
.../SCT_GeoModel/SCT_PixelAttachment.h | 12 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_PowerTape.h | 6 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_Sensor.h | 10 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_Ski.h | 50 ++--
.../SCT_GeoModel/SCT_GeoModel/SCT_SkiAux.h | 6 +-
.../SCT_GeoModel/SCT_SkiPowerTape.h | 8 +-
.../SCT_GeoModel/SCT_GeoModel/SCT_Spider.h | 8 +-
.../SCT_GeoModel/SCT_SupportCyl.h | 6 +-
.../TRTFastDigitizationTool.h | 6 +-
.../TRT_Digitization/src/TRTDigCondBase.cxx | 2 +-
.../TRT_Digitization/src/TRTDigSettings.h | 232 +++++++--------
.../src/TRTElectronicsProcessing.h | 28 +-
.../src/TRTProcessingOfStraw.h | 24 +-
.../TRT_Digitization/src/TRTTimeCorrection.h | 10 +-
.../BCM_RawDataProviderTool.h | 2 +-
.../BCM_RawDataByteStreamCnv/BCM_RodDecoder.h | 6 +-
.../InDetJiveXML/InDetJiveXML/TRTRetriever.h | 2 +-
.../src/PixelRodDecoder.cxx | 2 +-
.../TRTParametersOfBarrelStraws.hh | 46 +--
.../TRTParametersOfModulesA.hh | 56 ++--
.../TRTParametersOfModulesB.hh | 60 ++--
.../TRTParametersOfModulesC.hh | 60 ++--
.../TRTParametersOfStrawPlanes.hh | 82 +++---
.../TRT_G4Utilities/TRTParametersOfWheelsA.hh | 52 ++--
.../TRT_G4Utilities/TRTParametersOfWheelsB.hh | 62 ++--
.../TRT_G4Utilities/TRTParametersOfWheelsC.hh | 52 ++--
.../TRT_G4Utilities/TRTVisualization.hh | 14 +-
.../ElectronSelector.h | 10 +-
.../FourMuonEvent.h | 58 ++--
.../IDPerfMonEoverP.h | 94 +++----
.../IDPerfMonZmumu.h | 4 +-
.../InDetPerformanceMonitoring/MuonSelector.h | 2 +-
.../InDetPerformanceMonitoring/ZmumuEvent.h | 24 +-
.../SCT_Monitoring/src/SCTErrMonAlg.cxx | 6 +-
.../SCT_Monitoring/src/SCTErrMonAlg.h | 4 +-
.../SCT_Monitoring/src/SCTErrMonTool.cxx | 2 +-
.../SCT_Monitoring/src/SCTHitEffMonTool.h | 8 +-
.../TRTMonitoringRun3ESD_Alg.h | 4 +-
.../TRTMonitoringRun3RAW_Alg.h | 4 +-
.../InDetRawData/SCT_TB04_RawData.h | 2 +-
.../InDetV0Finder/InDetV0FinderTool.h | 14 +-
.../SiSpacePointsSeed/SiSpacePointsSeed.h | 36 +--
.../InDetVKalVxInJetTool.h | 2 +-
.../InDetPhysValMonitoringTool.h | 2 +-
.../src/InDetPerfPlot_Resolution.h | 2 +-
.../src/ReadFromXmlDom.cxx | 2 +-
.../InDetRecStatisticsAlg.h | 4 +-
.../InDetRecStatistics/TrackStatHelper.h | 4 +-
.../InDetSecVertexTruthMatchTool.h | 266 +++++++++---------
.../SegmentDriftCircleAssValidation.h | 2 +-
106 files changed, 1208 insertions(+), 1208 deletions(-)
diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/InDetAlignGenAlgs/InDetAlignCog.h b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/InDetAlignGenAlgs/InDetAlignCog.h
index bb7192faa3e..0befdd9dc51 100644
--- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/InDetAlignGenAlgs/InDetAlignCog.h
+++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/InDetAlignGenAlgs/InDetAlignCog.h
@@ -174,11 +174,11 @@ class InDetAlignCog : public AthAlgorithm {
Amg::Transform3D m_grot_z;
// Center-of-gravity
- double m_cog[6];
+ double m_cog[6]{};
Amg::Transform3D m_CoG;
// residual global transformation
- double m_resglob[6];
+ double m_resglob[6]{};
Amg::Transform3D m_ResGlob;
// Chi2 specific stuff:
diff --git a/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/InDetAlignTrkInfo/AlignSiHit.h b/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/InDetAlignTrkInfo/AlignSiHit.h
index c5a5f36dc81..d5f6397fa1f 100755
--- a/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/InDetAlignTrkInfo/AlignSiHit.h
+++ b/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/InDetAlignTrkInfo/AlignSiHit.h
@@ -93,15 +93,15 @@ private:
float m_z;
float m_delzr;
float m_sinlocal;
- float m_locang[2]; // local angles: theta,phi
- float m_locdel[2]; // local scatterings: theta, phi
- float m_locedel[2]; // error on local scatterings: theta, phi
- float m_globang[2]; // global angles: cot_theta,phi
- float m_globdel[2]; // global scatterings: cot_theta, phi
- float m_globedel[2]; // error on global scatterings: cot_theta, phi
+ float m_locang[2]{}; // local angles: theta,phi
+ float m_locdel[2]{}; // local scatterings: theta, phi
+ float m_locedel[2]{}; // error on local scatterings: theta, phi
+ float m_globang[2]{}; // global angles: cot_theta,phi
+ float m_globdel[2]{}; // global scatterings: cot_theta, phi
+ float m_globedel[2]{}; // error on global scatterings: cot_theta, phi
float m_trklen; // track length since last scatterer
- float m_dtpar1[5]; // rphi trackpar derivatives
- float m_dtpar2[5]; // rz trackpar derivatives
+ float m_dtpar1[5]{}; // rphi trackpar derivatives
+ float m_dtpar2[5]{}; // rz trackpar derivatives
};
diff --git a/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/InDetAlignTrkInfo/AlignTrk.h b/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/InDetAlignTrkInfo/AlignTrk.h
index 6cb10bd00f8..9774154556e 100755
--- a/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/InDetAlignTrkInfo/AlignTrk.h
+++ b/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/InDetAlignTrkInfo/AlignTrk.h
@@ -91,17 +91,17 @@ private:
int m_nshared;
int m_noverlapPIX;
int m_noverlapSCT;
- float m_trkpar[5];
- float m_trkcov[15];
+ float m_trkpar[5]{};
+ float m_trkcov[15]{};
int m_ikine;
- float m_truetrkpar[5];
+ float m_truetrkpar[5]{};
int m_ivtx;
- float m_trpvtx[3];
- float m_beampos[3];
- float m_beamsigma[3];
- float m_beamtilt[2];
- float m_trtpt;
- float m_trtpterr;
+ float m_trpvtx[3]{};
+ float m_beampos[3]{};
+ float m_beamsigma[3]{};
+ float m_beamtilt[2]{};
+ float m_trtpt = 0.0F;
+ float m_trtpterr = 0.0F;
std::vector<AlignSiHit> m_hits;
std::vector<AlignTRTHit> m_trthits;
std::vector<AlignSiHit> m_overlaphits;
diff --git a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/InDetAlignNtupleTools/DetailedIDNtupleTool.h b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/InDetAlignNtupleTools/DetailedIDNtupleTool.h
index 62e9652db4d..b2a84ea594f 100644
--- a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/InDetAlignNtupleTools/DetailedIDNtupleTool.h
+++ b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/InDetAlignNtupleTools/DetailedIDNtupleTool.h
@@ -94,81 +94,81 @@ namespace InDet
// Reconstructed variables
- int m_runNumber;
- int m_evtNumber;
+ int m_runNumber = 0;
+ int m_evtNumber = 0;
// original track information
- double m_original_xvtx;
- double m_original_yvtx;
- double m_original_zvtx;
-
- double m_original_d0;
- double m_original_z0;
- double m_original_phi0;
- double m_original_theta;
- double m_original_qoverp;
- double m_original_pt;
-
- double m_original_eta;
- double m_original_chi2;
- int m_original_ndof;
- double m_original_chi2prob;
-
- double m_original_err_d0;
- double m_original_err_z0;
- double m_original_err_phi0;
- double m_original_err_theta;
- double m_original_err_qoverp;
+ double m_original_xvtx = 0.0;
+ double m_original_yvtx = 0.0;
+ double m_original_zvtx = 0.0;
+
+ double m_original_d0 = 0.0;
+ double m_original_z0 = 0.0;
+ double m_original_phi0 = 0.0;
+ double m_original_theta = 0.0;
+ double m_original_qoverp = 0.0;
+ double m_original_pt = 0.0;
+
+ double m_original_eta = 0.0;
+ double m_original_chi2 = 0.0;
+ int m_original_ndof = 0;
+ double m_original_chi2prob = 0.0;
+
+ double m_original_err_d0 = 0.0;
+ double m_original_err_z0 = 0.0;
+ double m_original_err_phi0 = 0.0;
+ double m_original_err_theta = 0.0;
+ double m_original_err_qoverp = 0.0;
// truth informaiton
- double m_truth_d0;
- double m_truth_z0;
- double m_truth_phi0;
- double m_truth_theta;
- double m_truth_eta;
- double m_truth_pt;
- double m_truth_qoverp;
- double m_truth_qoverpt;
- double m_truth_charge;
- double m_truth_prod_x;
- double m_truth_prod_y;
- double m_truth_prod_z;
+ double m_truth_d0 = 0.0;
+ double m_truth_z0 = 0.0;
+ double m_truth_phi0 = 0.0;
+ double m_truth_theta = 0.0;
+ double m_truth_eta = 0.0;
+ double m_truth_pt = 0.0;
+ double m_truth_qoverp = 0.0;
+ double m_truth_qoverpt = 0.0;
+ double m_truth_charge = 0.0;
+ double m_truth_prod_x = 0.0;
+ double m_truth_prod_y = 0.0;
+ double m_truth_prod_z = 0.0;
// oroginal track wrt reference points
- double m_original_toRef_d0;
- double m_original_toRef_z0;
- double m_original_toRef_phi0;
- double m_original_toRef_theta;
- double m_original_toRef_qoverp;
+ double m_original_toRef_d0 = 0.0;
+ double m_original_toRef_z0 = 0.0;
+ double m_original_toRef_phi0 = 0.0;
+ double m_original_toRef_theta = 0.0;
+ double m_original_toRef_qoverp = 0.0;
// refitted track wrt reference points
- double m_toRef_d0;
- double m_toRef_z0;
- double m_toRef_phi0;
- double m_toRef_theta;
- double m_toRef_qoverp;
+ double m_toRef_d0 = 0.0;
+ double m_toRef_z0 = 0.0;
+ double m_toRef_phi0 = 0.0;
+ double m_toRef_theta = 0.0;
+ double m_toRef_qoverp = 0.0;
// the AlignTrack information
- double m_err_d0;
- double m_err_z0;
- double m_err_phi0;
- double m_err_theta;
- double m_err_qoverp;
-
- double m_xvtx;
- double m_yvtx;
- double m_zvtx;
- double m_d0;
- double m_z0;
- double m_phi0;
- double m_theta;
- double m_qoverp;
- double m_pt;
- double m_eta;
- double m_chi2;
- int m_ndof;
- double m_chi2prob;
+ double m_err_d0 = 0.0;
+ double m_err_z0 = 0.0;
+ double m_err_phi0 = 0.0;
+ double m_err_theta = 0.0;
+ double m_err_qoverp = 0.0;
+
+ double m_xvtx = 0.0;
+ double m_yvtx = 0.0;
+ double m_zvtx = 0.0;
+ double m_d0 = 0.0;
+ double m_z0 = 0.0;
+ double m_phi0 = 0.0;
+ double m_theta = 0.0;
+ double m_qoverp = 0.0;
+ double m_pt = 0.0;
+ double m_eta = 0.0;
+ double m_chi2 = 0.0;
+ int m_ndof = 0;
+ double m_chi2prob = 0.0;
}; // end class
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.cxx
index 461780d7d11..ee9fb6cd1f7 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.cxx
@@ -111,7 +111,7 @@ StatusCode PixelChargeLUTCalibCondAlg::execute(const EventContext& ctx) const {
return StatusCode::FAILURE;
}
- std::array<float,16> chrgs;
+ std::array<float,16> chrgs{};
for (int k=0; k<16; k++) {
chrgs[k]=std::atof(calibString[k+4].c_str());
}
diff --git a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/InDetCosmicsEventPhase/InDetCosmicsEventPhase.h b/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/InDetCosmicsEventPhase/InDetCosmicsEventPhase.h
index c3b94fe1e28..b819037b669 100755
--- a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/InDetCosmicsEventPhase/InDetCosmicsEventPhase.h
+++ b/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/InDetCosmicsEventPhase/InDetCosmicsEventPhase.h
@@ -34,7 +34,7 @@ namespace InDet
StatusCode storePhase();
private:
- double m_phase;
+ double m_phase = 0.0;
SG::ReadHandleKeyArray<TrackCollection> m_readKey_tracks {this, "InputTracksNames" ,{"Tracks"}, "Tracks to extract event phase" };
SG::WriteHandleKey<ComTime> m_writeKey_TRTPhase {this, "EventPhaseName" ,"TRT_Phase", "TRT Event Phase name to store" };
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeSplitterUtils.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeSplitterUtils.h
index bb2c5583b02..54d53c82b1f 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeSplitterUtils.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeSplitterUtils.h
@@ -60,8 +60,8 @@ namespace InDetDD {
bool m_valid;
bool m_found;
- bool m_horizontal;
- bool m_vertical;
+ bool m_horizontal = false;
+ bool m_vertical = false;
Point m_start;
Point m_end;
};
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDetailedStaveSupport.h b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDetailedStaveSupport.h
index ab7b00d4ce3..132820b1e03 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDetailedStaveSupport.h
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDetailedStaveSupport.h
@@ -39,22 +39,22 @@ private:
GeoNodePtr<GeoSimplePolygonBrep> m_staveEnvelopShape;
GeoNodePtr<GeoSimplePolygonBrep> m_basicStaveEnvelopShape;
- GeoPhysVol* m_endblockAPhysVol;
- GeoPhysVol* m_endblockCPhysVol;
- double m_endblockZpos, m_endblockLength, m_serviceZpos;
- double m_endblockSrvLength;
- GeoPhysVol* m_endblockFlexPhysVol;
+ GeoPhysVol* m_endblockAPhysVol = nullptr;
+ GeoPhysVol* m_endblockCPhysVol = nullptr;
+ double m_endblockZpos = 0.0, m_endblockLength = 0.0, m_serviceZpos = 0.0;
+ double m_endblockSrvLength = 0.0;
+ GeoPhysVol* m_endblockFlexPhysVol = nullptr;
GeoNodePtr<GeoTransform> m_endblockFlexTrf;
- GeoPhysVol* m_serviceCoolPipePhysVol;
+ GeoPhysVol* m_serviceCoolPipePhysVol = nullptr;
GeoNodePtr<GeoTransform> m_serviceCoolPipeTrfA;
GeoNodePtr<GeoTransform> m_serviceCoolPipeTrfC;
GeoTrf::Transform3D m_transform;
- double m_thicknessP;
- double m_thicknessN;
- double m_thicknessN_svc;
- double m_width_svc;
- double m_SafetyMargin;
+ double m_thicknessP = 0.0;
+ double m_thicknessN = 0.0;
+ double m_thicknessN_svc = 0.0;
+ double m_width_svc = 0.0;
+ double m_SafetyMargin = 0.0;
bool m_bVerbose;
void RemoveCoincidentAndColinearPointsFromShape(std::vector<double> &xPoint, std::vector<double>&yPoint);
@@ -62,18 +62,18 @@ private:
std::vector<int> iExcept = std::vector<int>());
void AddSurroundingXYMargin(double vMarginX, double vMarginY, std::vector<double> &xPoint, std::vector<double>&yPoint);
- int m_PlanarModuleNumber, m_3DModuleNumber;
-
- double m_StaveLength;
- double m_FoamEdgePointX;
- double m_FoamEdgePointY;
- double m_FoamMiddleThick;
- double m_OmegaEndStaveThick;
- double m_OmegaEndStavePointX;
- double m_OmegaEndStavePointY;
- double m_OmegaMidStaveThick;
- double m_MidStaveSidePointX;
- double m_MidStaveSidePointY;
+ int m_PlanarModuleNumber = 0, m_3DModuleNumber = 0;
+
+ double m_StaveLength = 0.0;
+ double m_FoamEdgePointX = 0.0;
+ double m_FoamEdgePointY = 0.0;
+ double m_FoamMiddleThick = 0.0;
+ double m_OmegaEndStaveThick = 0.0;
+ double m_OmegaEndStavePointX = 0.0;
+ double m_OmegaEndStavePointY = 0.0;
+ double m_OmegaMidStaveThick = 0.0;
+ double m_MidStaveSidePointX = 0.0;
+ double m_MidStaveSidePointY = 0.0;
void ComputeStaveExternalShape();
GeoTrf::Vector3D IntersectionPoint(double Ax,double Ay,double Bx,double By,double Cx,double Cy,double Dx,double Dy);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelSimpleStaveSupport.h b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelSimpleStaveSupport.h
index 958ce4fc5fc..55ab3534da8 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelSimpleStaveSupport.h
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelSimpleStaveSupport.h
@@ -36,8 +36,8 @@ public:
private:
GeoVPhysVol* m_physVol;
GeoTrf::Transform3D m_transform;
- double m_thicknessP;
- double m_thicknessN;
+ double m_thicknessP = 0.0;
+ double m_thicknessN = 0.0;
};
#endif
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/OraclePixGeoManager.h b/InnerDetector/InDetDetDescr/PixelGeoModel/src/OraclePixGeoManager.h
index cf9b85ea602..43f64cd8a02 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/OraclePixGeoManager.h
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/OraclePixGeoManager.h
@@ -97,7 +97,7 @@ class OraclePixGeoManager : public PixelGeometryManager {
int m_diskFrontBack;
// number or general service elements
- int m_barrelInFrames, m_endcapInFrames;
+ int m_barrelInFrames = 0, m_endcapInFrames = 0;
// flag to build also the services
bool m_servicesOnLadder;
@@ -120,7 +120,7 @@ class OraclePixGeoManager : public PixelGeometryManager {
bool m_dbm;
// Flag set to true if no parts are listed in placement table - ie indicates actully all are present.
- bool m_allPartsPresent;
+ bool m_allPartsPresent = false;
// Class holding items that only one instance is needed for all detector elements.
InDetDD::SiCommonItems * m_commonItems;
@@ -129,11 +129,11 @@ class OraclePixGeoManager : public PixelGeometryManager {
InDetDD::PixelDetectorManager *m_pDDmgr;
//the material manager
- InDetMaterialManager * m_pMatMgr;
+ InDetMaterialManager * m_pMatMgr = nullptr;
// Distorted material manager. Access to tables for distorting
// the material. Extra volumes, modified volumes, etc
- const InDetDD::DistortedMaterialManager * m_distortedMatManager;
+ const InDetDD::DistortedMaterialManager * m_distortedMatManager = nullptr;
// Legacy tables
PixelLegacyManager * m_legacyManager;
@@ -142,13 +142,13 @@ class OraclePixGeoManager : public PixelGeometryManager {
std::string m_versionTag;
// top level placements
- TopLevelPlacements * m_placements;
+ TopLevelPlacements * m_placements = nullptr;
// material map
- PixelMaterialMap * m_materialMap;
+ PixelMaterialMap * m_materialMap = nullptr;
// Stave types
- PixelStaveTypes * m_pixelStaveTypes;
+ PixelStaveTypes * m_pixelStaveTypes = nullptr;
// ganged pixel index map
std::map<int,std::vector<int> > * m_gangedIndexMap;
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.h b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.h
index 5956209050a..2ae9af35d3c 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.h
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.h
@@ -689,7 +689,7 @@ class OraclePixGeoManager : public PixelGeometryManager {
const StoredMaterialManager* m_pMatMgr;
// The Transient Detector Store Service
- StoreGateSvc* m_pDetStore;
+ StoreGateSvc* m_pDetStore = nullptr;
// The name of the collections in the det store
std::string m_elementsObjectName;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Barrel.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Barrel.h
index 8a58255181f..684799930ea 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Barrel.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Barrel.h
@@ -36,17 +36,17 @@ private:
void buildEMIShield(GeoFullPhysVol * parent) const;
- int m_numLayers;
+ int m_numLayers = 0;
- double m_innerRadius;
- double m_outerRadius;
- double m_length;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_length = 0.0;
- double m_thermalShieldEndWallThickness;
+ double m_thermalShieldEndWallThickness = 0.0;
- double m_zClearance;
+ double m_zClearance = 0.0;
- bool m_isOldGeometry;
+ bool m_isOldGeometry = false;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_BaseBoard.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_BaseBoard.h
index ddd2d08c060..e55bd2e94ce 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_BaseBoard.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_BaseBoard.h
@@ -34,15 +34,15 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
- double m_thickness;
- double m_width;
- double m_length;
+ const GeoMaterial * m_material = nullptr;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
+ double m_length = 0.0;
//double m_baseBoardOffsetX; // Thu 16th Jun 2005 D.Naito removed.
//double m_baseBoardOffsetY; // Thu 16th Jun 2005 D.Naito removed.
//double m_baseBoardOffsetZ; // Thu 16th Jun 2005 D.Naito removed.
- double m_safety;
+ double m_safety = 0.0;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Bracket.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Bracket.h
index 2ccd94be4c7..bff10255d7c 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Bracket.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Bracket.h
@@ -33,10 +33,10 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
- double m_thickness;
- double m_width;
- double m_length;
+ const GeoMaterial * m_material = nullptr;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
+ double m_length = 0.0;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Clamp.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Clamp.h
index 2421ff0a773..7fa2df154c6 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Clamp.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Clamp.h
@@ -34,12 +34,12 @@ private:
int m_iLayer;
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
double m_innerRadius;
- double m_outerRadius;
- double m_length;
- double m_radialWidth;
+ double m_outerRadius = 0.0;
+ double m_length = 0.0;
+ double m_radialWidth = 0.0;
};
#endif // SCT_GEOMODEL_SCT_CLAMP_H
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CloseOut.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CloseOut.h
index 289d27f1891..35318f476a7 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CloseOut.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CloseOut.h
@@ -32,10 +32,10 @@ private:
int m_iLayer;
- const GeoMaterial * m_material;
- double m_innerRadius;
- double m_outerRadius;
- double m_length;
+ const GeoMaterial * m_material = nullptr;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_length = 0.0;
};
#endif // SCT_GEOMODEL_SCT_CLOSEOUT_H
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CoolingBlock.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CoolingBlock.h
index 6ddfa222eb6..219ab2c3ad4 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CoolingBlock.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CoolingBlock.h
@@ -33,11 +33,11 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- double m_thickness;
- double m_width;
- double m_length;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
+ double m_length = 0.0;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CoolingEnd.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CoolingEnd.h
index 8de3939bedf..3a8eba6f6bc 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CoolingEnd.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CoolingEnd.h
@@ -35,12 +35,12 @@ private:
int m_iLayer;
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
double m_innerRadius;
- double m_outerRadius;
+ double m_outerRadius = 0.0;
double m_length;
- double m_radialWidth;
+ double m_radialWidth = 0.0;
};
#endif // SCT_GEOMODEL_SCT_COOLINGEND_H
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CoolingPipe.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CoolingPipe.h
index 58194f645c8..afac2290054 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CoolingPipe.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_CoolingPipe.h
@@ -32,9 +32,9 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- double m_pipeRadius;
+ double m_pipeRadius = 0.0;
double m_length;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Dogleg.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Dogleg.h
index 1a29840ec84..77a91880e2b 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Dogleg.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Dogleg.h
@@ -36,10 +36,10 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
- double m_thickness;
- double m_width;
- double m_length;
+ const GeoMaterial * m_material = nullptr;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
+ double m_length = 0.0;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIEndJewel.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIEndJewel.h
index 5a447e11670..588c0f9b872 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIEndJewel.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIEndJewel.h
@@ -31,11 +31,11 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- double m_radialWidth;
- double m_rPhiWidth;
- double m_length;
+ double m_radialWidth = 0.0;
+ double m_rPhiWidth = 0.0;
+ double m_length = 0.0;
};
#endif // SCT_GEOMODEL_SCT_FSIENDJEWEL_H
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIFibreMask.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIFibreMask.h
index 56e5a945d8d..dd0e7dce852 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIFibreMask.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIFibreMask.h
@@ -33,10 +33,10 @@ private:
int m_iLayer;
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- double m_innerRadius;
- double m_outerRadius;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
double m_length;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIScorpion.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIScorpion.h
index 34fcf7a5426..83cbc29837a 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIScorpion.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIScorpion.h
@@ -31,11 +31,11 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- double m_radialWidth;
- double m_rPhiWidth;
- double m_length;
+ double m_radialWidth = 0.0;
+ double m_rPhiWidth = 0.0;
+ double m_length = 0.0;
};
#endif // SCT_GEOMODEL_SCT_FSISCORPION_H
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Flange.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Flange.h
index 5d231a3e326..83159fdedbd 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Flange.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Flange.h
@@ -33,12 +33,12 @@ private:
int m_iLayer;
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- double m_innerRadius;
- double m_outerRadius;
- double m_length;
- double m_radialWidth;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_length = 0.0;
+ double m_radialWidth = 0.0;
};
#endif // SCT_GEOMODEL_SCT_FLANGE_H
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Forward.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Forward.h
index 52b737e2d28..10bbb913868 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Forward.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Forward.h
@@ -54,20 +54,20 @@ private:
// Basic parameters
int m_endcap;
- int m_numModuleTypes;
- int m_numWheels;
- double m_innerRadius;
- double m_outerRadius;
- double m_zMin;
- double m_zMax;
- double m_trtGapPos;
- double m_coolingPipeRadius;
- int m_numThermalShieldElements;
- bool m_cylinderServicesPresent;
+ int m_numModuleTypes = 0;
+ int m_numWheels = 0;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_zMin = 0.0;
+ double m_zMax = 0.0;
+ double m_trtGapPos = 0.0;
+ double m_coolingPipeRadius = 0.0;
+ int m_numThermalShieldElements = 0;
+ bool m_cylinderServicesPresent = false;
// Derived parameters
- double m_length;
- double m_outerRadiusCylinderServices;
+ double m_length = 0.0;
+ double m_outerRadiusCylinderServices = 0.0;
// Child detector elements
std::vector<std::unique_ptr<SCT_FwdWheel>> m_wheels;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdCoolingBlock.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdCoolingBlock.h
index bac694eab7e..919e9a66e38 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdCoolingBlock.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdCoolingBlock.h
@@ -41,15 +41,15 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- double m_thickness;
- double m_deltaR;
- double m_rphi;
- double m_offset;
+ double m_thickness = 0.0;
+ double m_deltaR = 0.0;
+ double m_rphi = 0.0;
+ double m_offset = 0.0;
int m_hiLo;
int m_mainSec;
- int m_coolingBlockIndex;
+ int m_coolingBlockIndex = 0;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdCoolingPipe.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdCoolingPipe.h
index cef91098760..2ce53504489 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdCoolingPipe.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdCoolingPipe.h
@@ -37,12 +37,12 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
int m_numPipes;
- double m_pipeRadius;
+ double m_pipeRadius = 0.0;
double m_innerRadius;
- double m_outerRadius;
- double m_thickness;
+ double m_outerRadius = 0.0;
+ double m_thickness = 0.0;
double m_length;
double m_zPosition;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdCylinderServices.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdCylinderServices.h
index 0766a478aa8..6357adad88f 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdCylinderServices.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdCylinderServices.h
@@ -43,19 +43,19 @@ private:
std::vector<double> m_nPipeLocAngle;
std::vector<double> m_railLocAngle;
- double m_coolingDeltaR;
- double m_lmtDeltaR;
- double m_lmtCoolingDeltaR;
- double m_fibreDeltaR;
- double m_nPipeDeltaR;
- double m_railDeltaR;
+ double m_coolingDeltaR = 0.0;
+ double m_lmtDeltaR = 0.0;
+ double m_lmtCoolingDeltaR = 0.0;
+ double m_fibreDeltaR = 0.0;
+ double m_nPipeDeltaR = 0.0;
+ double m_railDeltaR = 0.0;
- double m_coolingRPhi;
- double m_lmtRPhi;
- double m_lmtCoolingRPhi;
- double m_fibreRPhi;
- double m_nPipeRPhi;
- double m_railRPhi;
+ double m_coolingRPhi = 0.0;
+ double m_lmtRPhi = 0.0;
+ double m_lmtCoolingRPhi = 0.0;
+ double m_fibreRPhi = 0.0;
+ double m_nPipeRPhi = 0.0;
+ double m_railRPhi = 0.0;
std::string m_coolingMaterialName;
std::string m_lmtMaterialName;
@@ -64,7 +64,7 @@ private:
std::string m_nPipeMaterialName;
std::string m_railMaterialName;
- double m_lmtCoolingZOffset;
+ double m_lmtCoolingZOffset = 0.0;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdDiscFixation.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdDiscFixation.h
index d760b498291..9b3a54af31e 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdDiscFixation.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdDiscFixation.h
@@ -31,9 +31,9 @@ private:
virtual GeoVPhysVol * build();
// Basic parameters
- double m_radius;
- double m_thickness;
- const GeoMaterial * m_material;
+ double m_radius = 0.0;
+ double m_thickness = 0.0;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdDiscPowerTape.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdDiscPowerTape.h
index 15d6461cd3a..f1f253540f6 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdDiscPowerTape.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdDiscPowerTape.h
@@ -33,11 +33,11 @@ private:
int m_ringNumber;
- double m_thickness;
- double m_innerRadius;
- double m_outerRadius;
+ double m_thickness = 0.0;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdDiscSupport.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdDiscSupport.h
index 7867f6acea9..5343b462ca5 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdDiscSupport.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdDiscSupport.h
@@ -36,10 +36,10 @@ private:
int m_iWheel;
// Basic parameters
- double m_innerRadius;
- double m_outerRadius;
- double m_thickness;
- const GeoMaterial * m_material;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_thickness = 0.0;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdFSI.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdFSI.h
index c2c6a72f9ae..8619081d87f 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdFSI.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdFSI.h
@@ -34,11 +34,11 @@ private:
int m_type;
// Basic parameters
- double m_deltaR;
- double m_rphi;
- double m_thickness;
- double m_zOffset;
- const GeoMaterial * m_material;
+ double m_deltaR = 0.0;
+ double m_rphi = 0.0;
+ double m_thickness = 0.0;
+ double m_zOffset = 0.0;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdHybrid.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdHybrid.h
index f9fe308161a..fd7ea2290c7 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdHybrid.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdHybrid.h
@@ -40,22 +40,22 @@ private:
int m_ringType;
- double m_outerWidth; // Outer width of hybrid. (When module is placed on
+ double m_outerWidth = 0.0; // Outer width of hybrid. (When module is placed on
// inner edge). ie the long side with wire bonds.
- double m_innerWidth; // Inner width
- double m_length1;
+ double m_innerWidth = 0.0; // Inner width
+ double m_length1 = 0.0;
- double m_length; // Length (radially).
- double m_thickness;
+ double m_length = 0.0; // Length (radially).
+ double m_thickness = 0.0;
- double m_width2; // second part of hybrid - rectangular
- double m_length2;
- double m_thickness2;
+ double m_width2 = 0.0; // second part of hybrid - rectangular
+ double m_length2 = 0.0;
+ double m_thickness2 = 0.0;
- double m_mountPointToInnerEdge;
- double m_mountPointToOuterEdge;
+ double m_mountPointToInnerEdge = 0.0;
+ double m_mountPointToOuterEdge = 0.0;
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdModule.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdModule.h
index 1a262527ed2..e6e62e0ba71 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdModule.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdModule.h
@@ -68,27 +68,27 @@ private:
// const std::string & m_name;
int m_ringType;
- double m_stereoAngle; // Magnitude of stereo angle
- double m_length;
- double m_widthOuter;
- double m_widthInner;
- double m_thickness;
- double m_moduleShift;
- double m_glueThickness;
- double m_distBtwMountPoints;
- double m_mountPointToCenter;
- bool m_hybridIsOnInnerEdge;
- int m_upperSide;
+ double m_stereoAngle = 0.0; // Magnitude of stereo angle
+ double m_length = 0.0;
+ double m_widthOuter = 0.0;
+ double m_widthInner = 0.0;
+ double m_thickness = 0.0;
+ double m_moduleShift = 0.0;
+ double m_glueThickness = 0.0;
+ double m_distBtwMountPoints = 0.0;
+ double m_mountPointToCenter = 0.0;
+ bool m_hybridIsOnInnerEdge = false;
+ int m_upperSide = 0;
- double m_innerRadius;
- double m_outerRadius;
- double m_powerTapeStart;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_powerTapeStart = 0.0;
- double m_mainMountPoint;
- double m_secMountPoint;
- double m_endLocator;
+ double m_mainMountPoint = 0.0;
+ double m_secMountPoint = 0.0;
+ double m_endLocator = 0.0;
- bool m_connectorPresent;
+ bool m_connectorPresent = false;
public:
// Child detector elements
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdModuleConnector.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdModuleConnector.h
index 728f492541c..87d04235fe4 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdModuleConnector.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdModuleConnector.h
@@ -33,10 +33,10 @@ private:
int m_ringType;
- double m_deltaR;
- double m_rphi;
- double m_thickness;
- const GeoMaterial * m_material;
+ double m_deltaR = 0.0;
+ double m_rphi = 0.0;
+ double m_thickness = 0.0;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdOptoHarness.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdOptoHarness.h
index 39274fc8525..8fc45b45029 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdOptoHarness.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdOptoHarness.h
@@ -33,13 +33,13 @@ private:
int m_type;
- double m_innerRadius;
- double m_outerRadius;
- double m_thickness;
- const GeoMaterial * m_material;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_thickness = 0.0;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- int m_index;
+ int m_index = 0;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPPConnector.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPPConnector.h
index a3ca5e72366..d596e688726 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPPConnector.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPPConnector.h
@@ -32,10 +32,10 @@ private:
virtual GeoVPhysVol * build();
// Basic parameters
- double m_deltaR;
- double m_rphi;
- double m_thickness;
- const GeoMaterial * m_material;
+ double m_deltaR = 0.0;
+ double m_rphi = 0.0;
+ double m_thickness = 0.0;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPPCooling.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPPCooling.h
index a9566aea2f0..e43c843d77d 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPPCooling.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPPCooling.h
@@ -32,10 +32,10 @@ private:
virtual GeoVPhysVol * build();
// Basic parameters
- double m_deltaR;
- double m_rphi;
- double m_thickness;
- const GeoMaterial * m_material;
+ double m_deltaR = 0.0;
+ double m_rphi = 0.0;
+ double m_thickness = 0.0;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPatchPanel.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPatchPanel.h
index f38de2d5df3..5281f01dc4e 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPatchPanel.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPatchPanel.h
@@ -37,11 +37,11 @@ private:
int m_type;
// Basic parameters
- double m_midRadius;
- double m_deltaR;
- double m_rphi;
- double m_thickness;
- const GeoMaterial * m_material;
+ double m_midRadius = 0.0;
+ double m_deltaR = 0.0;
+ double m_rphi = 0.0;
+ double m_thickness = 0.0;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPowerTape.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPowerTape.h
index 3b8ee4765dd..02c3d3b6265 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPowerTape.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdPowerTape.h
@@ -36,12 +36,12 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
int m_numModules;
- double m_crossSectArea; // Cross sectional area per module
+ double m_crossSectArea = 0.0; // Cross sectional area per module
double m_innerRadius;
- double m_outerRadius;
- double m_thickness;
+ double m_outerRadius = 0.0;
+ double m_thickness = 0.0;
double m_length;
double m_zPosition;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdRing.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdRing.h
index f8f7355ed75..d73dc049007 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdRing.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdRing.h
@@ -73,37 +73,37 @@ private:
int m_endcap;
// Basic parameters
- int m_numModules;
- double m_moduleStagger;
- double m_safety;
- int m_identifier;
- int m_ringSide;
- int m_stereoSign;
- double m_refStartAngle;
- int m_refFirstStagger;
- double m_ringOffset;
- double m_discSupportThickness;
+ int m_numModules = 0;
+ double m_moduleStagger = 0.0;
+ double m_safety = 0.0;
+ int m_identifier = 0;
+ int m_ringSide = 0;
+ int m_stereoSign = 0;
+ double m_refStartAngle = 0.0;
+ int m_refFirstStagger = 0;
+ double m_ringOffset = 0.0;
+ double m_discSupportThickness = 0.0;
// Derived parameters
- double m_innerRadius;
- double m_outerRadius;
- double m_thickness;
- double m_thicknessInner;
- double m_thicknessOuter;
- double m_startAngle;
- int m_firstStagger;
- bool m_discRotated;
- int m_moduleZero;
-
- double m_moduleServicesHiRPos;
- double m_moduleServicesLoRPos;
- double m_moduleServicesHiZPos;
- double m_moduleServicesLoZPos;
-
- double m_moduleServicesHiOuterZPos;
- double m_moduleServicesLoOuterZPos;
-
- double m_maxModuleServicesBaseToRingCenter;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_thickness = 0.0;
+ double m_thicknessInner = 0.0;
+ double m_thicknessOuter = 0.0;
+ double m_startAngle = 0.0;
+ int m_firstStagger = 0;
+ bool m_discRotated = false;
+ int m_moduleZero = 0;
+
+ double m_moduleServicesHiRPos = 0.0;
+ double m_moduleServicesLoRPos = 0.0;
+ double m_moduleServicesHiZPos = 0.0;
+ double m_moduleServicesLoZPos = 0.0;
+
+ double m_moduleServicesHiOuterZPos = 0.0;
+ double m_moduleServicesLoOuterZPos = 0.0;
+
+ double m_maxModuleServicesBaseToRingCenter = 0.0;
// Child detector elements
SCT_FwdModule* m_module;
@@ -112,8 +112,8 @@ private:
std::unique_ptr<SCT_FwdCoolingBlock> m_coolingBlockLoMain;
std::unique_ptr<SCT_FwdCoolingBlock> m_coolingBlockLoSec;
- GeoPhysVol * m_moduleServicesHi;
- GeoPhysVol * m_moduleServicesLo;
+ GeoPhysVol * m_moduleServicesHi = nullptr;
+ GeoPhysVol * m_moduleServicesLo = nullptr;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdRingCooling.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdRingCooling.h
index b7398967444..205f54d0efa 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdRingCooling.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdRingCooling.h
@@ -33,13 +33,13 @@ private:
int m_ringType;
- double m_innerRadius;
- double m_outerRadius;
- double m_thickness;
- const GeoMaterial * m_material;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_thickness = 0.0;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- int m_numModules;
+ int m_numModules = 0;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSensor.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSensor.h
index e201263a3d2..5a13387d877 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSensor.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSensor.h
@@ -87,38 +87,38 @@ private:
int m_ringType;
- double m_thickness; // Thickness of sensor
- double m_outerRadius; // Outer radius of physical sensor
- double m_innerRadius; // Outer radius of physical sensor
- double m_innerWidth; // Width of sensor at inner radius
- double m_outerWidth; // Width of sensor at outer radius
-
-
- double m_outerWidthN; // Outer physical width of near sensor.
- double m_innerWidthN; // Inner width
- double m_lengthN; // Length (radially).
- double m_thicknessN;
- double m_radiusN;
- double m_activeHalfLengthNear; // Active half length
+ double m_thickness = 0.0; // Thickness of sensor
+ double m_outerRadius = 0.0; // Outer radius of physical sensor
+ double m_innerRadius = 0.0; // Outer radius of physical sensor
+ double m_innerWidth = 0.0; // Width of sensor at inner radius
+ double m_outerWidth = 0.0; // Width of sensor at outer radius
+
+
+ double m_outerWidthN = 0.0; // Outer physical width of near sensor.
+ double m_innerWidthN = 0.0; // Inner width
+ double m_lengthN = 0.0; // Length (radially).
+ double m_thicknessN = 0.0;
+ double m_radiusN = 0.0;
+ double m_activeHalfLengthNear = 0.0; // Active half length
- double m_outerWidthF; // Outer physical width of Far sensor.
- double m_innerWidthF; // Inner width
- double m_lengthF; // Length (radially).
- double m_thicknessF;
- double m_radiusF;
- double m_activeHalfLengthFar; // Active half length
+ double m_outerWidthF = 0.0; // Outer physical width of Far sensor.
+ double m_innerWidthF = 0.0; // Inner width
+ double m_lengthF = 0.0; // Length (radially).
+ double m_thicknessF = 0.0;
+ double m_radiusF = 0.0;
+ double m_activeHalfLengthFar = 0.0; // Active half length
- double m_sensorRadius; // Physics center (of double wafer)
+ double m_sensorRadius = 0.0; // Physics center (of double wafer)
- double m_sensorOffset; // Offset of det element center.
+ double m_sensorOffset = 0.0; // Offset of det element center.
// Differs from m_sensorRadius for truncated middle detector
- const GeoMaterial * m_materialSensor;
- const GeoMaterial * m_materialGlass;
+ const GeoMaterial * m_materialSensor = nullptr;
+ const GeoMaterial * m_materialGlass = nullptr;
- GeoPhysVol * m_inactive;
+ GeoPhysVol * m_inactive = nullptr;
- InDetDD::SiDetectorDesign * m_design;
+ InDetDD::SiDetectorDesign * m_design = nullptr;
mutable std::atomic_bool m_noElementWarning;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSpine.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSpine.h
index bfc92c50cb5..b9622f76e40 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSpine.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSpine.h
@@ -38,13 +38,13 @@ private:
int m_ringType;
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- double m_thickness;
- double m_width;
- double m_length;
- double m_moduleCenterToEnd;
- double m_moduleCenterToEndTmp;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
+ double m_length = 0.0;
+ double m_moduleCenterToEnd = 0.0;
+ double m_moduleCenterToEndTmp = 0.0;
};
#endif // SCT_GEOMODEL_SCT_FWDSPINE_H
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSubSpine.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSubSpine.h
index 38a01d88278..1899662da2c 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSubSpine.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSubSpine.h
@@ -48,19 +48,19 @@ private:
int m_ringType;
int m_spineSide;
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
- double m_thickness1;
- double m_width1;
- double m_length1;
+ double m_thickness1 = 0.0;
+ double m_width1 = 0.0;
+ double m_length1 = 0.0;
- double m_thickness2;
- double m_width2;
- double m_length2;
+ double m_thickness2 = 0.0;
+ double m_width2 = 0.0;
+ double m_length2 = 0.0;
- double m_thickness3;
- double m_width3;
- double m_length3;
+ double m_thickness3 = 0.0;
+ double m_width3 = 0.0;
+ double m_length3 = 0.0;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSupportFrame.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSupportFrame.h
index b94dfadac58..61d7f9bb45a 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSupportFrame.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdSupportFrame.h
@@ -36,15 +36,15 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- double m_innerRadius;
- double m_thickness;
- double m_zMin;
- double m_zMax;
+ double m_innerRadius = 0.0;
+ double m_thickness = 0.0;
+ double m_zMin = 0.0;
+ double m_zMax = 0.0;
- double m_outerRadius;
- double m_length;
+ double m_outerRadius = 0.0;
+ double m_length = 0.0;
};
#endif // SCT_GEOMODEL_SCT_FWDSUPPORTFRAME_H
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdThermalShieldElement.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdThermalShieldElement.h
index 302539bfbea..532f22d3283 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdThermalShieldElement.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdThermalShieldElement.h
@@ -38,15 +38,15 @@ private:
virtual GeoVPhysVol * build();
std::string m_materialName;
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
int m_iElement;
- double m_innerRadius;
- double m_outerRadius;
- double m_zMin;
- double m_zMax;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_zMin = 0.0;
+ double m_zMax = 0.0;
- double m_length;
+ double m_length = 0.0;
};
#endif // SCT_GEOMODEL_SCT_FWDTHERMALSHIELDELEMENT_H
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdWheel.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdWheel.h
index 064b84f9d97..80afd944e79 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdWheel.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FwdWheel.h
@@ -66,33 +66,33 @@ private:
int m_endcap;
// Basic parameters
- int m_numRings;
- double m_zPosition;
+ int m_numRings = 0;
+ double m_zPosition = 0.0;
std::vector<int> m_ringType;
std::vector<int> m_patchPanelType;
std::vector<double> m_patchPanelLocAngle;
std::vector<bool> m_patchPanelRepeatQuadrant;
- int m_numPatchPanelLocs;
- int m_numPatchPanelTypes;
- int m_numFSITypes;
- int m_numWheels;
- bool m_optoHarnessPresent;
- bool m_pPConnectorPresent;
- bool m_pPCoolingPresent;
- bool m_discFixationPresent;
+ int m_numPatchPanelLocs = 0;
+ int m_numPatchPanelTypes = 0;
+ int m_numFSITypes = 0;
+ int m_numWheels = 0;
+ bool m_optoHarnessPresent = false;
+ bool m_pPConnectorPresent = false;
+ bool m_pPCoolingPresent = false;
+ bool m_discFixationPresent = false;
std::vector<double> m_discFixationLocAngle;
// Derived parameters
- double m_innerRadius;
- double m_outerRadius;
- double m_thickness;
- double m_thicknessFront;
- double m_thicknessBack;
- int m_totalModules;
- int m_rotateWheel;
- double m_ringMaxRadius;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_thickness = 0.0;
+ double m_thicknessFront = 0.0;
+ double m_thicknessBack = 0.0;
+ int m_totalModules = 0;
+ int m_rotateWheel = 0;
+ double m_ringMaxRadius = 0.0;
- double m_safety;
+ double m_safety = 0.0;
// Child detector elements
std::vector<std::unique_ptr<SCT_FwdRing>> m_rings;
@@ -106,7 +106,7 @@ private:
const std::vector<SCT_FwdModule*> & m_modules;
- const std::vector<const FSIDetails *> * m_fsiVector;
+ const std::vector<const FSIDetails *> * m_fsiVector = nullptr;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Harness.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Harness.h
index 79243c1aae9..8b1358bcc7d 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Harness.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Harness.h
@@ -31,10 +31,10 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- double m_thickness;
- double m_width;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
double m_length;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Hybrid.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Hybrid.h
index 7046e978bb4..fc39d8a5fca 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Hybrid.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Hybrid.h
@@ -31,10 +31,10 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
- double m_thickness;
- double m_width;
- double m_length;
+ const GeoMaterial * m_material = nullptr;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
+ double m_length = 0.0;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_InnerSide.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_InnerSide.h
index 56a39034b5b..2c5936cfc83 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_InnerSide.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_InnerSide.h
@@ -64,19 +64,19 @@ private:
void getParameters();
virtual const GeoLogVol * preBuild();
- double m_thickness;
- double m_width;
- double m_length;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
+ double m_length = 0.0;
- double m_hybridOffsetX;
- double m_hybridOffsetZ;
- double m_safety;
+ double m_hybridOffsetX = 0.0;
+ double m_hybridOffsetZ = 0.0;
+ double m_safety = 0.0;
std::unique_ptr<SCT_Hybrid> m_hybrid;
std::unique_ptr<SCT_Sensor> m_sensor;
- GeoTransform * m_hybridPos;
- GeoTransform * m_sensorPos;
+ GeoTransform * m_hybridPos = nullptr;
+ GeoTransform * m_sensorPos = nullptr;
std::unique_ptr<GeoTrf::Vector3D> m_env1RefPointVector;
std::unique_ptr<GeoTrf::Vector3D> m_env2RefPointVector;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_InterLink.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_InterLink.h
index 518e168a23b..9ffb629bf49 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_InterLink.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_InterLink.h
@@ -39,27 +39,27 @@ private:
// Following are for interlink
std::string m_materialName;
- double m_innerRadius;
- double m_outerRadius;
- double m_length;
- double m_dPhi;
- double m_phiPos;
- int m_nRepeat;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_length = 0.0;
+ double m_dPhi = 0.0;
+ double m_phiPos = 0.0;
+ int m_nRepeat = 0;
// Following are for FSI flange
- bool m_includeFSIFlange;
- double m_innerRadiusFSIFlange;
- double m_outerRadiusFSIFlange;
+ bool m_includeFSIFlange = false;
+ double m_innerRadiusFSIFlange = 0.0;
+ double m_outerRadiusFSIFlange = 0.0;
std::string m_materialNameFSIFlange;
// Following are for B6 bearing
std::string m_materialNameBearing;
- double m_innerRadiusBearing;
- double m_outerRadiusBearing;
- double m_lengthBearing;
- double m_dPhiBearing;
- double m_phiPosBearing;
- int m_nRepeatBearing;
+ double m_innerRadiusBearing = 0.0;
+ double m_outerRadiusBearing = 0.0;
+ double m_lengthBearing = 0.0;
+ double m_dPhiBearing = 0.0;
+ double m_phiPosBearing = 0.0;
+ int m_nRepeatBearing = 0;
const GeoTube* m_interLinkShape;
const GeoLogVol* m_interLinkLog;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Layer.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Layer.h
index 651370bfe9f..d01ffa5ff2a 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Layer.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Layer.h
@@ -74,35 +74,35 @@ private:
// Layer number
int m_iLayer;
- int m_skisPerLayer;
- double m_tilt;
- int m_stereoSign;
- double m_radius;
- double m_safety;
+ int m_skisPerLayer = 0;
+ double m_tilt = 0.0;
+ int m_stereoSign = 0;
+ double m_radius = 0.0;
+ double m_safety = 0.0;
- double m_innerRadius;
- double m_outerRadius;
- double m_cylinderLength;
- double m_activeLength;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_cylinderLength = 0.0;
+ double m_activeLength = 0.0;
- double m_innerRadiusActive;
- double m_outerRadiusActive;
+ double m_innerRadiusActive = 0.0;
+ double m_outerRadiusActive = 0.0;
- double m_outerRadiusOfSupport;
+ double m_outerRadiusOfSupport = 0.0;
- double m_skiPhiStart;
- double m_skiAuxPhiStart;
+ double m_skiPhiStart = 0.0;
+ double m_skiAuxPhiStart = 0.0;
- double m_bracketPhiOffset;
- double m_phiRefModule;
-
- bool m_includeFSI;
- int m_nRepeatEndJewel;
- double m_phiEndJewel;
- double m_zEndJewel;
- int m_nRepeatScorpion;
- double m_phiScorpion;
- double m_zScorpion;
+ double m_bracketPhiOffset = 0.0;
+ double m_phiRefModule = 0.0;
+
+ bool m_includeFSI = false;
+ int m_nRepeatEndJewel = 0;
+ double m_phiEndJewel = 0.0;
+ double m_zEndJewel = 0.0;
+ int m_nRepeatScorpion = 0;
+ double m_phiScorpion = 0.0;
+ double m_zScorpion = 0.0;
SCT_Module* m_module;
std::unique_ptr<SCT_Ski> m_ski;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Module.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Module.h
index 202b2d3fd00..fe7d4914c11 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Module.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Module.h
@@ -71,28 +71,28 @@ private:
void getParameters();
virtual const GeoLogVol * preBuild();
- double m_thickness;
- double m_width;
- double m_length;
-
- double m_env1Thickness;
- double m_env1Width;
- double m_env1Length;
- double m_env2Thickness;
- double m_env2Width;
- double m_env2Length;
-
- double m_activeWidth;
-
- double m_baseBoardOffsetY;
- double m_baseBoardOffsetZ;
-
- double m_sensorGap;
- double m_stereoInner;
- double m_stereoOuter;
- double m_stereoAngle;
- int m_upperSide;
- double m_safety;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
+ double m_length = 0.0;
+
+ double m_env1Thickness = 0.0;
+ double m_env1Width = 0.0;
+ double m_env1Length = 0.0;
+ double m_env2Thickness = 0.0;
+ double m_env2Width = 0.0;
+ double m_env2Length = 0.0;
+
+ double m_activeWidth = 0.0;
+
+ double m_baseBoardOffsetY = 0.0;
+ double m_baseBoardOffsetZ = 0.0;
+
+ double m_sensorGap = 0.0;
+ double m_stereoInner = 0.0;
+ double m_stereoOuter = 0.0;
+ double m_stereoAngle = 0.0;
+ int m_upperSide = 0;
+ double m_safety = 0.0;
std::unique_ptr<SCT_InnerSide> m_innerSide;
std::unique_ptr<SCT_OuterSide> m_outerSide;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_OuterSide.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_OuterSide.h
index 3dede87b925..52950eec2ee 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_OuterSide.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_OuterSide.h
@@ -57,21 +57,21 @@ private:
void getParameters();
virtual const GeoLogVol * preBuild();
- double m_thickness;
- double m_width;
- double m_length;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
+ double m_length = 0.0;
- double m_hybridOffsetX;
- double m_hybridOffsetZ;
- double m_safety;
+ double m_hybridOffsetX = 0.0;
+ double m_hybridOffsetZ = 0.0;
+ double m_safety = 0.0;
std::unique_ptr<SCT_Hybrid> m_hybrid;
std::unique_ptr<SCT_Pigtail> m_pigtail;
std::unique_ptr<SCT_Sensor> m_sensor;
- GeoTransform * m_hybridPos;
- GeoTransform * m_pigtailPos;
- GeoTransform * m_sensorPos;
+ GeoTransform * m_hybridPos = nullptr;
+ GeoTransform * m_pigtailPos = nullptr;
+ GeoTransform * m_sensorPos = nullptr;
std::unique_ptr<GeoTrf::Vector3D> m_env1RefPointVector;
std::unique_ptr<GeoTrf::Vector3D> m_env2RefPointVector;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Pigtail.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Pigtail.h
index 7ad7ef872c8..f6b43a0d6ee 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Pigtail.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Pigtail.h
@@ -31,10 +31,10 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
- double m_thickness;
- double m_width;
- double m_length;
+ const GeoMaterial * m_material = nullptr;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
+ double m_length = 0.0;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_PixelAttachment.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_PixelAttachment.h
index f8470545495..6b01533611b 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_PixelAttachment.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_PixelAttachment.h
@@ -37,14 +37,14 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
- double m_innerRadius;
- double m_outerRadius;
- double m_zMin;
- double m_zMax;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_zMin = 0.0;
+ double m_zMax = 0.0;
- double m_length;
+ double m_length = 0.0;
};
#endif // SCT_GEOMODEL_SCT_PIXELATTACHMENT_H
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_PowerTape.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_PowerTape.h
index 6440152146a..62d54cc39ce 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_PowerTape.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_PowerTape.h
@@ -33,9 +33,9 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
- double m_thickness;
- double m_width;
+ const GeoMaterial * m_material = nullptr;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
double m_length;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Sensor.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Sensor.h
index d77710e9d46..1660f1eaada 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Sensor.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Sensor.h
@@ -35,12 +35,12 @@ private:
virtual const GeoLogVol * preBuild();
void makeDesign();
- const GeoMaterial * m_material;
- double m_thickness;
- double m_width;
- double m_length;
+ const GeoMaterial * m_material = nullptr;
+ double m_thickness = 0.0;
+ double m_width = 0.0;
+ double m_length = 0.0;
- InDetDD::SiDetectorDesign * m_design;
+ InDetDD::SiDetectorDesign * m_design = nullptr;
mutable std::atomic_bool m_noElementWarning;
};
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Ski.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Ski.h
index 7baa2fd5480..86017870602 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Ski.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Ski.h
@@ -84,10 +84,10 @@ private:
void getParameters();
virtual const GeoLogVol * preBuild();
- double m_radialSep;
- int m_firstStagger;
- int m_modulesPerSki;
- double m_safety;
+ double m_radialSep = 0.0;
+ int m_firstStagger = 0;
+ int m_modulesPerSki = 0;
+ double m_safety = 0.0;
std::vector<double> m_zPos;
std::vector<int> m_id;
@@ -96,45 +96,45 @@ private:
double m_tilt;
double m_length;
- double m_width;
- double m_thickness;
+ double m_width = 0.0;
+ double m_thickness = 0.0;
// These are currently all set to zero.
- double m_doglegPhiOffset;
- double m_doglegRadialOffset;
- double m_coolingBlockPhiOffset;
- double m_coolingBlockRadialOffset;
- double m_coolingPipeRadialOffset;
- double m_coolingPipePhiOffset;
+ double m_doglegPhiOffset = 0.0;
+ double m_doglegRadialOffset = 0.0;
+ double m_coolingBlockPhiOffset = 0.0;
+ double m_coolingBlockRadialOffset = 0.0;
+ double m_coolingPipeRadialOffset = 0.0;
+ double m_coolingPipePhiOffset = 0.0;
// There are cooling block & cooling pipe offset parameters.
- double m_coolingBlockOffsetX;
- double m_coolingBlockOffsetY;
- double m_coolingBlockOffsetZ;
- double m_coolingPipeOffsetX;
- double m_coolingPipeOffsetY;
+ double m_coolingBlockOffsetX = 0.0;
+ double m_coolingBlockOffsetY = 0.0;
+ double m_coolingBlockOffsetZ = 0.0;
+ double m_coolingPipeOffsetX = 0.0;
+ double m_coolingPipeOffsetY = 0.0;
- double m_doglegOffsetX;
- double m_doglegOffsetY;
+ double m_doglegOffsetX = 0.0;
+ double m_doglegOffsetY = 0.0;
SCT_Module* m_module;
std::unique_ptr<SCT_Dogleg> m_dogleg;
std::unique_ptr<SCT_CoolingBlock> m_coolingBlock;
std::unique_ptr<SCT_CoolingPipe> m_coolingPipe;
- GeoTransform * m_refPointTransform;
- GeoTransform * m_coolingPipePos;
+ GeoTransform * m_refPointTransform = nullptr;
+ GeoTransform * m_coolingPipePos = nullptr;
//! For calculations of envelopes of SCT_DetailLayer.
std::unique_ptr<GeoTrf::Vector3D> m_env1RefPointVector;
//! For calculations of envelopes of SCT_DetailLayer.
std::unique_ptr<GeoTrf::Vector3D> m_env2RefPointVector;
- double m_env1Thickness;
- double m_env1Width;
- double m_env2Thickness;
- double m_env2Width;
+ double m_env1Thickness = 0.0;
+ double m_env1Width = 0.0;
+ double m_env2Thickness = 0.0;
+ double m_env2Width = 0.0;
std::vector<GeoNameTag *> m_nameTag;
std::vector<GeoTrf::Transform3D> m_modulePos;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SkiAux.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SkiAux.h
index d01b0935332..2a5a8e1ee73 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SkiAux.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SkiAux.h
@@ -60,11 +60,11 @@ private:
// Basic/derived parameters
double m_innerRadius;
- double m_outerRadius;
- double m_length;
+ double m_outerRadius = 0.0;
+ double m_length = 0.0;
double m_bracketPhiOffset;
double m_powerTapePhiOffset;
- double m_sectorStartAngle;
+ double m_sectorStartAngle = 0.0;
double m_sectorAngle;
// Child detector elements
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SkiPowerTape.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SkiPowerTape.h
index 1542267f6e0..6a0b9b10395 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SkiPowerTape.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SkiPowerTape.h
@@ -37,16 +37,16 @@ private:
// Basic and Derived parameters
double m_length;
- double m_width;
- double m_thickness;
- double m_powerTapeThickness;
+ double m_width = 0.0;
+ double m_thickness = 0.0;
+ double m_powerTapeThickness = 0.0;
// Child detector elements
const SCT_Ski * m_ski;
// 15th Aug 2005 S.Mima modified.
// Power Tape Z Offset from Bracket
- double m_powerTapeStartPointOffset;
+ double m_powerTapeStartPointOffset = 0.0;
};
#endif // SCT_GEOMODEL_SCT_SKIPOWERTAPE_H
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Spider.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Spider.h
index 35bfe08ba79..d4c6fd1bdc7 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Spider.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_Spider.h
@@ -31,11 +31,11 @@ private:
void getParameters();
virtual GeoVPhysVol * build();
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- double m_innerRadius;
- double m_outerRadius;
- double m_length;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
+ double m_length = 0.0;
};
#endif // SCT_GEOMODEL_SCT_SPIDER_H
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SupportCyl.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SupportCyl.h
index 2f671952e1a..ee7243a055a 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SupportCyl.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SupportCyl.h
@@ -33,10 +33,10 @@ private:
int m_iLayer;
- const GeoMaterial * m_material;
+ const GeoMaterial * m_material = nullptr;
std::string m_materialName;
- double m_innerRadius;
- double m_outerRadius;
+ double m_innerRadius = 0.0;
+ double m_outerRadius = 0.0;
double m_length;
};
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/TRTFastDigitizationTool.h b/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/TRTFastDigitizationTool.h
index 591fa126299..225c9def28d 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/TRTFastDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/TRTFastDigitizationTool.h
@@ -149,11 +149,11 @@ private:
float m_NCollPerEvent;
// numerical constants. Might wish to move these to a DB in the future
- double m_trtTailFraction; // fraction in tails
- double m_trtSigmaDriftRadiusTail; // sigma of one TRT straw in R
+ double m_trtTailFraction = 0.0; // fraction in tails
+ double m_trtSigmaDriftRadiusTail = 0.0; // sigma of one TRT straw in R
double m_trtHighProbabilityBoostBkg;
double m_trtHighProbabilityBoostEle;
- double m_cFit[ 8 ][ 5 ]; // efficiency and resolution
+ double m_cFit[ 8 ][ 5 ]{}; // efficiency and resolution
};
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondBase.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondBase.cxx
index 2333490adbf..8405ae1ca46 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondBase.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondBase.cxx
@@ -115,7 +115,7 @@ void TRTDigCondBase::initialize(CLHEP::HepRandomEngine* rndmEngine) {
//Get info about the straw conditions, then create and fill the strawstate
double noiselevel, relative_noiseamplitude;
setStrawStateInfo( strawId, strawLength, noiselevel, relative_noiseamplitude, rndmEngine );
- StrawState strawstate;
+ StrawState strawstate{};
strawstate.noiselevel = noiselevel; // same for all gas types
strawstate.lowthreshold = ( !(hitid & 0x00200000) ) ? m_settings->lowThresholdBar(strawGasType) : m_settings->lowThresholdEC(strawGasType);
strawstate.noiseamplitude= relative_noiseamplitude; // These two are later regulated noise code
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.h
index 5d4a31ae2b3..3a376fe26db 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.h
@@ -251,124 +251,124 @@ private:
//---First a list of data members used for holding the parameters:
unsigned int m_digversion;
- bool m_useMagneticFieldMap;
- bool m_getT0FromData;
- unsigned int m_storeSDO; /**< Time window in which to store SDOs*/
-
- double m_ionisationPotential; /**< Mean ionisation potential */
- double m_ionisationPotentialArgon; /**< Mean ionisation potential for Argon mixture */
- double m_ionisationPotentialKrypton; /**< Mean ionisation potential for Krypton mixture */
- double m_smearingFactor; /**< Cluster energy smearing factor */
- double m_smearingFactorArgon; /**< Cluster energy smearing factor for Argon mixture */
- double m_smearingFactorKrypton; /**< Cluster energy smearing factor for Krypton mixture */
-
- double m_timeInterval; /**< Time interval covered by each digit*/
- unsigned int m_numberOfBins; /**< No. bins used internally */
- unsigned int m_numberOfBinsInEncodingBin; /**< No. internal bins for each
+ bool m_useMagneticFieldMap = false;
+ bool m_getT0FromData = false;
+ unsigned int m_storeSDO = 0U; /**< Time window in which to store SDOs*/
+
+ double m_ionisationPotential = 0.0; /**< Mean ionisation potential */
+ double m_ionisationPotentialArgon = 0.0; /**< Mean ionisation potential for Argon mixture */
+ double m_ionisationPotentialKrypton = 0.0; /**< Mean ionisation potential for Krypton mixture */
+ double m_smearingFactor = 0.0; /**< Cluster energy smearing factor */
+ double m_smearingFactorArgon = 0.0; /**< Cluster energy smearing factor for Argon mixture */
+ double m_smearingFactorKrypton = 0.0; /**< Cluster energy smearing factor for Krypton mixture */
+
+ double m_timeInterval = 0.0; /**< Time interval covered by each digit*/
+ unsigned int m_numberOfBins = 0U; /**< No. bins used internally */
+ unsigned int m_numberOfBinsInEncodingBin = 0U; /**< No. internal bins for each
* readout bit */
- double m_minDiscriminatorWidth; /**< Min. discriminator width */
- double m_discriminatorSettlingTime; /**< Discriminator settling time */
- double m_discriminatorDeadTime; /**< Discriminator dead time */
- double m_signalPropagationSpeed;/**< Signal propagation time in signal wire*/
- double m_distanceToTimeFactor; /**< Fudge factor: time to distance */
-
- double m_lowThresholdBar; /**< Low threshold discriminator setting */
- double m_lowThresholdEC; /**< Low threshold discriminator setting */
-
- double m_lowThresholdBarArgon; /**< Low threshold discriminator setting for Argon mixture */
- double m_lowThresholdECArgon; /**< Low threshold discriminator setting for Argon mixture */
-
- double m_lowThresholdBarKrypton; /**< Low threshold discriminator setting for Krypton mixture */
- double m_lowThresholdECKrypton; /**< Low threshold discriminator setting for Krypton mixture */
-
- double m_highThresholdBarShort; /**< High threshold discriminator setting */
- double m_highThresholdBarLong; /**< High threshold discriminator setting */
- double m_highThresholdECAwheels; /**< High threshold discriminator setting */
- double m_highThresholdECBwheels; /**< High threshold discriminator setting */
-
- double m_highThresholdBarShortArgon; /**< High threshold discriminator setting Argon */
- double m_highThresholdBarLongArgon; /**< High threshold discriminator setting Argon */
- double m_highThresholdECAwheelsArgon; /**< High threshold discriminator setting Argon */
- double m_highThresholdECBwheelsArgon; /**< High threshold discriminator setting Argon */
-
- double m_highThresholdBarShortKrypton; /**< High threshold discriminator setting Krypton */
- double m_highThresholdBarLongKrypton; /**< High threshold discriminator setting Krypton */
- double m_highThresholdECAwheelsKrypton; /**< High threshold discriminator setting Krypton */
- double m_highThresholdECBwheelsKrypton; /**< High threshold discriminator setting Krypton */
-
- int m_htT0shiftBarShort; /** HT T0 shift */
- int m_htT0shiftBarLong;
- int m_htT0shiftECAwheels;
- int m_htT0shiftECBwheels;
-
- int m_ltT0shiftBarShortXe; /** LT T0 shift */
- int m_ltT0shiftBarShortKr;
- int m_ltT0shiftBarShortAr;
- int m_ltT0shiftBarLongXe;
- int m_ltT0shiftBarLongKr;
- int m_ltT0shiftBarLongAr;
- int m_ltT0shiftECAwheelsXe;
- int m_ltT0shiftECAwheelsKr;
- int m_ltT0shiftECAwheelsAr;
- int m_ltT0shiftECBwheelsXe;
- int m_ltT0shiftECBwheelsKr;
- int m_ltT0shiftECBwheelsAr;
-
- double m_innerRadiusOfStraw; /**< Inner radius of straw */
- double m_outerRadiusOfWire; /**< Radius of drift wire */
- double m_lengthOfDeadRegion; /**< Length of dead region at straw end */
-
- bool m_timeCorrection; /**< Corrrect for flight and wire propagation delays*/
-
- unsigned int m_numberOfCrossingsBeforeMain; /**< For pileup: BCs before main
+ double m_minDiscriminatorWidth = 0.0; /**< Min. discriminator width */
+ double m_discriminatorSettlingTime = 0.0; /**< Discriminator settling time */
+ double m_discriminatorDeadTime = 0.0; /**< Discriminator dead time */
+ double m_signalPropagationSpeed = 0.0;/**< Signal propagation time in signal wire*/
+ double m_distanceToTimeFactor = 0.0; /**< Fudge factor: time to distance */
+
+ double m_lowThresholdBar = 0.0; /**< Low threshold discriminator setting */
+ double m_lowThresholdEC = 0.0; /**< Low threshold discriminator setting */
+
+ double m_lowThresholdBarArgon = 0.0; /**< Low threshold discriminator setting for Argon mixture */
+ double m_lowThresholdECArgon = 0.0; /**< Low threshold discriminator setting for Argon mixture */
+
+ double m_lowThresholdBarKrypton = 0.0; /**< Low threshold discriminator setting for Krypton mixture */
+ double m_lowThresholdECKrypton = 0.0; /**< Low threshold discriminator setting for Krypton mixture */
+
+ double m_highThresholdBarShort = 0.0; /**< High threshold discriminator setting */
+ double m_highThresholdBarLong = 0.0; /**< High threshold discriminator setting */
+ double m_highThresholdECAwheels = 0.0; /**< High threshold discriminator setting */
+ double m_highThresholdECBwheels = 0.0; /**< High threshold discriminator setting */
+
+ double m_highThresholdBarShortArgon = 0.0; /**< High threshold discriminator setting Argon */
+ double m_highThresholdBarLongArgon = 0.0; /**< High threshold discriminator setting Argon */
+ double m_highThresholdECAwheelsArgon = 0.0; /**< High threshold discriminator setting Argon */
+ double m_highThresholdECBwheelsArgon = 0.0; /**< High threshold discriminator setting Argon */
+
+ double m_highThresholdBarShortKrypton = 0.0; /**< High threshold discriminator setting Krypton */
+ double m_highThresholdBarLongKrypton = 0.0; /**< High threshold discriminator setting Krypton */
+ double m_highThresholdECAwheelsKrypton = 0.0; /**< High threshold discriminator setting Krypton */
+ double m_highThresholdECBwheelsKrypton = 0.0; /**< High threshold discriminator setting Krypton */
+
+ int m_htT0shiftBarShort = 0; /** HT T0 shift */
+ int m_htT0shiftBarLong = 0;
+ int m_htT0shiftECAwheels = 0;
+ int m_htT0shiftECBwheels = 0;
+
+ int m_ltT0shiftBarShortXe = 0; /** LT T0 shift */
+ int m_ltT0shiftBarShortKr = 0;
+ int m_ltT0shiftBarShortAr = 0;
+ int m_ltT0shiftBarLongXe = 0;
+ int m_ltT0shiftBarLongKr = 0;
+ int m_ltT0shiftBarLongAr = 0;
+ int m_ltT0shiftECAwheelsXe = 0;
+ int m_ltT0shiftECAwheelsKr = 0;
+ int m_ltT0shiftECAwheelsAr = 0;
+ int m_ltT0shiftECBwheelsXe = 0;
+ int m_ltT0shiftECBwheelsKr = 0;
+ int m_ltT0shiftECBwheelsAr = 0;
+
+ double m_innerRadiusOfStraw = 0.0; /**< Inner radius of straw */
+ double m_outerRadiusOfWire = 0.0; /**< Radius of drift wire */
+ double m_lengthOfDeadRegion = 0.0; /**< Length of dead region at straw end */
+
+ bool m_timeCorrection = false; /**< Corrrect for flight and wire propagation delays*/
+
+ unsigned int m_numberOfCrossingsBeforeMain = 0U; /**< For pileup: BCs before main
* event */
- double m_pileUpSDOsMinEkin; /**< Min. Ekin for pileup particle to appear in MC-truth */
- double m_maxVertexDisplacement; /**< Max. vertex displacement */
- double m_timeOffsetCalcVertexX; /**< x-coord. of point where particle is assumed to originate */
- double m_timeOffsetCalcVertexY; /**< y-coord. of point where particle is assumed to originate */
- double m_timeOffsetCalcVertexZ; /**< z-coord. of point where particle is assumed to originate */
- bool m_electronicsAreAtFarEnd; /**< Electronics assumed at far end of straw */
- bool m_timeshiftsSymmetricForPhiSectors; /**< Time offset assumed phi symmetric */
-
- double m_trEfficiencyBarrel; /**< Transition Radiation efficiency, barrel */
- double m_trEfficiencyEndCapA; /**< Transition Radiation efficiency, end cap A*/
- double m_trEfficiencyEndCapB; /**< Transition Radiation efficiency, end cap B*/
- double m_trEfficiencyBarrelArgon; /**< Transition Radiation efficiency, barrel, Argon */
- double m_trEfficiencyEndCapAArgon; /**< Transition Radiation efficiency, end cap A, Argon */
- double m_trEfficiencyEndCapBArgon; /**< Transition Radiation efficiency, end cap B, Argon */
- double m_trEfficiencyBarrelKrypton; /**< Transition Radiation efficiency, barrel, Krypton */
- double m_trEfficiencyEndCapAKrypton; /**< Transition Radiation efficiency, end cap A, Krypton */
- double m_trEfficiencyEndCapBKrypton; /**< Transition Radiation efficiency, end cap B, Krypton */
-
- bool m_noiseInUnhitStraws; /**< Simulate noise in unhit straws */
- bool m_noiseInSimhits; /**< Simulate noise in hit straws */
-
- bool m_isCTB; /**< Data is from CTB (Combined Test Beam) */
-
- bool m_killEndCap; /**< Disable end cap */
- bool m_killBarrel; /**< Disable barrel */
- double m_jitterTimeOffset; /**< Event time not correlated with LHC clock */
- bool m_doCosmicTimingPit; /**< Cosmics pit setup */
- bool m_doCrosstalk; /**< Crosstalk noise */
-
- unsigned int m_cosmicFlag; /**< Data is cosmics */
- bool m_isOverlay; /**< Doing overlay */
-
- double m_fastElectronicsNoisePulseDistance; /**< Fast electronics noise pulse distance (time) */
- double m_slowPeriodicNoisePulseDistance; /**< Slow periodic noise pulse distance (time) */
- double m_slowPeriodicNoisePulseFraction; /**< Slow periodic noise pulse fraction */
- double m_averageNoiseLevel; /**< Average noise level */
- double m_crosstalkNoiseLevel; /**< Average cross talk noise level */
- double m_crosstalkNoiseLevelOtherEnd; /**< Average cross talk noise level - other end */
-
- double m_relativeLowThresholdFluctuation; /**< Relative low threshold fluctuation */
- double m_relativeHighThresholdFluctuation; /**< Relative high threshold fluctuation */
- double m_solenoidFieldStrength; /**< Solenoid field strength */
-
- bool m_useAttenuation;
- double m_attenuationLength;
-
- double m_trtRangeCutProperty; /**< Electrons xenon range cut in TRT simulation */
+ double m_pileUpSDOsMinEkin = 0.0; /**< Min. Ekin for pileup particle to appear in MC-truth */
+ double m_maxVertexDisplacement = 0.0; /**< Max. vertex displacement */
+ double m_timeOffsetCalcVertexX = 0.0; /**< x-coord. of point where particle is assumed to originate */
+ double m_timeOffsetCalcVertexY = 0.0; /**< y-coord. of point where particle is assumed to originate */
+ double m_timeOffsetCalcVertexZ = 0.0; /**< z-coord. of point where particle is assumed to originate */
+ bool m_electronicsAreAtFarEnd = false; /**< Electronics assumed at far end of straw */
+ bool m_timeshiftsSymmetricForPhiSectors = false; /**< Time offset assumed phi symmetric */
+
+ double m_trEfficiencyBarrel = 0.0; /**< Transition Radiation efficiency, barrel */
+ double m_trEfficiencyEndCapA = 0.0; /**< Transition Radiation efficiency, end cap A*/
+ double m_trEfficiencyEndCapB = 0.0; /**< Transition Radiation efficiency, end cap B*/
+ double m_trEfficiencyBarrelArgon = 0.0; /**< Transition Radiation efficiency, barrel, Argon */
+ double m_trEfficiencyEndCapAArgon = 0.0; /**< Transition Radiation efficiency, end cap A, Argon */
+ double m_trEfficiencyEndCapBArgon = 0.0; /**< Transition Radiation efficiency, end cap B, Argon */
+ double m_trEfficiencyBarrelKrypton = 0.0; /**< Transition Radiation efficiency, barrel, Krypton */
+ double m_trEfficiencyEndCapAKrypton = 0.0; /**< Transition Radiation efficiency, end cap A, Krypton */
+ double m_trEfficiencyEndCapBKrypton = 0.0; /**< Transition Radiation efficiency, end cap B, Krypton */
+
+ bool m_noiseInUnhitStraws = false; /**< Simulate noise in unhit straws */
+ bool m_noiseInSimhits = false; /**< Simulate noise in hit straws */
+
+ bool m_isCTB = false; /**< Data is from CTB (Combined Test Beam) */
+
+ bool m_killEndCap = false; /**< Disable end cap */
+ bool m_killBarrel = false; /**< Disable barrel */
+ double m_jitterTimeOffset = 0.0; /**< Event time not correlated with LHC clock */
+ bool m_doCosmicTimingPit = false; /**< Cosmics pit setup */
+ bool m_doCrosstalk = false; /**< Crosstalk noise */
+
+ unsigned int m_cosmicFlag = 0U; /**< Data is cosmics */
+ bool m_isOverlay = false; /**< Doing overlay */
+
+ double m_fastElectronicsNoisePulseDistance = 0.0; /**< Fast electronics noise pulse distance (time) */
+ double m_slowPeriodicNoisePulseDistance = 0.0; /**< Slow periodic noise pulse distance (time) */
+ double m_slowPeriodicNoisePulseFraction = 0.0; /**< Slow periodic noise pulse fraction */
+ double m_averageNoiseLevel = 0.0; /**< Average noise level */
+ double m_crosstalkNoiseLevel = 0.0; /**< Average cross talk noise level */
+ double m_crosstalkNoiseLevelOtherEnd = 0.0; /**< Average cross talk noise level - other end */
+
+ double m_relativeLowThresholdFluctuation = 0.0; /**< Relative low threshold fluctuation */
+ double m_relativeHighThresholdFluctuation = 0.0; /**< Relative high threshold fluctuation */
+ double m_solenoidFieldStrength = 0.0; /**< Solenoid field strength */
+
+ bool m_useAttenuation = false;
+ double m_attenuationLength = 0.0;
+
+ double m_trtRangeCutProperty = 0.0; /**< Electrons xenon range cut in TRT simulation */
//Now follows infrastructure for handling all the parameters in a robust way:
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.h
index 3482fff78b5..c1ef4689afe 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.h
@@ -133,22 +133,22 @@ private:
TRTElectronicsNoise * m_pElectronicsNoise;
- double m_timeInterval; /**< Time interval covered by digit [75 ns] */
+ double m_timeInterval = 0.0; /**< Time interval covered by digit [75 ns] */
- int m_totalNumberOfBins; /**< Total no. internal bins */
- int m_numberOfPreZeroBins; /**< No. internal bins before main event */
- int m_numberOfPostZeroBins; /**< No. internal bins after main event */
+ int m_totalNumberOfBins = 0; /**< Total no. internal bins */
+ int m_numberOfPreZeroBins = 0; /**< No. internal bins before main event */
+ int m_numberOfPostZeroBins = 0; /**< No. internal bins after main event */
- double m_binWidth; /**< Time interval corresponding to each internal bin*/
+ double m_binWidth = 0.0; /**< Time interval corresponding to each internal bin*/
- int m_minDiscriminatorWidthInBinWidths; /**< Min. discriminator width [internal bins]*/
- int m_discriminatorSettlingTimeInBinWidths; /**< Discriminator settling time [bins] */
- int m_discriminatorDeadTimeInBinWidths; /**< Discriminator dead time [int. bins] */
- int m_minWidthMinusSettlingTimeInBinWidths; /**< Min. discriminator time minus settling * time [internal bins] */
+ int m_minDiscriminatorWidthInBinWidths = 0; /**< Min. discriminator width [internal bins]*/
+ int m_discriminatorSettlingTimeInBinWidths = 0; /**< Discriminator settling time [bins] */
+ int m_discriminatorDeadTimeInBinWidths = 0; /**< Discriminator dead time [int. bins] */
+ int m_minWidthMinusSettlingTimeInBinWidths = 0; /**< Min. discriminator time minus settling * time [internal bins] */
// 0:Xe,1:Kr,2:Ar
- double m_lowThresholdBar[3];
- double m_lowThresholdEC[3];
+ double m_lowThresholdBar[3]{};
+ double m_lowThresholdEC[3]{};
std::vector<double> m_lowThresholdSignalShape[3];
std::vector<double> m_highThresholdSignalShape[3];
@@ -158,15 +158,15 @@ private:
// unsigned int m_maskHT; /**< mask - ever used? */
// Deposit energy in timed bins before shaping.
- double* m_energyDistribution;
+ double* m_energyDistribution = nullptr;
// LT and HT signals after shaping
std::vector<double> m_lowThresholdSignal;
std::vector<double> m_highThresholdSignal;
// LT and HT discriminated signals (bits).
- int* m_lowThresholdDiscriminator; /**< Signal after discrimination */
- int* m_highThresholdDiscriminator; /**< Signal after discrimination */
+ int* m_lowThresholdDiscriminator = nullptr; /**< Signal after discrimination */
+ int* m_highThresholdDiscriminator = nullptr; /**< Signal after discrimination */
mutable Athena::MsgStreamMember m_msg ATLAS_THREAD_SAFE;
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTProcessingOfStraw.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTProcessingOfStraw.h
index 45d63b7f62f..cc6031edc58 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTProcessingOfStraw.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTProcessingOfStraw.h
@@ -128,22 +128,22 @@ private:
ITRT_SimDriftTimeTool* m_pSimDriftTimeTool;
/** Time to be corrected for flight and wire propagation delays false when beamType='cosmics' */
- bool m_timeCorrection;
+ bool m_timeCorrection = false;
- double m_signalPropagationSpeed;
- double m_attenuationLength;
+ double m_signalPropagationSpeed = 0.0;
+ double m_attenuationLength = 0.0;
- bool m_useAttenuation;
- bool m_useMagneticFieldMap;
+ bool m_useAttenuation = false;
+ bool m_useMagneticFieldMap = false;
- double m_maxCrossingTime;
- double m_minCrossingTime;
- double m_shiftOfZeroPoint;
+ double m_maxCrossingTime = 0.0;
+ double m_minCrossingTime = 0.0;
+ double m_shiftOfZeroPoint = 0.0;
- double m_innerRadiusOfStraw;
- double m_outerRadiusOfWire;
+ double m_innerRadiusOfStraw = 0.0;
+ double m_outerRadiusOfWire = 0.0;
- double m_solenoidFieldStrength;
+ double m_solenoidFieldStrength = 0.0;
TRTTimeCorrection* m_pTimeCorrection;
@@ -229,7 +229,7 @@ private:
std::vector<double> m_drifttimes; // electron drift times
std::vector<double> m_expattenuation; // tabulation of exp()
- unsigned int m_maxelectrons; // maximum number of them (minmum is 100 for the Gaussian approx to be ok);
+ unsigned int m_maxelectrons = 0U; // maximum number of them (minmum is 100 for the Gaussian approx to be ok);
bool m_alreadywarnedagainstpdg0;
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTTimeCorrection.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTTimeCorrection.h
index 28f5e15ca32..a862b49a811 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTTimeCorrection.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTTimeCorrection.h
@@ -138,11 +138,11 @@ private:
const double m_notInitVal;
//Digitization parameters
- double m_signalPropagationSpeed;
- double m_lengthDeadRegion;
- double m_maxVertexDisplacement;
- bool m_timeShiftPhiSectSymmetry;
- bool m_getT0FromData;
+ double m_signalPropagationSpeed = 0.0;
+ double m_lengthDeadRegion = 0.0;
+ double m_maxVertexDisplacement = 0.0;
+ bool m_timeShiftPhiSectSymmetry = false;
+ bool m_getT0FromData = false;
const ITRT_CalDbTool* m_trtcaldbtool;
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RawDataProviderTool.h b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RawDataProviderTool.h
index f51771ddbe8..45e8b9b71c5 100644
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RawDataProviderTool.h
+++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RawDataProviderTool.h
@@ -41,7 +41,7 @@ class BCM_RawDataProviderTool : public AthAlgTool
StatusCode convert(std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs, BCM_RDO_Container* rdoCont) const;
private:
- mutable std::atomic<int> m_DecodeErrCount;
+ mutable std::atomic<int> m_DecodeErrCount{};
ToolHandle<BCM_RodDecoder> m_decoder;
};
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RodDecoder.h b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RodDecoder.h
index c603efde4c0..b9b2ff6eec6 100644
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RodDecoder.h
+++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RodDecoder.h
@@ -53,9 +53,9 @@ public:
BCM_RDO_Collection* getCollection(unsigned int chan, BCM_RDO_Container* cont) const;
private:
- mutable std::atomic<unsigned int> m_fragment_number;
- mutable std::atomic<unsigned int> m_LVL1A_number;
- mutable std::atomic<unsigned int> m_hit_number;
+ mutable std::atomic<unsigned int> m_fragment_number{};
+ mutable std::atomic<unsigned int> m_LVL1A_number{};
+ mutable std::atomic<unsigned int> m_hit_number{};
};
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/TRTRetriever.h b/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/TRTRetriever.h
index 691c77a2ebf..4e5d6fb7f47 100755
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/TRTRetriever.h
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/TRTRetriever.h
@@ -69,7 +69,7 @@ namespace JiveXML{
/// The StoreGate key for the TRT Cluster collection to retrieve
SG::ReadHandleKey<InDet::TRT_DriftCircleContainer> m_TRTDriftCircleCollKey{ this, "TRTClusters", "TRT_DriftCircles", "Container name for TRT Drift Circles" };
/// The StoreGate key for the TRT MultiTruthMap with the track associations
- bool m_useTRTTruthMap;
+ bool m_useTRTTruthMap = false;
SG::ReadHandleKey<PRD_MultiTruthCollection> m_TRTTruthMapKey{ this, "TRT_TruthMap", "PRD_MultiTruthTRT", "Container name for PRD Multi-truth TRT MAP" };
};
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx
index 0cf614ff9a8..6788c40f5fa 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx
@@ -155,7 +155,7 @@ StatusCode PixelRodDecoder::fillCollection( const ROBFragment *robFrag, IPixelRD
// @TODO find better solution for the error counter to avoid complex index computations and hard coded maximum size.
// The index array is defined in PixelRawDataProviderTool::SizeOfIDCInDetBSErrContainer()
- std::array<uint64_t, PixelRodDecoder::ERROR_CONTAINER_MAX> bsErrWord;
+ std::array<uint64_t, PixelRodDecoder::ERROR_CONTAINER_MAX> bsErrWord{};
std::fill(bsErrWord.begin(),bsErrWord.end(),0);
// Check ROD status
if (robFrag->nstatus()!=0) {
diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfBarrelStraws.hh b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfBarrelStraws.hh
index a292913192e..c7c7fa8092d 100644
--- a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfBarrelStraws.hh
+++ b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfBarrelStraws.hh
@@ -30,36 +30,36 @@ class TRTParametersOfBarrelStraws
void DefineParameters();
void PrintParameters(MsgStream& msg) const;
- double m_outerRadiusOfStrawHole;
- double m_lengthOfStrawHole;
+ double m_outerRadiusOfStrawHole = 0.0;
+ double m_lengthOfStrawHole = 0.0;
- double m_outerRadiusOfStraw;
- double m_lengthOfStraw;
+ double m_outerRadiusOfStraw = 0.0;
+ double m_lengthOfStraw = 0.0;
- double m_innerRadiusOfGas;
- double m_outerRadiusOfGas;
- double m_lengthOfGasL;
- double m_lengthOfGasS;
+ double m_innerRadiusOfGas = 0.0;
+ double m_outerRadiusOfGas = 0.0;
+ double m_lengthOfGasL = 0.0;
+ double m_lengthOfGasS = 0.0;
- double m_positionOfGasL;
- double m_positionOfGasS;
+ double m_positionOfGasL = 0.0;
+ double m_positionOfGasS = 0.0;
- double m_innerRadiusOfDeadRegion;
- double m_outerRadiusOfDeadRegion;
- double m_lengthOfDeadRegion;
- double m_lengthOfLongDeadRegion;
+ double m_innerRadiusOfDeadRegion = 0.0;
+ double m_outerRadiusOfDeadRegion = 0.0;
+ double m_lengthOfDeadRegion = 0.0;
+ double m_lengthOfLongDeadRegion = 0.0;
- double m_positionOfDeadRegionLA;
- double m_positionOfDeadRegionLB;
- double m_positionOfDeadRegionSA;
- double m_positionOfLongDeadRegionSB;
+ double m_positionOfDeadRegionLA = 0.0;
+ double m_positionOfDeadRegionLB = 0.0;
+ double m_positionOfDeadRegionSA = 0.0;
+ double m_positionOfLongDeadRegionSB = 0.0;
- double m_innerRadiusOfTwister;
- double m_outerRadiusOfTwister;
- double m_lengthOfTwister;
+ double m_innerRadiusOfTwister = 0.0;
+ double m_outerRadiusOfTwister = 0.0;
+ double m_lengthOfTwister = 0.0;
- double m_outerRadiusOfWire;
- double m_lengthOfWire;
+ double m_outerRadiusOfWire = 0.0;
+ double m_lengthOfWire = 0.0;
const TRTParameters* m_pParameters;
diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfModulesA.hh b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfModulesA.hh
index 700dfbeac96..6dbe86ffc81 100644
--- a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfModulesA.hh
+++ b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfModulesA.hh
@@ -30,47 +30,47 @@ private:
void DefineParameters();
void PrintParameters(MsgStream& msg, double*, double*) const;
- double m_baseOfShellTrd1A;
- double m_heightOfShellTrd1A;
+ double m_baseOfShellTrd1A = 0.0;
+ double m_heightOfShellTrd1A = 0.0;
- double m_baseOfShellTrd2A;
- double m_heightOfShellTrd2A;
+ double m_baseOfShellTrd2A = 0.0;
+ double m_heightOfShellTrd2A = 0.0;
- double m_xOfShellTrd2A;
- double m_zOfShellTrd2A;
- double m_phiOfShellTrd2A;
+ double m_xOfShellTrd2A = 0.0;
+ double m_zOfShellTrd2A = 0.0;
+ double m_phiOfShellTrd2A = 0.0;
- double m_x0OfShellA;
- double m_y0OfShellA;
- double m_phi0OfShellA;
+ double m_x0OfShellA = 0.0;
+ double m_y0OfShellA = 0.0;
+ double m_phi0OfShellA = 0.0;
- int m_numberOfModulesA;
- double m_lengthOfModuleA;
+ int m_numberOfModulesA = 0;
+ double m_lengthOfModuleA = 0.0;
- double m_baseOfRadiatorTrd1A;
- double m_heightOfRadiatorTrd1A;
+ double m_baseOfRadiatorTrd1A = 0.0;
+ double m_heightOfRadiatorTrd1A = 0.0;
- double m_baseOfRadiatorTrd2A;
- double m_heightOfRadiatorTrd2A;
+ double m_baseOfRadiatorTrd2A = 0.0;
+ double m_heightOfRadiatorTrd2A = 0.0;
- double m_xOfRadiatorTrd2A;
- double m_zOfRadiatorTrd2A;
- double m_phiOfRadiatorTrd2A;
+ double m_xOfRadiatorTrd2A = 0.0;
+ double m_zOfRadiatorTrd2A = 0.0;
+ double m_phiOfRadiatorTrd2A = 0.0;
- double m_xOfRadiatorA;
- double m_zOfRadiatorA;
+ double m_xOfRadiatorA = 0.0;
+ double m_zOfRadiatorA = 0.0;
- int m_numberOfHolesA;
+ int m_numberOfHolesA = 0;
- double* m_xLocalOfHolesA;
- double* m_zLocalOfHolesA;
+ double* m_xLocalOfHolesA = nullptr;
+ double* m_zLocalOfHolesA = nullptr;
- int m_numberOfCoolingTubesA;
+ int m_numberOfCoolingTubesA = 0;
- double* m_xOfCoolingTubesA;
- double* m_zOfCoolingTubesA;
+ double* m_xOfCoolingTubesA = nullptr;
+ double* m_zOfCoolingTubesA = nullptr;
- int m_numberOfShortStrawsA;
+ int m_numberOfShortStrawsA = 0;
const TRTParameters* m_pParameters;
diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfModulesB.hh b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfModulesB.hh
index a72270fd1e2..0a3cce7bd5a 100644
--- a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfModulesB.hh
+++ b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfModulesB.hh
@@ -30,50 +30,50 @@ class TRTParametersOfModulesB
void DefineParameters();
void PrintParameters(MsgStream& msg, double*, double*) const;
- double m_baseOfShellTrd1B;
- double m_heightOfShellTrd1B;
+ double m_baseOfShellTrd1B = 0.0;
+ double m_heightOfShellTrd1B = 0.0;
- double m_baseOfShellTrd2B;
- double m_heightOfShellTrd2B;
+ double m_baseOfShellTrd2B = 0.0;
+ double m_heightOfShellTrd2B = 0.0;
- double m_xOfShellTrd2B;
- double m_zOfShellTrd2B;
- double m_phiOfShellTrd2B;
+ double m_xOfShellTrd2B = 0.0;
+ double m_zOfShellTrd2B = 0.0;
+ double m_phiOfShellTrd2B = 0.0;
- double m_x0OfShellB;
- double m_y0OfShellB;
- double m_phi0OfShellB;
+ double m_x0OfShellB = 0.0;
+ double m_y0OfShellB = 0.0;
+ double m_phi0OfShellB = 0.0;
- int m_numberOfModulesB;
- double m_lengthOfModuleB;
+ int m_numberOfModulesB = 0;
+ double m_lengthOfModuleB = 0.0;
- double m_baseOfRadiatorTrd1B;
- double m_heightOfRadiatorTrd1B;
+ double m_baseOfRadiatorTrd1B = 0.0;
+ double m_heightOfRadiatorTrd1B = 0.0;
- double m_baseOfRadiatorTrd2B;
- double m_heightOfRadiatorTrd2B;
+ double m_baseOfRadiatorTrd2B = 0.0;
+ double m_heightOfRadiatorTrd2B = 0.0;
- double m_xOfRadiatorTrd2B;
- double m_zOfRadiatorTrd2B;
- double m_phiOfRadiatorTrd2B;
+ double m_xOfRadiatorTrd2B = 0.0;
+ double m_zOfRadiatorTrd2B = 0.0;
+ double m_phiOfRadiatorTrd2B = 0.0;
- double m_xOfRadiatorB;
- double m_zOfRadiatorB;
+ double m_xOfRadiatorB = 0.0;
+ double m_zOfRadiatorB = 0.0;
- int m_numberOfHolesB;
+ int m_numberOfHolesB = 0;
- double* m_xLocalOfHolesB;
- double* m_zLocalOfHolesB;
+ double* m_xLocalOfHolesB = nullptr;
+ double* m_zLocalOfHolesB = nullptr;
- int m_numberOfCoolingTubesB;
+ int m_numberOfCoolingTubesB = 0;
- double* m_xOfCoolingTubesB;
- double* m_zOfCoolingTubesB;
+ double* m_xOfCoolingTubesB = nullptr;
+ double* m_zOfCoolingTubesB = nullptr;
- double m_radiusOfHoleForCoolingTubeB;
+ double m_radiusOfHoleForCoolingTubeB = 0.0;
- double* m_xOfHolesForCoolingTubesB;
- double* m_zOfHolesForCoolingTubesB;
+ double* m_xOfHolesForCoolingTubesB = nullptr;
+ double* m_zOfHolesForCoolingTubesB = nullptr;
const TRTParameters* m_pParameters;
diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfModulesC.hh b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfModulesC.hh
index 73bb514bc89..36642e55315 100644
--- a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfModulesC.hh
+++ b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfModulesC.hh
@@ -30,50 +30,50 @@ private:
void DefineParameters();
void PrintParameters(MsgStream& msg, double*, double*) const;
- double m_baseOfShellTrd1C;
- double m_heightOfShellTrd1C;
+ double m_baseOfShellTrd1C = 0.0;
+ double m_heightOfShellTrd1C = 0.0;
- double m_baseOfShellTrd2C;
- double m_heightOfShellTrd2C;
+ double m_baseOfShellTrd2C = 0.0;
+ double m_heightOfShellTrd2C = 0.0;
- double m_xOfShellTrd2C;
- double m_zOfShellTrd2C;
- double m_phiOfShellTrd2C;
+ double m_xOfShellTrd2C = 0.0;
+ double m_zOfShellTrd2C = 0.0;
+ double m_phiOfShellTrd2C = 0.0;
- double m_x0OfShellC;
- double m_y0OfShellC;
- double m_phi0OfShellC;
+ double m_x0OfShellC = 0.0;
+ double m_y0OfShellC = 0.0;
+ double m_phi0OfShellC = 0.0;
- int m_numberOfModulesC;
- double m_lengthOfModuleC;
+ int m_numberOfModulesC = 0;
+ double m_lengthOfModuleC = 0.0;
- double m_baseOfRadiatorTrd1C;
- double m_heightOfRadiatorTrd1C;
+ double m_baseOfRadiatorTrd1C = 0.0;
+ double m_heightOfRadiatorTrd1C = 0.0;
- double m_baseOfRadiatorTrd2C;
- double m_heightOfRadiatorTrd2C;
+ double m_baseOfRadiatorTrd2C = 0.0;
+ double m_heightOfRadiatorTrd2C = 0.0;
- double m_xOfRadiatorTrd2C;
- double m_zOfRadiatorTrd2C;
- double m_phiOfRadiatorTrd2C;
+ double m_xOfRadiatorTrd2C = 0.0;
+ double m_zOfRadiatorTrd2C = 0.0;
+ double m_phiOfRadiatorTrd2C = 0.0;
- double m_xOfRadiatorC;
- double m_zOfRadiatorC;
+ double m_xOfRadiatorC = 0.0;
+ double m_zOfRadiatorC = 0.0;
- int m_numberOfHolesC;
+ int m_numberOfHolesC = 0;
- double* m_xLocalOfHolesC;
- double* m_zLocalOfHolesC;
+ double* m_xLocalOfHolesC = nullptr;
+ double* m_zLocalOfHolesC = nullptr;
- int m_numberOfCoolingTubesC;
+ int m_numberOfCoolingTubesC = 0;
- double* m_xOfCoolingTubesC;
- double* m_zOfCoolingTubesC;
+ double* m_xOfCoolingTubesC = nullptr;
+ double* m_zOfCoolingTubesC = nullptr;
- double m_radiusOfHoleForCoolingTubeC;
+ double m_radiusOfHoleForCoolingTubeC = 0.0;
- double* m_xOfHolesForCoolingTubesC;
- double* m_zOfHolesForCoolingTubesC;
+ double* m_xOfHolesForCoolingTubesC = nullptr;
+ double* m_zOfHolesForCoolingTubesC = nullptr;
const TRTParameters* m_pParameters;
diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfStrawPlanes.hh b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfStrawPlanes.hh
index 43001229236..f96d0f2d1ae 100644
--- a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfStrawPlanes.hh
+++ b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfStrawPlanes.hh
@@ -30,47 +30,47 @@ class TRTParametersOfStrawPlanes
void DefineParameters();
void PrintParameters(MsgStream& msg) const;
- double m_innerRadiusOfStrawPlanesAB;
- double m_innerRadiusOfStrawPlaneC;
- double m_outerRadiusOfStrawPlanesAB;
- double m_outerRadiusOfStrawPlaneC;
- double m_lengthOfStrawPlane;
-
- int m_numberOfSectorsAB;
- int m_numberOfSectorsC;
-
- double m_innerRadiusOfSectorsAB;
- double m_innerRadiusOfSectorC;
- double m_outerRadiusOfSectorsAB;
- double m_outerRadiusOfSectorC;
- double m_lengthOfSector;
-
- int m_numberOfStrawsInPlanesAB;
- int m_numberOfStrawsInPlaneC;
-
- int m_numberOfStrawsInSectorsAB;
- int m_numberOfStrawsInSectorC;
-
- double m_outerRadiusOfStraw;
- double m_lengthOfStrawsAB;
- double m_lengthOfStrawC;
- double m_positionOfStrawsAB;
- double m_positionOfStrawC;
-
- double m_innerRadiusOfGas;
- double m_outerRadiusOfGas;
- double m_lengthOfGasAB;
- double m_lengthOfGasC;
-
- double m_innerRadiusOfDeadRegion;
- double m_outerRadiusOfDeadRegion;
- double m_lengthOfDeadRegion;
- double m_positionOfDeadRegionsAB;
- double m_positionOfDeadRegionC;
-
- double m_outerRadiusOfWire;
- double m_lengthOfWiresAB;
- double m_lengthOfWireC;
+ double m_innerRadiusOfStrawPlanesAB = 0.0;
+ double m_innerRadiusOfStrawPlaneC = 0.0;
+ double m_outerRadiusOfStrawPlanesAB = 0.0;
+ double m_outerRadiusOfStrawPlaneC = 0.0;
+ double m_lengthOfStrawPlane = 0.0;
+
+ int m_numberOfSectorsAB = 0;
+ int m_numberOfSectorsC = 0;
+
+ double m_innerRadiusOfSectorsAB = 0.0;
+ double m_innerRadiusOfSectorC = 0.0;
+ double m_outerRadiusOfSectorsAB = 0.0;
+ double m_outerRadiusOfSectorC = 0.0;
+ double m_lengthOfSector = 0.0;
+
+ int m_numberOfStrawsInPlanesAB = 0;
+ int m_numberOfStrawsInPlaneC = 0;
+
+ int m_numberOfStrawsInSectorsAB = 0;
+ int m_numberOfStrawsInSectorC = 0;
+
+ double m_outerRadiusOfStraw = 0.0;
+ double m_lengthOfStrawsAB = 0.0;
+ double m_lengthOfStrawC = 0.0;
+ double m_positionOfStrawsAB = 0.0;
+ double m_positionOfStrawC = 0.0;
+
+ double m_innerRadiusOfGas = 0.0;
+ double m_outerRadiusOfGas = 0.0;
+ double m_lengthOfGasAB = 0.0;
+ double m_lengthOfGasC = 0.0;
+
+ double m_innerRadiusOfDeadRegion = 0.0;
+ double m_outerRadiusOfDeadRegion = 0.0;
+ double m_lengthOfDeadRegion = 0.0;
+ double m_positionOfDeadRegionsAB = 0.0;
+ double m_positionOfDeadRegionC = 0.0;
+
+ double m_outerRadiusOfWire = 0.0;
+ double m_lengthOfWiresAB = 0.0;
+ double m_lengthOfWireC = 0.0;
const TRTParameters* m_pParameters;
diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfWheelsA.hh b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfWheelsA.hh
index a6a79461fe8..21de322e795 100644
--- a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfWheelsA.hh
+++ b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfWheelsA.hh
@@ -31,40 +31,40 @@ class TRTParametersOfWheelsA
void DefineParameters();
void PrintParameters(MsgStream& msg) const;
- int m_numberOfWheelsA;
- double m_distanceBetweenWheelsA;
- double* m_positionsOfWheelsA;
+ int m_numberOfWheelsA = 0;
+ double m_distanceBetweenWheelsA = 0.0;
+ double* m_positionsOfWheelsA = nullptr;
- double m_innerRadiusOfWheelA;
- double m_outerRadiusOfWheelA;
- double m_lengthOfWheelA;
+ double m_innerRadiusOfWheelA = 0.0;
+ double m_outerRadiusOfWheelA = 0.0;
+ double m_lengthOfWheelA = 0.0;
- double m_innerRadiusOfInnerSupportA;
- double m_outerRadiusOfInnerSupportA;
- double m_lengthOfInnerSupportA;
+ double m_innerRadiusOfInnerSupportA = 0.0;
+ double m_outerRadiusOfInnerSupportA = 0.0;
+ double m_lengthOfInnerSupportA = 0.0;
- double m_innerRadiusOfOuterSupportA;
- double m_outerRadiusOfOuterSupportA;
- double m_lengthOfOuterSupportA;
+ double m_innerRadiusOfOuterSupportA = 0.0;
+ double m_outerRadiusOfOuterSupportA = 0.0;
+ double m_lengthOfOuterSupportA = 0.0;
- int m_numberOfStrawPlanesA;
- int m_numberOfStrawsInPlaneA;
- double* m_positionsOfStrawPlanesA;
- double* m_rotationAnglesOfStrawPlanesA;
+ int m_numberOfStrawPlanesA = 0;
+ int m_numberOfStrawsInPlaneA = 0;
+ double* m_positionsOfStrawPlanesA = nullptr;
+ double* m_rotationAnglesOfStrawPlanesA = nullptr;
- int m_numberOfMainRadiatorsA;
- double* m_positionsOfMainRadiatorsA;
+ int m_numberOfMainRadiatorsA = 0;
+ double* m_positionsOfMainRadiatorsA = nullptr;
- double m_innerRadiusOfMainRadiatorA;
- double m_outerRadiusOfMainRadiatorA;
- double m_lengthOfMainRadiatorA;
+ double m_innerRadiusOfMainRadiatorA = 0.0;
+ double m_outerRadiusOfMainRadiatorA = 0.0;
+ double m_lengthOfMainRadiatorA = 0.0;
- int m_numberOfThinRadiatorsA;
- double* m_positionsOfThinRadiatorsA;
+ int m_numberOfThinRadiatorsA = 0;
+ double* m_positionsOfThinRadiatorsA = nullptr;
- double m_innerRadiusOfThinRadiatorA;
- double m_outerRadiusOfThinRadiatorA;
- double m_lengthOfThinRadiatorA;
+ double m_innerRadiusOfThinRadiatorA = 0.0;
+ double m_outerRadiusOfThinRadiatorA = 0.0;
+ double m_lengthOfThinRadiatorA = 0.0;
const TRTParameters* m_pParameters;
diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfWheelsB.hh b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfWheelsB.hh
index 19a7d530c61..02fb8091da0 100644
--- a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfWheelsB.hh
+++ b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfWheelsB.hh
@@ -31,47 +31,47 @@ class TRTParametersOfWheelsB
void DefineParameters();
void PrintParameters(MsgStream& msg) const;
- int m_numberOfWheelsB;
- double m_distanceBetweenWheelsB;
- double* m_positionsOfWheelsB;
+ int m_numberOfWheelsB = 0;
+ double m_distanceBetweenWheelsB = 0.0;
+ double* m_positionsOfWheelsB = nullptr;
- double m_innerRadiusOfWheelB;
- double m_outerRadiusOfWheelB;
- double m_lengthOfWheelB;
+ double m_innerRadiusOfWheelB = 0.0;
+ double m_outerRadiusOfWheelB = 0.0;
+ double m_lengthOfWheelB = 0.0;
- double m_innerRadiusOfInnerSupportB;
- double m_outerRadiusOfInnerSupportB;
- double m_lengthOfInnerSupportB;
+ double m_innerRadiusOfInnerSupportB = 0.0;
+ double m_outerRadiusOfInnerSupportB = 0.0;
+ double m_lengthOfInnerSupportB = 0.0;
- double m_innerRadiusOfOuterSupportB;
- double m_outerRadiusOfOuterSupportB;
- double m_lengthOfOuterSupportB;
+ double m_innerRadiusOfOuterSupportB = 0.0;
+ double m_outerRadiusOfOuterSupportB = 0.0;
+ double m_lengthOfOuterSupportB = 0.0;
- int m_numberOfStrawPlanesB;
- int m_numberOfStrawsInPlaneB;
- double* m_positionsOfStrawPlanesB;
- double* m_rotationAnglesOfStrawPlanesB;
+ int m_numberOfStrawPlanesB = 0;
+ int m_numberOfStrawsInPlaneB = 0;
+ double* m_positionsOfStrawPlanesB = nullptr;
+ double* m_rotationAnglesOfStrawPlanesB = nullptr;
- int m_numberOfMainRadiatorsB;
- double* m_positionsOfMainRadiatorsB;
+ int m_numberOfMainRadiatorsB = 0;
+ double* m_positionsOfMainRadiatorsB = nullptr;
- double m_innerRadiusOfMainRadiatorB;
- double m_outerRadiusOfMainRadiatorB;
- double m_lengthOfMainRadiatorB;
+ double m_innerRadiusOfMainRadiatorB = 0.0;
+ double m_outerRadiusOfMainRadiatorB = 0.0;
+ double m_lengthOfMainRadiatorB = 0.0;
- int m_numberOfThinRadiatorsB;
- double* m_positionsOfThinRadiatorsB;
+ int m_numberOfThinRadiatorsB = 0;
+ double* m_positionsOfThinRadiatorsB = nullptr;
- double m_innerRadiusOfThinRadiatorB;
- double m_outerRadiusOfThinRadiatorB;
- double m_lengthOfThinRadiatorB;
+ double m_innerRadiusOfThinRadiatorB = 0.0;
+ double m_outerRadiusOfThinRadiatorB = 0.0;
+ double m_lengthOfThinRadiatorB = 0.0;
- int m_numberOfMiddleRadiatorsB;
- double* m_positionsOfMiddleRadiatorsB;
+ int m_numberOfMiddleRadiatorsB = 0;
+ double* m_positionsOfMiddleRadiatorsB = nullptr;
- double m_innerRadiusOfMiddleRadiatorB;
- double m_outerRadiusOfMiddleRadiatorB;
- double m_lengthOfMiddleRadiatorB;
+ double m_innerRadiusOfMiddleRadiatorB = 0.0;
+ double m_outerRadiusOfMiddleRadiatorB = 0.0;
+ double m_lengthOfMiddleRadiatorB = 0.0;
const TRTParameters* m_pParameters;
diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfWheelsC.hh b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfWheelsC.hh
index eeb0c82be47..bd7edecf265 100644
--- a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfWheelsC.hh
+++ b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTParametersOfWheelsC.hh
@@ -31,40 +31,40 @@ class TRTParametersOfWheelsC
void DefineParameters();
void PrintParameters(MsgStream& msg) const;
- int m_numberOfWheelsC;
- double m_distanceBetweenWheelsC;
- double* m_positionsOfWheelsC;
+ int m_numberOfWheelsC = 0;
+ double m_distanceBetweenWheelsC = 0.0;
+ double* m_positionsOfWheelsC = nullptr;
- double m_innerRadiusOfWheelC;
- double m_outerRadiusOfWheelC;
- double m_lengthOfWheelC;
+ double m_innerRadiusOfWheelC = 0.0;
+ double m_outerRadiusOfWheelC = 0.0;
+ double m_lengthOfWheelC = 0.0;
- double m_innerRadiusOfInnerSupportC;
- double m_outerRadiusOfInnerSupportC;
- double m_lengthOfInnerSupportC;
+ double m_innerRadiusOfInnerSupportC = 0.0;
+ double m_outerRadiusOfInnerSupportC = 0.0;
+ double m_lengthOfInnerSupportC = 0.0;
- double m_innerRadiusOfOuterSupportC;
- double m_outerRadiusOfOuterSupportC;
- double m_lengthOfOuterSupportC;
+ double m_innerRadiusOfOuterSupportC = 0.0;
+ double m_outerRadiusOfOuterSupportC = 0.0;
+ double m_lengthOfOuterSupportC = 0.0;
- int m_numberOfStrawPlanesC;
- int m_numberOfStrawsInPlaneC;
- double* m_positionsOfStrawPlanesC;
- double* m_rotationAnglesOfStrawPlanesC;
+ int m_numberOfStrawPlanesC = 0;
+ int m_numberOfStrawsInPlaneC = 0;
+ double* m_positionsOfStrawPlanesC = nullptr;
+ double* m_rotationAnglesOfStrawPlanesC = nullptr;
- int m_numberOfMainRadiatorsC;
- double* m_positionsOfMainRadiatorsC;
+ int m_numberOfMainRadiatorsC = 0;
+ double* m_positionsOfMainRadiatorsC = nullptr;
- double m_innerRadiusOfMainRadiatorC;
- double m_outerRadiusOfMainRadiatorC;
- double m_lengthOfMainRadiatorC;
+ double m_innerRadiusOfMainRadiatorC = 0.0;
+ double m_outerRadiusOfMainRadiatorC = 0.0;
+ double m_lengthOfMainRadiatorC = 0.0;
- int m_numberOfThinRadiatorsC;
- double* m_positionsOfThinRadiatorsC;
+ int m_numberOfThinRadiatorsC = 0;
+ double* m_positionsOfThinRadiatorsC = nullptr;
- double m_innerRadiusOfThinRadiatorC;
- double m_outerRadiusOfThinRadiatorC;
- double m_lengthOfThinRadiatorC;
+ double m_innerRadiusOfThinRadiatorC = 0.0;
+ double m_outerRadiusOfThinRadiatorC = 0.0;
+ double m_lengthOfThinRadiatorC = 0.0;
const TRTParameters* m_pParameters;
diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTVisualization.hh b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTVisualization.hh
index 438db2d5f80..3b8f6aa8cf7 100644
--- a/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTVisualization.hh
+++ b/InnerDetector/InDetG4/TRT_G4Utilities/TRT_G4Utilities/TRTVisualization.hh
@@ -28,13 +28,13 @@ class TRTVisualization
private:
void Initialize();
- G4VisAttributes* m_pVisAttributeRed;
- G4VisAttributes* m_pVisAttributeGreen;
- G4VisAttributes* m_pVisAttributeBlue;
- G4VisAttributes* m_pVisAttributeYellow;
- G4VisAttributes* m_pVisAttributeMagenta;
- G4VisAttributes* m_pVisAttributeCyan;
- G4VisAttributes* m_pVisAttributeBlack;
+ G4VisAttributes* m_pVisAttributeRed = nullptr;
+ G4VisAttributes* m_pVisAttributeGreen = nullptr;
+ G4VisAttributes* m_pVisAttributeBlue = nullptr;
+ G4VisAttributes* m_pVisAttributeYellow = nullptr;
+ G4VisAttributes* m_pVisAttributeMagenta = nullptr;
+ G4VisAttributes* m_pVisAttributeCyan = nullptr;
+ G4VisAttributes* m_pVisAttributeBlack = nullptr;
Athena::MsgStreamMember m_msg;
};
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/ElectronSelector.h b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/ElectronSelector.h
index 439b44b3661..9b2a59207d7 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/ElectronSelector.h
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/ElectronSelector.h
@@ -73,13 +73,13 @@ class ElectronSelector : public EventAnalysis
float m_etaCut;
// Electron likelihood tool:
- AsgElectronLikelihoodTool* m_LHTool2015; //!
+ AsgElectronLikelihoodTool* m_LHTool2015 = nullptr; //!
//
- int m_elecneg1;
- int m_elecneg2;
- int m_elecpos1;
- int m_elecpos2;
+ int m_elecneg1 = 0;
+ int m_elecneg2 = 0;
+ int m_elecpos1 = 0;
+ int m_elecpos2 = 0;
// MeV to GeV conversion
const float m_CGeV = 1.0e-3; // Conversion factor to remove evil MeV nonsense.
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/FourMuonEvent.h b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/FourMuonEvent.h
index e4d6094928c..b83f5209ecc 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/FourMuonEvent.h
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/FourMuonEvent.h
@@ -156,25 +156,25 @@ class FourMuonEvent : public EventAnalysis
// Member variables : Mostly to store relevant muon data for quick access.
unsigned int m_numberOfFullPassMuons{};
unsigned int m_numberOfFullPassElectrons{};
- bool m_passedSelectionCuts;
- bool m_passedFourMuonSelection;
- bool m_passedFourElectronSelection;
- bool m_passedFourLeptonSelection;
+ bool m_passedSelectionCuts = false;
+ bool m_passedFourMuonSelection = false;
+ bool m_passedFourElectronSelection = false;
+ bool m_passedFourLeptonSelection = false;
- const xAOD::Muon* m_pxRecMuon[NUM_MUONS];
- const xAOD::TrackParticle* m_pxMETrack[NUM_MUONS]; // Pointer to muon spectro ( corr. )
- const xAOD::TrackParticle* m_pxMSTrack[NUM_MUONS]; // Pointer to muon spectro
- const xAOD::TrackParticle* m_pxIDTrack[NUM_MUONS]; // Pointer to ID track
+ const xAOD::Muon* m_pxRecMuon[NUM_MUONS]{};
+ const xAOD::TrackParticle* m_pxMETrack[NUM_MUONS]{}; // Pointer to muon spectro ( corr. )
+ const xAOD::TrackParticle* m_pxMSTrack[NUM_MUONS]{}; // Pointer to muon spectro
+ const xAOD::TrackParticle* m_pxIDTrack[NUM_MUONS]{}; // Pointer to ID track
- const xAOD::TrackParticle* m_pxELTrack[NUM_MUONS]; // pointer to Track particle of the electrons
- const xAOD::TrackParticle* m_pxMUTrack[NUM_MUONS]; // pointer to Track particle of the muons
+ const xAOD::TrackParticle* m_pxELTrack[NUM_MUONS]{}; // pointer to Track particle of the electrons
+ const xAOD::TrackParticle* m_pxMUTrack[NUM_MUONS]{}; // pointer to Track particle of the muons
// Keep kinematic information on the Z
- float m_fZPt[NUM_TYPES];
- float m_fZEtaDir[NUM_TYPES];
- float m_fZPhiDir[NUM_TYPES];
- float m_fInvariantMass[NUM_TYPES];
- float m_fMuonDispersion[NUM_TYPES];
+ float m_fZPt[NUM_TYPES]{};
+ float m_fZEtaDir[NUM_TYPES]{};
+ float m_fZPhiDir[NUM_TYPES]{};
+ float m_fInvariantMass[NUM_TYPES]{};
+ float m_fMuonDispersion[NUM_TYPES]{};
// Graphs
enum HISTOS_1D
@@ -196,23 +196,23 @@ class FourMuonEvent : public EventAnalysis
// selected muon identifiers
// to be removed
- int m_muon1;
- int m_muon2;
+ int m_muon1 = 0;
+ int m_muon2 = 0;
// selected muon identifiers
- int m_muonpos1;
- int m_muonpos2;
- int m_muonneg1;
- int m_muonneg2;
+ int m_muonpos1 = 0;
+ int m_muonpos2 = 0;
+ int m_muonneg1 = 0;
+ int m_muonneg2 = 0;
//
- int m_nVertex; // number of vertex to which the muons are associated
- int m_muonneg1_vtx; // tell us wich of the vertex
- int m_muonneg2_vtx; // tell us wich of the vertex
- int m_muonpos1_vtx; // tell us wich of the vertex
- int m_muonpos2_vtx; // tell us wich of the vertex
-
- int m_muon_vtx[NUM_MUONS];
- int m_elec_vtx[NUM_MUONS];
+ int m_nVertex = 0; // number of vertex to which the muons are associated
+ int m_muonneg1_vtx = 0; // tell us wich of the vertex
+ int m_muonneg2_vtx = 0; // tell us wich of the vertex
+ int m_muonpos1_vtx = 0; // tell us wich of the vertex
+ int m_muonpos2_vtx = 0; // tell us wich of the vertex
+
+ int m_muon_vtx[NUM_MUONS]{};
+ int m_elec_vtx[NUM_MUONS]{};
};
//==============================================================================
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/IDPerfMonEoverP.h b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/IDPerfMonEoverP.h
index 5b74a93b812..4cdbee8d58f 100755
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/IDPerfMonEoverP.h
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/IDPerfMonEoverP.h
@@ -201,64 +201,64 @@ class IDPerfMonEoverP : public AthAlgorithm
int m_nelectrons;
int m_electronCounter; //!< counter for electrons
- float m_electronTheta[3][NOS_ELECTRONS]; //!< Track theta on Surface
- float m_electronPhi[3][NOS_ELECTRONS]; //!< Track Phi on electron
- float m_electronQoverP[3][NOS_ELECTRONS]; //!< Track q over p on electron
- float m_electrond0[3][NOS_ELECTRONS]; //!< Track Phi on electron
- float m_electronz0[3][NOS_ELECTRONS]; //!< Track q over p on electron
+ float m_electronTheta[3][NOS_ELECTRONS]{}; //!< Track theta on Surface
+ float m_electronPhi[3][NOS_ELECTRONS]{}; //!< Track Phi on electron
+ float m_electronQoverP[3][NOS_ELECTRONS]{}; //!< Track q over p on electron
+ float m_electrond0[3][NOS_ELECTRONS]{}; //!< Track Phi on electron
+ float m_electronz0[3][NOS_ELECTRONS]{}; //!< Track q over p on electron
- float m_electronLMQoverP[3][NOS_ELECTRONS]; //!< Track q over p on electron
+ float m_electronLMQoverP[3][NOS_ELECTRONS]{}; //!< Track q over p on electron
- float m_electronErrTheta[3][NOS_ELECTRONS]; //!< Track theta error on electron
- float m_electronErrPhi[3][NOS_ELECTRONS]; //!< Track phi error on electron
- float m_electronErrQoverP[3][NOS_ELECTRONS];
- float m_electronErrd0[3][NOS_ELECTRONS];
- float m_electronErrz0[3][NOS_ELECTRONS];
+ float m_electronErrTheta[3][NOS_ELECTRONS]{}; //!< Track theta error on electron
+ float m_electronErrPhi[3][NOS_ELECTRONS]{}; //!< Track phi error on electron
+ float m_electronErrQoverP[3][NOS_ELECTRONS]{};
+ float m_electronErrd0[3][NOS_ELECTRONS]{};
+ float m_electronErrz0[3][NOS_ELECTRONS]{};
- int m_nTRT[NOS_ELECTRONS];
- int m_nSCT[NOS_ELECTRONS];
- int m_nBLayer[NOS_ELECTRONS];
- int m_nPIX[NOS_ELECTRONS];
- int m_nTRTout[NOS_ELECTRONS];
- int m_nSCTout[NOS_ELECTRONS];
- int m_nPIXout[NOS_ELECTRONS];
- int m_nTRTHT[NOS_ELECTRONS];
- int m_nTRTHTout[NOS_ELECTRONS];
+ int m_nTRT[NOS_ELECTRONS]{};
+ int m_nSCT[NOS_ELECTRONS]{};
+ int m_nBLayer[NOS_ELECTRONS]{};
+ int m_nPIX[NOS_ELECTRONS]{};
+ int m_nTRTout[NOS_ELECTRONS]{};
+ int m_nSCTout[NOS_ELECTRONS]{};
+ int m_nPIXout[NOS_ELECTRONS]{};
+ int m_nTRTHT[NOS_ELECTRONS]{};
+ int m_nTRTHTout[NOS_ELECTRONS]{};
- int m_author[NOS_ELECTRONS];
+ int m_author[NOS_ELECTRONS]{};
- float m_ClusterEnergy[NOS_ELECTRONS];
- float m_ClusterEta[NOS_ELECTRONS];
- float m_ClusterPhi[NOS_ELECTRONS];
+ float m_ClusterEnergy[NOS_ELECTRONS]{};
+ float m_ClusterEta[NOS_ELECTRONS]{};
+ float m_ClusterPhi[NOS_ELECTRONS]{};
- bool m_IsEMLoose[NOS_ELECTRONS];
- bool m_IsEMMedium[NOS_ELECTRONS];
- bool m_IsEMTight[NOS_ELECTRONS];
- bool m_IsEMTightTRT[NOS_ELECTRONS];
- bool m_isGoodOQ[NOS_ELECTRONS];
+ bool m_IsEMLoose[NOS_ELECTRONS]{};
+ bool m_IsEMMedium[NOS_ELECTRONS]{};
+ bool m_IsEMTight[NOS_ELECTRONS]{};
+ bool m_IsEMTightTRT[NOS_ELECTRONS]{};
+ bool m_isGoodOQ[NOS_ELECTRONS]{};
//Vertex Resolution Information
- int m_associatedToVtx[NOS_ELECTRONS];
+ int m_associatedToVtx[NOS_ELECTRONS]{};
VxPos m_vxpos[NOS_ELECTRONS];
//Vertex information
int m_nbpv;
- int m_pvtype[NO_PV];
- int m_pvnbtk[NO_PV];
- float m_pvsumpt[NO_PV];
- float m_pvx[NO_PV];
- float m_pvy[NO_PV];
- float m_pvz[NO_PV];
- float m_errpvx[NO_PV];
- float m_errpvy[NO_PV];
- float m_errpvz[NO_PV];
- float m_covpvxpvy[NO_PV];
- float m_covpvypvz[NO_PV];
- float m_covpvzpvx[NO_PV];
+ int m_pvtype[NO_PV]{};
+ int m_pvnbtk[NO_PV]{};
+ float m_pvsumpt[NO_PV]{};
+ float m_pvx[NO_PV]{};
+ float m_pvy[NO_PV]{};
+ float m_pvz[NO_PV]{};
+ float m_errpvx[NO_PV]{};
+ float m_errpvy[NO_PV]{};
+ float m_errpvz[NO_PV]{};
+ float m_covpvxpvy[NO_PV]{};
+ float m_covpvypvz[NO_PV]{};
+ float m_covpvzpvx[NO_PV]{};
//MET
bool m_METgoodness;
@@ -268,10 +268,10 @@ class IDPerfMonEoverP : public AthAlgorithm
float m_missingEty;
- float m_ePID_ShowerType[50][NOS_ELECTRONS];
- float m_ePID_IsolationType[50][NOS_ELECTRONS];
- float m_ePID_TrackCaloMatchType[50][NOS_ELECTRONS];
- float m_ePID_SummaryType[50][NOS_ELECTRONS];
+ float m_ePID_ShowerType[50][NOS_ELECTRONS]{};
+ float m_ePID_IsolationType[50][NOS_ELECTRONS]{};
+ float m_ePID_TrackCaloMatchType[50][NOS_ELECTRONS]{};
+ float m_ePID_SummaryType[50][NOS_ELECTRONS]{};
// std::vector< std::pair <xAOD::EgammaParameters::ShowerShapeType, std::string > > m_PIDNames;
std::vector< std::pair <xAOD::EgammaParameters::ShowerShapeType, std::string > > m_PID_ShowerType_Names;
std::vector< std::pair <xAOD::Iso::IsolationType, std::string > > m_PID_IsolationType_Names;
@@ -280,7 +280,7 @@ class IDPerfMonEoverP : public AthAlgorithm
- bool m_trigger[50];
+ bool m_trigger[50]{};
std::vector<std::string> m_triggerNames;
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/IDPerfMonZmumu.h b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/IDPerfMonZmumu.h
index 84cca9dc57f..5d8ff6a1184 100755
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/IDPerfMonZmumu.h
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/IDPerfMonZmumu.h
@@ -170,7 +170,7 @@ class IDPerfMonZmumu : public AthAlgorithm
std::string m_truthLinkVecName; /// link vector to map HepMC onto xAOD truth
// cut flow histogram
- TH1F* m_h_cutflow;
+ TH1F* m_h_cutflow = nullptr;
//!< Root Validation Tree
TTree* m_commonTree;
TTree* m_defaultTree;
@@ -186,7 +186,7 @@ class IDPerfMonZmumu : public AthAlgorithm
unsigned int m_evtNumber{};
unsigned int m_lumi_block{};
unsigned int m_event_mu{};
- int m_triggerPrescale;
+ int m_triggerPrescale = 0;
unsigned int m_nVertex{};
double m_positive_px{};
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/MuonSelector.h b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/MuonSelector.h
index 5a86d124ae6..2036a9ecc9e 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/MuonSelector.h
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/MuonSelector.h
@@ -59,7 +59,7 @@ class MuonSelector : public EventAnalysis
typedef EventAnalysis PARENT;
//static unsigned int s_uNumInstances;
- unsigned int m_uNumInstances;
+ unsigned int m_uNumInstances = 0U;
bool passQualCuts ();
bool passPtCuts ();
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/ZmumuEvent.h b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/ZmumuEvent.h
index 634200a353d..1e293b54f2a 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/ZmumuEvent.h
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/ZmumuEvent.h
@@ -117,7 +117,7 @@ class ZmumuEvent : public EventAnalysis
unsigned int m_uTrackMatch;
bool m_bLooseMatch;
double m_etaCut;
- double m_DiMuonPairInvMass;
+ double m_DiMuonPairInvMass = 0.0;
double m_LeadingMuonPtCut;
double m_SecondMuonPtCut;
@@ -146,17 +146,17 @@ class ZmumuEvent : public EventAnalysis
unsigned int m_eventselectioncount_dimuoncharge{};
- const xAOD::Muon* m_pxRecMuon[NUM_MUONS];
- const xAOD::TrackParticle* m_pxMETrack[NUM_MUONS]; // Pointer to muon spectro ( corr. )
- const xAOD::TrackParticle* m_pxMSTrack[NUM_MUONS]; // Pointer to muon spectro
- const xAOD::TrackParticle* m_pxIDTrack[NUM_MUONS]; // Pointer to ID track
+ const xAOD::Muon* m_pxRecMuon[NUM_MUONS]{};
+ const xAOD::TrackParticle* m_pxMETrack[NUM_MUONS]{}; // Pointer to muon spectro ( corr. )
+ const xAOD::TrackParticle* m_pxMSTrack[NUM_MUONS]{}; // Pointer to muon spectro
+ const xAOD::TrackParticle* m_pxIDTrack[NUM_MUONS]{}; // Pointer to ID track
// Keep kinematic information on the Z
- float m_fZPt[NUM_TYPES];
- float m_fZEtaDir[NUM_TYPES];
- float m_fZPhiDir[NUM_TYPES];
- float m_fInvariantMass[NUM_TYPES];
- float m_fMuonDispersion[NUM_TYPES];
+ float m_fZPt[NUM_TYPES]{};
+ float m_fZEtaDir[NUM_TYPES]{};
+ float m_fZPhiDir[NUM_TYPES]{};
+ float m_fInvariantMass[NUM_TYPES]{};
+ float m_fMuonDispersion[NUM_TYPES]{};
// Graphs
enum HISTOS_1D
@@ -170,8 +170,8 @@ class ZmumuEvent : public EventAnalysis
bool m_SelectMuonByIP;
// selected muon identifiers
- int m_muon1;
- int m_muon2;
+ int m_muon1 = 0;
+ int m_muon2 = 0;
};
//==============================================================================
#endif
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonAlg.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonAlg.cxx
index ce6808140de..f95ffe53fb6 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonAlg.cxx
@@ -72,7 +72,7 @@ StatusCode SCTErrMonAlg::fillHistograms(const EventContext& ctx) const {
// Check wafers with many fired strips (event dependent) using SCT_FlaggedConditionTool.
std::array<int, N_REGIONS_INC_GENERAL> flaggedWafersIndices
{ENDCAP_C_INDEX, BARREL_INDEX, ENDCAP_A_INDEX, GENERAL_INDEX};
- std::array<int, N_REGIONS_INC_GENERAL> nFlaggedWafers;
+ std::array<int, N_REGIONS_INC_GENERAL> nFlaggedWafers{};
nFlaggedWafers.fill(0);
const unsigned int wafer_hash_max{static_cast<unsigned int>(m_pSCTHelper->wafer_hash_max())};
for (unsigned int iHash{0}; iHash<wafer_hash_max; iHash++) {
@@ -232,7 +232,7 @@ SCTErrMonAlg::fillByteStreamErrors(const EventContext& ctx) const {
categoryErrorMap_t categoryErrorMap;
int total_errors{0};
- std::array<int, N_REGIONS_INC_GENERAL> nMaskedLinks;
+ std::array<int, N_REGIONS_INC_GENERAL> nMaskedLinks{};
nMaskedLinks.fill(0);
for (int errType{0}; errType < SCT_ByteStreamErrors::NUM_ERROR_TYPES; ++errType) {
total_errors += fillByteStreamErrorsHelper(m_byteStreamErrTool->getErrorSet(errType, ctx), errType, categoryErrorMap, nMaskedLinks);
@@ -360,7 +360,7 @@ SCTErrMonAlg::fillByteStreamErrorsHelper(const std::set<IdentifierHash>& errors,
categoryErrorMap_t& categoryErrorMap,
std::array<int, N_REGIONS_INC_GENERAL>& nMaskedLinks) const {
//--- Check categories of the BS error
- std::array<bool, CategoryErrors::N_ERRCATEGORY> b_category;
+ std::array<bool, CategoryErrors::N_ERRCATEGORY> b_category{};
b_category.fill(false);
b_category[CategoryErrors::MASKEDLINKALL] =
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonAlg.h b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonAlg.h
index 99c57e2d233..6d1fcc14332 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonAlg.h
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonAlg.h
@@ -86,9 +86,9 @@ class SCTErrMonAlg : public AthMonitorAlgorithm {
mutable std::atomic_bool m_isFirstConfigurationDetails{true};
mutable std::mutex m_mutex{};
mutable SG::SlotSpecificObj<CacheEntry> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
- mutable std::array<std::atomic_int, SCT_Monitoring::N_REGIONS_INC_GENERAL> m_nMaskedLinks ATLAS_THREAD_SAFE;
+ mutable std::array<std::atomic_int, SCT_Monitoring::N_REGIONS_INC_GENERAL> m_nMaskedLinks ATLAS_THREAD_SAFE {};
// For coverage check because it is time consuming and run at the first event of each lumi block.
- mutable std::array<std::atomic_bool, SCT_Monitoring::NBINS_LBs+1> m_firstEventOfLB ATLAS_THREAD_SAFE;
+ mutable std::array<std::atomic_bool, SCT_Monitoring::NBINS_LBs+1> m_firstEventOfLB ATLAS_THREAD_SAFE {};
BooleanProperty m_makeConfHisto{this, "MakeConfHisto", true};
BooleanProperty m_coverageCheck{this, "CoverageCheck", true};
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonTool.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonTool.cxx
index c0a0e7a9061..a74e635e341 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonTool.cxx
@@ -319,7 +319,7 @@ SCTErrMonTool::fillHistograms() {
ATH_CHECK(fillByteStreamErrors());
// Check wafers with many fired strips (event dependent) using SCT_FlaggedConditionTool.
- std::array<int, N_REGIONS_INC_GENERAL> nFlaggedWafers;
+ std::array<int, N_REGIONS_INC_GENERAL> nFlaggedWafers{};
nFlaggedWafers.fill(0);
const unsigned int wafer_hash_max{static_cast<unsigned int>(m_pSCTHelper->wafer_hash_max())};
for (unsigned int iHash{0}; iHash<wafer_hash_max; iHash++) {
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.h b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.h
index fb092d6b1ee..8690613d6a5 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.h
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.h
@@ -167,10 +167,10 @@ class SCTHitEffMonTool : public ManagedMonitorToolBase {
BooleanProperty m_vetoBadChips{this, "VetoBadChips", true};
BooleanProperty m_useIDGlobal{this, "useIDGlobal", false};
- std::array < std::array < TProfile2D*, 2 >, SCT_Monitoring::N_LAYERS_TOTAL > m_effMap;
- std::array < std::array < TProfile2D*, 2 >, SCT_Monitoring::N_LAYERS_TOTAL > m_effMapFirstBCID;
- std::array < std::array < TProfile2D*, 2 >, SCT_Monitoring::N_LAYERS_TOTAL > m_ineffMap;
- std::array < std::array < TProfile*, 2 >, SCT_Monitoring::N_LAYERS_TOTAL > m_effLumiBlock;
+ std::array < std::array < TProfile2D*, 2 >, SCT_Monitoring::N_LAYERS_TOTAL > m_effMap{};
+ std::array < std::array < TProfile2D*, 2 >, SCT_Monitoring::N_LAYERS_TOTAL > m_effMapFirstBCID{};
+ std::array < std::array < TProfile2D*, 2 >, SCT_Monitoring::N_LAYERS_TOTAL > m_ineffMap{};
+ std::array < std::array < TProfile*, 2 >, SCT_Monitoring::N_LAYERS_TOTAL > m_effLumiBlock{};
TProfile* m_Eff_Total{nullptr};
TProfile* m_Eff_TotalBCID{nullptr};
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/TRTMonitoringRun3/TRTMonitoringRun3ESD_Alg.h b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/TRTMonitoringRun3/TRTMonitoringRun3ESD_Alg.h
index a591f30a163..26412923d3f 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/TRTMonitoringRun3/TRTMonitoringRun3ESD_Alg.h
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/TRTMonitoringRun3/TRTMonitoringRun3ESD_Alg.h
@@ -126,8 +126,8 @@ private:
bool m_doShift;
bool m_doExpert;
- unsigned char m_mat_chip_B[64][1642];
- unsigned char m_mat_chip_E[64][3840];
+ unsigned char m_mat_chip_B[64][1642]{};
+ unsigned char m_mat_chip_E[64][3840]{};
float m_DistToStraw;
bool m_isCosmics;
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/TRTMonitoringRun3/TRTMonitoringRun3RAW_Alg.h b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/TRTMonitoringRun3/TRTMonitoringRun3RAW_Alg.h
index c8439de79d0..0f24a609a25 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/TRTMonitoringRun3/TRTMonitoringRun3RAW_Alg.h
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/TRTMonitoringRun3/TRTMonitoringRun3RAW_Alg.h
@@ -61,8 +61,8 @@ private:
const TRT_ID* m_pTRTHelper;
const InDetDD::TRT_DetectorManager *m_mgr;
- unsigned char m_mat_chip_E[64][3840];
- unsigned char m_mat_chip_B[64][1642];
+ unsigned char m_mat_chip_E[64][3840]{};
+ unsigned char m_mat_chip_B[64][1642]{};
enum GasType{ Xe = 0, Ar = 1, Kr = 2 };
diff --git a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/SCT_TB04_RawData.h b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/SCT_TB04_RawData.h
index 276dc13d9ca..332fe15e40d 100755
--- a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/SCT_TB04_RawData.h
+++ b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/SCT_TB04_RawData.h
@@ -108,7 +108,7 @@ private:
unsigned int m_word_error_count;
unsigned int m_event_count;
unsigned int m_onlineId;
- float m_errorCondensedHit[20];
+ float m_errorCondensedHit[20]{};
};
diff --git a/InnerDetector/InDetRecAlgs/InDetV0Finder/InDetV0Finder/InDetV0FinderTool.h b/InnerDetector/InDetRecAlgs/InDetV0Finder/InDetV0Finder/InDetV0FinderTool.h
index c308dcaba1c..319c9ceda65 100755
--- a/InnerDetector/InDetRecAlgs/InDetV0Finder/InDetV0Finder/InDetV0FinderTool.h
+++ b/InnerDetector/InDetRecAlgs/InDetV0Finder/InDetV0Finder/InDetV0FinderTool.h
@@ -165,12 +165,12 @@ namespace InDet
double m_vert_a0xy_cut; //!< V0 |a0xy| wrt a vertex (<3.)
double m_vert_a0z_cut; //!< V0 |a0z| wrt a vertex (<15.)
- mutable std::atomic<unsigned int> m_events_processed;
- mutable std::atomic<unsigned int> m_V0s_stored;
- mutable std::atomic<unsigned int> m_Kshort_stored;
- mutable std::atomic<unsigned int> m_Lambda_stored;
- mutable std::atomic<unsigned int> m_Lambdabar_stored;
- mutable std::atomic<unsigned int> m_Gamma_stored;
+ mutable std::atomic<unsigned int> m_events_processed{};
+ mutable std::atomic<unsigned int> m_V0s_stored{};
+ mutable std::atomic<unsigned int> m_Kshort_stored{};
+ mutable std::atomic<unsigned int> m_Lambda_stored{};
+ mutable std::atomic<unsigned int> m_Lambdabar_stored{};
+ mutable std::atomic<unsigned int> m_Gamma_stored{};
void SGError(const std::string& errService) const;
@@ -190,7 +190,7 @@ namespace InDet
xAOD::Vertex* massFit(int pdgID, const std::vector<const xAOD::TrackParticle*> &pairV0, const Amg::Vector3D &vertex) const;
- const Trk::TrkV0VertexFitter* m_concreteVertexFitter;
+ const Trk::TrkV0VertexFitter* m_concreteVertexFitter = nullptr;
SG::ReadHandleKey<xAOD::VertexContainer> m_vertexKey { this, "VertexContainer", "PrimaryVertices",
"primary vertex container" };
diff --git a/InnerDetector/InDetRecEvent/SiSpacePointsSeed/SiSpacePointsSeed/SiSpacePointsSeed.h b/InnerDetector/InDetRecEvent/SiSpacePointsSeed/SiSpacePointsSeed/SiSpacePointsSeed.h
index e0b293a8b7b..1c4bbbc9b12 100755
--- a/InnerDetector/InDetRecEvent/SiSpacePointsSeed/SiSpacePointsSeed/SiSpacePointsSeed.h
+++ b/InnerDetector/InDetRecEvent/SiSpacePointsSeed/SiSpacePointsSeed/SiSpacePointsSeed.h
@@ -96,24 +96,24 @@ namespace InDet {
protected:
std::vector<const Trk::SpacePoint*> m_spacepoints;
- double m_d0 ;
- double m_zvertex ;
- double m_eta ;
- double m_x1 ;
- double m_x2 ;
- double m_x3 ;
- double m_y1 ;
- double m_y2 ;
- double m_y3 ;
- double m_z1 ;
- double m_z2 ;
- double m_z3 ;
- double m_r1 ;
- double m_r2 ;
- double m_r3 ;
- double m_dzdr_b ;
- double m_dzdr_t ;
- double m_pt ;
+ double m_d0 = 0.0;
+ double m_zvertex =0.0;
+ double m_eta = 0.0 ;
+ double m_x1 = 0.0 ;
+ double m_x2 = 0.0 ;
+ double m_x3 = 0.0 ;
+ double m_y1 = 0.0 ;
+ double m_y2 = 0.0 ;
+ double m_y3 = 0.0 ;
+ double m_z1 = 0.0 ;
+ double m_z2 = 0.0 ;
+ double m_z3 = 0.0 ;
+ double m_r1 = 0.0 ;
+ double m_r2 = 0.0 ;
+ double m_r3 = 0.0 ;
+ double m_dzdr_b = 0.0 ;
+ double m_dzdr_t = 0.0 ;
+ double m_pt = 0.0 ;
};
MsgStream& operator << (MsgStream& ,const SiSpacePointsSeed&);
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/InDetVKalVxInJetTool/InDetVKalVxInJetTool.h b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/InDetVKalVxInJetTool/InDetVKalVxInJetTool.h
index 0ec304fd696..88a8b3d5468 100755
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/InDetVKalVxInJetTool/InDetVKalVxInJetTool.h
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/InDetVKalVxInJetTool/InDetVKalVxInJetTool.h
@@ -223,7 +223,7 @@ namespace InDet {
ToolHandle < IInDetTrkInJetType > m_trackClassificator;
- bool m_useEtaDependentCuts;
+ bool m_useEtaDependentCuts = false;
/** service to get cut values depending on different variable */
ServiceHandle<InDet::IInDetEtaDependentCutsSvc> m_etaDependentCutsSvc{this, "InDetEtaDependentCutsSvc", ""};
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/InDetPhysValMonitoring/InDetPhysValMonitoringTool.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/InDetPhysValMonitoring/InDetPhysValMonitoringTool.h
index 3a8d67059d6..1d2e6b2eab4 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/InDetPhysValMonitoring/InDetPhysValMonitoringTool.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/InDetPhysValMonitoring/InDetPhysValMonitoringTool.h
@@ -188,7 +188,7 @@ private:
mutable std::mutex m_mutex;
mutable CutFlow m_truthCutFlow ATLAS_THREAD_SAFE; // Guarded by m_mutex
std::vector<int> m_prospectsMatched;
- int m_truthCounter;
+ int m_truthCounter = 0;
std::vector<std::string> m_trackCutflowNames;
std::vector<int> m_trackCutflow;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Resolution.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Resolution.h
index ed5f7929ed5..d0945ba7e4f 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Resolution.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Resolution.h
@@ -63,7 +63,7 @@ private:
const double m_ptMin = 0.745;
const double m_ptMax = 1000.0;
- float m_PtBins[m_nPtBins + 1];
+ float m_PtBins[m_nPtBins + 1]{};
std::string m_paramProp[NPARAMS] = { "d0", "z0", "ptqopt", "theta", "phi", "pt", "z0sin" };
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXmlDom.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXmlDom.cxx
index 62de290e2a1..0ebd81227bd 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXmlDom.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXmlDom.cxx
@@ -124,7 +124,7 @@ ReadFromXmlDom::initialize() {
bool
ReadFromXmlDom::sourceExists() const {
- struct stat buffer;
+ struct stat buffer{};
return(stat(m_source.c_str(), &buffer) == 0);
}
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/InDetRecStatistics/InDetRecStatisticsAlg.h b/InnerDetector/InDetValidation/InDetRecStatistics/InDetRecStatistics/InDetRecStatisticsAlg.h
index 9bcc92633db..96f7d0838ad 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/InDetRecStatistics/InDetRecStatisticsAlg.h
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/InDetRecStatistics/InDetRecStatisticsAlg.h
@@ -143,8 +143,8 @@ namespace InDet {
SG::ReadHandleKeyArray<TrackCollection> m_RecTrackCollection_keys;
SG::ReadHandleKeyArray<TrackTruthCollection> m_TrackTruthCollection_keys;
- mutable std::atomic<bool> m_pullWarning ATLAS_THREAD_SAFE; //!< warn only once, if pull cannot be calculated
- mutable std::atomic<bool> m_UpdatorWarning ATLAS_THREAD_SAFE; //!< warn only once, if unbiased track states can not be calculated
+ mutable std::atomic<bool> m_pullWarning ATLAS_THREAD_SAFE{}; //!< warn only once, if pull cannot be calculated
+ mutable std::atomic<bool> m_UpdatorWarning ATLAS_THREAD_SAFE{}; //!< warn only once, if unbiased track states can not be calculated
mutable std::atomic<int> m_isUnbiased ATLAS_THREAD_SAFE; //!< if can get unbiased residuals
mutable std::atomic<long> m_events_processed ATLAS_THREAD_SAFE;//!< number of events processed
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/InDetRecStatistics/TrackStatHelper.h b/InnerDetector/InDetValidation/InDetRecStatistics/InDetRecStatistics/TrackStatHelper.h
index e692e2e165f..c70fb5c9286 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/InDetRecStatistics/TrackStatHelper.h
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/InDetRecStatistics/TrackStatHelper.h
@@ -189,8 +189,8 @@ namespace InDet {
std::string m_TrackCollectionKey;//!< StoreGate Track Collection Key
std::string m_TrackTruthCollectionKey; //!< StoreGate Track Truth Collection Key
- mutable std::atomic<bool> m_author_found ATLAS_THREAD_SAFE [Trk::TrackInfo::NumberOfTrackFitters]; //!<Number of tracking authors found
- mutable std::atomic<long> m_events ATLAS_THREAD_SAFE ;//!< Number of events
+ mutable std::atomic<bool> m_author_found ATLAS_THREAD_SAFE [Trk::TrackInfo::NumberOfTrackFitters]{}; //!<Number of tracking authors found
+ mutable std::atomic<long> m_events ATLAS_THREAD_SAFE {} ;//!< Number of events
template <int N_Categories, int N_Types, int N_Regions, typename T_Int=long>
struct Counter {
diff --git a/InnerDetector/InDetValidation/InDetSecVertexValidation/InDetSecVertexValidation/InDetSecVertexTruthMatchTool.h b/InnerDetector/InDetValidation/InDetSecVertexValidation/InDetSecVertexValidation/InDetSecVertexTruthMatchTool.h
index ec63aae10c8..1b06386002d 100644
--- a/InnerDetector/InDetValidation/InDetSecVertexValidation/InDetSecVertexValidation/InDetSecVertexTruthMatchTool.h
+++ b/InnerDetector/InDetValidation/InDetSecVertexValidation/InDetSecVertexValidation/InDetSecVertexTruthMatchTool.h
@@ -105,141 +105,141 @@ class InDetSecVertexTruthMatchTool : public virtual IInDetSecVertexTruthMatchToo
//histograms
ITHistSvc* m_thistSvc{nullptr};
- TH1F* m_matchType;
- TH1F* m_truth_Ntrk;
- TH1F* m_positionRes_R;
- TH1F* m_positionRes_Z;
-
- TH1F* m_truthInclusive_r;
- TH1F* m_truthReconstructable_r;
- TH1F* m_truthAccepted_r;
- TH1F* m_truthSeeded_r;
- TH1F* m_truthReconstructed_r;
- TH1F* m_truthSplit_r;
-
- TH1F* m_truthReconstructable_trkSel;
- TH1F* m_truthReconstructed_trkSel;
-
- TH1F* m_recoX;
- TH1F* m_recoY;
- TH1F* m_recoZ;
- TH1F* m_recoR;
- TH1F* m_recodistFromPV;
- TH1F* m_recoPt;
- TH1F* m_recoEta;
- TH1F* m_recoPhi;
- TH1F* m_recoMass;
- TH1F* m_recoMu;
- TH1F* m_recoChi2;
- TH1F* m_recoDir;
- TH1F* m_recoCharge;
- TH1F* m_recoH;
- TH1F* m_recoHt;
- TH1F* m_recoMinOpAng;
- TH1F* m_recoMaxOpAng;
- TH1F* m_recoMaxDR;
- TH1F* m_recoMinD0;
- TH1F* m_recoMaxD0;
- TH1F* m_recoNtrk;
-
- TH1F* m_recoR_LLP;
- TH1F* m_recoPt_LLP;
- TH1F* m_recoEta_LLP;
- TH1F* m_recoPhi_LLP;
- TH1F* m_recoMass_LLP;
- TH1F* m_recoMu_LLP;
- TH1F* m_recoChi2_LLP;
- TH1F* m_recoDir_LLP;
- TH1F* m_recoCharge_LLP;
- TH1F* m_recoH_LLP;
- TH1F* m_recoHt_LLP;
- TH1F* m_recoMinOpAng_LLP;
- TH1F* m_recoMaxOpAng_LLP;
- TH1F* m_recoMaxDR_LLP;
- TH1F* m_recoMinD0_LLP;
- TH1F* m_recoMaxD0_LLP;
- TH1F* m_recoNtrk_LLP;
-
- TH1F* m_recoR_Fake;
- TH1F* m_recoPt_Fake;
- TH1F* m_recoEta_Fake;
- TH1F* m_recoPhi_Fake;
- TH1F* m_recoMass_Fake;
- TH1F* m_recoMu_Fake;
- TH1F* m_recoChi2_Fake;
- TH1F* m_recoDir_Fake;
- TH1F* m_recoCharge_Fake;
- TH1F* m_recoH_Fake;
- TH1F* m_recoHt_Fake;
- TH1F* m_recoMinOpAng_Fake;
- TH1F* m_recoMaxOpAng_Fake;
- TH1F* m_recoMaxDR_Fake;
- TH1F* m_recoMinD0_Fake;
- TH1F* m_recoMaxD0_Fake;
- TH1F* m_recoNtrk_Fake;
-
- TH1F* m_recoR_Split;
- TH1F* m_recoPt_Split;
- TH1F* m_recoEta_Split;
- TH1F* m_recoPhi_Split;
- TH1F* m_recoMass_Split;
- TH1F* m_recoMu_Split;
- TH1F* m_recoChi2_Split;
- TH1F* m_recoDir_Split;
- TH1F* m_recoCharge_Split;
- TH1F* m_recoH_Split;
- TH1F* m_recoHt_Split;
- TH1F* m_recoMinOpAng_Split;
- TH1F* m_recoMaxOpAng_Split;
- TH1F* m_recoMaxDR_Split;
- TH1F* m_recoMinD0_Split;
- TH1F* m_recoMaxD0_Split;
- TH1F* m_recoNtrk_Split;
-
-
- TH1F* m_recoTrk_qOverP;
- TH1F* m_recoTrk_theta;
- TH1F* m_recoTrk_E;
- TH1F* m_recoTrk_M;
- TH1F* m_recoTrk_Pt;
- TH1F* m_recoTrk_Px;
- TH1F* m_recoTrk_Py;
- TH1F* m_recoTrk_Pz;
- TH1F* m_recoTrk_Eta;
- TH1F* m_recoTrk_Phi;
- TH1F* m_recoTrk_D0;
- TH1F* m_recoTrk_Z0;
- TH1F* m_recoTrk_errD0;
- TH1F* m_recoTrk_errZ0;
- TH1F* m_recoTrk_Chi2;
- TH1F* m_recoTrk_nDoF;
- TH1F* m_recoTrk_charge;
+ TH1F* m_matchType = nullptr;
+ TH1F* m_truth_Ntrk = nullptr;
+ TH1F* m_positionRes_R = nullptr;
+ TH1F* m_positionRes_Z = nullptr;
+
+ TH1F* m_truthInclusive_r = nullptr;
+ TH1F* m_truthReconstructable_r = nullptr;
+ TH1F* m_truthAccepted_r = nullptr;
+ TH1F* m_truthSeeded_r = nullptr;
+ TH1F* m_truthReconstructed_r = nullptr;
+ TH1F* m_truthSplit_r = nullptr;
+
+ TH1F* m_truthReconstructable_trkSel = nullptr;
+ TH1F* m_truthReconstructed_trkSel = nullptr;
+
+ TH1F* m_recoX = nullptr;
+ TH1F* m_recoY = nullptr;
+ TH1F* m_recoZ = nullptr;
+ TH1F* m_recoR = nullptr;
+ TH1F* m_recodistFromPV = nullptr;
+ TH1F* m_recoPt = nullptr;
+ TH1F* m_recoEta = nullptr;
+ TH1F* m_recoPhi = nullptr;
+ TH1F* m_recoMass = nullptr;
+ TH1F* m_recoMu = nullptr;
+ TH1F* m_recoChi2 = nullptr;
+ TH1F* m_recoDir = nullptr;
+ TH1F* m_recoCharge = nullptr;
+ TH1F* m_recoH = nullptr;
+ TH1F* m_recoHt = nullptr;
+ TH1F* m_recoMinOpAng = nullptr;
+ TH1F* m_recoMaxOpAng = nullptr;
+ TH1F* m_recoMaxDR = nullptr;
+ TH1F* m_recoMinD0 = nullptr;
+ TH1F* m_recoMaxD0 = nullptr;
+ TH1F* m_recoNtrk = nullptr;
+
+ TH1F* m_recoR_LLP = nullptr;
+ TH1F* m_recoPt_LLP = nullptr;
+ TH1F* m_recoEta_LLP = nullptr;
+ TH1F* m_recoPhi_LLP = nullptr;
+ TH1F* m_recoMass_LLP = nullptr;
+ TH1F* m_recoMu_LLP = nullptr;
+ TH1F* m_recoChi2_LLP = nullptr;
+ TH1F* m_recoDir_LLP = nullptr;
+ TH1F* m_recoCharge_LLP = nullptr;
+ TH1F* m_recoH_LLP = nullptr;
+ TH1F* m_recoHt_LLP = nullptr;
+ TH1F* m_recoMinOpAng_LLP = nullptr;
+ TH1F* m_recoMaxOpAng_LLP = nullptr;
+ TH1F* m_recoMaxDR_LLP = nullptr;
+ TH1F* m_recoMinD0_LLP = nullptr;
+ TH1F* m_recoMaxD0_LLP = nullptr;
+ TH1F* m_recoNtrk_LLP = nullptr;
+
+ TH1F* m_recoR_Fake = nullptr;
+ TH1F* m_recoPt_Fake = nullptr;
+ TH1F* m_recoEta_Fake = nullptr;
+ TH1F* m_recoPhi_Fake = nullptr;
+ TH1F* m_recoMass_Fake = nullptr;
+ TH1F* m_recoMu_Fake = nullptr;
+ TH1F* m_recoChi2_Fake = nullptr;
+ TH1F* m_recoDir_Fake = nullptr;
+ TH1F* m_recoCharge_Fake = nullptr;
+ TH1F* m_recoH_Fake = nullptr;
+ TH1F* m_recoHt_Fake = nullptr;
+ TH1F* m_recoMinOpAng_Fake = nullptr;
+ TH1F* m_recoMaxOpAng_Fake = nullptr;
+ TH1F* m_recoMaxDR_Fake = nullptr;
+ TH1F* m_recoMinD0_Fake = nullptr;
+ TH1F* m_recoMaxD0_Fake = nullptr;
+ TH1F* m_recoNtrk_Fake = nullptr;
+
+ TH1F* m_recoR_Split = nullptr;
+ TH1F* m_recoPt_Split = nullptr;
+ TH1F* m_recoEta_Split = nullptr;
+ TH1F* m_recoPhi_Split = nullptr;
+ TH1F* m_recoMass_Split = nullptr;
+ TH1F* m_recoMu_Split = nullptr;
+ TH1F* m_recoChi2_Split = nullptr;
+ TH1F* m_recoDir_Split = nullptr;
+ TH1F* m_recoCharge_Split = nullptr;
+ TH1F* m_recoH_Split = nullptr;
+ TH1F* m_recoHt_Split = nullptr;
+ TH1F* m_recoMinOpAng_Split = nullptr;
+ TH1F* m_recoMaxOpAng_Split = nullptr;
+ TH1F* m_recoMaxDR_Split = nullptr;
+ TH1F* m_recoMinD0_Split = nullptr;
+ TH1F* m_recoMaxD0_Split = nullptr;
+ TH1F* m_recoNtrk_Split = nullptr;
+
+
+ TH1F* m_recoTrk_qOverP = nullptr;
+ TH1F* m_recoTrk_theta = nullptr;
+ TH1F* m_recoTrk_E = nullptr;
+ TH1F* m_recoTrk_M = nullptr;
+ TH1F* m_recoTrk_Pt = nullptr;
+ TH1F* m_recoTrk_Px = nullptr;
+ TH1F* m_recoTrk_Py = nullptr;
+ TH1F* m_recoTrk_Pz = nullptr;
+ TH1F* m_recoTrk_Eta = nullptr;
+ TH1F* m_recoTrk_Phi = nullptr;
+ TH1F* m_recoTrk_D0 = nullptr;
+ TH1F* m_recoTrk_Z0 = nullptr;
+ TH1F* m_recoTrk_errD0 = nullptr;
+ TH1F* m_recoTrk_errZ0 = nullptr;
+ TH1F* m_recoTrk_Chi2 = nullptr;
+ TH1F* m_recoTrk_nDoF = nullptr;
+ TH1F* m_recoTrk_charge = nullptr;
- TH1F* m_matchScore_weight;
- TH1F* m_matchScore_pt;
- TH1F* m_matchedTruthID;
+ TH1F* m_matchScore_weight = nullptr;
+ TH1F* m_matchScore_pt = nullptr;
+ TH1F* m_matchedTruthID = nullptr;
- TH1F* m_truthX;
- TH1F* m_truthY;
- TH1F* m_truthZ;
- TH1F* m_truthR;
- TH1F* m_truthdistFromPV;
- TH1F* m_truthEta;
- TH1F* m_truthPhi;
- TH1F* m_truthNtrk_out;
- TH1F* m_truthParent_E;
- TH1F* m_truthParent_M;
- TH1F* m_truthParent_Pt;
- TH1F* m_truthParent_Eta;
- TH1F* m_truthParent_Phi;
- TH1F* m_truthParent_charge;
- TH1F* m_truthParentProdX;
- TH1F* m_truthParentProdY;
- TH1F* m_truthParentProdZ;
- TH1F* m_truthParentProdR;
- TH1F* m_truthParentProddistFromPV;
- TH1F* m_truthParentProdEta;
- TH1F* m_truthParentProdPhi;
+ TH1F* m_truthX = nullptr;
+ TH1F* m_truthY = nullptr;
+ TH1F* m_truthZ = nullptr;
+ TH1F* m_truthR = nullptr;
+ TH1F* m_truthdistFromPV = nullptr;
+ TH1F* m_truthEta = nullptr;
+ TH1F* m_truthPhi = nullptr;
+ TH1F* m_truthNtrk_out = nullptr;
+ TH1F* m_truthParent_E = nullptr;
+ TH1F* m_truthParent_M = nullptr;
+ TH1F* m_truthParent_Pt = nullptr;
+ TH1F* m_truthParent_Eta = nullptr;
+ TH1F* m_truthParent_Phi = nullptr;
+ TH1F* m_truthParent_charge = nullptr;
+ TH1F* m_truthParentProdX = nullptr;
+ TH1F* m_truthParentProdY = nullptr;
+ TH1F* m_truthParentProdZ = nullptr;
+ TH1F* m_truthParentProdR = nullptr;
+ TH1F* m_truthParentProddistFromPV = nullptr;
+ TH1F* m_truthParentProdEta = nullptr;
+ TH1F* m_truthParentProdPhi = nullptr;
};
diff --git a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/InDetSegmentDriftCircleAssValidation/SegmentDriftCircleAssValidation.h b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/InDetSegmentDriftCircleAssValidation/SegmentDriftCircleAssValidation.h
index c87724505e8..f1ea36b9d74 100644
--- a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/InDetSegmentDriftCircleAssValidation/SegmentDriftCircleAssValidation.h
+++ b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/InDetSegmentDriftCircleAssValidation/SegmentDriftCircleAssValidation.h
@@ -79,7 +79,7 @@ namespace InDet {
std::multimap<int,int> m_allParticles ;
std::multimap<int,int> m_tracks ;
std::multimap<const HepMC::GenParticle*, int> m_genPars ;
- int m_efficiency[5] ;
+ int m_efficiency[5]{} ;
///////////////////////////////////////////////////////////////////
// Protected methods
--
GitLab