Merge pull request #200 from JeffersonLab/feature-no-default-kryptonite

Merge branch feature-no-default-kryptonite
JeffersonLab · Sep 5, 2019 · 8124ac8 · 8124ac8
2 parents 993a901 + 116d213
commit 8124ac8
Show file tree

Hide file tree

Showing 51 changed files with 72 additions and 63 deletions.
diff --git a/analysis/pruneTreeEnvelope/runexample_epelastic_envelope.mac b/analysis/pruneTreeEnvelope/runexample_epelastic_envelope.mac
@@ -23,7 +23,7 @@
 /remoll/beamcurr 85 microampere
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 /process/list
 # Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
 #/remoll/seed 123456

diff --git a/analysis/pruneTreeEnvelope/runexample_limit_envelope.mac b/analysis/pruneTreeEnvelope/runexample_limit_envelope.mac
@@ -23,7 +23,7 @@
 /remoll/beamcurr 85 microampere
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 /process/list
 # Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
 #/remoll/seed 123456

diff --git a/analysis/pruneTreeEnvelope/runexample_moller_envelope.mac b/analysis/pruneTreeEnvelope/runexample_moller_envelope.mac
@@ -23,7 +23,7 @@
 /remoll/beamcurr 85 microampere
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 /process/list
 # Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
 #/remoll/seed 123456

diff --git a/include/remollDetectorConstruction.hh b/include/remollDetectorConstruction.hh
@@ -90,7 +90,6 @@ class remollDetectorConstruction : public G4VUserDetectorConstruction
   public:
 
     void SetKryptoniteVerbose(G4int verbose) { fKryptoniteVerbose = verbose; }
-    void SetKryptoniteEnable(G4String flag);
     void EnableKryptonite();
     void DisableKryptonite();
     void AddKryptoniteCandidate(G4String name);

diff --git a/macros/envelope_data.mac b/macros/envelope_data.mac
@@ -44,7 +44,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-#/remoll/kryptonite/set true
+#/control/execute macros/kryptonite.mac
 
 
 #create moller output file

diff --git a/macros/hepmc/ee_ee_hepmc.mac b/macros/hepmc/ee_ee_hepmc.mac
@@ -8,7 +8,7 @@
 /remoll/addfield map_directory/blockyHybrid_rm_3.0.txt
 /remoll/addfield map_directory/blockyUpstream_rm_1.1.txt
 
-/remoll/kryptonite/enable
+/control/execute macros/kryptonite.mac
 
 /remoll/SD/disable_range 7000 10000
 

diff --git a/macros/hepmc/ee_ee_moller.mac b/macros/hepmc/ee_ee_moller.mac
@@ -8,7 +8,7 @@
 /remoll/addfield map_directory/blockyHybrid_rm_3.0.txt
 /remoll/addfield map_directory/blockyUpstream_rm_1.1.txt
 
-/remoll/kryptonite/enable
+/control/execute macros/kryptonite.mac
 
 /remoll/SD/disable_range 7000 10000
 

diff --git a/macros/hepmc/ep_ep.mac b/macros/hepmc/ep_ep.mac
@@ -8,7 +8,7 @@
 /remoll/addfield map_directory/blockyHybrid_rm_3.0.txt
 /remoll/addfield map_directory/blockyUpstream_rm_1.1.txt
 
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /remoll/evgen/set hepmcAscii
 

diff --git a/macros/hepmc/ep_ep_elastic.mac b/macros/hepmc/ep_ep_elastic.mac
@@ -8,7 +8,7 @@
 /remoll/addfield map_directory/blockyHybrid_rm_3.0.txt
 /remoll/addfield map_directory/blockyUpstream_rm_1.1.txt
 
-/remoll/kryptonite/enable
+/control/execute macros/kryptonite.mac
 
 /remoll/SD/disable_range 7000 10000
 

diff --git a/macros/hepmc/ep_ep_hepmc.mac b/macros/hepmc/ep_ep_hepmc.mac
@@ -8,7 +8,7 @@
 /remoll/addfield map_directory/blockyHybrid_rm_3.0.txt
 /remoll/addfield map_directory/blockyUpstream_rm_1.1.txt
 
-/remoll/kryptonite/enable
+/control/execute macros/kryptonite.mac
 
 /remoll/SD/disable_range 7000 10000
 

diff --git a/macros/initializeTF1Generator.mac b/macros/initializeTF1Generator.mac
@@ -53,7 +53,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /process/list
 

diff --git a/macros/kryptonite.mac b/macros/kryptonite.mac
@@ -0,0 +1,12 @@
+# Enable kryptonite
+/remoll/kryptonite/enable
+
+# Set some default materials
+/remoll/kryptonite/add VacuumKryptonite
+/remoll/kryptonite/add Tungsten
+/remoll/kryptonite/add Copper
+/remoll/kryptonite/add Lead
+/remoll/kryptonite/add CW95
+
+# List materials
+/remoll/kryptonite/list
diff --git a/macros/mainz.mac b/macros/mainz.mac
@@ -25,7 +25,7 @@
 #----------------------------------------
 
 # Kill tracks on interactions with W, Cu, and Pb
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /process/list
 

diff --git a/macros/optical.mac b/macros/optical.mac
@@ -24,7 +24,7 @@
 /remoll/addfield map_directory/blockyHybrid_rm_3.0.txt
 /remoll/addfield map_directory/blockyUpstream_rm_1.1.txt
 
-/remoll/kryptonite/set false
+/remoll/kryptonite/disable
 
 /remoll/filename remollout.root
 

diff --git a/macros/optics_test.mac b/macros/optics_test.mac
@@ -41,7 +41,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /process/list
 

diff --git a/macros/pion/pion_optical_response.in b/macros/pion/pion_optical_response.in
@@ -14,7 +14,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set false
+/remoll/kryptonite/disable
 
 # Only read detectors 28 and 30
 /remoll/SD/disable_all

diff --git a/macros/pion/pion_optical_response.mac b/macros/pion/pion_optical_response.mac
@@ -15,7 +15,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set false
+/remoll/kryptonite/disable
 
 # Only read detectors 28 and 30
 /remoll/SD/disable_all

diff --git a/macros/remoll_test.in b/macros/remoll_test.in
@@ -58,7 +58,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /process/list
 

diff --git a/macros/runTF1.mac b/macros/runTF1.mac
@@ -35,7 +35,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /process/list
 

diff --git a/macros/runexample.mac b/macros/runexample.mac
@@ -75,7 +75,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /process/list
 

diff --git a/macros/runexample_envelope.mac b/macros/runexample_envelope.mac
@@ -16,7 +16,7 @@
 /remoll/beamcurr 85 microampere
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 /process/list
 # Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
 #/remoll/seed 123456

diff --git a/macros/runexample_epelastic_envelope.mac b/macros/runexample_epelastic_envelope.mac
@@ -23,7 +23,7 @@
 /remoll/beamcurr 85 microampere
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 /process/list
 # Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
 #/remoll/seed 123456

diff --git a/macros/runexample_limit_envelope.mac b/macros/runexample_limit_envelope.mac
@@ -23,7 +23,7 @@
 /remoll/beamcurr 85 microampere
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 /process/list
 # Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
 #/remoll/seed 123456

diff --git a/macros/runexample_moller_envelope.mac b/macros/runexample_moller_envelope.mac
@@ -23,7 +23,7 @@
 /remoll/beamcurr 85 microampere
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 /process/list
 # Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
 #/remoll/seed 123456

diff --git a/macros/showermax_piondetector_optical_response_moller.in b/macros/showermax_piondetector_optical_response_moller.in
@@ -14,7 +14,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set false
+/remoll/kryptonite/disable
 
 # Only read detectors 28 and 30
 /remoll/SD/disable_all

diff --git a/macros/showermax_piondetector_optical_response_pion.in b/macros/showermax_piondetector_optical_response_pion.in
@@ -14,7 +14,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set false
+/remoll/kryptonite/disable
 
 # Only read detectors 28 and 30
 /remoll/SD/disable_all

diff --git a/macros/sim_dump_backscatter.in b/macros/sim_dump_backscatter.in
@@ -27,7 +27,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set false
+/remoll/kryptonite/disable
 
 # Disable all but useful detectors
 /remoll/SD/disable_all

diff --git a/macros/sim_dump_backscatter.mac b/macros/sim_dump_backscatter.mac
@@ -27,7 +27,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set false
+/remoll/kryptonite/disable
 
 /remoll/SD/disable_all
 /remoll/SD/enable 28

diff --git a/macros/tests/commit/test_beam.mac b/macros/tests/commit/test_beam.mac
@@ -43,7 +43,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /remoll/seed 123456
 

diff --git a/macros/tests/commit/test_elastic.mac b/macros/tests/commit/test_elastic.mac
@@ -43,7 +43,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /remoll/seed 123456
 

diff --git a/macros/tests/commit/test_elasticAl.mac b/macros/tests/commit/test_elasticAl.mac
@@ -32,7 +32,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /remoll/seed 123456
 

diff --git a/macros/tests/commit/test_elasticAl_DS.mac b/macros/tests/commit/test_elasticAl_DS.mac
@@ -34,7 +34,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /remoll/seed 123456
 

diff --git a/macros/tests/commit/test_elasticAl_US.mac b/macros/tests/commit/test_elasticAl_US.mac
@@ -34,7 +34,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /remoll/seed 123456
 

diff --git a/macros/tests/commit/test_inelastic.mac b/macros/tests/commit/test_inelastic.mac
@@ -43,7 +43,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /remoll/seed 123456
 

diff --git a/macros/tests/commit/test_inelasticAl.mac b/macros/tests/commit/test_inelasticAl.mac
@@ -43,7 +43,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /remoll/seed 123456
 

diff --git a/macros/tests/commit/test_moller.mac b/macros/tests/commit/test_moller.mac
@@ -43,7 +43,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/enable
+/control/execute macros/kryptonite.mac
 
 /remoll/seed 123456
 

diff --git a/macros/tests/commit/test_pion.mac b/macros/tests/commit/test_pion.mac
@@ -44,7 +44,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /remoll/seed 123456
 

diff --git a/macros/tests/commit/test_raster.mac b/macros/tests/commit/test_raster.mac
@@ -55,7 +55,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /remoll/seed 123456
 

diff --git a/macros/tests/release/test_moller.mac b/macros/tests/release/test_moller.mac
@@ -43,7 +43,7 @@
 
 # Make interactions with W, Cu, and Pb
 # realistic rather than pure absorbers
-/remoll/kryptonite/set true
+/control/execute macros/kryptonite.mac
 
 /remoll/seed 123456
 

diff --git a/macros/tests/unit/test_beam_energy.mac b/macros/tests/unit/test_beam_energy.mac
@@ -1,5 +1,7 @@
 # This will produce four files test_moller_$E.root, $E = 8,9,10,11 GeV.
 
+/control/execute macros/kryptonite.mac
+
 /run/initialize
 
 /remoll/filename test_moller_8.root

diff --git a/macros/tests/unit/test_det_enable.mac b/macros/tests/unit/test_det_enable.mac
@@ -1,5 +1,7 @@
 /run/initialize
 
+/control/execute macros/kryptonite.mac
+
 # Print all detectors
 /remoll/SD/print_all
 

diff --git a/macros/tests/unit/test_gen_external.mac b/macros/tests/unit/test_gen_external.mac
@@ -3,6 +3,8 @@
 /remoll/parallel/setfile geometry/mollerParallel.gdml
 /remoll/physlist/parallel/enable 
 
+/control/execute macros/kryptonite.mac
+
 /run/initialize
 
 /remoll/evgen/set moller

diff --git a/macros/tests/unit/test_interval.mac b/macros/tests/unit/test_interval.mac
@@ -1,3 +1,4 @@
+/control/execute macros/kryptonite.mac
 /run/initialize
 /remoll/evgen/set moller
 /remoll/interval 5

diff --git a/macros/tests/unit/test_kryptonite.mac b/macros/tests/unit/test_kryptonite.mac
@@ -4,7 +4,7 @@
 /remoll/kryptonite/add G4_Pb
 /remoll/kryptonite/list
 
-/remoll/kryptonite/set true
+/remoll/kryptonite/enable
 /run/beamOn 100
-/remoll/kryptonite/set false
+/remoll/kryptonite/disable
 /run/beamOn 100