X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliModule.h;h=5fced4f3b8ddae0670dd63625974339b9d931014;hb=a858321102511dce392148f313656f698d2f9895;hp=da2e53db9f1ecef4bc8537c2e7047f977f8ebd67;hpb=b99d1564459c785c4392913af8752c7ce14764eb;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliModule.h b/STEER/AliModule.h
index da2e53db9f1..5fced4f3b8d 100644
--- a/STEER/AliModule.h
+++ b/STEER/AliModule.h
@@ -13,14 +13,12 @@
 //
 
 #include <Riostream.h>
-#include <TAttLine.h>
-#include <TAttMarker.h>
 #include <TNamed.h>
+#include <TClonesArray.h>
 
-#include "AliRndm.h"
+#include "AliLog.h"
 #include "AliTriggerDetector.h"
 
-class TClonesArray;
 class TBrowser;
 class TArrayI;
 class TFile;
@@ -36,22 +34,18 @@ 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
-  virtual  int           GetNdigits() const {return 0;}
-  virtual  int           GetNhits()  const {return 0;}
+  virtual  Int_t         GetNdigits() const {return 0;}
+  virtual  Int_t         GetNhits()  const {return 0;}
   virtual  TArrayI      *GetIdtmed()   const {return fIdtmed;}
-  virtual  TList        *Histograms() const {return fHistograms;}
-  virtual  TList        *Nodes()  const {return fNodes;}
   virtual  TClonesArray *Digits() const {return 0;}
   virtual  TClonesArray *Hits()   const {return 0;}
   virtual  TObjArray    *Points() const {return 0;}
@@ -61,6 +55,8 @@ public:
   virtual  Bool_t        IsFolder() const {return kTRUE;}
   virtual  Int_t&        LoMedium() {return fLoMedium;}
   virtual  Int_t&        HiMedium() {return fHiMedium;}
+  virtual  Bool_t        IsModule() const {return kTRUE;}
+  virtual  Bool_t        IsDetector() const {return kFALSE;}
 
   // Module composition
   virtual void AliMaterial(Int_t imat, const char* name, Float_t a, 
@@ -102,11 +98,12 @@ public:
   virtual void        Digits2Raw();
   virtual void        Raw2Digits()  {}
   virtual Bool_t      Raw2SDigits(AliRawReader*) {return kFALSE;}
-  virtual void        Browse(TBrowser *) {}
+  virtual void        QADataMaker (const char *) {} 
+  virtual void        Browse(TBrowser *) {} //PH Do we need it?
   virtual void        CreateGeometry() {}
   virtual void        CreateMaterials() {}
-  virtual void        Disable();
-  virtual void        Enable();
+  virtual void        DefineOpticalProperties() {}
+  virtual void        AddAlignableVolumes() const;
   virtual void        PreTrack(){}
   virtual void        PostTrack(){}
   virtual void        FinishEvent() {}
@@ -114,6 +111,7 @@ public:
   virtual void        FinishPrimary() {}
   virtual void        Init() {}
   virtual void        LoadPoints(Int_t ) {}
+  virtual void        UpdateInternalGeometry() {}
 
 
 
@@ -124,12 +122,10 @@ 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() {}
@@ -138,50 +134,40 @@ public:
   virtual void        SetBufferSize(Int_t) {}  
   virtual Float_t     ZMin() const;
   virtual Float_t     ZMax() const;
-  virtual void        SetEuclidFile(char *material,char *geometry=0);
-  virtual void        ReadEuclid(const char *filnam, char *topvol);
-  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  AliTrackReference * AddTrackReference(Int_t label);
-  virtual  AliTrackReference * FirstTrackReference(Int_t track);
-  virtual  AliTrackReference * NextTrackReference();
-  virtual void        MakeBranchTR(Option_t *opt=" ");
+  virtual  AliTrackReference * AddTrackReference(Int_t label, Int_t id = -999);
   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()    { ; }
+  
+  static void SetDensityFactor(Float_t density) { fgDensityFactor = density; }
+  static Float_t GetDensityFactor() { return fgDensityFactor; }
+  
 protected:      
-  void Copy(TObject &mod) const;
 
   // Data members
   
-  TString       fEuclidMaterial;  //!Name of the Euclid file for materials (if any)
-  TString       fEuclidGeometry;  //!Name of the Euclid file for geometry (if any)
-  
   TArrayI      *fIdtmed;      //!List of tracking medium numbers
   TArrayI      *fIdmate;      //!List of material numbers
   Int_t         fLoMedium;   //!Minimum tracking medium ID for this Module
   Int_t         fHiMedium;   //!Maximum tracking medium ID for this Module
 
   Bool_t        fActive;      //Detector activity flag
-  TList        *fHistograms;  //List of histograms
-  TList        *fNodes;       //List of geometry nodes
   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
   Int_t         fCurrentIterTrackRef; //!for track refernce iterator routines
 
   AliRunLoader* fRunLoader;   //!local pointer to run loader
 
-  ClassDef(AliModule,7)  //Base class for ALICE Modules
+  static Float_t fgDensityFactor; //! factor that is multiplied to all material densities (ONLY for systematic studies)
+
+ private:
+  AliModule(const AliModule&);
+  AliModule& operator=(const AliModule&);
+
+  ClassDef(AliModule, 9)  //Base class for ALICE Modules
 };
 #endif