From 65ce12e8e7b58f1bdfaa77865384d168118baae5 Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 08:34:37 -0500 Subject: [PATCH 01/16] fix volume list --- Mu2eG4/geom/mu2eHall_v03.txt | 64 ++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/Mu2eG4/geom/mu2eHall_v03.txt b/Mu2eG4/geom/mu2eHall_v03.txt index 2121c72c9c..6eb954372a 100644 --- a/Mu2eG4/geom/mu2eHall_v03.txt +++ b/Mu2eG4/geom/mu2eHall_v03.txt @@ -81,6 +81,7 @@ double yOfFloorSurface.below.mu2eOrigin = -2312; // mm -(728.58684' - 721') #include "Offline/Mu2eG4/geom/bldg/centralStairwellUpperPlatform.txt" #include "Offline/Mu2eG4/geom/bldg/centralStairwellUpperStairs1.txt" #include "Offline/Mu2eG4/geom/bldg/centralStairwellUpperStairs2.txt" +#include "Offline/Mu2eG4/geom/bldg/centralStairwellUpperCeiling.txt" #include "Offline/Mu2eG4/geom/bldg/centralStairwellUpperWallE.txt" #include "Offline/Mu2eG4/geom/bldg/centralStairwellUpperWallE2.txt" #include "Offline/Mu2eG4/geom/bldg/centralStairwellUpperWallN.txt" @@ -101,14 +102,18 @@ double yOfFloorSurface.below.mu2eOrigin = -2312; // mm -(728.58684' - 721') #include "Offline/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab6.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaDownstreamUpstairsFloor.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaElevatorCeiling.txt" +#include "Offline/Mu2eG4/geom/bldg/dsAreaElevatorCeilingS.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaElevatorUpper.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaElevatorInterior.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerS.txt" +#include "Offline/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerSW.txt" +#include "Offline/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerSW2.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerN.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerE.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaElevatorInteriorDoorFrame.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaElevatorShield.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaFirstFloorS.txt" +#include "Offline/Mu2eG4/geom/bldg/dsAreaFirstFloorSE.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaFirstFloorS2.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaTrenchFloor.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaUpper.txt" @@ -132,6 +137,9 @@ double yOfFloorSurface.below.mu2eOrigin = -2312; // mm -(728.58684' - 721') #include "Offline/Mu2eG4/geom/bldg/escapeCeilingW.txt" #include "Offline/Mu2eG4/geom/bldg/escapeCeilingE.txt" #include "Offline/Mu2eG4/geom/bldg/escapeHatchN.txt" +#include "Offline/Mu2eG4/geom/bldg/escapeHatchNE.txt" +#include "Offline/Mu2eG4/geom/bldg/escapeHatchNTop.txt" +#include "Offline/Mu2eG4/geom/bldg/escapeHatchNBot.txt" #include "Offline/Mu2eG4/geom/bldg/escapeHatchS.txt" #include "Offline/Mu2eG4/geom/bldg/escapeHatchLid.txt" #include "Offline/Mu2eG4/geom/bldg/escapeStair01.txt" @@ -179,6 +187,11 @@ double yOfFloorSurface.below.mu2eOrigin = -2312; // mm -(728.58684' - 721') #include "Offline/Mu2eG4/geom/bldg/firstFloorWall_v02.txt" #include "Offline/Mu2eG4/geom/bldg/firstFloorWallp1_v02.txt" #include "Offline/Mu2eG4/geom/bldg/firstFloorWallp2_v02.txt" +#include "Offline/Mu2eG4/geom/bldg/firstFloorWallLower1.txt" +#include "Offline/Mu2eG4/geom/bldg/firstFloorWallLower2.txt" +#include "Offline/Mu2eG4/geom/bldg/firstFloorWallLower3.txt" +#include "Offline/Mu2eG4/geom/bldg/firstFloorWallLower4.txt" +#include "Offline/Mu2eG4/geom/bldg/firstFloorWallLower5.txt" // #include "Offline/Mu2eG4/geom/bldg/firstFloorWall_p1.txt" // #include "Offline/Mu2eG4/geom/bldg/firstFloorWall_p2.txt" // #include "Offline/Mu2eG4/geom/bldg/firstFloorWall_p3.txt" @@ -251,6 +264,7 @@ double yOfFloorSurface.below.mu2eOrigin = -2312; // mm -(728.58684' - 721') #include "Offline/Mu2eG4/geom/bldg/remoteHandlingCeilingStrip.txt" #include "Offline/Mu2eG4/geom/bldg/remoteHandlingHatchBlock_v02.txt" #include "Offline/Mu2eG4/geom/bldg/remoteHandlingHatchLower.txt" +#include "Offline/Mu2eG4/geom/bldg/remoteHandlingHatchLowerSW.txt" #include "Offline/Mu2eG4/geom/bldg/remoteHandlingHatchUpper.txt" #include "Offline/Mu2eG4/geom/bldg/remoteHandlingHatchLid_v02.txt" #include "Offline/Mu2eG4/geom/bldg/remoteHandlingInteriorBeam.txt" @@ -269,13 +283,13 @@ double yOfFloorSurface.below.mu2eOrigin = -2312; // mm -(728.58684' - 721') #include "Offline/Mu2eG4/geom/bldg/tsAreaAlcoveVerticalN.txt" #include "Offline/Mu2eG4/geom/bldg/tsAreaAlcoveVerticalS.txt" #include "Offline/Mu2eG4/geom/bldg/tsAreaStairwell.txt" +#include "Offline/Mu2eG4/geom/bldg/tsAreaStairwellE.txt" #include "Offline/Mu2eG4/geom/bldg/tsAreaStairwellCeiling.txt" #include "Offline/Mu2eG4/geom/bldg/tsAreaTrenchFloor.txt" #include "Offline/Mu2eG4/geom/bldg/tsAreaUpper2W_v02.txt" #include "Offline/Mu2eG4/geom/bldg/tsAreaUpperW.txt" #include "Offline/Mu2eG4/geom/bldg/tsAreaW.txt" #include "Offline/Mu2eG4/geom/bldg/tsDsAreaFirstFloorEdgeN_v02.txt" -#include "Offline/Mu2eG4/geom/bldg/tsDsAreaWallinsertN_v02.txt" #include "Offline/Mu2eG4/geom/bldg/WTSareaCF1.txt" #include "Offline/Mu2eG4/geom/bldg/WTSareaCF1notch.txt" #include "Offline/Mu2eG4/geom/bldg/WTSareaCF2.txt" @@ -308,6 +322,9 @@ double yOfFloorSurface.below.mu2eOrigin = -2312; // mm -(728.58684' - 721') #include "Offline/Mu2eG4/geom/bldg/exteriorWallNWExtension2_v02.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaUpperWallW_v08.txt" #include "Offline/Mu2eG4/geom/bldg/dsAreaUpperWallE_v08.txt" +#include "Offline/Mu2eG4/geom/bldg/dsAreaUpperWallS1.txt" +#include "Offline/Mu2eG4/geom/bldg/dsAreaUpperWallS2.txt" +#include "Offline/Mu2eG4/geom/bldg/dsAreaUpperWallS3.txt" #include "Offline/Mu2eG4/geom/bldg/dirtExtMonStairsGap.txt" vector bldg.prefix.list = { @@ -376,6 +393,7 @@ vector bldg.prefix.list = { "building.central.stairwell.lower.wall.w", "building.central.stairwell.upper.landing", "building.central.stairwell.upper.platform", + "building.central.stairwell.upper.ceiling", "building.central.stairwell.upper.wall.e", "building.central.stairwell.upper.wall.e2", "building.central.stairwell.upper.wall.n", @@ -396,12 +414,16 @@ vector bldg.prefix.list = { "building.dsArea.downstreamCeiling.vslab6", "building.dsArea.downstreamUpstairs.floor", "building.dsArea.elevator.ceiling", + "building.dsArea.elevator.ceilingS", "building.dsArea.elevator.upper", "building.dsArea.elevator.interior", "building.dsArea.elevator.interior.lower.S", + "building.dsArea.elevator.interior.lower.SW", + "building.dsArea.elevator.interior.lower.SW2", "building.dsArea.elevator.interior.lower.N", "building.dsArea.elevator.shield", "building.dsArea.firstFloor.S", + "building.dsArea.firstFloor.SE", "building.dsArea.firstFloor.S2", "building.dsArea.trench.cover", "building.dsArea.trench.floor", @@ -422,6 +444,9 @@ vector bldg.prefix.list = { "building.escape.ceiling.W", "building.escape.ceiling.E", "building.escape.hatch.N", + "building.escape.hatch.NE", + "building.escape.hatch.NTop", + "building.escape.hatch.NBot", "building.escape.hatch.S", "building.escape.hatch.lid", "building.escape.stair.01", @@ -462,6 +487,11 @@ vector bldg.prefix.list = { "building.firstFloor.wall", "building.firstFloor.wall.p1", "building.firstFloor.wall.p2", + "building.firstFloor.wall.lower1", + "building.firstFloor.wall.lower2", + "building.firstFloor.wall.lower3", + "building.firstFloor.wall.lower4", + "building.firstFloor.wall.lower5", "building.firstFloor.wall.extension", "building.floor.N", "building.floor.Sd", @@ -515,6 +545,7 @@ vector bldg.prefix.list = { "building.remote.handling.ceiling.strip", "building.remote.handling.hatch.block", "building.remote.handling.Hatch.Lower", + "building.remote.handling.Hatch.Lower.SW", "building.remote.handling.Hatch.Upper", "building.remote.handling.Hatch.Lid", "building.remote.handling.Interior.Beam", @@ -534,12 +565,12 @@ vector bldg.prefix.list = { "building.tsArea.alcove.vertical.N", "building.tsArea.alcove.vertical.S", "building.tsArea.stairwell", + "building.tsArea.stairwell.E", "building.tsArea.stairwell.ceiling", "building.tsArea.trench.floor", "building.tsArea.upper.W", "building.tsArea.upper2.W", "building.tsDsArea.firstFloorEdge.N", - "building.tsDsArea.wallinsert.N", "building.W.TSareaCF1", "building.W.TSareaCF1notch", "building.W.TSareaCF2", @@ -565,7 +596,10 @@ vector bldg.prefix.list = { "building.exteriorWall.NW.extension", "building.exteriorWall.NW.extension2", "building.dsArea.upper.wall.W", - "building.dsArea.upper.wall.E" + "building.dsArea.upper.wall.E", + "building.dsArea.upper.wall.S1", + "building.dsArea.upper.wall.S2", + "building.dsArea.upper.wall.S3" }; vector rotated.prefix.list = { @@ -661,6 +695,13 @@ vector rotated.prefix.list = { #include "Offline/Mu2eG4/geom/bldg/dirtBeamlineSlab2NW.txt" #include "Offline/Mu2eG4/geom/bldg/dirtBeamlineSlab2NC.txt" #include "Offline/Mu2eG4/geom/bldg/dirtBeamlineSlab2NE.txt" +#include "Offline/Mu2eG4/geom/bldg/dirtBeamlineSlab3NE.txt" +#include "Offline/Mu2eG4/geom/bldg/dirtBeamlineSlab3NW.txt" +#include "Offline/Mu2eG4/geom/bldg/dirtFirstFloorLower1.txt" +#include "Offline/Mu2eG4/geom/bldg/dirtFirstFloorLower2.txt" +#include "Offline/Mu2eG4/geom/bldg/dirtFirstFloorLower3.txt" +#include "Offline/Mu2eG4/geom/bldg/dirtFirstFloorLower4.txt" +#include "Offline/Mu2eG4/geom/bldg/dirtFirstFloorLower5.txt" #include "Offline/Mu2eG4/geom/bldg/dirtBeamlineUpper_v02.txt" #include "Offline/Mu2eG4/geom/bldg/dirtCentralStairwellLower.txt" #include "Offline/Mu2eG4/geom/bldg/dirtCentralStairwellLower2.txt" @@ -677,6 +718,7 @@ vector rotated.prefix.list = { #include "Offline/Mu2eG4/geom/bldg/dirtDsAreaAlcove2.txt" #include "Offline/Mu2eG4/geom/bldg/dirtDsAreaAlcove3.txt" #include "Offline/Mu2eG4/geom/bldg/dirtDsAreaAlcoveStairwell.txt" +#include "Offline/Mu2eG4/geom/bldg/dirtDsAreaAlcoveStairwellTop.txt" #include "Offline/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab1.txt" #include "Offline/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab2.txt" #include "Offline/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab3.txt" @@ -686,8 +728,12 @@ vector rotated.prefix.list = { #include "Offline/Mu2eG4/geom/bldg/dirtDsAreaElevator.txt" #include "Offline/Mu2eG4/geom/bldg/dirtDsAreaElevatorUpper.txt" #include "Offline/Mu2eG4/geom/bldg/dirtDsAreaFirstFloorS.txt" +#include "Offline/Mu2eG4/geom/bldg/dirtDsAreaFirstFloorSE.txt" #include "Offline/Mu2eG4/geom/bldg/dirtDsAreaFirstFloorS2.txt" #include "Offline/Mu2eG4/geom/bldg/dirtDsAreaUpper.txt" +#include "Offline/Mu2eG4/geom/bldg/dirtDsAreaUpper2.txt" +#include "Offline/Mu2eG4/geom/bldg/dirtDsAreaUpper3.txt" +#include "Offline/Mu2eG4/geom/bldg/dirtDsAreaUpper4.txt" #include "Offline/Mu2eG4/geom/bldg/dirtDsAreaUpperSE.txt" #include "Offline/Mu2eG4/geom/bldg/dirtEscapeStair04.txt" #include "Offline/Mu2eG4/geom/bldg/dirtEscapeStair07.txt" @@ -802,6 +848,13 @@ vector dirt.prefix.list = { "dirt.beamline.slab2.NC", "dirt.beamline.slab2.NE", "dirt.beamline.slab2.NW", + "dirt.beamline.slab3.NE", + "dirt.beamline.slab3.NW", + "dirt.firstFloor.lower.1", + "dirt.firstFloor.lower.2", + "dirt.firstFloor.lower.3", + "dirt.firstFloor.lower.4", + "dirt.firstFloor.lower.5", "dirt.beamline.upper", "dirt.central.stairwell.lower", "dirt.central.stairwell.lower2", @@ -818,6 +871,7 @@ vector dirt.prefix.list = { "dirt.dsArea.alcove2", "dirt.dsArea.alcove3", "dirt.dsArea.alcove.stairwell", + "dirt.dsArea.alcove.stairwell.top", "dirt.dsArea.downstreamCeiling.vslab1", "dirt.dsArea.downstreamCeiling.vslab2", "dirt.dsArea.downstreamCeiling.vslab3", @@ -827,8 +881,12 @@ vector dirt.prefix.list = { "dirt.dsArea.elevator", "dirt.dsArea.elevator.upper", "dirt.dsArea.firstFloor.S", + "dirt.dsArea.firstFloor.SE", "dirt.dsArea.firstFloor.S2", "dirt.dsArea.upper", + "dirt.dsArea.upper2", + "dirt.dsArea.upper3", + "dirt.dsArea.upper4", "dirt.dsArea.upper.SE", "dirt.extMon", "dirt.extMon.ceiling", From 57472d493f6a67381c84c459acd3f10d8a7cf024 Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 08:36:00 -0500 Subject: [PATCH 02/16] DS hatch lateral wall --- Mu2eG4/geom/bldg/dsAreaHatchNLedge.txt | 4 ++-- Mu2eG4/geom/bldg/dsAreaHatchSLedge.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mu2eG4/geom/bldg/dsAreaHatchNLedge.txt b/Mu2eG4/geom/bldg/dsAreaHatchNLedge.txt index 70f3abce8b..33c8c51ad2 100644 --- a/Mu2eG4/geom/bldg/dsAreaHatchNLedge.txt +++ b/Mu2eG4/geom/bldg/dsAreaHatchNLedge.txt @@ -20,8 +20,8 @@ vector building.dsArea.hatchnledge.xPositions = { vector building.dsArea.hatchnledge.yPositions = { -1041.4, // B -1041.4, // C - -1397.0, // C1 - -1397.0 // E + -1524.0, // C1 + -1524.0 // E }; // Local Variables: diff --git a/Mu2eG4/geom/bldg/dsAreaHatchSLedge.txt b/Mu2eG4/geom/bldg/dsAreaHatchSLedge.txt index 852bc9fdcb..d2b850fba9 100644 --- a/Mu2eG4/geom/bldg/dsAreaHatchSLedge.txt +++ b/Mu2eG4/geom/bldg/dsAreaHatchSLedge.txt @@ -18,8 +18,8 @@ vector building.dsArea.hatchsledge.xPositions = { }; vector building.dsArea.hatchsledge.yPositions = { - -8305.8, // B - -8305.8, // C + -8178.8, // B + -8178.8, // C -8661.4, // C1 -8661.4 // E }; From ab331f3e268e8b5301cb4eb28cb4eb4eaf8c09da Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 08:38:28 -0500 Subject: [PATCH 03/16] DS and TS trench floor --- Mu2eG4/geom/bldg/dsAreaTrenchFloor.txt | 4 ++-- Mu2eG4/geom/bldg/tsAreaTrenchFloor.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mu2eG4/geom/bldg/dsAreaTrenchFloor.txt b/Mu2eG4/geom/bldg/dsAreaTrenchFloor.txt index 274c546e5f..79d4484082 100644 --- a/Mu2eG4/geom/bldg/dsAreaTrenchFloor.txt +++ b/Mu2eG4/geom/bldg/dsAreaTrenchFloor.txt @@ -7,10 +7,10 @@ string building.dsArea.trench.floor.name = "dsAreaTrenchFloor"; string building.dsArea.trench.floor.material = "CONCRETE_MARS"; double building.dsArea.trench.floor.offsetFromMu2eOrigin.x = 947.4; -double building.dsArea.trench.floor.offsetFromFloorSurface.y = -1143; +double building.dsArea.trench.floor.offsetFromFloorSurface.y = -1066.78; double building.dsArea.trench.floor.offsetFromMu2eOrigin.z = -3581.4; -double building.dsArea.trench.floor.yHalfThickness = 76.2; +double building.dsArea.trench.floor.yHalfThickness = 152.4; vector building.dsArea.trench.floor.xPositions = { 19431, // T0 diff --git a/Mu2eG4/geom/bldg/tsAreaTrenchFloor.txt b/Mu2eG4/geom/bldg/tsAreaTrenchFloor.txt index 497bf338d8..1f0f681bb2 100644 --- a/Mu2eG4/geom/bldg/tsAreaTrenchFloor.txt +++ b/Mu2eG4/geom/bldg/tsAreaTrenchFloor.txt @@ -7,10 +7,10 @@ string building.tsArea.trench.floor.name = "tsAreaTrenchFloor"; string building.tsArea.trench.floor.material = "CONCRETE_MARS"; double building.tsArea.trench.floor.offsetFromMu2eOrigin.x = 947.4; -double building.tsArea.trench.floor.offsetFromFloorSurface.y = -1143; +double building.tsArea.trench.floor.offsetFromFloorSurface.y = -1066.78; double building.tsArea.trench.floor.offsetFromMu2eOrigin.z = -3581.4; -double building.tsArea.trench.floor.yHalfThickness = 76.2; +double building.tsArea.trench.floor.yHalfThickness = 152.4; vector building.tsArea.trench.floor.xPositions = { 2870.2, // T0 From 90bd1b4f52099b673b15de38f580a022a7778325 Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 08:41:32 -0500 Subject: [PATCH 04/16] DS area elevator walls --- .../geom/bldg/dsAreaElevatorInteriorLowerS.txt | 4 ++-- .../bldg/dsAreaElevatorInteriorLowerSW.txt | 18 ++++++++++++++++++ .../bldg/dsAreaElevatorInteriorLowerSW2.txt | 18 ++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerSW.txt create mode 100644 Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerSW2.txt diff --git a/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerS.txt b/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerS.txt index 159f534d3f..c801c738ee 100644 --- a/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerS.txt +++ b/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerS.txt @@ -9,8 +9,8 @@ vector building.dsArea.elevator.interior.lower.S.xPositions = { 35839.40, // 1 35585.40, // 2 35585.40, // 3 -29794.20, // 4 -29794.20 // 5 +35433., // 4 +35433. // 5 }; vector building.dsArea.elevator.interior.lower.S.yPositions = { -14427.20, // 0 diff --git a/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerSW.txt b/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerSW.txt new file mode 100644 index 0000000000..8a177eed6c --- /dev/null +++ b/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerSW.txt @@ -0,0 +1,18 @@ +string building.dsArea.elevator.interior.lower.SW.name = "dsAreaElevatorInteriorLowerSW"; +string building.dsArea.elevator.interior.lower.SW.material = "CONCRETE_MARS"; +double building.dsArea.elevator.interior.lower.SW.offsetFromMu2eOrigin.x = 947.40; +double building.dsArea.elevator.interior.lower.SW.offsetFromFloorSurface.y = 1524.00; +double building.dsArea.elevator.interior.lower.SW.offsetFromMu2eOrigin.z = -3581.40; +double building.dsArea.elevator.interior.lower.SW.yHalfThickness = 1524.00; +vector building.dsArea.elevator.interior.lower.SW.xPositions = { +34404.3, // 0 +34404.3, // 1 +29794.20, // 2 +29794.20 // 3 +}; +vector building.dsArea.elevator.interior.lower.SW.yPositions = { +-14427.20, // 0 +-14732.0, // 1 +-14732.0, // 2 +-14427.20 // 3 +}; diff --git a/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerSW2.txt b/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerSW2.txt new file mode 100644 index 0000000000..97ef2c10c6 --- /dev/null +++ b/Mu2eG4/geom/bldg/dsAreaElevatorInteriorLowerSW2.txt @@ -0,0 +1,18 @@ +string building.dsArea.elevator.interior.lower.SW2.name = "dsAreaElevatorInteriorLowerSW2"; +string building.dsArea.elevator.interior.lower.SW2.material = "CONCRETE_MARS"; +double building.dsArea.elevator.interior.lower.SW2.offsetFromMu2eOrigin.x = 947.40; +double building.dsArea.elevator.interior.lower.SW2.offsetFromFloorSurface.y = 2622.55; +double building.dsArea.elevator.interior.lower.SW2.offsetFromMu2eOrigin.z = -3581.40; +double building.dsArea.elevator.interior.lower.SW2.yHalfThickness = 425.45; +vector building.dsArea.elevator.interior.lower.SW2.xPositions = { +34404.3, // 0 +34404.3, // 1 +35433., // 2 +35433. // 3 +}; +vector building.dsArea.elevator.interior.lower.SW2.yPositions = { +-14427.20, // 0 +-14732.0, // 1 +-14732.0, // 2 +-14427.20 // 3 +}; From aa1448e29117157ea93cc2172505aef68ed252db Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 08:45:15 -0500 Subject: [PATCH 05/16] escape hatch north door --- Mu2eG4/geom/bldg/escapeHatchN.txt | 28 ++++++++++------------ Mu2eG4/geom/bldg/escapeHatchNBot.txt | 31 ++++++++++++++++++++++++ Mu2eG4/geom/bldg/escapeHatchNE.txt | 35 ++++++++++++++++++++++++++++ Mu2eG4/geom/bldg/escapeHatchNTop.txt | 31 ++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 16 deletions(-) create mode 100644 Mu2eG4/geom/bldg/escapeHatchNBot.txt create mode 100644 Mu2eG4/geom/bldg/escapeHatchNE.txt create mode 100644 Mu2eG4/geom/bldg/escapeHatchNTop.txt diff --git a/Mu2eG4/geom/bldg/escapeHatchN.txt b/Mu2eG4/geom/bldg/escapeHatchN.txt index 1901411f37..15570d4981 100644 --- a/Mu2eG4/geom/bldg/escapeHatchN.txt +++ b/Mu2eG4/geom/bldg/escapeHatchN.txt @@ -13,25 +13,21 @@ double building.escape.hatch.N.offsetFromMu2eOrigin.z = -3581.4; double building.escape.hatch.N.yHalfThickness = 2667; vector building.escape.hatch.N.xPositions = { - 20660.7, // B6 - 19356.8, // B7 - 15900.8, // B8 - 17204.7, // B9 - 17797.2, // Z0 - 16636.8, // C7 - 18907.9, // C8 - 20068.3 // Z1 + 17696.83, // N + 15900.8, // F + 17204.7, // E + 17797.2, // D + 16636.8, // C + 17840.38 // K }; vector building.escape.hatch.N.yPositions = { - 19140.1, // B6 - 24521.6, // B7 - 23684.2, // B8 - 18302.7, // B9 - 18446.3, // Z0 - 23235.3, // C7 - 23785.6, // C8 - 18996.6 // Z1 + 24119.38, // N + 23684.2, // F + 18302.7, // E + 18446.3, // D + 23235.3, // C + 23526.93 // K }; // Local Variables: diff --git a/Mu2eG4/geom/bldg/escapeHatchNBot.txt b/Mu2eG4/geom/bldg/escapeHatchNBot.txt new file mode 100644 index 0000000000..cbf26006f8 --- /dev/null +++ b/Mu2eG4/geom/bldg/escapeHatchNBot.txt @@ -0,0 +1,31 @@ +// SimpleConfig geometry file automatically produced for original file: +// +// geom/geom_escape_hatch_N.ccl + +string building.escape.hatch.NBot.name = "escapeHatchNBot"; + +string building.escape.hatch.NBot.material = "CONCRETE_MARS"; + +double building.escape.hatch.NBot.offsetFromMu2eOrigin.x = 947.4; +double building.escape.hatch.NBot.offsetFromFloorSurface.y = 6400.8; +double building.escape.hatch.NBot.offsetFromMu2eOrigin.z = -3581.4; + +double building.escape.hatch.NBot.yHalfThickness = 1219.2; + +vector building.escape.hatch.NBot.xPositions = { + 18696.6, // O + 17696.83, // N + 17840.38, // K + 18840.15 // L +}; + +vector building.escape.hatch.NBot.yPositions = { + 24361.63, // O + 24119.38, // N + 23526.93, // K + 23769.18 // L +}; + +// Local Variables: +// mode:c++ +// End: diff --git a/Mu2eG4/geom/bldg/escapeHatchNE.txt b/Mu2eG4/geom/bldg/escapeHatchNE.txt new file mode 100644 index 0000000000..c3dc65d66a --- /dev/null +++ b/Mu2eG4/geom/bldg/escapeHatchNE.txt @@ -0,0 +1,35 @@ +// SimpleConfig geometry file automatically produced for original file: +// +// geom/geom_escape_hatch_N.ccl + +string building.escape.hatch.NE.name = "escapeHatchNE"; + +string building.escape.hatch.NE.material = "CONCRETE_MARS"; + +double building.escape.hatch.NE.offsetFromMu2eOrigin.x = 947.4; +double building.escape.hatch.NE.offsetFromFloorSurface.y = 7848.6; +double building.escape.hatch.NE.offsetFromMu2eOrigin.z = -3581.4; + +double building.escape.hatch.NE.yHalfThickness = 2667; + +vector building.escape.hatch.NE.xPositions = { + 20660.7, // H + 19356.8, // G + 18696.6, // O + 18840.15, // L + 18907.9, // B + 20068.3 // A +}; + +vector building.escape.hatch.NE.yPositions = { + 19140.1, // H + 24521.6, // G + 24361.63, // O + 23769.18, // L + 23785.6, // B + 18996.6 // A +}; + +// Local Variables: +// mode:c++ +// End: diff --git a/Mu2eG4/geom/bldg/escapeHatchNTop.txt b/Mu2eG4/geom/bldg/escapeHatchNTop.txt new file mode 100644 index 0000000000..b3ba0b9b64 --- /dev/null +++ b/Mu2eG4/geom/bldg/escapeHatchNTop.txt @@ -0,0 +1,31 @@ +// SimpleConfig geometry file automatically produced for original file: +// +// geom/geom_escape_hatch_N.ccl + +string building.escape.hatch.NTop.name = "escapeHatchNTop"; + +string building.escape.hatch.NTop.material = "CONCRETE_MARS"; + +double building.escape.hatch.NTop.offsetFromMu2eOrigin.x = 947.4; +double building.escape.hatch.NTop.offsetFromFloorSurface.y = 10166.35; +double building.escape.hatch.NTop.offsetFromMu2eOrigin.z = -3581.4; + +double building.escape.hatch.NTop.yHalfThickness = 349.25; + +vector building.escape.hatch.NTop.xPositions = { + 18696.6, // O + 17696.83, // N + 17840.38, // K + 18840.15 // L +}; + +vector building.escape.hatch.NTop.yPositions = { + 24361.63, // O + 24119.38, // N + 23526.93, // K + 23769.18 // L +}; + +// Local Variables: +// mode:c++ +// End: From 9e2b6a3dd08a399159b32b24b79b6f83f46751b8 Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 08:48:28 -0500 Subject: [PATCH 06/16] south roof of DS elevator area --- Mu2eG4/geom/bldg/dsAreaElevatorCeiling.txt | 52 +++++++++++---------- Mu2eG4/geom/bldg/dsAreaElevatorCeilingS.txt | 18 +++++++ 2 files changed, 46 insertions(+), 24 deletions(-) create mode 100644 Mu2eG4/geom/bldg/dsAreaElevatorCeilingS.txt diff --git a/Mu2eG4/geom/bldg/dsAreaElevatorCeiling.txt b/Mu2eG4/geom/bldg/dsAreaElevatorCeiling.txt index aa894fa874..a35d4702d0 100644 --- a/Mu2eG4/geom/bldg/dsAreaElevatorCeiling.txt +++ b/Mu2eG4/geom/bldg/dsAreaElevatorCeiling.txt @@ -5,30 +5,34 @@ double building.dsArea.elevator.ceiling.offsetFromFloorSurface.y = 3251.20; double building.dsArea.elevator.ceiling.offsetFromMu2eOrigin.z = -3581.40; double building.dsArea.elevator.ceiling.yHalfThickness = 203.20; vector building.dsArea.elevator.ceiling.xPositions = { -37249.10, // 0 -37249.10, // 1 -37350.70, // 2 -37350.70, // 3 -35585.40, // 4 -35585.40, // 5 -29794.20, // 6 -29794.20, // 7 -32689.80, // 8 -32689.80, // 9 -29895.80, // 10 -29895.80 // 11 +37249.10, // A +37249.10, // B +37350.70, // C +37350.70, // S +35839.40, // T +35839.40, // N +35585.40, // E +35585.40, // F +29794.20, // G +29794.20, // H +32689.80, // I +32689.80, // J +29895.80, // K +29895.80 // L }; vector building.dsArea.elevator.ceiling.yPositions = { --8661.40, // 0 --11887.20, // 1 --11887.20, // 2 --17475.20, // 3 --17475.20, // 4 --14732.00, // 5 --14732.00, // 6 --14427.20, // 7 --14427.20, // 8 --12090.40, // 9 --12090.40, // 10 --8661.40 // 11 +-8661.40, // A +-11887.20, // B +-11887.20, // C +-14427.00, // S +-14427.00, // T +-17475.20, // N +-17475.20, // E +-14732.00, // F +-14732.00, // G +-14427.20, // H +-14427.20, // I +-12090.40, // J +-12090.40, // K +-8661.40 // L }; diff --git a/Mu2eG4/geom/bldg/dsAreaElevatorCeilingS.txt b/Mu2eG4/geom/bldg/dsAreaElevatorCeilingS.txt new file mode 100644 index 0000000000..07ba4bac66 --- /dev/null +++ b/Mu2eG4/geom/bldg/dsAreaElevatorCeilingS.txt @@ -0,0 +1,18 @@ +string building.dsArea.elevator.ceilingS.name = "dsAreaElevatorCeilingS"; +string building.dsArea.elevator.ceilingS.material = "CONCRETE_MARS"; +double building.dsArea.elevator.ceilingS.offsetFromMu2eOrigin.x = 947.40; +double building.dsArea.elevator.ceilingS.offsetFromFloorSurface.y = 3378.20; +double building.dsArea.elevator.ceilingS.offsetFromMu2eOrigin.z = -3581.40; +double building.dsArea.elevator.ceilingS.yHalfThickness = 76.20; +vector building.dsArea.elevator.ceilingS.xPositions = { +37350.70, // D +35839.40, // N +35839.40, // T +37350.70 // S +}; +vector building.dsArea.elevator.ceilingS.yPositions = { +-17475.20, // D +-17475.20, // N +-14427.00, // T +-14427.00 // S +}; From 8e7842a5e6ba01eef0964ef493fb62fdef674c0a Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 08:52:02 -0500 Subject: [PATCH 07/16] south east roof of first floor --- Mu2eG4/geom/bldg/dirtDsAreaFirstFloorSE.txt | 31 +++++++++++++++++++++ Mu2eG4/geom/bldg/dsAreaFirstFloorS.txt | 8 ++++++ Mu2eG4/geom/bldg/dsAreaFirstFloorSE.txt | 21 ++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 Mu2eG4/geom/bldg/dirtDsAreaFirstFloorSE.txt create mode 100644 Mu2eG4/geom/bldg/dsAreaFirstFloorSE.txt diff --git a/Mu2eG4/geom/bldg/dirtDsAreaFirstFloorSE.txt b/Mu2eG4/geom/bldg/dirtDsAreaFirstFloorSE.txt new file mode 100644 index 0000000000..c48fb33346 --- /dev/null +++ b/Mu2eG4/geom/bldg/dirtDsAreaFirstFloorSE.txt @@ -0,0 +1,31 @@ +// SimpleConfig geometry file automatically produced for original file: +// +// geom/geom_DSarea_firstFloor_S.ccl + +string dirt.dsArea.firstFloor.SE.name = "dirtDsAreaFirstFloorSE"; + +string dirt.dsArea.firstFloor.SE.material = "MBOverburden"; + +double dirt.dsArea.firstFloor.SE.offsetFromMu2eOrigin.x = 947.4; +double dirt.dsArea.firstFloor.SE.offsetFromFloorSurface.y = 7416.8; +double dirt.dsArea.firstFloor.SE.offsetFromMu2eOrigin.z = -3581.4; + +double dirt.dsArea.firstFloor.SE.yHalfThickness = 50.8; + +vector dirt.dsArea.firstFloor.SE.xPositions = { +44932.60, // w2 +44932.60, // u1 +38061.90, // t2 +38061.90 // b3 +}; + +vector dirt.dsArea.firstFloor.SE.yPositions = { +-10668.00, // w2 +-9474.20, // u1 +-9474.20, // t2 +-10668.00 // b3 +}; + +// Local Variables: +// mode:c++ +// End: diff --git a/Mu2eG4/geom/bldg/dsAreaFirstFloorS.txt b/Mu2eG4/geom/bldg/dsAreaFirstFloorS.txt index 949f1ef75c..3e9e0fd506 100644 --- a/Mu2eG4/geom/bldg/dsAreaFirstFloorS.txt +++ b/Mu2eG4/geom/bldg/dsAreaFirstFloorS.txt @@ -26,6 +26,10 @@ vector building.dsArea.firstFloor.S.xPositions = { 21971.20, // 18 45847.00, // 19 45847.00, // 20 +44932.60, // w2 +44932.60, // u1 +38061.90, // t2 +38061.90, // b3 38163.50, // 21 38163.50, // 22 -2921.00 // 23 @@ -52,6 +56,10 @@ vector building.dsArea.firstFloor.S.yPositions = { -8661.40, // 18 -8661.40, // 19 -10668.00, // 20 +-10668.00, // w2 +-9474.20, // u1 +-9474.20, // t2 +-10668.00, // b3 -10668.00, // 21 -12014.2, // 22 -12014.2 // 23 diff --git a/Mu2eG4/geom/bldg/dsAreaFirstFloorSE.txt b/Mu2eG4/geom/bldg/dsAreaFirstFloorSE.txt new file mode 100644 index 0000000000..c80c685806 --- /dev/null +++ b/Mu2eG4/geom/bldg/dsAreaFirstFloorSE.txt @@ -0,0 +1,21 @@ +string building.dsArea.firstFloor.SE.name = "dsAreaFirstFloorSE"; +string building.dsArea.firstFloor.SE.material = "CONCRETE_MARS"; +double building.dsArea.firstFloor.SE.offsetFromMu2eOrigin.x = 947.40; +double building.dsArea.firstFloor.SE.offsetFromFloorSurface.y = 7620.0; +double building.dsArea.firstFloor.SE.offsetFromMu2eOrigin.z = -3581.40; +double building.dsArea.firstFloor.SE.yHalfThickness = 152.40; +vector building.dsArea.firstFloor.SE.xPositions = { +44932.60, // w2 +44932.60, // u1 +38061.90, // t2 +38061.90 // b3 +}; +vector building.dsArea.firstFloor.SE.yPositions = { +-10668.00, // w2 +-9474.20, // u1 +-9474.20, // t2 +-10668.00 // b3 +}; +// Local Variables: +// mode:c++ +// End: From 398726b2a92e2731aba1132c6a1ad5b52a8aa23b Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 09:04:10 -0500 Subject: [PATCH 08/16] wall foot north of DS area --- Mu2eG4/geom/bldg/dirtBeamlineSlab2NE.txt | 4 +- Mu2eG4/geom/bldg/dirtBeamlineSlab2NW.txt | 4 +- Mu2eG4/geom/bldg/dirtBeamlineSlab3NE.txt | 63 +++++++++++++++++++++++ Mu2eG4/geom/bldg/dirtBeamlineSlab3NW.txt | 55 ++++++++++++++++++++ Mu2eG4/geom/bldg/dirtFirstFloorLower1.txt | 18 +++++++ Mu2eG4/geom/bldg/dirtFirstFloorLower2.txt | 18 +++++++ Mu2eG4/geom/bldg/dirtFirstFloorLower3.txt | 18 +++++++ Mu2eG4/geom/bldg/dirtFirstFloorLower4.txt | 18 +++++++ Mu2eG4/geom/bldg/dirtFirstFloorLower5.txt | 18 +++++++ Mu2eG4/geom/bldg/firstFloorWallLower1.txt | 18 +++++++ Mu2eG4/geom/bldg/firstFloorWallLower2.txt | 18 +++++++ Mu2eG4/geom/bldg/firstFloorWallLower3.txt | 18 +++++++ Mu2eG4/geom/bldg/firstFloorWallLower4.txt | 18 +++++++ Mu2eG4/geom/bldg/firstFloorWallLower5.txt | 18 +++++++ 14 files changed, 302 insertions(+), 4 deletions(-) create mode 100644 Mu2eG4/geom/bldg/dirtBeamlineSlab3NE.txt create mode 100644 Mu2eG4/geom/bldg/dirtBeamlineSlab3NW.txt create mode 100644 Mu2eG4/geom/bldg/dirtFirstFloorLower1.txt create mode 100644 Mu2eG4/geom/bldg/dirtFirstFloorLower2.txt create mode 100644 Mu2eG4/geom/bldg/dirtFirstFloorLower3.txt create mode 100644 Mu2eG4/geom/bldg/dirtFirstFloorLower4.txt create mode 100644 Mu2eG4/geom/bldg/dirtFirstFloorLower5.txt create mode 100644 Mu2eG4/geom/bldg/firstFloorWallLower1.txt create mode 100644 Mu2eG4/geom/bldg/firstFloorWallLower2.txt create mode 100644 Mu2eG4/geom/bldg/firstFloorWallLower3.txt create mode 100644 Mu2eG4/geom/bldg/firstFloorWallLower4.txt create mode 100644 Mu2eG4/geom/bldg/firstFloorWallLower5.txt diff --git a/Mu2eG4/geom/bldg/dirtBeamlineSlab2NE.txt b/Mu2eG4/geom/bldg/dirtBeamlineSlab2NE.txt index b8822005ac..a31e461092 100644 --- a/Mu2eG4/geom/bldg/dirtBeamlineSlab2NE.txt +++ b/Mu2eG4/geom/bldg/dirtBeamlineSlab2NE.txt @@ -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 dirt.beamline.slab2.NE.xreplace = { 13, 14 }; vector dirt.beamline.slab2.NE.xPositions = { diff --git a/Mu2eG4/geom/bldg/dirtBeamlineSlab2NW.txt b/Mu2eG4/geom/bldg/dirtBeamlineSlab2NW.txt index 7d188314f4..9493b326bc 100644 --- a/Mu2eG4/geom/bldg/dirtBeamlineSlab2NW.txt +++ b/Mu2eG4/geom/bldg/dirtBeamlineSlab2NW.txt @@ -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 dirt.beamline.slab2.NW.xreplace = { 21, 21 }; vector dirt.beamline.slab2.NW.xPositions = { diff --git a/Mu2eG4/geom/bldg/dirtBeamlineSlab3NE.txt b/Mu2eG4/geom/bldg/dirtBeamlineSlab3NE.txt new file mode 100644 index 0000000000..b6e18d2a6d --- /dev/null +++ b/Mu2eG4/geom/bldg/dirtBeamlineSlab3NE.txt @@ -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 dirt.beamline.slab3.NE.xreplace = { 13, 14 }; +vector 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 dirt.beamline.slab3.NE.yreplace = { 14, 15 }; +vector 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: diff --git a/Mu2eG4/geom/bldg/dirtBeamlineSlab3NW.txt b/Mu2eG4/geom/bldg/dirtBeamlineSlab3NW.txt new file mode 100644 index 0000000000..56666fc32c --- /dev/null +++ b/Mu2eG4/geom/bldg/dirtBeamlineSlab3NW.txt @@ -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 dirt.beamline.slab3.NW.xreplace = { 21, 21 }; +vector 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 dirt.beamline.slab3.NW.yreplace = {9,10}; +vector 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: diff --git a/Mu2eG4/geom/bldg/dirtFirstFloorLower1.txt b/Mu2eG4/geom/bldg/dirtFirstFloorLower1.txt new file mode 100644 index 0000000000..81b54dd1e7 --- /dev/null +++ b/Mu2eG4/geom/bldg/dirtFirstFloorLower1.txt @@ -0,0 +1,18 @@ +string dirt.firstFloor.lower.1.name = "dirtFirstFloorLower1"; +string dirt.firstFloor.lower.1.material = "MBOverburden"; +double dirt.firstFloor.lower.1.offsetFromMu2eOrigin.x = 947.40; +double dirt.firstFloor.lower.1.offsetFromFloorSurface.y = 6959.6; +double dirt.firstFloor.lower.1.offsetFromMu2eOrigin.z = -3581.40; +double dirt.firstFloor.lower.1.yHalfThickness = 406.40; +vector dirt.firstFloor.lower.1.xPositions = { +13233.40, // 0 +13233.40, // 1 +7975.60, // 2 +7975.60 // 3 +}; +vector dirt.firstFloor.lower.1.yPositions = { +2031.95, // 1 +-152.4, // 2 +-152.4, // 3 +2031.95 // 4 +}; diff --git a/Mu2eG4/geom/bldg/dirtFirstFloorLower2.txt b/Mu2eG4/geom/bldg/dirtFirstFloorLower2.txt new file mode 100644 index 0000000000..7ed7441f03 --- /dev/null +++ b/Mu2eG4/geom/bldg/dirtFirstFloorLower2.txt @@ -0,0 +1,18 @@ +string dirt.firstFloor.lower.2.name = "dirtFirstFloorLower2"; +string dirt.firstFloor.lower.2.material = "MBOverburden"; +double dirt.firstFloor.lower.2.offsetFromMu2eOrigin.x = 947.40; +double dirt.firstFloor.lower.2.offsetFromFloorSurface.y = 6959.6; +double dirt.firstFloor.lower.2.offsetFromMu2eOrigin.z = -3581.40; +double dirt.firstFloor.lower.2.yHalfThickness = 406.40; +vector dirt.firstFloor.lower.2.xPositions = { +21158.20, // 0 +21158.20, // 1 +14046.20, // 2 +14046.20 // 3 +}; +vector dirt.firstFloor.lower.2.yPositions = { +2031.95, // 1 +-152.4, // 2 +-152.4, // 3 +2031.95 // 4 +}; diff --git a/Mu2eG4/geom/bldg/dirtFirstFloorLower3.txt b/Mu2eG4/geom/bldg/dirtFirstFloorLower3.txt new file mode 100644 index 0000000000..82c97a552c --- /dev/null +++ b/Mu2eG4/geom/bldg/dirtFirstFloorLower3.txt @@ -0,0 +1,18 @@ +string dirt.firstFloor.lower.3.name = "dirtFirstFloorLower3"; +string dirt.firstFloor.lower.3.material = "MBOverburden"; +double dirt.firstFloor.lower.3.offsetFromMu2eOrigin.x = 947.40; +double dirt.firstFloor.lower.3.offsetFromFloorSurface.y = 6959.6; +double dirt.firstFloor.lower.3.offsetFromMu2eOrigin.z = -3581.40; +double dirt.firstFloor.lower.3.yHalfThickness = 406.40; +vector dirt.firstFloor.lower.3.xPositions = { +29083., // 0 +29083., // 1 +21971., // 2 +21971. // 3 +}; +vector dirt.firstFloor.lower.3.yPositions = { +2031.95, // 1 +-431.8, // 2 +-431.8, // 3 +2031.95 // 4 +}; diff --git a/Mu2eG4/geom/bldg/dirtFirstFloorLower4.txt b/Mu2eG4/geom/bldg/dirtFirstFloorLower4.txt new file mode 100644 index 0000000000..4efad75ef2 --- /dev/null +++ b/Mu2eG4/geom/bldg/dirtFirstFloorLower4.txt @@ -0,0 +1,18 @@ +string dirt.firstFloor.lower.4.name = "dirtFirstFloorLower4"; +string dirt.firstFloor.lower.4.material = "MBOverburden"; +double dirt.firstFloor.lower.4.offsetFromMu2eOrigin.x = 947.40; +double dirt.firstFloor.lower.4.offsetFromFloorSurface.y = 6959.6; +double dirt.firstFloor.lower.4.offsetFromMu2eOrigin.z = -3581.40; +double dirt.firstFloor.lower.4.yHalfThickness = 406.40; +vector dirt.firstFloor.lower.4.xPositions = { +37007.80, // 0 +37007.80, // 1 +29895.80, // 2 +29895.80 // 3 +}; +vector dirt.firstFloor.lower.4.yPositions = { +2031.95, // 1 +-431.8, // 2 +-431.8, // 3 +2031.95 // 4 +}; diff --git a/Mu2eG4/geom/bldg/dirtFirstFloorLower5.txt b/Mu2eG4/geom/bldg/dirtFirstFloorLower5.txt new file mode 100644 index 0000000000..8cc5046be9 --- /dev/null +++ b/Mu2eG4/geom/bldg/dirtFirstFloorLower5.txt @@ -0,0 +1,18 @@ +string dirt.firstFloor.lower.5.name = "dirtFirstFloorLower5"; +string dirt.firstFloor.lower.5.material = "MBOverburden"; +double dirt.firstFloor.lower.5.offsetFromMu2eOrigin.x = 947.40; +double dirt.firstFloor.lower.5.offsetFromFloorSurface.y = 6959.6; +double dirt.firstFloor.lower.5.offsetFromMu2eOrigin.z = -3581.40; +double dirt.firstFloor.lower.5.yHalfThickness = 406.40; +vector dirt.firstFloor.lower.5.xPositions = { +44932.60, // 0 +44932.60, // 1 +37820.60, // 2 +37820.60 // 3 +}; +vector dirt.firstFloor.lower.5.yPositions = { +2031.95, // 1 +-431.8, // 2 +-431.8, // 3 +2031.95 // 4 +}; diff --git a/Mu2eG4/geom/bldg/firstFloorWallLower1.txt b/Mu2eG4/geom/bldg/firstFloorWallLower1.txt new file mode 100644 index 0000000000..e250a46d51 --- /dev/null +++ b/Mu2eG4/geom/bldg/firstFloorWallLower1.txt @@ -0,0 +1,18 @@ +string building.firstFloor.wall.lower1.name = "firstFloorWallLower1"; +string building.firstFloor.wall.lower1.material = "CONCRETE_MARS"; +double building.firstFloor.wall.lower1.offsetFromMu2eOrigin.x = 947.40; +double building.firstFloor.wall.lower1.offsetFromFloorSurface.y = 6959.6; +double building.firstFloor.wall.lower1.offsetFromMu2eOrigin.z = -3581.40; +double building.firstFloor.wall.lower1.yHalfThickness = 406.40; +vector building.firstFloor.wall.lower1.xPositions = { +13233.40, // 0 +13233.40, // 1 +7975.60, // 2 +7975.60 // 3 +}; +vector building.firstFloor.wall.lower1.yPositions = { +2438.35, // 1 +2031.95, // 2 +2031.95, // 3 +2438.35 // 4 +}; diff --git a/Mu2eG4/geom/bldg/firstFloorWallLower2.txt b/Mu2eG4/geom/bldg/firstFloorWallLower2.txt new file mode 100644 index 0000000000..40e41f31a5 --- /dev/null +++ b/Mu2eG4/geom/bldg/firstFloorWallLower2.txt @@ -0,0 +1,18 @@ +string building.firstFloor.wall.lower2.name = "firstFloorWallLower2"; +string building.firstFloor.wall.lower2.material = "CONCRETE_MARS"; +double building.firstFloor.wall.lower2.offsetFromMu2eOrigin.x = 947.40; +double building.firstFloor.wall.lower2.offsetFromFloorSurface.y = 6959.6; +double building.firstFloor.wall.lower2.offsetFromMu2eOrigin.z = -3581.40; +double building.firstFloor.wall.lower2.yHalfThickness = 406.40; +vector building.firstFloor.wall.lower2.xPositions = { +21158.20, // 0 +21158.20, // 1 +14046.20, // 2 +14046.20 // 3 +}; +vector building.firstFloor.wall.lower2.yPositions = { +2438.35, // 1 +2031.95, // 2 +2031.95, // 3 +2438.35 // 4 +}; diff --git a/Mu2eG4/geom/bldg/firstFloorWallLower3.txt b/Mu2eG4/geom/bldg/firstFloorWallLower3.txt new file mode 100644 index 0000000000..20bf2ff70e --- /dev/null +++ b/Mu2eG4/geom/bldg/firstFloorWallLower3.txt @@ -0,0 +1,18 @@ +string building.firstFloor.wall.lower3.name = "firstFloorWallLower3"; +string building.firstFloor.wall.lower3.material = "CONCRETE_MARS"; +double building.firstFloor.wall.lower3.offsetFromMu2eOrigin.x = 947.40; +double building.firstFloor.wall.lower3.offsetFromFloorSurface.y = 6959.6; +double building.firstFloor.wall.lower3.offsetFromMu2eOrigin.z = -3581.40; +double building.firstFloor.wall.lower3.yHalfThickness = 406.40; +vector building.firstFloor.wall.lower3.xPositions = { +29083., // 0 +29083., // 1 +21971., // 2 +21971. // 3 +}; +vector building.firstFloor.wall.lower3.yPositions = { +2438.35, // 1 +2031.95, // 2 +2031.95, // 3 +2438.35 // 4 +}; diff --git a/Mu2eG4/geom/bldg/firstFloorWallLower4.txt b/Mu2eG4/geom/bldg/firstFloorWallLower4.txt new file mode 100644 index 0000000000..df676cb21f --- /dev/null +++ b/Mu2eG4/geom/bldg/firstFloorWallLower4.txt @@ -0,0 +1,18 @@ +string building.firstFloor.wall.lower4.name = "firstFloorWallLower4"; +string building.firstFloor.wall.lower4.material = "CONCRETE_MARS"; +double building.firstFloor.wall.lower4.offsetFromMu2eOrigin.x = 947.40; +double building.firstFloor.wall.lower4.offsetFromFloorSurface.y = 6959.6; +double building.firstFloor.wall.lower4.offsetFromMu2eOrigin.z = -3581.40; +double building.firstFloor.wall.lower4.yHalfThickness = 406.40; +vector building.firstFloor.wall.lower4.xPositions = { +37007.80, // 0 +37007.80, // 1 +29895.80, // 2 +29895.80 // 3 +}; +vector building.firstFloor.wall.lower4.yPositions = { +2438.35, // 1 +2031.95, // 2 +2031.95, // 3 +2438.35 // 4 +}; diff --git a/Mu2eG4/geom/bldg/firstFloorWallLower5.txt b/Mu2eG4/geom/bldg/firstFloorWallLower5.txt new file mode 100644 index 0000000000..e22fce7e9e --- /dev/null +++ b/Mu2eG4/geom/bldg/firstFloorWallLower5.txt @@ -0,0 +1,18 @@ +string building.firstFloor.wall.lower5.name = "firstFloorWallLower5"; +string building.firstFloor.wall.lower5.material = "CONCRETE_MARS"; +double building.firstFloor.wall.lower5.offsetFromMu2eOrigin.x = 947.40; +double building.firstFloor.wall.lower5.offsetFromFloorSurface.y = 6959.6; +double building.firstFloor.wall.lower5.offsetFromMu2eOrigin.z = -3581.40; +double building.firstFloor.wall.lower5.yHalfThickness = 406.40; +vector building.firstFloor.wall.lower5.xPositions = { +44932.60, // 0 +44932.60, // 1 +37820.60, // 2 +37820.60 // 3 +}; +vector building.firstFloor.wall.lower5.yPositions = { +2438.35, // 1 +2031.95, // 2 +2031.95, // 3 +2438.35 // 4 +}; From 638ca4acd5450ac9489848c070c19cf0d91d90ed Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 09:06:19 -0500 Subject: [PATCH 09/16] remote handling hatch base contour --- Mu2eG4/geom/bldg/dirtBeamlineSlabW2.txt | 10 +++--- Mu2eG4/geom/bldg/dirtBeamlineUpper_v02.txt | 10 +++--- .../geom/bldg/remoteHandlingHatchLowerSW.txt | 35 +++++++++++++++++++ 3 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 Mu2eG4/geom/bldg/remoteHandlingHatchLowerSW.txt diff --git a/Mu2eG4/geom/bldg/dirtBeamlineSlabW2.txt b/Mu2eG4/geom/bldg/dirtBeamlineSlabW2.txt index 72a01a3f98..e20a4787ee 100644 --- a/Mu2eG4/geom/bldg/dirtBeamlineSlabW2.txt +++ b/Mu2eG4/geom/bldg/dirtBeamlineSlabW2.txt @@ -19,8 +19,8 @@ vector 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 + 2946.4, // + 2946.4, // 9550.5, // NE corner rem hatch 9550.5, // rem hatch to N -2006.6, // h1_to_N @@ -37,9 +37,9 @@ vector dirt.beamline.slab.W2.yPositions = { 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 diff --git a/Mu2eG4/geom/bldg/dirtBeamlineUpper_v02.txt b/Mu2eG4/geom/bldg/dirtBeamlineUpper_v02.txt index 6df0443e5c..1095d418a5 100644 --- a/Mu2eG4/geom/bldg/dirtBeamlineUpper_v02.txt +++ b/Mu2eG4/geom/bldg/dirtBeamlineUpper_v02.txt @@ -28,8 +28,8 @@ vector 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 @@ -49,9 +49,9 @@ vector 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 }; diff --git a/Mu2eG4/geom/bldg/remoteHandlingHatchLowerSW.txt b/Mu2eG4/geom/bldg/remoteHandlingHatchLowerSW.txt new file mode 100644 index 0000000000..b5c5060318 --- /dev/null +++ b/Mu2eG4/geom/bldg/remoteHandlingHatchLowerSW.txt @@ -0,0 +1,35 @@ +// SimpleConfig geometry file automatically produced for original file: +// +// geom/geom_remoteHatchLower.SW.ccl + +string building.remote.handling.Hatch.Lower.SW.name = "remoteHandlingHatchLowerSW"; + +string building.remote.handling.Hatch.Lower.SW.material = "CONCRETE_MARS"; + +double building.remote.handling.Hatch.Lower.SW.offsetFromMu2eOrigin.x = 947.4; +double building.remote.handling.Hatch.Lower.SW.offsetFromFloorSurface.y = 5664.2; +double building.remote.handling.Hatch.Lower.SW.offsetFromMu2eOrigin.z = -3581.4; + +double building.remote.handling.Hatch.Lower.SW.yHalfThickness = 431.8; + +vector building.remote.handling.Hatch.Lower.SW.xPositions = { + 3403.6, // + 3403.6, // + 9550.4, // + 9550.4, // + 2946.4, // + 2946.4 // +}; + +vector building.remote.handling.Hatch.Lower.SW.yPositions = { + 16459.2, // + 13055.6, // + 13055.6, // + 12598.4, // + 12598.4, // + 16459.2 // +}; + +// Local Variables: +// mode:c++ +// End: From 66134cad7dbb7b3e4c9a1e7b458b3a7a151c0e92 Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 09:09:17 -0500 Subject: [PATCH 10/16] concrete beam south of DS area --- .../geom/bldg/dirtDsAreaAlcoveStairwell.txt | 4 +-- .../bldg/dirtDsAreaAlcoveStairwellTop.txt | 28 +++++++++++++++++++ Mu2eG4/geom/bldg/dirtDsAreaUpper.txt | 6 ++-- Mu2eG4/geom/bldg/dirtDsAreaUpper2.txt | 26 +++++++++++++++++ Mu2eG4/geom/bldg/dirtDsAreaUpper3.txt | 25 +++++++++++++++++ Mu2eG4/geom/bldg/dirtDsAreaUpper4.txt | 25 +++++++++++++++++ Mu2eG4/geom/bldg/dsAreaUpperWallS1.txt | 18 ++++++++++++ Mu2eG4/geom/bldg/dsAreaUpperWallS2.txt | 22 +++++++++++++++ Mu2eG4/geom/bldg/dsAreaUpperWallS3.txt | 22 +++++++++++++++ 9 files changed, 171 insertions(+), 5 deletions(-) create mode 100644 Mu2eG4/geom/bldg/dirtDsAreaAlcoveStairwellTop.txt create mode 100644 Mu2eG4/geom/bldg/dirtDsAreaUpper2.txt create mode 100644 Mu2eG4/geom/bldg/dirtDsAreaUpper3.txt create mode 100644 Mu2eG4/geom/bldg/dirtDsAreaUpper4.txt create mode 100644 Mu2eG4/geom/bldg/dsAreaUpperWallS1.txt create mode 100644 Mu2eG4/geom/bldg/dsAreaUpperWallS2.txt create mode 100644 Mu2eG4/geom/bldg/dsAreaUpperWallS3.txt diff --git a/Mu2eG4/geom/bldg/dirtDsAreaAlcoveStairwell.txt b/Mu2eG4/geom/bldg/dirtDsAreaAlcoveStairwell.txt index 0a493185fb..1af5e975c8 100644 --- a/Mu2eG4/geom/bldg/dirtDsAreaAlcoveStairwell.txt +++ b/Mu2eG4/geom/bldg/dirtDsAreaAlcoveStairwell.txt @@ -4,10 +4,10 @@ string dirt.dsArea.alcove.stairwell.name = "dirtDsAreaAlcoveStairwell"; string dirt.dsArea.alcove.stairwell.material = "MBOverburden"; double dirt.dsArea.alcove.stairwell.offsetFromMu2eOrigin.x = 947.4; -double dirt.dsArea.alcove.stairwell.offsetFromFloorSurface.y = 3606.8; +double dirt.dsArea.alcove.stairwell.offsetFromFloorSurface.y = 3429.; double dirt.dsArea.alcove.stairwell.offsetFromMu2eOrigin.z = -3581.4; -double dirt.dsArea.alcove.stairwell.yHalfThickness = 3759.2; +double dirt.dsArea.alcove.stairwell.yHalfThickness = 3581.4; vector dirt.dsArea.alcove.stairwell.xPositions = { 13233.4, // g1 diff --git a/Mu2eG4/geom/bldg/dirtDsAreaAlcoveStairwellTop.txt b/Mu2eG4/geom/bldg/dirtDsAreaAlcoveStairwellTop.txt new file mode 100644 index 0000000000..202c30b42b --- /dev/null +++ b/Mu2eG4/geom/bldg/dirtDsAreaAlcoveStairwellTop.txt @@ -0,0 +1,28 @@ + +string dirt.dsArea.alcove.stairwell.top.name = "dirtDsAreaAlcoveStairwellTop"; + +string dirt.dsArea.alcove.stairwell.top.material = "MBOverburden"; + +double dirt.dsArea.alcove.stairwell.top.offsetFromMu2eOrigin.x = 947.4; +double dirt.dsArea.alcove.stairwell.top.offsetFromFloorSurface.y = 7188.2; +double dirt.dsArea.alcove.stairwell.top.offsetFromMu2eOrigin.z = -3581.4; + +double dirt.dsArea.alcove.stairwell.top.yHalfThickness = 177.8; + +vector dirt.dsArea.alcove.stairwell.top.xPositions = { + 13233.4, // g1 + 13233.4, // g2 + 6121.4, // g3 + 6121.4 // g4 +}; + +vector dirt.dsArea.alcove.stairwell.top.yPositions = { + -11404.6, // g1 + -9550.4, // g2 + -9550.4, // g3 + -11404.6 // g4 +}; + +// Local Variables: +// mode:c++ +// End: diff --git a/Mu2eG4/geom/bldg/dirtDsAreaUpper.txt b/Mu2eG4/geom/bldg/dirtDsAreaUpper.txt index a0f2046e78..740523c85b 100644 --- a/Mu2eG4/geom/bldg/dirtDsAreaUpper.txt +++ b/Mu2eG4/geom/bldg/dirtDsAreaUpper.txt @@ -1,10 +1,10 @@ string dirt.dsArea.upper.name = "dirtDsAreaUpper"; string dirt.dsArea.upper.material = "MBOverburden"; double dirt.dsArea.upper.offsetFromMu2eOrigin.x = 947.40; -double dirt.dsArea.upper.offsetFromFloorSurface.y = 5410.20; +double dirt.dsArea.upper.offsetFromFloorSurface.y = 5232.4; double dirt.dsArea.upper.offsetFromMu2eOrigin.z = -3581.40; vector dirt.dsArea.upper.yreplace ={0 ,1 }; -double dirt.dsArea.upper.yHalfThickness = 1955.80; +double dirt.dsArea.upper.yHalfThickness = 1778.; vector dirt.dsArea.upper.xPositions = { 29083.00, // 0 13630.28, // 1 @@ -47,7 +47,7 @@ vector dirt.dsArea.upper.yPositions = { }; int dirt.dsArea.upper.Notch.numberOfNotches = 1; vector dirt.dsArea.upper.Notch.halfDims.1 = {76.2,127.,3350}; -vector dirt.dsArea.upper.Notch.position.1 = {18000.,-12801.6,0.}; +vector dirt.dsArea.upper.Notch.position.1 = {18000.,-12623.8,0.}; string dirt.dsArea.upper.Notch.orientation.1 = "500"; // Local Variables: // mode:c++ diff --git a/Mu2eG4/geom/bldg/dirtDsAreaUpper2.txt b/Mu2eG4/geom/bldg/dirtDsAreaUpper2.txt new file mode 100644 index 0000000000..3ae785fda3 --- /dev/null +++ b/Mu2eG4/geom/bldg/dirtDsAreaUpper2.txt @@ -0,0 +1,26 @@ +string dirt.dsArea.upper2.name = "dirtDsAreaUpper2"; +string dirt.dsArea.upper2.material = "MBOverburden"; +double dirt.dsArea.upper2.offsetFromMu2eOrigin.x = 947.40; +double dirt.dsArea.upper2.offsetFromFloorSurface.y = 7188.2; +double dirt.dsArea.upper2.offsetFromMu2eOrigin.z = -3581.40; +vector dirt.dsArea.upper2.yreplace ={0 ,1 }; +double dirt.dsArea.upper2.yHalfThickness = 177.8; +vector dirt.dsArea.upper2.xPositions = { +29083.00, // 0 +13630.28, // 1 +13630.28, // 2 +29083.00 // 3 +}; +vector dirt.dsArea.upper2.yPositions = { +-50000.00, // 0 +-50000.00, // 1 +-12014.20, // 2 +-12014.20 // 3 +}; +int dirt.dsArea.upper2.Notch.numberOfNotches = 1; +vector dirt.dsArea.upper2.Notch.halfDims.1 = {76.2,127.,3350}; +vector dirt.dsArea.upper2.Notch.position.1 = {18000.,-14579.6,0.}; +string dirt.dsArea.upper2.Notch.orientation.1 = "500"; +// Local Variables: +// mode:c++ +// End: diff --git a/Mu2eG4/geom/bldg/dirtDsAreaUpper3.txt b/Mu2eG4/geom/bldg/dirtDsAreaUpper3.txt new file mode 100644 index 0000000000..7adf8e84f1 --- /dev/null +++ b/Mu2eG4/geom/bldg/dirtDsAreaUpper3.txt @@ -0,0 +1,25 @@ +string dirt.dsArea.upper3.name = "dirtDsAreaUpper3"; +string dirt.dsArea.upper3.material = "MBOverburden"; +double dirt.dsArea.upper3.offsetFromMu2eOrigin.x = 947.40; +double dirt.dsArea.upper3.offsetFromFloorSurface.y = 7188.2; +double dirt.dsArea.upper3.offsetFromMu2eOrigin.z = -3581.40; +double dirt.dsArea.upper3.yHalfThickness = 177.8; +vector dirt.dsArea.upper3.xPositions = { +21158.1, // a +19573.98, // b +19573.98, // c +14046.2, // d +14046.2, // e +21158.1 // f +}; +vector dirt.dsArea.upper3.yPositions = { +-10312.4, // a +-10312.4, // b +-11404.6, // c +-11404.6, // d +-9271., // e +-9271. // f +}; +// Local Variables: +// mode:c++ +// End: diff --git a/Mu2eG4/geom/bldg/dirtDsAreaUpper4.txt b/Mu2eG4/geom/bldg/dirtDsAreaUpper4.txt new file mode 100644 index 0000000000..1f451231cb --- /dev/null +++ b/Mu2eG4/geom/bldg/dirtDsAreaUpper4.txt @@ -0,0 +1,25 @@ +string dirt.dsArea.upper4.name = "dirtDsAreaUpper4"; +string dirt.dsArea.upper4.material = "MBOverburden"; +double dirt.dsArea.upper4.offsetFromMu2eOrigin.x = 947.40; +double dirt.dsArea.upper4.offsetFromFloorSurface.y = 7188.2; +double dirt.dsArea.upper4.offsetFromMu2eOrigin.z = -3581.40; +double dirt.dsArea.upper4.yHalfThickness = 177.8; +vector dirt.dsArea.upper4.xPositions = { +24069.8, // a +29083., // b +29083., // c +21971.1, // d +21971.1, // e +24069.8 // f +}; +vector dirt.dsArea.upper4.yPositions = { +-11404.6, // a +-11404.6, // b +-9271., // c +-9271., // d +-10312.4, // e +-10312.4 // f +}; +// Local Variables: +// mode:c++ +// End: diff --git a/Mu2eG4/geom/bldg/dsAreaUpperWallS1.txt b/Mu2eG4/geom/bldg/dsAreaUpperWallS1.txt new file mode 100644 index 0000000000..80f3c43cf1 --- /dev/null +++ b/Mu2eG4/geom/bldg/dsAreaUpperWallS1.txt @@ -0,0 +1,18 @@ +string building.dsArea.upper.wall.S1.name = "dsAreaUpperWallS1"; +string building.dsArea.upper.wall.S1.material = "CONCRETE_MARS"; +double building.dsArea.upper.wall.S1.offsetFromMu2eOrigin.x = 947.40; +double building.dsArea.upper.wall.S1.offsetFromFloorSurface.y = 7188.2; +double building.dsArea.upper.wall.S1.offsetFromMu2eOrigin.z = -3581.40; +double building.dsArea.upper.wall.S1.yHalfThickness = 177.8; +vector building.dsArea.upper.wall.S1.xPositions = { +13233.4, // +13233.4, // +6121.4, // +6121.4 // +}; +vector building.dsArea.upper.wall.S1.yPositions = { +-12014.2, // +-11404.6, // +-11404.6, // +-12014.2 // +}; diff --git a/Mu2eG4/geom/bldg/dsAreaUpperWallS2.txt b/Mu2eG4/geom/bldg/dsAreaUpperWallS2.txt new file mode 100644 index 0000000000..eeb13248b1 --- /dev/null +++ b/Mu2eG4/geom/bldg/dsAreaUpperWallS2.txt @@ -0,0 +1,22 @@ +string building.dsArea.upper.wall.S2.name = "dsAreaUpperWallS2"; +string building.dsArea.upper.wall.S2.material = "CONCRETE_MARS"; +double building.dsArea.upper.wall.S2.offsetFromMu2eOrigin.x = 947.40; +double building.dsArea.upper.wall.S2.offsetFromFloorSurface.y = 7188.2; +double building.dsArea.upper.wall.S2.offsetFromMu2eOrigin.z = -3581.40; +double building.dsArea.upper.wall.S2.yHalfThickness = 177.8; +vector building.dsArea.upper.wall.S2.xPositions = { +14046.2, // a +14046.2, // b +21158.2, // c +21158.2, // d +19573.95, // e +19573.95 // f +}; +vector building.dsArea.upper.wall.S2.yPositions = { +-11404.6, // a +-12014.2, // b +-12014.2, // c +-11658.6, // d +-11658.6, // e +-11404.6 // f +}; diff --git a/Mu2eG4/geom/bldg/dsAreaUpperWallS3.txt b/Mu2eG4/geom/bldg/dsAreaUpperWallS3.txt new file mode 100644 index 0000000000..eb9035e686 --- /dev/null +++ b/Mu2eG4/geom/bldg/dsAreaUpperWallS3.txt @@ -0,0 +1,22 @@ +string building.dsArea.upper.wall.S3.name = "dsAreaUpperWallS3"; +string building.dsArea.upper.wall.S3.material = "CONCRETE_MARS"; +double building.dsArea.upper.wall.S3.offsetFromMu2eOrigin.x = 947.40; +double building.dsArea.upper.wall.S3.offsetFromFloorSurface.y = 7188.2; +double building.dsArea.upper.wall.S3.offsetFromMu2eOrigin.z = -3581.40; +double building.dsArea.upper.wall.S3.yHalfThickness = 177.8; +vector building.dsArea.upper.wall.S3.xPositions = { +21971., // a +29083., // b +29083., // c +24069.8, // d +24069.8, // e +21971. // f +}; +vector building.dsArea.upper.wall.S3.yPositions = { +-12014.2, // a +-12014.2, // b +-11404.6, // c +-11404.6, // d +-11658.6, // e +-11658.6 // f +}; From d8118928c8949da66681a86de0a454b25d1800c9 Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 09:12:18 -0500 Subject: [PATCH 11/16] fix concrete in NW of DS area --- .../backfillTSarea-W1UpperNotchUpper1.txt | 4 +-- .../backfillTSarea-W1UpperNotchUpper2.txt | 4 +-- Mu2eG4/geom/bldg/psAreaCeiling_v03.txt | 4 +-- Mu2eG4/geom/bldg/tsDsAreaWallinsertN.txt | 35 ------------------- Mu2eG4/geom/bldg/tsDsAreaWallinsertN_v02.txt | 35 ------------------- 5 files changed, 6 insertions(+), 76 deletions(-) delete mode 100644 Mu2eG4/geom/bldg/tsDsAreaWallinsertN.txt delete mode 100644 Mu2eG4/geom/bldg/tsDsAreaWallinsertN_v02.txt diff --git a/Mu2eG4/geom/bldg/backfillTSarea-W1UpperNotchUpper1.txt b/Mu2eG4/geom/bldg/backfillTSarea-W1UpperNotchUpper1.txt index 69b22b3273..f718bdc595 100644 --- a/Mu2eG4/geom/bldg/backfillTSarea-W1UpperNotchUpper1.txt +++ b/Mu2eG4/geom/bldg/backfillTSarea-W1UpperNotchUpper1.txt @@ -22,8 +22,8 @@ vector building.backfill.TSarea-W.1UpperNotchUpper1.xPositions = { }; vector 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 diff --git a/Mu2eG4/geom/bldg/backfillTSarea-W1UpperNotchUpper2.txt b/Mu2eG4/geom/bldg/backfillTSarea-W1UpperNotchUpper2.txt index 63ff92ef92..5cb600da31 100644 --- a/Mu2eG4/geom/bldg/backfillTSarea-W1UpperNotchUpper2.txt +++ b/Mu2eG4/geom/bldg/backfillTSarea-W1UpperNotchUpper2.txt @@ -20,8 +20,8 @@ vector building.backfill.TSarea-W.1UpperNotchUpper2.xPositions = { }; vector building.backfill.TSarea-W.1UpperNotchUpper2.yPositions = { - 2438.3, // F0 - 2438.3, // F1 + 0., // F0 + 0., // F1 -609.6, // F2 -609.6 // F3 }; diff --git a/Mu2eG4/geom/bldg/psAreaCeiling_v03.txt b/Mu2eG4/geom/bldg/psAreaCeiling_v03.txt index 63971f6af3..a29846b22b 100644 --- a/Mu2eG4/geom/bldg/psAreaCeiling_v03.txt +++ b/Mu2eG4/geom/bldg/psAreaCeiling_v03.txt @@ -7,10 +7,10 @@ string building.psArea.ceiling.name = "psAreaCeiling"; string building.psArea.ceiling.material = "CONCRETE_MARS"; double building.psArea.ceiling.offsetFromMu2eOrigin.x = 947.4; -double building.psArea.ceiling.offsetFromFloorSurface.y = 5638.8; +double building.psArea.ceiling.offsetFromFloorSurface.y = 6273.8; double building.psArea.ceiling.offsetFromMu2eOrigin.z = -3581.4; -double building.psArea.ceiling.yHalfThickness = 457.2; +double building.psArea.ceiling.yHalfThickness = 1092.2; vector building.psArea.ceiling.xPositions = { -2006.6, // b1 diff --git a/Mu2eG4/geom/bldg/tsDsAreaWallinsertN.txt b/Mu2eG4/geom/bldg/tsDsAreaWallinsertN.txt deleted file mode 100644 index 987ab2ccbb..0000000000 --- a/Mu2eG4/geom/bldg/tsDsAreaWallinsertN.txt +++ /dev/null @@ -1,35 +0,0 @@ -// SimpleConfig geometry file automatically produced for original file: -// -// geom/geom_TSDS_NwallInsert.ccl - -string building.tsDsArea.wallinsert.N.name = "tsDsAreaWallinsertN"; - -string building.tsDsArea.wallinsert.N.material = "CONCRETE_MARS"; - -double building.tsDsArea.wallinsert.N.offsetFromMu2eOrigin.x = 947.4; -double building.tsDsArea.wallinsert.N.offsetFromFloorSurface.y = 6731; -double building.tsDsArea.wallinsert.N.offsetFromMu2eOrigin.z = -3581.4; - -double building.tsDsArea.wallinsert.N.yHalfThickness = 635; - -vector building.tsDsArea.wallinsert.N.xPositions = { - -1270, // A - 0, // B - 0, // C - 6705.6, // E - 6705.6, // F - -1270 // G -}; - -vector building.tsDsArea.wallinsert.N.yPositions = { - 0, // A - 0, // B - 609.6, // C - 609.6, // E - 2438.4, // F - 2438.4 // G -}; - -// Local Variables: -// mode:c++ -// End: diff --git a/Mu2eG4/geom/bldg/tsDsAreaWallinsertN_v02.txt b/Mu2eG4/geom/bldg/tsDsAreaWallinsertN_v02.txt deleted file mode 100644 index 0a2faff239..0000000000 --- a/Mu2eG4/geom/bldg/tsDsAreaWallinsertN_v02.txt +++ /dev/null @@ -1,35 +0,0 @@ -// SimpleConfig geometry file automatically produced for original file: -// -// geom/geom_TSDS_NwallInsert.ccl - -string building.tsDsArea.wallinsert.N.name = "tsDsAreaWallinsertN"; - -string building.tsDsArea.wallinsert.N.material = "CONCRETE_MARS"; - -double building.tsDsArea.wallinsert.N.offsetFromMu2eOrigin.x = 947.4; -double building.tsDsArea.wallinsert.N.offsetFromFloorSurface.y = 6731; -double building.tsDsArea.wallinsert.N.offsetFromMu2eOrigin.z = -3581.4; - -double building.tsDsArea.wallinsert.N.yHalfThickness = 635; - -vector building.tsDsArea.wallinsert.N.xPositions = { - -1270, // A - -609.6, // B - -609.6, // C - 6705.6, // E - 6705.6, // F - -1270 // G -}; - -vector building.tsDsArea.wallinsert.N.yPositions = { - 0, // A - 0, // B - 609.6, // C - 609.6, // E - 2438.4, // F - 2438.4 // G -}; - -// Local Variables: -// mode:c++ -// End: From df64652fef81f5f64288994afe63dce6cb042b91 Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 09:15:00 -0500 Subject: [PATCH 12/16] fix beam distances from east wall --- Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab1.txt | 8 ++++---- Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab2.txt | 8 ++++---- Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab3.txt | 8 ++++---- Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab4.txt | 8 ++++---- Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab5.txt | 8 ++++---- Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab6.txt | 4 ++-- Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab2.txt | 8 ++++---- Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab3.txt | 8 ++++---- Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab4.txt | 8 ++++---- Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab5.txt | 8 ++++---- Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab6.txt | 8 ++++---- 11 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab1.txt b/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab1.txt index 03b2a792fd..6c93e4be8c 100644 --- a/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab1.txt +++ b/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab1.txt @@ -13,10 +13,10 @@ double dirt.dsArea.downstreamCeiling.vslab1.offsetFromMu2eOrigin.z = -3581.4; double dirt.dsArea.downstreamCeiling.vslab1.yHalfThickness = 876.3; vector dirt.dsArea.downstreamCeiling.vslab1.xPositions = { - 29972, // v1 - 32004, // v2 - 32004, // v3 - 29972 // v4 + 29972., // v1 + 31826.2, // v2 + 31826.2, // v3 + 29972. // v4 }; vector dirt.dsArea.downstreamCeiling.vslab1.yPositions = { diff --git a/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab2.txt b/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab2.txt index 5e16dbd1f0..dbe723c535 100644 --- a/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab2.txt +++ b/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab2.txt @@ -13,10 +13,10 @@ double dirt.dsArea.downstreamCeiling.vslab2.offsetFromMu2eOrigin.z = -3581.4; double dirt.dsArea.downstreamCeiling.vslab2.yHalfThickness = 876.3; vector dirt.dsArea.downstreamCeiling.vslab2.xPositions = { - 32613.6, // v1 - 34645.6, // v2 - 34645.6, // v3 - 32613.6 // v4 + 32435.8, // v1 + 34467.8, // v2 + 34467.8, // v3 + 32435.8 // v4 }; vector dirt.dsArea.downstreamCeiling.vslab2.yPositions = { diff --git a/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab3.txt b/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab3.txt index 6597b429fb..f3a283679e 100644 --- a/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab3.txt +++ b/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab3.txt @@ -13,10 +13,10 @@ double dirt.dsArea.downstreamCeiling.vslab3.offsetFromMu2eOrigin.z = -3581.4; double dirt.dsArea.downstreamCeiling.vslab3.yHalfThickness = 876.3; vector dirt.dsArea.downstreamCeiling.vslab3.xPositions = { - 35255.2, // v1 - 37287.2, // v2 - 37287.2, // v3 - 35255.2 // v4 + 35077.4, // v1 + 37109.4, // v2 + 37109.4, // v3 + 35077.4 // v4 }; vector dirt.dsArea.downstreamCeiling.vslab3.yPositions = { diff --git a/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab4.txt b/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab4.txt index 57501e2940..16f4971a37 100644 --- a/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab4.txt +++ b/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab4.txt @@ -13,10 +13,10 @@ double dirt.dsArea.downstreamCeiling.vslab4.offsetFromMu2eOrigin.z = -3581.4; double dirt.dsArea.downstreamCeiling.vslab4.yHalfThickness = 876.3; vector dirt.dsArea.downstreamCeiling.vslab4.xPositions = { - 37896.8, // v1 - 39928.8, // v2 - 39928.8, // v3 - 37896.8 // v4 + 37719., // v1 + 39751., // v2 + 39751., // v3 + 37719. // v4 }; vector dirt.dsArea.downstreamCeiling.vslab4.yPositions = { diff --git a/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab5.txt b/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab5.txt index b2e521751a..9571b7d784 100644 --- a/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab5.txt +++ b/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab5.txt @@ -13,10 +13,10 @@ double dirt.dsArea.downstreamCeiling.vslab5.offsetFromMu2eOrigin.z = -3581.4; double dirt.dsArea.downstreamCeiling.vslab5.yHalfThickness = 876.3; vector dirt.dsArea.downstreamCeiling.vslab5.xPositions = { - 40538.4, // v1 - 42570.4, // v2 - 42570.4, // v3 - 40538.4 // v4 + 40360.6, // v1 + 42392.6, // v2 + 42392.6, // v3 + 40360.6 // v4 }; vector dirt.dsArea.downstreamCeiling.vslab5.yPositions = { diff --git a/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab6.txt b/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab6.txt index f95191c3d9..c9c9032124 100644 --- a/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab6.txt +++ b/Mu2eG4/geom/bldg/dirtDsAreaDownstreamCeilingVslab6.txt @@ -13,10 +13,10 @@ double dirt.dsArea.downstreamCeiling.vslab6.offsetFromMu2eOrigin.z = -3581.4; double dirt.dsArea.downstreamCeiling.vslab6.yHalfThickness = 876.3; vector dirt.dsArea.downstreamCeiling.vslab6.xPositions = { - 43180, // v1 + 43002.2, // v1 44932.6, // v2 44932.6, // v3 - 43180 // v4 + 43002.2 // v4 }; vector dirt.dsArea.downstreamCeiling.vslab6.yPositions = { diff --git a/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab2.txt b/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab2.txt index a0eeb28066..f76dada804 100644 --- a/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab2.txt +++ b/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab2.txt @@ -13,10 +13,10 @@ double building.dsArea.downstreamCeiling.vslab2.offsetFromMu2eOrigin.z = -3581 double building.dsArea.downstreamCeiling.vslab2.yHalfThickness = 876.3; vector building.dsArea.downstreamCeiling.vslab2.xPositions = { - 32004, // v1 - 32613.6, // v2 - 32613.6, // v3 - 32004 // v4 + 31826.2, // v1 + 32435.8, // v2 + 32435.8, // v3 + 31826.2 // v4 }; vector building.dsArea.downstreamCeiling.vslab2.yPositions = { diff --git a/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab3.txt b/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab3.txt index f5e72fc53a..fd01423f72 100644 --- a/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab3.txt +++ b/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab3.txt @@ -13,10 +13,10 @@ double building.dsArea.downstreamCeiling.vslab3.offsetFromMu2eOrigin.z = -3581 double building.dsArea.downstreamCeiling.vslab3.yHalfThickness = 876.3; vector building.dsArea.downstreamCeiling.vslab3.xPositions = { - 34645.6, // v1 - 35255.2, // v2 - 35255.2, // v3 - 34645.6 // v4 + 34467.8, // v1 + 35077.4, // v2 + 35077.4, // v3 + 34467.8 // v4 }; vector building.dsArea.downstreamCeiling.vslab3.yPositions = { diff --git a/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab4.txt b/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab4.txt index f8e943aa7b..4f1018b198 100644 --- a/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab4.txt +++ b/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab4.txt @@ -13,10 +13,10 @@ double building.dsArea.downstreamCeiling.vslab4.offsetFromMu2eOrigin.z = -3581 double building.dsArea.downstreamCeiling.vslab4.yHalfThickness = 876.3; vector building.dsArea.downstreamCeiling.vslab4.xPositions = { - 37287.2, // v1 - 37896.8, // v2 - 37896.8, // v3 - 37287.2 // v4 + 37109.4, // v1 + 37719., // v2 + 37719., // v3 + 37109.4 // v4 }; vector building.dsArea.downstreamCeiling.vslab4.yPositions = { diff --git a/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab5.txt b/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab5.txt index 8c97188f22..56535e2db4 100644 --- a/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab5.txt +++ b/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab5.txt @@ -13,10 +13,10 @@ double building.dsArea.downstreamCeiling.vslab5.offsetFromMu2eOrigin.z = -3581 double building.dsArea.downstreamCeiling.vslab5.yHalfThickness = 876.3; vector building.dsArea.downstreamCeiling.vslab5.xPositions = { - 39928.8, // v1 - 40538.4, // v2 - 40538.4, // v3 - 39928.8 // v4 + 39751, // v1 + 40360.6, // v2 + 40360.6, // v3 + 39751 // v4 }; vector building.dsArea.downstreamCeiling.vslab5.yPositions = { diff --git a/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab6.txt b/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab6.txt index 5de154a075..2cf6292b60 100644 --- a/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab6.txt +++ b/Mu2eG4/geom/bldg/dsAreaDownstreamCeilingVslab6.txt @@ -13,10 +13,10 @@ double building.dsArea.downstreamCeiling.vslab6.offsetFromMu2eOrigin.z = -3581 double building.dsArea.downstreamCeiling.vslab6.yHalfThickness = 876.3; vector building.dsArea.downstreamCeiling.vslab6.xPositions = { - 42570.4, // v1 - 43180, // v2 - 43180, // v3 - 42570.4 // v4 + 42392.6, // v1 + 43002.2, // v2 + 43002.2, // v3 + 42392.6 // v4 }; vector building.dsArea.downstreamCeiling.vslab6.yPositions = { From 3147d0a0ae06d90f2155fec678aa1d5ab6c64d23 Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 09:17:37 -0500 Subject: [PATCH 13/16] fix central stairwell --- .../bldg/centralStairwellLowerCeiling.txt | 4 +-- .../geom/bldg/centralStairwellLowerWallN.txt | 8 ++--- .../geom/bldg/centralStairwellLowerWallN2.txt | 4 +-- .../bldg/centralStairwellUpperCeiling.txt | 28 +++++++++++++++++ .../geom/bldg/centralStairwellUpperWallE2.txt | 8 ++--- .../geom/bldg/centralStairwellUpperWallN.txt | 12 +++---- .../geom/bldg/centralStairwellUpperWallW2.txt | 8 ++--- .../geom/bldg/dirtCentralStairwellLower.txt | 4 +-- .../geom/bldg/dirtCentralStairwellLower2.txt | 4 +-- .../geom/bldg/dirtCentralStairwellLower3.txt | 4 +-- .../geom/bldg/dirtCentralStairwellUpper.txt | 4 +-- Mu2eG4/geom/bldg/dirtDsAreaFirstFloorS2.txt | 12 +++---- Mu2eG4/geom/bldg/dsAreaFirstFloorS2.txt | 16 +++++----- Mu2eG4/geom/bldg/tsAreaStairwell.txt | 4 +-- Mu2eG4/geom/bldg/tsAreaStairwellE.txt | 31 +++++++++++++++++++ 15 files changed, 105 insertions(+), 46 deletions(-) create mode 100644 Mu2eG4/geom/bldg/centralStairwellUpperCeiling.txt create mode 100644 Mu2eG4/geom/bldg/tsAreaStairwellE.txt diff --git a/Mu2eG4/geom/bldg/centralStairwellLowerCeiling.txt b/Mu2eG4/geom/bldg/centralStairwellLowerCeiling.txt index c8aa7dafdb..8eca00d3be 100644 --- a/Mu2eG4/geom/bldg/centralStairwellLowerCeiling.txt +++ b/Mu2eG4/geom/bldg/centralStairwellLowerCeiling.txt @@ -22,8 +22,8 @@ vector 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 }; diff --git a/Mu2eG4/geom/bldg/centralStairwellLowerWallN.txt b/Mu2eG4/geom/bldg/centralStairwellLowerWallN.txt index 3a966e4ff9..b7e84e4633 100644 --- a/Mu2eG4/geom/bldg/centralStairwellLowerWallN.txt +++ b/Mu2eG4/geom/bldg/centralStairwellLowerWallN.txt @@ -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 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 building.central.stairwell.lower.wall.n.yPositions = { diff --git a/Mu2eG4/geom/bldg/centralStairwellLowerWallN2.txt b/Mu2eG4/geom/bldg/centralStairwellLowerWallN2.txt index ecf5339505..d802bf0203 100644 --- a/Mu2eG4/geom/bldg/centralStairwellLowerWallN2.txt +++ b/Mu2eG4/geom/bldg/centralStairwellLowerWallN2.txt @@ -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 building.central.stairwell.lower.wall.n2.xPositions = { 5308.6, // h diff --git a/Mu2eG4/geom/bldg/centralStairwellUpperCeiling.txt b/Mu2eG4/geom/bldg/centralStairwellUpperCeiling.txt new file mode 100644 index 0000000000..28cb8e3f44 --- /dev/null +++ b/Mu2eG4/geom/bldg/centralStairwellUpperCeiling.txt @@ -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 building.central.stairwell.upper.ceiling.xPositions = { + 13233.4, // 1 + 13233.4, // 2 + 12014.2, // 3 + 12014.2 // 4 +}; + +vector building.central.stairwell.upper.ceiling.yPositions = { + -20262.87, // 1 + -15081.27, // 2 + -15081.27, // 3 + -20262.87 // 4 +}; + +// Local Variables: +// mode:c++ +// End: diff --git a/Mu2eG4/geom/bldg/centralStairwellUpperWallE2.txt b/Mu2eG4/geom/bldg/centralStairwellUpperWallE2.txt index 979bbf9c60..1fb5f07966 100644 --- a/Mu2eG4/geom/bldg/centralStairwellUpperWallE2.txt +++ b/Mu2eG4/geom/bldg/centralStairwellUpperWallE2.txt @@ -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 building.central.stairwell.upper.wall.e2.xPositions = { 13233.4, // h @@ -17,10 +17,10 @@ vector building.central.stairwell.upper.wall.e2.xPositions = { }; vector 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: diff --git a/Mu2eG4/geom/bldg/centralStairwellUpperWallN.txt b/Mu2eG4/geom/bldg/centralStairwellUpperWallN.txt index 90769b2e81..273a578763 100644 --- a/Mu2eG4/geom/bldg/centralStairwellUpperWallN.txt +++ b/Mu2eG4/geom/bldg/centralStairwellUpperWallN.txt @@ -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 building.central.stairwell.upper.wall.n.xPositions = { 12014.2, // h @@ -17,10 +17,10 @@ vector building.central.stairwell.upper.wall.n.xPositions = { }; vector 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: diff --git a/Mu2eG4/geom/bldg/centralStairwellUpperWallW2.txt b/Mu2eG4/geom/bldg/centralStairwellUpperWallW2.txt index 611a4c37f8..598f44a23a 100644 --- a/Mu2eG4/geom/bldg/centralStairwellUpperWallW2.txt +++ b/Mu2eG4/geom/bldg/centralStairwellUpperWallW2.txt @@ -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 building.central.stairwell.upper.wall.w2.xPositions = { 11617.2, // h @@ -17,10 +17,10 @@ vector building.central.stairwell.upper.wall.w2.xPositions = { }; vector 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: diff --git a/Mu2eG4/geom/bldg/dirtCentralStairwellLower.txt b/Mu2eG4/geom/bldg/dirtCentralStairwellLower.txt index 9d97ebec22..d4687da95e 100644 --- a/Mu2eG4/geom/bldg/dirtCentralStairwellLower.txt +++ b/Mu2eG4/geom/bldg/dirtCentralStairwellLower.txt @@ -14,8 +14,8 @@ double dirt.central.stairwell.lower.yHalfThickness = 1336.675; vector 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 diff --git a/Mu2eG4/geom/bldg/dirtCentralStairwellLower2.txt b/Mu2eG4/geom/bldg/dirtCentralStairwellLower2.txt index ce6d643b99..6a3fa37824 100644 --- a/Mu2eG4/geom/bldg/dirtCentralStairwellLower2.txt +++ b/Mu2eG4/geom/bldg/dirtCentralStairwellLower2.txt @@ -14,8 +14,8 @@ double dirt.central.stairwell.lower2.yHalfThickness = 76.2; vector dirt.central.stairwell.lower2.xPositions = { 6273.9, // g1 - 11617.2, // g2 - 11617.2, // g3 + 11366.5, // g2 + 11366.5, // g3 6273.9 // g4 }; diff --git a/Mu2eG4/geom/bldg/dirtCentralStairwellLower3.txt b/Mu2eG4/geom/bldg/dirtCentralStairwellLower3.txt index 0a859f6cfe..c22e7e4052 100644 --- a/Mu2eG4/geom/bldg/dirtCentralStairwellLower3.txt +++ b/Mu2eG4/geom/bldg/dirtCentralStairwellLower3.txt @@ -16,8 +16,8 @@ double dirt.central.stairwell.lower3.yHalfThickness = 1260.45; // conflict as that volume's rotation angle is not exactly pi/2 vector dirt.central.stairwell.lower3.xPositions = { 9956.801, // g1 - 11617.2, // g2 - 11617.2, // g3 + 11366.5, // g2 + 11366.5, // g3 9956.801 // g4 }; diff --git a/Mu2eG4/geom/bldg/dirtCentralStairwellUpper.txt b/Mu2eG4/geom/bldg/dirtCentralStairwellUpper.txt index 11ac378707..4f62ac317f 100644 --- a/Mu2eG4/geom/bldg/dirtCentralStairwellUpper.txt +++ b/Mu2eG4/geom/bldg/dirtCentralStairwellUpper.txt @@ -27,8 +27,8 @@ vector dirt.central.stairwell.upper.yreplace = { 6, 7 }; vector dirt.central.stairwell.upper.yPositions = { -12014.2, // g1 -12014.2, // g2 - -14740.25, // g3 - -14740.25, // g4 + -14827.27, // g3 + -14827.27, // g4 -25908, // g5 -25908, // g6 -50000, // g7 diff --git a/Mu2eG4/geom/bldg/dirtDsAreaFirstFloorS2.txt b/Mu2eG4/geom/bldg/dirtDsAreaFirstFloorS2.txt index 3e6d98dfd6..d0baf6c52f 100644 --- a/Mu2eG4/geom/bldg/dirtDsAreaFirstFloorS2.txt +++ b/Mu2eG4/geom/bldg/dirtDsAreaFirstFloorS2.txt @@ -7,10 +7,10 @@ string dirt.dsArea.firstFloor.S2.name = "dirtDsAreaFirstFloorS2"; string dirt.dsArea.firstFloor.S2.material = "MBOverburden"; double dirt.dsArea.firstFloor.S2.offsetFromMu2eOrigin.x = 947.4; -double dirt.dsArea.firstFloor.S2.offsetFromFloorSurface.y = 7454.9; +double dirt.dsArea.firstFloor.S2.offsetFromFloorSurface.y = 7493.; double dirt.dsArea.firstFloor.S2.offsetFromMu2eOrigin.z = -3581.4; -double dirt.dsArea.firstFloor.S2.yHalfThickness = 88.9; +double dirt.dsArea.firstFloor.S2.yHalfThickness = 127.; vector dirt.dsArea.firstFloor.S2.xPositions = { -2921.00, // 0 @@ -34,8 +34,8 @@ vector dirt.dsArea.firstFloor.S2.xPositions = { 31153.10, // 18 31419.80, // 19 31419.80, // 20 -13630.40, // 21 -13630.40, // 22 +13630.275, // 21 +13630.275, // 22 11617.20, // 23 11617.20, // 24 -2921.00 // 25 @@ -64,8 +64,8 @@ vector dirt.dsArea.firstFloor.S2.yPositions = { -25298.40, // 19 -25908.00, // 20 -25908.00, // 21 --14740.10, // 22 --14740.10, // 23 +-14827.27, // 22 +-14827.27, // 23 -25908.00, // 24 -25908.00 // 25 }; diff --git a/Mu2eG4/geom/bldg/dsAreaFirstFloorS2.txt b/Mu2eG4/geom/bldg/dsAreaFirstFloorS2.txt index e00a639ce1..4f23cd281c 100644 --- a/Mu2eG4/geom/bldg/dsAreaFirstFloorS2.txt +++ b/Mu2eG4/geom/bldg/dsAreaFirstFloorS2.txt @@ -1,9 +1,9 @@ string building.dsArea.firstFloor.S2.name = "dsAreaFirstFloorS2"; string building.dsArea.firstFloor.S2.material = "CONCRETE_MARS"; double building.dsArea.firstFloor.S2.offsetFromMu2eOrigin.x = 947.40; -double building.dsArea.firstFloor.S2.offsetFromFloorSurface.y = 7658.10; +double building.dsArea.firstFloor.S2.offsetFromFloorSurface.y = 7696.2; double building.dsArea.firstFloor.S2.offsetFromMu2eOrigin.z = -3581.40; -double building.dsArea.firstFloor.S2.yHalfThickness = 114.3; +double building.dsArea.firstFloor.S2.yHalfThickness = 76.2; vector building.dsArea.firstFloor.S2.xPositions = { -2921.00, // 0 38163.50, // 1 @@ -26,10 +26,10 @@ vector building.dsArea.firstFloor.S2.xPositions = { 31153.10, // 18 31419.80, // 19 31419.80, // 20 -13233.40, // 21 -13233.40, // 22 -12014.20, // 23 -12014.20, // 24 +13630.275, // 21 +13630.275, // 22 +11617.20, // 23 +11617.20, // 24 -2921.00 // 25 }; vector building.dsArea.firstFloor.S2.yPositions = { @@ -55,8 +55,8 @@ vector building.dsArea.firstFloor.S2.yPositions = { -25298.40, // 19 -25908.00, // 20 -25908.00, // 21 --19431.00, // 22 --19431.00, // 23 +-14827.27, // 22 +-14827.27, // 23 -25908.00, // 24 -25908.00 // 25 }; diff --git a/Mu2eG4/geom/bldg/tsAreaStairwell.txt b/Mu2eG4/geom/bldg/tsAreaStairwell.txt index 3d11f84484..cc89756026 100644 --- a/Mu2eG4/geom/bldg/tsAreaStairwell.txt +++ b/Mu2eG4/geom/bldg/tsAreaStairwell.txt @@ -16,8 +16,8 @@ vector building.tsArea.stairwell.xPositions = { 3784.6, // S0 4089.4, // S1 4089.4, // S2 - 11617.2, // S3 - 11617.2, // s4 + 11366.5, // S3 + 11366.5, // s4 3784.6 // s5 }; diff --git a/Mu2eG4/geom/bldg/tsAreaStairwellE.txt b/Mu2eG4/geom/bldg/tsAreaStairwellE.txt new file mode 100644 index 0000000000..abff3573ac --- /dev/null +++ b/Mu2eG4/geom/bldg/tsAreaStairwellE.txt @@ -0,0 +1,31 @@ +// SimpleConfig geometry file automatically produced for original file: +// +// geom/geom_TSstairwell.ccl + +string building.tsArea.stairwell.E.name = "tsAreaStairwellE"; + +string building.tsArea.stairwell.E.material = "CONCRETE_MARS"; + +double building.tsArea.stairwell.E.offsetFromMu2eOrigin.x = 947.4; +double building.tsArea.stairwell.E.offsetFromFloorSurface.y = 2555.875; +double building.tsArea.stairwell.E.offsetFromMu2eOrigin.z = -3581.4; + +double building.tsArea.stairwell.E.yHalfThickness = 34.925; + +vector building.tsArea.stairwell.E.xPositions = { + 11366.5, // S3 + 11366.5, // s4 + 11617.2, // + 11617.2 // +}; + +vector building.tsArea.stairwell.E.yPositions = { + -13589, // S3 + -13944.6, // s4 + -13944.6, // + -13589 // +}; + +// Local Variables: +// mode:c++ +// End: From 9df37859ad7f58e244e93d9b3b1464f5f1d384be Mon Sep 17 00:00:00 2001 From: difalco Date: Sat, 10 Oct 2026 13:57:23 -0500 Subject: [PATCH 14/16] fixed dirtBeamlineSlabW2 --- Mu2eG4/geom/bldg/dirtBeamlineSlabW2.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Mu2eG4/geom/bldg/dirtBeamlineSlabW2.txt b/Mu2eG4/geom/bldg/dirtBeamlineSlabW2.txt index e20a4787ee..d761c4ee3f 100644 --- a/Mu2eG4/geom/bldg/dirtBeamlineSlabW2.txt +++ b/Mu2eG4/geom/bldg/dirtBeamlineSlabW2.txt @@ -19,6 +19,7 @@ vector dirt.beamline.slab.W2.xPositions = { 11684, // i1 11684, // d1 9550.51, // SE corner rem hatch + 9550.51, // 2946.4, // 2946.4, // 9550.5, // NE corner rem hatch @@ -30,13 +31,14 @@ vector dirt.beamline.slab.W2.xPositions = { -2006.6 }; -vector dirt.beamline.slab.W2.yreplace = { 9, 10 }; +vector dirt.beamline.slab.W2.yreplace = { 10, 11 }; vector 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 12598.4, // 12598.4, // 16459.21, // From 8a8b4008b10825f084d06987710b38046fe01cac Mon Sep 17 00:00:00 2001 From: difalco Date: Mon, 12 Oct 2026 05:34:55 -0500 Subject: [PATCH 15/16] example of updated wideband geometry file --- Mu2eG4/geom/geom_Wideband4modules_v19.txt | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Mu2eG4/geom/geom_Wideband4modules_v19.txt b/Mu2eG4/geom/geom_Wideband4modules_v19.txt index 832f8678c1..2e9005f72f 100644 --- a/Mu2eG4/geom/geom_Wideband4modules_v19.txt +++ b/Mu2eG4/geom/geom_Wideband4modules_v19.txt @@ -683,3 +683,32 @@ string dirt.dsArea.downstreamCeiling.vslab6.material = "G4_AIR"; string dirt.overburdenMaterialName = "G4_AIR"; double building.dsArea.downstreamCeiling.yHalfThickness = 80.0; double building.dsArea.hatchblock.yHalfThickness = 80.0; +string dirt.beamline.slab3.NE.material = "G4_AIR"; +string dirt.beamline.slab3.NW.material = "G4_AIR"; +string dirt.dsArea.alcove.stairwell.top.material = "G4_AIR"; +string dirt.dsArea.firstFloor.SE.material = "G4_AIR"; +string dirt.dsArea.upper2.material = "G4_AIR"; +string dirt.dsArea.upper3.material = "G4_AIR"; +string dirt.dsArea.upper4.material = "G4_AIR"; +string dirt.firstFloor.lower.1.material = "G4_AIR"; +string dirt.firstFloor.lower.2.material = "G4_AIR"; +string dirt.firstFloor.lower.3.material = "G4_AIR"; +string dirt.firstFloor.lower.4.material = "G4_AIR"; +string dirt.firstFloor.lower.5.material = "G4_AIR"; +string building.dsArea.elevator.ceilingS.material = "G4_AIR"; +string building.dsArea.elevator.interior.lower.SW.material = "G4_AIR"; +string building.dsArea.elevator.interior.lower.SW2.material = "G4_AIR"; +string building.dsArea.firstFloor.SE.material = "G4_AIR"; +string building.dsArea.upper.wall.S1.material = "G4_AIR"; +string building.dsArea.upper.wall.S2.material = "G4_AIR"; +string building.dsArea.upper.wall.S3.material = "G4_AIR"; +string building.escape.hatch.NBot.material = "G4_AIR"; +string building.escape.hatch.NE.material = "G4_AIR"; +string building.escape.hatch.NTop.material = "G4_AIR"; +string building.firstFloor.wall.lower1.material = "G4_AIR"; +string building.firstFloor.wall.lower2.material = "G4_AIR"; +string building.firstFloor.wall.lower3.material = "G4_AIR"; +string building.firstFloor.wall.lower4.material = "G4_AIR"; +string building.firstFloor.wall.lower5.material = "G4_AIR"; +string building.remote.handling.Hatch.Lower.SW.material = "G4_AIR"; +string building.tsArea.stairwell.E.material = "G4_AIR"; From d7baa4677e33ea4922b54904477517a85547f8d8 Mon Sep 17 00:00:00 2001 From: difalco Date: Fri, 16 Oct 2026 04:15:19 -0500 Subject: [PATCH 16/16] forgot commit from PR 1918 --- Mu2eG4/src/constructServicesGeom.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Mu2eG4/src/constructServicesGeom.cc b/Mu2eG4/src/constructServicesGeom.cc index b6d684ec70..8c057e120c 100644 --- a/Mu2eG4/src/constructServicesGeom.cc +++ b/Mu2eG4/src/constructServicesGeom.cc @@ -113,6 +113,8 @@ namespace mu2e { // *** Now loop over the individual pipes *** for ( int ip = 0; ip < nPipe; ip++ ) { + // skip obsolete pump pipes + if (!isBend && it== 2 && ( ip == 0 || ip == 2 ) ) continue; double len = pLeng[it][ip]; // Make the container ("mother") volume for the type. @@ -123,14 +125,14 @@ namespace mu2e { if ( isBend ) { motherTubeName << "pBendType" << it+1 << "PBend" << ip+1; } else { - motherTubeName << "pipeType" << it+1 << "Pipe" << ip+1; + motherTubeName << "pipeType" << it+1 << "Pipe" << ip+1; } std::ostringstream motherName; if ( isBend ) { motherName << "pBendLogicVolType" << it+1 << "PBend" << ip+1; } else { - motherName << "pipeLogicVolType" << it+1 << "Pipe" << ip+1; + motherName << "pipeLogicVolType" << it+1 << "Pipe" << ip+1; } CLHEP::HepRotation* pipeRotat = new @@ -140,7 +142,6 @@ namespace mu2e { CLHEP::Hep3Vector pipePosInMu2e = pCent[it][ip] - parent.centerInMu2e(); - VolumeInfo motherLogVol; if ( isBend ) { motherLogVol = nestTorus(motherName.str(),