Skip to content

Commit 9dc6a5f

Browse files
author
Sunanda
committed
Code check
1 parent 7cc4a66 commit 9dc6a5f

File tree

5 files changed

+72
-52
lines changed

5 files changed

+72
-52
lines changed

‎Geometry/HGCalCommonData/interface/HGCalParameters.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ class HGCalParameters {
7979
double scintCellSize(const int layer) const { return cellSize_[scintType(layer)]; }
8080
bool scintFine(int indx) const { return ((!tileRingFineR_.empty()) && (nPhiLayer_[indx] > 288)); }
8181
int scintType(const int layer) const { return ((layer < layerFrontBH_[1]) ? 0 : 1); }
82-
bool scintValidRing(int indx, int irad) const { return (scintFine(indx) ? ((irad >= iradMinBHFine_[indx]) && (irad <= (iradMaxBHFine_[indx] + 1))) : ((irad >= iradMinBH_[indx]) && (irad <= (iradMaxBH_[indx] + 1)))); }
82+
bool scintValidRing(int indx, int irad) const {
83+
return (scintFine(indx) ? ((irad >= iradMinBHFine_[indx]) && (irad <= (iradMaxBHFine_[indx] + 1)))
84+
: ((irad >= iradMinBH_[indx]) && (irad <= (iradMaxBH_[indx] + 1))));
85+
}
8386
std::array<int, 4> getID(unsigned int k) const;
8487

8588
std::string name_;

‎Geometry/HGCalCommonData/src/HGCalCassette.cc‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ void HGCalCassette::setParameter(int cassette, const std::vector<double>& shifts
1010
cassette_ = cassette;
1111
typeHE_ = (cassette_ >= 12);
1212
#ifdef EDM_ML_DEBUG
13-
edm::LogVerbatim("HGCalGeom") << "HGCalCassette::setParameter Cassette" << cassette << " Both " << both << " Size " << shifts.size();
13+
edm::LogVerbatim("HGCalGeom") << "HGCalCassette::setParameter Cassette" << cassette << " Both " << both << " Size "
14+
<< shifts.size();
1415
#endif
1516
shifts_.insert(shifts_.end(), shifts.begin(), shifts.end());
1617
if (both)
@@ -61,7 +62,9 @@ std::pair<double, double> HGCalCassette::getShift(int layer, int zside, int cass
6162
int locc = (zside < 0) ? (cassette - 1) : (typeHE_ ? positHE_[cassette - 1] : positEE_[cassette - 1]);
6263
int loc = 2 * (cassette_ * (layer - 1) + locc);
6364
#ifdef EDM_ML_DEBUG
64-
edm::LogVerbatim("HGCalGeom") << "HGCalCassette::getShift: layer|zside|cassett|scnt " << layer << ":" << zside << ":" << cassette << ":" << scnt << " loc " << locc << ":" << loc << " size " << shiftsScnt_.size() << ":" << shifts_.size();
65+
edm::LogVerbatim("HGCalGeom") << "HGCalCassette::getShift: layer|zside|cassett|scnt " << layer << ":" << zside << ":"
66+
<< cassette << ":" << scnt << " loc " << locc << ":" << loc << " size "
67+
<< shiftsScnt_.size() << ":" << shifts_.size();
6568
#endif
6669
std::pair<double, double> xy = (typeHE_ && scnt) ? (std::make_pair(-zside * shiftsScnt_[loc], shiftsScnt_[loc + 1]))
6770
: (std::make_pair(-zside * shifts_[loc], shifts_[loc + 1]));

‎Geometry/HGCalCommonData/src/HGCalDDDConstants.cc‎

Lines changed: 45 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ using namespace geant_units::operators;
2525
HGCalDDDConstants::HGCalDDDConstants(const HGCalParameters* hp, const std::string& name)
2626
: hgpar_(hp), sqrt3_(std::sqrt(3.0)), mode_(hgpar_->mode_), fullAndPart_(waferHexagon8File()) {
2727
#ifdef EDM_ML_DEBUG
28-
edm::LogVerbatim("HGCalGeom") << "HGCalDDDConstants::Mode " << mode_ << " FullAndPart " << fullAndPart_ << " waferHex6:waverHex8 " << waferHexagon6() << ":" << waferHexagon8() << " cassettte " << cassetteMode();
28+
edm::LogVerbatim("HGCalGeom") << "HGCalDDDConstants::Mode " << mode_ << " FullAndPart " << fullAndPart_
29+
<< " waferHex6:waverHex8 " << waferHexagon6() << ":" << waferHexagon8() << " cassettte "
30+
<< cassetteMode();
2931
#endif
3032
if (waferHexagon6() || waferHexagon8()) {
3133
rmax_ = (HGCalParameters::k_ScaleFromDDD * (hgpar_->waferR_) * std::cos(30._deg));
@@ -231,7 +233,9 @@ std::array<int, 3> HGCalDDDConstants::assignCellTrap(float x, float y, float z,
231233
double r = std::sqrt(xx * xx + yy * yy);
232234
auto ir = std::lower_bound(hgpar_->radiusLayer_[type].begin(), hgpar_->radiusLayer_[type].end(), r);
233235
irad = static_cast<int>(ir - hgpar_->radiusLayer_[type].begin());
234-
irad = hgpar_->scintFine(indx.first) ? (std::clamp(irad, hgpar_->iradMinBHFine_[indx.first], hgpar_->iradMaxBHFine_[indx.first])) : (std::clamp(irad, hgpar_->iradMinBH_[indx.first], hgpar_->iradMaxBH_[indx.first]));
236+
irad = hgpar_->scintFine(indx.first)
237+
? (std::clamp(irad, hgpar_->iradMinBHFine_[indx.first], hgpar_->iradMaxBHFine_[indx.first]))
238+
: (std::clamp(irad, hgpar_->iradMinBH_[indx.first], hgpar_->iradMaxBH_[indx.first]));
235239
#ifdef EDM_ML_DEBUG
236240
edm::LogVerbatim("HGCalGeomT") << "assignCellTrap Input " << x << ":" << y << ":" << z << ":" << layer << ":" << reco
237241
<< " x|y|r " << xx << ":" << yy << ":" << r << " phi " << phi << ":"
@@ -241,34 +245,34 @@ std::array<int, 3> HGCalDDDConstants::assignCellTrap(float x, float y, float z,
241245
if (tileRingEdge(r, layer, irad)) {
242246
if (std::abs(r - hgpar_->radiusLayer_[type][irad - 1]) < tol_) {
243247
--irad;
244-
if (hgpar_->scintFine(indx.first)) {
245-
if (irad <= hgpar_->iradMinBHFine_[indx.first])
246-
irad = hgpar_->iradMinBHFine_[indx.first];
247-
} else {
248-
if (irad <= hgpar_->iradMinBH_[indx.first])
249-
irad = hgpar_->iradMinBH_[indx.first];
250-
}
248+
if (hgpar_->scintFine(indx.first)) {
249+
if (irad <= hgpar_->iradMinBHFine_[indx.first])
250+
irad = hgpar_->iradMinBHFine_[indx.first];
251+
} else {
252+
if (irad <= hgpar_->iradMinBH_[indx.first])
253+
irad = hgpar_->iradMinBH_[indx.first];
254+
}
251255
} else {
252256
++irad;
253-
if (hgpar_->scintFine(indx.first)) {
254-
if (irad > hgpar_->iradMaxBHFine_[indx.first])
255-
irad = hgpar_->iradMaxBHFine_[indx.first];
256-
} else {
257-
if (irad > hgpar_->iradMaxBH_[indx.first])
258-
irad = hgpar_->iradMaxBH_[indx.first];
259-
}
257+
if (hgpar_->scintFine(indx.first)) {
258+
if (irad > hgpar_->iradMaxBHFine_[indx.first])
259+
irad = hgpar_->iradMaxBHFine_[indx.first];
260+
} else {
261+
if (irad > hgpar_->iradMaxBH_[indx.first])
262+
irad = hgpar_->iradMaxBH_[indx.first];
263+
}
260264
}
261265
#ifdef EDM_ML_DEBUG
262266
std::ostringstream st1;
263267
st1 << "assignCellTrap: ring # in ring type " << hgpar_->scintFine(indx.first) << "modified to " << irad;
264268
if (irad > hgpar_->iradMaxBHFine_[indx.first])
265-
st1 << ":" << hgpar_->iradMinBHFine_[indx.first] << ":" << hgpar_->iradMaxBHFine_[indx.first];
269+
st1 << ":" << hgpar_->iradMinBHFine_[indx.first] << ":" << hgpar_->iradMaxBHFine_[indx.first];
266270
else
267-
st1 << ":" << hgpar_->iradMinBH_[indx.first] << ":" << hgpar_->iradMaxBH_[indx.first];
271+
st1 << ":" << hgpar_->iradMinBH_[indx.first] << ":" << hgpar_->iradMaxBH_[indx.first];
268272
edm::LogVerbatim("HGCalGeomT") << st1.str();
269273
#endif
270274
} else if (tilePhiEdge(phi, layer, iphi)) {
271-
if (std::abs(phi - hgpar_->scintCellSize(layer) * (iphi - 1)) < tol_) {
275+
if (std::abs(phi - hgpar_->scintCellSize(layer) * (iphi - 1)) < tol_) {
272276
--iphi;
273277
if (iphi <= 0)
274278
iphi = 1;
@@ -538,15 +542,15 @@ std::pair<int, int> HGCalDDDConstants::getREtaRange(int lay) const {
538542
int indx = layerIndex(lay, false);
539543
if (indx >= 0) {
540544
if (hgpar_->scintFine(indx)) {
541-
if (indx < static_cast<int>(hgpar_->iradMinBHFine_.size())) {
542-
irmin = hgpar_->iradMinBHFine_[indx];
543-
irmax = hgpar_->iradMaxBHFine_[indx];
544-
}
545+
if (indx < static_cast<int>(hgpar_->iradMinBHFine_.size())) {
546+
irmin = hgpar_->iradMinBHFine_[indx];
547+
irmax = hgpar_->iradMaxBHFine_[indx];
548+
}
545549
} else {
546-
if (indx < static_cast<int>(hgpar_->iradMinBH_.size())) {
547-
irmin = hgpar_->iradMinBH_[indx];
548-
irmax = hgpar_->iradMaxBH_[indx];
549-
}
550+
if (indx < static_cast<int>(hgpar_->iradMinBH_.size())) {
551+
irmin = hgpar_->iradMinBH_[indx];
552+
irmax = hgpar_->iradMaxBH_[indx];
553+
}
550554
}
551555
}
552556
}
@@ -778,7 +782,10 @@ bool HGCalDDDConstants::isValidTrap(int zside, int layer, int irad, int iphi) co
778782
bool valid = ((ok && trapezoidFile()) ? tileExist(zside, layer, irad, iphi) : ok);
779783
#ifdef EDM_ML_DEBUG
780784
bool tileEx = trapezoidFile() ? tileExist(zside, layer, irad, iphi) : true;
781-
edm::LogVerbatim("HGCalGeomT") << "HGCalDDDConstants::isValidityTrap: Input " << zside << ":" << layer << ":" << irad << ":" << iphi << " Range on Ring " << hgpar_->scintValidRing(indx.first, irad) << " Range on phi 0:" << hgpar_->scintCells(layer) << " tileExist " << tileEx << " Valid " << ok << ":" << tileExist(zside, layer, irad, iphi) << ":" << valid;
785+
edm::LogVerbatim("HGCalGeomT") << "HGCalDDDConstants::isValidityTrap: Input " << zside << ":" << layer << ":" << irad
786+
<< ":" << iphi << " Range on Ring " << hgpar_->scintValidRing(indx.first, irad)
787+
<< " Range on phi 0:" << hgpar_->scintCells(layer) << " tileExist " << tileEx
788+
<< " Valid " << ok << ":" << tileExist(zside, layer, irad, iphi) << ":" << valid;
782789
#endif
783790
return valid;
784791
}
@@ -1001,7 +1008,8 @@ std::pair<float, float> HGCalDDDConstants::locateCellTrap(
10011008
int zside, int lay, int irad, int iphi, bool reco, bool debug) const {
10021009
float x(0), y(0);
10031010
const auto& indx = getIndex(lay, reco);
1004-
edm::LogVerbatim("HGCalGeom") << "locateCellTrap:: Input " << lay << ":" << irad << ":" << iphi << ":" << zside << ":" << reco << ":" << indx.first;
1011+
edm::LogVerbatim("HGCalGeom") << "locateCellTrap:: Input " << lay << ":" << irad << ":" << iphi << ":" << zside << ":"
1012+
<< reco << ":" << indx.first;
10051013
debug = true;
10061014
if (indx.first >= 0) {
10071015
int ir = std::abs(irad);
@@ -1012,12 +1020,16 @@ std::pair<float, float> HGCalDDDConstants::locateCellTrap(
10121020
std::pair<double, double> range = rangeR(z, true);
10131021
if (debug) {
10141022
std::ostringstream st1;
1015-
st1 << "locateCellTrap:: Input " << lay << ":" << irad << ":" << iphi << ":" << reco << " indx " << indx.first << " IR " << ir << ":";
1023+
st1 << "locateCellTrap:: Input " << lay << ":" << irad << ":" << iphi << ":" << reco << " indx " << indx.first
1024+
<< " IR " << ir << ":";
10161025
if (hgpar_->scintFine(indx.first))
1017-
st1 << hgpar_->iradMinBHFine_[indx.first] << ":" << hgpar_->iradMaxBHFine_[indx.first];
1026+
st1 << hgpar_->iradMinBHFine_[indx.first] << ":" << hgpar_->iradMaxBHFine_[indx.first];
10181027
else
1019-
st1 << hgpar_->iradMinBH_[indx.first] << ":" << hgpar_->iradMaxBH_[indx.first];
1020-
edm::LogVerbatim("HGCalGeom") << st1.str() << " Type " << type << " Z " << indx.first << ":" << z << " phi " << phi << ":" << convertRadToDeg(phi) << " R " << r << ":" << range.first << ":" << range.second << " file " << (!trapezoidFile()) << " CassetteMode " << cassetteMode();
1028+
st1 << hgpar_->iradMinBH_[indx.first] << ":" << hgpar_->iradMaxBH_[indx.first];
1029+
edm::LogVerbatim("HGCalGeom") << st1.str() << " Type " << type << " Z " << indx.first << ":" << z << " phi "
1030+
<< phi << ":" << convertRadToDeg(phi) << " R " << r << ":" << range.first << ":"
1031+
<< range.second << " file " << (!trapezoidFile()) << " CassetteMode "
1032+
<< cassetteMode();
10211033
}
10221034
if (!trapezoidFile())
10231035
r = std::max(range.first, std::min(r, range.second));

‎Geometry/HGCalCommonData/src/HGCalGeomParameters.cc‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2405,11 +2405,11 @@ void HGCalGeomParameters::loadCellTrapezoid(HGCalParameters& php) {
24052405
#ifdef EDM_ML_DEBUG
24062406
int kk = php.scintType(php.firstLayer_ + static_cast<int>(k));
24072407
if (php.nPhiLayer_[k] > 288)
2408-
edm::LogVerbatim("HGCalGeom") << "New Layer " << k << " Type " << kk << " Low edge " << php.iradMinBHFine_.back()
2409-
<< " Top edge " << php.iradMaxBHFine_.back();
2408+
edm::LogVerbatim("HGCalGeom") << "New Layer " << k << " Type " << kk << " Low edge "
2409+
<< php.iradMinBHFine_.back() << " Top edge " << php.iradMaxBHFine_.back();
24102410
else
2411-
edm::LogVerbatim("HGCalGeom") << "New Layer " << k << " Type " << kk << " Low edge " << php.iradMinBH_.back()
2412-
<< " Top edge " << php.iradMaxBH_.back();
2411+
edm::LogVerbatim("HGCalGeom") << "New Layer " << k << " Type " << kk << " Low edge " << php.iradMinBH_.back()
2412+
<< " Top edge " << php.iradMaxBH_.back();
24132413
#endif
24142414
}
24152415
} else {
@@ -2480,11 +2480,11 @@ void HGCalGeomParameters::loadCellTrapezoid(HGCalParameters& php) {
24802480
#endif
24812481
}
24822482
if (php.nPhiLayer_[k] > 288) {
2483-
php.iradMinBHFine_.emplace_back(irlow);
2484-
php.iradMaxBHFine_.emplace_back(irhigh);
2483+
php.iradMinBHFine_.emplace_back(irlow);
2484+
php.iradMaxBHFine_.emplace_back(irhigh);
24852485
} else {
2486-
php.iradMinBH_.emplace_back(irlow);
2487-
php.iradMaxBH_.emplace_back(irhigh);
2486+
php.iradMinBH_.emplace_back(irlow);
2487+
php.iradMaxBH_.emplace_back(irhigh);
24882488
}
24892489
#ifdef EDM_ML_DEBUG
24902490
edm::LogVerbatim("HGCalGeom") << "Old Layer " << k << " Type " << kk << " Low edge " << irlow << ":" << drlow
@@ -2508,10 +2508,10 @@ void HGCalGeomParameters::loadCellTrapezoid(HGCalParameters& php) {
25082508
for (unsigned int k = 0; k < php.zLayerHex_.size(); ++k) {
25092509
if (php.nPhiLayer_[k] > 288) {
25102510
if (php.iradMaxBHFine_[k] > php.tileUVMaxFine_)
2511-
php.tileUVMaxFine_ = php.iradMaxBHFine_[k];
2511+
php.tileUVMaxFine_ = php.iradMaxBHFine_[k];
25122512
} else {
25132513
if (php.iradMaxBH_[k] > php.tileUVMax_)
2514-
php.tileUVMax_ = php.iradMaxBH_[k];
2514+
php.tileUVMax_ = php.iradMaxBH_[k];
25152515
}
25162516
int kk = (php.nPhiLayer_[k] > 288) ? 0 : 1;
25172517
int irm = php.radiusLayer_[kk].size() - 1;
@@ -2520,8 +2520,8 @@ void HGCalGeomParameters::loadCellTrapezoid(HGCalParameters& php) {
25202520
#ifdef EDM_ML_DEBUG
25212521
double rmin = php.radiusLayer_[kk][std::max((irmin - 1), 0)];
25222522
double rmax = php.radiusLayer_[kk][std::min(irmax, irm)];
2523-
edm::LogVerbatim("HGCalGeom") << "Layer " << php.firstLayer_ + k << ":" << kk << " Radius range "
2524-
<< irmin << ":" << irmax << ":" << rmin << ":" << rmax;
2523+
edm::LogVerbatim("HGCalGeom") << "Layer " << php.firstLayer_ + k << ":" << kk << " Radius range " << irmin << ":"
2524+
<< irmax << ":" << rmin << ":" << rmax;
25252525
#endif
25262526
mytr.lay = php.firstLayer_ + k;
25272527
for (int irad = irmin; irad <= irmax; ++irad) {
@@ -2540,18 +2540,18 @@ void HGCalGeomParameters::loadCellTrapezoid(HGCalParameters& php) {
25402540
mytr.cellSize *= HGCalParameters::k_ScaleFromDDD;
25412541
php.fillModule(mytr, false);
25422542
if (irad == irmin)
2543-
php.firstModule_.emplace_back(im);
2543+
php.firstModule_.emplace_back(im);
25442544
++im;
25452545
if (irad == irmax)
2546-
php.lastModule_.emplace_back(im);
2546+
php.lastModule_.emplace_back(im);
25472547
}
25482548
}
25492549
php.nSectors_ = std::max(php.tileUVMax_, php.tileUVMaxFine_);
25502550
#ifdef EDM_ML_DEBUG
25512551
edm::LogVerbatim("HGCalGeom") << "Maximum radius index " << php.tileUVMax_ << ":" << php.tileUVMaxFine_;
25522552
for (unsigned int k = 0; k < php.firstModule_.size(); ++k)
25532553
edm::LogVerbatim("HGCalGeom") << "Layer " << k + php.firstLayer_ << " Modules " << php.firstModule_[k] << ":"
2554-
<< php.lastModule_[k];
2554+
<< php.lastModule_[k];
25552555

25562556
#endif
25572557
}

‎Geometry/HGCalGeometry/src/HGCalGeometry.cc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ void HGCalGeometry::newCell(
120120
#endif
121121
} else {
122122
edm::LogWarning("HGCalGeom") << "Check " << HGCScintillatorDetId(idc) << " from " << HGCScintillatorDetId(detId)
123-
<< " Mode " << m_topology.dddConstants().geomMode() << ":" << m_topology.geomMode() << " Valid " << m_topology.tileTrapezoid() << ":" << m_topology.valid(idc) <<" ERROR ???";
123+
<< " Mode " << m_topology.dddConstants().geomMode() << ":" << m_topology.geomMode()
124+
<< " Valid " << m_topology.tileTrapezoid() << ":" << m_topology.valid(idc)
125+
<< " ERROR ???";
124126
}
125127
} else {
126128
#ifdef EDM_ML_DEBUG

0 commit comments

Comments
 (0)