Clean-up in includes.

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

diff --git a/STEER/AliModule.h b/STEER/AliModule.h
index 182e81ceb108c857da39d2329fdb80b93359170e..1a8540e6dea984ab0275571fe4585103a6f071d3 100644 (file)
--- a/STEER/AliModule.h
+++ b/STEER/AliModule.h
@@ -13,11 +13,10 @@
 //
 
 #include <Riostream.h>
-#include <TAttLine.h>
-#include <TAttMarker.h>
 #include <TNamed.h>
 
-#include "AliRndm.h"
+#include "AliLog.h"
+#include "AliTriggerDetector.h"
 
 class TClonesArray;
 class TBrowser;
@@ -32,16 +31,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
@@ -59,7 +57,6 @@ public:
   virtual  Bool_t        IsFolder() const {return kTRUE;}
   virtual  Int_t&        LoMedium() {return fLoMedium;}
   virtual  Int_t&        HiMedium() {return fHiMedium;}
-  virtual  Int_t         GetDebug() const;
 
   // Module composition
   virtual void AliMaterial(Int_t imat, const char* name, Float_t a, 
@@ -93,14 +90,20 @@ public:
   virtual void        Hits2SDigits() {}
   virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* /*manager*/) const 
     {return NULL;}
+  virtual AliTriggerDetector* CreateTriggerDetector() const
+    { AliTriggerDetector* det = new AliTriggerDetector(); det->SetName(GetName()); return det;}
   virtual void        SDigits2Digits() {}
   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        QADataMaker (const char *) {} 
+  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(){}
@@ -110,6 +113,7 @@ public:
   virtual void        FinishPrimary() {}
   virtual void        Init() {}
   virtual void        LoadPoints(Int_t ) {}
+  virtual void        UpdateInternalGeometry() {}
 
 
 
@@ -120,12 +124,11 @@ 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() {}
   virtual void        ResetPoints() {}
-  virtual void        SetTreeAddress();
   virtual void        SetTimeGate(Float_t) {}
   virtual Float_t     GetTimeGate() const {return 1.e10;}
   virtual void        StepManager() {}
@@ -139,24 +142,18 @@ public:
   virtual void        ReadEuclidMedia(const char *filnam);
 // Track reference related
   TClonesArray *TrackReferences()   const {return fTrackReferences;}
-  virtual void        RemapTrackHitIDs(Int_t *) {}
-  virtual void        RemapTrackReferencesIDs(Int_t *map); //remaping track references MI
-  virtual void        ResetTrackReferences();
-  virtual void        AddTrackReference(Int_t label);
+  virtual  AliTrackReference * AddTrackReference(Int_t label, Int_t id = -999);
   virtual  AliTrackReference * FirstTrackReference(Int_t track);
   virtual  AliTrackReference * NextTrackReference();
-  virtual void        MakeBranchTR(Option_t *opt=" ");
   TTree* TreeTR();  //shorcut method for accessing treeTR from folder
 
   void                SetRunLoader(AliRunLoader* runLoader) 
     {fRunLoader = runLoader;}
   
-//
-  AliModule& operator=(const AliModule &mod)
-    {mod.Copy(*this); return (*this);}
- 
+// Quality Assurance methods
+  virtual void CheckQA()    { ; }
+  
 protected:      
-  void Copy(TObject &mod) const;
 
   // Data members
   
@@ -171,7 +168,6 @@ protected:
   Bool_t        fActive;      //Detector activity flag
   TList        *fHistograms;  //List of histograms
   TList        *fNodes;       //List of geometry nodes
-  Int_t         fDebug;       //Debug flag
   Bool_t        fEnable;      //StepManager enabling flag
   TClonesArray *fTrackReferences;     //!list of track references - for one primary track only -MI
   Int_t         fMaxIterTrackRef;     //!for track refernce iterator routines
@@ -179,6 +175,10 @@ protected:
 
   AliRunLoader* fRunLoader;   //!local pointer to run loader
 
-  ClassDef(AliModule,6)  //Base class for ALICE Modules
+ private:
+  AliModule(const AliModule &mod);
+  AliModule& operator=(const AliModule &mod);
+
+  ClassDef(AliModule,7)  //Base class for ALICE Modules
 };
 #endif