Correct x-position of slats in station 5.

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

diff --git a/MUON/AliMUONChamber.h b/MUON/AliMUONChamber.h
index 83e5077bcf68f0e9b7771e4048bc5304d4c544af..0d755d9872963ecd7b48f6e62d6a14f7b0be4494 100644 (file)
--- a/MUON/AliMUONChamber.h
+++ b/MUON/AliMUONChamber.h
@@ -6,18 +6,19 @@
 /* $Id$ */
 
 #include "TObjArray.h"
-#include "AliMUONSegmentation.h"
+#include "AliSegmentation.h"
 #include "AliMUONResponse.h"
 
-class AliMUONClusterFinder;
+class AliMUONClusterFinderVS;
 //class AliMUONResponse ;
-//class AliMUONSegmentation ;
+//class AliSegmentation ;
 
 class AliMUONChamber:
 public TObject
 {
  public:
     AliMUONChamber();
+    AliMUONChamber(Int_t id);
     AliMUONChamber(const AliMUONChamber & rChamber);
     virtual ~AliMUONChamber();
     
@@ -47,11 +48,11 @@ public TObject
   virtual void    SetResponseModel(AliMUONResponse* thisResponse) {fResponse=thisResponse;}
 //  
 // Set segmentation model
-  virtual void    SetSegmentationModel(Int_t i, AliMUONSegmentation* thisSegmentation) {
+  virtual void    SetSegmentationModel(Int_t i, AliSegmentation* thisSegmentation) {
       (*fSegmentation)[i-1] = thisSegmentation;
   }
 // Set Cluster reconstruction model  
-  virtual void    SetReconstructionModel(AliMUONClusterFinder *thisReconstruction) {
+  virtual void    SetReconstructionModel(AliMUONClusterFinderVS *thisReconstruction) {
       fReconstruction = thisReconstruction;
   }
 //  
@@ -59,12 +60,12 @@ public TObject
   virtual AliMUONResponse* &ResponseModel(){return fResponse;}
 //  
 //  Get reference to segmentation model
-  virtual AliMUONSegmentation*  SegmentationModel(Int_t isec) {
-      return (AliMUONSegmentation *) (*fSegmentation)[isec-1];
+  virtual AliSegmentation*  SegmentationModel(Int_t isec) {
+      return (AliSegmentation *) (*fSegmentation)[isec-1];
   }
   virtual TObjArray* ChamberSegmentation() {return fSegmentation;}
 //  Get pointer to cluster reconstruction model
-  virtual AliMUONClusterFinder* &ReconstructionModel(){return fReconstruction;}
+  virtual AliMUONClusterFinderVS* &ReconstructionModel(){return fReconstruction;}
 // Get number of segmentation sectors  
   virtual Int_t Nsec()              {return fnsec;}
 // Set number of segmented cathodes (1 or 2)  
@@ -94,12 +95,12 @@ public TObject
   virtual void   SetMaxAdc(Int_t p1)                   {fResponse->SetMaxAdc(p1);}
 // Set Pad size
   virtual void   SetPadSize(Int_t isec, Float_t p1, Float_t p2) {
-      ((AliMUONSegmentation*) (*fSegmentation)[isec-1])->SetPadSize(p1,p2);
+      ((AliSegmentation*) (*fSegmentation)[isec-1])->SetPadSize(p1,p2);
   }
 //  
 // Cluster formation method (charge disintegration)
   virtual void   DisIntegration(Float_t eloss, Float_t tof,
-                               Float_t xhit, Float_t yhit,
+                               Float_t xhit, Float_t yhit, Float_t zhit,
                                Int_t& x, Float_t newclust[6][500]);
 // Initialize geometry related parameters  
   virtual void    InitGeo(Float_t z);
@@ -107,10 +108,10 @@ public TObject
   virtual Float_t DGas() {return fdGas;}
   virtual Float_t DAlu() {return fdAlu;}  
 // assignment operator  
-  virtual AliMUONChamber& operator =(const AliMUONChamber& rhs);
+  AliMUONChamber& operator =(const AliMUONChamber& rhs);
   
  protected:
-
+  Int_t   fId;   // chamber number
   Float_t fdGas; // half gaz gap
   Float_t fdAlu; // half Alu width  
   Int_t   fGid;  // GEANT volume if for sensitive volume of this chamber
@@ -119,10 +120,10 @@ public TObject
   Float_t frMin; // innermost sensitive radius
   Float_t frMax; // outermost sensitive radius
 
-  TObjArray            *fSegmentation;    // pointer to segmentation
-  AliMUONClusterFinder *fReconstruction;  // pointer to reconstruction
-  AliMUONResponse      *fResponse;        // pointer to response
-  ClassDef(AliMUONChamber,1) // Muon tracking and trigger chamber class
+  TObjArray              *fSegmentation;    // pointer to segmentation
+  AliMUONClusterFinderVS *fReconstruction;  // pointer to reconstruction
+  AliMUONResponse        *fResponse;        // pointer to response
+  ClassDef(AliMUONChamber,1) // Muon tracking chamber class
 };
 
 #endif