Skip to content

Commit 5166902

Browse files
amorschsawenzel
authored andcommitted
extension of barrel volume to avoid extrusion of FOCAL
1 parent 7994d1e commit 5166902

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

Detectors/Passive/src/Cave.cxx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,23 +85,27 @@ void Cave::ConstructGeometry()
8585
shCaveTR1->DefineSection(0, -706. - 8.6, 0., 790.5);
8686
shCaveTR1->DefineSection(1, 707. + 7.6, 0., 790.5);
8787
TGeoTube* shCaveTR2 = new TGeoTube("shCaveTR2", 0., 150., 110.);
88+
TGeoTube* shCaveTR3 = new TGeoTube("shCaveTR3", 0., 80., 75.);
8889

8990
TGeoTranslation* transCaveTR2 = new TGeoTranslation("transTR2", 0, 30., -505. - 110.);
91+
TGeoTranslation* transCaveTR3 = new TGeoTranslation("transTR3", 0, 30., 714.6 + 75.);
9092
transCaveTR2->RegisterYourself();
91-
TGeoCompositeShape* shCaveTR = new TGeoCompositeShape("shCaveTR", "shCaveTR1-shCaveTR2:transTR2");
93+
transCaveTR3->RegisterYourself();
94+
95+
TGeoCompositeShape* shCaveTR = new TGeoCompositeShape("shCaveTR", "shCaveTR1-shCaveTR2:transTR2+shCaveTR3:transTR3");
9296
TGeoVolume* voBarrel = new TGeoVolume("barrel", shCaveTR, kMedAir);
9397
cavevol->AddNode(voBarrel, 1, new TGeoTranslation(0., -30., 0.));
9498
if (mHasRB24) { // should be not true only for alice 3
9599
// mother volume for RB24 side (FDD, Compensator)
96-
const Float_t kRB24CL = 2. * 597.9;
100+
const Float_t kRB24CL = 2. * 597.9 - 150.;
97101
auto shCaveRB24 = new TGeoPcon(0., 360., 6);
98-
Float_t z0 = kRB24CL / 2 + 714.6;
102+
Float_t z0 = kRB24CL / 2 + 714.6 + 150.;
99103
shCaveRB24->DefineSection(0, -kRB24CL / 2., 0., 105.);
100104
shCaveRB24->DefineSection(1, -z0 + 1705., 0., 105.);
101105
shCaveRB24->DefineSection(2, -z0 + 1705., 0., 14.5);
102-
shCaveRB24->DefineSection(3, -z0 + 1880., 0., 14.5);
103-
shCaveRB24->DefineSection(4, -z0 + 1880., 0., 40.0);
104-
shCaveRB24->DefineSection(5, kRB24CL / 2, 0., 40.0);
106+
shCaveRB24->DefineSection(3, -z0 + 1878, 0., 14.5);
107+
shCaveRB24->DefineSection(4, -z0 + 1878., 0., 40.0);
108+
shCaveRB24->DefineSection(5, kRB24CL / 2., 0., 40.0);
105109

106110
TGeoVolume* caveRB24 = new TGeoVolume("caveRB24", shCaveRB24, kMedAir);
107111
caveRB24->SetVisibility(0);

0 commit comments

Comments
 (0)