Skip to content
Snippets Groups Projects
Commit ae55bbc3 authored by Scott Snyder's avatar Scott Snyder Committed by Graeme Stewart
Browse files

'Fix coverity warnings 108586, 108594, 108601, 108597, 108600, 108607, 108589,...

'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
parent 7828f2a6
No related branches found
No related tags found
No related merge requests found
Showing
with 12 additions and 15 deletions
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -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);
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -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;
......
File mode changed from 100755 to 100644
......@@ -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 );
......
File mode changed from 100755 to 100644
......@@ -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 );
......
File mode changed from 100755 to 100644
......@@ -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 );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment