diff --git a/core/detectors/sts/CbmStsParAsic.cxx b/core/detectors/sts/CbmStsParAsic.cxx index b41bd64ffa1ecc0e359f189eb643e0ad545ff36d..a69d9434fe0a7ea7899e469e892a58267ed1da7a 100644 --- a/core/detectors/sts/CbmStsParAsic.cxx +++ b/core/detectors/sts/CbmStsParAsic.cxx @@ -36,18 +36,6 @@ CbmStsParAsic::CbmStsParAsic(const CbmStsParAsic& other) } // ------------------------------------------------------------------------- - -// ----- Move constructor ---------------------------------------------- -CbmStsParAsic::CbmStsParAsic(CbmStsParAsic&& other) -{ - Set(other.fNofChannels, other.fNofAdc, other.fDynRange, other.fThreshold, other.fTimeResolution, other.fDeadTime, - other.fNoise, other.fZeroNoiseRate); - SetTimeOffset(other.fTimeOffset); - SetWalkCoef(other.fWalkCoef); -} -// ------------------------------------------------------------------------- - - // ----- Copy assignment operator -------------------------------------- CbmStsParAsic& CbmStsParAsic::operator=(const CbmStsParAsic& other) { @@ -59,19 +47,6 @@ CbmStsParAsic& CbmStsParAsic::operator=(const CbmStsParAsic& other) } // ------------------------------------------------------------------------- - -// ----- Move assignment operator -------------------------------------- -CbmStsParAsic& CbmStsParAsic::operator=(CbmStsParAsic&& other) -{ - Set(other.fNofChannels, other.fNofAdc, other.fDynRange, other.fThreshold, other.fTimeResolution, other.fDeadTime, - other.fNoise, other.fZeroNoiseRate); - SetTimeOffset(other.fTimeOffset); - SetWalkCoef(other.fWalkCoef); - return *this; -} -// ------------------------------------------------------------------------- - - // ----- Destructor ---------------------------------------------------- CbmStsParAsic::~CbmStsParAsic() { @@ -142,7 +117,7 @@ double CbmStsParAsic::GetRandomNoiseCharge() const void CbmStsParAsic::Init() { if (fNoiseCharge) delete fNoiseCharge; - fNoiseCharge = new TF1("Noise Charge", "TMath::Gaus(x, [0], [1])", fThreshold, 10. * fNoise); + fNoiseCharge = new TF1("Noise_Charge", "TMath::Gaus(x, [0], [1])", fThreshold, 10. * fNoise, "NL"); fNoiseCharge->SetParameters(0., fNoise); fIsInit = kTRUE; } diff --git a/core/detectors/sts/CbmStsParAsic.h b/core/detectors/sts/CbmStsParAsic.h index 2dcfc568624ca59364dac0c59e3521ba19b2a86c..5388154cd1e9dc8c1de52211aef27593db29cb77 100644 --- a/core/detectors/sts/CbmStsParAsic.h +++ b/core/detectors/sts/CbmStsParAsic.h @@ -41,22 +41,14 @@ public: double noise, double znr); - /** @brief Copy constructor **/ + /** @brief Copy constructor (implicitely disable move constructor and assignment)**/ CbmStsParAsic(const CbmStsParAsic&); - /** @brief Move constructor (disabled) **/ - CbmStsParAsic(CbmStsParAsic&&); - - /** @brief Copy assignment operator **/ CbmStsParAsic& operator=(const CbmStsParAsic& other); - /** @brief Move assignment operator (disabled) **/ - CbmStsParAsic& operator=(CbmStsParAsic&&); - - /** @brief Destructor **/ ~CbmStsParAsic(); diff --git a/core/detectors/sts/CbmStsParModule.cxx b/core/detectors/sts/CbmStsParModule.cxx index 7221c976bc131d09cbe408877fffc25368eb0196..52b68aad91afaf6f63f26ea646541f82b2477b02 100644 --- a/core/detectors/sts/CbmStsParModule.cxx +++ b/core/detectors/sts/CbmStsParModule.cxx @@ -25,6 +25,27 @@ CbmStsParModule::CbmStsParModule(uint32_t nChannels, uint32_t nAsicChannels) // ------------------------------------------------------------------------- +// ----- Copy constructor ---------------------------------------------- +CbmStsParModule::CbmStsParModule(const CbmStsParModule& other) +{ + fNofChannels = other.GetNofChannels(); + fNofAsicChannels = other.GetNofAsicChannels(); + fAsicPars = other.GetAsicParams(); +} +// ------------------------------------------------------------------------- + + +// ----- Copy assignment operator -------------------------------------- +CbmStsParModule& CbmStsParModule::operator=(const CbmStsParModule& other) +{ + fNofChannels = other.GetNofChannels(); + fNofAsicChannels = other.GetNofAsicChannels(); + fAsicPars = other.GetAsicParams(); + return *this; +} +// ------------------------------------------------------------------------- + + // ----- Randomly deactivate channels ---------------------------------- uint32_t CbmStsParModule::DeactivateRandomChannels(Double_t fraction) { diff --git a/core/detectors/sts/CbmStsParModule.h b/core/detectors/sts/CbmStsParModule.h index c50da9fd293400b940a580f083a9e1b9fec1900b..3e2044f16e55a6324bdbe646968bb08f83727f42 100644 --- a/core/detectors/sts/CbmStsParModule.h +++ b/core/detectors/sts/CbmStsParModule.h @@ -38,6 +38,14 @@ public: CbmStsParModule(uint32_t nChannels, uint32_t nAsicChannels); + /** @brief Copy constructor (implicitely disable move constructor and assignment)**/ + CbmStsParModule(const CbmStsParModule&); + + + /** @brief Copy assignment operator **/ + CbmStsParModule& operator=(const CbmStsParModule& other); + + /** @brief Destructor **/ ~CbmStsParModule() {};