X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRD.h;h=64abc4b32a2d15ea8bf409e1d733853c3a6de07e;hb=c8f4be1ae5ee592301387577dd27918f92305a4d;hp=99b74a0a83c16dc90b67735193446206dcb11903;hpb=6244debe5b3eb4499eff1265a6ff5f1356db5e7e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TRD/AliTRD.h b/TRD/AliTRD.h
index 99b74a0a83c..64abc4b32a2 100644
--- 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,6 @@ class AliDigit;
 class AliTRDhit;
 class AliTRDsim;
 class AliTRDgeometry;
-class AliTRDdataArrayI;
 
 //_____________________________________________________________________________
 class AliTRD : public AliDetector {
@@ -33,26 +35,27 @@ 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       AddRecPoint(Float_t *pos, Int_t *digits
-                               , Int_t det, Float_t amp, Int_t *tracks);
+  virtual void       AddHit(Int_t track, Int_t det, Float_t *hits, Int_t q, Bool_t inDrift); 
   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, char *file=0);     
+  virtual void       MakeBranch(Option_t* option);
   virtual void       ResetDigits();     
-  virtual void       ResetRecPoints();
   virtual void       StepManager() = 0; 
   virtual void       SetTreeAddress();
 
+  virtual void       StepManagerErmilova()      = 0;
+  virtual void       StepManagerGeant()         = 0;
+  virtual void       StepManagerFixedStep()     = 0;
+  virtual void       SelectStepManager(Int_t t) = 0;
+  virtual void       SetStepSize(Double_t s)    = 0;
+
   virtual void       SetGasMix(Int_t imix = 0);
   virtual void       SetHits()             {};
   virtual void       SetPHOShole();
@@ -71,10 +74,12 @@ class AliTRD : public AliDetector {
   virtual Int_t      GetSensPlane() const       = 0;
   virtual Int_t      GetSensSector() const      = 0;
   virtual Int_t      GetSensSectorRange() const = 0; 
-
+ 
   virtual void       Hits2Digits();
   virtual void       Hits2SDigits();
+  virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const; 
   virtual void       SDigits2Digits();
+  virtual void       Digits2Raw();
 
   virtual AliTRDsim *CreateTR()     = 0;
   virtual AliTRDsim *GetTR() const  = 0;
@@ -85,19 +90,13 @@ class AliTRD : public AliDetector {
 
   AliTRDgeometry      *fGeometry;           //  The TRD geometry
 
-  TObjArray           *fRecPoints;          //  Array of reconstructed points
-  Int_t                fNRecPoints;         //! Number of reconstructed points
-
   Float_t              fGasDensity;         //  The density of the drift gas
   Float_t              fFoilDensity;        //  The density of the entrance window foil
 
   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,2)                        //  Transition Radiation Detector base class
+  ClassDef(AliTRD,7)                        //  Transition Radiation Detector base class
 
 };