include fgkTriggerTofLimit (Philippe)

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

diff --git a/MUON/AliMUONConstants.cxx b/MUON/AliMUONConstants.cxx
index 19bcd5d19058e87bb9dd87d737a73e876ed69b03..84fcf96df5c308d8f337ec707bdab3199f5408dc 100644 (file)
--- a/MUON/AliMUONConstants.cxx
+++ b/MUON/AliMUONConstants.cxx
@@ -17,7 +17,10 @@
 
 #include "AliMUONConstants.h"
 
+#include "AliLog.h"
+
 #include "TMath.h"
+#include "TClass.h"
 
 ///
 /// This class holds various constants to be used in many places,
@@ -29,13 +32,17 @@
 /// by the way).
 ///
 
+/// \cond CLASSIMP
+ClassImp(AliMUONConstants)
+/// \endcond
+
 Int_t   AliMUONConstants::fgNCh = 14;
 Int_t   AliMUONConstants::fgNTrackingCh = 10;
 Int_t   AliMUONConstants::fgNTriggerCh = 4;
 Int_t   AliMUONConstants::fgNTriggerCircuit = 234;
 Int_t   AliMUONConstants::fgNDetElem = 228;
-
-
+Int_t   AliMUONConstants::fgNGeomModules = 20;
+Float_t AliMUONConstants::fgkTriggerTofLimit = 75E-9;
 
 Float_t AliMUONConstants::fgDefaultChamberZ[14] = 
   {-526.16, -545.24, -676.4, -695.4, // St12
@@ -65,28 +72,39 @@ Float_t  AliMUONConstants::fgPitchSt1  = 0.21;
 // 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}; 
+// These are the diameter (Dmin == innner and Dmax - outner) values of the active surface
+// In the case of Dmax, the value corresponds to the maximum diameter of the active surface with 2pi coverture in phi
+Float_t  AliMUONConstants::fgDmin[7]  = {   36.4,  46.2,  63.0,   79.0,   79.0,  99.0,  100.0};  // cm
+Float_t  AliMUONConstants::fgDmax[7]  = {  176.6, 229.0, 308.84, 418.2,  522.0, 850.0, 900.0};   // cm
  
 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;
 }