Merge branch 'trunk' into pfReco

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,29 +2,28 @@
 I am updating _ldmx-sw_, here are the details.
 
 ### What are the issues that this addresses?
+<!--
 _Hint_: Use the phrase '_This resolves #< issue number >_' so that they are linked automatically.
+-->
 
 ## Check List
 - [ ] I successfully compiled _ldmx-sw_ with my developments
-
-- [ ] I ran my developments and the following shows that they are successful.
-
-_< put plots or some other proof that your developments work >_
-
+- [ ] I ran my developments and the following shows that they are successful. <!-- put plots or some other proof that your developments work and do the intended function -->
 - [ ] I attached any sub-module related changes to this PR.
+<!--
+EXPLANATION: You need to specifically `git add` your submodule's commit in ldmx-sw and then have a separate PR within that submodule.
 
-_Explanation_: You need to specifically `git add` your submodule's commit in _ldmx-sw_ and then have a separate PR within that submodule.
-```
-# outline of submodule commit updating
-cd SUBMODULE
-git checkout updates
-cd ..
-git add SUBMODULE
-git commit -m "I updated the commit for SUBMODULE to the last commit of my-updates"
-```
+  # outline of submodule commit updating
+  cd SUBMODULE
+  git checkout updates
+  cd ..
+  git add SUBMODULE
+  git commit -m "I updated the commit for SUBMODULE to the last commit of my-updates"
+-->
 
 ### Related Sub-Module PRs
+<!--
 If you have developments in a submodule that you need to merge in along with these developments, please link those PRs here, otherwise just delete this section.
-_Note_: You do not need to make a Sub-Module PR if your submodule developments are already on that repo's default branch.
-
+NOTE: You do not need to make a Sub-Module PR if your submodule developments are already on that repo's default branch.
+-->
 - 

.github/actions/validate/gold_label

@@ -1 +1 @@
-v3.3.5
+v3.3.6

.github/validation_samples/ecal_pn/config.py

@@ -22,6 +22,7 @@
 
 p.histogramFile = f'hist.root'
 p.outputFiles = [f'events.root']
+p.termLogLevel = 0
 
 import LDMX.Ecal.EcalGeometry
 import LDMX.Ecal.ecal_hardcoded_conditions

.github/validation_samples/hcal/config.py

@@ -47,6 +47,7 @@
 
 p.histogramFile = 'hist.root'
 p.outputFiles = ['events.root']
+p.termLogLevel = 0
 
 import LDMX.Ecal.EcalGeometry
 import LDMX.Ecal.ecal_hardcoded_conditions

.github/validation_samples/hcal/gold.log

@@ -21,5 +21,42 @@
 [ DetectorConstruction ] : Attaching trig_scint_Pad1_sd to trigger_pad1_bar_volume
 [ DetectorConstruction ] : Attaching trig_scint_Pad2_sd to trigger_pad2_bar_volume
 [ DetectorConstruction ] : Attaching trig_scint_Pad3_sd to trigger_pad3_bar_volume
+ [ Process ] 1 : RunHeader { run: 1, numTries: 10000, detectorName: ldmx-det-v14, description: Hcal Muons and Neutrons
+  intParameters: 
+    Included Scoring Planes = 0
+    RandomNumberMasterSeed[test] = 1
+    Use Random Seed from Event Header = 0
+  floatParameters: 
+  stringParameters: 
+    Geant4 revision = 
+    Gen0 Class = simcore::generators::GeneralParticleSource
+    Gen0 Init Cmd 0 = /gps/particle mu-
+    Gen0 Init Cmd 1 = /gps/ene/type Lin
+    Gen0 Init Cmd 10 = /gps/pos/halfx 500 mm
+    Gen0 Init Cmd 11 = /gps/pos/halfy 500 mm
+    Gen0 Init Cmd 12 = /gps/source/add 1
+    Gen0 Init Cmd 13 = /gps/particle neutron
+    Gen0 Init Cmd 14 = /gps/ene/type Lin
+    Gen0 Init Cmd 15 = /gps/ene/min 1 GeV
+    Gen0 Init Cmd 16 = /gps/ene/max 4 GeV
+    Gen0 Init Cmd 17 = /gps/ene/gradient 0.
+    Gen0 Init Cmd 18 = /gps/ene/intercept 1.
+    Gen0 Init Cmd 19 = /gps/ang/type cos
+    Gen0 Init Cmd 2 = /gps/ene/min 1 GeV
+    Gen0 Init Cmd 20 = /gps/pos/type Plane
+    Gen0 Init Cmd 21 = /gps/pos/shape Square
+    Gen0 Init Cmd 22 = /gps/pos/centre 0 0 220. mm
+    Gen0 Init Cmd 23 = /gps/pos/halfx 500 mm
+    Gen0 Init Cmd 24 = /gps/pos/halfy 500 mm
+    Gen0 Init Cmd 25 = /gps/source/multiplevertex True
+    Gen0 Init Cmd 3 = /gps/ene/max 4 GeV
+    Gen0 Init Cmd 4 = /gps/ene/gradient 0.
+    Gen0 Init Cmd 5 = /gps/ene/intercept 1.
+    Gen0 Init Cmd 6 = /gps/ang/type cos
+    Gen0 Init Cmd 7 = /gps/pos/type Plane
+    Gen0 Init Cmd 8 = /gps/pos/shape Square
+    Gen0 Init Cmd 9 = /gps/pos/centre 0 0 220. mm
+    ldmx-sw revision = 
+}
 [ Simulator ] : Started 10000 events to produce 10000 events.
 ---- LDMXSW: Event processing complete  --------

.github/validation_samples/inclusive/config.py

@@ -3,9 +3,9 @@
 
 from LDMX.SimCore import simulator as sim
 mySim = sim.simulator( "mySim" )
-mySim.setDetector( 'ldmx-det-v14' )
+mySim.setDetector( 'ldmx-det-v14-8gev', True )
 from LDMX.SimCore import generators as gen
-mySim.generators.append( gen.single_4gev_e_upstream_tagger() )
+mySim.generators.append( gen.single_8gev_e_upstream_tagger() )
 mySim.beamSpotSmear = [20.,80.,0.]
 mySim.description = 'Basic test Simulation'
 
@@ -22,6 +22,7 @@
 
 p.histogramFile = 'hist.root'
 p.outputFiles = ['events.root']
+p.termLogLevel = 0
 
 import LDMX.Ecal.EcalGeometry
 import LDMX.Ecal.ecal_hardcoded_conditions