From 8a190ba28397d08a3826976c55dff231b8f86fb1 Mon Sep 17 00:00:00 2001 From: rpreghen Date: Wed, 10 Dec 2008 17:38:50 +0000 Subject: [PATCH] Better implementation of copy-constructor and operator= --- TOF/AliTOF.cxx | 34 -------- TOF/AliTOF.h | 4 +- TOF/AliTOFAlignment.cxx | 18 ++-- TOF/AliTOFChannelOffline.cxx | 5 ++ TOF/AliTOFChannelOnline.cxx | 7 +- TOF/AliTOFChannelOnlineArray.cxx | 21 +++-- TOF/AliTOFChannelOnlineStatus.cxx | 5 ++ TOF/AliTOFChannelOnlineStatusArray.cxx | 17 ++-- TOF/AliTOFClusterFinder.cxx | 30 +++---- TOF/AliTOFClusterFinderV1.cxx | 34 ++++---- TOF/AliTOFDDLRawData.cxx | 50 ++++++----- TOF/AliTOFDataDCS.cxx | 48 +++++------ TOF/AliTOFDecoder.cxx | 86 +++++++++---------- TOF/AliTOFDigitMap.cxx | 57 ++++++------- TOF/AliTOFDigitizer.cxx | 13 ++- TOF/AliTOFFEEReader.cxx | 3 + TOF/AliTOFFormatDCS.cxx | 16 ++-- TOF/AliTOFRawMap.cxx | 51 ++++++------ TOF/AliTOFRawMap.h | 3 +- TOF/AliTOFRawStream.cxx | 110 +++++++++---------------- TOF/AliTOFRecoParam.cxx | 76 +++++++---------- TOF/AliTOFReconstructor.cxx | 10 ++- TOF/AliTOFSDigit.cxx | 43 +++++----- TOF/AliTOFTrigger.cxx | 31 +++---- TOF/AliTOFcalib.cxx | 37 +++++---- TOF/AliTOFdigit.cxx | 79 ++++++------------ TOF/AliTOFdigit.h | 7 +- TOF/AliTOFhit.cxx | 51 ++++-------- TOF/AliTOFhitT0.cxx | 51 ++++-------- TOF/AliTOFtracker.cxx | 69 ---------------- TOF/AliTOFtracker.h | 5 +- TOF/AliTOFtrackerMI.cxx | 71 ---------------- TOF/AliTOFtrackerMI.h | 5 +- TOF/AliTOFtrackerV1.cxx | 61 -------------- TOF/AliTOFtrackerV1.h | 5 +- 35 files changed, 443 insertions(+), 770 deletions(-) diff --git a/TOF/AliTOF.cxx b/TOF/AliTOF.cxx index 7dd7a0692db..13328232b54 100644 --- a/TOF/AliTOF.cxx +++ b/TOF/AliTOF.cxx @@ -187,40 +187,6 @@ void AliTOF::GetTOFSectors(Int_t *sectors) const sectors[isec]=fTOFSectors[isec]; } } -//_____________________________________________________________________________ -AliTOF::AliTOF(const AliTOF &source) - : - AliDetector(), - fFGeom(0x0), - fDTask(0x0), - fReTask(0x0), - fSDigits(0x0), - fNSDigits(0), - fReconParticles(0x0), - fIdSens(-1), - fTZero(kFALSE), - fTOFHoles(kTRUE), - fTOFGeometry(0x0) -{ - // copy constructor - - this->fReconParticles=source.fReconParticles; - this->fSDigits=source.fSDigits; - this->fTOFGeometry=source.fTOFGeometry; - -} - -//_____________________________________________________________________________ -AliTOF& AliTOF::operator=(const AliTOF &source) -{ - // ass. op. - - this->fReconParticles=source.fReconParticles; - this->fSDigits=source.fSDigits; - this->fTOFGeometry=source.fTOFGeometry; - return *this; - -} //_____________________________________________________________________________ void AliTOF::CreateTOFFolders() diff --git a/TOF/AliTOF.h b/TOF/AliTOF.h index c814d4aa0e2..af3d26fd030 100644 --- a/TOF/AliTOF.h +++ b/TOF/AliTOF.h @@ -33,8 +33,6 @@ class AliTOF : public AliDetector { public: AliTOF(); AliTOF(const char *name, const char *title, Option_t *option="noTimeZero"); - AliTOF(const AliTOF &source); // copy constructor - AliTOF& operator=(const AliTOF &source); // ass. op. virtual ~AliTOF() ; // getters for AliTOF object status @@ -115,6 +113,8 @@ protected: AliTOFGeometry *fTOFGeometry; //The TOF Geometry parameters private: + AliTOF(const AliTOF &source); // copy constructor + AliTOF& operator=(const AliTOF &source); // ass. op. ClassDef(AliTOF,8) // Time Of Flight base class }; diff --git a/TOF/AliTOFAlignment.cxx b/TOF/AliTOFAlignment.cxx index b02d5451a8e..a1e60de2a02 100644 --- a/TOF/AliTOFAlignment.cxx +++ b/TOF/AliTOFAlignment.cxx @@ -134,15 +134,13 @@ AliTOFAlignment::AliTOFAlignment(): } //_____________________________________________________________________________ AliTOFAlignment::AliTOFAlignment(const AliTOFAlignment &t): - TTask("AliTOFAlignment",""), - fNTOFAlignObj(0), + TTask(t), + fNTOFAlignObj(t.fNTOFAlignObj), fTOFmgr(0x0), - fTOFAlignObjArray(0x0) + fTOFAlignObjArray(t.fTOFAlignObjArray) { //AliTOFAlignment copy Ctor - fNTOFAlignObj=t.fNTOFAlignObj; - fTOFAlignObjArray=t.fTOFAlignObjArray; //AliTOFalignment main Ctor for(Int_t i=0; i<18;i++) for(Int_t j=0; j<5; j++) @@ -155,9 +153,13 @@ AliTOFAlignment::AliTOFAlignment(const AliTOFAlignment &t): AliTOFAlignment& AliTOFAlignment::operator=(const AliTOFAlignment &t){ //AliTOFAlignment assignment operator - this->fNTOFAlignObj=t.fNTOFAlignObj; - this->fTOFmgr=t.fTOFmgr; - this->fTOFAlignObjArray=t.fTOFAlignObjArray; + if (&t == this) + return *this; + + TTask::operator=(t); + fNTOFAlignObj=t.fNTOFAlignObj; + fTOFmgr=t.fTOFmgr; + fTOFAlignObjArray=t.fTOFAlignObjArray; return *this; } diff --git a/TOF/AliTOFChannelOffline.cxx b/TOF/AliTOFChannelOffline.cxx index aaa89b7ea61..2abfa26af50 100644 --- a/TOF/AliTOFChannelOffline.cxx +++ b/TOF/AliTOFChannelOffline.cxx @@ -70,6 +70,11 @@ AliTOFChannelOffline::AliTOFChannelOffline(const AliTOFChannelOffline& channel) AliTOFChannelOffline &AliTOFChannelOffline::operator =(const AliTOFChannelOffline& channel) { // assignment operator + + if (this == &channel) + return *this; + + TObject::operator=(channel); for(Int_t i = 0; i<6;i++) fSlewPar[i]=channel.GetSlewPar(i); return *this; } diff --git a/TOF/AliTOFChannelOnline.cxx b/TOF/AliTOFChannelOnline.cxx index e5d4829cecd..0846210a17d 100644 --- a/TOF/AliTOFChannelOnline.cxx +++ b/TOF/AliTOFChannelOnline.cxx @@ -65,7 +65,12 @@ AliTOFChannelOnline::AliTOFChannelOnline(const AliTOFChannelOnline& channel) : AliTOFChannelOnline &AliTOFChannelOnline::operator =(const AliTOFChannelOnline& channel) { // assignment operator -// fStatus= channel.GetStatus(); + + if (this == &channel) + return *this; + + TObject::operator=(channel); + // fStatus= channel.GetStatus(); fDelay=channel.GetDelay(); return *this; } diff --git a/TOF/AliTOFChannelOnlineArray.cxx b/TOF/AliTOFChannelOnlineArray.cxx index 54b23cf4a0f..6c3289436d0 100644 --- a/TOF/AliTOFChannelOnlineArray.cxx +++ b/TOF/AliTOFChannelOnlineArray.cxx @@ -52,21 +52,24 @@ AliTOFChannelOnlineArray::AliTOFChannelOnlineArray(Int_t size): } //________________________________________________________________ AliTOFChannelOnlineArray::AliTOFChannelOnlineArray(const AliTOFChannelOnlineArray & source): - TObject(), - fSize(0), - fArray(0x0) + TObject(source), + fSize(source.fSize), + fArray(source.fArray) { // copy constructor - this->fSize= source.fSize; - this->fArray= source.fArray; } //________________________________________________________________ AliTOFChannelOnlineArray &AliTOFChannelOnlineArray::operator=(const AliTOFChannelOnlineArray & source) { - // assignment operator - this->fSize= source.fSize; - this->fArray= source.fArray; - return *this; + // assignment operator + + if (this == &source) + return *this; + + TObject::operator=(source); + fSize= source.fSize; + fArray= source.fArray; + return *this; } //________________________________________________________________ void AliTOFChannelOnlineArray::SetDelay(Int_t pos, Float_t parr) diff --git a/TOF/AliTOFChannelOnlineStatus.cxx b/TOF/AliTOFChannelOnlineStatus.cxx index 26333c724a4..f02cc1b83c5 100644 --- a/TOF/AliTOFChannelOnlineStatus.cxx +++ b/TOF/AliTOFChannelOnlineStatus.cxx @@ -55,6 +55,11 @@ AliTOFChannelOnlineStatus::AliTOFChannelOnlineStatus(const AliTOFChannelOnlineSt AliTOFChannelOnlineStatus &AliTOFChannelOnlineStatus::operator =(const AliTOFChannelOnlineStatus& channel) { // assignment operator + + if (this == &channel) + return *this; + + TObject::operator=(channel); fStatus= channel.GetStatus(); return *this; } diff --git a/TOF/AliTOFChannelOnlineStatusArray.cxx b/TOF/AliTOFChannelOnlineStatusArray.cxx index 4a7a1c7d9df..d9e4fab6160 100644 --- a/TOF/AliTOFChannelOnlineStatusArray.cxx +++ b/TOF/AliTOFChannelOnlineStatusArray.cxx @@ -55,20 +55,23 @@ AliTOFChannelOnlineStatusArray::AliTOFChannelOnlineStatusArray(Int_t size): //________________________________________________________________ AliTOFChannelOnlineStatusArray::AliTOFChannelOnlineStatusArray(const AliTOFChannelOnlineStatusArray & source): TObject(), - fSize(0), - fArray(0x0) + fSize(source.fSize), + fArray(source.fArray) { // copy constructor - this->fSize= source.fSize; - this->fArray= source.fArray; } //________________________________________________________________ AliTOFChannelOnlineStatusArray &AliTOFChannelOnlineStatusArray::operator=(const AliTOFChannelOnlineStatusArray & source) { // assignment operator - this->fSize= source.fSize; - this->fArray= source.fArray; - return *this; + + if (this == &source) + return *this; + + TObject::operator=(source); + fSize= source.fSize; + fArray= source.fArray; + return *this; } //________________________________________________________________ void AliTOFChannelOnlineStatusArray::SetStatus(Int_t pos, UChar_t parr) diff --git a/TOF/AliTOFClusterFinder.cxx b/TOF/AliTOFClusterFinder.cxx index 6b4c7eecf4a..29506ecb942 100644 --- a/TOF/AliTOFClusterFinder.cxx +++ b/TOF/AliTOFClusterFinder.cxx @@ -174,35 +174,35 @@ AliTOFClusterFinder::AliTOFClusterFinder(AliRunLoader* runLoader, AliTOFcalib *c //------------------------------------------------------------------------ AliTOFClusterFinder::AliTOFClusterFinder(const AliTOFClusterFinder &source) - :TObject(), + :TObject(source), fRunLoader(0), fTOFLoader(0), fTreeD(0), fTreeR(0), - fDigits(new TClonesArray("AliTOFdigit", 4000)), - fRecPoints(new TClonesArray("AliTOFcluster", 4000)), + fDigits(source.fDigits), + fRecPoints(source.fRecPoints), fNumberOfTofClusters(0), fVerbose(0), - fDecoderVersion(0), - fTOFcalib(0) + fDecoderVersion(source.fDecoderVersion), + fTOFcalib(source.fTOFcalib) { // copy constructor - this->fDigits=source.fDigits; - this->fRecPoints=source.fRecPoints; - this->fDecoderVersion=source.fDecoderVersion; - this->fTOFcalib=source.fTOFcalib; - } //------------------------------------------------------------------------ AliTOFClusterFinder& AliTOFClusterFinder::operator=(const AliTOFClusterFinder &source) { // ass. op. - this->fDigits=source.fDigits; - this->fRecPoints=source.fRecPoints; - this->fVerbose=source.fVerbose; - this->fDecoderVersion=source.fDecoderVersion; - this->fTOFcalib=source.fTOFcalib; + + if (this == &source) + return *this; + + TObject::operator=(source); + fDigits=source.fDigits; + fRecPoints=source.fRecPoints; + fVerbose=source.fVerbose; + fDecoderVersion=source.fDecoderVersion; + fTOFcalib=source.fTOFcalib; return *this; } diff --git a/TOF/AliTOFClusterFinderV1.cxx b/TOF/AliTOFClusterFinderV1.cxx index 1606479ddb3..0b3f230e0f4 100644 --- a/TOF/AliTOFClusterFinderV1.cxx +++ b/TOF/AliTOFClusterFinderV1.cxx @@ -97,37 +97,37 @@ AliTOFClusterFinderV1::AliTOFClusterFinderV1(AliRunLoader* runLoader, AliTOFcali //_____________________________________________________________________________ AliTOFClusterFinderV1::AliTOFClusterFinderV1(const AliTOFClusterFinderV1 &source) - :TObject(), - fRunLoader(0), - fDigits(new TClonesArray("AliTOFdigit", 4000)), - fRecPoints(new TClonesArray("AliTOFcluster", 4000)), + :TObject(source), + fRunLoader(0), + fDigits(source.fDigits), + fRecPoints(source.fRecPoints), fNumberOfTofClusters(0), fNumberOfTofDigits(0), fMaxDeltaTime(10), fVerbose(0), - fDecoderVersion(0), - fTOFcalib(0), + fDecoderVersion(source.fDecoderVersion), + fTOFcalib(source.fTOFcalib), fTOFdigitMap(new AliTOFDigitMap()) { // copy constructor - this->fDigits=source.fDigits; - this->fRecPoints=source.fRecPoints; - this->fDecoderVersion=source.fDecoderVersion; - this->fTOFcalib=source.fTOFcalib; - } //_____________________________________________________________________________ AliTOFClusterFinderV1& AliTOFClusterFinderV1::operator=(const AliTOFClusterFinderV1 &source) { // ass. op. - this->fDigits=source.fDigits; - this->fRecPoints=source.fRecPoints; - this->fVerbose=source.fVerbose; - this->fDecoderVersion=source.fDecoderVersion; - this->fTOFcalib=source.fTOFcalib; - this->fTOFdigitMap=source.fTOFdigitMap; + + if (this == &source) + return *this; + + TObject::operator=(source); + fDigits=source.fDigits; + fRecPoints=source.fRecPoints; + fVerbose=source.fVerbose; + fDecoderVersion=source.fDecoderVersion; + fTOFcalib=source.fTOFcalib; + fTOFdigitMap=source.fTOFdigitMap; return *this; } diff --git a/TOF/AliTOFDDLRawData.cxx b/TOF/AliTOFDDLRawData.cxx index 2d7bda76208..4d446218b27 100644 --- a/TOF/AliTOFDDLRawData.cxx +++ b/TOF/AliTOFDDLRawData.cxx @@ -110,41 +110,37 @@ AliTOFDDLRawData::AliTOFDDLRawData(): //---------------------------------------------------------------------------- AliTOFDDLRawData::AliTOFDDLRawData(const AliTOFDDLRawData &source) : TObject(source), - fVerbose(0), - fIndex(-1), - fPackedAcquisition(kFALSE), - fFakeOrphaneProduction(kFALSE), - fMatchingWindow(8192), - fTOFdigitMap(new AliTOFDigitMap()), - fTOFdigitArray(0x0), - fTOFrawStream(new AliTOFRawStream()), - fTOFCableLengthMap(new AliTOFCableLengthMap()) + fVerbose(source.fVerbose), + fIndex(source.fIndex), + fPackedAcquisition(source.fPackedAcquisition), + fFakeOrphaneProduction(source.fFakeOrphaneProduction), + fMatchingWindow(source.fMatchingWindow), + fTOFdigitMap(source.fTOFdigitMap), + fTOFdigitArray(source.fTOFdigitArray), + fTOFrawStream(source.fTOFrawStream), + fTOFCableLengthMap(source.fTOFCableLengthMap) { //Copy Constructor - this->fIndex=source.fIndex; - this->fVerbose=source.fVerbose; - this->fPackedAcquisition=source.fPackedAcquisition; - this->fFakeOrphaneProduction=source.fFakeOrphaneProduction; - this->fMatchingWindow=source.fMatchingWindow; - this->fTOFdigitMap=source.fTOFdigitMap; - this->fTOFdigitArray=source.fTOFdigitArray; - this->fTOFrawStream=source.fTOFrawStream; - this->fTOFCableLengthMap=source.fTOFCableLengthMap; return; } //---------------------------------------------------------------------------- AliTOFDDLRawData& AliTOFDDLRawData::operator=(const AliTOFDDLRawData &source) { //Assigment operator - this->fIndex=source.fIndex; - this->fVerbose=source.fVerbose; - this->fPackedAcquisition=source.fPackedAcquisition; - this->fFakeOrphaneProduction=source.fFakeOrphaneProduction; - this->fMatchingWindow=source.fMatchingWindow; - this->fTOFdigitMap=source.fTOFdigitMap; - this->fTOFdigitArray=source.fTOFdigitArray; - this->fTOFrawStream=source.fTOFrawStream; - this->fTOFCableLengthMap=source.fTOFCableLengthMap; + + if (this == &source) + return *this; + + TObject::operator=(source); + fIndex=source.fIndex; + fVerbose=source.fVerbose; + fPackedAcquisition=source.fPackedAcquisition; + fFakeOrphaneProduction=source.fFakeOrphaneProduction; + fMatchingWindow=source.fMatchingWindow; + fTOFdigitMap=source.fTOFdigitMap; + fTOFdigitArray=source.fTOFdigitArray; + fTOFrawStream=source.fTOFrawStream; + fTOFCableLengthMap=source.fTOFCableLengthMap; return *this; } diff --git a/TOF/AliTOFDataDCS.cxx b/TOF/AliTOFDataDCS.cxx index 64648fa790f..29eb38d5676 100644 --- a/TOF/AliTOFDataDCS.cxx +++ b/TOF/AliTOFDataDCS.cxx @@ -120,27 +120,19 @@ AliTOFDataDCS::AliTOFDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime, UInt_ //--------------------------------------------------------------- AliTOFDataDCS::AliTOFDataDCS(const AliTOFDataDCS & data): - TObject(), - fRun(0), - fStartTime(0), - fEndTime(0), - fStartTimeDCSQuery(0), - fEndTimeDCSQuery(0), - fIsProcessed(kFALSE), - fFDR(kFALSE) + TObject(data), + fRun(data.fRun), + fStartTime(data.fStartTime), + fEndTime(data.fEndTime), + fStartTimeDCSQuery(data.fStartTimeDCSQuery), + fEndTimeDCSQuery(data.fEndTimeDCSQuery), + fIsProcessed(data.fIsProcessed), + fFDR(data.fFDR) { // copy constructor - fRun=data.fRun; - fStartTime=data.fStartTime; - fEndTime=data.fEndTime; - fStartTimeDCSQuery=data.fStartTimeDCSQuery; - fEndTimeDCSQuery=data.fEndTimeDCSQuery; - fIsProcessed=data.fIsProcessed; - fFDR=data.fFDR; - for(int i=0;ifRun=data.GetRun(); - this->fStartTime=data.GetStartTime(); - this->fEndTime=data.GetEndTime(); - this->fStartTimeDCSQuery=data.GetStartTimeDCSQuery(); - this->fEndTimeDCSQuery=data.GetEndTimeDCSQuery(); + if (this == &data) + return *this; + + TObject::operator=(data); + fRun=data.GetRun(); + fStartTime=data.GetStartTime(); + fEndTime=data.GetEndTime(); + fStartTimeDCSQuery=data.GetStartTimeDCSQuery(); + fEndTimeDCSQuery=data.GetEndTimeDCSQuery(); for(int i=0;ifAliasNames[i]=data.GetAliasName(i); + fAliasNames[i]=data.GetAliasName(i); } for(int i=0;ifHVvp[i]=data.GetHVvp(i); - this->fHVvn[i]=data.GetHVvn(i); - this->fHVip[i]=data.GetHVip(i); - this->fHVin[i]=data.GetHVin(i); + fHVvp[i]=data.GetHVvp(i); + fHVvn[i]=data.GetHVvn(i); + fHVip[i]=data.GetHVip(i); + fHVin[i]=data.GetHVin(i); } diff --git a/TOF/AliTOFDecoder.cxx b/TOF/AliTOFDecoder.cxx index 7f06a481a46..ed08a1e305d 100644 --- a/TOF/AliTOFDecoder.cxx +++ b/TOF/AliTOFDecoder.cxx @@ -104,42 +104,26 @@ AliTOFDecoder::AliTOFDecoder(AliTOFHitDataBuffer *DataBuffer, AliTOFHitDataBuffe //_________________________________________________________________ AliTOFDecoder::AliTOFDecoder(const AliTOFDecoder &source) : - TObject(), - fVerbose(0), - fV2718Patch(kFALSE), - fDataBuffer(0x0), - fPackedDataBuffer(0x0), - fTRMGlobalHeader(0x0), - fTRMGlobalTrailer(0x0), - fTRMChainHeader(0x0), - fTRMChainTrailer(0x0), - fTDCPackedHit(0x0), - fTDCUnpackedHit(0x0), - fTRMTDCError(0x0), - fTRMDiagnosticErrorWord1(0x0), - fTRMDiagnosticErrorWord2(0x0), - fSpiderCurrentSlotID(-1), - fSpiderCurrentChain(-1), - fSpiderCurrentTDC(-1) + TObject(source), + fVerbose(source.fVerbose), + fV2718Patch(source.fV2718Patch), + fDataBuffer(source.fDataBuffer), + fPackedDataBuffer(source.fPackedDataBuffer), + fTRMGlobalHeader(source.fTRMGlobalHeader), + fTRMGlobalTrailer(source.fTRMGlobalTrailer), + fTRMChainHeader(source.fTRMChainHeader), + fTRMChainTrailer(source.fTRMChainTrailer), + fTDCPackedHit(source.fTDCPackedHit), + fTDCUnpackedHit(source.fTDCUnpackedHit), + fTRMTDCError(source.fTRMTDCError), + fTRMDiagnosticErrorWord1(source.fTRMDiagnosticErrorWord1), + fTRMDiagnosticErrorWord2(source.fTRMDiagnosticErrorWord2), + fSpiderCurrentSlotID(source.fSpiderCurrentSlotID), + fSpiderCurrentChain(source.fSpiderCurrentChain), + fSpiderCurrentTDC(source.fSpiderCurrentTDC) { //copy constructor - this->fVerbose = source.fVerbose; - this->fV2718Patch = source.fV2718Patch; - this->fDataBuffer = source.fDataBuffer; - this->fPackedDataBuffer = source.fPackedDataBuffer; - this->fTRMGlobalHeader = source.fTRMGlobalHeader; - this->fTRMGlobalTrailer = source.fTRMGlobalTrailer; - this->fTRMChainHeader = source.fTRMChainHeader; - this->fTRMChainTrailer = source.fTRMChainTrailer; - this->fTDCPackedHit = source.fTDCPackedHit; - this->fTDCUnpackedHit = source.fTDCUnpackedHit; - this->fTRMTDCError = source.fTRMTDCError; - this->fTRMDiagnosticErrorWord1 = source.fTRMDiagnosticErrorWord1; - this->fTRMDiagnosticErrorWord2 = source.fTRMDiagnosticErrorWord2; - this->fSpiderCurrentSlotID = source.fSpiderCurrentSlotID; - this->fSpiderCurrentChain = source.fSpiderCurrentChain; - this->fSpiderCurrentTDC = source.fSpiderCurrentTDC; } //_________________________________________________________________ @@ -149,22 +133,26 @@ AliTOFDecoder::operator = (const AliTOFDecoder &source) { //operator = - this->fVerbose = source.fVerbose; - this->fV2718Patch = source.fV2718Patch; - this->fDataBuffer = source.fDataBuffer; - this->fPackedDataBuffer = source.fPackedDataBuffer; - this->fTRMGlobalHeader = source.fTRMGlobalHeader; - this->fTRMGlobalTrailer = source.fTRMGlobalTrailer; - this->fTRMChainHeader = source.fTRMChainHeader; - this->fTRMChainTrailer = source.fTRMChainTrailer; - this->fTDCPackedHit = source.fTDCPackedHit; - this->fTDCUnpackedHit = source.fTDCUnpackedHit; - this->fTRMTDCError = source.fTRMTDCError; - this->fTRMDiagnosticErrorWord1 = source.fTRMDiagnosticErrorWord1; - this->fTRMDiagnosticErrorWord2 = source.fTRMDiagnosticErrorWord2; - this->fSpiderCurrentSlotID = source.fSpiderCurrentSlotID; - this->fSpiderCurrentChain = source.fSpiderCurrentChain; - this->fSpiderCurrentTDC = source.fSpiderCurrentTDC; + if (this == &source) + return *this; + + TObject::operator=(source); + fVerbose = source.fVerbose; + fV2718Patch = source.fV2718Patch; + fDataBuffer = source.fDataBuffer; + fPackedDataBuffer = source.fPackedDataBuffer; + fTRMGlobalHeader = source.fTRMGlobalHeader; + fTRMGlobalTrailer = source.fTRMGlobalTrailer; + fTRMChainHeader = source.fTRMChainHeader; + fTRMChainTrailer = source.fTRMChainTrailer; + fTDCPackedHit = source.fTDCPackedHit; + fTDCUnpackedHit = source.fTDCUnpackedHit; + fTRMTDCError = source.fTRMTDCError; + fTRMDiagnosticErrorWord1 = source.fTRMDiagnosticErrorWord1; + fTRMDiagnosticErrorWord2 = source.fTRMDiagnosticErrorWord2; + fSpiderCurrentSlotID = source.fSpiderCurrentSlotID; + fSpiderCurrentChain = source.fSpiderCurrentChain; + fSpiderCurrentTDC = source.fSpiderCurrentTDC; return *this; } diff --git a/TOF/AliTOFDigitMap.cxx b/TOF/AliTOFDigitMap.cxx index c99c890dc00..afe465ac3ca 100644 --- a/TOF/AliTOFDigitMap.cxx +++ b/TOF/AliTOFDigitMap.cxx @@ -49,11 +49,11 @@ Raw data update: to read the TOF raw data defined in UNPACKED mode ClassImp(AliTOFDigitMap) AliTOFDigitMap::AliTOFDigitMap(): - fNSector(-1), - fNplate(-1), - fNstrip(-1), - fNpx(-1), - fNpz(-1), + fNSector(AliTOFGeometry::NSectors()), + fNplate(AliTOFGeometry::NPlates()), + fNstrip(AliTOFGeometry::NStripC()), + fNpx(AliTOFGeometry::NpadX()), + fNpz(AliTOFGeometry::NpadZ()), fMaxIndex(-1), fDigitMap(0x0) { @@ -61,34 +61,42 @@ AliTOFDigitMap::AliTOFDigitMap(): // Default ctor // - fNSector = AliTOFGeometry::NSectors(); - fNplate = AliTOFGeometry::NPlates(); - fNstrip = AliTOFGeometry::NStripC(); - fNpx = AliTOFGeometry::NpadX(); - fNpz = AliTOFGeometry::NpadZ(); fMaxIndex=fNSector*fNplate*fNstrip*fNpx*fNpz; - fDigitMap = new Int_t*[fMaxIndex]; + for (Int_t i=0; ifDigits=source.fDigits; - this->fSDigitsArray=source.fSDigitsArray; - this->fhitMap=source.fhitMap; - this->fCalib=source.fCalib; + + if (this == &source) + return *this; + + AliDigitizer::operator=(source); + fDigits=source.fDigits; + fSDigitsArray=source.fSDigitsArray; + fhitMap=source.fhitMap; + fCalib=source.fCalib; return *this; } diff --git a/TOF/AliTOFFEEReader.cxx b/TOF/AliTOFFEEReader.cxx index 320ff04de7f..08e755c86fc 100644 --- a/TOF/AliTOFFEEReader.cxx +++ b/TOF/AliTOFFEEReader.cxx @@ -76,6 +76,9 @@ AliTOFFEEReader::operator=(const AliTOFFEEReader &source) * */ + if (this == &source) + return *this; + TObject::operator=(source); memcpy(fFEEConfig, source.fFEEConfig, sizeof(AliTOFFEEConfig)); return *this; diff --git a/TOF/AliTOFFormatDCS.cxx b/TOF/AliTOFFormatDCS.cxx index 0c4b34a1aff..cd6b2355038 100644 --- a/TOF/AliTOFFormatDCS.cxx +++ b/TOF/AliTOFFormatDCS.cxx @@ -42,7 +42,7 @@ AliTOFFormatDCS::AliTOFFormatDCS(): TObject(),fShort(0){ //--------------------------------------------------------------- AliTOFFormatDCS::AliTOFFormatDCS(const AliTOFFormatDCS & format): - TObject(), + TObject(format), fShort(format.fShort) { // copy constructor @@ -59,16 +59,20 @@ AliTOFFormatDCS::AliTOFFormatDCS(const AliTOFFormatDCS & format): AliTOFFormatDCS& AliTOFFormatDCS:: operator=(const AliTOFFormatDCS & format) { + if (this == &format) + return *this; + // assignment operator + TObject::operator=(format); for (Int_t i=0;i<3;i++){ - this->fFloats[i]=format.GetFloat(i); - this->fTimeStampsFloat[i]=format.GetTimeStampFloat(i); + fFloats[i]=format.GetFloat(i); + fTimeStampsFloat[i]=format.GetTimeStampFloat(i); } for (Int_t i=0;i<2;i++){ - this->fDeltas[i]=format.GetDelta(i); - this->fTimeStampsDelta[i]=format.GetTimeStampFloat(i); + fDeltas[i]=format.GetDelta(i); + fTimeStampsDelta[i]=format.GetTimeStampFloat(i); } - this->fShort=format.GetShort(); + fShort=format.GetShort(); return *this; } //--------------------------------------------------------------- diff --git a/TOF/AliTOFRawMap.cxx b/TOF/AliTOFRawMap.cxx index d5fee233868..03dd8db872d 100644 --- a/TOF/AliTOFRawMap.cxx +++ b/TOF/AliTOFRawMap.cxx @@ -37,6 +37,7 @@ ClassImp(AliTOFRawMap) AliTOFRawMap::AliTOFRawMap(): + TObject(), fNtrm(-1), fNtrmChain(-1), fNtdc(-1), @@ -51,11 +52,12 @@ AliTOFRawMap::AliTOFRawMap(): } //////////////////////////////////////////////////////////////////////// -AliTOFRawMap::AliTOFRawMap(TClonesArray *dig)://, AliTOFGeometry *tofGeom): - fNtrm(-1), - fNtrmChain(-1), - fNtdc(-1), - fNtdcChannel(-1), +AliTOFRawMap::AliTOFRawMap(TClonesArray *dig)://, AliTOFGeometry *tofGeom: + TObject(), + fNtrm(AliTOFGeometry::NTRM()+2), + fNtrmChain(AliTOFGeometry::NChain()), + fNtdc(AliTOFGeometry::NTdc()), + fNtdcChannel(AliTOFGeometry::NCh()), fRawData(dig), fMaxIndex(-1), fRawMap(0x0) @@ -67,23 +69,19 @@ AliTOFRawMap::AliTOFRawMap(TClonesArray *dig)://, AliTOFGeometry *tofGeom): // of course, these constants must not be hardwired // change later - fNtrm = AliTOFGeometry::NTRM()+2; - fNtrmChain = AliTOFGeometry::NChain(); - fNtdc = AliTOFGeometry::NTdc(); - fNtdcChannel = AliTOFGeometry::NCh(); fMaxIndex = fNtrm*fNtrmChain*fNtdc*fNtdcChannel; fRawMap = new Int_t[fMaxIndex]; Clear(); } //////////////////////////////////////////////////////////////////////// -AliTOFRawMap::AliTOFRawMap(const AliTOFRawMap & /*rawMap*/) - :TObject(), - fNtrm(-1), - fNtrmChain(-1), - fNtdc(-1), - fNtdcChannel(-1), - fRawData(0x0), +AliTOFRawMap::AliTOFRawMap(const AliTOFRawMap & rawMap) + :TObject(rawMap), + fNtrm(rawMap.fNtrm), + fNtrmChain(rawMap.fNtrmChain), + fNtdc(rawMap.fNtdc), + fNtdcChannel(rawMap.fNtdcChannel), + fRawData(rawMap.fRawData), fMaxIndex(-1), fRawMap(0x0) { @@ -91,6 +89,18 @@ AliTOFRawMap::AliTOFRawMap(const AliTOFRawMap & /*rawMap*/) // Dummy copy constructor // + fMaxIndex = fNtrm*fNtrmChain*fNtdc*fNtdcChannel; + fRawMap = new Int_t[fMaxIndex]; +} + +//////////////////////////////////////////////////////////////////////// +AliTOFRawMap & +AliTOFRawMap::operator=(const AliTOFRawMap & /*rawMap*/) +{ +// +// Dummy copy constructor +// + return *this; } @@ -100,7 +110,8 @@ AliTOFRawMap::~AliTOFRawMap() // // Destructor // - delete[] fRawMap; + if (fRawMap) + delete[] fRawMap; } @@ -192,9 +203,3 @@ FlagType AliTOFRawMap::TestHit(Int_t *slot) const } } -//////////////////////////////////////////////////////////////////////// -AliTOFRawMap & AliTOFRawMap::operator = (const AliTOFRawMap & /*rhs*/) -{ -// Dummy assignment operator - return *this; -} diff --git a/TOF/AliTOFRawMap.h b/TOF/AliTOFRawMap.h index 96eff088fbb..8eb17f27c51 100644 --- a/TOF/AliTOFRawMap.h +++ b/TOF/AliTOFRawMap.h @@ -28,6 +28,7 @@ class AliTOFRawMap : public TObject AliTOFRawMap(); AliTOFRawMap(TClonesArray *sdig); AliTOFRawMap(const AliTOFRawMap & rawMap); + AliTOFRawMap &operator=(const AliTOFRawMap & rawMap); virtual ~AliTOFRawMap(); // Clear the raw map @@ -41,8 +42,6 @@ class AliTOFRawMap : public TObject virtual TObject* GetHit(Int_t *vol) const; // Test hit status virtual FlagType TestHit(Int_t *vol) const; - // Assignment operator - AliTOFRawMap& operator = (const AliTOFRawMap& rhs); private: // Check index diff --git a/TOF/AliTOFRawStream.cxx b/TOF/AliTOFRawStream.cxx index 16910ce318d..1060b1f585d 100644 --- a/TOF/AliTOFRawStream.cxx +++ b/TOF/AliTOFRawStream.cxx @@ -286,82 +286,47 @@ AliTOFRawStream::AliTOFRawStream(): //_____________________________________________________________________________ AliTOFRawStream::AliTOFRawStream(const AliTOFRawStream& stream) : TObject(stream), - fRawReader(0x0), - fTOFrawData(0x0), + fRawReader(stream.fRawReader), + fTOFrawData(stream.fTOFrawData), fDecoder(new AliTOFDecoder()), - fDDL(-1), - fTRM(-1), - fTRMchain(-1), - fTDC(-1), - fTDCchannel(-1), - fTime(-1), - fToT(-1), - fLeadingEdge(-1), - fTrailingEdge(-1), - fErrorFlag(-1), - fSector(-1), - fPlate(-1), - fStrip(-1), - fPadX(-1), - fPadZ(-1), - fPackedDigits(0), - fWordType(-1), - fSlotID(-1), - fACQ(-1), - fPSbit(-1), - fTDCerrorFlag(-1), - fInsideDRM(kFALSE), - fInsideTRM(kFALSE), - fInsideLTM(kFALSE), - fInsideTRMchain0(kFALSE), - fInsideTRMchain1(kFALSE), - fLocalEventCounterDRM(-1), - fLocalEventCounterLTM(-1), + fDDL(stream.fDDL), + fTRM(stream.fTRM), + fTRMchain(stream.fTRMchain), + fTDC(stream.fTDC), + fTDCchannel(stream.fTDCchannel), + fTime(stream.fTime), + fToT(-stream.fToT), + fLeadingEdge(stream.fLeadingEdge), + fTrailingEdge(stream.fTrailingEdge), + fErrorFlag(stream.fErrorFlag), + fSector(stream.fSector), + fPlate(stream.fPlate), + fStrip(stream.fStrip), + fPadX(stream.fPadX), + fPadZ(stream.fPadZ), + fPackedDigits(stream.fPackedDigits), + fWordType(stream.fWordType), + fSlotID(stream.fSlotID), + fACQ(stream.fACQ), + fPSbit(stream.fPSbit), + fTDCerrorFlag(stream.fTDCerrorFlag), + fInsideDRM(stream.fInsideDRM), + fInsideTRM(stream.fInsideTRM), + fInsideLTM(stream.fInsideLTM), + fInsideTRMchain0(stream.fInsideTRMchain0), + fInsideTRMchain1(stream.fInsideTRMchain1), + fLocalEventCounterDRM(stream.fLocalEventCounterDRM), + fLocalEventCounterLTM(stream.fLocalEventCounterLTM), fLocalEventCounterTRM(0x0), fLocalEventCounterChain(0x0), fChainBunchID(0x0), - fCableLengthMap(0x0), - fEventID(0) + fCableLengthMap(stream.fCableLengthMap), + fEventID(stream.fEventID) { // // copy constructor // - fRawReader = stream.fRawReader; - - fTOFrawData = stream.fTOFrawData; - - fDDL = stream.fDDL; - fTRM = stream.fTRM; - fTRMchain = stream.fTRMchain; - fTDC = stream.fTDC; - fTDCchannel = stream.fTDCchannel; - fTime = stream.fTime; - fToT = stream.fToT; - fLeadingEdge = stream.fLeadingEdge; - fTrailingEdge = stream.fTrailingEdge; - - fErrorFlag = stream.fErrorFlag; - - fSector = stream.fSector; - fPlate = stream.fPlate; - fStrip = stream.fStrip; - fPadX = stream.fPadX; - fPadZ = stream.fPadZ; - - fPackedDigits = stream.fPackedDigits; - - fWordType = stream.fWordType; - fSlotID = stream.fSlotID; - fACQ = stream.fACQ; - fPSbit = stream.fPSbit; - fTDCerrorFlag = stream.fTDCerrorFlag; - fInsideDRM = stream.fInsideDRM; - fInsideTRM = stream.fInsideTRM; - fInsideLTM = stream.fInsideLTM; - fInsideTRMchain0 = stream.fInsideTRMchain0; - fInsideTRMchain1 = stream.fInsideTRMchain1; - for (Int_t i=0;ifTimeZero=p.fTimeZero; - this->fTimeZerofromT0=p.fTimeZerofromT0; - this->fTimeZerofromTOF=p.fTimeZerofromTOF; - this->fTimeWalkCorr=p.fTimeWalkCorr; - this->fApplyPbPbCuts=p.fApplyPbPbCuts; - this->fWindowSizeMaxY=p.fWindowSizeMaxY; - this->fWindowSizeMaxZ=p.fWindowSizeMaxZ; - this->fDistanceCut=p.fDistanceCut; - this->fWindowScaleFact=p.fWindowScaleFact; - this->fStepSize=p.fStepSize; - this->fSensRadius=p.fSensRadius; - this->fMaxChi2=p.fMaxChi2; - this->fMaxChi2TRD=p.fMaxChi2TRD; - this->fTimeResolution=p.fTimeResolution; - this->fTimeNSigma=p.fTimeNSigma; return *this; } //_____________________________________________________________________________ diff --git a/TOF/AliTOFReconstructor.cxx b/TOF/AliTOFReconstructor.cxx index 021960b2828..c56fed6b32b 100644 --- a/TOF/AliTOFReconstructor.cxx +++ b/TOF/AliTOFReconstructor.cxx @@ -63,13 +63,12 @@ AliTOFReconstructor::AliTOFReconstructor() //------------------------------------------------------------------------ AliTOFReconstructor::AliTOFReconstructor(const AliTOFReconstructor &source) - : AliReconstructor(), - fTOFcalib(0) + : AliReconstructor(source), + fTOFcalib(source.fTOFcalib) { // // copy ctor // - this->fTOFcalib=source.fTOFcalib; } //------------------------------------------------------------------------ @@ -78,7 +77,10 @@ AliTOFReconstructor & AliTOFReconstructor::operator=(const AliTOFReconstructor & // // assignment op. // - this->fTOFcalib=source.fTOFcalib; + if (this == &source) + return *this; + + fTOFcalib=source.fTOFcalib; return *this; } //_____________________________________________________________________________ diff --git a/TOF/AliTOFSDigit.cxx b/TOF/AliTOFSDigit.cxx index 20f1fe8aa8f..a506517d75a 100644 --- a/TOF/AliTOFSDigit.cxx +++ b/TOF/AliTOFSDigit.cxx @@ -93,13 +93,13 @@ AliTOFSDigit::AliTOFSDigit(Int_t tracknum, Int_t *vol,Int_t *digit): //////////////////////////////////////////////////////////////////////// AliTOFSDigit::AliTOFSDigit(const AliTOFSDigit & digit): - TObject(), - fSector(-1), - fPlate(-1), - fStrip(-1), - fPadx(-1), - fPadz(-1), - fNDigits(0), + TObject(digit), + fSector(digit.fSector), + fPlate(digit.fPlate), + fStrip(digit.fStrip), + fPadx(digit.fPadx), + fPadz(digit.fPadz), + fNDigits(digit.fNDigits), fTdc(0x0), fAdc(0x0), fTracks(0x0) @@ -107,12 +107,6 @@ AliTOFSDigit::AliTOFSDigit(const AliTOFSDigit & digit): // // copy ctor for AliTOFSDigit object // - fSector = digit.fSector; - fPlate = digit.fPlate; - fStrip = digit.fStrip; - fPadx = digit.fPadx; - fPadz = digit.fPadz; - fNDigits = digit.fNDigits; fTdc = new TArrayI(*digit.fTdc); fAdc = new TArrayI(*digit.fAdc); fTracks = new TArrayI(*digit.fTracks); @@ -124,15 +118,20 @@ AliTOFSDigit& AliTOFSDigit::operator=(const AliTOFSDigit & digit) // // copy ctor for AliTOFSDigit object // - this->fSector = digit.fSector; - this->fPlate = digit.fPlate; - this->fStrip = digit.fStrip; - this->fPadx = digit.fPadx; - this->fPadz = digit.fPadz; - this->fNDigits = digit.fNDigits; - this->fTdc = digit.fTdc; - this->fAdc = digit.fAdc; - this->fTracks = digit.fTracks; + + if (this == &digit) + return *this; + + TObject::operator=(digit); + fSector = digit.fSector; + fPlate = digit.fPlate; + fStrip = digit.fStrip; + fPadx = digit.fPadx; + fPadz = digit.fPadz; + fNDigits = digit.fNDigits; + fTdc = digit.fTdc; + fAdc = digit.fAdc; + fTracks = digit.fTracks; return *this; } diff --git a/TOF/AliTOFTrigger.cxx b/TOF/AliTOFTrigger.cxx index e9c14d93d50..cd755f57570 100644 --- a/TOF/AliTOFTrigger.cxx +++ b/TOF/AliTOFTrigger.cxx @@ -103,27 +103,18 @@ AliTOFTrigger::AliTOFTrigger(Int_t HighMultTh, Int_t ppMBTh, Int_t MultiMuonTh, //____________________________________________________________________________ AliTOFTrigger::AliTOFTrigger(const AliTOFTrigger & tr): - AliTriggerDetector(), - fHighMultTh(0), - fppMBTh(0), - fMultiMuonTh(0), - fUPTh(0), - fdeltaminpsi(0), - fdeltamaxpsi(0), - fdeltaminro(0), - fdeltamaxro(0), - fstripWindow(0) + AliTriggerDetector(tr), + fHighMultTh(tr.fHighMultTh), + fppMBTh(tr.fppMBTh), + fMultiMuonTh(tr.fMultiMuonTh), + fUPTh(tr.fUPTh), + fdeltaminpsi(tr.fdeltaminpsi), + fdeltamaxpsi(tr.fdeltamaxpsi), + fdeltaminro(tr.fdeltaminro), + fdeltamaxro(tr.fdeltamaxro), + fstripWindow(tr.fstripWindow) { //copy ctor - fHighMultTh=tr.fHighMultTh; - fppMBTh=tr.fppMBTh; - fMultiMuonTh=tr.fMultiMuonTh; - fUPTh=tr.fUPTh; - fdeltaminpsi = tr.fdeltaminpsi; - fdeltamaxpsi = tr.fdeltamaxpsi; - fdeltaminro = tr.fdeltaminro; - fdeltamaxro = tr.fdeltamaxro; - fstripWindow = tr.fstripWindow; for (Int_t i=0;iGetRunLoader(); Int_t ncurrevent = rl->GetEventNumber(); rl->GetEvent(ncurrevent); diff --git a/TOF/AliTOFcalib.cxx b/TOF/AliTOFcalib.cxx index 65c86f5b99f..e1b1128744c 100644 --- a/TOF/AliTOFcalib.cxx +++ b/TOF/AliTOFcalib.cxx @@ -148,7 +148,7 @@ AliTOFcalib::AliTOFcalib(): //____________________________________________________________________________ AliTOFcalib::AliTOFcalib(const AliTOFcalib & calib): - TTask("AliTOFcalib",""), + TTask(calib), fNChannels(calib.fNChannels), fTOFCalOnline(0x0), fTOFCalOnlinePulser(0x0), @@ -186,27 +186,32 @@ AliTOFcalib::AliTOFcalib(const AliTOFcalib & calib): AliTOFcalib& AliTOFcalib::operator=(const AliTOFcalib &calib) { //TOF Calibration Class assignment operator - this->fNChannels = calib.fNChannels; - this->fCal = calib.fCal; - this->fStatus = calib.fStatus; - this->fTOFSimToT = calib.fTOFSimToT; - this->fkValidity = calib.fkValidity; - this->fTree = calib.fTree; - this->fChain = calib.fChain; - this->fNruns = calib.fNruns; - this->fFirstRun = calib.fFirstRun; - this->fLastRun = calib.fLastRun; + + if (this == &calib) + return *this; + + TTask::operator=(calib); + fNChannels = calib.fNChannels; + fCal = calib.fCal; + fStatus = calib.fStatus; + fTOFSimToT = calib.fTOFSimToT; + fkValidity = calib.fkValidity; + fTree = calib.fTree; + fChain = calib.fChain; + fNruns = calib.fNruns; + fFirstRun = calib.fFirstRun; + fLastRun = calib.fLastRun; for (Int_t iarray = 0; iarrayAt(iarray); AliTOFChannelOffline * calChOffline = (AliTOFChannelOffline*)calib.fTOFCalOffline->At(iarray); AliTOFChannelOnlineStatus * calChOnlineStPulser = (AliTOFChannelOnlineStatus*)calib.fTOFCalOnlinePulser->At(iarray); AliTOFChannelOnlineStatus * calChOnlineStNoise = (AliTOFChannelOnlineStatus*)calib.fTOFCalOnlineNoise->At(iarray); AliTOFChannelOnlineStatus * calChOnlineStHW = (AliTOFChannelOnlineStatus*)calib.fTOFCalOnlineHW->At(iarray); - this->fTOFCalOnline->AddAt(calChOnline,iarray); - this->fTOFCalOnlinePulser->AddAt(calChOnlineStPulser,iarray); - this->fTOFCalOnlineNoise->AddAt(calChOnlineStNoise,iarray); - this->fTOFCalOnlineHW->AddAt(calChOnlineStHW,iarray); - this->fTOFCalOffline->AddAt(calChOffline,iarray); + fTOFCalOnline->AddAt(calChOnline,iarray); + fTOFCalOnlinePulser->AddAt(calChOnlineStPulser,iarray); + fTOFCalOnlineNoise->AddAt(calChOnlineStNoise,iarray); + fTOFCalOnlineHW->AddAt(calChOnlineStHW,iarray); + fTOFCalOffline->AddAt(calChOffline,iarray); } return *this; } diff --git a/TOF/AliTOFdigit.cxx b/TOF/AliTOFdigit.cxx index bde6b425dd6..62423629f89 100644 --- a/TOF/AliTOFdigit.cxx +++ b/TOF/AliTOFdigit.cxx @@ -56,44 +56,33 @@ AliTOFdigit::AliTOFdigit() //______________________________________________________________________________ AliTOFdigit::AliTOFdigit(Int_t *tracks, Int_t *vol, Int_t *digit) :AliDigit(tracks), - fSector(-1), - fPlate(-1), - fStrip(-1), - fPadx(-1), - fPadz(-1), - fTdc(0), - fTdcND(0), - fAdc(0), - fToT(0) + fSector(vol[0]), + fPlate(vol[1]), + fStrip(vol[2]), + fPadx(vol[3]), + fPadz(vol[4]), + fTdc(digit[0]), + fTdcND(digit[3]), + fAdc(digit[1]), + fToT(digit[2]) { // // Constructor of digit object // - - fSector = vol[0]; - fPlate = vol[1]; - fStrip = vol[2]; - fPadx = vol[3]; - fPadz = vol[4]; - fTdc = digit[0]; - fAdc = digit[1]; - fToT = digit[2]; - fTdcND = digit[3]; - } //____________________________________________________________________________ AliTOFdigit::AliTOFdigit(const AliTOFdigit & digit) :AliDigit(digit), - fSector(-1), - fPlate(-1), - fStrip(-1), - fPadx(-1), - fPadz(-1), - fTdc(0), - fTdcND(0), - fAdc(0), - fToT(0) + fSector(digit.fSector), + fPlate(digit.fPlate), + fStrip(digit.fStrip), + fPadx(digit.fPadx), + fPadz(digit.fPadz), + fTdc(digit.fTdc), + fTdcND(digit.fTdcND), + fAdc(digit.fAdc), + fToT(digit.fToT) { // // copy ctor for AliTOFdigit object @@ -102,43 +91,25 @@ AliTOFdigit::AliTOFdigit(const AliTOFdigit & digit) Int_t i ; for ( i = 0; i < 3 ; i++) fTracks[i] = digit.fTracks[i] ; - fSector = digit.fSector; - fPlate = digit.fPlate; - fStrip = digit.fStrip; - fPadx = digit.fPadx; - fPadz = digit.fPadz; - fTdc = digit.fTdc; - fTdcND = digit.fTdcND; - fAdc = digit.fAdc; - fToT = digit.fToT; } //______________________________________________________________________________ AliTOFdigit::AliTOFdigit(Int_t sector, Int_t plate, Int_t strip, Int_t padx, Int_t padz, Int_t tdc, Int_t adc): - fSector(-1), - fPlate(-1), - fStrip(-1), - fPadx(-1), - fPadz(-1), - fTdc(0), + fSector(sector), + fPlate(plate), + fStrip(strip), + fPadx(padx), + fPadz(padz), + fTdc(tdc), fTdcND(0), - fAdc(0), + fAdc(adc), fToT(0) { // // Constructor for sdigit // - fSector = sector; - fPlate = plate; - fStrip = strip; - fPadx = padx; - fPadz = padz; - fTdc = tdc; - fTdcND = 0; - fAdc = adc; - fToT = 0; } //______________________________________________________________________________ diff --git a/TOF/AliTOFdigit.h b/TOF/AliTOFdigit.h index c3f51360719..04d92996db1 100644 --- a/TOF/AliTOFdigit.h +++ b/TOF/AliTOFdigit.h @@ -17,9 +17,9 @@ #include "AliDigit.h" class AliTOFdigit : public AliDigit { - + //overloading of the streamer << operator -friend ostream& operator << ( ostream& , const AliTOFdigit&) ; + friend ostream& operator << ( ostream& , const AliTOFdigit&) ; public: AliTOFdigit(); @@ -70,6 +70,9 @@ protected: // 'charge' measurement Int_t fToT; // simulated ToT + private: + AliTOFdigit &operator=(const AliTOFdigit& digit); + ClassDef(AliTOFdigit,5) // Digit for Time Of Flight }; diff --git a/TOF/AliTOFhit.cxx b/TOF/AliTOFhit.cxx index d34682ba562..28a8f9a4152 100644 --- a/TOF/AliTOFhit.cxx +++ b/TOF/AliTOFhit.cxx @@ -81,45 +81,26 @@ ClassImp(AliTOFhit) //____________________________________________________________________________ AliTOFhit::AliTOFhit(const AliTOFhit & hit) : AliHit(hit), - fSector(-1), - fPlate(-1), - fStrip(-1), - fPadx(-1), - fPadz(-1), - fPx(0), - fPy(0), - fPz(0), - fPmom(0), - fTof(0), - fDx(0), - fDy(0), - fDz(0), - fIncA(0), - fEdep(0) + fSector(hit.fSector), + fPlate(hit.fPlate), + fStrip(hit.fStrip), + fPadx(hit.fPadx), + fPadz(hit.fPadz), + fPx(hit.fPx), + fPy(hit.fPy), + fPz(hit.fPz), + fPmom(hit.fPmom), + fTof(hit.fTof), + fDx(hit.fDx), + fDy(hit.fDy), + fDz(hit.fDz), + fIncA(hit.fIncA), + fEdep(hit.fEdep) { // // copy ctor for AliTOFhit object // - fTrack = hit.fTrack; - fX = hit.fX; - fY = hit.fY; - fZ = hit.fZ; - fSector = hit.fSector; - fPlate = hit.fPlate; - fStrip = hit.fStrip; - fPadx = hit.fPadx; - fPadz = hit.fPadz; - fPx = hit.fPx; - fPy = hit.fPy; - fPz = hit.fPz; - fPmom = hit.fPmom; - fTof = hit.fTof; - fDx = hit.fDx; - fDy = hit.fDy; - fDz = hit.fDz; - fIncA = hit.fIncA; - fEdep = hit.fEdep; - + fTrack = hit.fTrack; } //______________________________________________________________________________ diff --git a/TOF/AliTOFhitT0.cxx b/TOF/AliTOFhitT0.cxx index 3ce5c1145a6..eef48fe7f33 100644 --- a/TOF/AliTOFhitT0.cxx +++ b/TOF/AliTOFhitT0.cxx @@ -77,45 +77,26 @@ ClassImp(AliTOFhitT0) //____________________________________________________________________________ AliTOFhitT0::AliTOFhitT0(const AliTOFhitT0 & hit): AliHit(hit), - fSector(-1), - fPlate(-1), - fStrip(-1), - fPadx(-1), - fPadz(-1), - fPx(0), - fPy(0), - fPz(0), - fPmom(0), - fTof(0), - fLenTof(0), - fDx(0), - fDy(0), - fDz(0), - fIncA(0), - fEdep(0){ + fSector(hit.fSector), + fPlate(hit.fPlate), + fStrip(hit.fStrip), + fPadx(hit.fPadx), + fPadz(hit.fPadz), + fPx(hit.fPx), + fPy(hit.fPy), + fPz(hit.fPz), + fPmom(hit.fPmom), + fTof(hit.fTof), + fLenTof(hit.fLenTof), + fDx(hit.fDx), + fDy(hit.fDy), + fDz(hit.fDz), + fIncA(hit.fIncA), + fEdep(hit.fEdep){ // // copy ctor for AliTOFhitT0 object // fTrack = hit.fTrack; - fX = hit.fX; - fY = hit.fY; - fZ = hit.fZ; - fSector = hit.fSector; - fPlate = hit.fPlate; - fStrip = hit.fStrip; - fPadx = hit.fPadx; - fPadz = hit.fPadz; - fPx = hit.fPx; - fPy = hit.fPy; - fPz = hit.fPz; - fPmom = hit.fPmom; - fTof = hit.fTof; - fLenTof = hit.fLenTof; - fDx = hit.fDx; - fDy = hit.fDy; - fDz = hit.fDz; - fIncA = hit.fIncA; - fEdep = hit.fEdep; } diff --git a/TOF/AliTOFtracker.cxx b/TOF/AliTOFtracker.cxx index 5458b497163..8badee5f05f 100644 --- a/TOF/AliTOFtracker.cxx +++ b/TOF/AliTOFtracker.cxx @@ -95,75 +95,6 @@ AliTOFtracker::AliTOFtracker(): InitCheckHists(); -} -//_____________________________________________________________________________ -AliTOFtracker::AliTOFtracker(const AliTOFtracker &t): - AliTracker(), - fRecoParam(0x0), - fGeom(0x0), - fPid(0x0), - fN(0), - fNseeds(0), - fNseedsTOF(0), - fngoodmatch(0), - fnbadmatch(0), - fnunmatch(0), - fnmatch(0), - fTracks(new TClonesArray("AliTOFtrack")), - fSeeds(new TClonesArray("AliESDtrack")), - fHDigClusMap(0x0), - fHDigNClus(0x0), - fHDigClusTime(0x0), - fHDigClusToT(0x0), - fHRecNClus(0x0), - fHRecDist(0x0), - fHRecSigYVsP(0x0), - fHRecSigZVsP(0x0), - fHRecSigYVsPWin(0x0), - fHRecSigZVsPWin(0x0), - fCalTree(0x0), - fIch(-1), - fToT(-1.), - fTime(-1.), - fExpTimePi(-1.), - fExpTimeKa(-1.), - fExpTimePr(-1.) - { - //AliTOFtracker copy Ctor - - fNseeds=t.fNseeds; - fNseeds=t.fNseeds; - fNseedsTOF=t.fNseedsTOF; - fngoodmatch=t.fngoodmatch; - fnbadmatch=t.fnbadmatch; - fnunmatch=t.fnunmatch; - fnmatch=t.fnmatch; - fRecoParam=t.fRecoParam; - fPid=t.fPid; - fSeeds=t.fSeeds; - fTracks=t.fTracks; - fN=t.fN; -} - -//_____________________________________________________________________________ -AliTOFtracker& AliTOFtracker::operator=(const AliTOFtracker &t) -{ - //AliTOFtracker assignment operator - - this->fNseeds=t.fNseeds; - this->fNseedsTOF=t.fNseedsTOF; - this->fngoodmatch=t.fngoodmatch; - this->fnbadmatch=t.fnbadmatch; - this->fnunmatch=t.fnunmatch; - this->fnmatch=t.fnmatch; - this->fRecoParam = t.fRecoParam; - this->fGeom=t.fGeom; - this->fPid = t.fPid; - this->fSeeds=t.fSeeds; - this->fTracks=t.fTracks; - this->fN=t.fN; - return *this; - } //_____________________________________________________________________________ AliTOFtracker::~AliTOFtracker() { diff --git a/TOF/AliTOFtracker.h b/TOF/AliTOFtracker.h index 9d86ca6288e..f5e7b56638a 100644 --- a/TOF/AliTOFtracker.h +++ b/TOF/AliTOFtracker.h @@ -40,8 +40,6 @@ enum {kMaxCluster=77777}; //maximal number of the TOF clusters public: AliTOFtracker(); - AliTOFtracker(const AliTOFtracker &t); //Copy Ctor - AliTOFtracker& operator=(const AliTOFtracker &source); // ass. op. virtual ~AliTOFtracker(); virtual Int_t Clusters2Tracks(AliESDEvent* /*event*/) {return -1;}; @@ -59,6 +57,9 @@ public: private: + AliTOFtracker(const AliTOFtracker &t); //Copy Ctor + AliTOFtracker& operator=(const AliTOFtracker &source); // ass. op. + Int_t FindClusterIndex(Double_t z) const; // Returns cluster index void MatchTracks(Bool_t mLastStep); // Matching Algorithm void CollectESD(); // Select starting Set for Matching diff --git a/TOF/AliTOFtrackerMI.cxx b/TOF/AliTOFtrackerMI.cxx index 51bbf9a2e9a..47655aae87b 100644 --- a/TOF/AliTOFtrackerMI.cxx +++ b/TOF/AliTOFtrackerMI.cxx @@ -72,77 +72,6 @@ AliTOFtrackerMI::AliTOFtrackerMI(): fDz=AliTOFGeometry::ZPad(); fDebugStreamer = new TTreeSRedirector("TOFdebug.root"); } -//_____________________________________________________________________________ -AliTOFtrackerMI::AliTOFtrackerMI(const AliTOFtrackerMI &t): - AliTracker(), - fRecoParam(0x0), - fGeom(0x0), - fPid(0x0), - fN(0), - fNseeds(0), - fNseedsTOF(0), - fngoodmatch(0), - fnbadmatch(0), - fnunmatch(0), - fnmatch(0), - fR(379.), - fTOFHeigth(15.3), - fdCut(3.), - fDx(1.5), - fDy(0), - fDz(0), - fTracks(new TClonesArray("AliTOFtrack")), - fSeeds(new TClonesArray("AliESDtrack")), - fDebugStreamer(0x0) - { - //AliTOFtrackerMI copy Ctor - - fNseeds=t.fNseeds; - fNseedsTOF=t.fNseedsTOF; - fngoodmatch=t.fngoodmatch; - fnbadmatch=t.fnbadmatch; - fnunmatch=t.fnunmatch; - fnmatch=t.fnmatch; - fRecoParam = t.fRecoParam; - fGeom=t.fGeom; - fPid = t.fPid; - fR=t.fR; - fTOFHeigth=t.fTOFHeigth; - fdCut=t.fdCut; - fDy=t.fDy; - fDz=t.fDz; - fDx=1.5; - fSeeds=t.fSeeds; - fTracks=t.fTracks; - fN=t.fN; -} - -//_________________________________________________________________________________ -AliTOFtrackerMI& AliTOFtrackerMI::operator=(const AliTOFtrackerMI &t) -{ - //AliTOFtrackerMI assignment operator - - this->fNseeds=t.fNseeds; - this->fNseedsTOF=t.fNseedsTOF; - this->fngoodmatch=t.fngoodmatch; - this->fnbadmatch=t.fnbadmatch; - this->fnunmatch=t.fnunmatch; - this->fnmatch=t.fnmatch; - this->fRecoParam = t.fRecoParam; - this->fGeom = t.fGeom; - this->fPid = t.fPid; - this->fR=t.fR; - this->fTOFHeigth=t.fTOFHeigth; - this->fdCut=t.fdCut; - this->fDy=t.fDy; - this->fDz=t.fDz; - this->fDx=t.fDx; - this->fSeeds=t.fSeeds; - this->fTracks=t.fTracks; - this->fN=t.fN; - return *this; - -} //_____________________________________________________________________________ AliTOFtrackerMI::~AliTOFtrackerMI(){ diff --git a/TOF/AliTOFtrackerMI.h b/TOF/AliTOFtrackerMI.h index f78839eb58d..437bdde5274 100644 --- a/TOF/AliTOFtrackerMI.h +++ b/TOF/AliTOFtrackerMI.h @@ -34,8 +34,6 @@ enum {kMaxCluster=77777}; //maximal number of the TOF clusters public: AliTOFtrackerMI(); - AliTOFtrackerMI(const AliTOFtrackerMI &t); //Copy Ctor - AliTOFtrackerMI& operator=(const AliTOFtrackerMI &source); // ass. op. // virtual ~AliTOFtrackerMI() {delete fTOFpid;} virtual ~AliTOFtrackerMI(); @@ -52,6 +50,9 @@ public: private: + AliTOFtrackerMI(const AliTOFtrackerMI &t); //Copy Ctor + AliTOFtrackerMI& operator=(const AliTOFtrackerMI &source); // ass. op. + Int_t InsertCluster(AliTOFcluster *c); // Fills TofClusters Array Int_t FindClusterIndex(Double_t z) const; // Returns cluster index void MatchTracks(Bool_t mLastStep); // Matching Algorithm diff --git a/TOF/AliTOFtrackerV1.cxx b/TOF/AliTOFtrackerV1.cxx index f1cef2a3690..4767678aa59 100644 --- a/TOF/AliTOFtrackerV1.cxx +++ b/TOF/AliTOFtrackerV1.cxx @@ -84,67 +84,6 @@ AliTOFtrackerV1::AliTOFtrackerV1(): InitCheckHists(); -} -//_____________________________________________________________________________ -AliTOFtrackerV1::AliTOFtrackerV1(const AliTOFtrackerV1 &t): - AliTracker(), - fRecoParam(0x0), - fPid(0x0), - fN(0), - fNseeds(0), - fNseedsTOF(0), - fngoodmatch(0), - fnbadmatch(0), - fnunmatch(0), - fnmatch(0), - fTracks(new TClonesArray("AliTOFtrack")), - fSeeds(new TClonesArray("AliESDtrack")), - fHDigClusMap(0x0), - fHDigNClus(0x0), - fHDigClusTime(0x0), - fHDigClusToT(0x0), - fHRecNClus(0x0), - fHRecChi2(0x0), - fHRecDistZ(0x0), - fHRecSigYVsP(0x0), - fHRecSigZVsP(0x0), - fHRecSigYVsPWin(0x0), - fHRecSigZVsPWin(0x0) - { - //AliTOFtrackerV1 copy Ctor - - fNseeds=t.fNseeds; - fNseeds=t.fNseeds; - fNseedsTOF=t.fNseedsTOF; - fngoodmatch=t.fngoodmatch; - fnbadmatch=t.fnbadmatch; - fnunmatch=t.fnunmatch; - fnmatch=t.fnmatch; - fRecoParam=t.fRecoParam; - fPid=t.fPid; - fSeeds=t.fSeeds; - fTracks=t.fTracks; - fN=t.fN; -} - -//_____________________________________________________________________________ -AliTOFtrackerV1& AliTOFtrackerV1::operator=(const AliTOFtrackerV1 &t) -{ - //AliTOFtrackerV1 assignment operator - - this->fNseeds=t.fNseeds; - this->fNseedsTOF=t.fNseedsTOF; - this->fngoodmatch=t.fngoodmatch; - this->fnbadmatch=t.fnbadmatch; - this->fnunmatch=t.fnunmatch; - this->fnmatch=t.fnmatch; - this->fRecoParam = t.fRecoParam; - this->fPid = t.fPid; - this->fSeeds=t.fSeeds; - this->fTracks=t.fTracks; - this->fN=t.fN; - return *this; - } //_____________________________________________________________________________ AliTOFtrackerV1::~AliTOFtrackerV1() { diff --git a/TOF/AliTOFtrackerV1.h b/TOF/AliTOFtrackerV1.h index 5e7c48e1b45..f56654f5020 100644 --- a/TOF/AliTOFtrackerV1.h +++ b/TOF/AliTOFtrackerV1.h @@ -38,8 +38,6 @@ enum {kMaxCluster=77777}; //maximal number of the TOF clusters public: AliTOFtrackerV1(); - AliTOFtrackerV1(const AliTOFtrackerV1 &t); //Copy Ctor - AliTOFtrackerV1& operator=(const AliTOFtrackerV1 &source); // ass. op. virtual ~AliTOFtrackerV1(); virtual Int_t Clusters2Tracks(AliESDEvent* /*event*/) {return -1;}; @@ -57,6 +55,9 @@ public: private: + AliTOFtrackerV1(const AliTOFtrackerV1 &t); //Copy Ctor + AliTOFtrackerV1& operator=(const AliTOFtrackerV1 &source); // ass. op. + Int_t FindClusterIndex(Double_t z) const; // Returns cluster index void MatchTracks(); // Matching Algorithm void CollectESD(); // Select starting Set for Matching -- 2.43.0