move TVirtualDecayer->Init() to class initializer

[u/mrichter/AliRoot.git] / TOF / AliTOFrawData.cxx

diff --git a/TOF/AliTOFrawData.cxx b/TOF/AliTOFrawData.cxx
index 0378f577b02845574ca831de891aea93cc9cdfcf..51263a37728c4aff3f855116863272bd269542ea 100644 (file)
--- a/TOF/AliTOFrawData.cxx
+++ b/TOF/AliTOFrawData.cxx
@@ -146,21 +146,25 @@ AliTOFrawData::AliTOFrawData(const AliTOFrawData& r) :
 AliTOFrawData& AliTOFrawData::operator=(const AliTOFrawData& r)
 {
 
-  // dummy assignment operator
-
-  this->fACQflag    = r.fACQflag;
-  this->fPSbit      = r.fPSbit;
-  this->fTRM        = r.fTRM;
-  this->fTRMchain   = r.fTRMchain;
-  this->fTDC        = r.fTDC;
-  this->fTDCchannel = r.fTDCchannel;
-  this->fLeading    = r.fLeading;
-  this->fTrailing   = r.fTrailing;
-  this->fToT        = r.fToT;
-  this->fTime       = r.fTime;
-  this->fError      = r.fError;
-  this->fDeltaBC      = r.fDeltaBC;
-  this->fL0L1Latency      = r.fL0L1Latency;
+  // Assignment operator
+
+  if (this == &r)
+    return *this;
+
+  TObject::operator=(r);
+  fACQflag    = r.fACQflag;
+  fPSbit      = r.fPSbit;
+  fTRM        = r.fTRM;
+  fTRMchain   = r.fTRMchain;
+  fTDC        = r.fTDC;
+  fTDCchannel = r.fTDCchannel;
+  fLeading    = r.fLeading;
+  fTrailing   = r.fTrailing;
+  fToT        = r.fToT;
+  fTime       = r.fTime;
+  fError      = r.fError;
+  fDeltaBC    = r.fDeltaBC;
+  fL0L1Latency= r.fL0L1Latency;
   return *this;
 
 }
@@ -175,7 +179,7 @@ void AliTOFrawData::Update(Int_t tof, Int_t tot, Int_t leading, Int_t trailing,
   //  to evaluate the time-of-flight and time-over-threshold measurements
   //
 
-  AliDebug(2,Form(" %10.0f %10.0f %10.0f %1i %1i %1i",tof, tot, leading, psBit, acq, errorFlag));
+  AliDebug(2,Form(" %d %d %d %d %d %d",tof, tot, leading, psBit, acq, errorFlag));
 
   if (fLeading!=-1 /*&& fTime==-1*/ && fToT==-1 && trailing!=-1) { // adc