Updated constants & method

diff --git a/MUON/AliMUONClusterInput.cxx b/MUON/AliMUONClusterInput.cxx
index f68d3c4d877b36a609911fabf666831090ef4be2..6fb69987e432b4936a557fe7574b3f39a327097a 100644 (file)
--- a/MUON/AliMUONClusterInput.cxx
+++ b/MUON/AliMUONClusterInput.cxx
@@ -91,16 +91,16 @@ void AliMUONClusterInput::SetDigits(Int_t chamber, TClonesArray* dig1, TClonesAr
     fSegmentation[1]=iChamber->SegmentationModel(2);
     fNseg = 2;
     if (chamber < AliMUONConstants::NTrackingCh()) {
-      if (chamber > 3 ) {
-       fgMathieson->SetPitch(AliMUONConstants::PitchSlat());
-       fgMathieson->SetSqrtKx3AndDeriveKx2Kx4(AliMUONConstants::SqrtKx3Slat());
-       fgMathieson->SetSqrtKy3AndDeriveKy2Ky4(AliMUONConstants::SqrtKy3Slat());
-       fChargeCorrel = AliMUONConstants::ChargeCorrelSlat();
+      if (chamber > 1 ) {
+       fgMathieson->SetPitch(AliMUONConstants::Pitch());
+       fgMathieson->SetSqrtKx3AndDeriveKx2Kx4(AliMUONConstants::SqrtKx3());
+       fgMathieson->SetSqrtKy3AndDeriveKy2Ky4(AliMUONConstants::SqrtKy3());
+       fChargeCorrel = AliMUONConstants::ChargeCorrel();
       } else {
-       fgMathieson->SetPitch(AliMUONConstants::PitchSt12());
-       fgMathieson->SetSqrtKx3AndDeriveKx2Kx4(AliMUONConstants::SqrtKx3St12());
-       fgMathieson->SetSqrtKy3AndDeriveKy2Ky4(AliMUONConstants::SqrtKy3St12());
-       fChargeCorrel = AliMUONConstants::ChargeCorrelSt12();
+       fgMathieson->SetPitch(AliMUONConstants::PitchSt1());
+       fgMathieson->SetSqrtKx3AndDeriveKx2Kx4(AliMUONConstants::SqrtKx3St1());
+       fgMathieson->SetSqrtKy3AndDeriveKy2Ky4(AliMUONConstants::SqrtKy3St1());
+       fChargeCorrel = AliMUONConstants::ChargeCorrelSt1();
       }
     }
 }

diff --git a/MUON/AliMUONConstants.cxx b/MUON/AliMUONConstants.cxx
index 506d789419f8380bdaf7d74389d6e0d66c2a7e86..44389f48e7cdd6a98c7ebc5a1ff521a86b7aa13d 100644 (file)
--- a/MUON/AliMUONConstants.cxx
+++ b/MUON/AliMUONConstants.cxx
@@ -33,17 +33,17 @@ Float_t AliMUONConstants::fgDefaultChamberZ[14] =
 Float_t  AliMUONConstants::fgDzCh   = 15.5/2.;
 Float_t  AliMUONConstants::fgDzSlat = 8.5/2.;
 
-Float_t  AliMUONConstants::fgSqrtKx3Slat = 0.7131;
-Float_t  AliMUONConstants::fgSqrtKy3Slat = 0.7642;
+Float_t  AliMUONConstants::fgSqrtKx3 = 0.7131;
+Float_t  AliMUONConstants::fgSqrtKy3 = 0.7642;
 
-Float_t  AliMUONConstants::fgSqrtKx3St12 = 0.7000;
-Float_t  AliMUONConstants::fgSqrtKy3St12 = 0.7550;
+Float_t  AliMUONConstants::fgSqrtKx3St1 = 0.7000;
+Float_t  AliMUONConstants::fgSqrtKy3St1 = 0.7550;
 
-Float_t  AliMUONConstants::fgChargeCorrelSlat = 0.11;
-Float_t  AliMUONConstants::fgChargeCorrelSt12 = 1.0; //???
+Float_t  AliMUONConstants::fgChargeCorrel    = 0.11;
+Float_t  AliMUONConstants::fgChargeCorrelSt1 = 1.0; //???
 
-Float_t  AliMUONConstants::fgPitchSlat = 0.25;
-Float_t  AliMUONConstants::fgPitchSt12 = 0.20; 
+Float_t  AliMUONConstants::fgPitch     = 0.25;
+Float_t  AliMUONConstants::fgPitchSt1  = 0.21; 
 
 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.};  

diff --git a/MUON/AliMUONConstants.h b/MUON/AliMUONConstants.h
index 15f771f7b66d2ab4b65ce2f6321caee3da85d18b..9b377617a006cbd28ec2eafe9fb5d823fa6d70a9 100644 (file)
--- a/MUON/AliMUONConstants.h
+++ b/MUON/AliMUONConstants.h
@@ -34,17 +34,17 @@ class AliMUONConstants : public TObject {
     static Float_t    DzSlat() {return fgDzSlat;}
     static  Int_t ChamberNumber(Float_t z); 
     // return SqrtKx3 and SqrtKy3 for Slat
-    static Float_t SqrtKx3Slat() {return fgSqrtKx3Slat;}
-    static Float_t SqrtKy3Slat() {return fgSqrtKy3Slat;}
+    static Float_t SqrtKx3() {return fgSqrtKx3;}
+    static Float_t SqrtKy3() {return fgSqrtKy3;}
     // return SqrtKx3 and SqrtKy3 for Station 1 & 2
-    static Float_t SqrtKx3St12() {return fgSqrtKx3St12;}
-    static Float_t SqrtKy3St12() {return fgSqrtKy3St12;}
+    static Float_t SqrtKx3St1() {return fgSqrtKx3St1;}
+    static Float_t SqrtKy3St1() {return fgSqrtKy3St1;}
        // return charge correlation (needed for response and for cluster finder !?)
-    static Float_t ChargeCorrelSlat() {return fgChargeCorrelSlat;}
-    static Float_t ChargeCorrelSt12() {return fgChargeCorrelSt12;}
+    static Float_t ChargeCorrel()    {return fgChargeCorrel;}
+    static Float_t ChargeCorrelSt1() {return fgChargeCorrelSt1;}
      // return wire pitch
-    static Float_t PitchSlat() {return fgPitchSlat;}
-    static Float_t PitchSt12() {return fgPitchSt12;}
+    static Float_t Pitch()    {return fgPitch;}
+    static Float_t PitchSt1() {return fgPitchSt1;}
 
  protected:
     AliMUONConstants() : TObject() {}
@@ -62,16 +62,16 @@ class AliMUONConstants : public TObject {
 
     static Float_t  fgDzCh;             // half-distance between two half-chambers 
     static Float_t  fgDzSlat;           // half-distance between two slat on the same chamber
-    static Float_t  fgSqrtKx3Slat;      // SqrtKx3 for Slat
-    static Float_t  fgSqrtKy3Slat;      // SqrtKy3 for Slat
-    static Float_t  fgSqrtKx3St12;      // SqrtKx3 for Station 1 & 2
-    static Float_t  fgSqrtKy3St12;      // SqrtKy3 for Station 1 & 2
+    static Float_t  fgSqrtKx3;          // SqrtKx3 for St2 & Slat
+    static Float_t  fgSqrtKy3;          // SqrtKy3 for St2 & Slat
+    static Float_t  fgSqrtKx3St1;       // SqrtKx3 for Station 1 
+    static Float_t  fgSqrtKy3St1;       // SqrtKy3 for Station 1 
  
-    static Float_t  fgChargeCorrelSlat;      // charge correlation for Slats
-    static Float_t  fgChargeCorrelSt12;      // charge correlation for Station 1 & 2
+    static Float_t  fgChargeCorrel;      // charge correlation for St2 & Slats
+    static Float_t  fgChargeCorrelSt1;   // charge correlation for Station 1
 
-    static Float_t  fgPitchSlat;      // wire pitch for Slats
-    static Float_t  fgPitchSt12;      // wire pitch for Station 1 & 2
+    static Float_t  fgPitch;             // wire pitch for St2 & Slats
+    static Float_t  fgPitchSt1;          // wire pitch for Station 1
 
 //
     static Int_t    fgMaxZoom;                // Maximum Zoom for event display

diff --git a/MUON/AliMUONSlatGeometryBuilder.cxx b/MUON/AliMUONSlatGeometryBuilder.cxx
index a1863d7a00aef48325a75be49b420add100bf40f..effdbe742a8835a84a7a8a1b54829fb484f7fbd5 100644 (file)
--- a/MUON/AliMUONSlatGeometryBuilder.cxx
+++ b/MUON/AliMUONSlatGeometryBuilder.cxx
@@ -131,7 +131,7 @@ void AliMUONSlatGeometryBuilder::CreateGeometry()
   // sensitive area: 40*40 cm**2
   const Float_t kSensLength = 40.; 
   const Float_t kSensHeight = 40.; 
-  const Float_t kSensWidth  = 0.5; // according to TDR fig 2.120 
+  const Float_t kSensWidth  = AliMUONConstants::Pitch()*2;// 0.5 cm, according to TDR fig 2.120 
   const Int_t kSensMaterial = idGas;
   //     const Float_t kYoverlap   = 1.5;