X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=inline;f=TOF%2FAliTOF.h;h=7eb64cbc36ca0e323fb86f85d3c180c08988d791;hb=afc9ccae6995d8ed280de27b8859033f196cb620;hp=ed758287745a36c4f35c928ed15bec2d4fc80461;hpb=0e46b9aedf22cba61c60921b7b19fb76d89a7a2e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOF.h b/TOF/AliTOF.h
index ed758287745..7eb64cbc36c 100644
--- a/TOF/AliTOF.h
+++ b/TOF/AliTOF.h
@@ -20,12 +20,12 @@
 #include "AliDetector.h"
 
 #include "AliTOFTrigger.h"
+#include "AliTOFDDLRawData.h"
 
 class TDirectory;
 class TFile;
 class TFolder ;
 class TString ;  
-class TTask ;
 
 class AliTOFGeometry;
 
@@ -33,8 +33,6 @@ class AliTOF : public AliDetector {
 public:
   AliTOF(); 
   AliTOF(const char *name, const char *title, Option_t *option="noTimeZero");
-  AliTOF(const AliTOF &source); // copy constructor
-  AliTOF& operator=(const AliTOF &source); // ass. op.
 
   virtual ~AliTOF() ;
 // getters for AliTOF object status
@@ -45,8 +43,8 @@ public:
   virtual void    AddHit(Int_t track, Int_t* vol, Float_t* hits);
   virtual void    AddT0Hit(Int_t track, Int_t* vol, Float_t* hits);
   virtual void    AddDigit(Int_t* /*tracks*/, Int_t* /*vol*/) {};
-  virtual void    AddDigit(Int_t* tracks, Int_t* vol, Float_t* digits);
-  virtual void    AddSDigit(Int_t tracknum, Int_t* vol, Float_t* digits);
+  virtual void    AddDigit(Int_t* tracks, Int_t* vol, Int_t* digits);
+  virtual void    AddSDigit(Int_t tracknum, Int_t* vol, Int_t* digits);
   virtual void    CreateGeometry();
   virtual void    CreateMaterials(){};
   virtual void    Init();
@@ -55,33 +53,34 @@ public:
   virtual void    Makehits(Bool_t hits=1);
   virtual void    FinishEvent();
   virtual Int_t   IsVersion() const =0;
-  Int_t           DistancetoPrimitive(Int_t px, Int_t py);
   virtual void    StepManager()=0;
   virtual void    TOFpc(Float_t /*xtof*/, Float_t /*ytof*/, Float_t /*zlenC*/,
                         Float_t /*zlenB*/, Float_t /*zlenA*/, Float_t /*ztof0*/){};
   virtual void    TOFpc(Float_t /*xtof*/,  Float_t /*ytof*/, Float_t /*zlenA*/,
 			Float_t /*zlenB*/){};
-  virtual void    DrawModule() const;
-  virtual void    DrawDetectorModules() const {};
-  virtual void    DrawDetectorStrips() const {};
-  //virtual void   DrawDetectorModulesinFrame()=0;
-  //virtual void   DrawDetectorStripsinFrame()=0;
+  virtual void    TOFpc(Float_t /*xtof*/,  Float_t /*ytof*/, Float_t /*zlenA*/){};
           void    CreateTOFFolders();
-  Bool_t    CheckOverlap(Int_t* vol, Float_t* digit, Int_t Track);
+  Bool_t    CheckOverlap(const Int_t * const vol, Int_t* digit, Int_t Track);
   //virtual void    Hits2Digits();   
   virtual void    Hits2SDigits();
   virtual void    Hits2SDigits(Int_t evNumber1, Int_t evNumber2);
-  virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const; 
-  virtual void    Digits2Reco() {};
-          void    Digits2Raw ();
-          void    Raw2Digits (){};
-  virtual void    ResetHits();
-  virtual void    ResetDigits();
+  virtual AliDigitizer* CreateDigitizer(AliDigitizationInput* digInput) const; 
+  virtual void    Digits2Reco () {};
+          void    Digits2Raw  ();
+	  void    Raw2Digits  () {};
+	  void    Raw2Digits  (AliRawReader* rawReader);
+	  Bool_t  Raw2SDigits (AliRawReader* rawReader);
+  virtual void    ResetHits   ();
+  virtual void    ResetDigits ();
   virtual void    ResetSDigits();
   TClonesArray *SDigits() const {return fSDigits;}
   TClonesArray *ReconParticles() const {return fReconParticles;}
   void RecreateSDigitsArray();
   void CreateSDigitsArray();
+  virtual void   SetTOFSectors(Int_t * const sectors);
+  virtual void   GetTOFSectors(Int_t *sectors) const;
+  virtual void   SetTOFHoles(Bool_t holes) { fTOFHoles = holes; };
+  virtual Bool_t GetTOFHoles() const { return fTOFHoles; };
   AliTOFGeometry *GetGeometry() const { return fTOFGeometry; }; 
 
   // Trigger
@@ -90,8 +89,6 @@ public:
 
 protected:
   TFolder* fFGeom ;       //  Folder that holds the Geometry definition
-  TTask*   fDTask ;       //  TOF Digitizer container
-  TTask*   fReTask;       //  TOF Reconstructioner container
   TClonesArray* fSDigits; //! List of summable digits
   Int_t   fNSDigits;      //! Number of sdigits
   TClonesArray* fReconParticles; // List of reconstructed particles
@@ -105,11 +102,17 @@ protected:
   Int_t   fIdSens;     // The unique identifier for sensitive volume FPAD 
 
   Bool_t  fTZero;      // Flag indicating if T0 is used
+  Int_t fTOFSectors[18]; // Selecting TOF Sectors to be simulated
+  Bool_t fTOFHoles; // Selecting geometry with and w/o holes
   AliTOFGeometry *fTOFGeometry; //The TOF Geometry parameters
+
+  AliTOFDDLRawData fTOFRawWriter; // AliTOFDDLRawData variable
  
 private:
+  AliTOF(const AliTOF &source); // copy constructor
+  AliTOF& operator=(const AliTOF &source); // ass. op.
 
-  ClassDef(AliTOF,7)  // Time Of Flight base class
+  ClassDef(AliTOF,12)  // Time Of Flight base class
 };
  
 #endif /* ALITOF_H */