Skip to content

Commit abecdf7

Browse files
author
Sunanda
committed
Code check
1 parent f0d7863 commit abecdf7

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixRotatedFineCassette.cc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,9 @@ struct HGCalMixRotatedFineCassette {
303303
double dphi = M_PI / cassettes_;
304304
for (unsigned int k = 0; k < layers_.size(); ++k) {
305305
for (int j = 0; j < cassettes_; ++j) {
306-
double phi = (2 * j + 1) * dphi;
307-
cassetteShiftScnt_.emplace_back(retract_[k] * cos(phi));
308-
cassetteShiftScnt_.emplace_back(retract_[k] * sin(phi));
306+
double phi = (2 * j + 1) * dphi;
307+
cassetteShiftScnt_.emplace_back(retract_[k] * cos(phi));
308+
cassetteShiftScnt_.emplace_back(retract_[k] * sin(phi));
309309
}
310310
}
311311
#ifdef EDM_ML_DEBUG
@@ -397,7 +397,7 @@ struct HGCalMixRotatedFineCassette {
397397
for (unsigned int k = 0; k < pgonZ.size(); ++k)
398398
edm::LogVerbatim("HGCalGeom") << "[" << k << "] z " << cms::convert2mm(pgonZ[k]) << " R "
399399
<< cms::convert2mm(pgonRin[k]) << ":" << cms::convert2mm(pgonRout[k]);
400-
edm::LogVerbatim("HGCalGeom") << "LayeerSense " << layerSense_[ly];
400+
edm::LogVerbatim("HGCalGeom") << "LayeerSense " << layerSense_[ly];
401401
#endif
402402
if (layerSense_[ly] < 0) {
403403
int absType = -layerSense_[ly];
@@ -540,8 +540,8 @@ struct HGCalMixRotatedFineCassette {
540540
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Casstee|Fimin|Fimax " << cassette << ":"
541541
<< fimin << ":" << fimax;
542542
#endif
543-
double phi1 = dphi * (fimin - 1);
544-
double phi2 = (forFireworks_ == 1) ? (dphi * (fimax - fimin + 1)) : (dphi * fimax);
543+
double phi1 = dphi * (fimin - 1);
544+
double phi2 = (forFireworks_ == 1) ? (dphi * (fimax - fimin + 1)) : (dphi * fimax);
545545
r1 += retract_[layer0 - 1];
546546
r2 += retract_[layer0 - 1];
547547
#ifdef EDM_ML_DEBUG
@@ -657,7 +657,7 @@ struct HGCalMixRotatedFineCassette {
657657
<< fimin << ":" << fimax;
658658
#endif
659659
double phi1 = dphi * (fimin - 1);
660-
double phi2 = (forFireworks_ == 1) ? (dphi * (fimax - fimin + 1)) : (dphi * fimax);
660+
double phi2 = (forFireworks_ == 1) ? (dphi * (fimax - fimin + 1)) : (dphi * fimax);
661661
r1 += retract_[layer0 - 1];
662662
r2 += retract_[layer0 - 1];
663663
#ifdef EDM_ML_DEBUG
@@ -793,22 +793,22 @@ struct HGCalMixRotatedFineCassette {
793793
#ifdef EDM_ML_DEBUG
794794
edm::LogVerbatim("HGCalGeom")
795795
<< "DDHGCalMixRotatedFineCassette::index:Property:layertype:type:part:orien:cassette:place:offsets:ind "
796-
<< k << ":" << waferProperty_[k] << ":" << layertype << ":" << type << ":" << part << ":" << orien
797-
<< ":" << cassette << ":" << place;
796+
<< k << ":" << waferProperty_[k] << ":" << layertype << ":" << type << ":" << part << ":" << orien << ":"
797+
<< cassette << ":" << place;
798798
#endif
799799
auto cshift = cassette_.getShift(layer0, -1, cassette, false);
800800
#ifdef EDM_ML_DEBUG
801-
edm::LogVerbatim("HGCalGeom") << "Layer " << (layer + 1) << ":" << layer0 << " Cassette " << cassette << " shift "
802-
<< cshift.first << ":" << cshift.second;
801+
edm::LogVerbatim("HGCalGeom") << "Layer " << (layer + 1) << ":" << layer0 << " Cassette " << cassette
802+
<< " shift " << cshift.first << ":" << cshift.second;
803803
#endif
804804
double xpos = xyoff.first - cshift.first + nc * delx;
805805
double ypos = xyoff.second + cshift.second + nr * dy;
806806
#ifdef EDM_ML_DEBUG
807807
double xorig = xyoff.first + nc * delx;
808808
double yorig = xyoff.second + nr * dy;
809809
double angle = std::atan2(yorig, xorig);
810-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Wafer: layer " << layer + 1 << ":" << layer0 << " cassette "
811-
<< cassette << " Shift " << cms::convert2mm(cshift.first) << ":"
810+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Wafer: layer " << layer + 1 << ":" << layer0
811+
<< " cassette " << cassette << " Shift " << cms::convert2mm(cshift.first) << ":"
812812
<< cms::convert2mm(cshift.second) << " Original " << cms::convert2mm(xorig) << ":"
813813
<< cms::convert2mm(yorig) << ":" << convertRadToDeg(angle) << " Final "
814814
<< cms::convert2mm(xpos) << ":" << cms::convert2mm(ypos);

0 commit comments

Comments
 (0)