Skip to content

Commit dfb36b8

Browse files
authored
Merge pull request #48123 from mmusich/patch-1
Geometry/TrackerGeometryBuilder/README.md: fix `subDetId` typo
2 parents 5b9a212 + 6e2b964 commit dfb36b8

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

Geometry/TrackerGeometryBuilder/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ of these methods for the three scenarios available so far are described in the t
3939

4040
* Present detector
4141

42-
| `DetId::subDetId()` | `TrackerGeometry::geomDetSubDetector(subdet)` | `TrackerGeometry::numberOfLayers(subdet)` |
42+
| `DetId::subdetId()` | `TrackerGeometry::geomDetSubDetector(subdet)` | `TrackerGeometry::numberOfLayers(subdet)` |
4343
|--------|--------|-------|
4444
| 1 | `GeomDetEnumerators::PixelBarrel` | 3 |
4545
| 2 | `GeomDetEnumerators::PixelEndcap` | 2 |
@@ -50,7 +50,7 @@ of these methods for the three scenarios available so far are described in the t
5050

5151
* Phase1 Tracker
5252

53-
| `DetId::subDetId()` | `TrackerGeometry::geomDetSubDetector(subdet)` | `TrackerGeometry::numberOfLayers(subdet)` |
53+
| `DetId::subdetId()` | `TrackerGeometry::geomDetSubDetector(subdet)` | `TrackerGeometry::numberOfLayers(subdet)` |
5454
|--------|--------|-------|
5555
| 1 | `GeomDetEnumerators::P1PXB` | 4 |
5656
| 2 | `GeomDetEnumerators::P1PXEC` | 3 |
@@ -61,7 +61,7 @@ of these methods for the three scenarios available so far are described in the t
6161

6262
* Phase2 Tracker
6363

64-
| `DetId::subDetId()` | `TrackerGeometry::geomDetSubDetector(subdet)` | `TrackerGeometry::numberOfLayers(subdet)` |
64+
| `DetId::subdetId()` | `TrackerGeometry::geomDetSubDetector(subdet)` | `TrackerGeometry::numberOfLayers(subdet)` |
6565
|--------|--------|-------|
6666
| 1 | `GeomDetEnumerators::P2PXB` | 4 |
6767
| 2 | `GeomDetEnumerators::P2PXEC` | 12 |

Geometry/TrackerNumberingBuilder/README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ When the name of the `TrackerTopology` method is written in _italic_, it means t
1717
### Run 1 Detector DetId schema
1818
The Run 1 detector DetId schema profits of all the six available subdetectors (from 1 to 6) and it is defined as follows
1919

20-
* Subdetector 1 (`DetId::subDetId() == PixelSubdetector::PixelBarrel`): Pixel Barrel
20+
* Subdetector 1 (`DetId::subdetId() == PixelSubdetector::PixelBarrel`): Pixel Barrel
2121

2222
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
2323
|------|-----------|-----------|-----|----|-----|
@@ -27,7 +27,7 @@ The Run 1 detector DetId schema profits of all the six available subdetectors (f
2727
| Module | 2 | 0x3F | 6 | pxbModule(id) | increasing z |
2828
| _not used_ | 0 | 0x3 | 2 | | |
2929

30-
* Subdetector 2 (`DetId::subDetId() == PixelSubdetector::PixelEndcap`): Pixel Forward
30+
* Subdetector 2 (`DetId::subdetId() == PixelSubdetector::PixelEndcap`): Pixel Forward
3131

3232
| Name | start bit | hex mask | bit size | `TrackerToplogy` method | Notes |
3333
|------|-----------|-----------|----|-----|-----|
@@ -39,7 +39,7 @@ The Run 1 detector DetId schema profits of all the six available subdetectors (f
3939
| Module | 2 | 0x3F | 6 | pxfModule(id) | increasing r |
4040
| _not used_ | 0 | 0x3 | 2 | | |
4141

42-
* Subdetector 3 (`DetId::subDetId() == StripSubdetector::TIB`): TIB
42+
* Subdetector 3 (`DetId::subdetId() == StripSubdetector::TIB`): TIB
4343

4444
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
4545
|------|-----------|-----------|-----|----|-----|
@@ -51,7 +51,7 @@ The Run 1 detector DetId schema profits of all the six available subdetectors (f
5151
| Module | 2 | 0x3 | 2 | tibModule(id) | increasing abs(z) |
5252
| Module type | 0 | 0x3 | 2 | tibStereo(id) or tibGlued(id) | 1=stereo, 2=rphi, 0=pair |
5353

54-
* Subdetector 4 (`DetId::subDetId() == StripSubdetector::TID`): TID
54+
* Subdetector 4 (`DetId::subdetId() == StripSubdetector::TID`): TID
5555

5656
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
5757
|------|-----------|-----------|-----|----|-----|
@@ -63,7 +63,7 @@ The Run 1 detector DetId schema profits of all the six available subdetectors (f
6363
| Module | 2 | 0x1F | 5 | tidModule(id) | increasing phi |
6464
| Module type | 0 | 0x3 | 2 | tidStereo(id) or tidGlued(id) | 1=stereo, 2=rphi, 0=pair |
6565

66-
* Subdetector 5 (`DetId::subDetId() == StripSubdetector::TOB`): TOB
66+
* Subdetector 5 (`DetId::subdetId() == StripSubdetector::TOB`): TOB
6767

6868
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
6969
|------|-----------|-----------|-----|----|----|
@@ -74,7 +74,7 @@ The Run 1 detector DetId schema profits of all the six available subdetectors (f
7474
| Module | 2 | 0x7 | 3 | tobModule(id) | increasing abs(z) |
7575
| Module type | 0 | 0x3 | 2 | tobStereo(id) or tobGlued(id) | 1=stereo, 2=rphi, 0=pair |
7676

77-
* Subdetector 6 (`DetId::subDetId() == StripSubdetector::TEC`): TEC
77+
* Subdetector 6 (`DetId::subdetId() == StripSubdetector::TEC`): TEC
7878

7979
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
8080
|------|-----------|-----------|-----|----|----|
@@ -96,7 +96,7 @@ The xml description of tracker parameters for this detid schema is in [Geometry/
9696
The phase 1 detector DetId schema differs from that of the Run 1 detector only in the first two subdetectors which
9797
corresponds to the Pixel Barrel and Forward detector. Therefore only them will be repeated here:
9898

99-
* Subdetector 1 (`DetId::subDetId() == PixelSubdetector::PixelBarrel`): Phase1 Pixel Barrel
99+
* Subdetector 1 (`DetId::subdetId() == PixelSubdetector::PixelBarrel`): Phase1 Pixel Barrel
100100

101101
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
102102
|------|-----------|-----------|-----|----|-----|
@@ -106,7 +106,7 @@ corresponds to the Pixel Barrel and Forward detector. Therefore only them will b
106106
| Module | 2 | 0x3FF | 10 | pxbModule(id) | increasing z |
107107
| _not used_ | 0 | 0x3 | 2 | | |
108108

109-
* Subdetector 2 (`DetId::subDetId() == PixelSubdetector::PixelEndcap`): Phase1 Pixel Forward
109+
* Subdetector 2 (`DetId::subdetId() == PixelSubdetector::PixelEndcap`): Phase1 Pixel Forward
110110

111111
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
112112
|------|-----------|-----------|----|-----|-----|
@@ -130,7 +130,7 @@ The OT tilted option has been introduced in the subdetector 5 with two bits (in
130130

131131
With this subdetector, the flat geometry is compatible using just the central barrel part of the subdetector 5.
132132

133-
* Subdetector 1: (`DetId::subDetId() == PixelSubdetector::PixelBarrel`): Phase2 Pixel Barrel
133+
* Subdetector 1: (`DetId::subdetId() == PixelSubdetector::PixelBarrel`): Phase2 Pixel Barrel
134134

135135
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
136136
|------|-----------|-----------|-----|----|-----|
@@ -140,7 +140,7 @@ With this subdetector, the flat geometry is compatible using just the central ba
140140
| Module | 2 | 0x3FF | 10 | pxbModule(id) | increasing z |
141141
| _not used_ | 0 | 0x3 | 2 | | |
142142

143-
* Subdetector 2: (`DetId::subDetId() == PixelSubdetector::PixelEndcap`): Phase2 Pixel Forward
143+
* Subdetector 2: (`DetId::subdetId() == PixelSubdetector::PixelEndcap`): Phase2 Pixel Forward
144144

145145
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
146146
|------|-----------|-----------|----|-----|-----|
@@ -152,7 +152,7 @@ With this subdetector, the flat geometry is compatible using just the central ba
152152
| Module | 2 | 0xFF | 8 | pxfModule(id) | increasing phi |
153153
| _not used_ | 0 | 0x3 | 2 | | |
154154

155-
* Subdetector 5 (`DetId::subDetId() == StripSubdetector::TOB`): Phase2 Outer Tracker Barrel
155+
* Subdetector 5 (`DetId::subdetId() == StripSubdetector::TOB`): Phase2 Outer Tracker Barrel
156156

157157
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
158158
|------|-----------|-----------|-----|----|-----|
@@ -180,7 +180,7 @@ The xml description of tracker parameters for this detid schema is in [Geometry/
180180
### Phase 2 Upgrade Detector DetId schema modified to account for the re-ordering of the pixel
181181
Only the subdetector 2 schema is different wrt the original Phase 2 upgrade DetIdSchema
182182

183-
* Subdetector 2: (`DetId::subDetId() == PixelSubdetector::PixelEndcap`): Phase2 Pixel Forward
183+
* Subdetector 2: (`DetId::subdetId() == PixelSubdetector::PixelEndcap`): Phase2 Pixel Forward
184184

185185
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
186186
|------|-----------|-----------|----|-----|-----|
@@ -199,7 +199,7 @@ The xml description of tracker parameters for this detid schema is in [Geometry/
199199

200200
From CMSSW_14_1_X on [Geometry/TrackerCommonData/data/PhaseII/TFPXTEPXReordered/trackerParameters.xml](../TrackerCommonData/data/PhaseII/TFPXTEPXReordered/trackerParameters.xml) has been updated to reflect a single geometry merging the splitted sensors detID numbering and the detID rearrangement described above.
201201

202-
* Subdetector 1: (`DetId::subDetId() == PixelSubdetector::PixelBarrel`): Phase2 Pixel Barrel
202+
* Subdetector 1: (`DetId::subdetId() == PixelSubdetector::PixelBarrel`): Phase2 Pixel Barrel
203203

204204
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
205205
|------|-----------|-----------|-----|----|-----|
@@ -209,7 +209,7 @@ From CMSSW_14_1_X on [Geometry/TrackerCommonData/data/PhaseII/TFPXTEPXReordered/
209209
| Module | 2 | 0x3FF | 10 | pxbModule(id) | increasing z |
210210
| Sensor | 0 | 0x3 | 2 |pxbSensor(id) | |
211211

212-
* Subdetector 2: (`DetId::subDetId() == PixelSubdetector::PixelEndcap`): Phase2 Pixel Forward
212+
* Subdetector 2: (`DetId::subdetId() == PixelSubdetector::PixelEndcap`): Phase2 Pixel Forward
213213

214214
| Name | start bit | hex mask | bit size | `TrackerTopology` method | Notes |
215215
|------|-----------|-----------|----|-----|-----|

0 commit comments

Comments
 (0)