Merging changes from v4-04-Release

[u/mrichter/AliRoot.git] / MUON / AliMUONConstants.cxx

diff --git a/MUON/AliMUONConstants.cxx b/MUON/AliMUONConstants.cxx
index 6d98c3aef9fad4a7118c5af8e753c1d369802fdd..dca69b51b616bf264c703c807e949ea91b2bd544 100644 (file)
--- a/MUON/AliMUONConstants.cxx
+++ b/MUON/AliMUONConstants.cxx
@@ -15,10 +15,22 @@
 
 /* $Id$ */
 
-#include <TMath.h>
 #include "AliMUONConstants.h"
 
-ClassImp(AliMUONConstants)
+#include "AliLog.h"
+
+#include "TMath.h"
+#include "TClass.h"
+
+///
+/// This class holds various constants to be used in many places,
+/// such as the number of tracking and trigger chambers, 
+/// some geometrical constants (to build the initial geometry for simulation)
+/// and mathieson distribution default values.
+/// Those constants should as much as possible replace hard-coded values
+/// which are to be considered strictly illegal in the MUON code (or any code,
+/// by the way).
+///
 
 Int_t   AliMUONConstants::fgNCh = 14;
 Int_t   AliMUONConstants::fgNTrackingCh = 10;
@@ -33,6 +45,10 @@ Float_t AliMUONConstants::fgDefaultChamberZ[14] =
    -967.5, -998.5, -1276.5, -1307.5, -1406.6, -1437.6,// updated 08/05, EDMS id 335328 (A. Tournaire)
    -1603.5, -1620.5, -1703.5, -1720.5}; // M1 & M2
 
+Float_t AliMUONConstants::fgDefaultRatioTriggerChamber[4] =
+{1., 1.01060, 1.06236, 1.07296};
+
+
 Float_t  AliMUONConstants::fgSt345inclination = 0.794; // in degrees, rotation axis is X axis 
 
 Float_t  AliMUONConstants::fgDzCh   = 15.5/2.;
@@ -58,20 +74,34 @@ Float_t  AliMUONConstants::fgDmax[7]  = {  176.6, 229.0, 308.84, 418.2,  522.0,
  
 Int_t    AliMUONConstants::fgMaxZoom = 20;
 
+ClassImp(AliMUONConstants)
+
 //______________________________________________________________________________
 Int_t AliMUONConstants::ChamberNumber(Float_t z) 
 {
   // return chamber number according z position of hit. Should be taken from geometry ?
  
   Float_t dMaxChamber = DzSlat() + DzCh() + 0.25; // cm st 3 &4 & 5
+  dMaxChamber += 3.00;                            // factor for inclination of chamber  
+  // dMaxChamber += Rmax(4) * TMath::Sin(fgSt345inclination*TMath::Pi()/360.); 
+                                                  // factor for inclination of chamber 
   if ( z >  (DefaultChamberZ(4)+50.)) dMaxChamber = 7.; // cm stations 1 & 2
   Int_t iChamber;
 
   for (iChamber = 0; iChamber < 10; iChamber++) {
-    
     if (TMath::Abs(z-DefaultChamberZ(iChamber)) < dMaxChamber) {
       return iChamber;
     }
   }
+  
+  if ( z > DefaultChamberZ(NTrackingCh()-1) ) {
+    AliWarningClass(Form("No chamber number found for z = %f",z));
+    // for (iChamber = 0; iChamber < 10; iChamber++) {
+    //   cout << iChamber << " zpos: " << DefaultChamberZ(iChamber)
+    //        << "  from " << DefaultChamberZ(iChamber) + dMaxChamber
+    //               << "  to " << DefaultChamberZ(iChamber) - dMaxChamber 
+    //        << "  delta " << dMaxChamber << endl;
+    //}
+  }
   return -1;
 }