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.

Sign up for GitHub

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/ehinkle geo resource charge coord fix #86

Merged
merged 20 commits into from
Dec 16, 2023
Merged

Feature/ehinkle geo resource charge coord fix #86

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0df6661
Renaming methods in proto_nd_flow/resource/geometry.py which specify …
Nov 7, 2023
1974342
Updating coordinate names within proto_nd_flow/resources/geometry.py …
Nov 7, 2023
f631ed5
Updating drift coordinate to x (from z) in in_fid, regions, and _crea…
Nov 7, 2023
cf30ca1
Adding up-to-date 2x2 geometry yamls to proto_nd_flow data directory.
Nov 10, 2023
403781b
Updating description in geometry.py to reflect x/z coordinate switch.
Nov 15, 2023
5893521
Updating geometry.py to save accurate drift regions as an attribute t…
Nov 17, 2023
6b70fc2
Updating geometry.pin_fid() method in proto_nd_flow.
Nov 17, 2023
526cf1c
Updating in_fid() method in geometry.py in proto_nd_flow based on val…
Nov 20, 2023
47c1e62
Updating description and use of drift_dir attribute calculated in pro…
Nov 25, 2023
39898c8
Updating Geometry resource in proto_nd_flow to include lar_detector_b…
Nov 25, 2023
9a48d08
Adding beam_direction and drift_direction attrs, updating in_fid() me…
Nov 27, 2023
15ca88b
Changing units in proto_nd_flow Geometry module attributes and datase…
Nov 27, 2023
bc8699d
Fixing drift region definition bug in proto_nd_flow Geometry module i…
Nov 29, 2023
2105125
Removing print statements from proto_nd_flow Geometry module and addi…
Nov 29, 2023
913fa49
Changing variable initialization within _load_charge_geometry() metho…
Dec 15, 2023
9393d6d
Creating helper method to set module_RO_bounds attribute in _load_cha…
Dec 15, 2023
67676c1
Merge branch 'develop' into feature/ehinkle_geo_resource_charge_coord…
edhinkle Dec 15, 2023
ce49280
Removing comments in proto_nd_flow Geometry module.
Dec 15, 2023
7674fc9
Manually merging origin geometry resource charge fix feature branch i…
Dec 15, 2023
e68a592
Removing outdated pixel layout file from data/proto_nd_flow.
Dec 16, 2023
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
55 changes: 55 additions & 0 deletions data/proto_nd_flow/2x2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
temperature: 87.17 # K
e_field: 0.50 # kV/cm
lifetime: 2.2e+3 # us
time_interval: [0, 200.] # us
long_diff: 4.0e-6 # cm * cm / us
tran_diff: 8.8e-6 # cm * cm / us
drift_length: 30.27225 # cm
response_sampling: 0.1 # us
reponse_bin_size: 0.04434 # cm
time_padding: 190 # us
time_window: 189.1 # us
tpc_offsets: # cm
- [33.5, -268, 1333.5]
- [33.5, -268, 1266.5]
- [-33.5, -268, 1333.5]
- [-33.5, -268, 1266.5]
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]
2: [3, 4]
3: [5, 6]
4: [7, 8]

# Light geometry parameters
module_to_tpcs:
1: [0, 1]
2: [2, 3]
3: [4, 5]
4: [6, 7]
n_op_channel: 384
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]
- [96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143]
- [144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191]
- [192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239]
- [240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287]
- [288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335]
- [336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383]

# Light simulation parameters
singlet_fraction: 0.3
tau_s: 0.001 # us
tau_t: 1.530 # us
op_channel_efficiency: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
light_gain: [-7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0, -7.0] # ADC us / PE
light_det_noise_sample_spacing: 0.016 # us
light_trig_threshold: [-4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000, -4500, -2000]
light_trig_mode: 1
light_window: [0, 16] # us
light_trig_window: [1.6, 14.4] # us
light_digit_sample_spacing: 0.016 # us
light_nbit: 14
126 changes: 126 additions & 0 deletions data/proto_nd_flow/light_module_desc-0.0.0.yaml
View file
Open in desktop
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: [2,3,4,5,6,7]
1: [9,10]
2: [11,12]
3: [13,14]
4: [18,19,20,21,22,23]
5: [25,26]
6: [27,28]
7: [29,30]
8: [34,35,36,37,38,39]
9: [41,42]
10: [43,44]
11: [45,46]
12: [50,51,52,53,54,55]
13: [57,58]
14: [59,60]
15: [61,62]

1:
0: [2,3,4,5,6,7]
1: [9,10]
2: [11,12]
3: [13,14]
4: [18,19,20,21,22,23]
5: [25,26]
6: [27,28]
7: [29,30]
8: [34,35,36,37,38,39]
9: [41,42]
10: [43,44]
11: [45,46]
12: [50,51,52,53,54,55]
13: [57,58]
14: [59,60]
15: [61,62]
Loading
Loading