Skip to content

Commit 29ccd1c

Browse files
tdealtryWCSim CI
and
WCSim CI
authored
Remember to turn dark noise off for IWCD OD PMTs (#35)
* Remember to turn dark noise off for IWCD OD PMTs * Add check for GeomVol1002 after suggestion from @nickwp in WCSim/WCSim#408 (previously erroneously added to deprecated Tests.sh * Remove deprecated script * RunTests.sh is the way to live --------- Co-authored-by: WCSim CI <[email protected]>
1 parent c0af11d commit 29ccd1c

6 files changed

+6
-448
lines changed

Generate/macReference/wcsim_iwcdod_SensitiveDetector_Only_NoTrigger_gun500MeVem_xdir_dark0_n800_seed20230628.mac

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
/control/execute /opt/Validation/Generate/macReference/daq/daq.mac
2424

2525
/control/execute /opt/Validation/Generate/macReference/dark/darktank0.mac
26+
/control/execute /opt/Validation/Generate/macReference/dark/darkod0.mac
2627

2728
/control/execute /opt/Validation/Generate/macReference/physics/gun500MeVem_xdir.mac
2829

Generate/macReference/wcsim_iwcdod_SensitiveDetector_Only_NoTrigger_gun500MeVmum_xdir_dark0_n1000_seed20230628.mac

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
/control/execute /opt/Validation/Generate/macReference/daq/daq.mac
2424

2525
/control/execute /opt/Validation/Generate/macReference/dark/darktank0.mac
26+
/control/execute /opt/Validation/Generate/macReference/dark/darkod0.mac
2627

2728
/control/execute /opt/Validation/Generate/macReference/physics/gun500MeVmum_xdir.mac
2829

Generate/macReference/wcsim_iwcdod_SensitiveDetector_Only_NoTrigger_gun5MeVem_xdir_dark0_n5000_seed20230628.mac

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
/control/execute /opt/Validation/Generate/macReference/daq/daq.mac
2424

2525
/control/execute /opt/Validation/Generate/macReference/dark/darktank0.mac
26+
/control/execute /opt/Validation/Generate/macReference/dark/darkod0.mac
2627

2728
/control/execute /opt/Validation/Generate/macReference/physics/gun5MeVem_xdir.mac
2829

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Then
8585
## More details
8686
* Tests are defined in `test.txt`
8787
* These link to WCSim config files in `Generate/macReference/`
88-
* Note that `MakeReference.py` labels tests in the range `[0,N-1]`, whilst `Tests.sh` label tests in the range `[1,N]`. Sorry
88+
* Note that `MakeReference.py` labels tests in the range `[0,N-1]`, whilst `RunTests.sh` label tests in the range `[1,N]`. Sorry
8989
* `MakeReference.py` is used to create reference files
9090
* The output of this is a set of reference files in `Compare/Reference/`
9191
* Raw vector/number ROOT files, with information extracted from the standard *classed* WCSim ROOT files
@@ -101,7 +101,7 @@ Then
101101
* Adds an entry to `folderlist` (list of folders = commit hashes) and trims it to 35 entries. Then `git rm`s
102102
any folders not in the `folderlist`. This ensures that the webpage does not grow expoentially
103103
* Pushes to
104-
* `Tests.sh` does the actual tests (one test is done based on the command line option)
104+
* `RunTests.sh` does the actual tests (one test is done based on the command line option)
105105
* Calls `Generate/Generate.sh` for the specified job, to get the same information as we have in `Compare/Reference/`
106106
* Runs WCSim, saving the log file (temporarily)
107107
* Converts the WCSim file to the raw vector/number ROOT file with `Reference/daq_readfilemain`

RunTests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ while read line; do
195195
if [ -f $impossiblefilename ]; then
196196
rm -f $impossiblefilename
197197
fi
198-
for greps in "IMPOSSIBLE GEOMETRY"; do
198+
for greps in "IMPOSSIBLE GEOMETRY" "*** G4Exception : GeomVol1002"; do
199199
grep "$greps" wcsim_run.out >> $impossiblefilename
200200
done
201201
if [ -s $impossiblefilename ]; then

0 commit comments

Comments
 (0)