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

Jump to bottom

Phase2-hgx335E Update the validity test of partial wafers of V16 geometry as well as the test kits #40585

Merged
merged 2 commits into from Jan 24, 2023
Merged

Phase2-hgx335E Update the validity test of partial wafers of V16 geometry as well as the test kits #40585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ef3e28
Update the validity test of partial wafers of V16 geometry as well as…
Jan 23, 2023
880f528
Code check
Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
187 changes: 132 additions & 55 deletions Geometry/HGCalCommonData/data/missD88.txt
View file
Open in desktop
@@ -1,55 +1,132 @@
8 0 -1 7 -2 0 11 8
8 0 1 18 1 -1 8 8
8 0 1 19 1 -1 8 8
8 0 1 20 1 -1 8 8
8 0 -1 10 2 1 13 9
8 0 -1 11 2 1 13 9
8 0 -1 23 2 1 11 8
8 0 1 23 -1 1 12 17
8 0 -1 25 -2 0 19 8
8 0 -1 19 -1 -2 3 0
8 0 1 17 -1 1 15 14
8 0 -1 20 -2 -1 11 14
8 0 -1 25 -2 -1 11 14
8 0 -1 21 1 -1 10 6
8 0 -1 22 1 -1 10 6
8 0 -1 23 1 -1 10 6
8 0 -1 24 1 -1 10 6
8 0 -1 21 1 -1 5 12
8 0 -1 22 1 -1 5 12
8 0 -1 11 1 -1 10 6
9 0 1 5 -2 0 15 14
9 0 1 3 0 -2 9 1
9 1 -1 18 4 2 13 14
9 0 -1 5 -2 -2 19 21
9 2 1 18 3 4 14 14
9 2 1 18 3 4 9 9
9 0 1 3 -2 0 17 14
9 1 1 13 1 -3 13 10
9 2 1 21 2 3 2 4
9 0 1 4 0 2 14 12
9 1 1 14 4 2 7 11
9 1 1 8 2 4 6 12
9 1 -1 14 -2 -3 10 4
9 2 1 21 1 3 3 6
9 1 -1 12 -1 -3 9 2
9 1 -1 13 -1 -4 8 10
9 1 -1 14 4 2 3 9
9 0 -1 3 0 2 14 2
9 2 -1 21 1 3 6 12
9 0 1 3 -2 0 7 14
10 1 -1 8 29 239 0 0
10 1 -1 8 29 242 0 0
10 1 -1 8 30 239 0 0
10 2 1 14 27 289 0 0
10 2 -1 14 41 241 0 0
10 1 -1 21 1 289 1 0
10 1 -1 16 12 289 0 0
10 1 -1 13 14 289 0 0
10 1 -1 13 18 289 0 0
10 1 1 19 17 289 1 0
10 1 1 9 30 72 0 0
10 1 -1 12 37 146 1 0
10 1 -1 9 31 119 0 0
10 1 -1 9 32 119 0 0
10 1 -1 10 34 215 0 0
8 0 -1 7 -2 0 11 8
8 0 1 18 1 -1 8 8
8 0 1 19 1 -1 8 8
8 0 1 20 1 -1 8 8
8 0 -1 10 2 1 13 9
8 0 -1 11 2 1 13 9
8 0 -1 23 2 1 11 8
8 0 1 23 -1 1 12 17
8 0 -1 25 -2 0 19 8
8 0 -1 19 -1 -2 3 0
8 0 1 17 -1 1 15 14
8 0 -1 20 -2 -1 11 14
8 0 -1 25 -2 -1 11 14
8 0 -1 21 1 -1 10 6
8 0 -1 22 1 -1 10 6
8 0 -1 23 1 -1 10 6
8 0 -1 24 1 -1 10 6
8 0 -1 21 1 -1 5 12
8 0 -1 22 1 -1 5 12
8 0 -1 11 1 -1 10 6
8 2 -1 10 -7 -10 11 15
8 2 -1 3 -5 -10 11 15
8 2 1 6 -6 -10 10 13
8 2 -1 6 -5 -10 11 15
8 2 -1 1 10 2 0 7
8 2 -1 1 -8 -10 15 15
9 2 1 9 10 2 0 7
9 0 1 5 -2 0 15 14
9 0 1 3 0 -2 9 1
9 1 -1 18 4 2 13 14
9 0 -1 5 -2 -2 19 21
9 2 1 18 3 4 14 14
9 2 1 18 3 4 9 9
9 0 1 3 -2 0 17 14
9 1 1 13 1 -3 13 10
9 2 1 21 2 3 2 4
9 0 1 4 0 2 14 12
9 1 1 14 4 2 7 11
9 1 1 8 2 4 6 12
9 1 -1 14 -2 -3 10 4
9 2 1 21 1 3 3 6
9 1 -1 12 -1 -3 9 2
9 1 -1 13 -1 -4 8 10
9 1 -1 14 4 2 3 9
9 0 -1 3 0 2 14 2
9 2 -1 21 1 3 6 12
9 0 1 3 -2 0 7 14
10 0 1 1 0 10 33 47
10 0 1 1 0 8 28 217
10 0 1 1 0 9 30 96
10 0 1 1 0 8 29 143
10 0 2 1 0 15 39 289
10 0 1 -1 0 9 31 266
10 0 1 -1 0 8 29 146
10 0 1 1 0 8 29 48
10 0 1 1 1 17 17 289
10 0 1 1 0 12 17 289
10 0 1 -1 0 9 30 73
10 0 1 -1 0 9 32 47
10 0 1 1 0 8 29 47
10 0 1 -1 1 13 20 289
10 0 1 1 0 8 29 119
10 0 1 -1 0 11 33 167
10 0 1 1 1 12 38 71
10 0 1 -1 1 12 37 95
10 0 2 1 0 14 41 23
10 0 2 -1 1 16 41 98
10 0 1 -1 1 12 37 50
10 0 1 1 1 12 37 71
10 0 1 1 0 11 25 289
10 0 2 1 0 15 41 266
10 0 1 1 0 10 33 146
10 0 1 -1 0 11 31 289
10 0 2 -1 1 18 38 289
10 0 1 1 1 18 17 289
10 0 1 -1 1 12 37 287
10 0 1 -1 0 9 31 240
10 0 1 -1 0 11 33 121
10 0 1 1 0 8 30 143
10 0 1 1 0 8 29 23
10 0 2 1 1 18 27 289
10 0 2 1 0 14 42 143
10 0 1 -1 0 12 16 289
10 0 1 -1 0 11 20 289
10 0 1 1 0 9 31 287
10 0 1 1 0 11 34 71
10 0 1 -1 0 20 33 289
10 0 1 -1 0 10 33 47
10 0 1 -1 0 10 33 48
10 0 1 1 1 12 35 289
10 0 1 -1 0 14 18 289
10 0 1 -1 0 16 8 289
10 0 1 -1 0 9 23 289
10 0 2 -1 0 14 31 289
10 0 2 -1 0 14 38 289
10 0 1 1 0 12 20 289
10 0 1 -1 0 10 34 167
10 0 1 -1 0 10 33 119
10 0 1 1 0 11 33 242
10 0 1 -1 0 10 24 289
10 0 1 -1 0 8 25 289
10 0 1 -1 0 14 8 289
10 0 1 1 0 9 31 191
10 0 1 1 0 9 31 191
10 0 1 1 1 19 14 289
10 0 2 1 0 15 42 239
10 0 1 1 0 12 16 289
10 0 1 1 0 13 18 289
10 0 2 1 0 16 34 289
10 0 1 -1 0 8 29 95
10 0 1 1 0 8 29 266
10 0 1 -1 0 8 30 287
10 0 1 -1 1 12 38 23
10 0 1 -1 0 9 19 289
10 0 1 -1 0 9 31 287
10 0 1 -1 0 9 31 287
10 0 1 -1 0 14 11 289
10 0 1 1 0 9 28 289
10 0 1 1 0 15 14 289
10 0 1 1 1 12 34 289
10 0 2 -1 0 16 19 289
10 0 1 1 0 9 32 191
10 0 1 1 0 10 33 239
10 0 1 1 0 9 30 240
10 0 1 1 0 8 30 143
10 0 2 -1 0 14 41 266
10 0 2 1 1 17 38 289
10 0 2 1 1 16 41 25
10 0 2 1 1 16 41 26
10 0 1 -1 0 8 29 191
10 0 1 -1 0 8 30 95
10 0 1 1 0 10 24 289
184 changes: 144 additions & 40 deletions Geometry/HGCalCommonData/data/missD92.txt
View file
Open in desktop
@@ -1,40 +1,144 @@
8 0 1 1 -1 -2 3 4
8 0 -1 8 1 2 3 4
8 0 -1 4 2 1 7 6
8 0 -1 11 2 1 17 11
8 0 -1 2 1 -1 5 5
8 0 -1 5 -1 -2 23 14
8 0 -1 9 -1 -2 23 14
8 0 -1 14 -1 -2 1 3
8 0 -1 17 -2 -1 23 14
8 0 -1 19 -2 -1 21 13
8 0 1 18 1 2 7 6
8 0 1 11 -1 1 5 5
8 0 1 18 -1 1 19 12
8 0 -1 16 -2 -1 5 5
8 0 1 18 2 1 9 7
8 0 1 21 2 1 15 10
8 0 1 22 2 1 7 6
8 0 -1 13 1 -1 23 14
8 0 -1 22 1 2 15 10
8 0 1 16 -2 -1 7 6
9 2 1 19 -1 2 7 31
9 2 -1 19 -1 2 7 31
9 1 -1 14 -3 -2 7 31
9 1 -1 15 -3 -4 7 15
9 2 -1 20 1 -24 7 31
9 1 1 9 -3 -1 7 31
9 1 -1 15 -3 -4 7 31
9 1 -1 11 2 -12 7 31
9 1 -1 11 2 -12 7 31
9 2 -1 19 -1 2 7 31
9 2 -1 19 -3 -4 7 31
9 1 1 14 -3 0 7 15
9 2 -1 21 3 0 7 15
9 2 1 19 3 0 7 15
9 1 -1 9 -3 -3 7 31
9 2 -1 18 1 4 7 15
9 1 1 10 0 3 7 31
9 2 -1 20 -3 -2 7 15
9 1 1 12 -3 0 7 15
9 1 1 10 -2 1 7 31
8 0 1 1 -1 -2 3 4
8 0 -1 8 1 2 3 4
8 0 -1 4 2 1 7 6
8 0 -1 11 2 1 17 11
8 0 -1 2 1 -1 5 5
8 0 -1 5 -1 -2 23 14
8 0 -1 9 -1 -2 23 14
8 0 -1 14 -1 -2 1 3
8 0 -1 17 -2 -1 23 14
8 0 -1 19 -2 -1 21 13
8 0 1 18 1 2 7 6
8 0 1 11 -1 1 5 5
8 0 1 18 -1 1 19 12
8 0 -1 16 -2 -1 5 5
8 0 1 18 2 1 9 7
8 0 1 21 2 1 15 10
8 0 1 22 2 1 7 6
8 0 -1 13 1 -1 23 14
8 0 -1 22 1 2 15 10
8 0 1 16 -2 -1 7 6
9 2 1 19 -1 2 7 31
9 2 -1 19 -1 2 7 31
9 1 -1 14 -3 -2 7 31
9 1 -1 15 -3 -4 7 15
9 2 -1 20 1 -24 7 31
9 1 1 9 -3 -1 7 31
9 1 -1 15 -3 -4 7 31
9 1 -1 11 2 -12 7 31
9 1 -1 11 2 -12 7 31
9 2 -1 19 -1 2 7 31
9 2 -1 19 -3 -4 7 31
9 1 1 14 -3 0 7 15
9 2 -1 21 3 0 7 15
9 2 1 19 3 0 7 15
9 1 -1 9 -3 -3 7 31
9 2 -1 18 1 4 7 15
9 1 1 10 0 3 7 31
9 2 -1 20 -3 -2 7 15
9 1 1 12 -3 0 7 15
9 1 1 10 -2 1 7 31
10 0 1 -1 0 11 33 23
10 0 2 -1 0 13 39 122
10 0 1 -1 0 15 8 289
10 0 1 -1 0 10 34 119
10 0 1 -1 0 8 21 289
10 0 1 -1 0 12 26 289
10 0 2 1 1 16 42 143
10 0 1 -1 0 9 31 23
10 0 1 -1 0 9 22 289
10 0 1 -1 0 11 33 215
10 0 1 -1 0 8 29 218
10 0 2 -1 1 21 19 289
10 0 1 1 0 8 23 289
10 0 2 1 1 16 41 47
10 0 1 -1 0 8 30 191
10 0 2 -1 0 14 41 191
10 0 2 -1 0 14 41 167
10 0 1 -1 0 9 31 170
10 0 1 1 0 8 20 289
10 0 1 1 0 12 15 289
10 0 1 -1 0 9 31 71
10 0 1 -1 0 10 21 289
10 0 1 1 1 12 38 47
10 0 1 1 0 8 22 289
10 0 1 -1 0 10 33 74
10 0 1 -1 0 8 29 72
10 0 1 -1 0 9 30 216
10 0 1 -1 0 11 34 47
10 0 1 1 0 10 33 47
10 0 1 -1 0 8 30 263
10 0 2 -1 0 16 34 289
10 0 1 1 0 12 19 289
10 0 1 -1 0 9 31 119
10 0 1 1 0 14 12 289
10 0 1 1 0 10 33 191
10 0 1 -1 1 15 21 289
10 0 1 -1 0 16 18 289
10 0 1 -1 0 16 16 289
10 0 1 1 0 8 29 119
10 0 1 1 1 12 37 217
10 0 2 1 1 19 41 143
10 0 1 1 0 8 30 71
10 0 1 -1 0 9 31 215
10 0 2 -1 0 16 27 289
10 0 1 -1 0 9 22 289
10 0 1 -1 0 12 24 289
10 0 1 -1 0 9 20 289
10 0 1 -1 0 10 23 289
10 0 2 -1 1 20 20 289
10 0 1 -1 0 11 26 289
10 0 1 -1 0 8 24 289
10 0 1 -1 0 16 12 289
10 0 1 -1 1 17 17 289
10 0 1 1 0 9 31 2
10 0 1 1 0 9 31 2
10 0 1 1 0 9 30 72
10 0 1 -1 0 8 29 287
10 0 1 -1 0 9 31 144
10 0 1 1 0 10 28 28
10 0 1 1 0 11 33 26
10 0 1 -1 0 9 31 71
10 0 1 -1 0 10 34 287
10 0 1 -1 0 11 34 287
10 0 1 -1 0 11 33 287
10 0 1 -1 0 11 33 194
10 0 1 1 0 9 31 96
10 0 1 1 0 9 19 289
10 0 1 1 0 10 34 95
10 0 1 1 0 10 33 192
10 0 1 1 0 10 33 143
10 0 1 1 0 9 20 289
10 0 1 -1 0 8 28 169
10 0 2 -1 0 13 39 143
10 0 1 1 1 13 37 289
10 0 2 -1 1 16 41 97
10 0 1 1 0 8 28 96
10 0 1 1 0 10 33 143
10 0 2 1 0 13 40 23
10 0 1 -1 1 13 21 289
10 0 1 1 0 9 31 96
10 0 1 1 0 9 31 2
10 0 2 -1 0 13 39 26
10 0 2 -1 1 19 41 144
10 0 2 -1 1 19 41 144
10 0 1 -1 1 12 37 193
10 0 1 -1 0 9 31 215
10 0 1 -1 0 11 33 71
10 0 2 -1 1 19 41 47
10 0 1 1 0 11 33 1
10 0 2 1 0 13 39 241
10 0 2 -1 1 18 41 193
10 0 1 -1 0 13 18 289
10 0 1 1 1 17 18 289
10 0 1 -1 0 8 29 119
10 0 2 -1 0 15 30 289
10 0 1 1 0 9 32 23
10 0 1 1 0 8 28 24
10 0 2 1 0 14 41 146
10 0 1 -1 0 10 33 287
10 0 2 1 1 19 41 191
10 0 1 -1 0 16 15 289
10 0 1 -1 1 13 32 289
10 0 1 1 0 11 24 289
10 0 2 1 0 14 31 289
1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/interface/HGCalDDDConstants.h
View file
Open in desktop
Expand Up @@ -66,6 +66,7 @@ class HGCalDDDConstants {
std::vector<HGCalParameters::hgtrap> getModules() const;
inline const HGCalParameters* getParameter() const { return hgpar_; }
int getPhiBins(int lay) const;
std::pair<double, double> getRangeR(int, bool reco) const;
std::pair<int, int> getREtaRange(int lay) const;
inline const std::vector<double>& getRadiusLayer(int layer) const {
return hgpar_->radiusLayer_[(tileTrapezoid() ? hgpar_->scintType(layer) : 0)];
Expand Down
8 changes: 8 additions & 0 deletions Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
View file
Open in desktop
Expand Up @@ -408,6 +408,14 @@ std::vector<HGCalParameters::hgtrap> HGCalDDDConstants::getModules() const {

int HGCalDDDConstants::getPhiBins(int lay) const { return (tileTrapezoid() ? hgpar_->scintCells(lay) : 0); }

std::pair<double, double> HGCalDDDConstants::getRangeR(int lay, bool reco) const {
int indx = layerIndex(lay, false);
if ((indx >= 0) && (indx < static_cast<int>(hgpar_->rMinLayHex_.size())))
return std::make_pair(hgpar_->rMinLayHex_[indx], hgpar_->rMaxLayHex_[indx]);
else
return std::make_pair(0, -1.);
}

std::pair<int, int> HGCalDDDConstants::getREtaRange(int lay) const {
int irmin(0), irmax(0);
if (tileTrapezoid()) {
Expand Down