Skip to content

Commit 7f52026

Browse files
author
Sunanda
committed
Code check
1 parent d7e09ff commit 7f52026

File tree

2 files changed

+54
-32
lines changed

2 files changed

+54
-32
lines changed

‎Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ void DDHGCalMixRotatedFineCassette::initialize(const DDNumericArguments& nArgs,
190190
shiftedCassettes_ = dbl_to_int(vArgs["ShiftedCassettes"]);
191191
}
192192
#ifdef EDM_ML_DEBUG
193-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Change flag for IR shift " << changeCassetteIR_ << " by " << shiftCassetteIR_ << " for " << shiftedCassettes_.size() << " cassettes:";
193+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Change flag for IR shift " << changeCassetteIR_
194+
<< " by " << shiftCassetteIR_ << " for " << shiftedCassettes_.size() << " cassettes:";
194195
unsigned int i0max = static_cast<unsigned int>(shiftedCassettes_.size());
195196
for (unsigned int i1 = 0; i1 < i0max; i1 += 12) {
196197
std::ostringstream st1;
@@ -646,15 +647,15 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
646647
double phi2 = dphi * (fimax - fimin + 1);
647648
r1 += retract_[layer0 - 1];
648649
r2 += retract_[layer0 - 1];
649-
#ifdef EDM_ML_DEBUG
650-
double r0(r1);
650+
#ifdef EDM_ML_DEBUG
651+
double r0(r1);
651652
#endif
652-
// see if inner rdius to be changed or not
653-
if (changeCassetteIR_ > 0) {
654-
int tilex = 1000 * copy + k;
655-
if (std::find(shiftedCassettes_.begin(), shiftedCassettes_.end(), tilex) != shiftedCassettes_.end())
656-
r1 += shiftCassetteIR_;
657-
}
653+
// see if inner rdius to be changed or not
654+
if (changeCassetteIR_ > 0) {
655+
int tilex = 1000 * copy + k;
656+
if (std::find(shiftedCassettes_.begin(), shiftedCassettes_.end(), tilex) != shiftedCassettes_.end())
657+
r1 += shiftCassetteIR_;
658+
}
658659
#ifdef EDM_ML_DEBUG
659660
double phi = phi1 + 0.5 * phi2;
660661
edm::LogVerbatim("HGCalGeom") << "1Layer " << ly << ":" << ii << ":" << copy << ":" << layer0 << " phi " << phi
@@ -664,7 +665,11 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
664665
: std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
665666
int ir2 = (fine) ? std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti]))
666667
: std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
667-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << layer0 << " iR " << ir1 << ":" << ir2 << " R " << r0 << ":" << r1 << ":" << r2 << " Thick " << (2.0 * hthickl) << " phi " << fimin << ":" << fimax << ":" << convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette " << cassette << ":" << cassette0 << " Shift " << retract_[layer0 - 1];
668+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << layer0 << " iR "
669+
<< ir1 << ":" << ir2 << " R " << r0 << ":" << r1 << ":" << r2 << " Thick "
670+
<< (2.0 * hthickl) << " phi " << fimin << ":" << fimax << ":"
671+
<< convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette "
672+
<< cassette << ":" << cassette0 << " Shift " << retract_[layer0 - 1];
668673
#endif
669674
std::string name = namesTop_[ii] + "L" + std::to_string(copy) + "F" + std::to_string(k);
670675
++k;
@@ -752,14 +757,14 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
752757
double phi2 = dphi * (fimax - fimin + 1);
753758
r1 += retract_[layer0 - 1];
754759
r2 += retract_[layer0 - 1];
755-
#ifdef EDM_ML_DEBUG
760+
#ifdef EDM_ML_DEBUG
756761
double r0(r1);
757762
#endif
758763
// see if inner rdius to be changed or not
759764
if (changeCassetteIR_ > 0) {
760-
int tilex = 1000 * copy + k;
761-
if (std::find(shiftedCassettes_.begin(), shiftedCassettes_.end(), tilex) != shiftedCassettes_.end())
762-
r1 += shiftCassetteIR_;
765+
int tilex = 1000 * copy + k;
766+
if (std::find(shiftedCassettes_.begin(), shiftedCassettes_.end(), tilex) != shiftedCassettes_.end())
767+
r1 += shiftCassetteIR_;
763768
}
764769
#ifdef EDM_ML_DEBUG
765770
double phi = phi1 + 0.5 * phi2;
@@ -770,7 +775,11 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
770775
: std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
771776
int ir2 = (fine) ? std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti]))
772777
: std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
773-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << (layer + 1) << ":" << layer0 << " iR " << ir1 << ":" << ir2 << " R " << r0 << ":" << r1 << ":" << r2 << " Thick " << (2.0 * hthickl) << " phi " << fimin << ":" << fimax << ":" << convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette " << cassette << ":" << cassette0 << " Shift " << retract_[layer0 - 1];
778+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << (layer + 1) << ":"
779+
<< layer0 << " iR " << ir1 << ":" << ir2 << " R " << r0 << ":" << r1 << ":" << r2
780+
<< " Thick " << (2.0 * hthickl) << " phi " << fimin << ":" << fimax << ":"
781+
<< convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette " << cassette
782+
<< ":" << cassette0 << " Shift " << retract_[layer0 - 1];
774783
#endif
775784
std::string name = namesTop_[ii] + "L" + std::to_string(copy) + "F" + std::to_string(k);
776785
++k;

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

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,14 @@ struct HGCalMixRotatedFineCassette {
8888
shiftedCassettes_ = args.value<std::vector<int>>("ShiftedCassettes");
8989
}
9090
#ifdef EDM_ML_DEBUG
91-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Change flag for IR shift " << changeCassetteIR_ << " by " << shiftCassetteIR_ << " for " << shiftedCassettes_.size() << " cassettes:";
91+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Change flag for IR shift " << changeCassetteIR_
92+
<< " by " << shiftCassetteIR_ << " for " << shiftedCassettes_.size() << " cassettes:";
9293
unsigned int i0max = static_cast<unsigned int>(shiftedCassettes_.size());
9394
for (unsigned int i1 = 0; i1 < i0max; i1 += 12) {
9495
std::ostringstream st1;
9596
unsigned int i2 = std::min((i1 + 12), i0max);
9697
for (unsigned int i = i1; i < i2; ++i)
97-
st1 << " " << shiftedCassettes_[i];
98+
st1 << " " << shiftedCassettes_[i];
9899
edm::LogVerbatim("HGCalGeom") << st1.str();
99100
}
100101
#endif
@@ -541,14 +542,14 @@ struct HGCalMixRotatedFineCassette {
541542
r1 += retract_[layer0 - 1];
542543
r2 += retract_[layer0 - 1];
543544
#ifdef EDM_ML_DEBUG
544-
double r0(r1);
545+
double r0(r1);
545546
#endif
546-
// see if inner rdius to be changed or not
547-
if (changeCassetteIR_ > 0) {
548-
int tilex = 1000 * copy + k;
549-
if (std::find(shiftedCassettes_.begin(), shiftedCassettes_.end(), tilex) != shiftedCassettes_.end())
550-
r1 += shiftCassetteIR_;
551-
}
547+
// see if inner rdius to be changed or not
548+
if (changeCassetteIR_ > 0) {
549+
int tilex = 1000 * copy + k;
550+
if (std::find(shiftedCassettes_.begin(), shiftedCassettes_.end(), tilex) != shiftedCassettes_.end())
551+
r1 += shiftCassetteIR_;
552+
}
552553
#ifdef EDM_ML_DEBUG
553554
double phi = phi1 + 0.5 * phi2;
554555
edm::LogVerbatim("HGCalGeom") << "1Layer " << ly << ":" << ii << ":" << copy << ":" << layer0 << " phi "
@@ -558,7 +559,13 @@ struct HGCalMixRotatedFineCassette {
558559
: std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
559560
int ir2 = (fine) ? std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti]))
560561
: std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
561-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << layer0 << " iR " << ir1 << ":" << ir2 << " R " << cms::convert2mm(r0) << ":" << cms::convert2mm(r1) << ":" << cms::convert2mm(r2) << " Thick " << cms::convert2mm(2.0 * hthickl) << " phi " << fimin << ":" << fimax << ":" << convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette " << cassette << ":" << cassette0 << " Shift " << cms::convert2mm(retract_[layer0 - 1]);
562+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << layer0 << " iR "
563+
<< ir1 << ":" << ir2 << " R " << cms::convert2mm(r0) << ":"
564+
<< cms::convert2mm(r1) << ":" << cms::convert2mm(r2) << " Thick "
565+
<< cms::convert2mm(2.0 * hthickl) << " phi " << fimin << ":" << fimax << ":"
566+
<< convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette "
567+
<< cassette << ":" << cassette0 << " Shift "
568+
<< cms::convert2mm(retract_[layer0 - 1]);
562569
#endif
563570
std::string name = namesTop_[ii] + "L" + std::to_string(copy) + "F" + std::to_string(k);
564571
++k;
@@ -651,14 +658,14 @@ struct HGCalMixRotatedFineCassette {
651658
r1 += retract_[layer0 - 1];
652659
r2 += retract_[layer0 - 1];
653660
#ifdef EDM_ML_DEBUG
654-
double r0(r1);
661+
double r0(r1);
655662
#endif
656-
// see if inner rdius to be changed or not
657-
if (changeCassetteIR_ > 0) {
658-
int tilex = 1000 * copy + k;
659-
if (std::find(shiftedCassettes_.begin(), shiftedCassettes_.end(), tilex) != shiftedCassettes_.end())
663+
// see if inner rdius to be changed or not
664+
if (changeCassetteIR_ > 0) {
665+
int tilex = 1000 * copy + k;
666+
if (std::find(shiftedCassettes_.begin(), shiftedCassettes_.end(), tilex) != shiftedCassettes_.end())
660667
r1 += shiftCassetteIR_;
661-
}
668+
}
662669
#ifdef EDM_ML_DEBUG
663670
double phi = phi1 + 0.5 * phi2;
664671
edm::LogVerbatim("HGCalGeom") << "2Layer " << ii << ":" << copy << ":" << layer << ":" << layer0 << " phi "
@@ -668,7 +675,13 @@ struct HGCalMixRotatedFineCassette {
668675
: std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
669676
int ir2 = (fine) ? std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti]))
670677
: std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
671-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << (layer + 1) << ":" << layer0 << " iR " << ir1 << ":" << ir2 << " R " << cms::convert2mm(r0) << ":" << cms::convert2mm(r1) << ":" << cms::convert2mm(r2) << " Thick " << cms::convert2mm(2.0 * hthickl) << " phi " << fimin << ":" << fimax << ":" << convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette " << cassette << ":" << cassette0 << " Shift " << cms::convert2mm(retract_[layer0 - 1]);
678+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << (layer + 1) << ":"
679+
<< layer0 << " iR " << ir1 << ":" << ir2 << " R " << cms::convert2mm(r0) << ":"
680+
<< cms::convert2mm(r1) << ":" << cms::convert2mm(r2) << " Thick "
681+
<< cms::convert2mm(2.0 * hthickl) << " phi " << fimin << ":" << fimax << ":"
682+
<< convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette "
683+
<< cassette << ":" << cassette0 << " Shift "
684+
<< cms::convert2mm(retract_[layer0 - 1]);
672685
#endif
673686
std::string name = namesTop_[ii] + "L" + std::to_string(copy) + "F" + std::to_string(k);
674687
++k;

0 commit comments

Comments
 (0)