@@ -618,7 +618,8 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
618618 double phi2 = dphi * (fimax - fimin + 1 ) - tol0_;
619619 auto cshift = cassette_.getShift (layer + 1 , 1 , cassette, true );
620620#ifdef EDM_ML_DEBUG
621- edm::LogVerbatim (" HGCalGeom" ) << " 1Layer " << ly << " :" << ii << " :" << copy << " :" << layer << " Cassette " << cassette << " shift " << cshift.first << " :" << cshift.second ;
621+ edm::LogVerbatim (" HGCalGeom" ) << " 1Layer " << ly << " :" << ii << " :" << copy << " :" << layer << " Cassette "
622+ << cassette << " shift " << cshift.first << " :" << cshift.second ;
622623 int cassette0 = HGCalCassette::cassetteType (2 , 1 , cassette); //
623624 int ir1 = (fine) ? std::get<1 >(HGCalTileIndex::tileUnpack (tileFineIndex_[ti]))
624625 : std::get<1 >(HGCalTileIndex::tileUnpack (tileCoarseIndex_[ti]));
@@ -710,7 +711,8 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
710711 double phi2 = dphi * (fimax - fimin + 1 );
711712 auto cshift = cassette_.getShift (layer + 1 , 1 , cassette, true );
712713#ifdef EDM_ML_DEBUG
713- edm::LogVerbatim (" HGCalGeom" ) << " 2Layer " << ii << " :" << copy << " :" << layer << " Cassette " << cassette << " shift " << cshift.first << " :" << cshift.second ;
714+ edm::LogVerbatim (" HGCalGeom" ) << " 2Layer " << ii << " :" << copy << " :" << layer << " Cassette " << cassette
715+ << " shift " << cshift.first << " :" << cshift.second ;
714716 int cassette0 = HGCalCassette::cassetteType (2 , 1 , cassette); //
715717 int ir1 = (fine) ? std::get<1 >(HGCalTileIndex::tileUnpack (tileFineIndex_[ti]))
716718 : std::get<1 >(HGCalTileIndex::tileUnpack (tileCoarseIndex_[ti]));
@@ -755,7 +757,8 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
755757 int cassette = k + 1 ;
756758 auto cshift = cassette_.getShift (layer + 1 , 1 , cassette);
757759#ifdef EDM_ML_DEBUG
758- edm::LogVerbatim (" HGCalGeom" ) << " 3Layer " << layer << " Cassette " << cassette << " shift " << cshift.first << " :" << cshift.second ;
760+ edm::LogVerbatim (" HGCalGeom" ) << " 3Layer " << layer << " Cassette " << cassette << " shift " << cshift.first
761+ << " :" << cshift.second ;
759762#endif
760763 double xpos = -cshift.first ;
761764 double ypos = cshift.second ;
@@ -826,7 +829,8 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
826829#endif
827830 auto cshift = cassette_.getShift (layer + 1 , 1 , cassette, false );
828831#ifdef EDM_ML_DEBUG
829- edm::LogVerbatim (" HGCalGeom" ) << " Layer " << layer << " Cassette " << cassette << " shift " << cshift.first << " :" << cshift.second ;
832+ edm::LogVerbatim (" HGCalGeom" ) << " Layer " << layer << " Cassette " << cassette << " shift " << cshift.first << " :"
833+ << cshift.second ;
830834#endif
831835 double xpos = xyoff.first - cshift.first + nc * delx;
832836 double ypos = xyoff.second + cshift.second + nr * dy;
@@ -900,9 +904,11 @@ void DDHGCalMixRotatedFineCassette::testCassetteShift() {
900904 int cassette = l + 1 ;
901905 auto cf1 = cassette_.getShift (layer, 1 , cassette, false );
902906 auto cf2 = cassette_.getShift (layer, 1 , cassette, true );
903- auto cf3 = cassette_.getShift (layer,-1 , cassette, false );
904- auto cf4 = cassette_.getShift (layer,-1 , cassette, true );
905- edm::LogVerbatim (" HGCalGeom" ) << " Layer " << layer << " Cassette " << cassette << " x for z+ " << cf1.first << " :" << cf2.first << " y for z+ " << cf1.second << " :" << cf2.second << " x for z- " << cf3.first << " :" << cf4.first << " y for z- " << cf3.second << " :" << cf4.second ;
907+ auto cf3 = cassette_.getShift (layer, -1 , cassette, false );
908+ auto cf4 = cassette_.getShift (layer, -1 , cassette, true );
909+ edm::LogVerbatim (" HGCalGeom" ) << " Layer " << layer << " Cassette " << cassette << " x for z+ " << cf1.first << " :"
910+ << cf2.first << " y for z+ " << cf1.second << " :" << cf2.second << " x for z- "
911+ << cf3.first << " :" << cf4.first << " y for z- " << cf3.second << " :" << cf4.second ;
906912 }
907913 }
908914}
0 commit comments