Corrected initialization of the data members and data ownership

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

diff --git a/FMD/AliFMD.h b/FMD/AliFMD.h
index 7466206578699444fa198915dd837d9aa4a27e9e..944b8f205c66443073aa17be814b0daf219568f4 100644 (file)
--- a/FMD/AliFMD.h
+++ b/FMD/AliFMD.h
@@ -7,63 +7,54 @@
 //  Manager and hits classes for set:Si-FMD     //
 ////////////////////////////////////////////////
  
-#include "TBranch.h"
 #include "AliDetector.h"
-
+#include "TBranch.h"
 class TClonesArray;
-class AliFMD : public AliDetector {
+ class AliFMD : public AliDetector {
  
 public:
   AliFMD();
   AliFMD(const char *name, const char *title);
   virtual       ~AliFMD(); 
-  virtual void   AddHit(Int_t track, Int_t * vol, Float_t * hits);
-  virtual void   AddDigit(Int_t* digits);
-  virtual void   BuildGeometry();
+  virtual void   AddHit(Int_t, Int_t*, Float_t*);
+  virtual void   AddDigit(Int_t*);
+   virtual void   BuildGeometry();
   virtual void   CreateGeometry() {}
   virtual void   CreateMaterials()=0; 
   virtual Int_t  DistanceToPrimitive(Int_t px, Int_t py);
   virtual Int_t  IsVersion() const =0;
   virtual void   Init();
-  virtual void   MakeBranch(Option_t *opt=" ",const char *file=0);
+  virtual void   MakeBranch(Option_t *opt=" ");
   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 eta, Float_t zDisk, Float_t * radius);
-  void Digits2Reco(); 
-  virtual void SetHitsAddressBranch(TBranch *b){b->SetAddress(&fHits);}
-  
+  void  Eta2Radius(Float_t, Float_t, Float_t*);
+   void Digits2Reco(); 
+ 
    // Digitisation
-  TClonesArray *ReconParticles() const {return fReconParticles;}   
+   TClonesArray *ReconParticles() const {return fReconParticles;}   
+  virtual void SetHitsAddressBranch(TBranch *b){b->SetAddress(&fHits);}
+  virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
 
  protected:
-  Int_t fIdSens1;     //Si sensetive volume
-  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
+//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   fNevents ;        // Number of events to digitize
   Int_t fEvNrSig;                 // signal     event number
 
-  TClonesArray *fReconParticles; // list of reconstructed particles
 
- ClassDef(AliFMD,5)  //Class for the FMD detector
+  TClonesArray *fReconParticles;
+
+ ClassDef(AliFMD,6)  //Class for the FMD detector
 };
 #endif // AliFMD_H