diff --git a/TileCalorimeter/TileEvent/TileEvent/TileBeamElem.h b/TileCalorimeter/TileEvent/TileEvent/TileBeamElem.h index ce8fdbb1c47123589971753701833c9928349de3..07cc82990300942fe3eb5acd7e71577978a5a464 100755 --- a/TileCalorimeter/TileEvent/TileEvent/TileBeamElem.h +++ b/TileCalorimeter/TileEvent/TileEvent/TileBeamElem.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration */ //*************************************************************************** @@ -38,12 +38,8 @@ public: // with pyroot. TileBeamElem(const Identifier& id, const std::vector<uint32_t>& digits ); - TileBeamElem(const HWIdentifier& HWid, uint32_t digit ); + TileBeamElem(const HWIdentifier& HWid, uint32_t digit ); - /* Destructor */ - - ~TileBeamElem() {} - /* Inline access methods */ inline int size(void) const { return m_digits.size(); } diff --git a/TileCalorimeter/TileEvent/TileEvent/TileDigits.h b/TileCalorimeter/TileEvent/TileEvent/TileDigits.h index 34fd7acdad6e9d7eaf617612b1baa8f0cef774d2..11c82723c20c8103fc19a8d0ae30c5b01917f901 100755 --- a/TileCalorimeter/TileEvent/TileEvent/TileDigits.h +++ b/TileCalorimeter/TileEvent/TileEvent/TileDigits.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration */ //*************************************************************************** @@ -57,10 +57,6 @@ public: /** @return a reference to a stl vector containing the sample values */ const std::vector < float > & samples() const { return m_digits; } - /* Destructor */ - - ~TileDigits() { } - /* Inline access methods */ inline int NtimeSamples(void) const { return m_digits.size(); } diff --git a/TileCalorimeter/TileEvent/TileEvent/TileRawChannel.h b/TileCalorimeter/TileEvent/TileEvent/TileRawChannel.h index f652c5d4aa02672ee238872d07fb65d9cef0ab62..a8f6b90a13bd94104ed620d6a15e261465d6871a 100755 --- a/TileCalorimeter/TileEvent/TileEvent/TileRawChannel.h +++ b/TileCalorimeter/TileEvent/TileEvent/TileRawChannel.h @@ -51,6 +51,8 @@ class TileRawChannel: public TileRawData { float ped = 0.0); TileRawChannel(const Identifier& id, float amplitude, float time, float quality, float ped = 0.0); + TileRawChannel& operator=(const TileRawChannel&) = default; + /* Destructor */ ~TileRawChannel() { diff --git a/TileCalorimeter/TileEvent/TileEvent/TileRawData.h b/TileCalorimeter/TileEvent/TileEvent/TileRawData.h index 299d207e7730e4c8309a64e5f2647f15df802f3f..1c4dc0099a291a58702cdc1fbec2a07f85c9ca0d 100755 --- a/TileCalorimeter/TileEvent/TileEvent/TileRawData.h +++ b/TileCalorimeter/TileEvent/TileEvent/TileRawData.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration */ //*************************************************************************** @@ -46,7 +46,7 @@ public: TileRawData(const Identifier& id); /* Destructor */ - virtual ~TileRawData() {} + virtual ~TileRawData() = default; /* Inline accessor methods: */ inline Identifier identify(void) const { return adc_ID(); } diff --git a/TileCalorimeter/TileEvent/TileEvent/TileRawDataCollection.h b/TileCalorimeter/TileEvent/TileEvent/TileRawDataCollection.h index 64301b013e8e09bff163a9f5fc22f57c7bea3875..69bcb22ebd44c0d58be3d4473df67bb2f91c1a6d 100755 --- a/TileCalorimeter/TileEvent/TileEvent/TileRawDataCollection.h +++ b/TileCalorimeter/TileEvent/TileEvent/TileRawDataCollection.h @@ -54,7 +54,7 @@ template <typename TELEMENT> class TileRawDataCollection m_id(0), m_lvl1Id(0), m_lvl1Type(0), m_detEvType(0), m_rodBCID(0) { this->reserve(48); } // destructor - virtual ~TileRawDataCollection<TELEMENT> () { } + virtual ~TileRawDataCollection<TELEMENT> () = default; // clear everything for next event virtual void clear (); diff --git a/TileCalorimeter/TileEvent/TileEvent/TileTTL1.h b/TileCalorimeter/TileEvent/TileEvent/TileTTL1.h index 3ff6d177864e7babf133ee83fedd52910c950305..6b5a69e23881ad0e04619133fa3d05ed56e40a36 100755 --- a/TileCalorimeter/TileEvent/TileEvent/TileTTL1.h +++ b/TileCalorimeter/TileEvent/TileEvent/TileTTL1.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration */ //*************************************************************************** @@ -37,7 +37,7 @@ public: TileTTL1(const Identifier& id, std::vector<float>&& digits ); - ~TileTTL1() {} + ~TileTTL1() = default; /* Access methods */ diff --git a/TileCalorimeter/TileEvent/TileEvent/TileTTL1Cell.h b/TileCalorimeter/TileEvent/TileEvent/TileTTL1Cell.h index 0e8196373a9d2529d082d6ad5f9187252b4f1a6f..94afe137b39b083625c7c7b04fef0ff7dce5e6ab 100755 --- a/TileCalorimeter/TileEvent/TileEvent/TileTTL1Cell.h +++ b/TileCalorimeter/TileEvent/TileEvent/TileTTL1Cell.h @@ -1,7 +1,7 @@ // This file's extension implies that it's C, but it's really -*- C++ -*-. /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration */ //*************************************************************************** @@ -63,7 +63,7 @@ public: uint16_t quality); /** @brief destructor */ - ~TileTTL1Cell() {} + ~TileTTL1Cell() = default; /** all set methods */ /** @brief set total tower energy*/