X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFSDigit.cxx;h=a506517d75af09ee4a02a78256c06a1235dafec8;hb=8a190ba28397d08a3826976c55dff231b8f86fb1;hp=20f1fe8aa8f38e16b4ea1a6b7fc2b5470480f457;hpb=702659f63794422c92d2605226e9acf0cb79427b;p=u%2Fmrichter%2FAliRoot.git 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; }