Skip to content

Geomfixafterai #2031

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
oksuzian merged 16 commits into from
Oct 19, 2026
Merged

Geomfixafterai #2031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
65ce12e
fix volume list
sdifalco Oct 10, 2026
57472d4
DS hatch lateral wall
sdifalco Oct 10, 2026
ab331f3
DS and TS trench floor
sdifalco Oct 10, 2026
90bd1b4
DS area elevator walls
sdifalco Oct 10, 2026
aa1448e
escape hatch north door
sdifalco Oct 10, 2026
9e2b6a3
south roof of DS elevator area
sdifalco Oct 10, 2026
8e7842a
south east roof of first floor
sdifalco Oct 10, 2026
398726b
wall foot north of DS area
sdifalco Oct 10, 2026
638ca4a
remote handling hatch base contour
sdifalco Oct 10, 2026
66134ca
concrete beam south of DS area
sdifalco Oct 10, 2026
d811892
fix concrete in NW of DS area
sdifalco Oct 10, 2026
df64652
fix beam distances from east wall
sdifalco Oct 10, 2026
3147d0a
fix central stairwell
sdifalco Oct 10, 2026
9df3785
fixed dirtBeamlineSlabW2
sdifalco Oct 10, 2026
8a8b400
example of updated wideband geometry file
sdifalco Oct 12, 2026
d7baa46
forgot commit from PR 1918
sdifalco Oct 16, 2026
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
4 changes: 2 additions & 2 deletions Mu2eG4/geom/bldg/backfillTSarea-W1UpperNotchUpper1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ vector<double> building.backfill.TSarea-W.1UpperNotchUpper1.xPositions = {
};

vector<double> building.backfill.TSarea-W.1UpperNotchUpper1.yPositions = {
2438.3, // F0
2438.3, // F1
0., // F0
0., // F1
-3606.8, // F2
-3606.8, // F3
-2438.4, // F5
Expand Down
4 changes: 2 additions & 2 deletions Mu2eG4/geom/bldg/backfillTSarea-W1UpperNotchUpper2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ vector<double> building.backfill.TSarea-W.1UpperNotchUpper2.xPositions = {
};

vector<double> building.backfill.TSarea-W.1UpperNotchUpper2.yPositions = {
2438.3, // F0
2438.3, // F1
0., // F0
0., // F1
-609.6, // F2
-609.6 // F3
};
Expand Down
4 changes: 2 additions & 2 deletions Mu2eG4/geom/bldg/centralStairwellLowerCeiling.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ vector<double> building.central.stairwell.lower.ceiling.yPositions = {
-12369.8, // h
-13589, // h0
-13589, // h1
-14892.65, // h2
-14892.65, // h3
-15081.27, // h2
-15081.27, // h3
-12369.8 // h4
};

Expand Down
8 changes: 4 additions & 4 deletions Mu2eG4/geom/bldg/centralStairwellLowerWallN.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ string building.central.stairwell.lower.wall.n.name = "CentralStairwellLower
string building.central.stairwell.lower.wall.n.material = "CONCRETE_MARS";

double building.central.stairwell.lower.wall.n.offsetFromMu2eOrigin.x = 947.4;
double building.central.stairwell.lower.wall.n.offsetFromFloorSurface.y = 1219.2;
double building.central.stairwell.lower.wall.n.offsetFromFloorSurface.y = 1184.275;
double building.central.stairwell.lower.wall.n.offsetFromMu2eOrigin.z = -3581.4;

double building.central.stairwell.lower.wall.n.yHalfThickness = 1371.6;
double building.central.stairwell.lower.wall.n.yHalfThickness = 1336.675;

vector<double> building.central.stairwell.lower.wall.n.xPositions = {
5308.6, // h
5308.6, // h0
11617.2, // h1
11617.2 // h2
11366.5, // h1
11366.5 // h2
};

vector<double> building.central.stairwell.lower.wall.n.yPositions = {
Expand Down
4 changes: 2 additions & 2 deletions Mu2eG4/geom/bldg/centralStairwellLowerWallN2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ string building.central.stairwell.lower.wall.n2.name = "CentralStairwellLowe
string building.central.stairwell.lower.wall.n2.material = "CONCRETE_MARS";

double building.central.stairwell.lower.wall.n2.offsetFromMu2eOrigin.x = 947.4;
double building.central.stairwell.lower.wall.n2.offsetFromFloorSurface.y = 4191;
double building.central.stairwell.lower.wall.n2.offsetFromFloorSurface.y = 4156.075;
double building.central.stairwell.lower.wall.n2.offsetFromMu2eOrigin.z = -3581.4;

double building.central.stairwell.lower.wall.n2.yHalfThickness = 1600.2;
double building.central.stairwell.lower.wall.n2.yHalfThickness = 1635.125;

vector<double> building.central.stairwell.lower.wall.n2.xPositions = {
5308.6, // h
Expand Down
28 changes: 28 additions & 0 deletions Mu2eG4/geom/bldg/centralStairwellUpperCeiling.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

string building.central.stairwell.upper.ceiling.name = "CentralStairwellUpperCeiling";

string building.central.stairwell.upper.ceiling.material = "CONCRETE_MARS";

double building.central.stairwell.upper.ceiling.offsetFromMu2eOrigin.x = 947.4;
double building.central.stairwell.upper.ceiling.offsetFromFloorSurface.y = 7658.1;
double building.central.stairwell.upper.ceiling.offsetFromMu2eOrigin.z = -3581.4;

double building.central.stairwell.upper.ceiling.yHalfThickness = 114.3;

vector<double> building.central.stairwell.upper.ceiling.xPositions = {
13233.4, // 1
13233.4, // 2
12014.2, // 3
12014.2 // 4
};

vector<double> building.central.stairwell.upper.ceiling.yPositions = {
-20262.87, // 1
-15081.27, // 2
-15081.27, // 3
-20262.87 // 4
};

// Local Variables:
// mode:c++
// End:
8 changes: 4 additions & 4 deletions Mu2eG4/geom/bldg/centralStairwellUpperWallE2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ string building.central.stairwell.upper.wall.e2.name = "CentralStairwellUppe
string building.central.stairwell.upper.wall.e2.material = "CONCRETE_MARS";

double building.central.stairwell.upper.wall.e2.offsetFromMu2eOrigin.x = 947.4;
double building.central.stairwell.upper.wall.e2.offsetFromFloorSurface.y = 6667.5;
double building.central.stairwell.upper.wall.e2.offsetFromFloorSurface.y = 6781.8;
double building.central.stairwell.upper.wall.e2.offsetFromMu2eOrigin.z = -3581.4;

double building.central.stairwell.upper.wall.e2.yHalfThickness = 876.3;
double building.central.stairwell.upper.wall.e2.yHalfThickness = 990.6;

vector<double> building.central.stairwell.upper.wall.e2.xPositions = {
13233.4, // h
Expand All @@ -17,10 +17,10 @@ vector<double> building.central.stairwell.upper.wall.e2.xPositions = {
};

vector<double> building.central.stairwell.upper.wall.e2.yPositions = {
-14740.25, // h
-14827.27, // h
-25908, // h0
-25908, // h1
-14740.25 // h2
-14827.27 // h2
};

// Local Variables:
Expand Down
12 changes: 6 additions & 6 deletions Mu2eG4/geom/bldg/centralStairwellUpperWallN.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ string building.central.stairwell.upper.wall.n.name = "CentralStairwellUpper
string building.central.stairwell.upper.wall.n.material = "CONCRETE_MARS";

double building.central.stairwell.upper.wall.n.offsetFromMu2eOrigin.x = 947.4;
double building.central.stairwell.upper.wall.n.offsetFromFloorSurface.y = 6667.5;
double building.central.stairwell.upper.wall.n.offsetFromFloorSurface.y = 6781.8;
double building.central.stairwell.upper.wall.n.offsetFromMu2eOrigin.z = -3581.4;

double building.central.stairwell.upper.wall.n.yHalfThickness = 876.3;
double building.central.stairwell.upper.wall.n.yHalfThickness = 990.6;

vector<double> building.central.stairwell.upper.wall.n.xPositions = {
12014.2, // h
Expand All @@ -17,10 +17,10 @@ vector<double> building.central.stairwell.upper.wall.n.xPositions = {
};

vector<double> building.central.stairwell.upper.wall.n.yPositions = {
-14740.25, // h
-14892.65, // h0
-14892.65, // h1
-14740.25 // h2
-14827.27, // h
-15081.27, // h0
-15081.27, // h1
-14827.27 // h2
};

// Local Variables:
Expand Down
8 changes: 4 additions & 4 deletions Mu2eG4/geom/bldg/centralStairwellUpperWallW2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ string building.central.stairwell.upper.wall.w2.name = "CentralStairwellUppe
string building.central.stairwell.upper.wall.w2.material = "CONCRETE_MARS";

double building.central.stairwell.upper.wall.w2.offsetFromMu2eOrigin.x = 947.4;
double building.central.stairwell.upper.wall.w2.offsetFromFloorSurface.y = 6667.5;
double building.central.stairwell.upper.wall.w2.offsetFromFloorSurface.y = 6781.8;
double building.central.stairwell.upper.wall.w2.offsetFromMu2eOrigin.z = -3581.4;

double building.central.stairwell.upper.wall.w2.yHalfThickness = 876.3;
double building.central.stairwell.upper.wall.w2.yHalfThickness = 990.6;

vector<double> building.central.stairwell.upper.wall.w2.xPositions = {
11617.2, // h
Expand All @@ -17,10 +17,10 @@ vector<double> building.central.stairwell.upper.wall.w2.xPositions = {
};

vector<double> building.central.stairwell.upper.wall.w2.yPositions = {
-14740.25, // h
-14827.27, // h
-25908, // h0
-25908, // h1
-14740.25 // h2
-14827.27 // h2
};

// Local Variables:
Expand Down
4 changes: 2 additions & 2 deletions Mu2eG4/geom/bldg/dirtBeamlineSlab2NE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ string dirt.beamline.slab2.NE.name = "dirtBeamlineSlab2NE";
string dirt.beamline.slab2.NE.material = "MBOverburden";

double dirt.beamline.slab2.NE.offsetFromMu2eOrigin.x = 947.4;
double dirt.beamline.slab2.NE.offsetFromFloorSurface.y = 6731;
double dirt.beamline.slab2.NE.offsetFromFloorSurface.y = 6324.6;
double dirt.beamline.slab2.NE.offsetFromMu2eOrigin.z = -3581.4;

double dirt.beamline.slab2.NE.yHalfThickness = 635;
double dirt.beamline.slab2.NE.yHalfThickness = 228.6;

vector<int> dirt.beamline.slab2.NE.xreplace = { 13, 14 };
vector<double> dirt.beamline.slab2.NE.xPositions = {
Expand Down
4 changes: 2 additions & 2 deletions Mu2eG4/geom/bldg/dirtBeamlineSlab2NW.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ string dirt.beamline.slab2.NW.name = "dirtBeamlineSlab2NW";
string dirt.beamline.slab2.NW.material = "MBOverburden";

double dirt.beamline.slab2.NW.offsetFromMu2eOrigin.x = 947.4;
double dirt.beamline.slab2.NW.offsetFromFloorSurface.y = 6731;
double dirt.beamline.slab2.NW.offsetFromFloorSurface.y = 6324.6;
double dirt.beamline.slab2.NW.offsetFromMu2eOrigin.z = -3581.4;

double dirt.beamline.slab2.NW.yHalfThickness = 635;
double dirt.beamline.slab2.NW.yHalfThickness = 228.6;

//vector<int> dirt.beamline.slab2.NW.xreplace = { 21, 21 };
vector<double> dirt.beamline.slab2.NW.xPositions = {
Expand Down
63 changes: 63 additions & 0 deletions Mu2eG4/geom/bldg/dirtBeamlineSlab3NE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// SimpleConfig geometry file automatically produced for original file:
//
// geom/geom_beamline_dirtSlab2_N.ccl

string dirt.beamline.slab3.NE.name = "dirtBeamlineSlab3NE";

string dirt.beamline.slab3.NE.material = "MBOverburden";

double dirt.beamline.slab3.NE.offsetFromMu2eOrigin.x = 947.4;
double dirt.beamline.slab3.NE.offsetFromFloorSurface.y = 6959.6;
double dirt.beamline.slab3.NE.offsetFromMu2eOrigin.z = -3581.4;

double dirt.beamline.slab3.NE.yHalfThickness = 406.4;

vector<int> dirt.beamline.slab3.NE.xreplace = { 13, 14 };
vector<double> dirt.beamline.slab3.NE.xPositions = {
21158.2, // x1
21971, // x2
21971, // x3
29083, // x4
29083, // x5
29895.8, // x6
29895.8, // x7
37007.8, // x8
37007.8, // x9
37820.6, // y0
37820.6, // y1
44932.6, // y2
44932.6, // y3
50000, // y4_to_E
50000, // NEcorner
15900.8, // N of escape hatch NW corner
15900.8, // NW corner escape hatch
19356.8, // NE corner escape hatch
20744.5 // SE corner escape hatch
};

vector<int> dirt.beamline.slab3.NE.yreplace = { 14, 15 };
vector<double> dirt.beamline.slab3.NE.yPositions = {
2616.2, // x1
2616.2, // x2
2438.4, // x3
2438.4, // x4
2616.2, // x5
2616.2, // x6
2438.4, // x7
2438.4, // x8
2616.2, // x9
2616.2, // y0
2438.4, // y1
2438.4, // y2
2616.2, // y3
2616.2, // y4_to_E
50000, // NEcorner
50000, // N of escape hatch NW corner
23684.2, // NW corner escape hatch
24521.6, // NE corner escape hatch
18794.4 // SE corner escape hatch
};

// Local Variables:
// mode:c++
// End:
55 changes: 55 additions & 0 deletions Mu2eG4/geom/bldg/dirtBeamlineSlab3NW.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// SimpleConfig geometry file automatically produced for original file:
//
// geom/geom_beamline_dirtSlab2_N.ccl

string dirt.beamline.slab3.NW.name = "dirtBeamlineSlab3NW";

string dirt.beamline.slab3.NW.material = "MBOverburden";

double dirt.beamline.slab3.NW.offsetFromMu2eOrigin.x = 947.4;
double dirt.beamline.slab3.NW.offsetFromFloorSurface.y = 6959.6;
double dirt.beamline.slab3.NW.offsetFromMu2eOrigin.z = -3581.4;

double dirt.beamline.slab3.NW.yHalfThickness = 406.4;

//vector<int> dirt.beamline.slab3.NW.xreplace = { 21, 21 };
vector<double> dirt.beamline.slab3.NW.xPositions = {
-1270, // h3
21158.2, //
21158.2, // x1
20744.5, // SE corner escape hatch
17288.5, // SW corner escape hatch
9550.51, // SE corner rem hatch
3403.59, // SW corner rem hatch
3403.59, // NW corner rem hatch
9550.5, // NE corner rem hatch
9550.5, // rem hatch to N
-1270, // h3_to_N
-1270, // to NRetWall
3708.41, // NE corner NRetWall
3708.41, // SE corner NRetWall
-1270 // h3_to_N
};

vector<int> dirt.beamline.slab3.NW.yreplace = {9,10};
vector<double> dirt.beamline.slab3.NW.yPositions = {
2438.4, // h3
2438.4, //
2616.2, // x1
18794.4, // SE corner escape hatch
17957, // SW corner escape hatch
13055.59, // SE corner rem hatch
13055.59, // SW corner rem hatch
16459.21, // NW corner rem hatch
16459.21, // NE corner rem hatch
50000, // NE corner to N
50000, // h3_to_N
10312.5, // down to wall
10312.5, // NE corner NRetWall
9702.79, // SE corner NRetWall
9702.79 // last point
};

// Local Variables:
// mode:c++
// End:
12 changes: 7 additions & 5 deletions Mu2eG4/geom/bldg/dirtBeamlineSlabW2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ vector<double> dirt.beamline.slab.W2.xPositions = {
11684, // i1
11684, // d1
9550.51, // SE corner rem hatch
3403.59, // SW corner rem hatch
3403.59, // NW corner rem hatch
9550.51, //
2946.4, //
2946.4, //
9550.5, // NE corner rem hatch
9550.5, // rem hatch to N
-2006.6, // h1_to_N
Expand All @@ -30,16 +31,17 @@ vector<double> dirt.beamline.slab.W2.xPositions = {
-2006.6
};

vector<int> dirt.beamline.slab.W2.yreplace = { 9, 10 };
vector<int> dirt.beamline.slab.W2.yreplace = { 10, 11 };
vector<double> dirt.beamline.slab.W2.yPositions = {
2438.4, // h2
2438.4, // h1
8674.1, // P5 bc
10697.778, // i1
14406.978, // d1
13055.59, // SE corner rem hatch
13055.59, // SW corner rem hatch
16459.21, // NW corner rem hatch
12598.4, //
12598.4, //
16459.21, //
16459.21, // NE corner rem hatch
50000, // NE corner to N
50000, // h1_to_N
Expand Down
10 changes: 5 additions & 5 deletions Mu2eG4/geom/bldg/dirtBeamlineUpper_v02.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ vector<double> dirt.beamline.upper.xPositions = {
-2006.6, // o9_to_N
9550.5, // to N of NE corner rem hatch
9550.5, // NE corner rem hatch
3403.59, // NW corner rem hatch
3403.59, // SW corner rem hatch
2946.4, //
2946.4, //
9550.51, // SE corner rem hatch
9550.51, // N of E wall rem hatch
11684 // o7dirt_to_N
Expand All @@ -49,9 +49,9 @@ vector<double> dirt.beamline.upper.yPositions = {
50000, // o9_to_N
50000, // N of NE corner rem hatch
16459.21, // NE corner rem hatch
16459.21, // NW corner rem hatch
13055.59, // SW corner rem hatch
13055.59, // SE corner rem hatch
16459.2, //
12598.4, //
12598.4, //
50000, // N of E wall rem hatch
50000 // o7dirt_to_N
};
Expand Down
4 changes: 2 additions & 2 deletions Mu2eG4/geom/bldg/dirtCentralStairwellLower.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ double dirt.central.stairwell.lower.yHalfThickness = 1336.675;

vector<double> dirt.central.stairwell.lower.xPositions = {
5308.6, // g1
11617.325, // g2
11617.325, // g3
11366.5, // g2
11366.5, // g3
13630.275, // g4
13630.275, // g5
5308.6 // g6
Expand Down
Loading