diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/BunchGroup.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/BunchGroup.cxx index c64c357a4a393b10a756a6b228048beb170de405..bba0db289621059502793d7f0711f3b8cea0423d 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/BunchGroup.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/BunchGroup.cxx @@ -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 */ #include "TrigConfL1Data/BunchGroup.h" @@ -14,8 +14,6 @@ TrigConf::BunchGroup::BunchGroup() : m_Bunches() {} -TrigConf::BunchGroup::~BunchGroup() {} - void TrigConf::BunchGroup::addBunch(int b) { m_Bunches.push_back(b); } diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/BunchGroupSet.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/BunchGroupSet.cxx index b7914405e7420e3c60dd57c8cecbf8032b7dbc23..6d4ea6c67204992278be441bdb4457f3058f37f9 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/BunchGroupSet.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/BunchGroupSet.cxx @@ -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 */ #include "TrigConfL1Data/BunchGroupSet.h" @@ -21,9 +21,6 @@ BunchGroupSet::BunchGroupSet(const std::vector<BunchGroup>& bgv) : fillPattern(bg.internalNumber(), bg); } -BunchGroupSet::~BunchGroupSet() {} - - void BunchGroupSet::addBunchGroup(const BunchGroup& bg) { fillPattern(bg.internalNumber(), bg); diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/CaloInfo.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/CaloInfo.cxx index f0e080d7481164b5b6c455b457a716e5d8a59ab0..b861bb4157ad237120b05757a8e5b5ab9cfff505 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/CaloInfo.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/CaloInfo.cxx @@ -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 */ #include "TrigConfL1Data/CaloInfo.h" @@ -25,8 +25,6 @@ CaloInfo::CaloInfo() m_JetWindowSizeLarge( 0 ) {} -CaloInfo::~CaloInfo() {} - void CaloInfo::addJetWeight(int jw) { m_JetWeights.push_back(jw); diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/ClusterThresholdValue.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/ClusterThresholdValue.cxx index 37a22744207250055945f38c77eee5419d646120..b53e6a0995a49fbf28abe6060ad27e0261625982 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/ClusterThresholdValue.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/ClusterThresholdValue.cxx @@ -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 */ #include "TrigConfL1Data/ClusterThresholdValue.h" @@ -19,10 +19,6 @@ TrigConf::ClusterThresholdValue::ClusterThresholdValue() : m_useIsolationMask(false) {} -TrigConf::ClusterThresholdValue::~ClusterThresholdValue() -{} - - TrigConf::TriggerThresholdValue* TrigConf::ClusterThresholdValue::createCopy() const { return new ClusterThresholdValue(*this); diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/DeadTime.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/DeadTime.cxx index 459a7bacb2ae1a91215c74307d1b7d100b5358bf..bb8c8b3edb52079e5266f7cf72c277a0ddc409ac 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/DeadTime.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/DeadTime.cxx @@ -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 */ #include "TrigConfL1Data/DeadTime.h" @@ -16,9 +16,6 @@ TrigConf::DeadTime::DeadTime() : m_complex2Rate(0) {} -TrigConf::DeadTime::~DeadTime() -{} - void TrigConf::DeadTime::print(const std::string& indent, unsigned int detail) const { if(detail>=1) { diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/EtThresholdValue.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/EtThresholdValue.cxx index b7d89b2eb3a4b6b761c99e7ed166a5333109fd0a..c39436a189b896a3960a766b8dc3ee642ac1301f 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/EtThresholdValue.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/EtThresholdValue.cxx @@ -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 */ #include "TrigConfL1Data/EtThresholdValue.h" @@ -13,9 +13,6 @@ TrigConf::EtThresholdValue::EtThresholdValue() : TriggerThresholdValue() {} -TrigConf::EtThresholdValue::~EtThresholdValue() -{} - TrigConf::TriggerThresholdValue* TrigConf::EtThresholdValue::createCopy() const{ return new EtThresholdValue(*this); diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/JetThresholdValue.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/JetThresholdValue.cxx index 8b2acba19968f1c003133d87377792c5bc42050c..3a7e84540a787241949c4f5ec516dd52fd296f43 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/JetThresholdValue.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/JetThresholdValue.cxx @@ -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 */ #include "TrigConfL1Data/JetThresholdValue.h" @@ -13,9 +13,6 @@ TrigConf::JetThresholdValue::JetThresholdValue() : TriggerThresholdValue() {} -TrigConf::JetThresholdValue::~JetThresholdValue() -{} - TrigConf::TriggerThresholdValue* TrigConf::JetThresholdValue::createCopy() const{ return new JetThresholdValue(*this); diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/L1PSNumber.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/L1PSNumber.cxx index 532a1dd58b288b01c9eacd6f46706e8373e5af7b..9b364c958511bd888df7d50c2075e2342a4e5c82 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/L1PSNumber.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/L1PSNumber.cxx @@ -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 */ ///////////////////////////////////////////////////////////////////// @@ -85,9 +85,6 @@ namespace TrigConf { setInt64(i64); } - L1PSNumber::~L1PSNumber() { - } - /** * Checks whether the m_n,m_m,m_d combination is valid, i.e. * whether m_n >= 1 && 1 < (m_m+m_d+1)/(m_m+1) < 2. diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/METSigParam.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/METSigParam.cxx index 972ac220c3d3fe010dd323952ef95ae150241512..f0377400e2c0b721b116da566ba6a7fb412bb506 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/METSigParam.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/METSigParam.cxx @@ -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 */ #include "TrigConfL1Data/METSigParam.h" @@ -31,9 +31,6 @@ TrigConf::METSigParam::METSigParam() m_TESqrtMax(0) {} -TrigConf::METSigParam::~METSigParam() -{} - void TrigConf::METSigParam::setValues( int XSSigmaScale, int XSSigmaOffset, int XEmin, int XEmax, diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/Menu.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/Menu.cxx index bd7d899b5f2fe565d1f8087908fb42ec089882f5..dcf9d09af91324d69ecfef53fbad6dc63718491b 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/Menu.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/Menu.cxx @@ -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 */ #include "TrigConfL1Data/Menu.h" @@ -16,10 +16,6 @@ TrigConf::Menu::Menu() : L1DataBaseclass() {} -TrigConf::Menu::~Menu() { - clear(); -} - std::vector<uint16_t> TrigConf::Menu::bunchgroupMask() const { std::vector<uint16_t> bgmask(512); diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/Muctpi.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/Muctpi.cxx index be3f486a69ba64c60df438ae39fe1e4351741010..0cdb1ef039cebba061947b4d990c481815de8b27 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/Muctpi.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/Muctpi.cxx @@ -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 */ #include "TrigConfL1Data/Muctpi.h" @@ -14,8 +14,6 @@ TrigConf::Muctpi::Muctpi() : m_MaxCand(0) {} -TrigConf::Muctpi::~Muctpi() {} - void TrigConf::Muctpi::print(const std::string& indent, unsigned int /*detail*/) const { cout << indent << "Muctpi: " << endl; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/MuonThresholdSet.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/MuonThresholdSet.cxx index 5556007fd80338254504d045f6a515fa7a36d834..63d6a87b582121ccff03dfffc685f36b44466ad2 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/MuonThresholdSet.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/MuonThresholdSet.cxx @@ -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 */ #include "TrigConfL1Data/MuonThresholdSet.h" @@ -28,9 +28,6 @@ TrigConf::MuonThresholdSet::MuonThresholdSet() : m_tgc_set_ext_id = -1; } -TrigConf::MuonThresholdSet::~MuonThresholdSet() -{} - void TrigConf::MuonThresholdSet::print(const std::string& indent, unsigned int /*detail*/) const { cout << indent << "=============================================" << endl; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/MuonThresholdValue.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/MuonThresholdValue.cxx index f296acab234c044c961e1410ec43e7ee679c5cd7..2bde7346caef9ddb8d908846c0bfa4091076c1bb 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/MuonThresholdValue.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/MuonThresholdValue.cxx @@ -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 */ #include "TrigConfL1Data/MuonThresholdValue.h" @@ -11,10 +11,6 @@ TrigConf::MuonThresholdValue::MuonThresholdValue() : TriggerThresholdValue() {} -TrigConf::MuonThresholdValue::~MuonThresholdValue() -{} - - TrigConf::TriggerThresholdValue* TrigConf::MuonThresholdValue::createCopy() const { return new MuonThresholdValue(*this); diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/NimThresholdValue.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/NimThresholdValue.cxx index 32375de73c5e8d726011beb64d4f22d0fd16bbd4..06bf9f1adcda540d6cfa1b2952311014e6a2b33d 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/NimThresholdValue.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/NimThresholdValue.cxx @@ -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 */ #include "TrigConfL1Data/NimThresholdValue.h" @@ -12,9 +12,6 @@ TrigConf::NimThresholdValue::NimThresholdValue() : TriggerThresholdValue() {} -TrigConf::NimThresholdValue::~NimThresholdValue() -{} - TrigConf::TriggerThresholdValue* TrigConf::NimThresholdValue::createCopy() const{ return new NimThresholdValue(*this); diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/PrescaleSet.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/PrescaleSet.cxx index f15ad95c7b00e4bb61c5d6430a6ee0a7c7d7d34d..c0a1b2a49f939867ef66a5e0fc4ffba76f494776 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/PrescaleSet.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/PrescaleSet.cxx @@ -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 */ @@ -68,9 +68,6 @@ TrigConf::PrescaleSet::PrescaleSet() : m_Cuts() {} -TrigConf::PrescaleSet::~PrescaleSet() -{} - void TrigConf::PrescaleSet::reset() { for(auto& x: m_Prescales) x=-1; for(auto& x: m_Prescales_ctp) x=-1; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/PrescaledClock.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/PrescaledClock.cxx index c7abe41e53f691577aa02f1155e328ca79a3935c..3b1a0374da62b02d349e4cd154e1895900238442 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/PrescaledClock.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/PrescaledClock.cxx @@ -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 */ #include "TrigConfL1Data/PrescaledClock.h" @@ -13,9 +13,6 @@ TrigConf::PrescaledClock::PrescaledClock() : m_clock2(0) {} -TrigConf::PrescaledClock::~PrescaledClock() -{} - void TrigConf::PrescaledClock::print(const std::string& indent, unsigned int detail) const { if(detail>=1) { cout << indent << "PrescaledClock: "; printNameIdV(); diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/PrioritySet.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/PrioritySet.cxx index 0b710b27da1464394222fb63724a5ef35abd9db4..abfbdd20015af74e74df7c2b4b8c4bdcd7b1c769 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/PrioritySet.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/PrioritySet.cxx @@ -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 */ #include "TrigConfL1Data/PrioritySet.h" @@ -12,8 +12,6 @@ TrigConf::PrioritySet::PrioritySet() : L1DataBaseclass(),m_Priorities(N_PRIORITIES,"LOW") {} -TrigConf::PrioritySet::~PrioritySet() {} - void TrigConf::PrioritySet::setPriorities(const std::string p[], const unsigned int size) { if (size > N_PRIORITIES) std::cerr diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/Random.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/Random.cxx index ffdc6832d416884c46b3251c9d7e6572ff12215b..d75c8b8f2a5528f1465b6b85ab4deb3857f7a390 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/Random.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/Random.cxx @@ -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 */ #include "TrigConfL1Data/Random.h" @@ -17,9 +17,6 @@ TrigConf::Random::Random() : L1DataBaseclass(), 0xffffff } {} -TrigConf::Random::~Random() -{} - float TrigConf::Random::getRateFromCut(unsigned int idx) const { int32_t cut = m_cuts[idx]; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/ThresholdConfig.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/ThresholdConfig.cxx index 8052fc7fc1caf65008aba2204d22d06dd457f2dc..bad4bd09adc9882152609f4b0e0e34b094028c55 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/ThresholdConfig.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/ThresholdConfig.cxx @@ -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 */ #include "TrigConfL1Data/ThresholdConfig.h" @@ -30,10 +30,6 @@ ThresholdConfig::ThresholdConfig() : } -TrigConf::ThresholdConfig::~ThresholdConfig() { - clear(); -} - const vector<TriggerThreshold*>& TrigConf::ThresholdConfig::getThresholdVector(L1DataDef::TriggerType type) const { thrVecMap_t::const_iterator res = m_thresholdVectors.find(type); diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/TrigConfData.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/TrigConfData.cxx index 7f28b543ad5fbcf3ff7781be64790ec895d9fa05..006bd99675af8746db4b3fdc80dadc7ab6b68649 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/TrigConfData.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/TrigConfData.cxx @@ -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 */ #include "TrigConfL1Data/TrigConfData.h" @@ -19,14 +19,6 @@ TrigConfData::TrigConfData(const string& name) : m_comment("") {} -TrigConfData::TrigConfData(const TrigConfData& o) : - m_smk(o.m_smk), - m_id(o.m_id), - m_name(o.m_name), - m_version(o.m_version), - m_comment(o.m_comment) -{} - std::ostream& TrigConfData::indent(std::ostream& o, int lvl, int size) const { int width = lvl*size; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/TriggerThresholdValue.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/TriggerThresholdValue.cxx index bd5b5d5326d7d22c6e07fd125ed8121158542da8..49d4610f194635c7035253b0d456682e1b9d6ac3 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/TriggerThresholdValue.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/TriggerThresholdValue.cxx @@ -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 */ #include "TrigConfL1Data/TriggerThresholdValue.h" @@ -70,9 +70,6 @@ TrigConf::TriggerThresholdValue::TriggerThresholdValue( ) , m_EtaMax(49) {} -TrigConf::TriggerThresholdValue::~TriggerThresholdValue() -{} - int TrigConf::TriggerThresholdValue::thresholdValueCount() const { return (int) ptcut(); // overriden in Cluster/JetThresholdValue diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/XsThresholdValue.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/XsThresholdValue.cxx index f1fe6321bb00f481728933ab69f4deffe5506e95..1d96ac88d91f058dba82fb2d87922945bfda4ef4 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/XsThresholdValue.cxx +++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/XsThresholdValue.cxx @@ -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 */ #include "TrigConfL1Data/XsThresholdValue.h" @@ -10,9 +10,6 @@ TrigConf::XsThresholdValue::XsThresholdValue() : TriggerThresholdValue() {} -TrigConf::XsThresholdValue::~XsThresholdValue() -{} - TrigConf::TriggerThresholdValue* TrigConf::XsThresholdValue::createCopy() const{ return new XsThresholdValue(*this); diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/BunchGroup.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/BunchGroup.h index 7caccbb7d506d3fe4fadd5104eb4812388bae685..dcd99422219f12a5ff454cf852e281169c24e26b 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/BunchGroup.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/BunchGroup.h @@ -1,7 +1,7 @@ // Dear emacs, this is -*- 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 */ #ifndef TrigConf_BunchGroup @@ -17,7 +17,7 @@ namespace TrigConf { class BunchGroup : public L1DataBaseclass { public: BunchGroup(); - ~BunchGroup(); + ~BunchGroup() = default; // Accessors unsigned int internalNumber() const { return m_InternalNumber; } diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/BunchGroupSet.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/BunchGroupSet.h index 7b27b3c4af4a1d785625c00ef3532a53124b17a0..39bc1fffc2aa0ac1df8b03c95dd5f17a71d90552 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/BunchGroupSet.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/BunchGroupSet.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 */ #ifndef TrigConf_BunchGroupSet @@ -20,7 +20,7 @@ namespace TrigConf { public: BunchGroupSet(); BunchGroupSet(const std::vector<BunchGroup>&); - ~BunchGroupSet(); + ~BunchGroupSet() = default; // getters uint16_t menuPartition() const { return m_MenuPartition; } diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/CaloInfo.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/CaloInfo.h index 07e327cbe5649c2ff9fcc85110c9ce5735953c8a..fb885680fcc440f7b5106db90de463a1532a8879 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/CaloInfo.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/CaloInfo.h @@ -1,7 +1,7 @@ // Dear emacs, this is -*- 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 */ #ifndef TrigConf_CaloInfo @@ -36,7 +36,7 @@ namespace TrigConf { public: CaloInfo(); - virtual ~CaloInfo(); + virtual ~CaloInfo() = default; // getters double globalScale() const { return m_GlobalScale; } diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/ClusterThresholdValue.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/ClusterThresholdValue.h index 06263633abaf9927ff662a524d62889110cc5286..1086b142ed67320ad38e5c662d8c06021b281435 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/ClusterThresholdValue.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/ClusterThresholdValue.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 */ #ifndef TrigConf_ClusterThresholdValue @@ -12,7 +12,7 @@ namespace TrigConf { class ClusterThresholdValue : public TriggerThresholdValue { public: ClusterThresholdValue(); - ~ClusterThresholdValue(); + ~ClusterThresholdValue() = default; virtual TriggerThresholdValue* createCopy() const override; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/DeadTime.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/DeadTime.h index 76f7afede5a47f9588073d93b574071b6b88fb45..8c5230e3d299e7a6f1d8c7a8296681092107764f 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/DeadTime.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/DeadTime.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 */ #ifndef TrigConf_DeadTime @@ -13,7 +13,7 @@ namespace TrigConf { class DeadTime : public L1DataBaseclass { public: DeadTime(); - ~DeadTime(); + ~DeadTime() = default; // getters int simple() const { return m_simple; } diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/EtThresholdValue.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/EtThresholdValue.h index 091d4c98de45fb68425f512f09fc5b12ae31aff1..5991bf05f4a2675f9e8def1250338d8e4a6b8634 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/EtThresholdValue.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/EtThresholdValue.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 */ #ifndef TrigConf_EtThresholdValue @@ -11,7 +11,7 @@ namespace TrigConf { class EtThresholdValue : public TriggerThresholdValue { public: EtThresholdValue(); - ~EtThresholdValue(); + ~EtThresholdValue() = default; virtual TriggerThresholdValue* createCopy() const override; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/IsolationParam.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/IsolationParam.h index ff58adacbbed56db59e4094e120336461584ccfa..300813cc46f488ddca71bff368e9848eb1cf9b78 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/IsolationParam.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/IsolationParam.h @@ -1,7 +1,7 @@ // Dear emacs, this is -*- 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 */ #ifndef TrigConf_IsolationParam @@ -22,7 +22,7 @@ namespace TrigConf { int etamin, int etamax, int priority ); IsolationParam() {}; - virtual ~IsolationParam() {}; + virtual ~IsolationParam() = default; // getters diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/JetThresholdValue.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/JetThresholdValue.h index 31e01cfa6cc2fa662418518735d43fcc363f7d9d..152d59597f610e161505b9763127d744329a09c9 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/JetThresholdValue.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/JetThresholdValue.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 */ #ifndef TrigConf_JetThresholdValue @@ -13,7 +13,7 @@ namespace TrigConf { public: JetThresholdValue(); - ~JetThresholdValue(); + ~JetThresholdValue() = default; virtual TriggerThresholdValue* createCopy() const override; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/L1DataBaseclass.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/L1DataBaseclass.h index be66d0eaabee9b5a3125ebfc1c674961b2bd08b7..f25756a105789bd6de848dd6868a0f9e87fff096 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/L1DataBaseclass.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/L1DataBaseclass.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 */ ///////////////////////////////////////////////////////////////////// @@ -25,11 +25,7 @@ namespace TrigConf { TrigConfData(), m_Lvl1MasterId(0) {} - L1DataBaseclass(const L1DataBaseclass& o) : - TrigConfData(o), - m_Lvl1MasterId(o.m_Lvl1MasterId) - {} - virtual ~L1DataBaseclass(){} + virtual ~L1DataBaseclass() = default; unsigned int lvl1MasterTableId() const { return m_Lvl1MasterId; } void setLvl1MasterTableId ( unsigned int id) { m_Lvl1MasterId = id; } diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/L1PSNumber.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/L1PSNumber.h index 7cfa993c783b31bb681de836d61962d1228bc405..2f5f58935629bba4354358656c4a97db0fa4853e 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/L1PSNumber.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/L1PSNumber.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,8 +57,7 @@ namespace TrigConf { public: L1PSNumber(); - // L1PSNumber(const L1PSNumber& orig); - virtual ~L1PSNumber(); + virtual ~L1PSNumber() = default; L1PSNumber(const float ps); L1PSNumber(const int64_t ps); L1PSNumber(const int ps); diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/METSigParam.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/METSigParam.h index a12e49d540b43137ae4214d89d96c6e52800a1f1..95ea4e5cb00c4640d0ca439abb8b7b13903257eb 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/METSigParam.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/METSigParam.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 */ #ifndef TrigConf_METSigParam @@ -16,7 +16,7 @@ namespace TrigConf { int XEmin, int XEmax, int TESqrtMin, int TESqrtMax ); METSigParam(); - virtual ~METSigParam(); + virtual ~METSigParam() = default; // setters and accessors void setValues( int XSSigmaScale, int XSSigmaOffset, diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/Menu.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/Menu.h index b5975adb32b00236c04c856beb776231ea1bcf86..e7000b3d45c16720dc9eaee928ac5149939f62c7 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/Menu.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/Menu.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 */ #ifndef TrigConf_Menu @@ -49,7 +49,7 @@ namespace TrigConf { class Menu : public L1DataBaseclass { public: Menu(); - ~Menu(); + ~Menu() = default; item_by_ctpid_t& item_by_ctpid(); const item_by_ctpid_t& item_by_ctpid() const; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/Muctpi.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/Muctpi.h index 0b05a37df4cae4d17bd0998b88c20f18e926a466..392bd9b8b7e307d8231325b5d8be5bfa8629514f 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/Muctpi.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/Muctpi.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 */ #ifndef TrigConf_Muctpi @@ -12,7 +12,7 @@ namespace TrigConf { class Muctpi : public L1DataBaseclass { public: Muctpi(); - ~Muctpi(); + ~Muctpi() = default; // getters int lowptThreshold() const { return m_LowptThreshold; } diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/MuonThresholdSet.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/MuonThresholdSet.h index 25c1f46c3e77d07041942f02f687b231e62f45e9..55a9579ffd9ed255e198893c0363eb02a6d4c306 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/MuonThresholdSet.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/MuonThresholdSet.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 */ #ifndef TrigConf_MuonThresholdSet @@ -13,7 +13,7 @@ namespace TrigConf { class MuonThresholdSet : public L1DataBaseclass { public: MuonThresholdSet(); - ~MuonThresholdSet(); + ~MuonThresholdSet() = default; bool rpcAvailable() const {return m_rpc_avail;} bool rpcAvailableOnline() const {return m_rpc_avail_online;} diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/MuonThresholdValue.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/MuonThresholdValue.h index 3906de777758c20a7669f332bbe196d91d54cc1d..870b10038dff7e3912587a6a48ceabe92a49450b 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/MuonThresholdValue.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/MuonThresholdValue.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 */ #ifndef TrigConf_MuonThresholdValue @@ -11,7 +11,7 @@ namespace TrigConf { class MuonThresholdValue : public TriggerThresholdValue { public: MuonThresholdValue(); - ~MuonThresholdValue(); + ~MuonThresholdValue() = default; virtual TriggerThresholdValue* createCopy() const; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/NimThresholdValue.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/NimThresholdValue.h index 77c74486d913c3cea2d15417362359df81c5e602..53b6a781ac9a79116d4fd4138dc58e097c3502b2 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/NimThresholdValue.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/NimThresholdValue.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 */ #ifndef TrigConf_NimThresholdValue @@ -11,7 +11,7 @@ namespace TrigConf { class NimThresholdValue : public TriggerThresholdValue { public: NimThresholdValue(); - ~NimThresholdValue(); + ~NimThresholdValue() = default; virtual TriggerThresholdValue* createCopy() const; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/PrescaleSet.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/PrescaleSet.h index 0b8396b74cd8a91dcf947d8bfe2771c469961a41..ecc6c0495fcfd75703b98f6a2cde6424d16860cc 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/PrescaleSet.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/PrescaleSet.h @@ -1,7 +1,7 @@ // Dear emacs, this is -*- 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 */ #ifndef TrigConf_PrescaleSet @@ -31,7 +31,7 @@ namespace TrigConf { static double getPrescaleFromCut(int32_t cut); PrescaleSet(); - ~PrescaleSet(); + ~PrescaleSet() = default; // Accessors bool isNull() const { return m_null; } diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/PrescaledClock.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/PrescaledClock.h index a0a0cfbce8d35103c923c8536ce62a09c07883fb..7e8b864eddbb73ccb827f54ef012ed9f4a50663e 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/PrescaledClock.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/PrescaledClock.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 */ #ifndef TrigConf_PrescaledClock @@ -13,7 +13,7 @@ namespace TrigConf { class PrescaledClock : public L1DataBaseclass { public: PrescaledClock(); - ~PrescaledClock(); + ~PrescaledClock() = default; // setters int clock1() const { return m_clock1; } diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/PrioritySet.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/PrioritySet.h index f7ff4d6ca167b31a28e2955374badb22c17c33a4..f1573c6b9f0dffa1d64147285c34c2d413c21eaf 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/PrioritySet.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/PrioritySet.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 */ #ifndef TrigConf_PrioritySet @@ -18,7 +18,7 @@ namespace TrigConf { static const unsigned int N_PRIORITIES = 256; PrioritySet(); - ~PrioritySet(); + ~PrioritySet() = default; // Accessors const std::vector<std::string>& priorities() const { return m_Priorities; } diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/Random.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/Random.h index fb83b1007052d9024b32e5f105bb6edbd8b2d146..5949b50104c4535555ffc577bc710c4c44953223 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/Random.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/Random.h @@ -1,7 +1,7 @@ // Dear emacs, this is -*- 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 */ #ifndef TrigConf_Random @@ -15,7 +15,7 @@ namespace TrigConf { class Random : public L1DataBaseclass { public: Random(); - ~Random(); + ~Random() = default; // getters uint32_t cuts(unsigned int idx) const { return m_cuts[idx]; } diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/ThresholdConfig.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/ThresholdConfig.h index a2963c2f116e7ef72efb6702915791a260e3d2c0..63987c1aee51a30005c19d873dd1936ee1d0ab33 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/ThresholdConfig.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/ThresholdConfig.h @@ -1,7 +1,7 @@ // Dear emacs, this is -*- 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 */ #ifndef TrigConf_ThresholdConfig @@ -21,7 +21,7 @@ namespace TrigConf { typedef std::map< L1DataDef::TriggerType, thrVec_t> thrVecMap_t; ThresholdConfig(); - ~ThresholdConfig(); + ~ThresholdConfig() = default; std::vector<TriggerThreshold*>& thresholdVector(L1DataDef::TriggerType); const std::vector<TriggerThreshold*>& getThresholdVector(L1DataDef::TriggerType) const; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/TrigConfData.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/TrigConfData.h index ee3f840397d8b1aa673540c27c554f615b63344b..1c8ec88b2140c859f6a7e58f661d32b327882cd7 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/TrigConfData.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/TrigConfData.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 */ #ifndef TrigConf_TrigConfData @@ -13,8 +13,7 @@ namespace TrigConf { class TrigConfData { public: TrigConfData(const std::string& name = ""); - TrigConfData(const TrigConfData& o); - virtual ~TrigConfData(){} + virtual ~TrigConfData() = default; // getters int superMasterTableId() const {return (int)m_smk;} diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/TriggerThresholdValue.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/TriggerThresholdValue.h index 060f6aa4e6f7a01ffdb9ae5f47a7bcfc3d9e80fd..1c6f05c48009eb0369aeb91688d8d12b404e33cb 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/TriggerThresholdValue.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/TriggerThresholdValue.h @@ -1,7 +1,7 @@ // Dear emacs, this is -*- 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 */ #ifndef TrigConf_TriggerThresholdValue @@ -36,7 +36,7 @@ namespace TrigConf { public: TriggerThresholdValue(); - virtual ~TriggerThresholdValue(); + virtual ~TriggerThresholdValue() = default; virtual TriggerThresholdValue* createCopy() const = 0; diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/XsThresholdValue.h b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/XsThresholdValue.h index e2725ee10c045a5cc84dcbd47ec97500096289c4..9bd87a0612e29d6a9d2e5dbedb681f6e1cc07383 100644 --- a/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/XsThresholdValue.h +++ b/Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/XsThresholdValue.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 */ #ifndef TrigConf_XsThresholdValue @@ -11,7 +11,7 @@ namespace TrigConf { class XsThresholdValue : public TriggerThresholdValue { public: XsThresholdValue(); - ~XsThresholdValue(); + ~XsThresholdValue() = default; TriggerThresholdValue* createCopy() const;