Skip to content

Commit f3c273d

Browse files
author
Sunanda
committed
Code check
1 parent 6631c82 commit f3c273d

File tree

1 file changed

+46
-41
lines changed

1 file changed

+46
-41
lines changed

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

Lines changed: 46 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,9 @@ struct HGCalMixRotatedFineCassette {
307307
if (testCassette != 0)
308308
testCassetteShift();
309309

310-
311-
////////////////////////////////////////////////////////////////////
312-
// DDHGCalMixRotatedFineCassette methods...
313-
////////////////////////////////////////////////////////////////////
310+
////////////////////////////////////////////////////////////////////
311+
// DDHGCalMixRotatedFineCassette methods...
312+
////////////////////////////////////////////////////////////////////
314313

315314
#ifdef EDM_ML_DEBUG
316315
edm::LogVerbatim("HGCalGeom") << "==>> Constructing DDHGCalMixRotatedFineCassette...";
@@ -471,7 +470,7 @@ struct HGCalMixRotatedFineCassette {
471470
int ii = layerTypeTop_[ly];
472471
int copy = copyNumberTop_[ii];
473472
int layer = (fine) ? (copy - firstFineLayer_) : (copy - firstCoarseLayer_);
474-
int layer0 = (copy - std::min(firstFineLayer_, firstCoarseLayer_) + 1);
473+
int layer0 = (copy - std::min(firstFineLayer_, firstCoarseLayer_) + 1);
475474
double hthickl = 0.5 * layerThickTop_[ii];
476475
thickTot += layerThickTop_[ii];
477476
zpos += hthickl;
@@ -485,11 +484,11 @@ struct HGCalMixRotatedFineCassette {
485484
? tileCoarseLayerStart_[layer + 1]
486485
: static_cast<int>(tileCoarseIndex_.size()));
487486
#ifdef EDM_ML_DEBUG
488-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << ly << ":" << ii << ":" << layer << ":" << layer0
489-
<< " Copy " << copy << " Tiles " << firstTile << ":" << lastTile << " Size "
490-
<< tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine " << fine
491-
<< " absType " << absType;
492-
int cassette;
487+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << ly << ":" << ii << ":" << layer
488+
<< ":" << layer0 << " Copy " << copy << " Tiles " << firstTile << ":" << lastTile
489+
<< " Size " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine "
490+
<< fine << " absType " << absType;
491+
int cassette;
493492
#endif
494493
for (int ti = firstTile; ti < lastTile; ++ti) {
495494
double r1, r2;
@@ -522,19 +521,19 @@ struct HGCalMixRotatedFineCassette {
522521
#endif
523522
double phi1 = dphi * (fimin - 1);
524523
double phi2 = dphi * (fimax - fimin + 1);
525-
r1 += retract_[layer0 - 1];
526-
r2 += retract_[layer0 - 1];
524+
r1 += retract_[layer0 - 1];
525+
r2 += retract_[layer0 - 1];
527526
#ifdef EDM_ML_DEBUG
528-
double phi = phi1 + 0.5 * phi2;
529-
edm::LogVerbatim("HGCalGeom") << "1Layer " << ly << ":" << ii << ":" << copy << ":" << layer0 << " phi " << phi
530-
<< " shift " << retract_[layer0 - 1];
527+
double phi = phi1 + 0.5 * phi2;
528+
edm::LogVerbatim("HGCalGeom") << "1Layer " << ly << ":" << ii << ":" << copy << ":" << layer0 << " phi "
529+
<< phi << " shift " << retract_[layer0 - 1];
531530
int cassette0 = HGCalCassette::cassetteType(2, 1, cassette); //
532531
int ir1 = (fine) ? std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti]))
533532
: std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
534533
int ir2 = (fine) ? std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti]))
535534
: std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
536-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << layer0
537-
<< " iR " << ir1 << ":" << ir2 << " R " << cms::convert2mm(r1) << ":"
535+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << layer0 << " iR "
536+
<< ir1 << ":" << ir2 << " R " << cms::convert2mm(r1) << ":"
538537
<< cms::convert2mm(r2) << " Thick " << cms::convert2mm(2.0 * hthickl) << " phi "
539538
<< fimin << ":" << fimax << ":" << convertRadToDeg(phi1) << ":"
540539
<< convertRadToDeg(phi2) << " cassette " << cassette << ":" << cassette0
@@ -556,7 +555,8 @@ struct HGCalMixRotatedFineCassette {
556555
glog.placeVolume(glog1, copy, tran);
557556
#ifdef EDM_ML_DEBUG
558557
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Position " << glog1.name() << " number "
559-
<< copy << " in " << glog.name() << " at (0,0," << cms::convert2mm(zpos) << ") with no rotation";
558+
<< copy << " in " << glog.name() << " at (0,0," << cms::convert2mm(zpos)
559+
<< ") with no rotation";
560560
#endif
561561
}
562562
++copyNumberTop_[ii];
@@ -590,7 +590,10 @@ struct HGCalMixRotatedFineCassette {
590590
? tileCoarseLayerStart_[layer + 1]
591591
: static_cast<int>(tileCoarseIndex_.size()));
592592
#ifdef EDM_ML_DEBUG
593-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: TOP Layer " << ii << ":" << layer << ":" << layer0 << " Copy " << copy << " Tiles " << firstTile << ":" << lastTile << " Size " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine " << fine << " absType " << absType;
593+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: TOP Layer " << ii << ":" << layer << ":"
594+
<< layer0 << " Copy " << copy << " Tiles " << firstTile << ":" << lastTile
595+
<< " Size " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " Fine "
596+
<< fine << " absType " << absType;
594597
int cassette;
595598
#endif
596599
for (int ti = firstTile; ti < lastTile; ++ti) {
@@ -624,22 +627,23 @@ struct HGCalMixRotatedFineCassette {
624627
#endif
625628
double phi1 = dphi * (fimin - 1);
626629
double phi2 = dphi * (fimax - fimin + 1);
627-
r1 += retract_[layer0 - 1];
628-
r2 += retract_[layer0 - 1];
630+
r1 += retract_[layer0 - 1];
631+
r2 += retract_[layer0 - 1];
629632
#ifdef EDM_ML_DEBUG
630-
double phi = phi1 + 0.5 * phi2;
631-
edm::LogVerbatim("HGCalGeom") << "2Layer " << ii << ":" << copy << ":" << layer << ":" << layer0 << " phi " << phi
632-
<< " shift " << retract_[layer0 - 1];
633+
double phi = phi1 + 0.5 * phi2;
634+
edm::LogVerbatim("HGCalGeom") << "2Layer " << ii << ":" << copy << ":" << layer << ":" << layer0 << " phi "
635+
<< phi << " shift " << retract_[layer0 - 1];
633636
int cassette0 = HGCalCassette::cassetteType(2, 1, cassette); //
634637
int ir1 = (fine) ? std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti]))
635638
: std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
636639
int ir2 = (fine) ? std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti]))
637640
: std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti]));
638-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << (layer + 1) << ":" << layer0 << " iR "
639-
<< ir1 << ":" << ir2 << " R " << cms::convert2mm(r1) << ":" << cms::convert2mm(r2)
640-
<< " Thick " << cms::convert2mm(2.0 * hthickl) << " phi " << fimin << ":" << fimax
641-
<< ":" << convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette "
642-
<< cassette << ":" << cassette0 << " Shift " << cms::convert2mm(retract_[layer0 - 1]);
641+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << (layer + 1) << ":"
642+
<< layer0 << " iR " << ir1 << ":" << ir2 << " R " << cms::convert2mm(r1) << ":"
643+
<< cms::convert2mm(r2) << " Thick " << cms::convert2mm(2.0 * hthickl) << " phi "
644+
<< fimin << ":" << fimax << ":" << convertRadToDeg(phi1) << ":"
645+
<< convertRadToDeg(phi2) << " cassette " << cassette << ":" << cassette0
646+
<< " Shift " << cms::convert2mm(retract_[layer0 - 1]);
643647
#endif
644648
std::string name = namesTop_[ii] + "L" + std::to_string(copy) + "F" + std::to_string(k);
645649
++k;
@@ -668,7 +672,8 @@ struct HGCalMixRotatedFineCassette {
668672
int layer = (copyM - firstFineLayer_);
669673
int layer0 = (copyM - std::min(firstFineLayer_, firstCoarseLayer_) + 1);
670674
#ifdef EDM_ML_DEBUG
671-
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Start bottom section for layer " << (layer + 1) << ":" << layer0 << " absType " << absType;
675+
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Start bottom section for layer " << (layer + 1)
676+
<< ":" << layer0 << " absType " << absType;
672677
#endif
673678
if (absType > 0) {
674679
#ifdef EDM_ML_DEBUG
@@ -678,8 +683,8 @@ struct HGCalMixRotatedFineCassette {
678683
int cassette = k + 1;
679684
auto cshift = cassette_.getShift(layer0, -1, cassette);
680685
#ifdef EDM_ML_DEBUG
681-
edm::LogVerbatim("HGCalGeom") << "3Layer " << layer << ":" << layer0 << " Cassette " << cassette << " shift "
682-
<< cms::convert2mm(cshift.first) << ":" << cms::convert2mm(cshift.second);
686+
edm::LogVerbatim("HGCalGeom") << "3Layer " << layer << ":" << layer0 << " Cassette " << cassette << " shift "
687+
<< cms::convert2mm(cshift.first) << ":" << cms::convert2mm(cshift.second);
683688
#endif
684689
double xpos = -cshift.first;
685690
double ypos = cshift.second;
@@ -821,19 +826,19 @@ struct HGCalMixRotatedFineCassette {
821826
for (unsigned int k = 0; k < layers_.size(); ++k) {
822827
int layer = k + 1;
823828
for (int l = 0; l < cassettes_; ++l) {
824-
int cassette = l + 1;
825-
auto cf1 = cassette_.getShift(layer, 1, cassette, false);
826-
auto cf2 = cassette_.getShift(layer, 1, cassette, true);
827-
auto cf3 = cassette_.getShift(layer, -1, cassette, false);
828-
auto cf4 = cassette_.getShift(layer, -1, cassette, true);
829-
edm::LogVerbatim("HGCalGeom") << "Layer " << layer << " Cassette " << cassette << " x for z+ " << cf1.first << ":"
830-
<< cf2.first << " y for z+ " << cf1.second << ":" << cf2.second << " x for z- "
831-
<< cf3.first << ":" << cf4.first << " y for z- " << cf3.second << ":" << cf4.second;
829+
int cassette = l + 1;
830+
auto cf1 = cassette_.getShift(layer, 1, cassette, false);
831+
auto cf2 = cassette_.getShift(layer, 1, cassette, true);
832+
auto cf3 = cassette_.getShift(layer, -1, cassette, false);
833+
auto cf4 = cassette_.getShift(layer, -1, cassette, true);
834+
edm::LogVerbatim("HGCalGeom") << "Layer " << layer << " Cassette " << cassette << " x for z+ " << cf1.first
835+
<< ":" << cf2.first << " y for z+ " << cf1.second << ":" << cf2.second
836+
<< " x for z- " << cf3.first << ":" << cf4.first << " y for z- " << cf3.second
837+
<< ":" << cf4.second;
832838
}
833839
}
834840
}
835841

836-
837842
HGCalGeomTools geomTools_;
838843
HGCalCassette cassette_;
839844

0 commit comments

Comments
 (0)