//
// Constants
const Float_t kEps = 0.01;
- const Int_t kAir = idtmed[2004];
- const Int_t kSteel = idtmed[2064];
+ const Int_t kAir = idtmed[2004];
+ const Int_t kSteel = idtmed[2064];
- const Float_t krad2deg = 180./TMath::Pi();
- const Float_t kdeg2rad = 1./krad2deg;
+ const Float_t krad2deg = 180. / TMath::Pi();
+ const Float_t kdeg2rad = 1. / krad2deg;
- Float_t iFrH = 114.40;
- Float_t ringH = 6.00;
- Float_t ringW = 10.00;
+ Float_t iFrH = 118.66; // Height of inner frame
+ Float_t ringH = 6.00; // Height of the ring bars
+ Float_t ringW = 9.00; // Width of the ring bars in z
Float_t longH = 6.00;
Float_t longW = 4.00;
Float_t dwl = 3.14;
// The outer Frame
//
- Float_t dol = 8.75;
- Float_t doh = 5.;
- Float_t ds = 0.35;
+ Float_t dol = 4.;
+ Float_t doh = 4.;
+ Float_t ds = 0.63;
//
// Mother volume
//
ppgon[3] = 2.;
ppgon[4] = -350.;
- ppgon[5] = 399.;
-// ppgon[6] = 420.7122;
+ ppgon[5] = 401.35;
ppgon[6] = 415.6;
ppgon[7] = -ppgon[4];
//
// longitudinal bars
//
-// 170x200x5
+// 80 x 80 x 6.3
//
pbox[0] = dol;
pbox[1] = doh;
gMC->Gsvolu("B034", "BOX", kAir, pbox, 3);
gMC->Gspos("B034", 1, "B033", 0., 0., 0., 0, "ONLY");
- pbox[0] = 1.0;
+ pbox[0] = 0.9;
pbox[1] = 5.0;
pbox[2] = 375.5;
gMC->Gsvolu("B080", "BOX", kSteel, pbox, 3);
- gMC->Gspos("B080", 1, "B077", 286.01, 0., 0., 0, "ONLY");
- gMC->Gspos("B080", 2, "B077", -286.01, 0., 0., 0, "ONLY");
+ gMC->Gspos("B080", 1, "B077", 285.3, 0., 0., 0, "ONLY");
+ gMC->Gspos("B080", 2, "B077", -285.3, 0., 0., 0, "ONLY");
//
// Diagonal bars (1)
AliMatrix(idrotm[2032], 0.0, 0.0, 90.0, 190.0, 90.0, 100.0);
AliMatrix(idrotm[2033], 0.0, 0.0, 90.0, 350.0, 90.0, 80.0);
- Float_t rd = 410.56;
+ Float_t rd = 405.5;
dz = (dymodU[1]+dymodU[0])/2.;
Float_t dz2 = (dymodU[1]+dymodU[2])/2.;
gMC->Gspos("BM49", 7, "B076", dx, -dy, 0., idrotm[2025], "ONLY");
gMC->Gspos("BM49", 8, "B076", -dx, -dy, 0., idrotm[2024], "ONLY");
-
+//
// The internal frame
//
//
//
// Mother Volumes
//
- ptrd1[0] = 50.18;
- ptrd1[1] = 70.35;
- ptrd1[2] = 375.5;
- ptrd1[3] = 57.7;
+
+ ptrd1[0] = 49.8;
+ ptrd1[1] = 70.7;
+ ptrd1[2] = 376.0; // CBL 4/4/08
+ ptrd1[3] = iFrH / 2.;
- Float_t r = 341.8;
- Float_t rout1 = 410.564;
- Float_t rout2 = 415.2;
+ Float_t r = 342.0;
+ Float_t rout1 = 405.5;
+ Float_t rout2 = 411.5;
TString module[18];
for (i = 0; i < 18; i++) {
+
// Create volume i
char name[16];
Int_t mod = i + 13;
module[i] = name;
// Place volume i
- Float_t phi = i * 20.;
- Float_t phi2 = 270 + phi;
+ Float_t phi1 = i * 20.;
+ Float_t phi2 = 270 + phi1;
if (phi2 >= 360.) phi2 -= 360.;
- dx = TMath::Sin(phi*kdeg2rad)*r;
- dy = -TMath::Cos(phi*kdeg2rad)*r;
+ dx = TMath::Sin(phi1*kdeg2rad)*r;
+ dy = -TMath::Cos(phi1*kdeg2rad)*r;
- AliMatrix(idrotm[2034+i], 90.0, phi, 0., 0., 90., phi2);
+ AliMatrix(idrotm[2034+i], 90.0, phi1, 0., 0., 90., phi2);
gMC->Gspos(name, 1, "B077", dx, dy, 0., idrotm[2034+i], "ONLY");
+
//
// Position elements of outer Frame
//
- dx = TMath::Sin(phi*kdeg2rad)*rout1;
- dy = -TMath::Cos(phi*kdeg2rad)*rout1;
+ dx = TMath::Sin(phi1*kdeg2rad)*rout1;
+ dy = -TMath::Cos(phi1*kdeg2rad)*rout1;
for (j = 0; j < 3; j++)
{
dz = dymodU[j];
gMC->Gspos("B042", 6*i+2*j+2, "B076", dx, dy, -dz, idrotm[2034+i], "ONLY");
}
- phi = i*20.+10;
- phi2 = 270+phi;
- AliMatrix(idrotm[2052+i], 90.0, phi, 90., phi2, 0., 0.);
+ phi1 = i*20.+10;
+ phi2 = 270+phi1;
+ AliMatrix(idrotm[2052+i], 90.0, phi1, 90., phi2, 0., 0.);
- dx = TMath::Sin(phi*kdeg2rad)*rout2;
- dy = -TMath::Cos(phi*kdeg2rad)*rout2;
+ dx = TMath::Sin(phi1*kdeg2rad)*rout2;
+ dy = -TMath::Cos(phi1*kdeg2rad)*rout2;
gMC->Gspos("B033", i+1, "B076", dx, dy, 0., idrotm[2052+i], "ONLY");
//
}
// Internal Frame rings
//
//
-// new specs: 40x100x6 for inner rings
-// 30x135x6 for front and rear rings
+// new specs: 40x90x60 for inner rings
+// 30x135x60 for front and rear rings
//
// currently no distinction between front/rear and inner rings
//
//
//
- pbox[0] = 50.;
- pbox[1] = ringW/2.;
- pbox[2] = ringH/2.;
+ ptrd1[0] = 287. * TMath::Sin(10.* kdeg2rad) - 2.1;
+ ptrd1[1] = 293. * TMath::Sin(10.* kdeg2rad) - 2.1;
+ ptrd1[2] = ringW/2.;
+ ptrd1[3] = ringH/2.;
- gMC->Gsvolu("B072", "BOX ", kSteel, pbox, 3);
+ gMC->Gsvolu("B072", "TRD1", kSteel, ptrd1, 4);
+
+ ptrd1[0] = 287.5 * TMath::Sin(10. * kdeg2rad) - 2.1;
+ ptrd1[1] = 292.5 * TMath::Sin(10. * kdeg2rad) - 2.1;
+ ptrd1[2] = ringW / 2. - 0.5;
+ ptrd1[3] = ringH / 2. - 0.5;
- pbox[1] = pbox[1] - 0.5;
- pbox[2] = pbox[2] - 0.5;
- gMC->Gsvolu("B073", "BOX ", kAir, pbox, 3);
+ gMC->Gsvolu("B073", "TRD1", kAir, ptrd1, 4);
gMC->Gspos("B073", 1, "B072", 0., 0., 0., 0, "ONLY");
// Web frame 0-degree
// h x w x s = 60x40x4
// (attention: element is are half bars, "U" shaped)
//
- dz = 106.2;
+ dz = 114.5;
d = 2.*dwl;
h = dymodU[0]-dymodL[0];
dq = h*h+dz*dz;
theta = TMath::ACos(x);
Float_t thetaP = (TMath::Pi()-theta)*krad2deg;
- ptrap[0] = dz/2.;
+ ptrap[0] = dz/2. - 0.15;
ptrap[1] = thetaP;
ptrap[2] = 0.;
ptrap[3] = dwh;
gMC->Gspos("B064", 1, "B063", 0.0, -0.2, 0., 0, "ONLY");
- h = 106.2;
+ h = 114.5;
d = 2.*dwl;
dz = dymodU[1]-dymodL[1];
dq = h*h+dz*dz;
pbox[0] = dwh;
pbox[1] = dwl;
- pbox[2] = (iFrH-ringH-longH)/2.;
+ pbox[2] = 114.5 / 2.;
gMC->Gsvolu("B263", "BOX ", kSteel, pbox, 3);
pbox[0] = dwh-0.2;
pbox[1] = dwl-0.4;
//
// web frame diagonal (outer)
//
- h = 106.2;
+ h = 114.5;
d = 2.*dwl;
dz = dymodL[2]-dymodU[1]-dwl;
dq = h*h+dz*dz;
theta = krad2deg * TMath::ACos(x);
- ptrap[0] = dz/2.;
+ ptrap[0] = dz/2 - 0.15;
ptrap[1] = theta;
ptrap[2] = 0.;
ptrap[3] = dwh;
dz = -iFrH/2.+ringH/2.+kEps;
+ Float_t dz0 = 3. - 0.22;
+ Float_t dx0 = 60.82 - 1.066;
for (jmod = 0; jmod< 18; jmod++)
{
// 0-deg web
if (i == 2) {
- gMC->Gspos("B263", 4*jmod+1, module[jmod], 60.0732, dymodU[2], 4.6669, idrotm[2072], "ONLY");
- gMC->Gspos("B263", 4*jmod+2, module[jmod], 60.0732, -dymodU[2], 4.6669, idrotm[2071], "ONLY");
- gMC->Gspos("B263", 4*jmod+3, module[jmod], -60.0732, dymodU[2], 4.6669, idrotm[2074], "ONLY");
- gMC->Gspos("B263", 4*jmod+4, module[jmod], -60.0732, -dymodU[2], 4.6669, idrotm[2073], "ONLY");
+ gMC->Gspos("B263", 4*jmod+1, module[jmod], dx0, dymodU[2], dz0, idrotm[2072], "ONLY");
+ gMC->Gspos("B263", 4*jmod+2, module[jmod], dx0, -dymodU[2], dz0, idrotm[2071], "ONLY");
+ gMC->Gspos("B263", 4*jmod+3, module[jmod], -dx0, dymodU[2], dz0, idrotm[2074], "ONLY");
+ gMC->Gspos("B263", 4*jmod+4, module[jmod], -dx0, -dymodU[2], dz0, idrotm[2073], "ONLY");
}
}
}
// outer diagonal web
dy = (dymodU[0]+dymodL[0])/2.;
+
+
for (jmod = 0; jmod < 18; jmod++) {
- gMC->Gspos("B063", 4*jmod+1, module[jmod], 60.0732, dy, 4.6669, idrotm[2086], "ONLY");
- gMC->Gspos("B063", 4*jmod+2, module[jmod], 60.0732, -dy, 4.6669, idrotm[2087], "ONLY");
- gMC->Gspos("B063", 4*jmod+3, module[jmod], -60.0732, dy, 4.6669, idrotm[2088], "ONLY");
- gMC->Gspos("B063", 4*jmod+4, module[jmod], -60.0732, -dy, 4.6669, idrotm[2089], "ONLY");
+ gMC->Gspos("B063", 4*jmod+1, module[jmod], dx0, dy, dz0, idrotm[2086], "ONLY");
+ gMC->Gspos("B063", 4*jmod+2, module[jmod], dx0, -dy, dz0, idrotm[2087], "ONLY");
+ gMC->Gspos("B063", 4*jmod+3, module[jmod], -dx0, dy, dz0, idrotm[2088], "ONLY");
+ gMC->Gspos("B063", 4*jmod+4, module[jmod], -dx0, -dy, dz0, idrotm[2089], "ONLY");
}
dy = (dymodU[1]+dymodL[1])/2.;
for (jmod = 0; jmod < 18; jmod++) {
- gMC->Gspos("B163", 4*jmod+1, module[jmod], 60.0732, dy, 4.6669, idrotm[2080], "ONLY");
- gMC->Gspos("B163", 4*jmod+2, module[jmod], 60.0732, -dy, 4.6669, idrotm[2079], "ONLY");
- gMC->Gspos("B163", 4*jmod+3, module[jmod], -60.0732, dy, 4.6669, idrotm[2082], "ONLY");
- gMC->Gspos("B163", 4*jmod+4, module[jmod], -60.0732, -dy, 4.6669, idrotm[2081], "ONLY");
+ gMC->Gspos("B163", 4*jmod+1, module[jmod], dx0, dy, dz0, idrotm[2080], "ONLY");
+ gMC->Gspos("B163", 4*jmod+2, module[jmod], dx0, -dy, dz0, idrotm[2079], "ONLY");
+ gMC->Gspos("B163", 4*jmod+3, module[jmod], -dx0, dy, dz0, idrotm[2082], "ONLY");
+ gMC->Gspos("B163", 4*jmod+4, module[jmod], -dx0, -dy, dz0, idrotm[2081], "ONLY");
}
dy = (dymodL[2]+dymodU[1])/2.-dwl/2.;
for (jmod = 0; jmod < 18; jmod++) {
- gMC->Gspos("B065", 4*jmod+1, module[jmod], 60.0732, dy, 4.6669, idrotm[2076], "ONLY");
- gMC->Gspos("B065", 4*jmod+2, module[jmod], 60.0732, -dy, 4.6669, idrotm[2075], "ONLY");
- gMC->Gspos("B065", 4*jmod+3, module[jmod], -60.0732, dy, 4.6669, idrotm[2078], "ONLY");
- gMC->Gspos("B065", 4*jmod+4, module[jmod], -60.0732, -dy, 4.6669, idrotm[2077], "ONLY");
+ gMC->Gspos("B065", 4*jmod+1, module[jmod], dx0, dy, dz0 + 0.14, idrotm[2076], "ONLY");
+ gMC->Gspos("B065", 4*jmod+2, module[jmod], dx0, -dy, dz0 + 0.14, idrotm[2075], "ONLY");
+ gMC->Gspos("B065", 4*jmod+3, module[jmod], -dx0, dy, dz0 + 0.14, idrotm[2078], "ONLY");
+ gMC->Gspos("B065", 4*jmod+4, module[jmod], -dx0, -dy, dz0 + 0.14, idrotm[2077], "ONLY");
}
dy = (dymodL[1]+dymodU[0])/2.;
for (jmod = 0; jmod < 18; jmod++) {
- gMC->Gspos("B067", 4*jmod+1, module[jmod], 60.0732, dy, 4.6669, idrotm[2076], "ONLY");
- gMC->Gspos("B067", 4*jmod+2, module[jmod], 60.0732, -dy, 4.6669, idrotm[2075], "ONLY");
- gMC->Gspos("B067", 4*jmod+3, module[jmod], -60.0732, dy, 4.6669, idrotm[2078], "ONLY");
- gMC->Gspos("B067", 4*jmod+4, module[jmod], -60.0732, -dy, 4.6669, idrotm[2077], "ONLY");
+ gMC->Gspos("B067", 4*jmod+1, module[jmod], dx0, dy, dz0, idrotm[2076], "ONLY");
+ gMC->Gspos("B067", 4*jmod+2, module[jmod], dx0, -dy, dz0, idrotm[2075], "ONLY");
+ gMC->Gspos("B067", 4*jmod+3, module[jmod], -dx0, dy, dz0, idrotm[2078], "ONLY");
+ gMC->Gspos("B067", 4*jmod+4, module[jmod], -dx0, -dy, dz0, idrotm[2077], "ONLY");
}
// longitudinal bars (TPC rails attached)
gMC->Gsvolu("BA62", "TRAP", kAir, ptrap, 11);
gMC->Gspos("BA62", 1, "BA59", 0.0, 0.0, -0.15, 0, "ONLY");
- dz = -iFrH/2.+ringH+longH/2.;
+ dz = -iFrH/2. + longH/2.;
for (jmod = 0; jmod < 18; jmod++) {
- gMC->Gspos("BA59", 2*jmod+1, module[jmod], 49.6476, 0.0, dz, idrotm[2084], "ONLY");
- gMC->Gspos("BA59", 2*jmod+2, module[jmod], -49.6476, 0.0, dz, idrotm[2083], "ONLY");
+ gMC->Gspos("BA59", 2*jmod+1, module[jmod], 49.31, 0.0, dz, idrotm[2084], "ONLY");
+ gMC->Gspos("BA59", 2*jmod+2, module[jmod], -49.31, 0.0, dz, idrotm[2083], "ONLY");
}
// Thermal shield
//
- Float_t dyM = 99.0 - 4.;
+ Float_t dyM = 99.0 - 1.;
MakeHeatScreen("M", dyM, idrotm[2090], idrotm[2091]);
Float_t dyAM = 119.5 - 5.;
MakeHeatScreen("AM", dyAM, idrotm[2090], idrotm[2091]);
ptrd1[2] = 375.5; // CBL
ptrd1[3] = 38.95; // CBL
-
-
for (i = 0; i < 18; i++) {
char nameCh[16];
sprintf(nameCh, "BTRD%d",i);
sprintf(nameMo, "BSEGMO%d",i);
gMC->Gsvolu(nameCh, "TRD1", kAir, ptrd1, 4);
gGeoManager->GetVolume(nameCh)->SetVisibility(kFALSE);
- gMC->Gspos(nameCh, 1, nameMo, 0., 0., -11.75, 0, "ONLY"); // CBL 28/6/2006
+ gMC->Gspos(nameCh, 1, nameMo, 0., 0., -12.62, 0, "ONLY"); // CBL 28/6/2006
}
//
ptrd1[0] = 62.2500;
ptrd1[1] = 67.3631;
ptrd1[2] = 373.6;
- ptrd1[3] = 14.5;
+ ptrd1[3] = 14.525; //AdC
for (i = 0; i < 18; i++) {
char nameCh[16];
sprintf(nameCh, "BTOF%d",i);
sprintf(nameMo, "BSEGMO%d",i);
gMC->Gsvolu(nameCh, "TRD1", kAir, ptrd1, 4);
gGeoManager->GetVolume(nameCh)->SetVisibility(kFALSE);
- gMC->Gspos(nameCh, 1, nameMo, 0., 0., 42.69, 0, "ONLY");
+ gMC->Gspos(nameCh, 1, nameMo, 0., 0., 43.525, 0, "ONLY"); //AdC
}
//
tpar[1] = kBFMRou;
tpar[2] = kBFMdz / 2.;
gMC->Gsvolu("BFMO", "TUBE", kAir, tpar, 3);
+
+ // CBL ////////////////////////////////////////////////////////
+ //
+ // TRD mother volume
+ //
+
+ ptrd1[0] = 47.4405 - 0.3;
+ ptrd1[1] = 61.1765 - 0.3;
+ ptrd1[2] = kBFMdz / 2.;
+ ptrd1[3] = 38.95;
+ gMC->Gsvolu("BFTRD", "TRD1", kAir, ptrd1, 4);
+ gGeoManager->GetVolume("BFTRD")->SetVisibility(kFALSE);
+
+ for (i = 0; i < 18; i++) {
+
+ Float_t phiBF = i * 20.0;
+ dx = TMath::Sin(phiBF*kdeg2rad)*(342.0-12.62);
+ dy = -TMath::Cos(phiBF*kdeg2rad)*(342.0-12.62);
+ gMC->Gspos("BFTRD",i,"BFMO",dx,dy,0.0,idrotm[2034+i],"ONLY");
+
+ }
+
+ // CBL ////////////////////////////////////////////////////////
// Rings
//
for (i = 0; i < 18; i++)
{
- Float_t ro = kBFMRou - kBFBd / 2.;
+ Float_t ro = kBFMRou - kBFBd / 2. - 0.02;
Float_t ri = kBFMRin + kBFBd / 2.;
- Float_t phi = Float_t(i) * 20.;
+ Float_t phi0 = Float_t(i) * 20.;
- Float_t x = ri * TMath::Cos(phi * kDegrad);
- Float_t y = ri * TMath::Sin(phi * kDegrad);
- AliMatrix(idrotm[2090+i], 90.0, phi, 90.0, phi + 270., 0., 0.);
+ Float_t xb = ri * TMath::Cos(phi0 * kDegrad);
+ Float_t yb = ri * TMath::Sin(phi0 * kDegrad);
+ AliMatrix(idrotm[2090+i], 90.0, phi0, 90.0, phi0 + 270., 0., 0.);
- gMC->Gspos("BFLB", i + 1, "BFMO", x, y, 0., idrotm[2090 + i], "ONLY");
+ gMC->Gspos("BFLB", i + 1, "BFMO", xb, yb, 0., idrotm[2090 + i], "ONLY");
- x = ro * TMath::Cos(phi * kDegrad);
- y = ro * TMath::Sin(phi * kDegrad);
+ xb = ro * TMath::Cos(phi0 * kDegrad);
+ yb = ro * TMath::Sin(phi0 * kDegrad);
- gMC->Gspos("BFLB", i + 19, "BFMO", x, y, 0., idrotm[2090 +i], "ONLY");
+ gMC->Gspos("BFLB", i + 19, "BFMO", xb, yb, 0., idrotm[2090 +i], "ONLY");
}
//
for (i = 0; i < 10; i++)
{
- Float_t r = (kBFMRin + kBFMRou)/2.;
- Float_t phi = Float_t(iphi[i]) * 20.;
+ Float_t rb = (kBFMRin + kBFMRou)/2.;
+ Float_t phib = Float_t(iphi[i]) * 20.;
- Float_t x = r * TMath::Cos(phi * kDegrad);
- Float_t y = r * TMath::Sin(phi * kDegrad);
+ Float_t xb = rb * TMath::Cos(phib * kDegrad);
+ Float_t yb = rb * TMath::Sin(phib * kDegrad);
- gMC->Gspos("BFRB", i + 1, "BFMO", x, y, dz, idrotm[2034 + iphi[i]], "ONLY");
- gMC->Gspos("BFRB", i + 11, "BFMO", x, y, -dz, idrotm[2034 + iphi[i]], "ONLY");
+ gMC->Gspos("BFRB", i + 1, "BFMO", xb, yb, dz, idrotm[2034 + iphi[i]], "ONLY");
+ gMC->Gspos("BFRB", i + 11, "BFMO", xb, yb, -dz, idrotm[2034 + iphi[i]], "ONLY");
}
gMC->Gsvolu("BBMO", "PGON", kAir, ppgon, 10);
gMC->Gsdvn("BBCE", "BBMO", 18, 2);
+ // CBL ////////////////////////////////////////////////////////
+ //
+ // TRD mother volume
+ //
+
+ AliMatrix(idrotm[2092], 90.0, 90.0, 0.0, 0.0, 90.0, 0.0);
+
+ ptrd1[0] = 47.4405 - 2.5;
+ ptrd1[1] = 61.1765 - 2.5;
+ ptrd1[2] = kBBMdz / 2.;
+ ptrd1[3] = 38.95;
+ gMC->Gsvolu("BBTRD", "TRD1", kAir, ptrd1, 4);
+ gGeoManager->GetVolume("BBTRD")->SetVisibility(kFALSE);
+ gMC->Gspos("BBTRD", 1, "BBCE", 342.0-12.62, 0.0, 0.0, idrotm[2092], "ONLY");
+
+ // CBL ////////////////////////////////////////////////////////
+
// Longitudinal bars
bpar[0] = kBBBdz/2.;
bpar[1] = bpar[0];
char t5name[128];
//
- Float_t dxP = 98.5;
+ Float_t dxP = 2. * (287. * TMath::Sin(10.* TMath::Pi()/180.) - 2.);
Float_t dzP = 1.05;
//
// Mother volume
Float_t thshT[3];
thshT[0] = 0.4;
thshT[1] = 0.5;
- thshT[2] = (dyP / 2. - 6.);
+ thshT[2] = (dyP / 2. - 8.);
//
sprintf(t1name, "BTSHT1_%s", name);
gMC->Gsvolu(t1name, "TUBE", kAlu, thshT, 3);
- dx = - dxP / 2. + 8.;
- gMC->Gspos(t1name, 1, mname, dx, 0., 0.05, rot1);
- gMC->Gspos(t1name, 2, mname, -dx, 0., 0.05, rot1);
+ dx = - dxP / 2. + 8. - 0.5;
+ gMC->Gspos(t1name, 1, mname, dx, 0., 0.025, rot1);
//
sprintf(t2name, "BTSHT2_%s", name);
sprintf(t3name, "BTSHT3_%s", name);
gMC->Gsvolu(t3name, "TUBE", kAlu, thshT, 3);
thshT[2] = 23.9/2.;
gMC->Gsvolu(t4name, "TUBE", kAlu, thshT, 3);
- thshT[2] = 9.0/2.;
- gMC->Gsvolu(t5name, "TUBE", kAlu, thshT, 3);
- gMC->Gspos(t5name, 0, mname, -dx - 4., - (dyP / 2. - 5.5), 0.05, rot2);
Int_t sig = 1;
Int_t ipo = 1;
Float_t dy1 = - (thshM[1] - 15.5) * sig;
Float_t dy2 = - (thshM[1] - 7.5) * sig;
- gMC->Gspos(t2name, ipo++, mname, dx, dy, 0.05, rot1);
+ gMC->Gspos(t2name, ipo++, mname, dx, dy, 0.025, rot1);
dx += 6.9;
- gMC->Gspos(t2name, ipo++, mname, dx, dy, 0.05, rot1);
+ gMC->Gspos(t2name, ipo++, mname, dx, dy, 0.025, rot1);
- gMC->Gspos(t3name, i+1, mname, dx - 3.45, dy1, 0.05, rot2);
- gMC->Gspos(t4name, i+1, mname, dx - 3.45, dy2, 0.05, rot2);
+ gMC->Gspos(t3name, i+1, mname, dx - 3.45, dy1, 0.025, rot2);
+ gMC->Gspos(t4name, i+1, mname, dx - 3.45, dy2, 0.025, rot2);
}
+ dx += 8.;
+ gMC->Gspos(t1name, 2, mname, dx, 0., 0.025, rot1);
+ gMC->Gspos(t3name, 6, mname, dx - 3.45, -(thshM[1] - 7.5), 0.025, rot2);
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff