Muon tracking stations in new ALICE coordinate system (z -> -z)

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index b3db1b45f49a59b9648aa0df9e13cfcac7d7b76a..d34c95898abb1c8a13ae2a284ae81e98492d86b7 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -302,8 +302,8 @@ void AliMUON::SetAcceptance(Bool_t acc, Float_t angmin, Float_t angmax)
       for (Int_t stCH = 0; stCH < 2; stCH++) {
        ch = 2 * st + stCH;
        //         Set chamber inner and outer radius according to acceptance cuts
-       Chamber(ch).SetRInner(AliMUONConstants::DefaultChamberZ(ch)*TMath::Tan(fAccMin));
-       Chamber(ch).SetROuter(AliMUONConstants::DefaultChamberZ(ch)*TMath::Tan(fAccMax));
+       Chamber(ch).SetRInner(TMath::Abs(AliMUONConstants::DefaultChamberZ(ch)*TMath::Tan(fAccMin)));
+       Chamber(ch).SetROuter(TMath::Abs(AliMUONConstants::DefaultChamberZ(ch)*TMath::Tan(fAccMax)));
       } // chamber loop
     } // station loop
   }

diff --git a/MUON/AliMUONConstants.cxx b/MUON/AliMUONConstants.cxx
index 368b6b4135ac03e92816e36e3cf33b08ad37793b..13216eb4cd2053a19133c797d646c91156a3ea84 100644 (file)
--- a/MUON/AliMUONConstants.cxx
+++ b/MUON/AliMUONConstants.cxx
@@ -25,8 +25,8 @@ Int_t   AliMUONConstants::fgNTrackingCh = 10;
 Int_t   AliMUONConstants::fgNTriggerCh = 4;
 Int_t   AliMUONConstants::fgNTriggerCircuit = 234;
 Float_t AliMUONConstants::fgDefaultChamberZ[14] =
-{533.5, 546.5, 678.5, 693.5, 964.0, 986.0, 1251.5, 1278.5, 1416.5, 1443.5,
- 1603.5, 1620.5, 1703.5, 1720.5};
+{-533.5, -546.5, -678.5, -693.5, -964.0, -986.0, -1251.5, -1278.5, -1416.5, -1443.5,
+ -1603.5, -1620.5, -1703.5, -1720.5};
 
 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/AliMUONv1.cxx b/MUON/AliMUONv1.cxx
index 925edb051b1ff718bd7a0901389cdc1fa29d6e87..3c87c786c8c8e8868d04dc887f83f5aa71967d22 100644 (file)
--- a/MUON/AliMUONv1.cxx
+++ b/MUON/AliMUONv1.cxx
@@ -151,7 +151,7 @@ void AliMUONv1::CreateGeometry()
      iChamber2 =(AliMUONChamber*) (*fChambers)[1];
      zpos1=iChamber1->Z(); 
      zpos2=iChamber2->Z();
-     dstation = zpos2 - zpos1;
+     dstation = TMath::Abs(zpos2 - zpos1);
      // DGas decreased from standard one (0.5)
      iChamber->SetDGas(0.4); iChamber2->SetDGas(0.4);
      // DAlu increased from standard one (3% of X0),
@@ -309,7 +309,7 @@ void AliMUONv1::CreateGeometry()
      iChamber2 =(AliMUONChamber*) (*fChambers)[3];
      zpos1=iChamber1->Z(); 
      zpos2=iChamber2->Z();
-     dstation = zpos2 - zpos1;
+     dstation = TMath::Abs(zpos2 - zpos1);
      // DGas and DAlu not changed from standard values
      zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2;
      
@@ -563,7 +563,7 @@ void AliMUONv1::CreateGeometry()
      iChamber2 =(AliMUONChamber*) (*fChambers)[5];
      zpos1=iChamber1->Z(); 
      zpos2=iChamber2->Z();
-     dstation = zpos2 - zpos1;
+     dstation = TMath::Abs(zpos2 - zpos1);
 
 //      zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2; // not used any more
 //
@@ -581,8 +581,8 @@ void AliMUONv1::CreateGeometry()
        slats5Mother="DDIP";
        slats6Mother="DDIP";
 
-       zoffs5 = zpos1;
-       zoffs6 = zpos2;
+       zoffs5 = TMath::Abs(zpos1);
+       zoffs6 = TMath::Abs(zpos2);
      }
      else {
        gMC->Gsvolu("S05M", "TUBE", idAir, tpar, 3);
@@ -844,7 +844,7 @@ void AliMUONv1::CreateGeometry()
      iChamber2 =(AliMUONChamber*) (*fChambers)[7];
      zpos1=iChamber1->Z(); 
      zpos2=iChamber2->Z();
-     dstation = zpos2 - zpos1;
+     dstation = TMath::Abs(zpos2 - zpos1);
 //      zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2; // not used any more
      
 //
@@ -1052,7 +1052,7 @@ void AliMUONv1::CreateGeometry()
      iChamber2 =(AliMUONChamber*) (*fChambers)[9];
      zpos1=iChamber1->Z(); 
      zpos2=iChamber2->Z();
-     dstation = zpos2 - zpos1;
+     dstation = TMath::Abs(zpos2 - zpos1);
 //      zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2; // not used any more
      
 //