Adding missing semicolon, better structured if statement

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

diff --git a/STEER/AliModule.h b/STEER/AliModule.h
index ebb6553fa447e3b562d0a1036ec47d5e4e04eff5..b28c2ba31a246e31aa0118e06d3915f3958dff9a 100644 (file)
--- a/STEER/AliModule.h
+++ b/STEER/AliModule.h
@@ -5,13 +5,17 @@
 
 /* $Id$ */
 
-#include "Riostream.h"
+//
+// This is the basic class for any
+// ALICE detector module, whether it is 
+// sensitive or not. Detector classes depend
+// on this.
+//
 
-#include "TAttLine.h"
-#include "TAttMarker.h"
-#include "TNamed.h"
+#include <Riostream.h>
+#include <TNamed.h>
 
-#include "AliRndm.h"
+#include "AliTriggerDetector.h"
 
 class TClonesArray;
 class TBrowser;
@@ -22,19 +26,19 @@ class AliLoader;
 class AliTrackReference;
 class AliDigitizer;
 class AliRunDigitizer;
+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
@@ -52,8 +56,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 {return fDebug;}
-  virtual  void          SetDebug(Int_t deb=0) {fDebug=deb;}
 
   // Module composition
   virtual void AliMaterial(Int_t imat, const char* name, Float_t a, 
@@ -87,17 +89,19 @@ 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        Reconstruct() {}
-  virtual AliTracker* CreateTracker() {return NULL;}
-  virtual void        FillESD(AliESD* /*esd*/) {}
-  virtual void        Digits2Raw() {}
-  virtual void        Raw2Digits() {}
-  virtual void        Browse(TBrowser *) {}
+  virtual void        Digits2Raw();
+  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(){}
@@ -107,17 +111,18 @@ public:
   virtual void        FinishPrimary() {}
   virtual void        Init() {}
   virtual void        LoadPoints(Int_t ) {}
+  virtual void        UpdateInternalGeometry() {}
 
 
 
   virtual void        MakeBranch(Option_t * /*opt =" "*/) {}
   virtual void        MakeTree(Option_t *) {}//skowron 
 
-  virtual AliLoader*  MakeLoader(const char* topfoldername);//skowron   
+  virtual AliLoader*  MakeLoader(const char* topfoldername);  
   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() {}
@@ -139,7 +144,7 @@ public:
   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);
   virtual  AliTrackReference * FirstTrackReference(Int_t track);
   virtual  AliTrackReference * NextTrackReference();
   virtual void        MakeBranchTR(Option_t *opt=" ");
@@ -149,11 +154,8 @@ public:
     {fRunLoader = runLoader;}
   
 //
-  AliModule& operator=(const AliModule &mod)
-    {mod.Copy(*this); return (*this);}
  
 protected:      
-  void Copy(TObject &mod) const;
 
   // Data members
   
@@ -168,7 +170,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
@@ -176,6 +177,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