Skip to content

Commit e8d15a0

Browse files
author
Sunanda
committed
Code check
1 parent ba243e5 commit e8d15a0

File tree

3 files changed

+27
-12
lines changed

3 files changed

+27
-12
lines changed

‎Geometry/HGCalCommonData/interface/HGCGuardRing.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class HGCGuardRing {
2424
static constexpr std::array<double, 12> cos_1 = {{0.5, -0.5, -1.0, -0.5, 0.5, 1.0, -0.5, 0.5, 1.0, 0.5, -0.5, -1.0}};
2525
static constexpr std::array<double, 12> cot_1 = {
2626
{sqrt3_, -sqrt3_, 0.0, sqrt3_, -sqrt3_, 0.0, -sqrt3_, sqrt3_, 0.0, -sqrt3_, sqrt3_, 0.0}};
27-
double offset_, offsetPartial_, xmax_, ymax_, c22_, c27_;
27+
double offset_, offsetPartial_, xmax_, ymax_, c22_, c27_;
2828
};
2929

3030
#endif // HGCGuardRing_h

‎Geometry/HGCalCommonData/src/HGCGuardRing.cc‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ HGCGuardRing::HGCGuardRing(const HGCalDDDConstants& hgc)
2020
c22_ = (v17OrLess_) ? HGCalTypes::c22O : HGCalTypes::c22;
2121
c27_ = (v17OrLess_) ? HGCalTypes::c27O : HGCalTypes::c27;
2222
#ifdef EDM_ML_DEBUG
23-
edm::LogVerbatim("HGCSim") << "Creating HGCGuardRing with wafer size " << waferSize_ << ", Offsets " << sensorSizeOffset_ << ":" << guardRingOffset_ << ":" << offset_ << ":" << offsetPartial_ << ", mode " << modeUV_ << ", xmax|ymax " << xmax_ << ":" << ymax_ << " and c22:c77 " << c22_ << ":" << c77_;
23+
edm::LogVerbatim("HGCSim") << "Creating HGCGuardRing with wafer size " << waferSize_ << ", Offsets "
24+
<< sensorSizeOffset_ << ":" << guardRingOffset_ << ":" << offset_ << ":" << offsetPartial_
25+
<< ", mode " << modeUV_ << ", xmax|ymax " << xmax_ << ":" << ymax_ << " and c22:c77 "
26+
<< c22_ << ":" << c77_;
2427
#endif
2528
}
2629

@@ -30,7 +33,8 @@ bool HGCGuardRing::exclude(G4ThreeVector& point, int zside, int frontBack, int l
3033
int index = HGCalWaferIndex::waferIndex(layer, waferU, waferV);
3134
int partial = HGCalWaferType::getPartial(index, hgcons_.getParameter()->waferInfoMap_);
3235
#ifdef EDM_ML_DEBUG
33-
edm::LogVerbatim("HGCSim") << "HGCGuardRing::exclude: Layer " << layer << " wafer " << waferU << ":" << waferV << " index " << index << " partial " << partial;
36+
edm::LogVerbatim("HGCSim") << "HGCGuardRing::exclude: Layer " << layer << " wafer " << waferU << ":" << waferV
37+
<< " index " << index << " partial " << partial;
3438
#endif
3539
if (partial == HGCalTypes::WaferFull) {
3640
double dx = std::abs(point.x());
@@ -43,7 +47,9 @@ bool HGCGuardRing::exclude(G4ThreeVector& point, int zside, int frontBack, int l
4347
check = (dx > (sqrt3_ * (2 * ymax_ - dy)));
4448
}
4549
#ifdef EDM_ML_DEBUG
46-
edm::LogVerbatim("HGCSim") << "HGCGuardRing::exclude: Point " << point << " zside " << zside << " layer " << layer << " wafer " << waferU << ":" << waferV << " partial type " << partial << ":" << HGCalTypes::WaferFull << " x " << dx << ":" << xmax_ << " y " << dy << ":" << ymax_
50+
edm::LogVerbatim("HGCSim") << "HGCGuardRing::exclude: Point " << point << " zside " << zside << " layer " << layer
51+
<< " wafer " << waferU << ":" << waferV << " partial type " << partial << ":"
52+
<< HGCalTypes::WaferFull << " x " << dx << ":" << xmax_ << " y " << dy << ":" << ymax_
4753
<< " check " << check;
4854
#endif
4955
} else if (partial > 0) {
@@ -57,7 +63,8 @@ bool HGCGuardRing::exclude(G4ThreeVector& point, int zside, int frontBack, int l
5763
check = !(insidePolygon(point.x(), point.y(), wxy));
5864
#ifdef EDM_ML_DEBUG
5965
std::ostringstream st1;
60-
st1 << "HGCGuardRing::exclude: Point " << point << " Partial/orient/zside/size/offset " << partial << ":" << orient << ":" << zside << ":" << waferSize_ << offset_ << " with " << wxy.size() << " points:";
66+
st1 << "HGCGuardRing::exclude: Point " << point << " Partial/orient/zside/size/offset " << partial << ":"
67+
<< orient << ":" << zside << ":" << waferSize_ << offset_ << " with " << wxy.size() << " points:";
6168
for (unsigned int k = 0; k < wxy.size(); ++k)
6269
st1 << " (" << wxy[k].first << ", " << wxy[k].second << ")";
6370
edm::LogVerbatim("HGCSim") << st1.str();
@@ -69,7 +76,9 @@ bool HGCGuardRing::exclude(G4ThreeVector& point, int zside, int frontBack, int l
6976
check = !(insidePolygon(point.x(), point.y(), wxy));
7077
#ifdef EDM_ML_DEBUG
7178
std::ostringstream st1;
72-
st1 << "HGCGuardRing::exclude: Point " << point << " Partial/frontback/orient/zside/placeemnt/size/offset " << partial << ":" << frontBack << ":" << orient << ":" << zside << ":" << placement << ":" << waferSize_ << offset_ << " with " << wxy.size() << " points:";
79+
st1 << "HGCGuardRing::exclude: Point " << point << " Partial/frontback/orient/zside/placeemnt/size/offset "
80+
<< partial << ":" << frontBack << ":" << orient << ":" << zside << ":" << placement << ":" << waferSize_
81+
<< offset_ << " with " << wxy.size() << " points:";
7382
for (unsigned int k = 0; k < wxy.size(); ++k)
7483
st1 << " (" << wxy[k].first << ", " << wxy[k].second << ")";
7584
edm::LogVerbatim("HGCSim") << st1.str();
@@ -89,7 +98,8 @@ bool HGCGuardRing::excludePartial(G4ThreeVector& point, int zside, int frontBack
8998
int partial = HGCalWaferType::getPartial(index, hgcons_.getParameter()->waferInfoMap_);
9099
int type = HGCalWaferType::getType(index, hgcons_.getParameter()->waferInfoMap_);
91100
#ifdef EDM_ML_DEBUG
92-
edm::LogVerbatim("HGCSim") << "HGCGuardRing::excludePartial: Layer " << layer << " wafer " << waferU << ":" << waferV << " index " << index << " partial " << partial << " type " << type;
101+
edm::LogVerbatim("HGCSim") << "HGCGuardRing::excludePartial: Layer " << layer << " wafer " << waferU << ":"
102+
<< waferV << " index " << index << " partial " << partial << " type " << type;
93103
#endif
94104
if (partial == HGCalTypes::WaferFull) {
95105
return (check);
@@ -101,26 +111,31 @@ bool HGCGuardRing::excludePartial(G4ThreeVector& point, int zside, int frontBack
101111
double dx = point.x();
102112
double dy = point.y();
103113
#ifdef EDM_ML_DEBUG
104-
edm::LogVerbatim("HGCSim") << "HGCGuardRing::excludePartial: zside " << zside << " frontBack " << frontBack << " orient " << orient << " placement " << placement << " dx " << dx << " dy " << dy;
114+
edm::LogVerbatim("HGCSim") << "HGCGuardRing::excludePartial: zside " << zside << " frontBack " << frontBack
115+
<< " orient " << orient << " placement " << placement << " dx " << dx << " dy " << dy;
105116
#endif
106117
if (type > 0) {
107118
for (int ii = HGCalTypes::WaferPartLDOffset;
108119
ii < (HGCalTypes::WaferPartLDOffset + HGCalTypes::WaferPartLDCount);
109120
ii++) {
110-
std::array<double, 4> criterion = HGCalWaferMask::maskCut(ii, placement, waferSize_, offsetPartial_, v17OrLess_);
121+
std::array<double, 4> criterion =
122+
HGCalWaferMask::maskCut(ii, placement, waferSize_, offsetPartial_, v17OrLess_);
111123
check |= std::abs(criterion[0] * dy + criterion[1] * dx + criterion[2]) < criterion[3];
112124
}
113125
} else {
114126
for (int ii = HGCalTypes::WaferPartHDOffset;
115127
ii < (HGCalTypes::WaferPartHDOffset + HGCalTypes::WaferPartHDCount);
116128
ii++) {
117-
std::array<double, 4> criterion = HGCalWaferMask::maskCut(ii, placement, waferSize_, offsetPartial_, v17OrLess_);
129+
std::array<double, 4> criterion =
130+
HGCalWaferMask::maskCut(ii, placement, waferSize_, offsetPartial_, v17OrLess_);
118131
check |= std::abs(criterion[0] * dy + criterion[1] * dx + criterion[2]) < criterion[3];
119132
}
120133
}
121134
}
122135
#ifdef EDM_ML_DEBUG
123-
edm::LogVerbatim("HGCSim") << "HGCGuardRing::excludePartial: Point " << point << " zside " << zside << " layer " << layer << " wafer " << waferU << ":" << waferV << " partial type " << partial << " type " << type << " check " << check;
136+
edm::LogVerbatim("HGCSim") << "HGCGuardRing::excludePartial: Point " << point << " zside " << zside << " layer "
137+
<< layer << " wafer " << waferU << ":" << waferV << " partial type " << partial
138+
<< " type " << type << " check " << check;
124139
#endif
125140
}
126141
return check;

‎SimG4CMS/Calo/plugins/HGCalMouseBiteTester.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ void HGCalMouseBiteTester::analyze(const edm::Event& iEvent, const edm::EventSet
177177

178178
if (guardRing_.excludePartial(point, zside, frontBack, layer_, waferU_, waferV_)) {
179179
guard_ring << xi << "," << yi << std::endl;
180-
// guard_ring_partial << xi << "," << yi << std::endl;
180+
// guard_ring_partial << xi << "," << yi << std::endl;
181181
} else if (mouseBite_.exclude(point, zside, layer_, waferU_, waferV_)) {
182182
mouse_bite << xi << "," << yi << std::endl;
183183
} else {

0 commit comments

Comments
 (0)