- Modified comment lines to be compatible with Doxygen

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

diff --git a/MUON/AliMUONCommonGeometryBuilder.cxx b/MUON/AliMUONCommonGeometryBuilder.cxx
index 1bb97bb0dcd8f967e35e97d762f84f38808ed60f..76ceb1528828c79baf3827abd5bba600d4c5e820 100644 (file)
--- a/MUON/AliMUONCommonGeometryBuilder.cxx
+++ b/MUON/AliMUONCommonGeometryBuilder.cxx
@@ -37,7 +37,7 @@ AliMUONCommonGeometryBuilder::AliMUONCommonGeometryBuilder(AliMUON* muon)
   : AliMUONVGeometryBuilder("", 0),
     fMUON(muon)
 {
-// Standars constructor
+/// Standars constructor
 }
 
 //______________________________________________________________________________//___________________________________________
@@ -45,7 +45,7 @@ AliMUONCommonGeometryBuilder::AliMUONCommonGeometryBuilder()
   : AliMUONVGeometryBuilder(),
     fMUON(0)
 {
-// Default constructor
+/// Default constructor
 } 
 
 //______________________________________________________________________________
@@ -53,7 +53,7 @@ AliMUONCommonGeometryBuilder::AliMUONCommonGeometryBuilder(
                                  const AliMUONCommonGeometryBuilder& right) 
   : AliMUONVGeometryBuilder(right) 
 {  
-  // copy constructor (not implemented)
+  /// copy constructor (not implemented)
 
   AliFatal("Copy constructor not provided.");
 }
@@ -61,14 +61,14 @@ AliMUONCommonGeometryBuilder::AliMUONCommonGeometryBuilder(
 //______________________________________________________________________________
 AliMUONCommonGeometryBuilder::~AliMUONCommonGeometryBuilder()
 {
-// Destructor
+/// Destructor
 }
 
 //______________________________________________________________________________
 AliMUONCommonGeometryBuilder& 
 AliMUONCommonGeometryBuilder::operator=(const AliMUONCommonGeometryBuilder& right)
 {
-  // assignement operator (not implemented)
+  /// assignement operator (not implemented)
 
   // check assignement to self
   if (this == &right) return *this;
@@ -85,8 +85,7 @@ AliMUONCommonGeometryBuilder::operator=(const AliMUONCommonGeometryBuilder& righ
 //_____________________________________________________________________________
 void AliMUONCommonGeometryBuilder::CreateMaterials()
 {
-  // Definition of common materials
-  // --
+/// Definition of common materials
 
   //
   //     Ar-CO2 gas (80%+20%)
@@ -129,13 +128,21 @@ void AliMUONCommonGeometryBuilder::CreateMaterials()
   Float_t sXMGMX = gAlice->Field()->Max();
   //
   // --- Define the various materials for GEANT --- 
-  fMUON->AliMaterial(9, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
-  fMUON->AliMaterial(10, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
+  fMUON->AliMaterial(9, "ALUMINIUM0$", 26.98, 13., 2.7, 8.9, 37.2);
+  fMUON->AliMaterial(10, "ALUMINIUM1$", 26.98, 13., 2.7, 8.9, 37.2);
   fMUON->AliMaterial(49, "Kapton$", 12.01,6,1.42,-28.6,999);          // from DPG
   fMUON->AliMaterial(42, "Copper$", 63.546,29.,8.96,-1.43,9.6);
-  fMUON->AliMaterial(43, "FR4$", 17.749, 8.875, 1.7, -19.4, 999.);    // from DPG
+
+  //fMUON->AliMaterial(43, "FR4$", 17.749, 8.875, 1.7, -19.4, 999.);    // from DPG
+  Float_t aFR[4] = {16.0, 28.09, 12.011, 1.00794} ;
+  Float_t zFR[4] = {8.0, 14.0, 6.0, 1.0} ;
+  Float_t wFR[4] = {292.0, 68.0, 462.0, 736.0} ;
+  Float_t dFR = 1.8 ; 
+  fMUON->AliMixture(43, "FR4$", aFR, zFR, dFR, -4, wFR);
+
   fMUON->AliMaterial(44, "FrameEpoxy",12.24,6.0,1.85,-19.14,999);// use 16.75cm
 
+
   // Air
   Float_t aAir[4]={12.0107,14.0067,15.9994,39.948};
   Float_t zAir[4]={6.,7.,8.,18.};
@@ -207,9 +214,9 @@ void AliMUONCommonGeometryBuilder::CreateMaterials()
  
   //
   //    Aluminum 
-  fMUON->AliMedium(4, "ALU_CH_US          ", 9, 0, iSXFLD, sXMGMX, tmaxfd, maxStepAlu, 
+  fMUON->AliMedium(4, "ALU_CH_US0         ", 9, 0, iSXFLD, sXMGMX, tmaxfd, maxStepAlu, 
                   maxDestepAlu, epsil, stmin);
-  fMUON->AliMedium(5, "ALU_CH_US          ", 10, 0, iSXFLD, sXMGMX, tmaxfd, maxStepAlu, 
+  fMUON->AliMedium(5, "ALU_CH_US1         ", 10, 0, iSXFLD, sXMGMX, tmaxfd, maxStepAlu, 
                   maxDestepAlu, epsil, stmin);
   //
   //    Ar-isoC4H10 gas