X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=TRD%2FAliTRD.h;h=08bebf579771c6ed8c886c3f7b67bf99eb9fb16e;hp=057dec76d155c5a158069dd2bd6cacb914906e2c;hb=93fd278f1ccf1b4dbef5472a77f63cbf2d28b39e;hpb=bdbb05bb7ec7474aa9a07ec884d702e042cb7001

diff --git a/TRD/AliTRD.h b/TRD/AliTRD.h
index 057dec76d15..08bebf57977 100644
--- a/TRD/AliTRD.h
+++ b/TRD/AliTRD.h
@@ -5,113 +5,75 @@
 
 /* $Id$ */
 
-////////////////////////////////////////////////
-//  Manager and hits classes for set: TRD     //
-////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+//                                                                        //
+//  Manager and hits classes for set: TRD                                 //
+//                                                                        //
+////////////////////////////////////////////////////////////////////////////
 
-#include <TLorentzVector.h>
-#include "AliDetector.h"
-#include <TVirtualMC.h>
 
-class TFile;
-class TLorentzVector;
+#include "AliDetector.h"
+#include "AliTRDTrigger.h"
 
-class AliRun;
-class AliDigit;
+class AliRawReader;
 
-class AliTRDhit;
-class AliTRDsim;
 class AliTRDgeometry;
-class AliTRDtrackHits;
+class AliTriggerDetector;
 
-//_____________________________________________________________________________
 class AliTRD : public AliDetector {
 
  public:
 
   AliTRD();
   AliTRD(const char *name, const char *title);
-  AliTRD(const AliTRD &trd);
-  virtual           ~AliTRD();
-
-          AliTRD    &operator=(const AliTRD &trd);
-
-  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() const;
-  Int_t              DistancetoPrimitive(Int_t px, Int_t py) const;
-  virtual void       LoadPoints(Int_t track);    
-  virtual void       Init();
-  virtual Int_t      IsVersion() const = 0;
-  virtual void       MakeBranch(Option_t* option);
-  virtual void       ResetDigits();     
-  virtual void       StepManager() = 0; 
-  virtual void       SetTreeAddress();
-
-  virtual void       SetGasMix(Int_t imix = 0);
-  virtual void       SetHits()             {};
-  virtual void       SetPHOShole();
-  virtual void       SetRICHhole();
-  virtual void       SetDrawTR(Int_t idraw = 1)     { fDrawTR      = idraw; };
-  virtual void       SetDisplayType(Int_t type = 0) { fDisplayType = type;  };
-
-  AliTRDgeometry    *GetGeometry() const            { return fGeometry; };
-
-  virtual void       SetSensChamber(Int_t ichamber)              = 0;
-  virtual void       SetSensPlane(Int_t iplane)                  = 0;
-  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;
-  virtual Int_t      GetSensSectorRange() const = 0; 
- 
-  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);
+  virtual         ~AliTRD();
 
- protected:
+  virtual void     Init();
+  virtual Int_t    IsVersion() const          = 0;
+  virtual void     ResetDigits();     
+
+  virtual void     CreateGeometry();
+  virtual void     CreateMaterials();
+
+  virtual void     Hits2Digits();
+  virtual void     Hits2SDigits();
+  virtual void     SDigits2Digits();
+  virtual void     Digits2Raw();
+  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, Float_t time, Bool_t inDrift); 
 
-  Int_t                fGasMix;             //  Gas mixture. 0: Xe/Isobutane 1: Xe/CO2
+  virtual void     SetTreeAddress();
 
-  AliTRDgeometry      *fGeometry;           //  The TRD geometry
+  virtual void     StepManager()              = 0; 
 
-  Float_t              fGasDensity;         //  The density of the drift gas
-  Float_t              fFoilDensity;        //  The density of the entrance window foil
+  virtual void     SetStepSize(Double_t s)    = 0;
+  virtual void     SetHits()                             { };
+  virtual void     SetTR(Bool_t )             = 0;
 
-  Int_t                fDrawTR;             //  Switches marking the TR photons in the display
-  Int_t                fDisplayType;        //  Display type (0: normal, 1: detailed) 
+  virtual Bool_t   GetTR() const              = 0;
 
+          AliTRDgeometry     *GetGeometry() const           { return fGeometry; };
+  virtual AliDigitizer       *CreateDigitizer(AliRunDigitizer *manager) const; 
+  virtual AliLoader          *MakeLoader(const char* topfoldername);
+  virtual AliTriggerDetector *CreateTriggerDetector() const { return new AliTRDTrigger(); }
 
-  AliTRDtrackHits     *fTrackHits;          //! Compressed hits for a given track 
-  Int_t                fHitType;            //  Switch for the different hit data structures
+ 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
+  Float_t               fGasNobleFraction;     //  The fraction of noble gas in the mixture
+
+ private:
+
+  AliTRD(const AliTRD &trd);
+  AliTRD  &operator=(const AliTRD &trd);
 
-  ClassDef(AliTRD,6)                        //  Transition Radiation Detector base class
+  ClassDef(AliTRD,11)                          //  Transition Radiation Detector base class
 
 };