diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Coordinate.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Coordinate.h index bd3fc94a31fcd49fc941aa12ae614ebf82da0fd9..7f91c22ea26899b84f9ac7debe6de4dd94e7511e 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Coordinate.h +++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Coordinate.h @@ -1,6 +1,6 @@ // Dear emacs, this is -*- c++ -*- /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** Coordinate.h - description @@ -47,7 +47,7 @@ namespace LVL1 { public: Coordinate( double phi, double eta ); Coordinate(); - virtual ~Coordinate(); + virtual ~Coordinate() = default; void setCoords( double phi, double eta ); double eta() const; diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CoordinateRange.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CoordinateRange.h index ee78f281f594bef70e5f59726fbde65b9ce74091..4615c274f448ce87ffcd5d7dc2d5227a672a0b51 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CoordinateRange.h +++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CoordinateRange.h @@ -1,6 +1,6 @@ // Dear emacs, this is -*- c++ -*- /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** CoordinateRange.h - description @@ -32,7 +32,7 @@ class CoordinateRange : public Coordinate { public: CoordinateRange(double phiMin, double phiMax, double etaMin, double etaMax); CoordinateRange(); - virtual ~CoordinateRange(); + virtual ~CoordinateRange() = default; void setRanges(double phiMin, double phiMax, double etaMin, double etaMax); PhiRange phiRange() const; diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1Topo.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1Topo.h index 82c0162ba4ccbaa9fd909c2701fbad54c37a8d6e..d06eecc2332be17bce7356e0f71a5e5be9f8e5c0 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1Topo.h +++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1Topo.h @@ -27,7 +27,8 @@ namespace LVL1 { //constructor MuCTPIL1Topo(); MuCTPIL1Topo(std::vector<MuCTPIL1TopoCandidate> candList); - ~MuCTPIL1Topo(); + MuCTPIL1Topo(const MuCTPIL1Topo&) = default; + ~MuCTPIL1Topo() = default; //Return the vector of muon to L1Topo candidates std::vector<MuCTPIL1TopoCandidate> getCandidates() const; diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1TopoCandidate.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1TopoCandidate.h index f7743521fca39df1789a1308c83a005b51a188bc..06df7aa77ed38d934404cfa176223f14ec3d048a 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1TopoCandidate.h +++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1TopoCandidate.h @@ -27,7 +27,7 @@ namespace LVL1 { MuCTPIL1TopoCandidate(); - ~MuCTPIL1TopoCandidate(); + ~MuCTPIL1TopoCandidate() = default; // set candidate data void setCandidateData(std::string sectorName, diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/PhiRange.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/PhiRange.h index b9e6ce2a4c3a36e1233214b5992bce79d964f08e..c8fa26ba855955712b60836e5ed371c891969691 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/PhiRange.h +++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/PhiRange.h @@ -19,7 +19,7 @@ namespace LVL1 { public: PhiRange(); PhiRange( double min, double max ); - virtual ~PhiRange(); + ~PhiRange() = default; double min() const; double max() const; diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Range.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Range.h index f413ca52739cc591a8214fc32ca6964f258ac1c3..98df82f9fe422e146799078aa63d81bc095b35d8 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Range.h +++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Range.h @@ -19,7 +19,7 @@ namespace LVL1 { public: Range() ; Range( double min, double max ); - virtual ~Range(); + ~Range() = default; double min() const; double max() const; diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/iRecCoordRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/iRecCoordRoI.h index b22be68336bd99994d09540e88a689dc9fe9f2c1..35ea8f22f5be8c21a2f78767e530907fce71fd81 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/iRecCoordRoI.h +++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/iRecCoordRoI.h @@ -27,7 +27,7 @@ class iRecCoordRoI { public: iRecCoordRoI(); - virtual ~iRecCoordRoI(); + virtual ~iRecCoordRoI() = default; /** override this method & return eta coord */ virtual double eta() const = 0; /** override this method & return phi coord */ diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/Coordinate.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/Coordinate.cxx index 5a41447dc4d49a6f0c9121477b6d41c635da9a20..8dc6efc97fdd090aea20a62bc8500344359ca1a9 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/src/Coordinate.cxx +++ b/Trigger/TrigT1/TrigT1Interfaces/src/Coordinate.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** Coordinate.cxx - description @@ -27,11 +27,6 @@ namespace LVL1 { } - // Destructor - Coordinate::~Coordinate() { - - } - /** change coords of an existing Coordinate object*/ void Coordinate::setCoords( double phi, double eta ) { diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/CoordinateRange.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/CoordinateRange.cxx index 4bf3383ed2b69fa38e3588102d1663f73f31216e..aba45f67628977da7d103b7f8dfc6b0af603a1cd 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/src/CoordinateRange.cxx +++ b/Trigger/TrigT1/TrigT1Interfaces/src/CoordinateRange.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** CoordinateRange.cxx - description @@ -22,9 +22,6 @@ CoordinateRange::CoordinateRange(double phiMin, double phiMax, double etaMin, CoordinateRange::CoordinateRange() : m_phiRange(0.0, 0.0), m_etaRange(0.0, 0.0) {} -// Destructor -CoordinateRange::~CoordinateRange() {} - /** change coords of an existing CoordinateRange object*/ void CoordinateRange::setRanges(double phiMin, double phiMax, double etaMin, double etaMax) { diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1Topo.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1Topo.cxx index 040504058a0022598fec7bbf1456dd16b179774a..541e4d09b82ca6dd2019ff9cf60cc144b77c3ae5 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1Topo.cxx +++ b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1Topo.cxx @@ -13,10 +13,6 @@ namespace LVL1 { m_muonTopoCandidates = candList; } - MuCTPIL1Topo::~MuCTPIL1Topo() { - - } - MuCTPIL1Topo& MuCTPIL1Topo::operator=( const MuCTPIL1Topo& a ) { clearCandidates(); diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1TopoCandidate.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1TopoCandidate.cxx index 81f3c0e58bc1938b3acf404cf614c4762b287a93..d4d43b48ce7174d9e6f1496e9479e95262dd69f3 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1TopoCandidate.cxx +++ b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1TopoCandidate.cxx @@ -13,9 +13,6 @@ namespace LVL1 { m_bcid(0), m_ptThresholdID(0), m_ptL1TopoCode(0), m_ptValue(0), m_eta(0), m_phi(0), m_etacode(0), m_phicode(0), m_etamin(0), m_etamax(0), m_phimin(0), m_phimax(0), m_roiWord(0), m_mioctID(0), m_ieta(0), m_iphi(0) {} - MuCTPIL1TopoCandidate::~MuCTPIL1TopoCandidate() { - - } void MuCTPIL1TopoCandidate::setCandidateData(std::string sectorName, unsigned int roiID, unsigned int bcid, diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/PhiRange.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/PhiRange.cxx index f82d1328871c953515ad6c2afbe06c78a686ab69..d8b7be3b46cf26abb06a32d49880e0b0003feda8 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/src/PhiRange.cxx +++ b/Trigger/TrigT1/TrigT1Interfaces/src/PhiRange.cxx @@ -27,10 +27,6 @@ namespace LVL1 { checkValues(); } - PhiRange::~PhiRange() { - - } - double PhiRange::min() const { return m_min; } diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/Range.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/Range.cxx index 2d4de1344fa89d123e347eecbc64654fa56dc20d..eba9169d695c903ed2aada90c6102a5057f850d5 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/src/Range.cxx +++ b/Trigger/TrigT1/TrigT1Interfaces/src/Range.cxx @@ -23,10 +23,6 @@ namespace LVL1 { checkValues(); } - Range::~Range() { - - } - double Range::min() const { return m_min; } diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/iRecCoordRoI.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/iRecCoordRoI.cxx index a56186926de4de4be2ff8fd5e3f5c953bc443efb..cfb5a4790fa0d5ded6b1900c8e8831d16ce7d4ed 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/src/iRecCoordRoI.cxx +++ b/Trigger/TrigT1/TrigT1Interfaces/src/iRecCoordRoI.cxx @@ -12,5 +12,3 @@ iRecCoordRoI::iRecCoordRoI(){ } -iRecCoordRoI::~iRecCoordRoI(){ -}