From f7a1acaa0cd7678c018f81fd84cd4ea6c87582a0 Mon Sep 17 00:00:00 2001 From: Walter Lampl <Walter.Lampl@cern.ch> Date: Sat, 10 Aug 2019 12:00:14 +0200 Subject: [PATCH] Implement review comments (copyright, ...) + fix flake8 complain --- .../python/LArRawDataReadingConfig.py | 2 ++ .../LArByteStream/src/LArRawDataReadingAlg.cxx | 14 +++++++------- .../LArByteStream/src/LArRawDataReadingAlg.h | 1 - .../LArROD/python/LArRawChannelBuilderAlgConfig.py | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py index 1a402154350..462734e1f8c 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py +++ b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py @@ -1,3 +1,5 @@ +# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg from LArByteStream.LArByteStreamConf import LArRawDataReadingAlg diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.cxx index 4039698045a..ceafd6460a7 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.cxx +++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.cxx @@ -1,3 +1,7 @@ +/* + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +*/ + #include "LArRawDataReadingAlg.h" #include "LArIdentifier/LArOnlineID.h" #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h" @@ -42,10 +46,6 @@ LArRawDataReadingAlg::LArRawDataReadingAlg(const std::string& name, ISvcLocator* return StatusCode::SUCCESS; } -StatusCode LArRawDataReadingAlg::finalize() { - return StatusCode::SUCCESS; -} - StatusCode LArRawDataReadingAlg::execute(const EventContext& ctx) const { LArRawChannelContainer* rawChannels=nullptr; LArDigitContainer* digits=nullptr; @@ -55,21 +55,21 @@ StatusCode LArRawDataReadingAlg::execute(const EventContext& ctx) const { SG::WriteHandle<LArRawChannelContainer> rawChannelsHdl(m_rawChannelKey,ctx); ATH_CHECK(rawChannelsHdl.record(std::make_unique<LArRawChannelContainer>())); rawChannels=rawChannelsHdl.ptr(); - rawChannels->reserve(182468); + rawChannels->reserve(182468); //Total number of LAr readout channels } if (m_doDigits) { SG::WriteHandle<LArDigitContainer> digitsHdl(m_digitKey,ctx); ATH_CHECK(digitsHdl.record(std::make_unique<LArDigitContainer>())); digits=digitsHdl.ptr(); - digits->reserve(1000); + digits->reserve(1000); //Approximate number of Digits above threshold } if (m_doFebHeaders) { SG::WriteHandle<LArFebHeaderContainer> febHeadersHdl(m_febHeaderKey,ctx); ATH_CHECK(febHeadersHdl.record(std::make_unique<LArFebHeaderContainer>())); febHeaders=febHeadersHdl.ptr(); - febHeaders->reserve(1524); + febHeaders->reserve(1524); //Total number of LAr Front End Boards } //Get full events and filter out LAr ROBs diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.h b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.h index 5a71be4d768..16152ba179c 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.h +++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.h @@ -26,7 +26,6 @@ class LArRawDataReadingAlg : public AthReentrantAlgorithm { StatusCode initialize() override; StatusCode execute(const EventContext& ctx) const override; - StatusCode finalize() override; private: //Event output: diff --git a/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py b/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py index e62f765b8fb..8f848e476b3 100644 --- a/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py +++ b/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py @@ -1,4 +1,4 @@ -from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator +# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration from LArROD.LArRODConf import LArRawChannelBuilderAlg from LArRecUtils.LArADC2MeVCondAlgConfig import LArADC2MeVCondAlgCfg from LArConfiguration.LArElecCalibDBConfig import LArElecCalibDbCfg -- GitLab