X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliDetector.h;h=b42b9ade53a26fc95a876f18801c96b9d09aad46;hb=e0919e877c6f962639a2af56bc822a7d58a7f33b;hp=30bc13dfa486eca6372572b055b5c1c6297f9446;hpb=3a83c716c48976af8eb36575907773eac5ec2e1e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliDetector.h b/STEER/AliDetector.h
index 30bc13dfa48..b42b9ade53a 100644
--- a/STEER/AliDetector.h
+++ b/STEER/AliDetector.h
@@ -26,37 +26,33 @@ public:
   // Creators - distructors
   AliDetector(const char* name, const char *title);
   AliDetector();
-  AliDetector(const AliDetector &det);
   virtual ~AliDetector();
 
   // Inline functions
-  void  Copy(TObject &det) const;
   virtual int   GetNdigits() const {return fNdigits;}
   virtual int   GetNhits()   const {return fNhits;}
   TClonesArray *Digits() const {return fDigits;}
   TClonesArray *Hits()   const {return fHits;}
+  virtual  Bool_t        IsModule() const {return kFALSE;}
+  virtual  Bool_t        IsDetector() const {return kTRUE;}
 
-  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) 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;}  
@@ -64,11 +60,11 @@ public:
   virtual TBranch*    MakeBranchInTree(TTree *tree, const char* cname, const char* name, void* address, Int_t size=32000, Int_t splitlevel=99, const char *file=0);
   
   void MakeTree(Option_t *option); //skowron
+  virtual void        RemapTrackHitIDs(Int_t *) {}
   
   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() const;  //shorcut method for accessing treeH from folder
     // Data members
 protected:      
   
@@ -82,10 +78,13 @@ protected:
   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
 
+ private:
+  AliDetector(const AliDetector &det);
+  AliDetector &operator=(const AliDetector &det);
+
   ClassDef(AliDetector,5)  //Base class for ALICE detectors
 };
 #endif