//
// 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
//
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};
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, "ALUMINIUM0$", 26.98, 13., 2.7, 8.9, 37.2);
AliMaterial(29, "ALUMINIUM1$", 26.98, 13., 2.7, 8.9, 37.2);
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);
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);
//
TGeoMedium* kMedNiW = gGeoManager->GetMedium("ABSO_Ni/W0");
TGeoMedium* kMedNiWsh = gGeoManager->GetMedium("ABSO_Ni/W3");
+//
TGeoMedium* kMedSteel = gGeoManager->GetMedium("ABSO_ST_C0");
TGeoMedium* kMedSteelSh = gGeoManager->GetMedium("ABSO_ST_C3");
+//
TGeoMedium* kMedAir = gGeoManager->GetMedium("ABSO_AIR_C0");
-
+//
TGeoMedium* kMedPb = gGeoManager->GetMedium("ABSO_PB_C0");
TGeoMedium* kMedPbSh = gGeoManager->GetMedium("ABSO_PB_C2");
-
- TGeoMedium* kMedConc = gGeoManager->GetMedium("ABSO_CC_C0");
-
- TGeoMedium* kMedCH2 = gGeoManager->GetMedium("ABSO_CH2_C0");
-
+//
+ TGeoMedium* kMedConcSh = gGeoManager->GetMedium("ABSO_CC_C2");
+//
+ TGeoMedium* kMedCH2Sh = gGeoManager->GetMedium("ABSO_CH2_C2");
+//
TGeoMedium* kMedC = gGeoManager->GetMedium("ABSO_C_C0");
TGeoMedium* kMedCsh = gGeoManager->GetMedium("ABSO_C_C2");
-
+//
TGeoMedium* kMedAlu = gGeoManager->GetMedium("ABSO_ALU_C0");
+//
+ TGeoMedium* kMedMg = gGeoManager->GetMedium("ABSO_MG_C0");
//
const Float_t kDegRad = TMath::Pi() / 180.;
TGeoVolume* voFaWPlateA = new TGeoVolume("AFaWPlateA", shFaWPlateA, kMedNiW);
// Inner region with higher transport cuts
- TGeoPcon* shFaWPlateAI = new TGeoPcon(0., 360., 6);
+ TGeoPcon* shFaWPlateAI = new TGeoPcon(0., 360., 5);
z = 3.;
shFaWPlateAI->DefineSection(0, z, rInFaQPlateF + z * angle10, rOuFaQPlateC1 + (z - dzFaWPlateF) * angle24);
for (Int_t i = 1; i < 5; i++) {
TGeoVolume* voFaGraphiteCone = new TGeoVolume("AFaGraphiteCone", shFaGraphiteCone, kMedCsh);
//
// Outer region with lower transport cuts
- dz = 40.;
+ dz = 50.;
TGeoCone* shFaGraphiteConeO = new TGeoCone(dz/2.,
rInFaGraphiteCone1, rOuFaGraphiteCone1,
rInFaGraphiteCone1, rOuFaGraphiteCone1 + dz * angle10);
new TGeoCone(dzFaConcreteCone/2.,
rInFaConcreteCone1, rOuFaConcreteCone1,
rInFaConcreteCone2, rOuFaConcreteCone2),
- kMedConc);
+ kMedConcSh);
// Pos 14
///////////////////////////////////
new TGeoCone(dzFaCH2Cone/2.,
rInFaCH2Cone1, rInFaCH2Cone1 + dFaCH2Cone,
rInFaCH2Cone2, rInFaCH2Cone2 + dFaCH2Cone),
- kMedCH2);
+ kMedCH2Sh);
// Pos 15
rInFaSteelCone31A, rOuFaSteelCone31A,
rInFaSteelCone31B, rOuFaSteelCone31B),
kMedSteelSh);
- // Inner Region with higher transport cuts
+ // Outer Rregion with higher transport cuts
dz = 5.;
TGeoVolume* voFaSteelCone31I = new TGeoVolume("AFaSteelCone31I",
- new TGeoCone(dz/2.,
- rInFaSteelCone31B - dz * angle03,
- rOuFaSteelCone31B - dz * angle10,
- rInFaSteelCone31B, rOuFaSteelCone31B),
+ new TGeoCone(dz/2.,
+ rInFaSteelCone31B - dz * angle03,
+ rOuFaSteelCone31B - dz * angle10,
+ rInFaSteelCone31B, rOuFaSteelCone31B),
kMedSteel);
voFaSteelCone31->AddNode(voFaSteelCone31I, 1, new TGeoTranslation(0., 0., dzFaSteelCone31/2. - dz/2.));
shFaMgRing->DefineSection(6, z, rInFaMgRingO, rInFaCompRing2);
z += dzFaMgRingO;
shFaMgRing->DefineSection(7, z, rInFaMgRingO, rInFaCompRing2);
-
- TGeoVolume* voFaMgRing = new TGeoVolume("AFaMgRing", shFaMgRing, kMedNiW);
+ TGeoVolume* voFaMgRing = new TGeoVolume("AFaMgRing", shFaMgRing, kMedMg);
//