X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliDetector.h;h=aab9a5c3347ce9194291d95cf52885ca51a352f2;hb=267f939c4a7071012ebbb25ed005b3e030fa8067;hp=c752a737d87875c7fda58de1ad41df9b234e2932;hpb=88cb7938ca21d4a80991d4e7aa564008c29340f7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliDetector.h b/STEER/AliDetector.h
index c752a737d87..aab9a5c3347 100644
--- a/STEER/AliDetector.h
+++ b/STEER/AliDetector.h
@@ -5,6 +5,13 @@
 
 /* $Id$ */
 
+// 
+// This is the basic detector class from which
+// all ALICE detector derive.
+// This class is the base for the implementation of all detectors
+// in ALICE
+//
+
 #include "AliModule.h"
 
 class AliHit;
@@ -19,11 +26,9 @@ public:
   // Creators - distructors
   AliDetector(const char* name, const char *title);
   AliDetector();
-  AliDetector(const AliDetector &det);
   virtual ~AliDetector();
 
   // Inline functions
-  void  Copy(AliDetector &det) const;
   virtual int   GetNdigits() const {return fNdigits;}
   virtual int   GetNhits()   const {return fNhits;}
   TClonesArray *Digits() const {return fDigits;}
@@ -32,24 +37,23 @@ public:
   TObjArray    *Points() const {return fPoints;}
   Int_t         GetIshunt() const {return fIshunt;}
   void          SetIshunt(Int_t ishunt) {fIshunt=ishunt;}
-  AliDetector &operator=(const AliDetector &det) 
-  {det.Copy(*this); return (*this);}
   
   // Other methods
-  virtual void        Publish(const char *dir, void *c, const char *name=0);
+  virtual void        Publish(const char *dir, void *c, const char *name=0) const;
   virtual void        Browse(TBrowser *b);
   virtual void        FinishRun();
   virtual void        LoadPoints(Int_t track);
   virtual void        MakeBranch(Option_t *opt=" ");
   virtual void        ResetDigits();
   virtual void        ResetHits();
+  virtual void        AddAlignableVolumes() const;
 
   virtual void        ResetPoints();
   virtual void        SetTreeAddress();
   virtual void        SetTimeGate(Float_t gate) {fTimeGate=gate;}
   virtual Float_t     GetTimeGate() const {return fTimeGate;}
   virtual void        StepManager() {}
-  virtual void        DrawModule() {}
+  virtual void        DrawModule() const {}
   virtual AliHit*     FirstHit(Int_t track);
   virtual AliHit*     NextHit();
   virtual void        SetBufferSize(Int_t bufsize=8000) {fBufferSize = bufsize;}  
@@ -61,7 +65,7 @@ public:
   virtual AliLoader* MakeLoader(const char* topfoldername); //builds standard getter (AliLoader type)
   void    SetLoader(AliLoader* loader){fLoader = loader;}
   AliLoader* GetLoader() const {return fLoader;} //skowron
-  TTree* TreeH();  //shorcut method for accessing treeH from folder
+  TTree* TreeH() const;  //shorcut method for accessing treeH from folder
     // Data members
 protected:      
   
@@ -71,12 +75,18 @@ protected:
   Int_t         fNhits;       //!Number of hits
   Int_t         fNdigits;     //!Number of digits
   Int_t         fBufferSize;  //!buffer size for Tree detector branches
+  Int_t         fMaxIterHit;  //!Limit for the hit iterator
+  Int_t         fCurIterHit;  //!Counter for the hit iterator
   TClonesArray *fHits;        //!List of hits for one track only
   TClonesArray *fDigits;      //!List of digits for this detector
   TObjArray    *fPoints;      //!Array of points for each track (all tracks in memory)
 
   AliLoader*  fLoader;//! pointer to getter for this module skowron
 
-  ClassDef(AliDetector,4)  //Base class for ALICE detectors
+ private:
+  AliDetector(const AliDetector &det);
+  AliDetector &operator=(const AliDetector &det);
+
+  ClassDef(AliDetector,5)  //Base class for ALICE detectors
 };
 #endif