// Front insert
Float_t dzSteelEnvelopeFI = 1.;
Float_t rInSteelEnvelopeFI = 42.0/2.;
- Float_t rOuSteelEnvelopeFI = 85.0/2.;
+ Float_t rOuSteelEnvelopeFI = 85.0/2.+ 0.06;
TGeoPcon* shFaSteelEnvelopeC = new TGeoPcon(0., 360., 7);
z = 0.;
for (Int_t i = 1; i < 5; i++) {
Float_t rmin = shFaWPlateA->GetRmin(i+2);
Float_t rmax = shFaWPlateA->GetRmax(i+2) - 3.;
- Float_t z = shFaWPlateA->GetZ(i+2);
- shFaWPlateAI->DefineSection(i, z, rmin, rmax);
+ Float_t zpos = shFaWPlateA->GetZ(i+2);
+ shFaWPlateAI->DefineSection(i, zpos, rmin, rmax);
}
TGeoVolume* voFaWPlateAI = new TGeoVolume("AFaWPlateAI", shFaWPlateAI, kMedNiWsh);
voFaWPlateA->AddNode(voFaWPlateAI, 1, gGeoIdentity);
Float_t rInFaWTube2C1 = 9.10/2.;
Float_t rInFaWTube2C2 = 12.58/2.;
Float_t rOuFaWTube2C1 = 20.70/2.;
- Float_t rOuFaWTube2C2 = 30.72/2.;
+ Float_t rOuFaWTube2C2 = 30.72/2.- 0.05;
// Front Flange
Float_t dzFaWTube2F = 0.6;
Float_t rInFaWTube2F = 15.4/2.;
// 2nd section
Float_t dzFaCompRing2 = 1.2;
Float_t rInFaCompRing2 = 14.0/2.;
- Float_t rOuFaCompRing2 = 34.3/2.;
+ Float_t rOuFaCompRing2 = 35.3/2.;
TGeoPcon* shFaCompRing = new TGeoPcon(0., 360., 4);
z = 0.;
// Assemble volumes inside acceptance
TGeoPcon* shFaAccM = new TGeoPcon(0., 360., 7);
for (Int_t i = 0; i < 4; i++) {
- Float_t z = shFaGraphiteCone->GetZ(i);
+ Float_t zpos = shFaGraphiteCone->GetZ(i);
Float_t rmin = shFaGraphiteCone->GetRmin(i);
Float_t rmax = shFaGraphiteCone->GetRmax(i);
- shFaAccM->DefineSection(i, z, rmin, rmax);
+ shFaAccM->DefineSection(i, zpos, rmin, rmax);
}
z = dzFaGraphiteCone + dzFaConcreteCone + dzFaSteelCone25;
z0 = z + zFa + dzFaFlange;
voFA->AddNode(voFaM, 1, gGeoIdentity);
voFA->AddNode(voFaEndPlate, 1, new TGeoTranslation(0., 0., dzFa + dzEndPlate/2.));
voFA->AddNode(voFass, 1, new TGeoTranslation(0., 0., 388.45));
- voFA->AddNode(voFassAlRing, 1, new TGeoTranslation(0., 0., 382. - 3.5));
+ voFA->AddNode(voFassAlRing, 1, new TGeoTranslation(0., 0., 382. - 3.56));
top->AddNode(voFA, 1, new TGeoCombiTrans(0., 0., -90., rotxz));
}