From 73be2fce073764fcfe1136ac08c367bd63981868 Mon Sep 17 00:00:00 2001 From: Jeffrey Kleykamp Date: Mon, 17 Feb 2025 13:56:35 -0600 Subject: [PATCH 1/3] Change majority of rock to vac. Add back remaining rock column in front of detectors only --- duneggd/Config/ND_Hall_Rock.cfg | 6 +++++- duneggd/Config/WORLDggd.cfg | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/duneggd/Config/ND_Hall_Rock.cfg b/duneggd/Config/ND_Hall_Rock.cfg index cb639f21..758d0496 100644 --- a/duneggd/Config/ND_Hall_Rock.cfg +++ b/duneggd/Config/ND_Hall_Rock.cfg @@ -34,7 +34,7 @@ mat = 'Rock' #rockBoxMainDim = [Q('65.17m'), Q('31.64m'), Q('29.65m')] #rockBoxUpstreamDim = [Q('169.17m'), Q('135.64m'), Q('0.1m')] #rockBoxMainDim = [Q('65.17m'), Q('31.64m'), Q('30.55m')] -rockBoxMainDim = [Q('65.17m'), Q('31.64m'), Q('279.55m')] +#rockBoxMainDim = [Q('65.17m'), Q('31.64m'), Q('279.55m')] rockBoxUpstreamDim = [Q('169.17m'), Q('135.64m'), Q('0m')] rockBoxUpstreamPos = [Q('0m'), Q('0m'), Q('-15.775m')] rockBoxSubtDim = [Q('65.17001m'), Q('11.1001m'), Q('10.35001m')] @@ -48,6 +48,10 @@ rockTubPos = [Q('-21.795m'), Q('1.395m'), Q('-5.175m')] #Positions = [ [Q('2.895m'), Q('-3.2m'), Q('-5.125m')] ] #Positions = [ [Q('2.895m'), Q('-3.2m'), Q('-5.175m')] ] #Positions = [ [Q('2.895m'), Q('-3.2m'), Q('-125.175m')] ] +#Positions = [ [Q('2.895m'), Q('-3.2m'), Q('119.825m')] ] +#Rotations = [ [Q('0deg'), Q('0deg'), Q('0deg')] ] + +rockBoxMainDim = [Q('85.17m'), Q('106.64m'), Q('310.55m')] Positions = [ [Q('2.895m'), Q('-3.2m'), Q('119.825m')] ] Rotations = [ [Q('0deg'), Q('0deg'), Q('0deg')] ] diff --git a/duneggd/Config/WORLDggd.cfg b/duneggd/Config/WORLDggd.cfg index 43c7b20e..7c00573f 100644 --- a/duneggd/Config/WORLDggd.cfg +++ b/duneggd/Config/WORLDggd.cfg @@ -4,8 +4,8 @@ class = duneggd.World.WorldBuilder #subbuilders = ['ND_Hall_Air_Volume'] subbuilders = ['ND_Hall_Rock'] halfDimension = {'dx':Q('300m'),'dy':Q('300m'),'dz':Q('300m')} #Was 200m, 200m, 200m -#Material = 'NoGas' -Material = 'Rock' +Material = 'Vac' +#Material = 'Rock' # Mike Kordosky: position choosen here to exactly match # the hall used by the ND task force (site.xml) #DetEncPosition = [Q('0cm'), Q('433.096cm'), Q('739.61625cm')] From 87eedd1fc5ed3a5698892b8f787ccc13d4c73e2b Mon Sep 17 00:00:00 2001 From: jdkio <68720233+jdkio@users.noreply.github.com> Date: Mon, 17 Feb 2025 15:45:10 -0500 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3d78007..5e7d38c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ Geometry releases will be tagged as `Descriptive_tag_v_X.Y.Z`. ## [Unreleased] +### Changed + +- Change most rock to vaccuum. Only need rock in front, and a little around detectors + ### Added - Check for CHANGELOG update in PRs From 20d9d57310c5d7080bd99a46c568652a515e282b Mon Sep 17 00:00:00 2001 From: Jeffrey Kleykamp Date: Tue, 18 Feb 2025 12:03:37 -0600 Subject: [PATCH 3/3] Remove all commented lines unless there was a specific note as to why to keep them --- duneggd/Config/ND_Hall_Rock.cfg | 39 --------------------------------- duneggd/Config/WORLDggd.cfg | 10 --------- 2 files changed, 49 deletions(-) diff --git a/duneggd/Config/ND_Hall_Rock.cfg b/duneggd/Config/ND_Hall_Rock.cfg index 758d0496..bf651396 100644 --- a/duneggd/Config/ND_Hall_Rock.cfg +++ b/duneggd/Config/ND_Hall_Rock.cfg @@ -5,51 +5,12 @@ class = duneggd.Hall.ND_Hall_Rock.RockBuilder subbuilders = ['ND_Hall_Air_Volume'] mat = 'Rock' -#For Rock Thickness is 250m in front of Hall -#rockBoxMainDim = [Q('65.17m'), Q('31.64m'), Q('279.55m')] -#rockBoxUpstreamDim = [Q('169.17m'), Q('135.64m'), Q('250m')] -#rockBoxUpstreamPos = [Q('0m'), Q('0m'), Q('-14.775m')] -#rockBoxSubtDim = [Q('65.17001m'), Q('11.1001m'), Q('10.35001m')] -#rockBoxSubtPos = [Q('0m'), Q('10.27m'), Q('134.60m')] -#rockTubDim = [Q('0m'), Q('5.79m'), Q('34.43m'), Q('0deg'), Q('360deg')] -#rockTubPos = [Q('-21.795m'), Q('1.395m'), Q('119.825m')] - -#Positions = [ [Q('2.895m'), Q('-3.2m'), Q('119.825m')] ] -#Rotations = [ [Q('0deg'), Q('0deg'), Q('0deg')] ] - - -#For Rock Thickness is 5m in front of Hall -#rockBoxMainDim = [Q('65.17m'), Q('31.64m'), Q('34.55m')] -#rockBoxUpstreamDim = [Q('169.17m'), Q('135.64m'), Q('5m')] -#rockBoxUpstreamPos = [Q('0m'), Q('0m'), Q('-14.775m')] -#rockBoxSubtDim = [Q('65.17001m'), Q('11.1001m'), Q('10.35001m')] -#rockBoxSubtPos = [Q('0m'), Q('10.27m'), Q('12.1m')] -#rockTubDim = [Q('0m'), Q('5.79m'), Q('34.43m'), Q('0deg'), Q('360deg')] -#rockTubPos = [Q('-21.795m'), Q('1.395m'), Q('-2.675m')] - -#Positions = [ [Q('2.895m'), Q('-3.2m'), Q('-2.675m')] ] -#Rotations = [ [Q('0deg'), Q('0deg'), Q('0deg')] ] - - -#rockBoxMainDim = [Q('65.17m'), Q('31.64m'), Q('29.65m')] -#rockBoxUpstreamDim = [Q('169.17m'), Q('135.64m'), Q('0.1m')] -#rockBoxMainDim = [Q('65.17m'), Q('31.64m'), Q('30.55m')] -#rockBoxMainDim = [Q('65.17m'), Q('31.64m'), Q('279.55m')] rockBoxUpstreamDim = [Q('169.17m'), Q('135.64m'), Q('0m')] rockBoxUpstreamPos = [Q('0m'), Q('0m'), Q('-15.775m')] rockBoxSubtDim = [Q('65.17001m'), Q('11.1001m'), Q('10.35001m')] -#rockBoxSubtPos = [Q('0m'), Q('10.27m'), Q('9.65m')] rockBoxSubtPos = [Q('0m'), Q('10.27m'), Q('9.6m')] rockTubDim = [Q('0m'), Q('5.79m'), Q('34.43m'), Q('0deg'), Q('360deg')] -#rockTubPos = [Q('-21.795m'), Q('1.395m'), Q('-5.125m')] rockTubPos = [Q('-21.795m'), Q('1.395m'), Q('-5.175m')] -#rockTubPos = [Q('-21.795m'), Q('1.395m'), Q('125.175m')] - -#Positions = [ [Q('2.895m'), Q('-3.2m'), Q('-5.125m')] ] -#Positions = [ [Q('2.895m'), Q('-3.2m'), Q('-5.175m')] ] -#Positions = [ [Q('2.895m'), Q('-3.2m'), Q('-125.175m')] ] -#Positions = [ [Q('2.895m'), Q('-3.2m'), Q('119.825m')] ] -#Rotations = [ [Q('0deg'), Q('0deg'), Q('0deg')] ] rockBoxMainDim = [Q('85.17m'), Q('106.64m'), Q('310.55m')] Positions = [ [Q('2.895m'), Q('-3.2m'), Q('119.825m')] ] diff --git a/duneggd/Config/WORLDggd.cfg b/duneggd/Config/WORLDggd.cfg index 7c00573f..5618b9b9 100644 --- a/duneggd/Config/WORLDggd.cfg +++ b/duneggd/Config/WORLDggd.cfg @@ -5,18 +5,8 @@ class = duneggd.World.WorldBuilder subbuilders = ['ND_Hall_Rock'] halfDimension = {'dx':Q('300m'),'dy':Q('300m'),'dz':Q('300m')} #Was 200m, 200m, 200m Material = 'Vac' -#Material = 'Rock' # Mike Kordosky: position choosen here to exactly match # the hall used by the ND task force (site.xml) #DetEncPosition = [Q('0cm'), Q('433.096cm'), Q('739.61625cm')] -#DetEncPosition = [Q('0cm'), Q('0cm'), Q('0cm')] -#DetEncPosition = [Q('-18484mm'), Q('-1005.27mm'), Q('9.6m')] RockPosition = [Q('-21379mm'), Q('4205.27mm'), Q('-110.225m')] #For 250m in front of rock. - -#RockPosition = [Q('-21379mm'), Q('4205.27mm'), Q('12.275m')] #For 5m in front of hall - -#RockPosition = [Q('-21379mm'), Q('4205.27mm'), Q('14.775m')] #For 0m in front of hall - -#RockPosition = [Q('-18484mm'), Q('1005.27mm'), Q('9.6m')] #Was -18484mm, -1005.27mm, 9.6m, for ND Hall -