Skip to content

Commit 743c99b

Browse files
author
Sunanda
committed
Code check
1 parent 62ed66f commit 743c99b

File tree

6 files changed

+38
-19
lines changed

6 files changed

+38
-19
lines changed

‎Geometry/HGCalCommonData/interface/HGCalDDDConstants.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ class HGCalDDDConstants {
209209
return ((mode_ == HGCalGeometryMode::Hexagon8CalibCell) || (mode_ == HGCalGeometryMode::Hexagon8FineCell));
210210
}
211211
inline bool waferHexagon8Cassette() const {
212-
return ((mode_ == HGCalGeometryMode::Hexagon8Cassette) || (mode_ == HGCalGeometryMode::Hexagon8CalibCell) || (mode_ == HGCalGeometryMode::Hexagon8FineCell));
212+
return ((mode_ == HGCalGeometryMode::Hexagon8Cassette) || (mode_ == HGCalGeometryMode::Hexagon8CalibCell) ||
213+
(mode_ == HGCalGeometryMode::Hexagon8FineCell));
213214
}
214215
inline bool waferHexagon8File() const {
215216
return ((mode_ == HGCalGeometryMode::Hexagon8File) || (mode_ == HGCalGeometryMode::Hexagon8Module) ||

‎Geometry/HGCalCommonData/src/HGCalDDDConstants.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ std::pair<float, float> HGCalDDDConstants::locateCell(int zside,
955955
x = xy.first;
956956
y = xy.second;
957957
if (waferHexagon8Fine() || cog) {
958-
xy = cellOffset_->cellOffsetUV2XY1(cellU, cellV, place, fineCoarse, part);
958+
xy = cellOffset_->cellOffsetUV2XY1(cellU, cellV, place, fineCoarse, part);
959959
x += xy.first;
960960
y += xy.second;
961961
}
@@ -2207,7 +2207,8 @@ void HGCalDDDConstants::cellHex(
22072207
if (cassetteMode()) {
22082208
auto uv = (part == HGCalTypes::WaferFull)
22092209
? hgcellUV_->cellUVFromXY3(xloc, yloc, place, cellType, true, debug)
2210-
: (waferHexagon8Calib() ? hgcellUV_->cellUVFromXY2(xloc, yloc, place, cellType, part, true, debug) : hgcellUV_->cellUVFromXY1(xloc, yloc, place, cellType, part, true, debug));
2210+
: (waferHexagon8Calib() ? hgcellUV_->cellUVFromXY2(xloc, yloc, place, cellType, part, true, debug)
2211+
: hgcellUV_->cellUVFromXY1(xloc, yloc, place, cellType, part, true, debug));
22112212
cellU = uv.first;
22122213
cellV = uv.second;
22132214
} else if (waferHexagon8File()) {

‎Geometry/HGCalCommonData/src/HGCalGeomParameters.cc‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1591,7 +1591,8 @@ void HGCalGeomParameters::loadSpecParsHexagon8(HGCalParameters& php,
15911591
for (unsigned int k = 0; k < waferIndex.size(); ++k) {
15921592
int partial = HGCalProperty::waferPartial(waferProperties[k]);
15931593
int orient =
1594-
((php.mode_ == HGCalGeometryMode::Hexagon8Cassette) || (php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) || (php.mode_ == HGCalGeometryMode::Hexagon8FineCell))
1594+
((php.mode_ == HGCalGeometryMode::Hexagon8Cassette) || (php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) ||
1595+
(php.mode_ == HGCalGeometryMode::Hexagon8FineCell))
15951596
? HGCalProperty::waferOrient(waferProperties[k])
15961597
: HGCalWaferMask::getRotation(php.waferZSide_, partial, HGCalProperty::waferOrient(waferProperties[k]));
15971598
php.waferInfoMap_[waferIndex[k]] = HGCalParameters::waferInfo(HGCalProperty::waferThick(waferProperties[k]),
@@ -2193,7 +2194,8 @@ void HGCalGeomParameters::loadWaferHexagon8(HGCalParameters& php) {
21932194
int kndx = HGCalWaferIndex::waferIndex(lay, u, v);
21942195
int type(-1);
21952196
if ((php.mode_ == HGCalGeometryMode::Hexagon8File) || (php.mode_ == HGCalGeometryMode::Hexagon8Module) ||
2196-
(php.mode_ == HGCalGeometryMode::Hexagon8Cassette) || (php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) || (php.mode_ == HGCalGeometryMode::Hexagon8FineCell))
2197+
(php.mode_ == HGCalGeometryMode::Hexagon8Cassette) || (php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) ||
2198+
(php.mode_ == HGCalGeometryMode::Hexagon8FineCell))
21972199
type = wType->getType(kndx, php.waferInfoMap_);
21982200
if (type < 0)
21992201
type = wType->getType(HGCalParameters::k_ScaleToDDD * xpos0,
@@ -2229,13 +2231,15 @@ void HGCalGeomParameters::loadWaferHexagon8(HGCalParameters& php) {
22292231
xpos0, ypos0, r1, R1, php.rMinLayHex_[i], php.rMaxLayHex_[i], type, php.waferMaskMode_, v17OrLess);
22302232
if ((php.mode_ == HGCalGeometryMode::Hexagon8File) || (php.mode_ == HGCalGeometryMode::Hexagon8Module) ||
22312233
(php.mode_ == HGCalGeometryMode::Hexagon8Cassette) ||
2232-
(php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) || (php.mode_ == HGCalGeometryMode::Hexagon8FineCell)) {
2234+
(php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) ||
2235+
(php.mode_ == HGCalGeometryMode::Hexagon8FineCell)) {
22332236
auto itr = php.waferInfoMap_.find(wl);
22342237
if (itr != php.waferInfoMap_.end()) {
22352238
int part = (itr->second).part;
22362239
int orient = (itr->second).orient;
22372240
bool ok = ((php.mode_ == HGCalGeometryMode::Hexagon8Cassette) ||
2238-
(php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) || (php.mode_ == HGCalGeometryMode::Hexagon8FineCell))
2241+
(php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) ||
2242+
(php.mode_ == HGCalGeometryMode::Hexagon8FineCell))
22392243
? true
22402244
: HGCalWaferMask::goodTypeMode(
22412245
xpos0, ypos0, r1, R1, php.rMinLayHex_[i], php.rMaxLayHex_[i], part, orient, false);

‎Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ bool HGCalParametersFromDD::build(const DDCompactView* cpv,
4444
<< HGCalGeometryMode::Trapezoid << ":" << HGCalGeometryMode::TrapezoidFile << ":"
4545
<< HGCalGeometryMode::TrapezoidModule << ":" << HGCalGeometryMode::Hexagon8Cassette
4646
<< ":" << HGCalGeometryMode::TrapezoidCassette << ":"
47-
<< HGCalGeometryMode::Hexagon8CalibCell << ":"
48-
<< HGCalGeometryMode::TrapezoidFineCell << ":" << HGCalGeometryMode::Hexagon8FineCell;
47+
<< HGCalGeometryMode::Hexagon8CalibCell << ":" << HGCalGeometryMode::TrapezoidFineCell
48+
<< ":" << HGCalGeometryMode::Hexagon8FineCell;
4949
#endif
5050
php.levelZSide_ = 3; // Default level for ZSide
5151
php.detectorType_ = 0; // These two parameters are
@@ -79,7 +79,8 @@ bool HGCalParametersFromDD::build(const DDCompactView* cpv,
7979
}
8080
if ((php.mode_ == HGCalGeometryMode::Hexagon8) || (php.mode_ == HGCalGeometryMode::Hexagon8Full) ||
8181
(php.mode_ == HGCalGeometryMode::Hexagon8File) || (php.mode_ == HGCalGeometryMode::Hexagon8Module) ||
82-
(php.mode_ == HGCalGeometryMode::Hexagon8Cassette) || (php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) || (php.mode_ == HGCalGeometryMode::Hexagon8FineCell)) {
82+
(php.mode_ == HGCalGeometryMode::Hexagon8Cassette) || (php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) ||
83+
(php.mode_ == HGCalGeometryMode::Hexagon8FineCell)) {
8384
php.levelT_ = dbl_to_int(getDDDArray("LevelTop", sv));
8485
php.levelZSide_ = static_cast<int>(getDDDValue("LevelZSide", sv));
8586
php.nCellsFine_ = php.nCellsCoarse_ = 0;
@@ -182,7 +183,8 @@ bool HGCalParametersFromDD::build(const DDCompactView* cpv,
182183
// Load wafer positions
183184
geom->loadWaferHexagon8(php);
184185
} else if ((php.mode_ == HGCalGeometryMode::Hexagon8Module) || (php.mode_ == HGCalGeometryMode::Hexagon8Cassette) ||
185-
(php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) || (php.mode_ == HGCalGeometryMode::Hexagon8FineCell)) {
186+
(php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) ||
187+
(php.mode_ == HGCalGeometryMode::Hexagon8FineCell)) {
186188
// Load the SpecPars
187189
geom->loadSpecParsHexagon8(fv, php);
188190
// Load Geometry parameters
@@ -282,8 +284,8 @@ bool HGCalParametersFromDD::build(const cms::DDCompactView* cpv,
282284
<< HGCalGeometryMode::Trapezoid << ":" << HGCalGeometryMode::TrapezoidFile << ":"
283285
<< HGCalGeometryMode::TrapezoidModule << ":" << HGCalGeometryMode::Hexagon8Cassette
284286
<< ":" << HGCalGeometryMode::TrapezoidCassette << ":"
285-
<< HGCalGeometryMode::Hexagon8CalibCell << ":"
286-
<< HGCalGeometryMode::TrapezoidFineCell << ":" << HGCalGeometryMode::Hexagon8FineCell;
287+
<< HGCalGeometryMode::Hexagon8CalibCell << ":" << HGCalGeometryMode::TrapezoidFineCell
288+
<< ":" << HGCalGeometryMode::Hexagon8FineCell;
287289
#endif
288290
php.levelZSide_ = 3; // Default level for ZSide
289291
php.detectorType_ = 0; // These two parameters are
@@ -310,7 +312,8 @@ bool HGCalParametersFromDD::build(const cms::DDCompactView* cpv,
310312
}
311313
if ((php.mode_ == HGCalGeometryMode::Hexagon8) || (php.mode_ == HGCalGeometryMode::Hexagon8Full) ||
312314
(php.mode_ == HGCalGeometryMode::Hexagon8File) || (php.mode_ == HGCalGeometryMode::Hexagon8Module) ||
313-
(php.mode_ == HGCalGeometryMode::Hexagon8Cassette) || (php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) || (php.mode_ == HGCalGeometryMode::Hexagon8FineCell)) {
315+
(php.mode_ == HGCalGeometryMode::Hexagon8Cassette) || (php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) ||
316+
(php.mode_ == HGCalGeometryMode::Hexagon8FineCell)) {
314317
php.levelT_ = dbl_to_int(fv.get<std::vector<double> >(name, "LevelTop"));
315318
tempD = fv.get<std::vector<double> >(name, "LevelZSide");
316319
php.levelZSide_ = static_cast<int>(tempD[0]);
@@ -425,7 +428,8 @@ bool HGCalParametersFromDD::build(const cms::DDCompactView* cpv,
425428
// Load wafer positions
426429
geom->loadWaferHexagon8(php);
427430
} else if ((php.mode_ == HGCalGeometryMode::Hexagon8Module) || (php.mode_ == HGCalGeometryMode::Hexagon8Cassette) ||
428-
(php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) || (php.mode_ == HGCalGeometryMode::Hexagon8FineCell)) {
431+
(php.mode_ == HGCalGeometryMode::Hexagon8CalibCell) ||
432+
(php.mode_ == HGCalGeometryMode::Hexagon8FineCell)) {
429433
// Load the SpecPars
430434
geom->loadSpecParsHexagon8(fv, vmap, php, name);
431435
// Load Geometry parameters

‎SimG4CMS/Calo/src/HGCGuardRingPartial.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ bool HGCGuardRingPartial::exclude(G4ThreeVector& point, int zside, int frontBack
4444
double dx = point.x();
4545
double dy = point.y();
4646
#ifdef EDM_ML_DEBUG
47-
edm::LogVerbatim("HGCSim") << "HGCGuardRingPatial:: zside " << zside << " frontBack " << frontBack << " orient " << orient << " placement " << placement << " dx " << dx << " dy " << dy;
47+
edm::LogVerbatim("HGCSim") << "HGCGuardRingPatial:: zside " << zside << " frontBack " << frontBack << " orient "
48+
<< orient << " placement " << placement << " dx " << dx << " dy " << dy;
4849
#endif
4950
if (type > 0) {
5051
for (int ii = HGCalTypes::WaferPartLDOffset;

‎SimG4CMS/Calo/src/HGCalSD.cc‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ uint32_t HGCalSD::setDetUnitId(const G4Step* aStep) {
168168
}
169169
int module = touch->GetReplicaNumber(moduleLev);
170170
if (verbose_ && (cell == -1))
171-
edm::LogVerbatim("HGCSim") << "Top " << touch->GetVolume(0)->GetName() << " Module " << moduleLev << ":" << touch->GetVolume(moduleLev)->GetName() << " " << module;
171+
edm::LogVerbatim("HGCSim") << "Top " << touch->GetVolume(0)->GetName() << " Module " << moduleLev << ":"
172+
<< touch->GetVolume(moduleLev)->GetName() << " " << module;
172173
#ifdef EDM_ML_DEBUG
173174
edm::LogVerbatim("HGCSim") << "DepthsTop: " << touch->GetHistoryDepth() << ":" << levelT1_ << ":" << levelT2_ << ":"
174175
<< useSimWt_ << " name " << touch->GetVolume(0)->GetName() << " layer:module:cell "
@@ -210,9 +211,16 @@ uint32_t HGCalSD::setDetUnitId(const G4Step* aStep) {
210211
if (fiducialCut_) {
211212
int layertype = hgcons_->layerType(layer);
212213
int frontBack = HGCalTypes::layerFrontBack(layertype);
213-
bool reject = ((guardRing_->exclude(local, iz, frontBack, layer, uv.first, uv.second)) || (guardRingPartial_->exclude(local, iz, frontBack, layer, uv.first, uv.second)));
214+
bool reject = ((guardRing_->exclude(local, iz, frontBack, layer, uv.first, uv.second)) ||
215+
(guardRingPartial_->exclude(local, iz, frontBack, layer, uv.first, uv.second)));
214216
#ifdef EDM_ML_DEBUG
215-
edm::LogVerbatim("HGCSim") << "Zside:Layer:WaferU:WaferV " << iz << ":" << layer << ":" << uv.first << ":" << uv.second << " LayerType " << layertype << " FrontBack " << frontBack << " PartialType " << hgcons_->partialWaferType(layer, uv.first, uv.second) << ":" << HGCalTypes::WaferFull << " Reject " << guardRing_->exclude(local, iz, frontBack, layer, uv.first, uv.second) << ":" << guardRingPartial_->exclude(local, iz, frontBack, layer, uv.first, uv.second) << ":" << reject;
217+
edm::LogVerbatim("HGCSim") << "Zside:Layer:WaferU:WaferV " << iz << ":" << layer << ":" << uv.first << ":"
218+
<< uv.second << " LayerType " << layertype << " FrontBack " << frontBack
219+
<< " PartialType " << hgcons_->partialWaferType(layer, uv.first, uv.second) << ":"
220+
<< HGCalTypes::WaferFull << " Reject "
221+
<< guardRing_->exclude(local, iz, frontBack, layer, uv.first, uv.second) << ":"
222+
<< guardRingPartial_->exclude(local, iz, frontBack, layer, uv.first, uv.second) << ":"
223+
<< reject;
216224
if (reject)
217225
edm::LogVerbatim("HGCSim") << "Rejected by GuardRing cutoff *****";
218226
#endif

0 commit comments

Comments
 (0)