X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONConstants.cxx;h=bce50a9fa54f45bff3ecd159cbf0b8c9d2e0d7cb;hb=90366ff645be25f2fc03ecf1f7f375f56c6007c1;hp=48dc205403d9286469c96e1776fc49cc60e0149e;hpb=6061eac614e9c2ea8756abea9729c1a8d9eedd3b;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONConstants.cxx b/MUON/AliMUONConstants.cxx
index 48dc205403d..bce50a9fa54 100644
--- a/MUON/AliMUONConstants.cxx
+++ b/MUON/AliMUONConstants.cxx
@@ -23,7 +23,7 @@
 #include "TClass.h"
 #include "AliMpConstants.h"
 
-///
+//-----------------------------------------------------------------------------
 /// \class AliMUONConstants
 /// This class holds various constants to be used in many places,
 /// such as the number of tracking and trigger chambers, 
@@ -32,7 +32,7 @@
 /// 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).
-///
+//-----------------------------------------------------------------------------
 
 /// \cond CLASSIMP
 ClassImp(AliMUONConstants)
@@ -49,6 +49,13 @@ 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
 
+
+// These are used by AliMUONConstants::ChamberNumber and must be calculated once
+// by that method from fgDzCh, fgDzSlat, fgDefaultChamberZ and fgSt345inclination,
+// so for now we set everything to zero.
+Float_t AliMUONConstants::fgDefaultChamberMinZ[14] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+Float_t AliMUONConstants::fgDefaultChamberMaxZ[14] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
 Float_t AliMUONConstants::fgDefaultRatioTriggerChamber[4] =
 {1., 1.01060, 1.06236, 1.07296};
 
@@ -87,6 +94,14 @@ Double_t AliMUONConstants::fgCoilL = 502.1;
 Double_t AliMUONConstants::fgYokeZ = -986.6;
 Double_t AliMUONConstants::fgYokeL = 309.4;
 
+// Defaults parameters for absorber (27/06/07)
+const Double_t AliMUONConstants::fgkAbsZBeg = -90.;
+const Double_t AliMUONConstants::fgkAbsZEnd = -505.;
+    
+// Default chamber resolution (cm)
+const Double_t AliMUONConstants::fgkDefaultNonBendingReso = 0.144;
+const Double_t AliMUONConstants::fgkDefaultBendingReso = 0.01;
+
 // Defaults parameters for track reconstruction
 Double_t  AliMUONConstants::fgChamberThicknessInX0 = 0.03;
 
@@ -103,31 +118,48 @@ Int_t AliMUONConstants::NTrackingCh()
 }
 
 //______________________________________________________________________________
-Int_t AliMUONConstants::ChamberNumber(Float_t z) 
+Int_t AliMUONConstants::ChamberNumber(Float_t z, bool warn)
 {
   // 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 (fgDefaultChamberMinZ[0] == 0) // Are the min/max Z arrays initialised?
+  {
+    // The min and max Z arrays need to be calculated.
+    for (Int_t i = 0; i < NCh(); i++)
+    {
+      Float_t a = 0, b = 0;
+      if (4 <= i and i < 10)
+      {
+        Float_t dzAngle = TMath::Tan(TMath::Pi()*St345Inclination()/180.) * Rmax(i/2);
+        // We add 2.5mm since Rmax is an under-estimate.
+        a = DefaultChamberZ(i) + DzSlat() + DzCh() + dzAngle + 0.25;
+        b = DefaultChamberZ(i) - DzSlat() - DzCh() - dzAngle - 0.25;
+      }
+      else
+      {
+        a = DefaultChamberZ(i) + DzSlat();
+        b = DefaultChamberZ(i) - DzSlat();
+      }
+      fgDefaultChamberMinZ[i] = TMath::Min(a, b);
+      fgDefaultChamberMaxZ[i] = TMath::Max(a, b);
     }
   }
-  
-  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;
-    //}
+
+  // We can apply a binary search for the chamber since the fgDefaultChamberMinZ and
+  // fgDefaultChamberMaxZ arrays are ordered.
+  Int_t mini = 0, maxi = NCh()-1;
+  while (mini <= maxi)
+  {
+    Int_t iChamber = (maxi + mini) / 2;
+    if (z < fgDefaultChamberMinZ[iChamber])
+      mini = iChamber+1;
+    else if (z > fgDefaultChamberMaxZ[iChamber])
+      maxi = iChamber-1;
+    else
+      // We are between min and max Z of chamber number iChamber so we found our chamber.
+      return iChamber;
   }
+
+  if (warn) AliWarningClass(Form("No chamber number found for z = %f",z));
   return -1;
 }