Skip to content

Commit 64de6d4

Browse files
author
Sunanda
committed
Code check
1 parent 0c4950b commit 64de6d4

File tree

1 file changed

+23
-20
lines changed

1 file changed

+23
-20
lines changed

Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -585,10 +585,10 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
585585
? tileCoarseLayerStart_[layer + 1]
586586
: static_cast<int>(tileCoarseIndex_.size()));
587587
#ifdef EDM_ML_DEBUG
588-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << ly << ":" << ii << ":" << layer << ":" << layer0
589-
<< " Copy " << copy << " Tiles " << firstTile << ":" << lastTile << " Size "
590-
<< tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine " << fine
591-
<< " absType " << absType;
588+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << ly << ":" << ii << ":" << layer << ":"
589+
<< layer0 << " Copy " << copy << " Tiles " << firstTile << ":" << lastTile
590+
<< " Size " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine "
591+
<< fine << " absType " << absType;
592592
#endif
593593
for (int ti = firstTile; ti < lastTile; ++ti) {
594594
double r1, r2;
@@ -679,8 +679,8 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
679679
? tileCoarseLayerStart_[layer + 1]
680680
: static_cast<int>(tileCoarseIndex_.size()));
681681
#ifdef EDM_ML_DEBUG
682-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: TOP Layer " << ii << ":" << layer << ":" << layer0 << " Copy "
683-
<< copy << " Tiles " << firstTile << ":" << lastTile << " Size "
682+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: TOP Layer " << ii << ":" << layer << ":" << layer0
683+
<< " Copy " << copy << " Tiles " << firstTile << ":" << lastTile << " Size "
684684
<< tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine " << fine
685685
<< " absType " << absType;
686686
#endif
@@ -713,18 +713,18 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
713713
double phi2 = dphi * (fimax - fimin + 1);
714714
auto cshift = cassette_.getShift(layer0, -1, cassette, true);
715715
#ifdef EDM_ML_DEBUG
716-
edm::LogVerbatim("HGCalGeom") << "2Layer " << ii << ":" << copy << ":" << layer << ":" << layer0 << " Cassette " << cassette
717-
<< " shift " << cshift.first << ":" << cshift.second;
716+
edm::LogVerbatim("HGCalGeom") << "2Layer " << ii << ":" << copy << ":" << layer << ":" << layer0 << " Cassette "
717+
<< cassette << " shift " << cshift.first << ":" << cshift.second;
718718
int cassette0 = HGCalCassette::cassetteType(2, 1, cassette); //
719719
int ir1 = (fine) ? std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti]))
720720
: std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
721721
int ir2 = (fine) ? std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti]))
722722
: std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
723-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << (layer + 1) << ":" << layer0 << " iR "
724-
<< ir1 << ":" << ir2 << " R " << r1 << ":" << r2 << " Thick " << (2.0 * hthickl)
725-
<< " phi " << fimin << ":" << fimax << ":" << convertRadToDeg(phi1) << ":"
726-
<< convertRadToDeg(phi2) << " cassette " << cassette << ":" << cassette0
727-
<< " Shift " << cshift.first << ":" << cshift.second;
723+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << (layer + 1) << ":"
724+
<< layer0 << " iR " << ir1 << ":" << ir2 << " R " << r1 << ":" << r2 << " Thick "
725+
<< (2.0 * hthickl) << " phi " << fimin << ":" << fimax << ":"
726+
<< convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette " << cassette
727+
<< ":" << cassette0 << " Shift " << cshift.first << ":" << cshift.second;
728728
#endif
729729
std::string name = namesTop_[ii] + "L" + std::to_string(copy) + "F" + std::to_string(k);
730730
++k;
@@ -749,7 +749,8 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
749749
int layer = (copyM - firstFineLayer_);
750750
int layer0 = (copyM - std::min(firstFineLayer_, firstCoarseLayer_) + 1);
751751
#ifdef EDM_ML_DEBUG
752-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Start bottom section for layer " << (layer + 1) << ":" << layer0 << " absType " << absType;
752+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Start bottom section for layer " << (layer + 1)
753+
<< ":" << layer0 << " absType " << absType;
753754
#endif
754755
if (absType > 0) {
755756
#ifdef EDM_ML_DEBUG
@@ -759,7 +760,8 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
759760
int cassette = k + 1;
760761
auto cshift = cassette_.getShift(layer0, -1, cassette);
761762
#ifdef EDM_ML_DEBUG
762-
edm::LogVerbatim("HGCalGeom") << "3Layer " << layer << ":" << layer0 << " Cassette " << cassette << " shift " << cshift.first << ":" << cshift.second;
763+
edm::LogVerbatim("HGCalGeom") << "3Layer " << layer << ":" << layer0 << " Cassette " << cassette << " shift "
764+
<< cshift.first << ":" << cshift.second;
763765
#endif
764766
double xpos = -cshift.first;
765767
double ypos = cshift.second;
@@ -830,18 +832,19 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
830832
#endif
831833
auto cshift = cassette_.getShift(layer0, -1, cassette, false);
832834
#ifdef EDM_ML_DEBUG
833-
edm::LogVerbatim("HGCalGeom") << "Layer " << (layer + 1) << ":" << layer0 << " Cassette " << cassette << " shift " << cshift.first << ":" << cshift.second;
835+
edm::LogVerbatim("HGCalGeom") << "Layer " << (layer + 1) << ":" << layer0 << " Cassette " << cassette << " shift "
836+
<< cshift.first << ":" << cshift.second;
834837
#endif
835838
double xpos = xyoff.first - cshift.first + nc * delx;
836839
double ypos = xyoff.second + cshift.second + nr * dy;
837840
#ifdef EDM_ML_DEBUG
838841
double xorig = xyoff.first + nc * delx;
839842
double yorig = xyoff.second + nr * dy;
840843
double angle = std::atan2(yorig, xorig);
841-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Wafer: layer " << layer + 1 << ":" << layer0 << " cassette "
842-
<< cassette << " Shift " << cshift.first << ":" << cshift.second << " Original "
843-
<< xorig << ":" << yorig << ":" << convertRadToDeg(angle) << " Final " << xpos
844-
<< ":" << ypos;
844+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Wafer: layer " << layer + 1 << ":" << layer0
845+
<< " cassette " << cassette << " Shift " << cshift.first << ":" << cshift.second
846+
<< " Original " << xorig << ":" << yorig << ":" << convertRadToDeg(angle)
847+
<< " Final " << xpos << ":" << ypos;
845848
#endif
846849
std::string wafer;
847850
int i(999);

0 commit comments

Comments
 (0)