diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.cxx index e9950e17b7fcfaa44024a50e698ab2549fb8ab11..0b703b13043348502d63e4f7fc4727d5dcac4f21 100644 --- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.cxx +++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.cxx @@ -47,15 +47,6 @@ namespace LVL1MUCTPI { } - PtMultiplicitySet& PtMultiplicitySet::operator=( const PtMultiplicitySet& a ) { - - for( unsigned int i = 0; i < MAX_NUMBER_OF_THRESHOLDS; ++i ) { - m_multiplicity_pt[ i ] = a.m_multiplicity_pt[ i ]; - } - return *this; - - } - PtMultiplicitySet& PtMultiplicitySet::operator+=( const PtMultiplicitySet& a) { // No check is performed for the "correctness" of the input PtMultiplicitySet, diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.h index 7967ed12667b9f7148bfe35d0eac042f09dc5111..aafeb84d02001a639a695945f9d8a95ebc83a01a 100644 --- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.h +++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.h @@ -61,11 +61,9 @@ namespace LVL1MUCTPI { */ int getMultiplicity( const unsigned int threshold ) const; - /// Assignment operator - PtMultiplicitySet& operator=( const PtMultiplicitySet& ); - /// This operator clippes the multiplicities at a count of sevenn + /// This operator clips the multiplicities at a count of sevenn PtMultiplicitySet& operator+=( const PtMultiplicitySet& ); - /// This operator clippes the multiplicities at a count of seven. + /// This operator clips the multiplicities at a count of seven. PtMultiplicitySet operator+( const PtMultiplicitySet& ); /// Reset the object to 0 multiplicity diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h index f85f383a9d70bd6fc982cd135a86d42a629454cb..2af5226111776b09ead924edeab29770a74280a8 100644 --- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h +++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h @@ -43,7 +43,7 @@ namespace LVL1MUCTPI { class EventSource { public: - virtual ~EventSource() {} + virtual ~EventSource() = default; virtual const char* printSource() const = 0; }; // class EventSource diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx index 1ee2c6bccfe84d8ccdb99c1de77b7dd5e60f2af4..1b6c4d5ac53886fbc4fee5eca02df9599e9bf038 100644 --- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx +++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx @@ -150,18 +150,6 @@ namespace LVL1MUCTPI { } - // assignment operator - SectorID& SectorID::operator=( const SectorID& original ) { - - if (this != &original) { - this->m_detectorType = original.m_detectorType; - this->m_rapidityRegion = original.m_rapidityRegion; - this->m_sectorNumber = original.m_sectorNumber; - } - return *this; - - } - SectorID::operator int() const { int retval = 0; @@ -188,9 +176,4 @@ namespace LVL1MUCTPI { } - // destructor of class SectorID - SectorID::~SectorID() { - - } - } // namespace LVL1MUCTPI diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h index 73cffda6d822b124b9ad7a1dea33a13b48538750..0e7b1e3cd5f6e59de2d294ab6f05f8b9ccc02f1c 100644 --- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h +++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h @@ -141,10 +141,6 @@ namespace LVL1MUCTPI { * Provide a comparison operator */ bool operator== ( const SectorID& ) const; - /** - * Provide a assignment operator - */ - SectorID& operator= ( const SectorID& ); /** * This operator is used when the sector ID has to be stored as a single * integer number. (When reading the multiplicity handling from an XML @@ -158,7 +154,7 @@ namespace LVL1MUCTPI { /** * The destructor of class SectorID - nothing to destruct */ - ~SectorID(); + ~SectorID() = default; private: Detector m_detectorType; diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx index fecfe4c031f905e59350f3951e4dfba19bde2e13..a877e760ea6ec64728a720ee308904f01125bb97 100644 --- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx +++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx @@ -23,11 +23,6 @@ MirodFiFoContent::MirodFiFoContent() { } -//destructor of class MirodFiFoContent -MirodFiFoContent::~MirodFiFoContent() { - -} - // print content of Monitoring Fifo in "human" , "hex" or "bin" void MirodFiFoContent::printMonFiFo( std::string format ) { diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.h index 67ebafeeeeddb0afb99cd94550e0a77f0abf2be3..7d80383a3d2ee8df5b890bb1be3b2fc7658652b3 100644 --- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.h +++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.h @@ -69,7 +69,7 @@ class MirodFiFoContent { /** * The destructor of MirodFiFoContent */ - ~MirodFiFoContent(); + ~MirodFiFoContent() = default; private: diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx index 38aaa4e569dae613852bb98ee2c54bb01dd03419..d3a6c952bf5acf6e3793527b243753c6bb16c019 100644 --- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx +++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx @@ -20,7 +20,3 @@ MirodTestRamIn::MirodTestRamIn() { } -//destructor of class MirodTestRamIn -MirodTestRamIn::~MirodTestRamIn() { - -} diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.h index 4c1d1b494239e4c555ac903d9dda5912bbd4a260..d0750a2fb299235faf78ed8670e8e3e298767990 100644 --- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.h +++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.h @@ -52,7 +52,7 @@ class MirodTestRamIn { /** * The destructor of MirodTestRamIn */ - ~MirodTestRamIn(); + ~MirodTestRamIn() = default; private: