Skip to content

Commit 46a68ec

Browse files
author
Sunanda
committed
Code check
1 parent 53858fd commit 46a68ec

File tree

2 files changed

+57
-23
lines changed

2 files changed

+57
-23
lines changed

‎Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,9 @@ void DDHGCalMixRotatedFineCassette::initialize(const DDNumericArguments& nArgs,
296296
std::ostringstream st0;
297297
for (int k = 0; k < coverTopLayers_; ++k)
298298
st0 << " " << copyNumberCoverTop_[k];
299-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << materialTop_.size() << " types of volumes in the top part; " << coverTopLayers_ << " covers of Type " << coverTypeTop_ << " with initial copy numbers: " << st0.str();
299+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << materialTop_.size()
300+
<< " types of volumes in the top part; " << coverTopLayers_ << " covers of Type "
301+
<< coverTypeTop_ << " with initial copy numbers: " << st0.str();
300302
for (unsigned int i = 0; i < materialTop_.size(); ++i)
301303
edm::LogVerbatim("HGCalGeom") << "Volume [" << i << "] " << namesTop_[i] << " of thickness " << layerThickTop_[i]
302304
<< " filled with " << materialTop_[i] << " first copy number " << copyNumberTop_[i];
@@ -537,7 +539,9 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
537539
double dphi = (fine) ? ((2._pi) / phiBinsFineScint_) : ((2._pi) / phiBinsScint_);
538540
double thickTot(0), zpos(-hthick);
539541
#ifdef EDM_ML_DEBUG
540-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Entry to positionMix with Name " << nameM << " copy " << copyM << " Thick " << thick << " AbsType " << absType << " Fine " << fine << " dphi " << convertRadToDeg(dphi);
542+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Entry to positionMix with Name " << nameM << " copy "
543+
<< copyM << " Thick " << thick << " AbsType " << absType << " Fine " << fine << " dphi "
544+
<< convertRadToDeg(dphi);
541545
#endif
542546
if (absType < 0) {
543547
for (unsigned int ly = 0; ly < layerTypeTop_.size(); ++ly) {
@@ -558,13 +562,18 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
558562
? tileCoarseLayerStart_[layer + 1]
559563
: static_cast<int>(tileCoarseIndex_.size()));
560564
#ifdef EDM_ML_DEBUG
561-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << ly << ":" << ii << ":" << layer << " Copy " << copy << " Tiles " << firstTile << ":" << lastTile << " Size " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine " << fine << " absType " << absType;
565+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << ly << ":" << ii << ":" << layer
566+
<< " Copy " << copy << " Tiles " << firstTile << ":" << lastTile << " Size "
567+
<< tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine " << fine
568+
<< " absType " << absType;
562569
#endif
563570
for (int ti = firstTile; ti < lastTile; ++ti) {
564571
double r1, r2;
565572
int cassette, fimin, fimax;
566573
#ifdef EDM_ML_DEBUG
567-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: ti " << ti << ":" << fine << " index " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Phis " << tileFinePhis_.size() << ":" << tileCoarsePhis_.size();
574+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: ti " << ti << ":" << fine << " index "
575+
<< tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Phis "
576+
<< tileFinePhis_.size() << ":" << tileCoarsePhis_.size();
568577
#endif
569578
if (fine) {
570579
r1 = tileFineRMin_[std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1];
@@ -580,7 +589,8 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
580589
fimax = std::get<2>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti]));
581590
}
582591
#ifdef EDM_ML_DEBUG
583-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Casstee|Fimin|Fimax " << cassette << ":" << fimin << ":" << fimax;
592+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Casstee|Fimin|Fimax " << cassette << ":"
593+
<< fimin << ":" << fimax;
584594
#endif
585595
double phi1 = dphi * (fimin - 1);
586596
double phi2 = dphi * (fimax - fimin + 1);
@@ -643,13 +653,18 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
643653
? tileCoarseLayerStart_[layer + 1]
644654
: static_cast<int>(tileCoarseIndex_.size()));
645655
#ifdef EDM_ML_DEBUG
646-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: TOP Layer " << ii << ":" << layer << " Copy " << copy << " Tiles " << firstTile << ":" << lastTile << " Size " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine " << fine << " absType " << absType;
656+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: TOP Layer " << ii << ":" << layer << " Copy "
657+
<< copy << " Tiles " << firstTile << ":" << lastTile << " Size "
658+
<< tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine " << fine
659+
<< " absType " << absType;
647660
#endif
648661
for (int ti = firstTile; ti < lastTile; ++ti) {
649662
double r1, r2;
650663
int cassette, fimin, fimax;
651664
#ifdef EDM_ML_DEBUG
652-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: ti " << ti << ":" << fine << " index " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Phis " << tileFinePhis_.size() << ":" << tileCoarsePhis_.size();
665+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: ti " << ti << ":" << fine << " index "
666+
<< tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Phis "
667+
<< tileFinePhis_.size() << ":" << tileCoarsePhis_.size();
653668
#endif
654669
if (fine) {
655670
r1 = tileFineRMin_[std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1];
@@ -665,7 +680,8 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
665680
fimax = std::get<2>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti]));
666681
}
667682
#ifdef EDM_ML_DEBUG
668-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Casstee|Fimin|Fimax " << cassette << ":" << fimin << ":" << fimax;
683+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Casstee|Fimin|Fimax " << cassette << ":" << fimin
684+
<< ":" << fimax;
669685
#endif
670686
double phi1 = dphi * (fimin - 1);
671687
double phi2 = dphi * (fimax - fimin + 1);
@@ -704,7 +720,8 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
704720
// Make the bottom part next
705721
int layer = (copyM - firstFineLayer_);
706722
#ifdef EDM_ML_DEBUG
707-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Start bottom section for layer " << layer << " absType " << absType;
723+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Start bottom section for layer " << layer
724+
<< " absType " << absType;
708725
#endif
709726
if (absType > 0) {
710727
#ifdef EDM_ML_DEBUG

‎Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixRotatedFineCassette.cc‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,12 @@ struct HGCalMixRotatedFineCassette {
198198
coverTopLayers_ = args.value<int>("TopCoverLayers");
199199
copyNumberCoverTop_.resize(coverTopLayers_, firstFineLayer_);
200200
#ifdef EDM_ML_DEBUG
201-
std::ostringstream st0;
202-
for (int k = 0; k < coverTopLayers_; ++k)
203-
st0 << " " << copyNumberCoverTop_[k];
204-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << materialTop_.size() << " types of volumes in the top part; " << coverTopLayers_ << " covers of Type " << coverTypeTop_ << " with initial copy numbers: " << st0.str();
201+
std::ostringstream st0;
202+
for (int k = 0; k < coverTopLayers_; ++k)
203+
st0 << " " << copyNumberCoverTop_[k];
204+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << materialTop_.size()
205+
<< " types of volumes in the top part; " << coverTopLayers_ << " covers of Type "
206+
<< coverTypeTop_ << " with initial copy numbers: " << st0.str();
205207
for (unsigned int i = 0; i < materialTop_.size(); ++i)
206208
edm::LogVerbatim("HGCalGeom") << "Volume [" << i << "] " << namesTop_[i] << " of thickness " << layerThickTop_[i]
207209
<< " filled with " << materialTop_[i] << " first copy number " << copyNumberTop_[i];
@@ -440,7 +442,9 @@ struct HGCalMixRotatedFineCassette {
440442
double dphi = (fine) ? ((2._pi) / phiBinsFineScint_) : ((2._pi) / phiBinsScint_);
441443
double thickTot(0), zpos(-hthick);
442444
#ifdef EDM_ML_DEBUG
443-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Entry to positionMix with Name " << nameM << " copy " << copyM << " Thick " << thick << " AbsType " << absType << " Fine " << fine << " dphi " << convertRadToDeg(dphi);
445+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Entry to positionMix with Name " << nameM
446+
<< " copy " << copyM << " Thick " << thick << " AbsType " << absType << " Fine "
447+
<< fine << " dphi " << convertRadToDeg(dphi);
444448
#endif
445449
if (absType < 0) {
446450
for (unsigned int ly = 0; ly < layerTypeTop_.size(); ++ly) {
@@ -460,15 +464,20 @@ struct HGCalMixRotatedFineCassette {
460464
? tileCoarseLayerStart_[layer + 1]
461465
: static_cast<int>(tileCoarseIndex_.size()));
462466
#ifdef EDM_ML_DEBUG
463-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << ly << ":" << ii << ":" << layer << " Copy " << copy << " Tiles " << firstTile << ":" << lastTile << " Size " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine " << fine << " absType " << absType;
467+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << ly << ":" << ii << ":" << layer
468+
<< " Copy " << copy << " Tiles " << firstTile << ":" << lastTile << " Size "
469+
<< tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine " << fine
470+
<< " absType " << absType;
464471
#endif
465472
for (int ti = firstTile; ti < lastTile; ++ti) {
466473
double r1, r2;
467474
int cassette, fimin, fimax;
468475
#ifdef EDM_ML_DEBUG
469-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: ti " << ti << ":" << fine << " index " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Phis " << tileFinePhis_.size() << ":" << tileCoarsePhis_.size();
476+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: ti " << ti << ":" << fine << " index "
477+
<< tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Phis "
478+
<< tileFinePhis_.size() << ":" << tileCoarsePhis_.size();
470479
#endif
471-
if (fine) {
480+
if (fine) {
472481
r1 = tileFineRMin_[std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1];
473482
r2 = tileFineRMax_[std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1];
474483
cassette = std::get<0>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti]));
@@ -482,7 +491,8 @@ struct HGCalMixRotatedFineCassette {
482491
fimax = std::get<2>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti]));
483492
}
484493
#ifdef EDM_ML_DEBUG
485-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Casstee|Fimin|Fimax " << cassette << ":" << fimin << ":" << fimax;
494+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Casstee|Fimin|Fimax " << cassette << ":"
495+
<< fimin << ":" << fimax;
486496
#endif
487497
double phi1 = dphi * (fimin - 1);
488498
double phi2 = dphi * (fimax - fimin + 1);
@@ -552,13 +562,18 @@ struct HGCalMixRotatedFineCassette {
552562
? tileCoarseLayerStart_[layer + 1]
553563
: static_cast<int>(tileCoarseIndex_.size()));
554564
#ifdef EDM_ML_DEBUG
555-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: TOP Layer " << ii << ":" << layer << " Copy " << copy << " Tiles " << firstTile << ":" << lastTile << " Size " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine " << fine << " absType " << absType;
565+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: TOP Layer " << ii << ":" << layer << " Copy "
566+
<< copy << " Tiles " << firstTile << ":" << lastTile << " Size "
567+
<< tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine " << fine
568+
<< " absType " << absType;
556569
#endif
557570
for (int ti = firstTile; ti < lastTile; ++ti) {
558571
double r1, r2;
559572
int cassette, fimin, fimax;
560573
#ifdef EDM_ML_DEBUG
561-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: ti " << ti << ":" << fine << " index " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Phis " << tileFinePhis_.size() << ":" << tileCoarsePhis_.size();
574+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: ti " << ti << ":" << fine << " index "
575+
<< tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Phis "
576+
<< tileFinePhis_.size() << ":" << tileCoarsePhis_.size();
562577
#endif
563578
if (fine) {
564579
r1 = tileFineRMin_[std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1];
@@ -574,8 +589,9 @@ struct HGCalMixRotatedFineCassette {
574589
fimax = std::get<2>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti]));
575590
}
576591
#ifdef EDM_ML_DEBUG
577-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Casstee|Fimin|Fimax " << cassette << ":" << fimin << ":" << fimax;
578-
#endif
592+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Casstee|Fimin|Fimax " << cassette << ":"
593+
<< fimin << ":" << fimax;
594+
#endif
579595
double phi1 = dphi * (fimin - 1);
580596
double phi2 = dphi * (fimax - fimin + 1);
581597
auto cshift = cassette_.getShift(layer + 1, 1, cassette, true);
@@ -619,7 +635,8 @@ struct HGCalMixRotatedFineCassette {
619635
// Make the bottom part next
620636
int layer = (copyM - firstFineLayer_);
621637
#ifdef EDM_ML_DEBUG
622-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Start bottom section for layer " << layer << " absType " << absType;
638+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Start bottom section for layer " << layer
639+
<< " absType " << absType;
623640
#endif
624641
if (absType > 0) {
625642
#ifdef EDM_ML_DEBUG

0 commit comments

Comments
 (0)