Skip to content

Commit 3ea9e08

Browse files
AndrewEdmonds11AndrewEdmonds11
authored
Merge pull request #329 from AndrewEdmonds11/v06_08_02
Final changes for v06_08_02
2 parents f606f24 + 60ba84e commit 3ea9e08

6 files changed

Lines changed: 92 additions & 11 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Validation scripts and instructions are [here](validation/README.md)
6464
## Tagging a New Release
6565
Instructions for tagging a new release:
6666

67-
* have a working area set up environment set up with a backing to the latest SimJob and a clone of EventNtuple (you might already have this)
67+
* have a working area set up with a backing to the latest SimJob and a clone of EventNtuple (you might already have this)
6868
```
6969
cd /your/work/area
7070
muse backing SimJob MDCXXXXvv

‎fcl/from_mcs-ceSimRecoVal.fcl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
physics.analyzers.EventNtuple.branches[0].options.fillHits : true
44
physics.analyzers.EventNtuple.FillHitInfo : true
55
physics.analyzers.EventNtuple.FillHitCalibInfo : true
6+
physics.analyzers.EventNtuple.FillTriggerInfo : true
7+
physics.analyzers.EventNtuple.TriggerProcessName : "ceTrig"

‎src/EventNtupleMaker_module.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ namespace mu2e {
451451
_hVersion = tfs->make<TH1I>("version", "version number",3,0,3);
452452
_hVersion->GetXaxis()->SetBinLabel(1, "major"); _hVersion->SetBinContent(1, 6);
453453
_hVersion->GetXaxis()->SetBinLabel(2, "minor"); _hVersion->SetBinContent(2, 8);
454-
_hVersion->GetXaxis()->SetBinLabel(3, "patch"); _hVersion->SetBinContent(3, 1);
454+
_hVersion->GetXaxis()->SetBinLabel(3, "patch"); _hVersion->SetBinContent(3, 2);
455455
// add event info branch
456456
_ntuple->Branch("evtinfo",&_einfo,_buffsize,_splitlevel);
457457
if (_fillmc) {

‎validation/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ We want to make sure that any changes we make to the code don't:
88
From ```EventNtuple/``` directory:
99

1010
```
11-
. ./validation/test_fcls.sh
11+
. ./validation/test_fcls.sh [MDC2020 or MDC2025]
1212
```
1313

1414
This script will run all the supported fcl files over relevant datasets. All tests should report ```OK```. If one reports ```FAIL```, you can find the exact command that failed in the ```test_fcls.log``` file in order to debug.

‎validation/ceTrig.fcl‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
//
2+
// In order to test the full trigger menu in the SimJob backing
3+
// re-run the trigger on the output of ceSimReco.fcl
4+
//
5+
// FIXME: try to replace this with up-to-date trigger fcls in Production
6+
// when we have newer SimJob musings
7+
//
8+
9+
#include "Offline/fcl/standardServices.fcl"
10+
11+
#include "mu2e-trig-config/core/trigProducers.fcl"
12+
#include "mu2e-trig-config/core/trigFilters.fcl"
13+
#include "mu2e-trig-config/core/trigRecoSequences.fcl"
14+
15+
BEGIN_PROLOG
16+
# override the trigger digitization sequence (must be before trigSequences)
17+
TrigRecoSequences.artFragmentsGen : []
18+
END_PROLOG
19+
20+
#include "mu2e-trig-config/core/trigSequences.fcl"
21+
22+
#include "mu2e-trig-config/gen/trig_physMenuPSConfig_OnSpill.fcl"
23+
#include "mu2e-trig-config/gen/trig_physMenu_OnSpill.fcl"
24+
25+
process_name : ceTrig
26+
27+
source : { module_type : RootInput }
28+
29+
services : @local::Services.Core
30+
31+
physics.producers.KKDe.KKFitSettings.SaveHitCalibInfo : true
32+
33+
physics: {
34+
producers : { @table::TrigProducers.producers }
35+
36+
filters : { @table::TrigFilters.filters
37+
@table::Trig_physMenuPSConfig
38+
}
39+
40+
@table::TrigSequences
41+
42+
trigger_paths : [ @sequence::Trig_physMenu.trigger_paths ]
43+
44+
OutPath : [ Output ]
45+
end_paths : [ OutPath ]
46+
}
47+
48+
outputs : {
49+
Output : { module_type : RootOutput
50+
outputCommands : [ "keep *_*_*_*" ]
51+
fileName : "mcs.owner.val-ceTrig.dsconf.seq.art"
52+
}
53+
}
54+
55+
#include "Production/Validation/database.fcl"
56+
57+
services.scheduler.wantSummary : true

‎validation/test_fcls.sh‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,36 @@
22
# test_fcls.sh - runs fcl files to make sure that they complete successfully
33
# Note: requires relevant filelists in a directory above this one
44
#
5+
vMDC=$1
56

67
log_file="test_fcls.log"
78
rm ${log_file}
89

9-
mock_dataset="mcs.mu2e.ensembleMDS2cMix1BBTriggered.MDC2020ba_best_v1_3.art"
10-
primary_dataset="mcs.mu2e.CeEndpointOnSpillTriggered.MDC2020aw_best_v1_3.art"
11-
mixed_dataset="mcs.mu2e.CeEndpointMix1BBTriggered.MDC2020aw_best_v1_3.art"
12-
extracted_dataset="mcs.mu2e.CosmicCRYExtractedTriggered.MDC2020aw.art"
13-
digi_dataset="dig.mu2e.DIOtail95OnSpillTriggered.MDC2020au_perfect_v1_3.art"
14-
crv_vst_dataset="rec.mu2e.CRV_wideband_cosmics.CRVWBA-000-000-000.art"
10+
mock_dataset=""
11+
primary_dataset=""
12+
mixed_dataset=""
13+
extracted_dataset=""
14+
digi_dataset=""
15+
crv_vst_dataset=""
16+
17+
if [[ "$vMDC" == "MDC2020" ]]; then
18+
echo "Testing MDC2020 datasets"
19+
mock_dataset="mcs.mu2e.ensembleMDS2cMix1BBTriggered.MDC2020ba_best_v1_3.art"
20+
primary_dataset="mcs.mu2e.CeEndpointOnSpillTriggered.MDC2020aw_best_v1_3.art"
21+
mixed_dataset="mcs.mu2e.CeEndpointMix1BBTriggered.MDC2020aw_best_v1_3.art"
22+
extracted_dataset="mcs.mu2e.CosmicCRYExtractedTriggered.MDC2020aw.art"
23+
digi_dataset="dig.mu2e.DIOtail95OnSpillTriggered.MDC2020au_perfect_v1_3.art"
24+
crv_vst_dataset="rec.mu2e.CRV_wideband_cosmics.CRVWBA-000-000-000.art"
25+
elif [[ "$vMDC" == "MDC2025" ]]; then
26+
echo "Testing MDC2025 datasets"
27+
mock_dataset="mcs.mu2e.ensembleMDS3aOnSpillTriggered.MDC2025af_best_v1_3.art"
28+
primary_dataset="mcs.mu2e.CeEndpointOnSpillTriggered.MDC2025ae_best_v1_3.art"
29+
mixed_dataset="" # mcs.mu2e.CeEndpointMix1BBTriggered.MDC2020aw_best_v1_3.art"
30+
echo "No MDC2025 mixed datasets exist. Some tests will fail..."
31+
extracted_dataset="mcs.mu2e.CosmicCRYExtractedTriggered.MDC2025ae_best_v1_3.art"
32+
digi_dataset="dig.mu2e.FlatGammaMix1BBTriggered.MDC2025af_best_v1_1.art"
33+
crv_vst_dataset="rec.mu2e.CRV_wideband_cosmics.CRVWBA-000-000-000.art"
34+
fi
1535

1636
all_datasets=( $mock_dataset $primary_dataset $mixed_dataset $extracted_dataset $digi_dataset $crv_vst_dataset )
1737

@@ -89,8 +109,10 @@ fi
89109
echo -n "from_mcs-ceSimRecoVal.fcl... "
90110
echo "mu2e -c validation/ceSimReco.fcl -n 100" >> ${log_file} 2>&1
91111
mu2e -c validation/ceSimReco.fcl -n 100 >> ${log_file} 2>&1
92-
echo "mu2e -c fcl/from_mcs-ceSimRecoVal.fcl -s mcs.owner.val-ceSimRecoVal.dsconf.seq.art --TFileName nts.ntuple.ceSimRecoVal.root" >> ${log_file} 2>&1
93-
mu2e -c fcl/from_mcs-ceSimRecoVal.fcl -s mcs.owner.val-ceSimRecoVal.dsconf.seq.art --TFileName nts.ntuple.ceSimRecoVal.root >> ${log_file} 2>&1
112+
echo "mu2e -c validation/ceTrig.fcl -s mcs.owner.val-ceSimRecoVal.dsconf.seq.art --TFileName nts.ntuple.ceTrig.root" >> ${log_file} 2>&1
113+
mu2e -c validation/ceTrig.fcl -s mcs.owner.val-ceSimRecoVal.dsconf.seq.art --TFileName nts.ntuple.ceSimRecoVal.root >> ${log_file} 2>&1
114+
echo "mu2e -c fcl/from_mcs-ceSimRecoVal.fcl -s mcs.owner.val-ceTrig.dsconf.seq.art --TFileName nts.ntuple.ceSimRecoVal.root" >> ${log_file} 2>&1
115+
mu2e -c fcl/from_mcs-ceSimRecoVal.fcl -s mcs.owner.val-ceTrig.dsconf.seq.art --TFileName nts.ntuple.ceTrig.root >> ${log_file} 2>&1
94116
if [ $? == 0 ]; then
95117
echo "OK"
96118
else

0 commit comments

Comments
 (0)