From: hristov Date: Fri, 27 May 2005 11:16:19 +0000 (+0000) Subject: Unique material names (R.Grosso) X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=91e7cea3e385ce1b51711eac573b4da87e2db4eb Unique material names (R.Grosso) --- diff --git a/CRT/AliCRT.cxx b/CRT/AliCRT.cxx index 502f411b031..87a430d8e24 100644 --- a/CRT/AliCRT.cxx +++ b/CRT/AliCRT.cxx @@ -119,21 +119,21 @@ void AliCRT::CreateMaterials() Float_t epsil, stmin, tmaxfd, deemax, stemax; // // Aluminum - AliMaterial(9, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2); - AliMaterial(29, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2); - AliMaterial(49, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2); + AliMaterial(9, "ALUMINIUM0$", 26.98, 13., 2.7, 8.9, 37.2); + AliMaterial(29, "ALUMINIUM1$", 26.98, 13., 2.7, 8.9, 37.2); + AliMaterial(49, "ALUMINIUM2$", 26.98, 13., 2.7, 8.9, 37.2); // // Iron - AliMaterial(10, "IRON$ ", 55.85, 26., 7.87, 1.76, 17.1); - AliMaterial(30, "IRON$ ", 55.85, 26., 7.87, 1.76, 17.1); - AliMaterial(50, "IRON$ ", 55.85, 26., 7.87, 1.76, 17.1); + AliMaterial(10, "IRON0$ ", 55.85, 26., 7.87, 1.76, 17.1); + AliMaterial(30, "IRON1$ ", 55.85, 26., 7.87, 1.76, 17.1); + AliMaterial(50, "IRON2$ ", 55.85, 26., 7.87, 1.76, 17.1); // // Air - AliMaterial(15, "AIR$ ", 14.61, 7.3, .001205, 30423.24, 67500.); - AliMaterial(35, "AIR$ ", 14.61, 7.3, .001205, 30423.24, 67500.); - AliMaterial(55, "AIR$ ", 14.61, 7.3, .001205, 30423.24, 67500.); - AliMaterial(75, "AIR$ ", 14.61, 7.3, .001205, 30423.24, 67500.); - AliMaterial(95, "AIR$ ", 14.61, 7.3, .001205, 30423.24, 67500.); + AliMaterial(15, "AIR0$ ", 14.61, 7.3, .001205, 30423.24, 67500.); + AliMaterial(35, "AIR1$ ", 14.61, 7.3, .001205, 30423.24, 67500.); + AliMaterial(55, "AIR2$ ", 14.61, 7.3, .001205, 30423.24, 67500.); + AliMaterial(75, "AIR3$ ", 14.61, 7.3, .001205, 30423.24, 67500.); + AliMaterial(95, "AIR4$ ", 14.61, 7.3, .001205, 30423.24, 67500.); // Scintillator material polystyrene @@ -187,9 +187,9 @@ void AliCRT::CreateMaterials() // The scintillator of the CPV made of Polystyrene // scintillator -> idtmed[1112] - AliMedium(12 , "CPV scint. ", 13, 1, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin); - AliMedium(13 , "CPV scint. ", 13, 1, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin); - AliMedium(14 , "CPV scint. ", 13, 1, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin); + AliMedium(12 , "CPV scint.0 ", 13, 1, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin); + AliMedium(13 , "CPV scint.1 ", 13, 1, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin); + AliMedium(14 , "CPV scint.2 ", 13, 1, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin); // Molasse -> idtmed[1123] AliMedium(24 , "Molasse ", 24, 0, xfield, xfieldm, tmaxfd, stemax, deemax, xepsil, stmin); diff --git a/MUON/AliMUONCommonGeometryBuilder.cxx b/MUON/AliMUONCommonGeometryBuilder.cxx index 1bb97bb0dcd..6a41d0dfe31 100644 --- a/MUON/AliMUONCommonGeometryBuilder.cxx +++ b/MUON/AliMUONCommonGeometryBuilder.cxx @@ -129,13 +129,8 @@ 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(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(44, "FrameEpoxy",12.24,6.0,1.85,-19.14,999);// use 16.75cm - + 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); // Air Float_t aAir[4]={12.0107,14.0067,15.9994,39.948}; Float_t zAir[4]={6.,7.,8.,18.}; @@ -207,9 +202,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 @@ -241,19 +236,6 @@ void AliMUONCommonGeometryBuilder::CreateMaterials() maxStepAlu, maxDestepAlu, epsil, stmin); fMUON->AliMedium(17, "Nomex bulk ", 37, 0, iSXFLD, sXMGMX, tmaxfd, maxStepAlu, maxDestepAlu, epsil, stmin); - - // for station 2 only - // was med: 4 mat: 9 - fMUON->AliMedium(22, "COPPER_II ", 42, 0, iSXFLD, sXMGMX, - tmaxfd, maxStepAlu, maxDestepAlu, epsil, stmin); - // was med: 10 mat: 30 - fMUON->AliMedium(23, "FR4_CH ", 43, 0, iSXFLD, sXMGMX, - 10.0, 0.01, 0.1, 0.003, 0.003); - fMUON->AliMedium(24, "FrameCH$", 44, 1, iSXFLD, sXMGMX, - 10.0, 0.001, 0.001, 0.001, 0.001); - fMUON->AliMedium(29, "Kapton ", 49, 0, iSXFLD, sXMGMX, - 10.0, 0.01, 1.0, 0.003, 0.003); - // was med: 18 mat: 34 } diff --git a/START/AliSTARTv1.cxx b/START/AliSTARTv1.cxx index 649986ce2ba..e2dccb293c6 100755 --- a/START/AliSTARTv1.cxx +++ b/START/AliSTARTv1.cxx @@ -466,9 +466,9 @@ void AliSTARTv1::CreateMaterials() Float_t densupport=0.1; //*** Definition Of avaible START materials *** - AliMaterial(0, "START Steel$", 55.850,26.,7.87,1.76,999); - AliMaterial(1, "START Vacuum$", 1.e-16,1.e-16,1.e-16,1.e16,999); - AliMixture(2, "START Air$", aAir, zAir, dAir,4,wAir); + AliMaterial(0, "Steel$", 55.850,26.,7.87,1.76,999); + AliMaterial(1, "Vacuum$", 1.e-16,1.e-16,1.e-16,1.e16,999); + AliMixture(2, "Air$", aAir, zAir, dAir,4,wAir); AliMaterial(10, "CarbonPlastic$", 12.01, 6.0, 2.26, 18.8,999); AliMaterial(11, "Aliminium$", 26.98, 13.0, 2.7, 8.9,999); diff --git a/ZDC/AliZDCv2.cxx b/ZDC/AliZDCv2.cxx index afabfc84aab..64a3f33d949 100644 --- a/ZDC/AliZDCv2.cxx +++ b/ZDC/AliZDCv2.cxx @@ -937,11 +937,11 @@ void AliZDCv2::CreateMaterials() // --- Iron (energy loss taken into account) ubuf[0] = 1.1; - AliMaterial(7, "IRON", 55.85, 26., 7.87, 1.76, 0., ubuf, 1); + AliMaterial(7, "IRON0", 55.85, 26., 7.87, 1.76, 0., ubuf, 1); // --- Iron (no energy loss) ubuf[0] = 1.1; - AliMaterial(8, "IRON", 55.85, 26., 7.87, 1.76, 0., ubuf, 1); + AliMaterial(8, "IRON1", 55.85, 26., 7.87, 1.76, 0., ubuf, 1); // --------------------------------------------------------- Float_t aResGas[3]={1.008,12.0107,15.9994};