Skip to content

Commit 5429cc2

Browse files
linyan-wlinyan-w
authored
Merge branch 'develop' into feature/sungbinoh_crt_pds_for_calib
2 parents c2876f2 + b865af0 commit 5429cc2

24 files changed

Lines changed: 926 additions & 77 deletions

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515

1616
cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
1717

18-
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.83.01)
18+
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.84.00.01)
1919
find_package(cetmodules REQUIRED)
2020
project(sbndcode LANGUAGES CXX)
2121

2222
# for CI:
23-
# project(sbndcode VERSION 09.83.01)
23+
# project(sbndcode VERSION 09.84.00.01)
2424

2525
message(STATUS "\n")
2626
message(STATUS "================================= ${PROJECT_NAME} =================================")

‎sbndcode/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
add_subdirectory(JobConfigurations)
33
add_subdirectory(LArSoftConfigurations)
44
add_subdirectory(Utilities)
5+
add_subdirectory(Calibration)
56
add_subdirectory(Geometry)
67
add_subdirectory(LArG4)
7-
add_subdirectory(Calibration)
8+
add_subdirectory(TPC1DSignalProcessing)
89
add_subdirectory(CRT)
910
add_subdirectory(DetectorSim)
1011
add_subdirectory(MCTruthExtractor)

‎sbndcode/Calibration/CMakeLists.txt‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,2 @@
1-
add_subdirectory(tools)
21

3-
set (MODULE_LIBRARIES
4-
larcore::Geometry_Geometry_service
5-
lardata::Utilities
6-
lardata::ArtDataHelper
7-
lardataobj::RawData
8-
lardataobj::RecoBase
9-
larevt::CalibrationDBI_Providers
10-
sbndcode_Utilities_SignalShapingServiceSBND_service
11-
art::Framework_Core
12-
art::Framework_Principal
13-
art::Framework_Services_Registry
14-
art_root_io::tfile_support ROOT::Core
15-
art_root_io::TFileService_service
16-
art::Utilities
17-
canvas::canvas
18-
messagefacility::MF_MessageLogger
19-
ROOT::Core
20-
ROOT::Tree
21-
fhiclcpp::fhiclcpp
22-
cetlib::cetlib
23-
cetlib_except::cetlib_except
24-
ROOT::Geom
25-
ROOT::XMLIO
26-
ROOT::Gdml
27-
)
28-
set (TOOL_LIBRARIES
29-
larcore::Geometry_Geometry_service
30-
lardata::Utilities
31-
lardata::ArtDataHelper
32-
lardataobj::RawData
33-
lardataobj::RecoBase
34-
sbndcode::Utilities_SignalShapingServiceSBND_service
35-
art::Framework_Core
36-
art::Framework_Principal
37-
art::Framework_Services_Registry
38-
art_root_io::tfile_support ROOT::Core
39-
art_root_io::TFileService_service
40-
art::Utilities
41-
canvas::canvas
42-
messagefacility::MF_MessageLogger
43-
ROOT::Core
44-
fhiclcpp::fhiclcpp
45-
cetlib::cetlib
46-
cetlib_except::cetlib_except
47-
ROOT::Geom
48-
ROOT::XMLIO
49-
ROOT::Gdml
50-
)
512

52-
53-
54-
55-
56-
cet_build_plugin(CalWireSBND art::module SOURCE CalWireSBND_module.cc LIBRARIES ${MODULE_LIBRARIES})
57-
58-
cet_build_plugin(HitEfficiencyAna art::module SOURCE HitEfficiencyAna_module.cc LIBRARIES ${MODULE_LIBRARIES})
59-
60-
cet_build_plugin(ROIFinderStandardSBND art::tool SOURCE ROIFinderStandardSBND_tool.cc LIBRARIES ${TOOL_LIBRARIES})
61-
62-
install_headers()
63-
install_fhicl()
64-
install_source()

‎sbndcode/Decoders/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
add_subdirectory(TPC)
22
add_subdirectory(PTB)
3-
add_subdirectory(SPECTDC)
3+
add_subdirectory(SPECTDC)
4+
add_subdirectory(PMT)

‎sbndcode/Decoders/PMT/CMakeLists.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
art_make(
2+
MODULE_LIBRARIES
3+
sbndaq_artdaq_core::sbndaq-artdaq-core_Overlays_SBND
4+
sbnobj::SBND_Timing
5+
6+
lardataobj::RecoBase
7+
8+
art_root_io::TFileService_service
9+
art_root_io::tfile_support
10+
artdaq_core::artdaq-core_Data
11+
12+
ROOT::Core
13+
ROOT::Tree
14+
15+
)
16+
17+
install_fhicl()

‎sbndcode/Decoders/PMT/PMT_to_Digitizers.txt‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
PMT Simulation ID PMT Installation ID Breakout Board # (1=Curly, 2=Larry, 3=Moe) Slot (0-47) DIGITIZER (1-8) CHANNEL (0-14) Warm Cable Transit (ns) PMT to BB Delay (ns) PMT to BB Transit (ns) BB to Digitizer Delay (ns) BB to Digitizer Transit (ns) Total Transit (ns)
2+
17 A13 1 5 1 0 112.5 3.4 144.4 -0.08 7.32 151.7
3+
71 A11 1 17 1 1 108.9 -0.4 140.6 -0.1 7.3 147.9
4+
41 A22 1 29 1 2 111.1 1.8 142.8 -0.06 7.34 150.1
5+
15 A33 1 41 1 3 109.1 -0.2 140.8 -0.1 7.3 148.1
6+
69 A31 2 4 1 4 107.1 -2.3 138.7 -0.08 7.32 146.0
7+
13 B13 2 16 1 5 110.7 2.8 143.8 -0.06 7.34 151.1
8+
67 B11 2 28 1 6 107.7 -1.9 139.1 -0.1 7.3 146.4
9+
65 B31 2 40 1 7 110.5 1.15 142.15 0.0 7.4 149.6
10+
16 V11 2 5 1 8 107.5 -1.85 139.15 -0.12 7.28 146.4
11+
70 V13 2 17 1 9 104.1 -5.55 135.45 -0.12 7.28 142.7
12+
40 V22 2 29 1 10 104.3 -5.35 135.65 -0.1 7.3 143.0
13+
14 V31 2 41 1 11 105.7 -3.7 137.3 0.0 7.4 144.7
14+
68 V33 3 5 1 12 104.1 -5.5 135.5 -0.12 7.28 142.8
15+
12 W11 3 17 1 13 108.5 -1.0 140.0 0.0 7.4 147.4
16+
66 W13 3 29 1 14 108.7 -0.65 140.35 0.0 7.4 147.8
17+
39 B22 1 7 2 0 107.5 -2.1 138.9 -0.1 7.3 146.2
18+
11 B33 1 19 2 1 103.9 -5.5 135.5 -0.12 7.28 142.8
19+
9 C13 1 31 2 2 107.5 4.4 145.4 -0.14 7.26 152.7
20+
63 C11 1 43 2 3 109.1 -0.35 140.65 -0.08 7.32 148.0
21+
37 C22 1 8 2 4 108.7 3.95 144.95 -0.12 7.28 152.2
22+
7 C33 1 20 2 5 104.5 3.15 144.15 -0.08 7.32 151.5
23+
61 C31 1 32 2 6 104.1 1.65 142.65 -0.12 7.28 149.9
24+
64 W33 1 44 2 7 103.9 -5.55 135.45 -0.08 7.32 142.8
25+
38 W22 2 8 2 8 107.5 -1.85 139.15 -0.08 7.32 146.5
26+
10 W31 2 20 2 9 111.7 2.35 143.35 -0.1 7.3 150.7
27+
8 X11 2 32 2 10 109.1 10.3 151.3 -0.08 7.32 158.6
28+
62 X13 2 44 2 11 109.7 4.05 145.05 0.0 7.4 152.5
29+
46 X22 3 8 2 12 104.1 -0.35 140.65 -0.1 7.3 148.0
30+
6 X31 3 20 2 13 107.1 3.05 144.05 -0.06 7.34 151.4
31+
60 X33 3 32 2 14 105.1 3.85 144.85 0.0 7.4 152.3
32+
95 D13 1 9 3 0 110.7 1.0 142.0 0.0 7.4 149.4
33+
149 D11 1 21 3 1 108.9 -2.3 138.7 -0.1 7.3 146.0
34+
119 D22 1 33 3 2 105.5 -4.1 136.9 -0.1 7.3 144.2
35+
93 D33 1 45 3 3 110.3 0.7 141.7 0.0 7.4 149.1
36+
147 D31 2 9 3 4 108.3 -1.4 139.6 0.0 7.4 147.0
37+
91 E13 2 21 3 5 105.5 -3.95 137.05 -0.12 7.28 144.3
38+
145 E11 2 33 3 6 105.3 -4.05 136.95 0.0 7.4 144.4
39+
143 E31 2 45 3 7 108.1 -1.6 139.4 0.0 7.4 146.8
40+
94 S11 2 10 3 8 107.7 -1.65 139.35 -0.1 7.3 146.7
41+
148 S13 2 22 3 9 110.7 1.05 142.05 -0.12 7.28 149.3
42+
118 S22 2 34 3 10 107.9 1.9 142.9 0.0 7.4 150.3
43+
92 S31 2 46 3 11 108.5 -1.2 139.8 0.0 7.4 147.2
44+
146 S33 3 9 3 12 108.5 -0.55 140.45 -0.08 7.32 147.8
45+
90 T11 3 21 3 13 104.5 -5.15 135.85 0.0 7.4 143.3
46+
144 T13 3 33 3 14 105.9 -3.25 137.75 0.0 7.4 145.2
47+
117 E22 3 10 4 0 107.5 -2.1 138.9 0.0 7.4 146.3
48+
89 E33 1 22 4 1 105.5 -3.75 137.25 -0.06 7.34 144.6
49+
87 F13 1 34 4 2 109.7 0.0 141.0 -0.08 7.32 148.3
50+
141 F11 1 46 4 3 108.5 3.15 144.15 -0.1 7.3 151.5
51+
115 F22 1 11 4 4 105.9 0.8 141.8 -0.12 7.28 149.1
52+
85 F33 1 23 4 5 108.7 11.55 152.55 -0.14 7.26 159.8
53+
139 F31 1 35 4 6 104.5 -1.9 139.1 -0.14 7.26 146.4
54+
142 T33 1 47 4 7 111.7 2.0 143.0 0.0 7.4 150.4
55+
116 T22 2 11 4 8 109.9 2.75 143.75 -0.08 7.32 151.1
56+
88 T31 2 23 4 9 107.3 -2.05 138.95 -0.08 7.32 146.3
57+
86 U11 2 35 4 10 109.9 0.0 141.0 0.0 7.4 148.4
58+
140 U13 2 47 4 11 103.9 0.05 141.05 0.0 7.4 148.5
59+
114 U22 3 11 4 12 103.9 -0.4 140.6 -0.12 7.28 147.9
60+
84 U31 3 23 4 13 104.5 1.45 142.45 0.0 7.4 149.9
61+
138 U33 3 35 4 14 103.7 -1.55 139.45 -0.08 7.32 146.8
62+
173 G13 1 0 5 0 107.7 -1.55 139.45 -0.16 7.24 146.7
63+
227 G11 1 12 5 1 105.5 -4.0 137.0 -0.16 7.24 144.2
64+
197 G22 1 24 5 2 106.7 -3.1 137.9 -0.18 7.22 145.1
65+
171 G33 1 36 5 3 112.1 2.55 143.55 -0.1 7.3 150.9
66+
225 G31 1 1 5 4 111.7 2.4 143.4 -0.14 7.26 150.7
67+
169 H13 1 13 5 5 109.1 -0.3 140.7 -0.12 7.28 148.0
68+
223 H11 1 25 5 6 107.7 -1.75 139.25 -0.16 7.24 146.5
69+
221 H31 1 37 5 7 108.7 -1.15 139.85 -0.1 7.3 147.2
70+
172 P11 2 0 5 8 107.3 -1.85 139.15 -0.1 7.3 146.5
71+
226 P13 2 12 5 9 107.9 -1.5 139.5 -0.08 7.32 146.8
72+
196 P22 2 24 5 10 108.9 -0.2 140.8 0.0 7.4 148.2
73+
170 P31 2 36 5 11 107.7 -1.9 139.1 0.0 7.4 146.5
74+
224 P33 3 0 5 12 105.9 -3.55 137.45 -0.22 7.18 144.6
75+
168 Q11 3 12 5 13 110.3 0.8 141.8 -0.16 7.24 149.0
76+
222 Q13 3 24 5 14 110.1 0.9 141.9 0.0 7.4 149.3
77+
195 H22 1 2 6 0 105.9 -3.9 137.1 -0.14 7.26 144.4
78+
167 H33 1 14 6 1 108.7 -0.95 140.05 -0.12 7.28 147.3
79+
165 I13 1 26 6 2 107.9 -1.9 139.1 -0.1 7.3 146.4
80+
19 I11 1 38 6 3 110.7 1.25 142.25 0.0 7.4 149.7
81+
193 I22 2 1 6 4 111.5 1.7 142.7 0.0 7.4 150.1
82+
163 I33 2 13 6 5 107.7 -1.3 139.7 -0.1 7.3 147.0
83+
217 I31 2 25 6 6 107.9 -1.15 139.85 -0.12 7.28 147.1
84+
220 Q33 2 37 6 7 105.7 -3.85 137.15 0.0 7.4 144.6
85+
194 Q22 2 2 6 8 107.7 -1.95 139.05 -0.14 7.26 146.3
86+
166 Q31 2 14 6 9 107.1 -2.2 138.8 -0.1 7.3 146.1
87+
164 R11 2 26 6 10 108.3 -1.3 139.7 -0.12 7.28 147.0
88+
218 R13 2 38 6 11 109.7 0.35 141.35 0.0 7.4 148.8
89+
192 R22 3 2 6 12 109.7 0.0 141.0 -0.16 7.24 148.2
90+
162 R31 3 14 6 13 110.1 0.7 141.7 -0.1 7.3 149.0
91+
216 R33 3 26 6 14 104.1 -5.55 135.45 -0.06 7.34 142.8
92+
251 J13 1 3 7 0 107.7 4.15 145.15 -0.12 7.28 152.4
93+
305 J11 1 15 7 1 113.5 -1.15 139.85 -0.12 7.28 147.1
94+
275 J22 1 27 7 2 108.1 -1.7 139.3 -0.14 7.26 146.6
95+
249 J33 1 39 7 3 111.3 1.85 142.85 -0.08 7.32 150.2
96+
303 J31 1 4 7 4 104.5 -5.1 135.9 -0.08 7.32 143.2
97+
247 K13 1 16 7 5 107.1 -2.95 138.05 -0.14 7.26 145.3
98+
301 K11 1 28 7 6 108.3 -1.05 139.95 -0.14 7.26 147.2
99+
299 K31 1 40 7 7 106.1 -3.55 137.45 -0.08 7.32 144.8
100+
250 M11 2 3 7 8 na -5.5 135.5 0.06 7.46 143.0
101+
304 M13 2 15 7 9 108.9 -1.1 139.9 -0.12 7.28 147.2
102+
274 M22 2 27 7 10 105.7 -4.0 137.0 -0.1 7.3 144.3
103+
248 M31 2 39 7 11 109.5 -0.25 140.75 0.0 7.4 148.2
104+
302 M33 3 3 7 12 104.7 -5.4 135.6 -0.14 7.26 142.9
105+
247 N11 3 15 7 13 106.5 -3.1 137.9 -0.08 7.32 145.2
106+
300 N13 3 27 7 14 106.1 -3.55 137.45 -0.08 7.32 144.8
107+
273 K22 1 6 8 0 110.1 0.35 141.35 -0.14 7.26 148.6
108+
245 K33 1 18 8 1 107.9 -1.55 139.45 -0.2 7.2 146.7
109+
243 L13 1 30 8 2 104.7 -5.1 135.9 -0.18 7.22 143.1
110+
297 L11 1 42 8 3 104.5 -5.15 135.85 -0.1 7.3 143.2
111+
271 L22 2 6 8 4 108.9 -0.65 140.35 -0.1 7.3 147.7
112+
241 L33 2 18 8 5 108.1 -1.1 139.9 -0.14 7.26 147.2
113+
295 L31 2 30 8 6 112.7 3.1 144.1 -0.12 7.28 151.4
114+
298 N33 2 42 8 7 106.1 -3.9 137.1 0.0 7.4 144.5
115+
272 N22 2 7 8 8 107.3 -2.75 138.25 0.0 7.4 145.7
116+
244 N31 2 19 8 9 106.9 -3.1 137.9 -0.12 7.28 145.2
117+
242 O11 2 31 8 10 105.9 -3.7 137.3 -0.1 7.3 144.6
118+
296 O13 2 43 8 11 109.7 0.0 141.0 0.0 7.4 148.4
119+
70 O22 3 6 8 12 109.3 -0.6 140.4 -0.16 7.24 147.6
120+
240 O31 3 18 8 13 107.9 -1.8 139.2 0.0 7.4 146.6
121+
294 O33 3 30 8 14 109.5 0.0 141.0 -0.1 7.3 148.3

0 commit comments

Comments
 (0)