Change majority of rock to vac. Add back remaining rock column in front of detectors only (#49)

* Change majority of rock to vac. Add back remaining rock column in front of detectors only

* Update CHANGELOG.md

* Remove all commented lines unless there was a specific note as to why to keep them

Author: jdkio

Diff for: CHANGELOG.md

@@ -10,6 +10,7 @@ Geometry releases will be tagged as `Descriptive_tag_v_X.Y.Z`.
 
 ### Changed
 
+- Change most rock to vaccuum. Only need rock in front, and a little around detectors
 - TMS geometry update from CDR to PDR
   - Switch to 50 thin, 34 thick and 8 double thick steel planes with less material overburden in the y dimension
   - Change the dimension of scintillator bars, the amount of bars per module and the number of modules per layer

Diff for: duneggd/Config/ND_Hall_Rock.cfg

@@ -5,49 +5,14 @@ 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')] ]
+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 for: duneggd/Config/WORLDggd.cfg

@@ -4,19 +4,9 @@ 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'
 # 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
-