Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Fixing overlaps in Pipe volumes description #1865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sawenzel merged 2 commits into from
Apr 9, 2019
Merged

Fixing overlaps in Pipe volumes description #1865

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe526f6
Fixing overlaps in Pipe volumes description
Apr 9, 2019
b9927f0
Fixing coding conventions
Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 56 additions & 45 deletions 101 Detectors/Passive/src/Pipe.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ void Pipe::ConstructGeometry()
aluSideAVac->DefineSection(4, aluSideA->GetZ(8), 0., aluSideA->GetRmin(8));
aluSideAVac->DefineSection(5, aluSideA->GetZ(9), 0., aluSideA->GetRmin(9));
aluSideAVac->DefineSection(6, aluSideA->GetZ(10), 0., aluSideA->GetRmin(10));
aluSideAVac->DefineSection(7, aluSideA->GetZ(11) + 2 * flangeASteelRing->GetDz(), 0., aluSideA->GetRmin(11));
aluSideAVac->DefineSection(7, aluSideA->GetZ(11), 0., aluSideA->GetRmin(11));

TGeoVolume* voaluSideAVac = new TGeoVolume("aluSideAVac", aluSideAVac, kMedVac);
voaluSideAVac->SetLineColor(kGreen);
Expand Down Expand Up @@ -668,7 +668,7 @@ void Pipe::ConstructGeometry()
// Connection tube length
const Float_t kRB24B1ConTubeL = 2.5;
//
const Float_t kRB24B1CompL = 16.00; // Length of the compensator
const Float_t kRB24B1CompL = 16.375; // Length of the compensator
const Float_t kRB24B1BellowRi = 10.25 / 2.; // Bellow inner radius
const Float_t kRB24B1BellowRo = 11.40 / 2.; // Bellow outer radius
const Int_t kRB24B1NumberOfPlies = 27; // Number of plies
Expand All @@ -689,6 +689,13 @@ void Pipe::ConstructGeometry()
const Float_t kRB24B1L = kRB24B1CompL + 2. * (kRB24B1RFlangeL - kRB24B1RFlangeRecess);

///
//
// Bellow Section
TGeoVolume* voRB24B1Bellow = MakeBellow("RB24B1", kRB24B1NumberOfPlies, kRB24B1BellowRi, kRB24B1BellowRo,
kRB24B1BellowUndL, kRB24B1PlieRadius, kRB24B1PlieThickness);
voRB24B1Bellow->SetVisibility(0);
Float_t newRB24B1BellowUndL = 2 * (static_cast<TGeoTube*>(voRB24B1Bellow->GetShape()))->GetDz();

//
// Bellow mother volume
TGeoPcon* shRB24B1BellowM = new TGeoPcon(0., 360., 12);
Expand All @@ -704,7 +711,7 @@ void Pipe::ConstructGeometry()
shRB24B1BellowM->DefineSection(4, z, 0., kRB24B1ConTubeRou);
// Plie
shRB24B1BellowM->DefineSection(5, z, 0., kRB24B1BellowRo + kRB24B1ProtTubeThickness);
z += kRB24B1BellowUndL;
z += newRB24B1BellowUndL;
shRB24B1BellowM->DefineSection(6, z, 0., kRB24B1BellowRo + kRB24B1ProtTubeThickness);
shRB24B1BellowM->DefineSection(7, z, 0., kRB24B1ConTubeRou);
// Connection Tube and Flange
Expand All @@ -718,12 +725,6 @@ void Pipe::ConstructGeometry()

TGeoVolume* voRB24B1BellowM = new TGeoVolume("RB24B1BellowM", shRB24B1BellowM, kMedVac);
voRB24B1BellowM->SetVisibility(0);
//
// Bellow Section
TGeoVolume* voRB24B1Bellow = MakeBellow("RB24B1", kRB24B1NumberOfPlies, kRB24B1BellowRi, kRB24B1BellowRo,
kRB24B1BellowUndL, kRB24B1PlieRadius, kRB24B1PlieThickness);
voRB24B1Bellow->SetVisibility(0);

//
// End Parts (connection tube)
TGeoVolume* voRB24B1CT =
Expand All @@ -737,9 +738,9 @@ void Pipe::ConstructGeometry()
z = kRB24B1ConTubeL / 2. + (kRB24B1RFlangeL - kRB24B1RFlangeRecess);

voRB24B1BellowM->AddNode(voRB24B1CT, 1, new TGeoTranslation(0., 0., z));
z += (kRB24B1ConTubeL / 2. + kRB24B1BellowUndL / 2.);
z += (kRB24B1ConTubeL / 2. + newRB24B1BellowUndL / 2.);
voRB24B1BellowM->AddNode(voRB24B1Bellow, 1, new TGeoTranslation(0., 0., z));
z += (kRB24B1BellowUndL / 2. + kRB24B1ConTubeL / 2);
z += (newRB24B1BellowUndL / 2. + kRB24B1ConTubeL / 2);
voRB24B1BellowM->AddNode(voRB24B1CT, 2, new TGeoTranslation(0., 0., z));
z = kRB24B1ConTubeL + kRB24B1ProtTubeLength / 2. + 1. + kRB24B1RFlangeLO;
voRB24B1BellowM->AddNode(voRB24B1PT, 1, new TGeoTranslation(0., 0., z));
Expand Down Expand Up @@ -1050,8 +1051,7 @@ void Pipe::ConstructGeometry()
// Inner volume
//
TGeoVolume* voRB24ValveBoI = new TGeoVolume(
"RB24ValveBoI", new TGeoBBox(kRB24ValveBoWx / 2. - kRB24ValveBoD, kRB24ValveBoWy / 2. - kRB24ValveBoD / 2.,
kRB24ValveBoWz / 2. - kRB24ValveBoD),
"RB24ValveBoI", new TGeoBBox(kRB24ValveBoWx / 2. - kRB24ValveBoD, kRB24ValveBoWy / 2. - kRB24ValveBoD / 2., kRB24ValveBoWz / 2. - kRB24ValveBoD),
kMedVac);
voRB24ValveBo->AddNode(voRB24ValveBoI, 1, new TGeoTranslation(0., kRB24ValveBoD / 2., 0.));
//
Expand Down Expand Up @@ -1137,7 +1137,7 @@ void Pipe::ConstructGeometry()
const Float_t kRB24VMABCRBT1Ro = 10.3 / 2.;
const Float_t kRB24VMABCRBT1L = 11.5;
const Float_t kRB24VMABCRBT1L2 = 8.;
const Float_t kRB24VMABCL = 28.;
const Float_t kRB24VMABCL = 28.375;

TGeoTube* shRB24VMABCRBT1 = new TGeoTube(kRB24VMABCRBT1Ri, kRB24VMABCRBT1Ro, kRB24VMABCRBT1L / 2.);
shRB24VMABCRBT1->SetName("RB24VMABCRBT1");
Expand Down Expand Up @@ -1273,16 +1273,13 @@ void Pipe::ConstructGeometry()
// Tube 2
voRB24VMABCRB->AddNode(voRB24VMABCRBT2, 1, gGeoIdentity);
// Flange Tube 2
voRB24VMABCRB->AddNode(voRB24VMABCRBF2, 1, new TGeoCombiTrans(kRB24VMABCPy + kRB24VMABCRBF2L / 2., 0.,
kRB24VMABCTz - kRB24VMABCRBT1L / 2., rotxz));
voRB24VMABCRB->AddNode(voRB24VMABCRBF2, 1, new TGeoCombiTrans(kRB24VMABCPy + kRB24VMABCRBF2L / 2., 0., kRB24VMABCTz - kRB24VMABCRBT1L / 2., rotxz));
// Blank Flange Tube 2
voRB24VMABCRB->AddNode(voRB24VMABCRBF2B, 1, new TGeoCombiTrans(kRB24VMABCPy - kRB24VMABCRBF2L / 2., 0.,
kRB24VMABCTz - kRB24VMABCRBT1L / 2., rotxz));
voRB24VMABCRB->AddNode(voRB24VMABCRBF2B, 1, new TGeoCombiTrans(kRB24VMABCPy - kRB24VMABCRBF2L / 2., 0., kRB24VMABCTz - kRB24VMABCRBT1L / 2., rotxz));
// Tube 3
voRB24VMABCRB->AddNode(voRB24VMABCRBT3, 1, gGeoIdentity);
// Flange Tube 3
voRB24VMABCRB->AddNode(voRB24VMABCRBF3, 1, new TGeoCombiTrans(0., 11.2 - kRB24VMABCRBF3L / 2.,
kRB24VMABCTz - kRB24VMABCRBT1L / 2., rotyz));
voRB24VMABCRB->AddNode(voRB24VMABCRBF3, 1, new TGeoCombiTrans(0., 11.2 - kRB24VMABCRBF3L / 2., kRB24VMABCTz - kRB24VMABCRBT1L / 2., rotyz));
// Pirani Gauge
voRB24VMABCRB->AddNode(voRB24VMABCPirani, 1,
new TGeoCombiTrans(0., 11.2, kRB24VMABCTz - kRB24VMABCRBT1L / 2., rotyz));
Expand Down Expand Up @@ -1312,7 +1309,7 @@ void Pipe::ConstructGeometry()
z += kRB24VMABBEConTubeL1;
shRB24VMABBEBellowM->DefineSection(1, z, kRB24VMABBEConTubeRin, kRB24VMABBEConTubeRou);
shRB24VMABBEBellowM->DefineSection(2, z, kRB24B1BellowRi, kRB24B1BellowRo + kRB24B1ProtTubeThickness);
z += kRB24B1BellowUndL;
z += newRB24B1BellowUndL;
shRB24VMABBEBellowM->DefineSection(3, z, kRB24B1BellowRi, kRB24B1BellowRo + kRB24B1ProtTubeThickness);
shRB24VMABBEBellowM->DefineSection(4, z, kRB24VMABBEConTubeRin, kRB24VMABBEConTubeRou);
z += kRB24VMABBEConTubeL2;
Expand All @@ -1329,9 +1326,9 @@ void Pipe::ConstructGeometry()
z = kRB24VMABBEConTubeL1 / 2.;
voRB24VMABBEBellowM->AddNode(voRB24VMABBECT1, 1, new TGeoTranslation(0., 0., z));
z += kRB24VMABBEConTubeL1 / 2.;
z += kRB24B1BellowUndL / 2.;
z += newRB24B1BellowUndL / 2.;
voRB24VMABBEBellowM->AddNode(voRB24B1Bellow, 2, new TGeoTranslation(0., 0., z));
z += kRB24B1BellowUndL / 2.;
z += newRB24B1BellowUndL / 2.;
z += kRB24VMABBEConTubeL2 / 2.;
voRB24VMABBEBellowM->AddNode(voRB24VMABBECT2, 1, new TGeoTranslation(0., 0., z));
z += kRB24VMABBEConTubeL2 / 2.;
Expand All @@ -1342,7 +1339,7 @@ void Pipe::ConstructGeometry()
// Front
voRB24VMABCRB->AddNode(voRB24B1RFlange, 3, new TGeoCombiTrans(0., 0., -kRB24VMABCRBT1L / 2. + 0.86, rot180));
// End
z = kRB24VMABCRBT1L / 2. + kRB24B1BellowUndL + kRB24VMABBEConTubeL1 + kRB24VMABBEConTubeL2;
z = kRB24VMABCRBT1L / 2. + newRB24B1BellowUndL + kRB24VMABBEConTubeL1 + kRB24VMABBEConTubeL2;
voRB24VMABCRB->AddNode(voRB24B1RFlange, 4, new TGeoTranslation(0., 0., z - 0.86));

// Pos 2 Trans. Tube Flange LHCVSR__0062
Expand Down Expand Up @@ -1408,7 +1405,7 @@ void Pipe::ConstructGeometry()
voRB24VMABRFCT->AddNode(voRB24VMABCCT, 1, gGeoIdentity);
voRB24VMABRFCT->AddNode(voRB24VMABCCTFlange, 1, new TGeoTranslation(0., 0., kRB24VMABCCTL - kRB24VMABCCTFlangeL));

z = kRB24VMABCRBT1L / 2. + kRB24B1BellowUndL + kRB24VMABBEConTubeL1 + kRB24VMABBEConTubeL2 - kRB24VMABCCTL + 1.;
z = kRB24VMABCRBT1L / 2. + newRB24B1BellowUndL + kRB24VMABBEConTubeL1 + kRB24VMABBEConTubeL2 - kRB24VMABCCTL + 1.;
voRB24VMABCRB->AddNode(voRB24VMABRFCT, 1, new TGeoTranslation(0., 0., z));

//
Expand Down Expand Up @@ -1496,7 +1493,7 @@ void Pipe::ConstructGeometry()

//
//
top->AddNode(voRB24, 1, new TGeoCombiTrans(0., 0., kRB24CuTubeL / 2 + 88.5 + 400., rot180));
top->AddNode(voRB24, 1, new TGeoCombiTrans(0., 0., kRB24CuTubeL / 2 + 88.5 + 400. + 0.375, rot180));

//
////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1595,7 +1592,7 @@ void Pipe::ConstructGeometry()
const Float_t kRB26s2BellowRi = 12.12 / 2.; // Bellow inner radius [Pos 1]
const Int_t kRB26s2NumberOfPlies = 14; // Number of plies [Pos 1]
const Float_t kRB26s2BellowUndL =
10.00; // Length of undulated region [Pos 1] [+10 mm installed including pretension ?]
10.00; // Length of undulated region [Pos 1] [+10 mm installed including pretension ?]
const Float_t kRB26s2PlieThickness = 0.025; // Plie thickness [Pos 1]
const Float_t kRB26s2ConnectionPlieR = 0.21; // Connection plie radius [Pos 1]
// Plie radius
Expand Down Expand Up @@ -1963,7 +1960,7 @@ void Pipe::ConstructGeometry()
// RB26/3 Axial Compensator //
// Drawing LHCVC2a_0065 //
///////////////////////////////////
const Float_t kRB26s3CompL = 42.0; // Length of the compensator (0.3 cm added for welding)
const Float_t kRB26s3CompL = 42.3; // Length of the compensator (0.3 cm added for welding)
const Float_t kRB26s3BellowRo = 34.00 / 2.; // Bellow outer radius [Pos 1]
const Float_t kRB26s3BellowRi = 30.10 / 2.; // Bellow inner radius [Pos 1]
const Int_t kRB26s3NumberOfPlies = 13; // Number of plies [Pos 1]
Expand Down Expand Up @@ -1991,7 +1988,7 @@ void Pipe::ConstructGeometry()
const Float_t kRB26s3WeldingTubeLeftL2 = 3.4; // Left connection tube length [Pos 4]
const Float_t kRB26s3WeldingTubeLeftL = 7.0; // Left connection tube total length [Pos 4]
const Float_t kRB26s3WeldingTubeRightL1 =
2.3; // Right connection tube length [Pos 3] (0.3 cm added for welding)
2.3; // Right connection tube length [Pos 3] (0.3 cm added for welding)
const Float_t kRB26s3WeldingTubeRightL2 = 13.4; // Right connection tube length [Pos 3]

const Float_t kRB26s3WeldingTubeT1 = 0.6; // Length of first r-transition [Pos 4 + 3]
Expand Down Expand Up @@ -2019,8 +2016,7 @@ void Pipe::ConstructGeometry()
// [Pos 1] Bellow
//
//
TGeoVolume* voRB26s3Bellow =
new TGeoVolume("RB26s3Bellow", new TGeoTube(kRB26s3BellowRi, kRB26s3BellowRo, kRB26s3BellowUndL / 2.), kMedVac);

//
// Upper part of the undulation
//
Expand Down Expand Up @@ -2059,18 +2055,26 @@ void Pipe::ConstructGeometry()
voRB26s3Wiggle->AddNode(voRB26s3WiggleC1, 2, new TGeoTranslation(0., 0., z0));
z0 += kRB26s3PlieR - kRB26s3PlieThickness;
voRB26s3Wiggle->AddNode(voRB26s3WiggleL, 1, new TGeoTranslation(0., 0., z0));
voRB26s3Wiggle->GetShape()->ComputeBBox(); // enforce recomputing of BBox

//
// The bellow itself
Float_t zBellowTot = kRB26s3NumberOfPlies * (static_cast<TGeoBBox*>(voRB26s3Wiggle->GetShape()))->GetDZ();
TGeoVolume* voRB26s3Bellow =
new TGeoVolume("RB26s3Bellow", new TGeoTube(kRB26s3BellowRi, kRB26s3BellowRo, zBellowTot), kMedVac);

// Positioning of the volumes
z0 = -kRB26s3BellowUndL / 2. + kRB26s3ConnectionPlieR;
voRB26s3Bellow->AddNode(voRB26s3WiggleL, 1, new TGeoTranslation(0., 0., z0));
z0 += kRB26s3ConnectionPlieR;
zsh = 4. * kRB26s3PlieR - 2. * kRB26s3PlieThickness;
for (Int_t iw = 0; iw < kRB26s3NumberOfPlies; iw++) {
z0 = -kRB26s2BellowUndL / 2. + kRB26s2ConnectionPlieR;
voRB26s2Bellow->AddNode(voRB26s2WiggleL, 1, new TGeoTranslation(0., 0., z0));
z0 += kRB26s2ConnectionPlieR;
zsh = 4. * kRB26s2PlieR - 2. * kRB26s2PlieThickness;
for (Int_t iw = 0; iw < kRB26s2NumberOfPlies; iw++) {
Float_t zpos = z0 + iw * zsh;
voRB26s3Bellow->AddNode(voRB26s3Wiggle, iw + 1, new TGeoTranslation(0., 0., zpos - kRB26s3PlieThickness));
voRB26s2Bellow->AddNode(voRB26s2Wiggle, iw + 1, new TGeoTranslation(0., 0., zpos - kRB26s2PlieThickness));
}

voRB26s3Compensator->AddNode(voRB26s3Bellow, 1,
new TGeoTranslation(0., 0., kRB26s3WeldingTubeLeftL + kRB26s3BellowUndL / 2.));
new TGeoTranslation(0., 0., kRB26s3WeldingTubeLeftL + zBellowTot));

//
// [Pos 2] Outer Protecting Tube
Expand Down Expand Up @@ -2652,17 +2656,21 @@ TGeoPcon* Pipe::MakeMotherFromTemplate(const TGeoPcon* shape, Int_t imin, Int_t
rmin = r0;
Double_t rmax = shape->GetRmax(i);
Double_t z = shape->GetZ(i);
if (i == 0 || (z != zlast || rminlast != rminlast || rmax != rmaxlast)) {
if (i == 0 || (z != zlast || rmin != rminlast || rmax != rmaxlast)) {
addSection(z, rmin, rmax);
}
zlast = z;
rminlast = rmin;
rmaxlast = rmax;
}
// correct dimension
pconparams[2] = zplanecounter;
// reinit polycon from parameters
mother->SetDimensions(pconparams.data());
// correct dimension (unless the user chose the number of sections)
if (nz == -1) {
pconparams[2] = zplanecounter;
// reinit polycon from parameters
mother->SetDimensions(pconparams.data());
} else
for (Int_t i = 0; i < zplanecounter; i++)
mother->DefineSection(i, pconparams[3 + 3 * i], pconparams[4 + 3 * i], pconparams[5 + 3 * i]);

return mother;
}
Expand Down Expand Up @@ -2701,8 +2709,6 @@ TGeoVolume* Pipe::MakeBellow(const char* ext, Int_t nc, Float_t rMin, Float_t rM
const TGeoMedium* kMedSteel = matmgr.getTGeoMedium("PIPE_INOX");

char name[64], nameA[64], nameB[64], bools[64];
snprintf(name, 64, "%sBellowUS", ext);
TGeoVolume* voBellow = new TGeoVolume(name, new TGeoTube(rMin, rMax, dU / 2.), kMedVac);
//
// Upper part of the undulation
//
Expand Down Expand Up @@ -2748,6 +2754,11 @@ TGeoVolume* Pipe::MakeBellow(const char* ext, Int_t nc, Float_t rMin, Float_t rM
asWiggle->AddNode(voWiggleC1, 2, new TGeoTranslation(0., 0., z0));
z0 += dz;
asWiggle->AddNode(voWiggleL, 1, new TGeoTranslation(0., 0., z0));
asWiggle->GetShape()->ComputeBBox(); // enforce recomputing of BBox
//
snprintf(name, 64, "%sBellowUS", ext);
Float_t zBellowTot = nc * (static_cast<TGeoBBox*>(asWiggle->GetShape()))->GetDZ();
TGeoVolume* voBellow = new TGeoVolume(name, new TGeoTube(rMin, rMax, zBellowTot), kMedVac);
// Positioning of the volumes
z0 = -dU / 2. + rPlie;
voBellow->AddNode(voWiggleL, 2, new TGeoTranslation(0., 0., z0));
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.