new cuts and tasks added

[u/mrichter/AliRoot.git] / TOF / AliTOF.h

diff --git a/TOF/AliTOF.h b/TOF/AliTOF.h
index 7000dafaeb7c6cf744177e61102d14de8c3aa2b3..7c74a3f0b1c20da68403e942a8fb1eecb657da0d 100644 (file)
--- a/TOF/AliTOF.h
+++ b/TOF/AliTOF.h
@@ -20,7 +20,7 @@
 #include "AliDetector.h"
 
 #include "AliTOFTrigger.h"
-//#include "AliTOFDDLRawData.h"
+#include "AliTOFDDLRawData.h"
 
 class TDirectory;
 class TFile;
@@ -29,7 +29,6 @@ class TString ;
 class TTask ;
 
 class AliTOFGeometry;
-class AliTOFDDLRawData;
 
 class AliTOF : public AliDetector {
 public:
@@ -72,11 +71,13 @@ public:
   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 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;}
@@ -112,13 +113,14 @@ protected:
   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
-  static AliTOFDDLRawData fgTOFRawWriter; // AliTOFDDLRawStream static variable
+
+  AliTOFDDLRawData fTOFRawWriter; // AliTOFDDLRawData variable
  
 private:
   AliTOF(const AliTOF &source); // copy constructor
   AliTOF& operator=(const AliTOF &source); // ass. op.
 
-  ClassDef(AliTOF,9)  // Time Of Flight base class
+  ClassDef(AliTOF,11)  // Time Of Flight base class
 };
  
 #endif /* ALITOF_H */