Skip to content

Commit 1bc3e1e

Browse files
AndrewEdmonds11AndrewEdmonds11
authored
Merge pull request #353 from AndrewEdmonds11/v06_10_00
Almost final commits for v06_10_00
2 parents 34ac112 + 5b2c76d commit 1bc3e1e

5 files changed

Lines changed: 52 additions & 46 deletions

File tree

‎fcl/from_mcs-Run1B.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ physics.analyzers.EventNtuple.FillMCInfo : true
55
physics.analyzers.EventNtuple.StepPointMCTags : [ "compressRecoMCs:virtualdetector" ] # we add the mcsteps_virtualdetector branch
66
physics.analyzers.EventNtuple.FillTimeClusterInfo : true
77
physics.analyzers.EventNtuple.TimeClustersTag : "SimpleTimeCluster" # Store time clusters for straight line track finding
8+
physics.analyzers.EventNtuple.FillCaloMC : true
89
physics.analyzers.EventNtuple.FillCaloClustersMC : true
910
physics.analyzers.EventNtuple.FillCaloSimInfos : true
1011
services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common.txt" # we can use the standard geometry

‎fcl/from_mcs-mockdata_noMC.fcl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#include "EventNtuple/fcl/from_mcs-mockdata.fcl"
22

33
physics.analyzers.EventNtuple.FillMCInfo : false
4+
physics.analyzers.EventNtuple.FillCaloMC : false
5+
physics.analyzers.EventNtuple.FillCaloClustersMC : false
6+
physics.analyzers.EventNtuple.FillCaloSimInfos : false
47

58
physics.EventNtuplePath : [ @sequence::EventNtuple.PathNoMC ]
69
physics.EventNtupleEndPath : [ @sequence::EventNtuple.EndPathNoMC ]

‎src/EventNtupleMaker_module.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,8 @@ namespace mu2e {
479479
_ntuple=tfs->make<TTree>("ntuple","Mu2e Event Ntuple");
480480
_hVersion = tfs->make<TH1I>("version", "version number",3,0,3);
481481
_hVersion->GetXaxis()->SetBinLabel(1, "major"); _hVersion->SetBinContent(1, 6);
482-
_hVersion->GetXaxis()->SetBinLabel(2, "minor"); _hVersion->SetBinContent(2, 9);
483-
_hVersion->GetXaxis()->SetBinLabel(3, "patch"); _hVersion->SetBinContent(3, 2);
482+
_hVersion->GetXaxis()->SetBinLabel(2, "minor"); _hVersion->SetBinContent(2, 10);
483+
_hVersion->GetXaxis()->SetBinLabel(3, "patch"); _hVersion->SetBinContent(3, 0);
484484
_hProcEvents = tfs->make<TH1I>("n_proc_events", "number of processed events", 1,0,1);
485485
// add event info branch
486486
_ntuple->Branch("evtinfo",&_einfo,_buffsize,_splitlevel);

‎validation/create_val_file_rooutil.C‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,6 @@ void create_val_file_rooutil(std::string filename, std::string outfilename) {
201201
TH1F* h_trkmcsim_prirel_rem = new TH1F("h_trkmcsim_prirel_rem", "", 10,0,10);
202202
TH1F* h_trkmcsim_trkrel_rel = new TH1F("h_trkmcsim_trkrel_rel", "", 20,-10,10);
203203
TH1F* h_trkmcsim_trkrel_rem = new TH1F("h_trkmcsim_trkrel_rem", "", 10,0,10);
204-
TH1F* h_trkmcsim_calrel_rel = new TH1F("h_trkmcsim_calrel_rel", "", 20,-10,10);
205-
TH1F* h_trkmcsim_calrel_rem = new TH1F("h_trkmcsim_calrel_rem", "", 10,0,10);
206204

207205
TH1F* h_trkqual_valid = new TH1F("h_trkqual_valid", "", 100,0,100);
208206
TH1F* h_trkqual_result = new TH1F("h_trkqual_result", "", 100,0,1);
@@ -549,8 +547,6 @@ void create_val_file_rooutil(std::string filename, std::string outfilename) {
549547
TH1F* h_calomcsim_prirel_rem = new TH1F("h_calomcsim_prirel_rem", "", 10,0,10);
550548
TH1F* h_calomcsim_trkrel_rel = new TH1F("h_calomcsim_trkrel_rel", "", 20,-10,10);
551549
TH1F* h_calomcsim_trkrel_rem = new TH1F("h_calomcsim_trkrel_rem", "", 10,0,10);
552-
TH1F* h_calomcsim_calrel_rel = new TH1F("h_calomcsim_calrel_rel", "", 20,-10,10);
553-
TH1F* h_calomcsim_calrel_rem = new TH1F("h_calomcsim_calrel_rem", "", 10,0,10);
554550

555551
TH1F* h_mcsteps_virtualdetector_vid = new TH1F("h_mcsteps_virtualdetector_vid", "", 150,0,150);
556552
TH1F* h_mcsteps_virtualdetector_sid = new TH1F("h_mcsteps_virtualdetector_sid", "", 100,0,100);
@@ -803,8 +799,6 @@ void create_val_file_rooutil(std::string filename, std::string outfilename) {
803799
h_trkmcsim_prirel_rem->Fill(trkmcsim.prirel.removal());
804800
h_trkmcsim_trkrel_rel->Fill(trkmcsim.trkrel.relationship());
805801
h_trkmcsim_trkrel_rem->Fill(trkmcsim.trkrel.removal());
806-
h_trkmcsim_calrel_rel->Fill(trkmcsim.calrel.relationship());
807-
h_trkmcsim_calrel_rem->Fill(trkmcsim.calrel.removal());
808802
}
809803
}
810804

@@ -1269,8 +1263,6 @@ void create_val_file_rooutil(std::string filename, std::string outfilename) {
12691263
h_calomcsim_prirel_rem->Fill(calomcsim.prirel.removal());
12701264
h_calomcsim_trkrel_rel->Fill(calomcsim.trkrel.relationship());
12711265
h_calomcsim_trkrel_rem->Fill(calomcsim.trkrel.removal());
1272-
h_calomcsim_calrel_rel->Fill(calomcsim.calrel.relationship());
1273-
h_calomcsim_calrel_rem->Fill(calomcsim.calrel.removal());
12741266
}
12751267

12761268

‎validation/test_fcls.sh‎

Lines changed: 46 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Note: requires relevant filelists in a directory above this one
44
#
55
if [ $# -ne 1 ]; then
6-
echo "Usage: . ./validation/test_fcls.sh MDC202X"
6+
echo "Usage: . ./validation/test_fcls.sh [MDC2020 / MDC2025 / Run1B]"
77
return
88
fi
99
vMDC=$1
@@ -16,7 +16,7 @@ primary_dataset=""
1616
mixed_dataset=""
1717
extracted_dataset=""
1818
digi_dataset=""
19-
crv_vst_dataset=""
19+
crv_vst_dataset="temp_crv_kpp"
2020

2121
if [[ "$vMDC" == "MDC2020" ]]; then
2222
echo "Testing MDC2020 datasets"
@@ -25,16 +25,26 @@ if [[ "$vMDC" == "MDC2020" ]]; then
2525
mixed_dataset="mcs.mu2e.CeEndpointMix1BBTriggered.MDC2020aw_best_v1_3.art"
2626
extracted_dataset="mcs.mu2e.CosmicCRYExtractedTriggered.MDC2020aw.art"
2727
digi_dataset="dig.mu2e.DIOtail95OnSpillTriggered.MDC2020au_perfect_v1_3.art"
28-
crv_vst_dataset="rec.mu2e.CRV_wideband_cosmics.CRVWBA-000-000-000.art"
2928
elif [[ "$vMDC" == "MDC2025" ]]; then
3029
echo "Testing MDC2025 datasets"
3130
mock_dataset="mcs.mu2e.ensembleMDS3aOnSpillTriggered.MDC2025af_best_v1_3.art"
3231
primary_dataset="mcs.mu2e.CeEndpointOnSpillTriggered.MDC2025ae_best_v1_3.art"
33-
mixed_dataset="" # mcs.mu2e.CeEndpointMix1BBTriggered.MDC2020aw_best_v1_3.art"
34-
echo "No MDC2025 mixed datasets exist. Some tests will fail..."
32+
mixed_dataset="mcs.mu2e.CeMLeadingLogMix1BBTriggered.MDC2025af_best_v1_1.art"
3533
extracted_dataset="mcs.mu2e.CosmicCRYExtractedTriggered.MDC2025ae_best_v1_3.art"
3634
digi_dataset="dig.mu2e.FlatGammaMix1BBTriggered.MDC2025af_best_v1_1.art"
37-
crv_vst_dataset="rec.mu2e.CRV_wideband_cosmics.CRVWBA-000-000-000.art"
35+
elif [[ "$vMDC" == "Run1B" ]]; then
36+
echo "Testing Run1B datasets"
37+
echo "No mock datasets for Run1B - some tests will fail..."
38+
mock_dataset="" # "mcs.mu2e.ensembleMDS3aOnSpillTriggered.MDC2025af_best_v1_3.art"
39+
primary_dataset="mcs.mu2e.CeEndpointOnSpillTriggerable-KL.Run1Baf_best_v1_4-000.art"
40+
mixed_dataset="mcs.mu2e.CeEndpointMix1BB-KL.Run1Bah_best_v1_4-001.art"
41+
echo "No extracted datasets for Run1B - some tests will fail..."
42+
extracted_dataset="" # "mcs.mu2e.CosmicCRYExtractedTriggered.MDC2025ae_best_v1_3.art"
43+
echo "No reco+ntuple fcl for Run1B - some tests will fail..."
44+
digi_dataset="" # "dig.mu2e.FlatGammaMix1BBTriggered.MDC2025af_best_v1_1.art"
45+
else
46+
echo "Unsupported option $vMDC"
47+
return
3848
fi
3949

4050
all_datasets=( $mock_dataset $primary_dataset $mixed_dataset $extracted_dataset $digi_dataset $crv_vst_dataset )
@@ -58,45 +68,45 @@ echo -n "from_mcs-mockdata.fcl... "
5868
echo "mu2e -c fcl/from_mcs-mockdata.fcl -S ../filelists/$mock_dataset.list --TFileName nts.ntuple.mock.root -n 100" > ${log_file} 2>&1
5969
mu2e -c fcl/from_mcs-mockdata.fcl -S ../filelists/$mock_dataset.list --TFileName nts.ntuple.mock.root -n 100 >> ${log_file} 2>&1
6070
if [ $? == 0 ]; then
61-
echo "OK"
71+
echo "OK" | tee -a ${log_file}
6272
else
63-
echo "FAIL"
73+
echo "FAIL" | tee -a ${log_file}
6474
fi
6575

6676
echo -n "from_mcs-mockdata_noMC.fcl... "
6777
echo "mu2e -c fcl/from_mcs-mockdata_noMC.fcl -S ../filelists/$mock_dataset.list --TFileName nts.ntuple.mockNoMC.root -n 100" >> ${log_file} 2>&1
6878
mu2e -c fcl/from_mcs-mockdata_noMC.fcl -S ../filelists/$mock_dataset.list --TFileName nts.ntuple.mockNoMC.root -n 100 >> ${log_file} 2>&1
6979
if [ $? == 0 ]; then
70-
echo "OK"
80+
echo "OK" | tee -a ${log_file}
7181
else
72-
echo "FAIL"
82+
echo "FAIL" | tee -a ${log_file}
7383
fi
7484

7585
echo -n "from_mcs-primary.fcl... "
7686
echo "mu2e -c fcl/from_mcs-primary.fcl -S ../filelists/$primary_dataset.list --TFileName nts.ntuple.primary.root -n 100" >> ${log_file} 2>&1
7787
mu2e -c fcl/from_mcs-primary.fcl -S ../filelists/$primary_dataset.list --TFileName nts.ntuple.primary.root -n 100 >> ${log_file} 2>&1
7888
if [ $? == 0 ]; then
79-
echo "OK"
89+
echo "OK" | tee -a ${log_file}
8090
else
81-
echo "FAIL"
91+
echo "FAIL" | tee -a ${log_file}
8292
fi
8393

8494
echo -n "from_mcs-mixed.fcl... "
8595
echo "mu2e -c fcl/from_mcs-mixed.fcl -S ../filelists/$mixed_dataset.list --TFileName nts.ntuple.mixed.root -n 100" >> ${log_file} 2>&1
8696
mu2e -c fcl/from_mcs-mixed.fcl -S ../filelists/$mixed_dataset.list --TFileName nts.ntuple.mixed.root -n 100 >> ${log_file} 2>&1
8797
if [ $? == 0 ]; then
88-
echo "OK"
98+
echo "OK" | tee -a ${log_file}
8999
else
90-
echo "FAIL"
100+
echo "FAIL" | tee -a ${log_file}
91101
fi
92102

93103
echo -n "from_mcs-extracted.fcl... "
94104
echo "mu2e -c fcl/from_mcs-extracted.fcl -S ../filelists/$extracted_dataset.list --TFileName nts.ntuple.extracted.root -n 100" >> ${log_file} 2>&1
95105
mu2e -c fcl/from_mcs-extracted.fcl -S ../filelists/$extracted_dataset.list --TFileName nts.ntuple.extracted.root -n 100 >> ${log_file} 2>&1
96106
if [ $? == 0 ]; then
97-
echo "OK"
107+
echo "OK" | tee -a ${log_file}
98108
else
99-
echo "FAIL"
109+
echo "FAIL" | tee -a ${log_file}
100110
fi
101111

102112
echo -n "from_mcs-ceSimReco.fcl... "
@@ -105,9 +115,9 @@ mu2e -c Production/Validation/ceSimReco.fcl -n 10 >> ${log_file} 2>&1
105115
echo "mu2e -c fcl/from_mcs-ceSimReco.fcl -s mcs.owner.val-ceSimReco.dsconf.seq.art --TFileName nts.ntuple.ceSimReco.root" >> ${log_file} 2>&1
106116
mu2e -c fcl/from_mcs-ceSimReco.fcl -s mcs.owner.val-ceSimReco.dsconf.seq.art --TFileName nts.ntuple.ceSimReco.root >> ${log_file} 2>&1
107117
if [ $? == 0 ]; then
108-
echo "OK"
118+
echo "OK" | tee -a ${log_file}
109119
else
110-
echo "FAIL"
120+
echo "FAIL" | tee -a ${log_file}
111121
fi
112122

113123
echo -n "from_mcs-ceSimRecoVal.fcl... "
@@ -118,80 +128,80 @@ mu2e -c validation/ceTrig.fcl -s mcs.owner.val-ceSimRecoVal.dsconf.seq.art --TFi
118128
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
119129
mu2e -c fcl/from_mcs-ceSimRecoVal.fcl -s mcs.owner.val-ceTrig.dsconf.seq.art --TFileName nts.ntuple.ceTrig.root >> ${log_file} 2>&1
120130
if [ $? == 0 ]; then
121-
echo "OK"
131+
echo "OK" | tee -a ${log_file}
122132
else
123-
echo "FAIL"
133+
echo "FAIL" | tee -a ${log_file}
124134
fi
125135

126136
echo -n "from_mcs-mockdata_separateTrkBranches.fcl... "
127137
echo "mu2e -c fcl/from_mcs-mockdata_separateTrkBranches.fcl -S ../filelists/${mock_dataset}.list --TFileName nts.ntuple.mockSepTrkBranches.root -n 100" >> ${log_file} 2>&1
128138
mu2e -c fcl/from_mcs-mockdata_separateTrkBranches.fcl -S ../filelists/${mock_dataset}.list --TFileName nts.ntuple.mockSepTrkBranches.root -n 100 >> ${log_file} 2>&1
129139
if [ $? == 0 ]; then
130-
echo "OK"
140+
echo "OK" | tee -a ${log_file}
131141
else
132-
echo "FAIL"
142+
echo "FAIL" | tee -a ${log_file}
133143
fi
134144

135145
echo -n "from_mcs-mockdata_selectorExample.fcl... "
136146
echo"mu2e -c fcl/from_mcs-mockdata_selectorExample.fcl -S ../filelists/${mock_dataset}.list --TFileName nts.ntuple.mockSelector.root -n 100" >> ${log_file} 2>&1
137147
mu2e -c fcl/from_mcs-mockdata_selectorExample.fcl -S ../filelists/${mock_dataset}.list --TFileName nts.ntuple.mockSelector.root -n 100 >> ${log_file} 2>&1
138148
if [ $? == 0 ]; then
139-
echo "OK"
149+
echo "OK" | tee -a ${log_file}
140150
else
141-
echo "FAIL"
151+
echo "FAIL" | tee -a ${log_file}
142152
fi
143153

144154
echo -n "from_mcs-primary_addVDSteps.fcl... "
145155
echo "mu2e -c fcl/from_mcs-primary_addVDSteps.fcl -S ../filelists/$primary_dataset.list --TFileName nts.ntuple.primaryVDSteps.root -n 100" >> ${log_file} 2>&1
146156
mu2e -c fcl/from_mcs-primary_addVDSteps.fcl -S ../filelists/$primary_dataset.list --TFileName nts.ntuple.primaryVDSteps.root -n 100 >> ${log_file} 2>&1
147157
if [ $? == 0 ]; then
148-
echo "OK"
158+
echo "OK" | tee -a ${log_file}
149159
else
150-
echo "FAIL"
160+
echo "FAIL" | tee -a ${log_file}
151161
fi
152162

153163

154164
echo -n "from_dig-mockdata.fcl... "
155165
echo "mu2e -c fcl/from_dig-mockdata.fcl -S ../filelists/${digi_dataset}.list --TFileName nts.ntuple.dig.root -n 100" >> ${log_file} 2>&1
156166
mu2e -c fcl/from_dig-mockdata.fcl -S ../filelists/${digi_dataset}.list --TFileName nts.ntuple.dig.root -n 100 >> ${log_file} 2>&1
157167
if [ $? == 0 ]; then
158-
echo "OK"
168+
echo "OK" | tee -a ${log_file}
159169
else
160-
echo "FAIL"
170+
echo "FAIL" | tee -a ${log_file}
161171
fi
162172

163173
echo -n "creating file for validation script... "
164174
echo "mu2e -c fcl/from_mcs-mockdata.fcl -S ../filelists/${mock_dataset}.list --TFileName nts.ntuple.after.root -n 100" >> ${log_file} 2>&1
165175
mu2e -c fcl/from_mcs-mockdata.fcl -S ../filelists/${mock_dataset}.list --TFileName nts.ntuple.after.root -n 100 >> ${log_file} 2>&1
166176
if [ $? == 0 ]; then
167-
echo "OK"
177+
echo "OK" | tee -a ${log_file}
168178
else
169-
echo "FAIL"
179+
echo "FAIL" | tee -a ${log_file}
170180
fi
171181

172182
echo -n "creating validation file... "
173183
echo "root -l -b -q validation/create_val_file_rooutil.C\(\"nts.ntuple.after.root\",\"val.ntuple.after.root\"\)" >> ${log_file} 2>&1
174184
root -l -b -q validation/create_val_file_rooutil.C\(\"nts.ntuple.after.root\",\"val.ntuple.after.root\"\) >> ${log_file} 2>&1
175185
if [ $? == 0 ]; then
176-
echo "OK"
186+
echo "OK" | tee -a ${log_file}
177187
else
178-
echo "FAIL"
188+
echo "FAIL" | tee -a ${log_file}
179189
fi
180190

181191
echo -n "from_rec-crv-vst.fcl... "
182192
echo "mu2e -c fcl/from_rec-crv-vst.fcl -S ../filelists/${crv_vst_dataset}.list --TFileName nts.ntuple.crv-vst.root -n 100" >> ${log_file} 2>&1
183193
mu2e -c fcl/from_rec-crv-vst.fcl -S ../filelists/${crv_vst_dataset}.list --TFileName nts.ntuple.crv-vst.root -n 100 >> ${log_file} 2>&1
184194
if [ $? == 0 ]; then
185-
echo "OK"
195+
echo "OK" | tee -a ${log_file}
186196
else
187-
echo "FAIL"
197+
echo "FAIL" | tee -a ${log_file}
188198
fi
189199

190200
echo -n "from_mcs-DeCalib.fcl... "
191201
echo "mu2e -c fcl/from_mcs-DeCalib.fcl -S ../filelists/${mixed_dataset}.list --TFileName nts.ntuple.deCalib.root -n 100" >> ${log_file} 2>&1
192202
mu2e -c fcl/from_mcs-DeCalib.fcl -S ../filelists/${mixed_dataset}.list --TFileName nts.ntuple.deCalib.root -n 100 >> ${log_file} 2>&1
193203
if [ $? == 0 ]; then
194-
echo "OK"
204+
echo "OK" | tee -a ${log_file}
195205
else
196-
echo "FAIL"
206+
echo "FAIL" | tee -a ${log_file}
197207
fi

0 commit comments

Comments
 (0)