Using AliMpDDLStore::GetBusPatchId instead of static arrays (Christian)

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

diff --git a/STEER/AliModule.h b/STEER/AliModule.h
index 2e902166be73556d6eddcdbb89bc2adfe831af30..b28c2ba31a246e31aa0118e06d3915f3958dff9a 100644 (file)
--- a/STEER/AliModule.h
+++ b/STEER/AliModule.h
@@ -13,11 +13,8 @@
 //
 
 #include <Riostream.h>
-#include <TAttLine.h>
-#include <TAttMarker.h>
 #include <TNamed.h>
 
-#include "AliRndm.h"
 #include "AliTriggerDetector.h"
 
 class TClonesArray;
@@ -33,16 +30,15 @@ class AliVertexer;
 class AliTracker;
 class AliESD;
 class AliRunLoader;
+class AliRawReader;
 
 
-class AliModule : public TNamed , public TAttLine, public TAttMarker,
-                  public AliRndm {
+class AliModule : public TNamed {
 public:
 
   // Creators - distructors
   AliModule(const char* name, const char *title);
   AliModule();
-  AliModule(const AliModule &mod);
   virtual ~AliModule();
 
   // Inline functions
@@ -99,10 +95,13 @@ public:
   virtual void        Hits2Digits() {}
   virtual void        Digits2Reco() {}
   virtual void        Digits2Raw();
-  virtual void        Raw2Digits() {}
-  virtual void        Browse(TBrowser *) {}
+  virtual void        Raw2Digits()  {}
+  virtual Bool_t      Raw2SDigits(AliRawReader*) {return kFALSE;}
+  virtual void        Browse(TBrowser *) {} //PH Do we need it?
   virtual void        CreateGeometry() {}
   virtual void        CreateMaterials() {}
+  virtual void        DefineOpticalProperties() {}
+  virtual void        AddAlignableVolumes() const;
   virtual void        Disable();
   virtual void        Enable();
   virtual void        PreTrack(){}
@@ -112,6 +111,7 @@ public:
   virtual void        FinishPrimary() {}
   virtual void        Init() {}
   virtual void        LoadPoints(Int_t ) {}
+  virtual void        UpdateInternalGeometry() {}
 
 
 
@@ -122,7 +122,7 @@ public:
   virtual AliLoader*  GetLoader() const {return 0x0;} //skowron
   
 
-  virtual void        Paint(Option_t *) {}
+  virtual void        Paint(Option_t *) {} //PH Do we need it?
   virtual void        ResetDigits() {}
   virtual void        ResetSDigits() {}
   virtual void        ResetHits() {}
@@ -154,11 +154,8 @@ public:
     {fRunLoader = runLoader;}
   
 //
-  AliModule& operator=(const AliModule &mod)
-    {mod.Copy(*this); return (*this);}
  
 protected:      
-  void Copy(TObject &mod) const;
 
   // Data members
   
@@ -180,6 +177,10 @@ protected:
 
   AliRunLoader* fRunLoader;   //!local pointer to run loader
 
+ private:
+  AliModule(const AliModule &mod);
+  AliModule& operator=(const AliModule &mod);
+
   ClassDef(AliModule,7)  //Base class for ALICE Modules
 };
 #endif