Corrected a bug in kalman tracking (final parameters and covariances

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

diff --git a/TOF/AliTOFdigit.cxx b/TOF/AliTOFdigit.cxx
index d73b24a16cbb23bbf6f243ca018e3fb84556e153..854b9c7c1b98bc8cbb68c6f241e90a8e4f7c13b1 100644 (file)
--- a/TOF/AliTOFdigit.cxx
+++ b/TOF/AliTOFdigit.cxx
@@ -40,26 +40,60 @@
 ClassImp(AliTOFdigit)
 
 //______________________________________________________________________________
-AliTOFdigit::AliTOFdigit(Int_t *tracks, Int_t *vol,Float_t *digit)
-:AliDigit(tracks)
+AliTOFdigit::AliTOFdigit()
+  :AliDigit(),
+   fSector(-1),
+   fPlate(-1),
+   fStrip(-1),
+   fPadx(-1),
+   fPadz(-1),
+   fTdc(0),
+   fTdcND(0),
+   fAdc(0),
+   fToT(0)
+{
+}
+//______________________________________________________________________________
+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)
 {
 //
 // Constructor of digit object
 //
+
   fSector = vol[0];
   fPlate  = vol[1];
   fStrip  = vol[2];
   fPadx   = vol[3];
   fPadz   = vol[4];
   fTdc    = digit[0];
-  fTdcND  =0;
   fAdc    = digit[1];
-  fToT = 0;
+  fToT    = digit[2];
+  fTdcND  = digit[3];
+
 }
 
 //____________________________________________________________________________
 AliTOFdigit::AliTOFdigit(const AliTOFdigit & digit)
-:AliDigit(digit)
+  :AliDigit(digit),
+   fSector(-1),
+   fPlate(-1),
+   fStrip(-1),
+   fPadx(-1),
+   fPadz(-1),
+   fTdc(0),
+   fTdcND(0),
+   fAdc(0),
+   fToT(0)
 {
   // 
   // copy ctor for AliTOFdigit object
@@ -82,7 +116,16 @@ AliTOFdigit::AliTOFdigit(const AliTOFdigit & digit)
 
 //______________________________________________________________________________
 AliTOFdigit::AliTOFdigit(Int_t sector, Int_t plate, Int_t strip, Int_t padx,
-Int_t padz, Float_t tdc, Float_t adc)
+                        Int_t padz, Int_t tdc, Int_t adc):
+   fSector(-1),
+   fPlate(-1),
+   fStrip(-1),
+   fPadx(-1),
+   fPadz(-1),
+   fTdc(0),
+   fTdcND(0),
+   fAdc(0),
+   fToT(0)
 {
 //
 // Constructor for sdigit
@@ -114,7 +157,7 @@ void AliTOFdigit::GetLocation(Int_t *Loc) const
 }
 
 //______________________________________________________________________________
-Int_t AliTOFdigit::GetTotPad(AliTOFGeometry *tofGeom) const
+Int_t AliTOFdigit::GetTotPad() const
 {
 //
 // Get the "total" index of the pad inside a Sector
@@ -128,16 +171,16 @@ Int_t AliTOFdigit::GetTotPad(AliTOFGeometry *tofGeom) const
     //before = 0;
     break;
   case 1:
-    before = tofGeom->NStripC();
+    before = AliTOFGeometry::NStripC();
     break;
   case 2:
-    before = tofGeom->NStripC() +   AliTOFGeometry::NStripB();
+    before = AliTOFGeometry::NStripC() +   AliTOFGeometry::NStripB();
     break;
   case 3:
-    before = tofGeom->NStripC() +   AliTOFGeometry::NStripB() + AliTOFGeometry::NStripA();
+    before = AliTOFGeometry::NStripC() +   AliTOFGeometry::NStripB() + AliTOFGeometry::NStripA();
     break;
   case 4:
-    before = tofGeom->NStripC() + 2*AliTOFGeometry::NStripB() + AliTOFGeometry::NStripA();
+    before = AliTOFGeometry::NStripC() + 2*AliTOFGeometry::NStripB() + AliTOFGeometry::NStripA();
     break;
   }
   
@@ -186,7 +229,7 @@ Bool_t AliTOFdigit::operator==(AliTOFdigit const &digit) const
 }
 
 //______________________________________________________________________________
-AliTOFdigit& AliTOFdigit::operator+(AliTOFdigit const &digit)
+AliTOFdigit AliTOFdigit::operator+(const AliTOFdigit &digit)
 {
 //
 // Overloading of Sum operator
@@ -209,11 +252,13 @@ if  (fSector==digit.fSector &&
 //______________________________________________________________________________
 ostream& operator << (ostream& out, const AliTOFdigit &digit)
 {
-//
-// Output streamer: output of the digit data
-//
-out << "Sector " << digit.fSector << ", Plate " << digit.fPlate << ", Strip " << digit.fStrip << endl;
-out << "Padx" << digit.fPadx << ", Padz " << digit.fPadz << endl;
-out << "TDC " << digit.fTdc << ", ADC "<< digit.fAdc << endl;
-return out;
+  //
+  // Output streamer: output of the digit data
+  //
+
+  out << "Sector " << digit.fSector << ", Plate " << digit.fPlate << ", Strip " << digit.fStrip << endl;
+  out << "Padx" << digit.fPadx << ", Padz " << digit.fPadz << endl;
+  out << "TDC " << digit.fTdc << ", ADC "<< digit.fAdc << endl;
+
+  return out;
 }