From 364491e958c7aa62b82e1b5ec206552a95afd7c4 Mon Sep 17 00:00:00 2001
From: Kristian Bjoerke <krbjeork@cern.ch>
Date: Fri, 7 Dec 2018 12:12:13 +0100
Subject: [PATCH] Breaking up lines and statements that exceed character limits
According to ATLAS Coding Guidelines statements should not exceed
100 characters and lines should not exceed 120 characters.
If possible long lines or statements should be split up into
multiple ones [long-statements] [long-lines].
Former-commit-id: 10266f4b61d8efa315f59919f81d15a563a95414
---
.../ISCT_RodEncoder.h | 3 ++-
.../src/SCT_RodEncoder.cxx | 19 ++++++++-----
.../src/SCT_RodEncoder.h | 27 ++++++++++++++-----
3 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCT_RodEncoder.h b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCT_RodEncoder.h
index e7c5e244539..3408fe21677 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCT_RodEncoder.h
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCT_RodEncoder.h
@@ -30,7 +30,8 @@ class ISCT_RodEncoder : virtual public IAlgTool {
virtual ~ISCT_RodEncoder() = default;
/** convert all collections of RDO's in the current list to vector of 32bit words */
- virtual void fillROD(std::vector<uint32_t>& vec32Data, const uint32_t& robID, const std::vector<const SCT_RDORawData*>& vecRDOs) const = 0;
+ virtual void fillROD(std::vector<uint32_t>& vec32Data, const uint32_t& robID,
+ const std::vector<const SCT_RDORawData*>& vecRDOs) const = 0;
};
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodEncoder.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodEncoder.cxx
index 3e92bed0afc..54544403dbe 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodEncoder.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodEncoder.cxx
@@ -237,7 +237,8 @@ void SCT_RodEncoder::fillROD(std::vector<uint32_t>& vec32Data, const uint32_t& r
/// Encode Data function
///=========================================================================
-void SCT_RodEncoder::encodeData(const std::vector<int>& vecTimeBins, std::vector<uint16_t>& vec16Words, const SCT_RDORawData* rdo, const int& groupSize, const int& strip) const {
+void SCT_RodEncoder::encodeData(const std::vector<int>& vecTimeBins, std::vector<uint16_t>& vec16Words,
+ const SCT_RDORawData* rdo, const int& groupSize, const int& strip) const {
const int encodedSide{side(rdo) << 14};
@@ -305,7 +306,8 @@ void SCT_RodEncoder::encodeData(const std::vector<int>& vecTimeBins, std::vector
///=========================================================================
/// Converting the 16 bit vector v16 to 32 bit words v32
///=========================================================================
-void SCT_RodEncoder::packFragments(std::vector<uint16_t>& vec16Words, std::vector<uint32_t>& vec32Words) const {
+void SCT_RodEncoder::packFragments(std::vector<uint16_t>& vec16Words,
+ std::vector<uint32_t>& vec32Words) const {
int num16Words{static_cast<int>(vec16Words.size())};
if (isOdd(num16Words)) {
/** just add an additional 16bit words to make even size v16 to in the 32 bits word 0x40004000 */
@@ -333,7 +335,9 @@ void SCT_RodEncoder::packFragments(std::vector<uint16_t>& vec16Words, std::vecto
/// set the 16 bit word v16 to 32 bit words v32
///=========================================================================
-uint32_t SCT_RodEncoder::set32Bits(const unsigned short int* arr16Words, const unsigned short int* position, const unsigned short int& numWords) const {
+uint32_t SCT_RodEncoder::set32Bits(const unsigned short int* arr16Words,
+ const unsigned short int* position,
+ const unsigned short int& numWords) const {
uint32_t uint32Word{0};
uint32_t pos{0};
uint32_t uint16Word{0};
@@ -421,7 +425,8 @@ SCT_RodEncoder::getTrailer(const int& errorWord) const {
/// Add errors
///-------------------------------------------------------------------------------------
-void SCT_RodEncoder::addHeadersWithErrors(const uint32_t& robID, const std::set<IdentifierHash>* errors, const ErrorWords& errType, std::vector<uint16_t>& vec16Data) const {
+void SCT_RodEncoder::addHeadersWithErrors(const uint32_t& robID, const std::set<IdentifierHash>* errors,
+ const ErrorWords& errType, std::vector<uint16_t>& vec16Data) const {
for (const IdentifierHash& linkHash: *errors) {
const uint32_t errROBID{m_cabling->getRobIdFromHash(linkHash)};
if (errROBID == robID) {
@@ -434,7 +439,8 @@ void SCT_RodEncoder::addHeadersWithErrors(const uint32_t& robID, const std::set<
}
//
-void SCT_RodEncoder::addTrailersWithErrors(const uint32_t& robID, const std::set<IdentifierHash>* errors, const ErrorWords& errType, std::vector<uint16_t>& vec16Data) const {
+void SCT_RodEncoder::addTrailersWithErrors(const uint32_t& robID, const std::set<IdentifierHash>* errors,
+ const ErrorWords& errType, std::vector<uint16_t>& vec16Data) const {
for (const IdentifierHash& linkHash: *errors) {
const uint32_t errROBID{m_cabling->getRobIdFromHash(linkHash)};
if (errROBID == robID) {
@@ -446,7 +452,8 @@ void SCT_RodEncoder::addTrailersWithErrors(const uint32_t& robID, const std::set
}
}
-void SCT_RodEncoder::addSpecificErrors(const uint32_t& robID, const std::set<IdentifierHash>* errors, const ErrorWords& errType, std::vector<uint16_t>& vec16Data) const {
+void SCT_RodEncoder::addSpecificErrors(const uint32_t& robID, const std::set<IdentifierHash>* errors,
+ const ErrorWords& errType, std::vector<uint16_t>& vec16Data) const {
for (const IdentifierHash& linkHash: *errors) {
const uint32_t errROBID{m_cabling->getRobIdFromHash(linkHash)};
if (errROBID == robID) {
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodEncoder.h b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodEncoder.h
index 7a5c539d26a..d386a27720e 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodEncoder.h
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodEncoder.h
@@ -54,7 +54,8 @@ class SCT_RodEncoder : public extends<AthAlgTool, ISCT_RodEncoder>
virtual StatusCode finalize() override;
/// convert all collections of RDO's in the current list to vector of 32bit words
- virtual void fillROD(std::vector<uint32_t>& vec32Data, const uint32_t& robID, const std::vector<const SCT_RDORawData*>& vecRDOs) const override;
+ virtual void fillROD(std::vector<uint32_t>& vec32Data, const uint32_t& robID,
+ const std::vector<const SCT_RDORawData*>& vecRDOs) const override;
private:
@@ -72,13 +73,16 @@ class SCT_RodEncoder : public extends<AthAlgTool, ISCT_RodEncoder>
NULL_TRAILER_ERR=0};
/// Encode rdo into the data: called by fillROD(..)
- void encodeData(const std::vector<int>& vecTimeBins, std::vector<uint16_t>& vec16Words, const SCT_RDORawData* rdo, const int& groupSize, const int& strip) const;
+ void encodeData(const std::vector<int>& vecTimeBins, std::vector<uint16_t>& vec16Words,
+ const SCT_RDORawData* rdo, const int& groupSize, const int& strip) const;
/// pack 32 bit word: called by encodeData(..)
void packFragments(std::vector<uint16_t>& vec16Words, std::vector<uint32_t>& vec32Words) const;
/// from 16 bits array to 32 bit array
- uint32_t set32Bits(const unsigned short int* arr16Words, const unsigned short int* position, const unsigned short int& numWords) const;
+ uint32_t set32Bits(const unsigned short int* arr16Words,
+ const unsigned short int* position,
+ const unsigned short int& numWords) const;
/// Get the side info from the RDO
int side(const SCT_RDORawData* rdo) const;
@@ -116,10 +120,21 @@ class SCT_RodEncoder : public extends<AthAlgTool, ISCT_RodEncoder>
void addSpecificErrors(const uint32_t& robID, const std::set<IdentifierHash>* errors,
const ErrorWords& errType, std::vector<uint16_t>& vec16Data) const;
- ToolHandle<ISCT_ByteStreamErrorsTool> m_bsErrTool{this, "SCT_ByteStreamErrorsTool", "SCT_ByteStreamErrorsTool", "Tool to retrieve SCT ByteStream Errors"};
- ToolHandle<ISCT_CablingTool> m_cabling{this, "SCT_CablingTool", "SCT_CablingTool", "Tool to retrieve SCT Cabling"};
+ ToolHandle<ISCT_ByteStreamErrorsTool> m_bsErrTool{this,
+ "SCT_ByteStreamErrorsTool",
+ "SCT_ByteStreamErrorsTool",
+ "Tool to retrieve SCT ByteStream Errors"};
+
+ ToolHandle<ISCT_CablingTool> m_cabling{this,
+ "SCT_CablingTool",
+ "SCT_CablingTool",
+ "Tool to retrieve SCT Cabling"};
const SCT_ID* m_sctID;
- BooleanProperty m_condensed{this, "CondensedMode", false, "Condensed mode (true) or Expanded mode (false)"};
+ BooleanProperty m_condensed{this,
+ "CondensedMode",
+ false,
+ "Condensed mode (true) or Expanded mode (false)"};
+
std::set<Identifier> m_swapModuleID; // Set by SCTRawContByteStreamTool
};
--
GitLab