Change according to Federico's suggestions (Massimo)

[u/mrichter/AliRoot.git] / STEER / AliDetector.h

diff --git a/STEER/AliDetector.h b/STEER/AliDetector.h
index c2c54e934a2ccc3ecfece80562e9988e67086c67..f5576452e15291714f39083bbe670a3d88ae24f2 100644 (file)
--- a/STEER/AliDetector.h
+++ b/STEER/AliDetector.h
@@ -26,11 +26,9 @@ 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;}
@@ -39,8 +37,6 @@ 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) const;
@@ -50,6 +46,7 @@ public:
   virtual void        MakeBranch(Option_t *opt=" ");
   virtual void        ResetDigits();
   virtual void        ResetHits();
+  virtual void        AddAlignableVolumes() const;
 
   virtual void        ResetPoints();
   virtual void        SetTreeAddress();
@@ -64,6 +61,7 @@ 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;}
@@ -86,6 +84,10 @@ protected:
 
   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