Class version incremented

[u/mrichter/AliRoot.git] / FMD / AliFMD.h

diff --git a/FMD/AliFMD.h b/FMD/AliFMD.h
index 58f4d5e5dda51b88196b0324dbe25a094802cabd..7466206578699444fa198915dd837d9aa4a27e9e 100644 (file)
--- a/FMD/AliFMD.h
+++ b/FMD/AliFMD.h
@@ -7,22 +7,18 @@
 //  Manager and hits classes for set:Si-FMD     //
 ////////////////////////////////////////////////
  
+#include "TBranch.h"
 #include "AliDetector.h"
-#include "TString.h"
-#include "AliFMDMerger.h" 
-#include "AliFMDSDigitizer.h" 
- class TFile;
- class TTree;
- class AliFMDMerger;
- class AliFMD : public AliDetector {
+
+class TClonesArray;
+class AliFMD : public AliDetector {
  
 public:
   AliFMD();
   AliFMD(const char *name, const char *title);
   virtual       ~AliFMD(); 
-  virtual void   AddHit(Int_t, Int_t*, Float_t*);
-  virtual void   AddDigit(Int_t*);
-  virtual void   AddSDigit(Int_t*);
+  virtual void   AddHit(Int_t track, Int_t * vol, Float_t * hits);
+  virtual void   AddDigit(Int_t* digits);
   virtual void   BuildGeometry();
   virtual void   CreateGeometry() {}
   virtual void   CreateMaterials()=0; 
@@ -30,29 +26,25 @@ public:
   virtual Int_t  IsVersion() const =0;
   virtual void   Init();
   virtual void   MakeBranch(Option_t *opt=" ",const char *file=0);
+  virtual void   MakeBranchInTreeD(TTree *treeD, const char *file=0);
   virtual void   SetTreeAddress();
   virtual void   ResetHits();
   virtual void   ResetDigits();
   virtual void   DrawDetector()=0;
   virtual void   StepManager() {}
-  // Granularity
-  virtual void SetRingsSi1(Int_t ringsSi1);
-  virtual void SetSectorsSi1(Int_t sectorsSi1);
-  virtual void SetRingsSi2(Int_t ringsSi2);
-  virtual void SetSectorsSi2(Int_t sectorsSi2);
+   // Granularity
+  virtual void SetRingsSi1(Int_t ringsSi1=256);
+  virtual void SetSectorsSi1(Int_t sectorsSi1=20);
+  virtual void SetRingsSi2(Int_t ringsSi2=128);
+  virtual void SetSectorsSi2(Int_t sectorsSi2=40);
    
-  void  Eta2Radius(Float_t, Float_t, Float_t*);
-  void Hits2SDigits();//
+  void SetEventNumber(Int_t i)     {fEvNrSig = i;}
+  void  Eta2Radius(Float_t eta, Float_t zDisk, Float_t * radius);
   void Digits2Reco(); 
-
+  virtual void SetHitsAddressBranch(TBranch *b){b->SetAddress(&fHits);}
+  
    // Digitisation
-  TClonesArray *SDigits() const {return fSDigits;}
-//  virtual void   SDigits2Digits();
-  virtual void   SDigits2Digits();
-  virtual void   SetMerger(AliFMDMerger* merger);
-  virtual AliFMDMerger* Merger();
   TClonesArray *ReconParticles() const {return fReconParticles;}   
-  Int_t   fNevents ;        // Number of events to digitize
 
  protected:
   Int_t fIdSens1;     //Si sensetive volume
@@ -66,12 +58,12 @@ public:
   Int_t fRingsSi2;       // Number of rings
   Int_t fSectorsSi2;    // Number of sectors
 
+  Int_t   fNevents ;        // Number of events to digitize
+  Int_t fEvNrSig;                 // signal     event number
 
-  AliFMDMerger *fMerger;   // ! pointer to merger
-  TClonesArray *fSDigits      ; // List of summable digits
-  TClonesArray *fReconParticles;
+  TClonesArray *fReconParticles; // list of reconstructed particles
 
- ClassDef(AliFMD,3)  //Class for the FMD detector
+ ClassDef(AliFMD,5)  //Class for the FMD detector
 };
 #endif // AliFMD_H