Adding definition of Dmax in constants and semantic modifications for the generation...

diff --git a/MUON/AliMUONConstants.cxx b/MUON/AliMUONConstants.cxx
index dca69b51b616bf264c703c807e949ea91b2bd544..9e7dec92be12748864a12cebc468bb69306ddd95 100644 (file)
--- a/MUON/AliMUONConstants.cxx
+++ b/MUON/AliMUONConstants.cxx
@@ -68,9 +68,10 @@ Float_t  AliMUONConstants::fgPitchSt1  = 0.21;
 // From Alain TOURNAIRE    
 // ALICE / ALICE Engineering baseline / Dimuonspectrometer (DIS) v7-1
 // EDMS Id 335328 for "search in EDMS 
 // 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;
 
  
 Int_t    AliMUONConstants::fgMaxZoom = 20;
 

diff --git a/MUON/AliMUONSlatGeometryBuilder.cxx b/MUON/AliMUONSlatGeometryBuilder.cxx
index 859c191a7ea5be5427af64be7f7880cb2a7d746c..7c99524bcf345fa20f616e3855b8acc7ccce9c9e 100644 (file)
--- a/MUON/AliMUONSlatGeometryBuilder.cxx
+++ b/MUON/AliMUONSlatGeometryBuilder.cxx
@@ -249,13 +249,14 @@ void AliMUONSlatGeometryBuilder::CreateGeometry()
        // Mother volume for each chamber in st3 are only defined if Dipole volue is there.
        // Outer excess and inner recess for mother volume radius
        // with respect to ROuter and RInner
        // Mother volume for each chamber in st3 are only defined if Dipole volue is there.
        // Outer excess and inner recess for mother volume radius
        // with respect to ROuter and RInner

-       Float_t dframepIn = kRframeHeight; 
-       Float_t dframepOut= kVframeLength + 37.0; // Additional 37 cm gap is needed to wrap the corners of the slats 
+       Float_t dMotherInner = AliMUONConstants::Rmin(2)-kRframeHeight; 
+       Float_t dMotherOutner= AliMUONConstants::Rmax(2)+kVframeLength + 37.0; 
+       // Additional 37 cm gap is needed to wrap the corners of the slats sin Rmax represent the maximum active radius of the chamber with 2pi phi acceptance 

        Float_t tpar[3];
        Double_t dstation =  ( (-AliMUONConstants::DefaultChamberZ(5)) -
                               (-AliMUONConstants::DefaultChamberZ(4)) ) /2.1;
        Float_t tpar[3];
        Double_t dstation =  ( (-AliMUONConstants::DefaultChamberZ(5)) -
                               (-AliMUONConstants::DefaultChamberZ(4)) ) /2.1;

-       tpar[0] = AliMUONConstants::Rmin(2)-dframepIn; 
-       tpar[1] = AliMUONConstants::Rmax(2)+dframepOut;
+       tpar[0] = dMotherInner; 
+       tpar[1] = dMotherOutner;

        tpar[2] = dstation;
        gMC->Gsvolu("CH05", "TUBE", idAir, tpar, 3);
        gMC->Gsvolu("CH06", "TUBE", idAir, tpar, 3);
        tpar[2] = dstation;
        gMC->Gsvolu("CH05", "TUBE", idAir, tpar, 3);
        gMC->Gsvolu("CH06", "TUBE", idAir, tpar, 3);


@@ -647,13 +648,14 @@ void AliMUONSlatGeometryBuilder::CreateGeometry()
     // Mother volume for each chamber
     // Outer excess and inner recess for mother volume radius
     // with respect to ROuter and RInner
     // Mother volume for each chamber
     // Outer excess and inner recess for mother volume radius
     // with respect to ROuter and RInner

-    Float_t dframepIn = kRframeHeight; 
-    Float_t dframepOut= kVframeLength + 40.0; // Additional 30 cm gap is needed to wrap the corners of the slats 
+    Float_t dMotherInner =  AliMUONConstants::Rmin(3)-kRframeHeight; 
+    // Additional 40 cm gap is needed to wrap the corners of the slats since Rmax represent the maximum active radius of the chamber with 2pi phi acceptance 
+    Float_t dMotherOutner= AliMUONConstants::Rmax(3)+kVframeLength + 40.0;

     Float_t tpar[3];
     Double_t dstation =  ( (-AliMUONConstants::DefaultChamberZ(7)) - 
                            (-AliMUONConstants::DefaultChamberZ(6)) ) /2.2;
     Float_t tpar[3];
     Double_t dstation =  ( (-AliMUONConstants::DefaultChamberZ(7)) - 
                            (-AliMUONConstants::DefaultChamberZ(6)) ) /2.2;

-    tpar[0] = AliMUONConstants::Rmin(3)-dframepIn; 
-    tpar[1] = AliMUONConstants::Rmax(3)+dframepOut;
+    tpar[0] = dMotherInner; 
+    tpar[1] = dMotherOutner;

     tpar[2] = dstation;
     gMC->Gsvolu("CH07", "TUBE", idAir, tpar, 3);
     gMC->Gsvolu("CH08", "TUBE", idAir, tpar, 3);
     tpar[2] = dstation;
     gMC->Gsvolu("CH07", "TUBE", idAir, tpar, 3);
     gMC->Gsvolu("CH08", "TUBE", idAir, tpar, 3);


@@ -920,13 +922,14 @@ void AliMUONSlatGeometryBuilder::CreateGeometry()
     // Mother volume for each chamber
     // Outer excess and inner recess for mother volume radius
     // with respect to ROuter and RInner
     // Mother volume for each chamber
     // Outer excess and inner recess for mother volume radius
     // with respect to ROuter and RInner

-    Float_t dframepIn = kRframeHeight; 
-    Float_t dframepOut= kVframeLength + 40.0; // Additional 40 cm gap is needed to wrap the corners of the slats 
+    Float_t dMotherInner =  AliMUONConstants::Rmin(4)-kRframeHeight; 
+    // Additional 40 cm gap is needed to wrap the corners of the slats since Rmax represent the maximum active radius of the chamber with 2pi phi acceptance 
+    Float_t dMotherOutner= AliMUONConstants::Rmax(4)+kVframeLength + 40.0;

     Float_t tpar[3];
     Double_t dstation =  ( (-AliMUONConstants::DefaultChamberZ(9)) - 
                            (-AliMUONConstants::DefaultChamberZ(8)) ) /2.3;
     Float_t tpar[3];
     Double_t dstation =  ( (-AliMUONConstants::DefaultChamberZ(9)) - 
                            (-AliMUONConstants::DefaultChamberZ(8)) ) /2.3;

-    tpar[0] = AliMUONConstants::Rmin(4)-dframepIn; 
-    tpar[1] = AliMUONConstants::Rmax(4)+dframepOut;
+    tpar[0] = dMotherInner; 
+    tpar[1] = dMotherOutner;

     tpar[2] = dstation;
     gMC->Gsvolu("CH09", "TUBE", idAir, tpar, 3);
     gMC->Gsvolu("CH10", "TUBE", idAir, tpar, 3);
     tpar[2] = dstation;
     gMC->Gsvolu("CH09", "TUBE", idAir, tpar, 3);
     gMC->Gsvolu("CH10", "TUBE", idAir, tpar, 3);