Skip to content

Commit 3704217

Browse files
author
ocerri
committed
Ops changes
1 parent d3aecd4 commit 3704217

File tree

5 files changed

+52
-4
lines changed

5 files changed

+52
-4
lines changed

DQM_SiPM.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ def define_range_around_peak(h, perc = [0.4, 0.4], Range=[0.0, 99999.0]):
111111
if len(args.input_file) > 1:
112112
aux = re.search(r'Run[0-9]+', args.input_file[-1])
113113
flag += '_'+aux.group(0)[3:]
114+
elif len(args.runs_interval)==1:
115+
N = args.runs_interval[0]
116+
args.input_file = [args.input_file[0].replace('XXX', str(N))]
117+
flag = '_'+str(N)
114118
elif len(args.runs_interval)==2:
115119
deduced_file_list = []
116120
for i in range(args.runs_interval[0], args.runs_interval[1]+1):
@@ -202,7 +206,7 @@ def define_range_around_peak(h, perc = [0.4, 0.4], Range=[0.0, 99999.0]):
202206

203207
amp_aux = np.concatenate(list(tree2array( chain, 'amp['+str(k)+']')))
204208

205-
h = rt.TH1D(name, title, 80, np.percentile(amp_aux, 1), min(990., np.percentile(amp_aux, 99.9)))
209+
h = rt.TH1D(name, title, 80, np.percentile(amp_aux, 1), min(990., np.percentile(amp_aux, 99.99)))
206210
h.SetXTitle('Peak amplitude [mV]')
207211
h.SetYTitle('Events / {:.1f} mV'.format(h.GetBinWidth(1)))
208212
chain.Project(name, 'amp['+str(k)+']')
@@ -427,6 +431,8 @@ def define_range_around_peak(h, perc = [0.4, 0.4], Range=[0.0, 99999.0]):
427431
canvas['space_corr'][k].Divide(2)
428432

429433
selection += ' && ntracks == 1 && chi2 < 8'
434+
if chain.GetEntries(selection) == 0:
435+
continue
430436
delta_t = np.concatenate(list(tree2array(chain, var_dT, selection)))
431437

432438
add_sel = ''

config/FNAL_TB_1811/VME_v3.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ch_num idx_time idx_dut idx_ref var_ref amp_min amp_max
55
0 0 0 -1 gaus_mean 20 240
66
1 0 0 0 LP2_20 100 600
7-
2 0 0 0 LP2_20 100 600
7+
2 0 0 0 LP2_20 400 1200
88
3 0 0 0 LP2_20 100 600
99
4 0 0 0 LP2_20 400 1200
1010
5 0 0 0 LP2_20 100 800
@@ -16,5 +16,5 @@ ch_num idx_time idx_dut idx_ref var_ref amp_min amp_max
1616
12 2 0 -1 LP2 20 200
1717
13 2 0 -1 LP2 20 200
1818
14 2 0 -1 None 20 200
19-
15 2 0 -1 None 20 200
20-
16 2 0 -1 None 20 200
19+
15 2 0 -1 None 400 1200
20+
16 2 0 -1 None 100 850

config/FNAL_TB_1811/VME_v4.txt

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#-->Print: Amp PosRaw PosWeight TimeResRaw TimeCorrected
2+
-->Print: Amp PosRaw PosWeight WaveColor TimeResRaw TimeCorrected
3+
-->XYcenter-width: 20 20 30
4+
ch_num idx_time idx_dut idx_ref var_ref amp_min amp_max
5+
0 0 0 -1 gaus_mean 20 240
6+
1 0 0 0 LP2_20 300 800
7+
2 0 0 0 LP2_20 40 1200
8+
3 0 0 0 LP2_20 40 600
9+
4 0 0 0 LP2_20 80 1200
10+
5 0 0 0 LP2_20 80 800
11+
6 0 0 -1 LP2_20 800 1200
12+
7 0 0 -1 LP2_20 800 1200
13+
9 2 0 -1 gaus_mean 20 200
14+
10 2 0 -1 None 20 300
15+
11 2 0 -1 None 20 300
16+
12 2 0 -1 None 20 200
17+
13 2 0 -1 None 20 200
18+
14 2 0 -1 None 20 200
19+
15 2 0 -1 None 20 1200
20+
16 2 0 -1 None 20 850
21+
18 2 0 -1 gaus_mean 20 200
22+
19 2 0 -1 None 20 300
23+
20 2 0 18 LP2_20 20 300
24+
21 2 0 18 LP2_20 20 200
25+
22 2 0 18 LP2_20 20 200
26+
23 2 0 -1 None 20 200
27+
24 2 0 -1 None 20 1200
28+
25 2 0 18 LP2_20 20 200
29+
26 2 0 18 LP2_20 20 200
30+
27 2 0 18 LP2_20 20 200
31+
28 2 0 18 LP2_20 20 200
32+
29 2 0 18 LP2_20 20 200
33+
30 2 0 18 LP2_20 20 200
34+
31 2 0 18 LP2_20 20 200
35+
32 2 0 18 LP2_20 20 200
36+
33 2 0 18 LP2_20 20 200
37+
34 2 0 -1 None 200 1200

lib/histo_utilities.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ def create_TH1D(x, name='h', title=None, binning=[None, None, None], weights=Non
1919
bin_w = 4*(np.percentile(x,75) - np.percentile(x,25))/(len(x))**(1./3.)
2020
if bin_w == 0:
2121
bin_w = 0.5*np.std(x)
22+
if bin_w == 0:
23+
bin_w = 1
2224
binning[0] = int((binning[2] - binning[1])/bin_w) + 5
2325

2426
h = rt.TH1D(name, title, binning[0], binning[1], binning[2])

runDQM.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source ~/.bash_profile
2+
cd /Users/fqnet1/FNAL_TB/18_11/DataQualityMonitor
3+
python DQM_SiPM.py -C config/FNAL_TB_1811/VME_v3.txt -S ~/cernbox/ocerri/www/FNAL_TB_1811/ -i ../data/VME/RECO/v3/DataVMETiming_RunXXX.root -N $1

0 commit comments

Comments
 (0)