Bug fix (Yu.Belikov)

[u/mrichter/AliRoot.git] / MUON / AliMUON.h

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index 163659c98ca280f0f49a5d14177dae45b5e97a4a..41b487ac6f4ad622dde289db58ad55637f6d5414 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -4,48 +4,48 @@
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
-/* $Id$ */
-
+// Revision of includes 07/05/2004
 
 ////////////////////////////////////////////////
 //  AliDetector Class for MUON subsystem      //
 ////////////////////////////////////////////////
+
+#include <TObjArray.h>
+
 #include "AliDetector.h"
 #include "AliMUONData.h"
 #include "AliMUONChamber.h"
 
+class TVector;
+class TFile;
+class TTree;
+
 class AliLoader;
-class AliMUONTriggerCircuit;
-class AliMUONTriggerDecision;
 class AliSegmentation;
+class AliMUONTriggerCircuit;
+class AliMUONData;
 class AliMUONResponse;
 class AliMUONMerger;
 class AliMUONHit;
 class AliMUONPadHit;
 class AliMUONRawCluster;
-class AliMUONClusterFinderVS;
 class AliMUONReconstHit;
 class AliMUONMerger;
+class AliMUONGeometryBuilder;
 class AliMUONVGeometryBuilder;
 class AliESD;
 
-class TVector;
-#include "TObjArray.h"
-class TFile;
-class TTree;
-
-
-class AliMUON : public  AliDetector {
- public:
+class AliMUON : public  AliDetector 
+{
+  public:
     AliMUON();
     AliMUON(const char *name, const char *title);
-    AliMUON(const AliMUON& rMUON);
     virtual       ~AliMUON();
    
     void           AddGeometryBuilder(AliMUONVGeometryBuilder* geomBuilder);
     virtual void   BuildGeometry();
-    Int_t          DistancetoPrimitive(Int_t px, Int_t py);
     AliMUONData*   GetMUONData() {return fMUONData;}
+    AliMUONGeometryBuilder*  GetGeometryBuilder() {return fGeometryBuilder;}
     virtual Int_t  IsVersion()   const {return 0;}
 
     // MUONLoader definition
@@ -63,6 +63,9 @@ class AliMUON : public  AliDetector {
     virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
     virtual void   SDigits2Digits();      
     virtual void   Hits2SDigits();
+    virtual void   Digits2Raw();
+
+
     // Configuration Methods (per station id)
     //
     // Set Chamber Segmentation Parameters
@@ -98,6 +101,9 @@ class AliMUON : public  AliDetector {
     virtual Float_t  GetMaxStepAlu() const;
     virtual Float_t  GetMaxDestepGas() const;
     virtual Float_t  GetMaxDestepAlu() const;
+    
+    // Set alignement option
+    virtual void  SetAlign(Bool_t align);
    
     // Return reference to Chamber #id
     virtual AliMUONChamber& Chamber(Int_t id)
@@ -111,17 +117,21 @@ class AliMUON : public  AliDetector {
     // Return pointers to digits
     AliMUONRawCluster    *RawCluster(Int_t ichamber, Int_t icathod,
                                     Int_t icluster);
-    // Copy Operator
+    // Inherited and overridden from AliModule:
+    //PH    virtual void RemapTrackHitIDs(Int_t * map);
+
+  protected:
+    AliMUON(const AliMUON& rMUON);
     AliMUON& operator = (const AliMUON& rhs);
 
- protected:
+
     Int_t                 fNCh;                // Number of chambers   
     Int_t                 fNTrackingCh;        // Number of tracking chambers*
     AliMUONData*          fMUONData;           // Data container for MUON subsystem  
     Int_t                 fSplitLevel;         // Splitlevel when making branches in outfiles.
     TObjArray*            fChambers;           // List of Tracking Chambers
-    TObjArray            *fGeometryBuilders;   // List of Geometry Builders
     TObjArray*            fTriggerCircuits;    // List of Trigger Circuits
+    AliMUONGeometryBuilder*  fGeometryBuilder; // Geometry buiulder 
    
     //
     Bool_t   fAccCut;          //Transport acceptance cut