Safer distructor - some checks added.

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

diff --git a/TOF/AliTOFdigit.h b/TOF/AliTOFdigit.h
index bde47e66ef2b86201e7132274c9d4bcbd845e3df..c3f513607198c480879ddefac577dabab28bbb0e 100644 (file)
--- a/TOF/AliTOFdigit.h
+++ b/TOF/AliTOFdigit.h
@@ -16,45 +16,43 @@
 
 #include "AliDigit.h"
 
-class AliTOFGeometry;
-
 class AliTOFdigit : public AliDigit {
 
   //overloading of the streamer << operator
 friend ostream& operator << ( ostream& , const AliTOFdigit&) ;
 
  public:
-  AliTOFdigit(){}
-  AliTOFdigit(Int_t* tracks, Int_t* vol, Float_t* digit);
+ AliTOFdigit();
+  AliTOFdigit(Int_t* tracks, Int_t* vol, Int_t* digit);
 // new ctor for sdigits
-  AliTOFdigit(Int_t sector, Int_t plate, Int_t strip, Int_t padx, Int_t padz, Float_t tdc, Float_t adc);
+  AliTOFdigit(Int_t sector, Int_t plate, Int_t strip, Int_t padx, Int_t padz, Int_t tdc, Int_t adc);
 // copy ctor
   AliTOFdigit(const AliTOFdigit & digit) ;
   virtual ~AliTOFdigit(){}
   void            GetLocation(Int_t* Loc) const;
-  Int_t           GetTotPad(AliTOFGeometry *tofGeom) const;
+  Int_t           GetTotPad() const;
   void            AddTrack(Int_t track);
   // getters for AliTOFdigit object 
-  Float_t GetTdc()    const     {return fTdc;}
-  Float_t GetTdcND()  const     {return fTdcND;}
-  Float_t GetAdc()    const     {return fAdc;}
+  Int_t   GetTdc()    const     {return fTdc;}
+  Int_t   GetTdcND()  const     {return fTdcND;}
+  Int_t   GetAdc()    const     {return fAdc;}
+  Int_t   GetToT()    const     {return fToT;}  //Time Over Threshold
   Int_t   GetSector() const     {return fSector;}
   Int_t   GetPlate()  const     {return fPlate;}
   Int_t   GetStrip()  const     {return fStrip;}
   Int_t   GetPadx()   const     {return fPadx;}
   Int_t   GetPadz()   const     {return fPadz;}
-  Float_t GetToT() const{return fToT;}         //Time Over Threshold
 
   // setters for AliTOFdigit object
-  void    SetTdc(Float_t TDC){fTdc = TDC;}
-  void    SetTdcND(Float_t TDCND){fTdcND = TDCND;}
-  void    SetAdc(Float_t ADC){fAdc = ADC;}
-  void    SetToT(Float_t ToT) {fToT=ToT;}
+  void    SetTdc(Int_t TDC){fTdc = TDC;}
+  void    SetTdcND(Int_t TDCND){fTdcND = TDCND;}
+  void    SetAdc(Int_t ADC){fAdc = ADC;}
+  void    SetToT(Int_t ToT) {fToT=ToT;}
 
   //overloading of ==, + operators (summable digits)
   
   Bool_t operator==(const AliTOFdigit& digit) const;
-  AliTOFdigit& operator+(AliTOFdigit const &digit) ;  
+  AliTOFdigit operator+(const AliTOFdigit &digit) ;  
 
 
 protected:
@@ -63,16 +61,16 @@ protected:
   Int_t   fStrip;   // number of strip
   Int_t   fPadx;    // number of pad along x
   Int_t   fPadz;    // number of pad along z
-  Float_t fTdc;     // tdc channel value, to be multiplied by
+  Int_t   fTdc;     // tdc channel value, to be multiplied by
                    // AliTOFGeometry::TdcBinWidth() to have the
                    // time-of-flight measurement
-  Float_t fTdcND;   // simulated (non slewed) time signal
-  Float_t fAdc;     // adc channel value, to be multiplie by
+  Int_t   fTdcND;   // simulated (non slewed) time signal
+  Int_t   fAdc;     // adc channel value, to be multiplie by
                    // AliTOFSDigitizer::GetAdcBin() to have the
                    // 'charge' measurement
-  Float_t  fToT;    // simulated ToT
+  Int_t   fToT;     // simulated ToT
 
-  ClassDef(AliTOFdigit,3)  // Digit for Time Of Flight
+  ClassDef(AliTOFdigit,5)  // Digit for Time Of Flight
 };
 
 #endif /* ALITOFDIGIT_H */