From ae55bbc3b72cd3fa41d0f005188b9e3b7bcb1ce9 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 18 May 2016 20:52:33 +0200
Subject: [PATCH] 'Fix coverity warnings 108586, 108594, 108601, 108597,
108600, 108607, 108589, 108612, 108611 (uninitialized members).'
(LArG4H6SD-00-02-09)
2016-05-18 scott snyder <snyder@bnl.gov>
* Tagging LArG4H6SD-00-02-09.
* Fix coverity warnings 108586, 108594, 108601, 108597, 108600,
108607, 108589, 108612, 108611 (uninitialized members).
2016-04-09 Steve Farrell <Steven.Farrell@cern.ch>
* Fixed file permissions
* Removed ATHENAHIVE protections around WriteHandle usage.
* Tagging: LArG4H6SD-00-02-08
* Avoid repeated division and division by constants.
Former-commit-id: e19fc220ff13641cbe288d9645b110e5f11f2319
---
LArCalorimeter/LArG4/LArG4H6SD/cmt/requirements | 0
.../LArG4/LArG4H6SD/src/LArFCAL1H62004CalibCalculator.cc | 0
.../LArG4/LArG4H6SD/src/LArFCAL1H62004CalibCalculator.h | 0
.../LArG4/LArG4H6SD/src/LArFCAL2H62004CalibCalculator.cc | 0
.../LArG4/LArG4H6SD/src/LArFCAL2H62004CalibCalculator.h | 0
.../LArG4H6SD/src/LArFCALH62004CalibCalculatorBase.cc | 0
.../LArG4/LArG4H6SD/src/LArFCALH62004CalibCalculatorBase.h | 0
.../LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.cc | 5 +++++
.../LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.h | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004CalibSD.cc | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004CalibSD.h | 0
.../LArG4H6SD/src/LArG4H62004DeadCalibrationCalculator.cc | 0
.../LArG4H6SD/src/LArG4H62004DeadCalibrationCalculator.h | 0
.../LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.cc | 7 ++-----
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.h | 0
.../LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.cc | 6 +-----
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.h | 0
.../LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.cc | 3 +++
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.h | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.cc | 6 +-----
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.h | 0
.../LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.cc | 4 ++++
.../LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.h | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004SD.cc | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004SD.h | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSD.cc | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSD.h | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSDTool.cc | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSDTool.h | 0
.../LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0Calculator.cc | 0
.../LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0Calculator.h | 0
.../LArG4H6SD/src/LArG4H6COLDTCMod0CalibCalculator.cc | 0
.../LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0CalibCalculator.h | 0
.../LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0ChannelMap.cc | 0
.../LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0ChannelMap.h | 0
.../LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.cc | 0
.../LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.h | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc | 7 +------
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.h | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSDTool.cc | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSDTool.h | 0
.../LArG4/LArG4H6SD/src/LArG4TBECBeamChCalculator.cc | 0
.../LArG4/LArG4H6SD/src/LArG4TBECBeamChCalculator.h | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChHit.cc | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChHit.h | 0
.../LArG4/LArG4H6SD/src/LArG4TBECBeamChSDTool.cc | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSDTool.h | 0
.../LArG4H6SD/src/LArG4TBECBeamChSensitiveDetector.cc | 0
.../LArG4/LArG4H6SD/src/LArG4TBECBeamChSensitiveDetector.h | 0
.../LArG4/LArG4H6SD/src/LArGeoH62004EventAction.cc | 0
.../LArG4/LArG4H6SD/src/LArGeoH62004EventAction.h | 0
.../LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.cc | 0
.../LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.h | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6BeamInfo.cxx | 0
LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6BeamInfo.h | 0
.../LArG4/LArG4H6SD/src/LArTBH6TriggerTimeTool.cxx | 0
.../LArG4/LArG4H6SD/src/LArTBH6TriggerTimeTool.h | 0
LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.cc | 0
LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.h | 0
.../LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.cc | 7 +++++++
.../LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.h | 0
LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.cc | 7 +++++++
LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.h | 0
LArCalorimeter/LArG4/LArG4H6SD/src/TBECOuterModuleTool.cc | 0
LArCalorimeter/LArG4/LArG4H6SD/src/TBECOuterModuleTool.h | 0
.../LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx | 0
.../LArG4/LArG4H6SD/src/components/LArG4H6SDTools_load.cxx | 0
67 files changed, 31 insertions(+), 21 deletions(-)
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/cmt/requirements
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL1H62004CalibCalculator.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL1H62004CalibCalculator.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL2H62004CalibCalculator.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL2H62004CalibCalculator.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArFCALH62004CalibCalculatorBase.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArFCALH62004CalibCalculatorBase.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004CalibSD.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004CalibSD.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadCalibrationCalculator.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadCalibrationCalculator.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004SD.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004SD.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSD.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSD.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSDTool.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSDTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0Calculator.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0Calculator.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0CalibCalculator.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0CalibCalculator.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0ChannelMap.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0ChannelMap.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSDTool.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSDTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChCalculator.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChCalculator.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChHit.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChHit.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSDTool.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSDTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSensitiveDetector.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSensitiveDetector.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004EventAction.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004EventAction.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6BeamInfo.cxx
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6BeamInfo.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6TriggerTimeTool.cxx
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6TriggerTimeTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/TBECOuterModuleTool.cc
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/TBECOuterModuleTool.h
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx
mode change 100755 => 100644 LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_load.cxx
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/cmt/requirements b/LArCalorimeter/LArG4/LArG4H6SD/cmt/requirements
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL1H62004CalibCalculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL1H62004CalibCalculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL1H62004CalibCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL1H62004CalibCalculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL2H62004CalibCalculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL2H62004CalibCalculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL2H62004CalibCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL2H62004CalibCalculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCALH62004CalibCalculatorBase.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCALH62004CalibCalculatorBase.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCALH62004CalibCalculatorBase.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCALH62004CalibCalculatorBase.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.cc
old mode 100755
new mode 100644
index 58197b2db88..27ed180d1d8
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.cc
@@ -18,6 +18,11 @@
LArG4H62004ActiveSDTool::LArG4H62004ActiveSDTool(const std::string& type, const std::string& name, const IInterface *parent)
: LArG4SDTool(type,name,parent)
, m_HitColl("LArCalibrationHitActive")
+ , m_emecSD(nullptr)
+ , m_hecSD(nullptr)
+ , m_fcal1SD(nullptr)
+ , m_fcal2SD(nullptr)
+ , m_fcalColdSD(nullptr)
{
declareProperty("EMECVolumes",m_emecVolumes);
declareProperty("HECVolumes",m_hecVolumes);
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004CalibSD.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004CalibSD.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004CalibSD.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004CalibSD.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadCalibrationCalculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadCalibrationCalculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadCalibrationCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadCalibrationCalculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.cc
old mode 100755
new mode 100644
index 95d38c623d7..3af7ee7524c
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.cc
@@ -19,6 +19,8 @@
LArG4H62004DeadSDTool::LArG4H62004DeadSDTool(const std::string& type, const std::string& name, const IInterface *parent)
: LArG4SDTool(type,name,parent)
, m_HitColl("LArCalibrationHitDeadMaterial")
+ , m_deadSD(nullptr)
+ , m_uninstSD(nullptr)
{
declareProperty("doEscapedEnergy",m_do_eep=false);
declareInterface<ISensitiveDetector>(this);
@@ -62,12 +64,7 @@ StatusCode LArG4H62004DeadSDTool::initializeSD()
StatusCode LArG4H62004DeadSDTool::Gather()
{
// In this case, *unlike* other SDs, the *tool* owns the collection
-#ifdef ATHENAHIVE
- // Temporary fix for Hive until isValid is fixed
- m_HitColl = CxxUtils::make_unique<CaloCalibrationHitContainer>(m_HitColl.name());
-#else
if (!m_HitColl.isValid()) m_HitColl = CxxUtils::make_unique<CaloCalibrationHitContainer>(m_HitColl.name());
-#endif
m_deadSD ->EndOfAthenaEvent( &*m_HitColl );
if (m_do_eep) m_uninstSD ->EndOfAthenaEvent( &*m_HitColl );
return StatusCode::SUCCESS;
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.cc
old mode 100755
new mode 100644
index edf6532fe24..6ee7358ef5d
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.cc
@@ -14,6 +14,7 @@
LArG4H62004EMECSDTool::LArG4H62004EMECSDTool(const std::string& type, const std::string& name, const IInterface *parent)
: LArG4SDTool(type,name,parent)
, m_HitColl("LArHitEMEC")
+ , m_emecSD(nullptr)
{
declareInterface<ISensitiveDetector>(this);
}
@@ -35,12 +36,7 @@ StatusCode LArG4H62004EMECSDTool::initializeSD()
StatusCode LArG4H62004EMECSDTool::Gather()
{
// In this case, *unlike* other SDs, the *tool* owns the collection
-#ifdef ATHENAHIVE
- // Temporary fix for Hive until isValid is fixed
- m_HitColl = CxxUtils::make_unique<LArHitContainer>(m_HitColl.name());
-#else
if (!m_HitColl.isValid()) m_HitColl = CxxUtils::make_unique<LArHitContainer>(m_HitColl.name());
-#endif
// Hand this collection name off to the SDs. They will be writing to the
// collection, but only one at a time!
m_emecSD->EndOfAthenaEvent( &*m_HitColl );
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.cc
old mode 100755
new mode 100644
index f55f025d5f8..dc1df99757e
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.cc
@@ -14,6 +14,9 @@
LArG4H62004FCALSDTool::LArG4H62004FCALSDTool(const std::string& type, const std::string& name, const IInterface *parent)
: LArG4SDTool(type,name,parent)
, m_HitColl("LArHitFCAL")
+ , m_fcal1SD(nullptr)
+ , m_fcal2SD(nullptr)
+ , m_fcalColdSD(nullptr)
{
declareProperty( "FCAL1Volumes" , m_fcal1Volumes );
declareProperty( "FCAL2Volumes" , m_fcal2Volumes );
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.cc
old mode 100755
new mode 100644
index 8816e720e67..a9dc20e0b04
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.cc
@@ -14,6 +14,7 @@
LArG4H62004HECSDTool::LArG4H62004HECSDTool(const std::string& type, const std::string& name, const IInterface *parent)
: LArG4SDTool(type,name,parent)
, m_HitColl("LArHitHEC")
+ , m_wheelSD(nullptr)
{
declareInterface<ISensitiveDetector>(this);
}
@@ -38,12 +39,7 @@ StatusCode LArG4H62004HECSDTool::initializeSD()
StatusCode LArG4H62004HECSDTool::Gather()
{
// In this case, *unlike* other SDs, the *tool* owns the collection
-#ifdef ATHENAHIVE
- // Temporary fix for Hive until isValid is fixed
- m_HitColl = CxxUtils::make_unique<LArHitContainer>(m_HitColl.name());
-#else
if (!m_HitColl.isValid()) m_HitColl = CxxUtils::make_unique<LArHitContainer>(m_HitColl.name());
-#endif
// Hand this collection name off to the SDs. They will be writing to the
// collection, but only one at a time!
m_wheelSD->EndOfAthenaEvent( &*m_HitColl );
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.cc
old mode 100755
new mode 100644
index c28dc4fd120..c067a6aee88
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.cc
@@ -17,6 +17,10 @@
LArG4H62004InactiveSDTool::LArG4H62004InactiveSDTool(const std::string& type, const std::string& name, const IInterface *parent)
: LArG4SDTool(type,name,parent)
, m_HitColl("LArCalibrationHitInactive")
+ , m_emecSD(nullptr)
+ , m_hecSD(nullptr)
+ , m_fcal1SD(nullptr)
+ , m_fcal2SD(nullptr)
{
declareProperty("EMECVolumes",m_emecVolumes);
declareProperty("HECVolumes",m_hecVolumes);
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004SD.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004SD.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004SD.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004SD.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSD.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSD.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSD.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSD.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSDTool.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0Calculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0Calculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0Calculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0Calculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0CalibCalculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0CalibCalculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0CalibCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0CalibCalculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0ChannelMap.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0ChannelMap.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0ChannelMap.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0ChannelMap.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc
old mode 100755
new mode 100644
index 5fbe7e67afa..741f543572a
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc
@@ -66,12 +66,7 @@ void LArG4H6WarmTCSD::Initialize(G4HCofThisEvent*)
#ifdef DEBUG_ME
std::cout<<"LArG4H6WarmTCSD::LArG4H6WarmTCSD: "<<SensitiveDetectorName<<" initializing coll.: "<<collectionName[0]<<std::endl;
#endif
-#ifdef ATHENAHIVE
- // Temporary fix for Hive until isValid is fixed
- m_Collection = CxxUtils::make_unique<LArG4H6WarmTCHitCollection>();
-#else
- if (!m_Collection.isValid()) m_Collection = CxxUtils::make_unique<LArG4H6WarmTCHitCollection>();
-#endif
+ if (!m_Collection.isValid()) m_Collection = CxxUtils::make_unique<LArG4H6WarmTCHitCollection>();
#ifdef DEBUG_ME
std::cout<<"LArG4H6WarmTCSD::LArG4H6WarmTCSD: initialized "<<collectionName[0]<<" with HCID: "<<G4SDManager::GetSDMpointer()->GetCollectionID(collectionName[0])<<std::endl;
#endif
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSDTool.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChCalculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChCalculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChCalculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChHit.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChHit.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChHit.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChHit.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSDTool.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSensitiveDetector.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSensitiveDetector.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSensitiveDetector.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSensitiveDetector.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004EventAction.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004EventAction.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004EventAction.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004EventAction.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6BeamInfo.cxx b/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6BeamInfo.cxx
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6BeamInfo.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6BeamInfo.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6TriggerTimeTool.cxx b/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6TriggerTimeTool.cxx
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6TriggerTimeTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6TriggerTimeTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.h b/LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.cc
old mode 100755
new mode 100644
index 332ea4038e7..b46f1f64cc1
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.cc
@@ -18,6 +18,13 @@ TBECBackOuterBarretteTool::TBECBackOuterBarretteTool(const std::string& type, co
, m_HitColl_gap_se("LArHitEMEC_gap_se")
, m_HitColl_chcoll("LArHitEMEC_chcoll")
, m_HitColl_ropt("LArHitEMEC_ropt")
+ , m_gapadjSD(nullptr)
+ , m_gapoldSD(nullptr)
+ , m_gap_eSD(nullptr)
+ , m_gap_sSD(nullptr)
+ , m_gap_seSD(nullptr)
+ , m_chcollSD(nullptr)
+ , m_roptSD(nullptr)
{
declareInterface<ISensitiveDetector>(this);
}
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.cc
old mode 100755
new mode 100644
index 95b90e39d20..a89048c053e
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.cc
@@ -18,6 +18,13 @@ TBECInnerModuleTool::TBECInnerModuleTool(const std::string& type, const std::str
, m_HitColl_gap_se("LArHitEMEC_gap_se")
, m_HitColl_chcoll("LArHitEMEC_chcoll")
, m_HitColl_ropt("LArHitEMEC_ropt")
+ , m_gapadjSD(nullptr)
+ , m_gapoldSD(nullptr)
+ , m_gap_eSD(nullptr)
+ , m_gap_sSD(nullptr)
+ , m_gap_seSD(nullptr)
+ , m_chcollSD(nullptr)
+ , m_roptSD(nullptr)
{
declareInterface<ISensitiveDetector>(this);
}
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECOuterModuleTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECOuterModuleTool.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECOuterModuleTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECOuterModuleTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx b/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_load.cxx b/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_load.cxx
old mode 100755
new mode 100644
--
GitLab