Skip to content
Snippets Groups Projects
Commit 2307d877 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'cppcheck.MuonSimData-20240423' into 'main'

MuonSimData+AthenaPoolTestData: Fix cppcheck warnings.

See merge request atlas/athena!70828
parents 4725777f e271549e
No related branches found
No related tags found
No related merge requests found
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
/**
......@@ -25,23 +25,12 @@ AthenaPoolTestMapData::AthenaPoolTestMapData() :
AthenaPoolTestMapData::AthenaPoolTestMapData (const std::vector<Deposit>& deposits,
int simDataWord)
: m_word( ((deposits.size() << 29) & 0xe0000000) | (simDataWord & 0x1fffffff))
: m_word( ((deposits.size() << 29) & 0xe0000000) | (simDataWord & 0x1fffffff)),
m_deposits (deposits)
{
/*
m_p_deposits = new Deposit[deposits.size()];
for (unsigned int i = 0; i!= deposits.size(); i++)
{
m_p_deposits[i] = deposits[i];
}
*/
m_deposits = deposits;
}
AthenaPoolTestMapData::~AthenaPoolTestMapData()
{
// delete[] m_p_deposits;
}
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
// CscSimData.cxx
......@@ -12,13 +12,15 @@ CscSimData::CscSimData()
CscSimData::
CscSimData(const std::vector<Deposit>& deposits, int simDataWord)
: m_word((deposits.size()<<29 & 0xe0000000) | (simDataWord & 0x1fffffff)) {
m_deposits = deposits;
: m_word((deposits.size()<<29 & 0xe0000000) | (simDataWord & 0x1fffffff)),
m_deposits (deposits)
{
}
CscSimData::
CscSimData(std::vector<Deposit>&& deposits, int simDataWord)
: m_word((deposits.size()<<29 & 0xe0000000) | (simDataWord & 0x1fffffff)) {
m_deposits = std::move(deposits);
: m_word((deposits.size()<<29 & 0xe0000000) | (simDataWord & 0x1fffffff)),
m_deposits (std::move(deposits))
{
}
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
......@@ -23,15 +23,17 @@ MuonSimData::MuonSimData() :
MuonSimData::MuonSimData (const std::vector<Deposit>& deposits,
int simDataWord)
: m_word((deposits.size()<<29 & 0xe0000000) | (simDataWord & 0x1fffffff)), m_x(0.0),m_y(0.0),m_z(0.0),m_t(0.0)
: m_word((deposits.size()<<29 & 0xe0000000) | (simDataWord & 0x1fffffff)),
m_deposits (deposits),
m_x(0.0),m_y(0.0),m_z(0.0),m_t(0.0)
{
m_deposits = deposits;
}
MuonSimData::MuonSimData (std::vector<Deposit>&& deposits,
int simDataWord)
: m_word((deposits.size()<<29 & 0xe0000000) | (simDataWord & 0x1fffffff)), m_x(0.0),m_y(0.0),m_z(0.0),m_t(0.0)
: m_word((deposits.size()<<29 & 0xe0000000) | (simDataWord & 0x1fffffff)),
m_deposits (std::move(deposits)),
m_x(0.0),m_y(0.0),m_z(0.0),m_t(0.0)
{
m_deposits = std::move(deposits);
}
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