Skip to content

Commit a495773

Browse files
bear-is-asleepbear-is-asleep
authored
Merge pull request #499 from SBNSoftware/feature/lkashur_crt_colwires_gdml_fix
Feature/lkashur crt colwires gdml fix
2 parents ad265e6 + 5bf286f commit a495773

9 files changed

Lines changed: 96074 additions & 26 deletions

File tree

‎sbndcode/ChannelMaps/TPC/SBNDTPCChannelMap_v2.txt‎

Lines changed: 11264 additions & 0 deletions
Large diffs are not rendered by default.

‎sbndcode/ChannelMaps/TPC/TPCChannelMapService.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BEGIN_PROLOG
33
SBNDTPCChannelMapServiceDefaults: {
44
UseHWDB: false # if true, read map data from the hardware database
55
ReadMapFromFile: true # if true, read map data from a file
6-
FileName: "SBNDTPCChannelMap_v1.txt"
6+
FileName: "SBNDTPCChannelMap_v2.txt"
77
}
88

99
END_PROLOG

‎sbndcode/Geometry/GeometryWrappers/CRTGeoAlg.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ namespace sbnd::crt {
169169
orientation = (modulePosMother[2] > 0);
170170

171171
// Location of SiPMs
172-
if(CRTCommonUtils::GetTaggerEnum(taggerName) == kBottomTagger || CRTCommonUtils::GetTaggerEnum(taggerName) == kNorthTagger)
172+
if(CRTCommonUtils::GetTaggerEnum(taggerName) == kBottomTagger || CRTCommonUtils::GetTaggerEnum(taggerName) == kNorthTagger
173+
|| CRTCommonUtils::GetTaggerEnum(taggerName) == kWestTagger || CRTCommonUtils::GetTaggerEnum(taggerName) == kEastTagger)
173174
top = (orientation == 1) ? (modulePosMother[1] > 0) : (modulePosMother[0] < 0);
174175
else
175176
top = (orientation == 0) ? (modulePosMother[1] > 0) : (modulePosMother[0] < 0);

‎sbndcode/Geometry/gdml/sbnd_v02_02.gdml‎

Lines changed: 61955 additions & 0 deletions
Large diffs are not rendered by default.

‎sbndcode/Geometry/gdml/sbnd_v02_02_base.gdml‎

Lines changed: 6610 additions & 0 deletions
Large diffs are not rendered by default.

‎sbndcode/Geometry/gdml/sbnd_v02_02_nowires.gdml‎

Lines changed: 16229 additions & 0 deletions
Large diffs are not rendered by default.

‎sbndcode/Geometry/geometry_sbnd.fcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353

5454
BEGIN_PROLOG
5555

56-
sbnd_geometry_file: "sbnd_v02_01.gdml"
57-
sbnd_geometry_file_nowires: "sbnd_v02_01_nowires.gdml"
56+
sbnd_geometry_file: "sbnd_v02_02.gdml"
57+
sbnd_geometry_file_nowires: "sbnd_v02_02_nowires.gdml"
5858

5959

6060
#

‎sbndcode/Utilities/badchannels_sbnd.fcl‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,12 @@
44
BEGIN_PROLOG
55

66
#Missing collection plane wires in the jumpered region
7-
sbnd_badchannels_tpc0_plane2_missing_jumpered: [ 4802, 4803, 4804, 4805, 4806, 4807 ]
8-
sbnd_badchannels_tpc1_plane2_missing_jumpered: [ 10440, 10441, 10442, 10443, 10444, 10445 ]
7+
sbnd_badchannels_tpc0_plane2_missing_jumpered: [ 4800, 4801, 4802, 4803, 4804, 4805 ]
8+
sbnd_badchannels_tpc1_plane2_missing_jumpered: [ 10438, 10439, 10440, 10441, 10442, 10443 ]
99

1010
#Missing wires where the combs are located
11-
sbnd_badchannels_tpc0_plane2_missing_combs: [ 4399, 5221 ]
12-
sbnd_badchannels_tpc1_plane2_missing_combs: [ 10037, 10859 ]
13-
14-
#Missing wires at the extreme ends of the channel numbers
15-
sbnd_badchannels_tpc0_plane0_missing_extremities: [ 0, 1, 2, 1983, 1984, 1985 ]
16-
sbnd_badchannels_tpc0_plane1_missing_extremities: [ 1986, 1987, 1988, 3969, 3970, 3971 ]
17-
sbnd_badchannels_tpc1_plane0_missing_extremities: [ 5638, 5639, 5640, 7621, 7622, 7623 ]
18-
sbnd_badchannels_tpc1_plane1_missing_extremities: [ 7624, 7625, 7626, 9607, 9608, 9609 ]
19-
11+
sbnd_badchannels_tpc0_plane2_missing_combs: [ 4374, 5231 ]
12+
sbnd_badchannels_tpc1_plane2_missing_combs: [ 10012, 10869 ]
2013

2114

2215
#################################################################################
@@ -35,17 +28,17 @@ sbnd_data_badchannels_east_dead_femb: [
3528
]
3629

3730
#Shorted channels
38-
sbnd_data_badchannels_west_plane0_shorted: [ 7163 ]
39-
sbnd_data_badchannels_west_plane1_shorted: [ 8372 ]
31+
sbnd_data_badchannels_west_plane0_shorted: [ 7169 ]
32+
sbnd_data_badchannels_west_plane1_shorted: [ 8378 ]
4033

4134
#No response from channels
42-
sbnd_data_badchannels_no_response: [ 546, 607, 8568 ]
35+
sbnd_data_badchannels_no_response: [ 546, 607, 8574 ]
4336

4437
#noisy channels
45-
sbnd_data_badchannels_noisy: [ 5054, 5630, 5631 ]
38+
sbnd_data_badchannels_noisy: [ 5060, 5636, 5637 ]
4639

4740
#Missing wires where the combs are located (in data)
48-
sbnd_data_badchannels_east_plane2_missing_combs: [ 4374, 5225 ]
49-
sbnd_data_badchannels_west_plane2_missing_combs: [ 10006, 10857 ]
41+
sbnd_data_badchannels_east_plane2_missing_combs: [ 4374, 5231 ]
42+
sbnd_data_badchannels_west_plane2_missing_combs: [ 10012, 10869 ]
5043

5144
END_PROLOG

‎sbndcode/Utilities/channelstatus_sbnd.fcl‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ sbnd_channelstatus: {
1414
@sequence::sbnd_badchannels_tpc0_plane2_missing_jumpered,
1515
@sequence::sbnd_badchannels_tpc1_plane2_missing_jumpered,
1616
@sequence::sbnd_badchannels_tpc0_plane2_missing_combs,
17-
@sequence::sbnd_badchannels_tpc1_plane2_missing_combs,
18-
@sequence::sbnd_badchannels_tpc0_plane0_missing_extremities,
19-
@sequence::sbnd_badchannels_tpc0_plane1_missing_extremities,
20-
@sequence::sbnd_badchannels_tpc1_plane0_missing_extremities,
21-
@sequence::sbnd_badchannels_tpc1_plane1_missing_extremities
17+
@sequence::sbnd_badchannels_tpc1_plane2_missing_combs
2218
]
2319

2420
# list of bad noisy channels:

0 commit comments

Comments
 (0)