Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature module1 reflow #124

Merged
merged 34 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a00758a
make calib_prompt_hits.py work for data
diaza Jan 13, 2024
f705f4d
have event display sort event's TPC by io_group instead of position
diaza Jan 13, 2024
743116a
Revert "Remove channel-by-channel timestamp"
diaza Jan 13, 2024
edd9c27
add max_contrib_segments to CalibHitBuilder. Won't run otherwise
diaza Jan 15, 2024
f4d3905
Update run flow script
diaza Jan 15, 2024
a64e7eb
Prepare for another batch
diaza Feb 2, 2024
d3ec9b3
Use Karolina's derived time stamp correctors
diaza Feb 9, 2024
70a68c2
Revert some charge2light lines to work for single module
diaza Feb 9, 2024
20d1e9b
Add lrs geometry file Angela provided
diaza Feb 9, 2024
fc26ada
Add CL matching to workflow
diaza Feb 9, 2024
e3ad549
Update notes.rst
diaza Feb 15, 2024
759e439
Remove mc info from flowed data
diaza Mar 5, 2024
f9ed7f6
Add files to generate wvfm deconv input files
diaza Mar 8, 2024
41c0e82
Update wvfm deconv input files for Module1
diaza Mar 8, 2024
248e762
create module1 specific charge light matching files
diaza Apr 2, 2024
440a383
Updated the gain values to the 2x2 sim values
diaza Apr 2, 2024
a7137ed
Include light flow scripts that keep wvfm info
diaza Apr 2, 2024
adf3904
Replace gains with ones calculated from module1 specific callibrations
diaza Apr 3, 2024
b9b9431
Modified threshold values for sipm hits and sum hits
diaza Apr 4, 2024
54ab5b8
Merge branch 'develop' into feature_module1_reflow
diaza Apr 9, 2024
1793ce8
give module1 hit_finder hit level vars
diaza Apr 10, 2024
2462845
Add detector geo yaml file to repo
diaza Apr 11, 2024
be817ca
Center TPC to origin in yaml
diaza Apr 11, 2024
e9550ca
Update light module description yaml
diaza Apr 11, 2024
3e89987
Create module specific ADC64 event generator
diaza Apr 18, 2024
04a715b
Modify light parameter dimensions
diaza Apr 19, 2024
bfcc0ea
Revert "Revert some charge2light lines to work for single module"
diaza Apr 19, 2024
63c75f4
Set clock_timestamp_factor = 1, fixes CL matching
diaza Apr 24, 2024
503d3ce
Small change to event display
diaza May 2, 2024
6833b9f
Formatting
diaza May 2, 2024
341500c
module3: Update LightADC64EventGenerator.yaml
AWh1t3 May 13, 2024
b17485b
Temporary Change
AWh1t3 May 14, 2024
9d495b4
Revert "Temporary Change"
diaza May 17, 2024
a07a134
Minor name change
diaza May 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 126 additions & 0 deletions data/module1_flow/light_module_desc-0.1.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
format_version: "0.0.0"
geometry_version: "0.0.0"

geom:
# ArcLight
0: { min: [0, -155.09749, -152.155], max: [0, +155.09749, +152.155] }
# LCM
1: { min: [0, -51.69916, -152.155], max: [0, +51.69916, +152.155] }

tpc_center:
0: [0, 0, -152.155]
1: [0, 0, +152.155]

det_center:
0: [-310.19498, -465.2924, 0.0]
1: [-310.19498, -258.4958, 0.0]
2: [-310.19498, -155.0975, 0.0]
3: [-310.19498, -51.6992, 0.0]
4: [-310.19498, 155.0975, 0.0]
5: [-310.19498, 361.8941, 0.0]
6: [-310.19498, 465.2925, 0.0]
7: [-310.19498, 568.6908, 0.0]
8: [ 310.19498, -465.2924, 0.0]
9: [ 310.19498, -258.4958, 0.0]
10: [310.19498, -155.0975, 0.0]
11: [310.19498, -51.6992, 0.0]
12: [310.19498, 155.0975, 0.0]
13: [310.19498, 361.8941, 0.0]
14: [310.19498, 465.2925, 0.0]
15: [310.19498, 568.6908, 0.0]

det_geom:
0: 0
1: 1
2: 1
3: 1
4: 0
5: 1
6: 1
7: 1
8: 0
9: 1
10: 1
11: 1
12: 0
13: 1
14: 1
15: 1

det_adc:
0:
# -x, increasing y
0: 0
1: 0
2: 0
3: 0
4: 0
5: 0
6: 0
7: 0
# +x, increasing y
8: 1
9: 1
10: 1
11: 1
12: 1
13: 1
14: 1
15: 1

1:
# -x, increasing y
0: 1
1: 1
2: 1
3: 1
4: 1
5: 1
6: 1
7: 1
# +x, increasing y
8: 0
9: 0
10: 0
11: 0
12: 0
13: 0
14: 0
15: 0

det_chan:
0:
0: [4,5,6,7,8,9]
1: [10,11]
2: [12,13]
3: [14,15]
4: [20,21,22,23,24,25]
5: [26,27]
6: [28,29]
7: [30,31]
8: [36,37,38,39,40,41]
9: [42,43]
10: [44,45]
11: [46,47]
12: [52,53,54,55,56,57]
13: [58,59]
14: [60,61]
15: [62,63]

1:
0: [4,5,6,7,8,9]
1: [10,11]
2: [12,13]
3: [14,15]
4: [20,21,22,23,24,25]
5: [26,27]
6: [28,29]
7: [30,31]
8: [36,37,38,39,40,41]
9: [42,43]
10: [44,45]
11: [46,47]
12: [52,53,54,55,56,57]
13: [58,59]
14: [60,61]
15: [62,63]
202 changes: 202 additions & 0 deletions data/module1_flow/light_module_desc-0.2.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
format_version: "0.2.0"
geometry_version: "0.2.0"

geom:
# ArcLight
0: { min: [-15.14 , -15.51, 0], max: [+12.03, +15.51, 0] }
# LCM
1: { min: [-15.14 , -5.17, 0], max: [+12.03, +5.17, 0] }

tpc_center_offset:
0: [+15.30, 0, 0]
1: [-15.30, 0, 0]

det_center:
0: [0, -46.53, -31.49]
1: [0, -25.85, -31.49]
2: [0, -15.51, -31.49]
3: [0, -5.16, -31.49]
4: [0, 15.51, -31.49]
5: [0, 36.19, -31.49]
6: [0, 46.53, -31.49]
7: [0, 56.87, -31.49]
8: [0, -46.53, +31.49]
9: [0, -25.84, +31.49]
10: [0, -15.51, +31.49]
11: [0, -5.17, +31.49]
12: [0, 15.51, +31.49]
13: [0, 36.19, +31.49]
14: [0, 46.53, +31.49]
15: [0, 56.87, +31.49]

sipm_center:
0: [15.14, -60.07, -31.49]
1: [15.14, -55.37, -31.49]
2: [15.14, -48.87, -31.49]
3: [15.14, -44.17, -31.49]
4: [15.14, -37.67, -31.49]
5: [15.14, -32.97, -31.49]
6: [15.14, -29.07, -31.49]
7: [15.14, -24.37, -31.49]
8: [15.14, -17.87, -31.49]
9: [15.14, -13.17, -31.49]
10: [15.14, -6.67, -31.49]
11: [15.14, -1.97, -31.49]
12: [15.14, 1.97, -31.49]
13: [15.14, 6.67, -31.49]
14: [15.14, 13.17, -31.49]
15: [15.14, 17.87, -31.49]
16: [15.14, 24.37, -31.49]
17: [15.14, 29.07, -31.49]
18: [15.14, 32.97, -31.49]
19: [15.14, 37.67, -31.49]
20: [15.14, 44.17, -31.49]
21: [15.14, 48.87, -31.49]
22: [15.14, 55.37, -31.49]
23: [15.14, 60.07, -31.49]
24: [15.14, -60.07, 31.49]
25: [15.14, -55.37, 31.49]
26: [15.14, -48.87, 31.49]
27: [15.14, -44.17, 31.49]
28: [15.14, -37.67, 31.49]
29: [15.14, -32.97, 31.49]
30: [15.14, -29.07, 31.49]
31: [15.14, -24.37, 31.49]
32: [15.14, -17.87, 31.49]
33: [15.14, -13.17, 31.49]
34: [15.14, -6.67, 31.49]
35: [15.14, -1.97, 31.49]
36: [15.14, 1.97, 31.49]
37: [15.14, 6.67, 31.49]
38: [15.14, 13.17, 31.49]
39: [15.14, 17.87, 31.49]
40: [15.14, 24.37, 31.49]
41: [15.14, 29.07, 31.49]
42: [15.14, 32.97, 31.49]
43: [15.14, 37.67, 31.49]
44: [15.14, 44.17, 31.49]
45: [15.14, 48.87, 31.49]
46: [15.14, 55.37, 31.49]
47: [15.14, 60.07, 31.49]

ch_to_vert_bin: # 0:ACL 1:LCM
0: [-1,-1,-1,-1,0,1,2,3,4,5,12,13,14,15,16,17,-1,-1,-1,-1,0,1,2,3,4,5,12,13,14,15,16,17, -1,-1,-1,-1,0,1,2,3,4,5,12,13,14,15,16,17,-1,-1,-1,-1,0,1,2,3,4,5,12,13,14,15,16,17]
1: [-1,-1,-1,-1,6,7,8,9,10,11,18,19,20,21,22,23,-1,-1,-1,-1,6,7,8,9,10,11,18,19,20,21,22,23,-1,-1,-1,-1,6,7,8,9,10,11,18,19,20,21,22,23,-1,-1,-1,-1,6,7,8,9,10,11,18,19,20,21,22,23]

adc_to_det_type:
0: 0
1: 1

det_side: #TPC side 0: -z direction 1: +z direction
0: 0
1: 0
2: 0
3: 0
4: 0
5: 0
6: 0
7: 0
8: 1
9: 1
10: 1
11: 1
12: 1
13: 1
14: 1
15: 1

det_geom:
0: 0
1: 1
2: 1
3: 1
4: 0
5: 1
6: 1
7: 1
8: 0
9: 1
10: 1
11: 1
12: 0
13: 1
14: 1
15: 1

det_adc:
0: #TPC
# -z, increasing y (det-> adc)
0: 0
1: 1
2: 1
3: 1
4: 0
5: 1
6: 1
7: 1
# +z, increasing y
8: 0
9: 1
10: 1
11: 1
12: 0
13: 1
14: 1
15: 1

1:
# -z, increasing y
0: 0
1: 1
2: 1
3: 1
4: 0
5: 1
6: 1
7: 1
# +z, increasing y
8: 0
9: 1
10: 1
11: 1
12: 0
13: 1
14: 1
15: 1

det_chan:
0:
0: [4,5,6,7,8,9]
1: [4,5]
2: [6,7]
3: [8,9]
4: [10,11,12,13,14,15]
5: [10,11]
6: [12,13]
7: [14,15]
8: [20,21,22,23,24,25]
9: [20,21]
10: [22,23]
11: [24,25]
12: [26,27,28,29,30,31]
13: [26,27]
14: [28,29]
15: [30,31]

1:
0: [52,53,54,55,56,57]
1: [52,53]
2: [54,55]
3: [56,57]
4: [58,59,60,61,62,63]
5: [58,59]
6: [60,61]
7: [62,63]
8: [36,37,38,39,40,41]
9: [36,37]
10: [38,39]
11: [40,41]
12: [42,43,44,45,46,47]
13: [42,43]
14: [44,45]
15: [46,47]
50 changes: 50 additions & 0 deletions data/module1_flow/module0.yaml
diaza marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Argon properties
temperature: 87.17 # K
e_field: 0.50 # kV/cm
lifetime: 2.6e+3 # us
long_diff: 4.0e-6 # cm * cm / us
tran_diff: 8.8e-6 # cm * cm / us
singlet_fraction: 0.375
tau_s: 0.001 # us
tau_t: 0.752 # us
#tau_t: 0.620 # us

# Charge simulation parameters
drift_length: 30.27225 # cm
time_interval: [0, 200.] # us
response_sampling: 0.1 # us
#response_sampling: 0.05 # us
reponse_bin_size: 0.04434 # cm
time_padding: 190 # us
time_window: 189.1 # us

# Charge geometry parameters
tpc_offsets: # cm
- [0, 0, 0]
tile_map:
- [[7,5,3,1],[8,6,4,2]]
- [[16,14,12,10],[15,13,11,9]]
module_to_io_groups:
1: [1,2]

# Light simulation parameters
light_gain: [-5.2589, -5.1955, -5.1616, -5.0982, -5.6851, -5.6870, -58.5344, -58.1440, -58.7968, -59.8208, -55.1488, -57.2672, -5.5680, -5.2243, -5.4509, -5.4291, -5.2672, -5.4278, -57.8816, -54.9824, -54.2272, -54.5856, -56.7616, -58.1696, -5.1424, -6.1382, -6.2451, -5.9392, -4.9338, -5.0266, -51.6864, -50.1568, -49.3440, -51.5904, -48.4992, -46.8160, -6.0134, -6.3974, -6.0077, -6.1254, -6.1280, -6.2048, -0.0000, -0.0000, -0.0000, -0.0000, -0.0000, -0.0000, -5.8694, -5.9027, -5.9392, -6.0058, -6.0083, -6.0454, -59.9296, -61.7792, -63.2704, -60.4672, -61.1776, -60.7680, -6.7821, -6.8288, -6.7693, -6.9325, -6.7930, -6.7757, -55.9552, -57.2032, -56.1856, -53.5232, -59.9296, -0.0000, -6.2221, -6.0813, -6.0646, -6.2138, -6.2310, -6.3558, -42.9824, -41.6768, -51.2832, -49.4976, -42.1312, -44.9792, -6.1901, -0.0000, -5.9878, -5.8035, -6.1069, -6.4064, -0.0000, -55.6160, -56.4864, -55.6416, -54.8032, -55.4816] # PE/us / ADC
sipm_response_model: 1 # arbitrary impulse
impulse_model: 'larndsim/bin/sipm_impulse.npy'
impulse_tick_size: 0.01 # us

light_det_noise_sample_spacing: 0.01 # us
light_trig_threshold: [
-1500, -9e+9, -1500, -9e+9, -1500, -9e+9, -1500, -9e+9, -1500, -9e+9, -1500, -9e+9, -1500, -9e+9, -1500, -9e+9] # ArcLight=~no trigger, LCM=-1500 ADC, every 6 channels summed
light_trig_window: [0.9, 1.66] # us
light_nbit: 10
op_channel_efficiency: [0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38] # ad hoc PDE scale factor to better improve data/sim agreement

# Light geometry parameters
n_op_channel: 96
tpc_to_op_channel:
- [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47]
- [48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95]
module_to_tpcs:
1: [0, 1]
lut_vox_div: [14, 26, 8]
Binary file added data/module1_flow/noise_power.npz
Binary file not shown.
Binary file not shown.
Binary file added data/module1_flow/wvfm_deconv_signal_power.npz
Binary file not shown.
Loading
Loading