effc++ warnings

[u/mrichter/AliRoot.git] / TRD / AliTRDcluster.h

diff --git a/TRD/AliTRDcluster.h b/TRD/AliTRDcluster.h
index a14561936553d76afe12c6286f1e7e6318a491f4..985ca6b9a4e1544eceeba155a20a6d768902cb23 100644 (file)
--- a/TRD/AliTRDcluster.h
+++ b/TRD/AliTRDcluster.h
@@ -5,74 +5,61 @@
 
 /* $Id$ */
 
+///////////////////////////////////////////////////////////////////////////////
+//                                                                           //
+//  TRD cluster                                                              //
+//                                                                           //
+///////////////////////////////////////////////////////////////////////////////
 
 #include "AliCluster.h"  
 
-class AliTRDrecPoint;
-
 class AliTRDcluster : public AliCluster {
 
  public:
 
   AliTRDcluster();
+  AliTRDcluster(Int_t det, Float_t q, Float_t *pos, Float_t *sig
+              , Int_t *tracks, Char_t npads, Short_t *signals
+              , UChar_t col, UChar_t row, UChar_t time
+              , Char_t timebin, Float_t center, UShort_t volid);
   AliTRDcluster(const AliTRDcluster &c);
-  AliTRDcluster(const AliTRDrecPoint &p);
+  virtual ~AliTRDcluster() {};
 
-  virtual void    AddTrackIndex(Int_t *i); 
+  virtual void     AddTrackIndex(Int_t *i); 
 
+          Bool_t   IsInChamber() const          { return TestBit(1);       }
+          Bool_t   IsShared() const             { return TestBit(2);       }
+          Bool_t   IsUsed() const               { return (fQ < 0) ? kTRUE : kFALSE; }
+          
+          void     Use(Int_t = 0)               { fQ = -fQ;                }
+    
+          Int_t    GetDetector() const          { return fDetector;        }
+          Int_t    GetLocalTimeBin() const      { return fLocalTimeBin;    }
+          Float_t  GetQ() const                 { return fQ;               }
+          Int_t    GetNPads() const             { return fNPads;           }
+          Float_t  GetCenter() const            { return fCenter;          }
+         Int_t    GetPadCol() const            { return fPadCol;          }
+         Int_t    GetPadRow() const            { return fPadRow;          }
+          Int_t    GetPadTime() const           { return fPadTime;         }
+          Short_t *GetSignals()                 { return fSignals;         }
+          Float_t  GetSumS() const;
 
-  Int_t   IsUsed() const      { return (fQ < 0) ? 1 : 0; }
-  void    Use(Int_t = 0)               { fQ = -fQ; }
-  
-  Bool_t  From2pad() const    { return TestBit(k2pad); }
-  Bool_t  From3pad() const    { return TestBit(k3pad); }
-  Bool_t  From4pad() const    { return TestBit(k4pad); }
-  Bool_t  From5pad() const    { return TestBit(k5pad); }
-  Bool_t  FromLarge() const   { return TestBit(kLarge);}
-  Bool_t  Isolated() const    { return (TestBit(k2pad) || TestBit(k3pad)); }
- 
-  virtual void    SetDetector(Int_t d) { fDetector  = d; }
-  void    SetLocalTimeBin(Int_t t)     { fTimeBin   = t; }
-  void    SetQ(Float_t q)              { fQ         = q; }
-  virtual void    SetX(Float_t x)      { fX         = x; }
-  void    SetSignals(Short_t *signals);
-  
-  virtual Int_t   GetDetector() const  { return fDetector; }
-  Int_t   GetLocalTimeBin() const      { return fTimeBin;  }
-  Float_t GetQ() const                 { return fQ; }
-  virtual Float_t GetX() const         { return fX; }
+          void     SetLocalTimeBin(Char_t t)    { fLocalTimeBin = t;       }
+          void     SetInChamber(Bool_t in = kTRUE)      {SetBit(1, in);}
 
-  void    Set2pad()                    { SetBit(k2pad); fNPads=2; }
-  void    Set3pad()                    { SetBit(k3pad); fNPads=3; }
-  void    Set4pad()                    { SetBit(k4pad); fNPads=4; }
-  void    Set5pad()                    { SetBit(k5pad); fNPads=5; }
-  void    SetLarge()                   { SetBit(kLarge);fNPads=6; }
-  Int_t   GetNPads() const {return fNPads;}
-  void    SetCenter(Float_t center){fCenter =center;}
-  Float_t GetCenter() const {return fCenter;}
-  Float_t GetSumS() const;
-  Float_t GetCenterS() const;
  protected:
-
-  enum {
-    k2pad  = 0x00000001,   // 2 pad cluster
-    k3pad  = 0x00000002,   // 3 pad cluster
-    k4pad  = 0x00000004,   // 4 pad cluster
-    k5pad  = 0x00000008,   // 5 pad cluster
-    kLarge = 0x00000016    // Large cluster
-  };
   
-  Int_t   fDetector;       // TRD detector number
-  Float_t  fX;              // local (in this detector) x pos (first order proportional to time bin (depends on local drift velocity!), (x=0 corresponds timebin=0, thus x increases TOWARDS interaction point )
-  Char_t    fTimeBin;        // Time bin number within the detector
-  Float_t   fQ;              // amplitude 
-  Char_t    fNPads;          // number of pads in cluster
-  Float_t   fCenter;         // center of the cluster relative to the pad 
-  Short_t   fSignals[7];     // signals in the cluster
+          Int_t   fDetector;       //  TRD detector number
+          Char_t  fLocalTimeBin;   //  T0-calibrated time bin number
+          Float_t fQ;              //  Amplitude 
+          Char_t  fNPads;          //  Number of pads in cluster
+          Float_t fCenter;         //  Center of the cluster relative to the pad 
+         UChar_t fPadCol;         //  Central pad number in column direction
+         UChar_t fPadRow;         //  Central pad number in row direction
+         UChar_t fPadTime;        //  Uncalibrated time bin number
+          Short_t fSignals[7];     //  Signals in the cluster
   
-  ClassDef(AliTRDcluster,3) // Cluster for the TRD
+  ClassDef(AliTRDcluster,5)        //  Cluster for the TRD
  
 };
-
-
 #endif