Hits -> Digits directly

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

diff --git a/FMD/AliFMD.h b/FMD/AliFMD.h
index 65823219cba7a3e0569746afd09ebf85e717756b..98e487094bcc3c59091fb814c15aff546e7613ac 100644 (file)
--- a/FMD/AliFMD.h
+++ b/FMD/AliFMD.h
@@ -9,11 +9,12 @@
  
 #include "AliDetector.h"
 #include "TString.h"
-#include "AliFMDMerger.h" 
- 
+#include "TBranch.h"
+//#include "AliFMDMerger.h" 
+#include "AliFMDSDigitizer.h" 
  class TFile;
  class TTree;
- class AliFMDMerger;
+// class AliFMDMerger;
  class AliFMD : public AliDetector {
  
 public:
@@ -22,6 +23,7 @@ public:
   virtual       ~AliFMD(); 
   virtual void   AddHit(Int_t, Int_t*, Float_t*);
   virtual void   AddDigit(Int_t*);
+  virtual void   AddSDigit(Int_t*);
   virtual void   BuildGeometry();
   virtual void   CreateGeometry() {}
   virtual void   CreateMaterials()=0; 
@@ -29,26 +31,44 @@ 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=256);
+  virtual void SetSectorsSi1(Int_t sectorsSi1=20);
+  virtual void SetRingsSi2(Int_t ringsSi2=128);
+  virtual void SetSectorsSi2(Int_t sectorsSi2=40);
+   
+  void SetEventNumber(Int_t i)     {fEvNrSig = i;}
   void  Eta2Radius(Float_t, Float_t, Float_t*);
   void Hits2SDigits();//
   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
-  AliFMDMerger *fMerger;   // ! pointer to merger
+  Int_t fIdSens2;     //Si sensetive volume
+  Int_t fIdSens3;     //Si sensetive volume
+  Int_t fIdSens4;     //Si sensetive volume
+  Int_t fIdSens5;     //Si sensetive volume
+ //Granularity
+  Int_t fRingsSi1;       // Number of rings
+  Int_t fSectorsSi1;    // Number of sectors
+  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;