X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRD.h;h=fee62a80f74d2c3ca3528d26a425f230eae699ec;hb=6d839a5c0a62f1cc2c7d105a2de6b9bae0fa4734;hp=6d3028d68532aedfd7af5e88fa1009c82814be6f;hpb=e939a978a98d29901b86bdb02cdcaf5157e717de;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TRD/AliTRD.h b/TRD/AliTRD.h
index 6d3028d6853..fee62a80f74 100644
--- a/TRD/AliTRD.h
+++ b/TRD/AliTRD.h
@@ -11,22 +11,14 @@
 //                                                                        //
 ////////////////////////////////////////////////////////////////////////////
 
-#include <TLorentzVector.h>
-#include <TVirtualMC.h>
 
 #include "AliDetector.h"
+#include "AliTRDTrigger.h"
 
-#include "AliTRDTriggerL1.h"
+class AliRawReader;
 
-class TFile;
-class TLorentzVector;
-
-class AliRun;
-class AliDigit;
-
-class AliTRDhit;
-class AliTRDsim;
 class AliTRDgeometry;
+class AliTriggerDetector;
 
 class AliTRD : public AliDetector {
 
@@ -40,57 +32,48 @@ class AliTRD : public AliDetector {
   virtual Int_t    IsVersion() const          = 0;
   virtual void     ResetDigits();     
 
-  virtual void     BuildGeometry();
   virtual void     CreateGeometry();
   virtual void     CreateMaterials();
-  virtual void     DrawModule() const;
-  virtual Int_t    DistancetoPrimitive(Int_t px, Int_t py);
-  virtual void     LoadPoints(Int_t track);    
 
   virtual void     Hits2Digits();
   virtual void     Hits2SDigits();
   virtual void     SDigits2Digits();
   virtual void     Digits2Raw();
-  virtual void     MakeBranch(Option_t *option);
+  virtual Bool_t   Raw2SDigits(AliRawReader* rawReader);
 
   virtual void     AddHit(Int_t, Int_t*, Float_t*)       { }; 
-  virtual void     AddHit(Int_t track, Int_t det, Float_t *hits, Int_t q, Bool_t inDrift); 
+  virtual void     AddHit(Int_t track, Int_t det, Float_t *hits
+                        , Int_t q, Float_t time, Bool_t inDrift); 
 
   virtual void     SetTreeAddress();
 
   virtual void     StepManager()              = 0; 
-  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     SetHits()                             { };
-  virtual void     SetDrawTR(Int_t idraw = 1)            { fDrawTR      = idraw;         };
-  virtual void     SetDisplayType(Int_t type = 0)        { fDisplayType = type;          };
   virtual void     SetTR(Bool_t )             = 0;
 
   virtual Bool_t   GetTR() const              = 0;
-  AliTRDgeometry  *GetGeometry() const                   { return fGeometry;             };
-
-  virtual AliDigitizer    *CreateDigitizer(AliRunDigitizer *manager) const; 
-  virtual AliTRDTriggerL1 *CreateTriggerDetector() const { return new AliTRDTriggerL1(); };
 
+          AliTRDgeometry     *GetGeometry() const           { return fGeometry; };
+  virtual AliDigitizer       *CreateDigitizer(AliDigitizationInput* digInput) const; 
+  virtual AliLoader          *MakeLoader(const char* topfoldername);
+  virtual AliTriggerDetector *CreateTriggerDetector() const { return new AliTRDTrigger(); }
+  void    SetPrimaryIonisation(Bool_t flag = kTRUE) {fPrimaryIonisation = flag;}  
  protected:
 
-  AliTRDgeometry  *fGeometry;           //  The TRD geometry
-
-          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) 
+  AliTRDgeometry       *fGeometry;             //  The TRD geometry
 
+  Float_t               fGasDensity;           //  The density of the drift gas
+  Float_t               fFoilDensity;          //  The density of the entrance window foil
+  Float_t               fGasNobleFraction;     //  The fraction of noble gas in the mixture
+  Bool_t                fPrimaryIonisation;    //  switch between Fluka(true) and geant3(false)
  private:
+
   AliTRD(const AliTRD &trd);
   AliTRD  &operator=(const AliTRD &trd);
 
-  ClassDef(AliTRD,9)                    //  Transition Radiation Detector base class
+  ClassDef(AliTRD,12)                          //  Transition Radiation Detector base class
 
 };