Adding renormalisation of the combinatotial bgk for peripheral events

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

diff --git a/TRD/AliTRD.h b/TRD/AliTRD.h
index 36c1f6f7d8c214d64d0455f4a670efbcad296808..8e460ffd1cf518337f6f9038e037b080f18ff8ff 100644 (file)
--- a/TRD/AliTRD.h
+++ b/TRD/AliTRD.h
@@ -9,9 +9,12 @@
 //  Manager and hits classes for set: TRD     //
 ////////////////////////////////////////////////
 
+#include <TLorentzVector.h>
 #include "AliDetector.h"
+#include <TVirtualMC.h>
 
 class TFile;
+class TLorentzVector;
 
 class AliRun;
 class AliDigit;
@@ -19,7 +22,7 @@ class AliDigit;
 class AliTRDhit;
 class AliTRDsim;
 class AliTRDgeometry;
-class AliTRDdataArrayI;
+class AliTRDtrackHits;
 
 //_____________________________________________________________________________
 class AliTRD : public AliDetector {
@@ -33,22 +36,20 @@ class AliTRD : public AliDetector {
 
           AliTRD    &operator=(const AliTRD &trd);
 
-  virtual void       AddHit(Int_t track, Int_t det, Float_t *hits, Int_t q);
-  virtual void       AddDigit(Int_t *digits, Int_t *amp);    
-  virtual void       AddCluster(Float_t *pos, Int_t *digits
-                              , Int_t det, Float_t amp, Int_t *tracks
-                              , Float_t sigmaY2, Int_t iType);
+  virtual void       AddHit(Int_t track, Int_t det, Float_t *hits, Int_t q, Bool_t inDrift); 
+  virtual void       AddCluster(Float_t *pos, Int_t det, Float_t amp, Int_t *tracks
+                              , Float_t *sig, Int_t iType);
   virtual void       BuildGeometry();
   virtual void       Copy(TObject &trd);
   virtual void       CreateGeometry();
   virtual void       CreateMaterials();
-  virtual void       DrawModule();
-  Int_t              DistancetoPrimitive(Int_t px, Int_t py);
+  virtual void       DrawModule() const;
+  Int_t              DistancetoPrimitive(Int_t px, Int_t py) const;
   virtual void       LoadPoints(Int_t track);    
   TObjArray         *RecPoints() const              { return fRecPoints;   };
   virtual void       Init();
   virtual Int_t      IsVersion() const = 0;
-  virtual void       MakeBranch(Option_t* option, const char *file=0);     
+  virtual void       MakeBranch(Option_t* option);
   virtual void       ResetDigits();     
   virtual void       ResetRecPoints();
   virtual void       StepManager() = 0; 
@@ -68,6 +69,10 @@ class AliTRD : public AliDetector {
   virtual void       SetSensSector(Int_t isector)                = 0;
   virtual void       SetSensSector(Int_t isector, Int_t nsector) = 0;
 
+  virtual void       SetHitTypeStandard()           { fHitType = 1; };
+  virtual void       SetHitTypeCompressed()         { fHitType = 2; };
+  virtual void       SetHitTypeBoth()               { fHitType = 3; };
+
   virtual Int_t      GetSensChamber() const     = 0;
   virtual Int_t      GetSensPlane() const       = 0;
   virtual Int_t      GetSensSector() const      = 0;
@@ -75,11 +80,25 @@ class AliTRD : public AliDetector {
  
   virtual void       Hits2Digits();
   virtual void       Hits2SDigits();
+  virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const; 
   virtual void       SDigits2Digits();
 
   virtual AliTRDsim *CreateTR()     = 0;
   virtual AliTRDsim *GetTR() const  = 0;
 
+  virtual void       MakeBranch2(Option_t *opt=" ", const char *file=0); 
+  virtual void       SetTreeAddress2();
+  virtual void       AddHit2(Int_t track, Int_t det, Float_t *hits, Int_t q, Bool_t inDrift);
+  virtual void       ResetHits();
+
+  virtual AliHit*    FirstHit(Int_t track);
+  virtual AliHit*    NextHit();
+  virtual AliHit*    FirstHit2(Int_t track);
+  virtual AliHit*    NextHit2();
+
+  virtual void       FinishPrimary();
+  virtual void       RemapTrackHitIDs(Int_t *map);
+
  protected:
 
   Int_t                fGasMix;             //  Gas mixture. 0: Xe/Isobutane 1: Xe/CO2
@@ -95,10 +114,11 @@ class AliTRD : public AliDetector {
   Int_t                fDrawTR;             //  Switches marking the TR photons in the display
   Int_t                fDisplayType;        //  Display type (0: normal, 1: detailed) 
 
-  AliTRDdataArrayI    *fDigitsArray;        //! Digits array
-  AliTRDdataArrayI    *fDictionaryArray[3]; //! Dictionary array 
 
-  ClassDef(AliTRD,3)                        //  Transition Radiation Detector base class
+  AliTRDtrackHits     *fTrackHits;          //! Compressed hits for a given track 
+  Int_t                fHitType;            //  Switch for the different hit data structures
+
+  ClassDef(AliTRD,6)                        //  Transition Radiation Detector base class
 
 };