overlaps fixed

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

diff --git a/MUON/AliMUONConstants.cxx b/MUON/AliMUONConstants.cxx
index b789ff22b13ff56c2533fe8d4767a2fb6de6c030..9ade721fef8c6deb86ebf427986a53d350716c5c 100644 (file)
--- a/MUON/AliMUONConstants.cxx
+++ b/MUON/AliMUONConstants.cxx
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
+#include <TMath.h>
 #include "AliMUONConstants.h"
 
 ClassImp(AliMUONConstants)
@@ -23,36 +24,52 @@ Int_t   AliMUONConstants::fgNCh = 14;
 Int_t   AliMUONConstants::fgNTrackingCh = 10;
 Int_t   AliMUONConstants::fgNTriggerCh = 4;
 Int_t   AliMUONConstants::fgNTriggerCircuit = 234;
-Int_t   AliMUONConstants::fgNofDetElements[14] =
-{ 4, 4, 4, 4, 18, 18, 26, 26, 26, 26, 18, 18, 18, 18 };
+Int_t   AliMUONConstants::fgNDetElem = 228;
+
+
 
 Float_t AliMUONConstants::fgDefaultChamberZ[14] = 
-  {-533.5, -546.5, -678.5, -693.5, // St12
-   -966.9, -997.9, -1274.5, -1305.5, -1408.6, -1439.6, // St345  update sept04 Ch. Finck 
+  {-526.16, -545.24, -676.4, -695.4, // St12
+   -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::fgDzCh   = 15.5/2.;
 Float_t  AliMUONConstants::fgDzSlat = 8.5/2.;
 
+Float_t  AliMUONConstants::fgSqrtKx3 = 0.7131;
+Float_t  AliMUONConstants::fgSqrtKy3 = 0.7642;
 
-Float_t  AliMUONConstants::fgDmin[7] = {  36.4,  46.2,  66.0,   80.,   80., 100., 100.};    
-Float_t  AliMUONConstants::fgDmax[7]  = {183., 245., 395.,  560.,  563., 850., 900.};  
-Int_t   AliMUONConstants::fgMaxZoom = 20;
+Float_t  AliMUONConstants::fgSqrtKx3St1 = 0.7000;
+Float_t  AliMUONConstants::fgSqrtKy3St1 = 0.7550;
 
-//______________________________________________________________________________
-Int_t AliMUONConstants::GetChamberId(Int_t detElemId)
-{ 
-// Get chamber Id from detection element Id
-// ---
+Float_t  AliMUONConstants::fgChargeCorrel    = 0.11;
+Float_t  AliMUONConstants::fgChargeCorrelSt1 = 1.0; //??? 
+Float_t  AliMUONConstants::fgPitch     = 0.25;
+Float_t  AliMUONConstants::fgPitchSt1  = 0.21; 
 
-  return detElemId/100 - 1;
-}  
+// From Alain TOURNAIRE    
+// ALICE / ALICE Engineering baseline / Dimuonspectrometer (DIS) v7-1
+// EDMS Id 335328 for "search in EDMS 
+// These are the diameter (innner and ounner) values of the active surface
+Float_t  AliMUONConstants::fgDmin[7]  = {   36.4,  46.2,  63.0,   79.0,   79.0,  99.0,  100.0};  
+Float_t  AliMUONConstants::fgDmax[7]  = {  176.6, 229.0, 308.84, 418.2,  522.0, 850.0, 900.0}; 
+ 
+Int_t    AliMUONConstants::fgMaxZoom = 20;
 
 //______________________________________________________________________________
-Int_t AliMUONConstants::GetFirstDetElemId(Int_t chamberId)
+Int_t AliMUONConstants::ChamberNumber(Float_t z) 
 {
-// Get first detection element Id for chamber specified by chamber Id
-// ---
+  // 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
+  if ( z >  (DefaultChamberZ(4)+50.)) dMaxChamber = 7.; // cm stations 1 & 2
+  Int_t iChamber;
 
-  return (chamberId+1)*100;
-}  
+  for (iChamber = 0; iChamber < 10; iChamber++) {
+    
+    if (TMath::Abs(z-DefaultChamberZ(iChamber)) < dMaxChamber) {
+      return iChamber;
+    }
+  }
+  return -1;
+}