Merge branch 'master' of https://git.cern.ch/reps/AliRoot

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

diff --git a/TOF/AliTOFdigit.cxx b/TOF/AliTOFdigit.cxx
index bde6b425dd647ff944a50a7533e77947495c4b48..47a3b80f7ffc0104f8e504b48fa958f0ff9e182e 100644 (file)
--- a/TOF/AliTOFdigit.cxx
+++ b/TOF/AliTOFdigit.cxx
@@ -37,6 +37,8 @@
 #include "AliTOFdigit.h"
 #include "AliTOFGeometry.h"
 
+using std::endl;
+using std::cout;
 ClassImp(AliTOFdigit)
 
 //______________________________________________________________________________
@@ -56,44 +58,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 +93,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;
 }
    
 //______________________________________________________________________________
@@ -184,8 +157,7 @@ Int_t AliTOFdigit::GetTotPad() const
     break;
   }
   
-  Int_t pad = 2*fPadx + fPadz;
-  //Int_t pad = fPadx+AliTOFGeometry::NpadX()*fPadz;
+  Int_t pad = AliTOFGeometry::NpadZ()*fPadx + fPadz;
   Int_t strip  = fStrip + before;
   Int_t padTot = AliTOFGeometry::NpadXStrip()*strip + pad;
 
@@ -199,13 +171,13 @@ void AliTOFdigit::AddTrack(Int_t track)
 // Add a new and different track to the digit 
 //
   if (track==fTracks[0] || track==fTracks[1] || track==fTracks[2]) return;
-   if (fTracks[1]==0){
+   if (fTracks[1]==-1)
       fTracks[1] = track;
-   }else if (fTracks[2]==0){
+   else if (fTracks[2]==-1)
       fTracks[2] = track;
-   }else{
-   // printf("AliTOFdigit::AddTrack ERROR: Too many Tracks (>3) \n");
-   }
+   else
+     printf("W-AliTOFdigit::AddTrack: Too many tracks (>3) that contribute to the same TOF digit\n");
+
 }
 
 // Overloading of Streaming, Sum and Comparison operators
@@ -250,7 +222,7 @@ if  (fSector==digit.fSector &&
 }
 
 //______________________________________________________________________________
-ostream& operator << (ostream& out, const AliTOFdigit &digit)
+ostream& operator << (ostream & out, const AliTOFdigit &digit)
 {
   //
   // Output streamer: output of the digit data