Include all SPs except for HCal in reduced geometry v2

LDMX-Software · Jan 27, 2025 · 6c7f08c · 6c7f08c
1 parent a9d89a4
commit 6c7f08c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/validation_samples/reduced_ldmx/config.py b/.github/validation_samples/reduced_ldmx/config.py
@@ -17,7 +17,7 @@
 
 mySim = sim.simulator( "mySim" ) # Build simulator object
 det = 'ldmx-reduced-v2'
-mySim.setDetector(det, False )
+mySim.setDetector(det, True )
 mySim.beamSpotSmear = [20.,80.,0.]
 mySim.description = 'Reduced ECal Electron Gun Test Simulation'
 

diff --git a/Detectors/data/ldmx-reduced-v2/scoring_planes.gdml b/Detectors/data/ldmx-reduced-v2/scoring_planes.gdml
@@ -64,16 +64,16 @@
                                                         sp_magnet_gap_left_x 0 
                                                         sp_magnet_gap_right_x 0" />
 
-
-    <!-- Surround the Hcal with scoring planes -->
+    <!--
+     Surround the Hcal with scoring planes
     <variable name="sp_hcal_front_z"  value="ecal_front_z - sp_thickness/2 + clearance" />
     <variable name="sp_hcal_back_z"   value="ecal_front_z + back_hcal_dz + side_hcal_dz + sp_thickness/2" />
     <variable name="sp_hcal_top_y"  value="hcal_envelope_dy/2 + sp_thickness/2" />
     <variable name="sp_hcal_bot_y"  value="-hcal_envelope_dy/2 - sp_thickness/2" />
     <variable name="sp_hcal_left_x"   value="-hcal_envelope_dy/2 - sp_thickness/2" />
     <variable name="sp_hcal_right_x"  value="hcal_envelope_dx/2 + sp_thickness/2" />
     <variable name="sp_hcal_mid_z"  value="ecal_front_z + hcal_dz/2" />
-
+ 
     <matrix name="sp_hcal_pos" coldim="3" values="0 support_box_shift sp_hcal_front_z
                             0 support_box_shift sp_hcal_back_z
                             0 sp_hcal_top_y+support_box_shift sp_hcal_mid_z
@@ -84,7 +84,7 @@
     <matrix name="hcal_box_dim" coldim="3" values="hcal_envelope_dx hcal_envelope_dy sp_thickness
                              hcal_envelope_dx sp_thickness hcal_dz
                              sp_thickness hcal_envelope_dy hcal_dz" />
-
+    -->
     <!-- Dimensions of target box -->
     <variable name="target_box_x" value="magnet_gap_dx - (sp_thickness/2)" />
     <variable name="target_box_y" value="magnet_gap_dy - (sp_thickness/2)" />
@@ -168,11 +168,11 @@
 
     <box name="sp_magnet_gap_top_bot_box"   x="magnet_gap_dx" y="sp_thickness" z="magnet_gap_dz" />
     <box name="sp_magnet_gap_left_right_box"  x="sp_thickness" y="magnet_gap_dy" z="magnet_gap_dz" />
-
+    <!--
     <box name="sp_hcal_front_back_box" x="hcal_box_dim[1, 1]" y="hcal_box_dim[1, 2]" z="hcal_box_dim[1, 3]" />
     <box name="sp_hcal_top_bot_box" x="hcal_box_dim[2, 1]" y="hcal_box_dim[2, 2]" z="hcal_box_dim[2, 3]" />
     <box name="sp_hcal_left_right_box" x="hcal_box_dim[3, 1]" y="hcal_box_dim[3, 2]" z="hcal_box_dim[3, 3]" />
-
+    -->
     <box name="sp_target_box" x="target_box_x" y="target_box_y" z="sp_thickness" />
 
     <box name="sp_recoil_box"  x="recoil_box_x" y="recoil_box_y" z="sp_thickness" />
@@ -244,7 +244,7 @@
         <auxiliary auxtype="VisAttributes" auxvalue="SpVis"/>
       </volume> 
     </loop>
-
+    <!--
     <loop for="x9" to="2" step="1" > 
       <volume name="sp_hcal_front_back"> 
         <materialref ref="Vacuum" />
@@ -262,7 +262,7 @@
         <auxiliary auxtype="VisAttributes" auxvalue="SpVis"/>
       </volume> 
     </loop>
-
+    -->
     <volume name="SP_World">
       <materialref ref="Vacuum" />
       <solidref ref="world_box" />
@@ -322,7 +322,7 @@
           <rotationref ref="identity" />
         </physvol> 
       </loop> 
-
+      <!--
       <loop for="x10" to="2" step="1" > 
         <physvol copynumber="40 + x10">
           <volumeref ref="sp_hcal_front_back" />
@@ -340,7 +340,7 @@
           <rotationref ref="identity" />
         </physvol> 
       </loop> 
-
+      -->
     </volume>
   </structure>