X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STRUCT%2FAliABSO.cxx;h=a84227ee4addd8d72408dbb370a95d7dc076425a;hb=683601f2da12501791f83b7d748cceb33a799c15;hp=2ef2f94a6708585e037290d458f3aa4514f41f3c;hpb=002b37381cc403ef996f2a9f2f5d6a5b6e3b1afe;p=u%2Fmrichter%2FAliRoot.git diff --git a/STRUCT/AliABSO.cxx b/STRUCT/AliABSO.cxx index 2ef2f94a670..a84227ee4ad 100644 --- a/STRUCT/AliABSO.cxx +++ b/STRUCT/AliABSO.cxx @@ -58,9 +58,9 @@ AliABSO::AliABSO(const char *name, const char *title) // // Standard constructor // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); } //_____________________________________________________________________________ @@ -72,7 +72,7 @@ void AliABSO::CreateGeometry() } //_____________________________________________________________________________ -void AliABSO::DrawModule() +void AliABSO::DrawModule() const { // // Draw a shaded view of the muon absorber @@ -95,7 +95,7 @@ void AliABSO::CreateMaterials() Float_t zAir[4]={6.,7.,8.,18.}; Float_t wAir[4]={0.000124,0.755267,0.231781,0.012827}; Float_t dAir = 1.20479E-3; - + Float_t dAir1 = 1.20479E-10; // // Polyethylene // @@ -105,11 +105,9 @@ void AliABSO::CreateMaterials() // // Concrete // - Float_t aconc[10] = { 1.,12.01,15.994,22.99,24.305,26.98, - 28.086,39.1,40.08,55.85 }; + Float_t aconc[10] = { 1.,12.01,15.994,22.99,24.305,26.98,28.086,39.1,40.08,55.85 }; Float_t zconc[10] = { 1.,6.,8.,11.,12.,13.,14.,19.,20.,26. }; - Float_t wconc[10] = { .01,.001,.529107,.016,.002,.033872, - .337021,.013,.044,.014 }; + Float_t wconc[10] = { .01,.001,.529107,.016,.002,.033872, .337021,.013,.044,.014 }; // // Steel // @@ -117,11 +115,12 @@ void AliABSO::CreateMaterials() Float_t zsteel[4] = { 26.,24.,28.,14. }; Float_t wsteel[4] = { .715,.18,.1,.005 }; // -// // Ni-Cu-W alloy +// Float_t aniwcu[3] ={58.6934, 183.84, 63.546}; Float_t zniwcu[3] ={28., 74., 29}; Float_t wniwcu[3] ={0.015,0.95,0.035}; +// // Poly Concrete // H Li F C Al Si Ca Pb O Float_t aPolyCc[9] = {1. , 6.941, 18.998, 12.01, 26.98, 28.086, 40.078, 207.2, 15.999}; @@ -139,83 +138,87 @@ void AliABSO::CreateMaterials() Float_t ains[4] ={28.0855, 15.9994, 47.867, 26.982}; Float_t zins[4] ={14., 8. , 22. , 13. }; Float_t wins[4] ={ 0.3019, 0.4887, 0.1914, 0.018}; + // Float_t epsil, stmin, tmaxfd, deemax, stemax; // // Carbon - AliMaterial( 6, "CARBON$ ", 12.01, 6., 1.75, 24.4, 49.9); - AliMaterial(26, "CARBON$ ", 12.01, 6., 1.75, 24.4, 49.9); - AliMaterial(46, "CARBON$ ", 12.01, 6., 1.75, 24.4, 49.9); + AliMaterial( 6, "CARBON0$ ", 12.01, 6., 1.75, 24.4, 49.9); + AliMaterial(26, "CARBON1$ ", 12.01, 6., 1.75, 24.4, 49.9); + AliMaterial(46, "CARBON2$ ", 12.01, 6., 1.75, 24.4, 49.9); + // + // Magnesium + AliMaterial( 7, "MAGNESIUM$ ", 24.31, 12., 1.74, 25.3, 46.0); // // 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); // // Copper - AliMaterial(11, "COPPER$ ", 63.55, 29., 8.96, 1.43, 15.1); - AliMaterial(31, "COPPER$ ", 63.55, 29., 8.96, 1.43, 15.1); - AliMaterial(51, "COPPER$ ", 63.55, 29., 8.96, 1.43, 15.1); + AliMaterial(11, "COPPER0$ ", 63.55, 29., 8.96, 1.43, 15.1); + AliMaterial(31, "COPPER1$ ", 63.55, 29., 8.96, 1.43, 15.1); + AliMaterial(51, "COPPER2$ ", 63.55, 29., 8.96, 1.43, 15.1); // // Tungsten - AliMaterial(12, "TUNGSTEN$ ", 183.85, 74., 19.3, .35, 10.3); - AliMaterial(32, "TUNGSTEN$ ", 183.85, 74., 19.3, .35, 10.3); - AliMaterial(52, "TUNGSTEN$ ", 183.85, 74., 19.3, .35, 10.3); + AliMaterial(12, "TUNGSTEN0$ ", 183.85, 74., 19.3, .35, 10.3); + AliMaterial(32, "TUNGSTEN1$ ", 183.85, 74., 19.3, .35, 10.3); + AliMaterial(52, "TUNGSTEN2$ ", 183.85, 74., 19.3, .35, 10.3); // // Ni-W-Cu - AliMixture(21, "Ni-W-Cu$", aniwcu, zniwcu, 18.78, 3, wniwcu); - AliMixture(41, "Ni-W-Cu$", aniwcu, zniwcu, 18.78, 3, wniwcu); - AliMixture(61, "Ni-W-Cu$", aniwcu, zniwcu, 18.78, 3, wniwcu); + AliMixture(21, "Ni-W-Cu0$", aniwcu, zniwcu, 18.78, 3, wniwcu); + AliMixture(41, "Ni-W-Cu1$", aniwcu, zniwcu, 18.78, 3, wniwcu); + AliMixture(61, "Ni-W-Cu2$", aniwcu, zniwcu, 18.78, 3, wniwcu); // // Lead - AliMaterial(13, "LEAD$ ", 207.19, 82., 11.35, .56, 18.5); - AliMaterial(33, "LEAD$ ", 207.19, 82., 11.35, .56, 18.5); - AliMaterial(53, "LEAD$ ", 207.19, 82., 11.35, .56, 18.5); + AliMaterial(13, "LEAD0$ ", 207.19, 82., 11.35, .56, 18.5); + AliMaterial(33, "LEAD1$ ", 207.19, 82., 11.35, .56, 18.5); + AliMaterial(53, "LEAD2$ ", 207.19, 82., 11.35, .56, 18.5); // // Air - AliMixture(15, "AIR$ ", aAir, zAir, dAir, 4, wAir); - AliMixture(35, "AIR$ ", aAir, zAir, dAir, 4, wAir); - AliMixture(55, "AIR$ ", aAir, zAir, dAir, 4, wAir); + AliMixture(15, "AIR0$ ", aAir, zAir, dAir, 4, wAir); + AliMixture(35, "AIR1$ ", aAir, zAir, dAir, 4, wAir); + AliMixture(55, "AIR2$ ", aAir, zAir, dAir, 4, wAir); // // Vacuum - AliMaterial(16, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16); - AliMaterial(36, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16); - AliMaterial(56, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16); + AliMixture(16, "VACUUM0$ ", aAir, zAir, dAir1, 4, wAir); + AliMixture(36, "VACUUM1$ ", aAir, zAir, dAir1, 4, wAir); + AliMixture(56, "VACUUM2$ ", aAir, zAir, dAir1, 4, wAir); // // Concrete - AliMixture(17, "CONCRETE$", aconc, zconc, 2.35, 10, wconc); - AliMixture(37, "CONCRETE$", aconc, zconc, 2.35, 10, wconc); - AliMixture(57, "CONCRETE$", aconc, zconc, 2.35, 10, wconc); + AliMixture(17, "CONCRETE0$", aconc, zconc, 2.35, 10, wconc); + AliMixture(37, "CONCRETE1$", aconc, zconc, 2.35, 10, wconc); + AliMixture(57, "CONCRETE2$", aconc, zconc, 2.35, 10, wconc); // // Poly CH2 - AliMixture(18, "POLYETHYLEN$", apoly, zpoly, .95, -2, wpoly); + AliMixture(18, "POLYETHYLEN0$", apoly, zpoly, .95, -2, wpoly); // // After a call with ratios by number (negative number of elements), // the ratio array is changed to the ratio by weight, so all successive // calls with the same array must specify the number of elements as // positive // - AliMixture(38, "POLYETHYLEN$", apoly, zpoly, .95, 2, wpoly); - AliMixture(58, "POLYETHYLEN$", apoly, zpoly, .95, 2, wpoly); + AliMixture(38, "POLYETHYLEN1$", apoly, zpoly, .95, 2, wpoly); + AliMixture(58, "POLYETHYLEN2$", apoly, zpoly, .95, 2, wpoly); // // stainless Steel - AliMixture(19, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel); - AliMixture(39, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel); - AliMixture(59, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel); + AliMixture(19, "STAINLESS STEEL0$", asteel, zsteel, 7.88, 4, wsteel); + AliMixture(39, "STAINLESS STEEL1$", asteel, zsteel, 7.88, 4, wsteel); + AliMixture(59, "STAINLESS STEEL2$", asteel, zsteel, 7.88, 4, wsteel); // // Insulation powder - AliMixture(14, "INSULATION$", ains, zins, 0.41, 4, wins); - AliMixture(34, "INSULATION$", ains, zins, 0.41, 4, wins); - AliMixture(54, "INSULATION$", ains, zins, 0.41, 4, wins); + AliMixture(14, "INSULATION0$", ains, zins, 0.41, 4, wins); + AliMixture(34, "INSULATION1$", ains, zins, 0.41, 4, wins); + AliMixture(54, "INSULATION2$", ains, zins, 0.41, 4, wins); // Polymere Concrete - AliMixture(20, "Poly Concrete$", aPolyCc, zPolyCc, 3.53, -9, wPolyCc); - AliMixture(40, "Poly Concrete$", aPolyCc, zPolyCc, 3.53, 9, wPolyCc); - AliMixture(60, "Poly Concrete$", aPolyCc, zPolyCc, 3.53, 9, wPolyCc); + AliMixture(20, "Poly Concrete0$", aPolyCc, zPolyCc, 3.53, -9, wPolyCc); + AliMixture(40, "Poly Concrete1$", aPolyCc, zPolyCc, 3.53, 9, wPolyCc); + AliMixture(60, "Poly Concrete2$", aPolyCc, zPolyCc, 3.53, 9, wPolyCc); // // **************** @@ -238,6 +241,9 @@ void AliABSO::CreateMaterials() AliMedium(29, "ALU_C1 ", 29, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); AliMedium(49, "ALU_C2 ", 49, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); // + // Magnesium + AliMedium(7, "MG_C0 ", 7, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + // // Iron AliMedium(10, "FE_C0 ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); AliMedium(30, "FE_C1 ", 30, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); @@ -252,6 +258,7 @@ void AliABSO::CreateMaterials() AliMedium(12, "W_C0 ", 12, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); AliMedium(32, "W_C1 ", 32, 0, isxfld, sxmgmx, tmaxfd, -stemax, deemax, epsil, stmin); AliMedium(52, "W_C2 ", 52, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + // // Ni/Tungsten AliMedium(21, "Ni/W0 ", 21, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); AliMedium(41, "Ni/W1 ", 41, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);