diff --git a/Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml index f33d5e6791e17..55ce69779d7ad 100644 --- a/Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml +++ b/Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml @@ -1,5 +1,5 @@ - + @@ -171,10 +171,10 @@ - + - + diff --git a/Geometry/HGCalCommonData/data/hgcal/v11m20/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v11m20/hgcal.xml index 80acf2b194bd6..a651b2321fa0b 100644 --- a/Geometry/HGCalCommonData/data/hgcal/v11m20/hgcal.xml +++ b/Geometry/HGCalCommonData/data/hgcal/v11m20/hgcal.xml @@ -1,5 +1,5 @@ - + @@ -171,10 +171,10 @@ - + - + diff --git a/Geometry/HGCalCommonData/data/hgcal/v11p20/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v11p20/hgcal.xml index 88effe79e4348..0bd42bb8e97f7 100644 --- a/Geometry/HGCalCommonData/data/hgcal/v11p20/hgcal.xml +++ b/Geometry/HGCalCommonData/data/hgcal/v11p20/hgcal.xml @@ -1,5 +1,5 @@ - + @@ -171,10 +171,10 @@ - + - + diff --git a/Geometry/HGCalCommonData/data/hgcal/v12/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v12/hgcal.xml index 5836596562be9..d0c99f67fc772 100644 --- a/Geometry/HGCalCommonData/data/hgcal/v12/hgcal.xml +++ b/Geometry/HGCalCommonData/data/hgcal/v12/hgcal.xml @@ -1,5 +1,5 @@ - + @@ -177,10 +177,10 @@ - + - + diff --git a/Geometry/HGCalCommonData/data/hgcal/v13/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v13/hgcal.xml index 4fa27227588fd..0ae42dde2a74a 100644 --- a/Geometry/HGCalCommonData/data/hgcal/v13/hgcal.xml +++ b/Geometry/HGCalCommonData/data/hgcal/v13/hgcal.xml @@ -1,5 +1,5 @@ - + @@ -173,10 +173,10 @@ - + - + diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalCell.cc b/Geometry/HGCalCommonData/plugins/DDHGCalCell.cc index 9a26ae246f654..38e01eaa6c426 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalCell.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalCell.cc @@ -153,7 +153,7 @@ void DDHGCalCell::execute(DDCompactView& cpv) { cpv.position(glog2, glog1, 1, tran, rot); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalCell: " << glog2.name() << " number 1 position in " << glog1.name() << " at " - << tran << " with " << rot; + << tran << " with no rotation"; #endif static constexpr int ir0[] = {0, 1, 0}; diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc index d302c0813646b..418b9ba12029b 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc @@ -325,7 +325,7 @@ void DDHGCalEEAlgo::constructLayers(const DDLogicalPart& module, DDCompactView& ++copyNumber_[ii]; #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalEEAlgo: " << glog.name() << " number " << copy << " positioned in " - << module.name() << " at " << r1 << " with " << rot; + << module.name() << " at " << r1 << " with no rotation"; #endif zz += hthick; } // End of loop over layers in a block @@ -410,7 +410,7 @@ void DDHGCalEEAlgo::positionSensitive(const DDLogicalPart& glog, #ifdef EDM_ML_DEBUG ++ntype[type]; edm::LogVerbatim("HGCalGeom") << " DDHGCalEEAlgo: " << name << " number " << copy << " positioned in " - << glog.ddname() << " at " << tran << " with " << rotation; + << glog.ddname() << " at " << tran << " with no rotation"; #endif } } diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalEEFileAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalEEFileAlgo.cc index 446d9c7d3cc5a..3c1472fab82f5 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalEEFileAlgo.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalEEFileAlgo.cc @@ -302,7 +302,7 @@ void DDHGCalEEFileAlgo::constructLayers(const DDLogicalPart& module, DDCompactVi ++copyNumber_[ii]; #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalEEFileAlgo: " << glog.name() << " number " << copy << " positioned in " - << module.name() << " at " << r1 << " with " << rot; + << module.name() << " at " << r1 << " with no rotation"; #endif zz += hthick; } // End of loop over layers in a block @@ -391,7 +391,7 @@ void DDHGCalEEFileAlgo::positionSensitive( ++ntype[type]; edm::LogVerbatim("HGCalGeom") << " DDHGCalEEFileAlgo: " << name << " number " << copy << " type " << layertype << ":" << type << " positioned in " << glog.ddname() << " at " << tran - << " with " << rotation; + << " with no rotation"; #endif } } diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc index 2633ff06d4453..5c268d0f39125 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc @@ -369,7 +369,7 @@ void DDHGCalHEAlgo::constructLayers(const DDLogicalPart& module, DDCompactView& ++copyNumber_[ii]; #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalHEAlgo: " << glog.name() << " number " << copy << " positioned in " - << module.name() << " at " << r1 << " with " << rot; + << module.name() << " at " << r1 << " with no rotation"; #endif zz += hthick; } // End of loop over layers in a block @@ -420,7 +420,7 @@ void DDHGCalHEAlgo::positionMix(const DDLogicalPart& glog, cpv.position(glog1, glog, 1, tran, rot); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalHEAlgo: " << glog1.name() << " number 1 positioned in " << glog.name() - << " at " << tran << " with " << rot; + << " at " << tran << " with no rotation"; #endif double thickTot(0), zpos(-hthick); for (unsigned int ly = 0; ly < layerTypeTop_.size(); ++ly) { @@ -450,7 +450,7 @@ void DDHGCalHEAlgo::positionMix(const DDLogicalPart& glog, cpv.position(glog2, glog1, copy, r1, rot); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalHEAlgo: Position " << glog2.name() << " number " << copy << " in " - << glog1.name() << " at " << r1 << " with " << rot; + << glog1.name() << " at " << r1 << " with no rotation"; #endif ++copyNumberTop_[ii]; zpos += hthickl; @@ -476,7 +476,7 @@ void DDHGCalHEAlgo::positionMix(const DDLogicalPart& glog, cpv.position(glog1, glog, 1, tran, rot); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalHEAlgo: " << glog1.name() << " number 1 positioned in " << glog.name() - << " at " << tran << " with " << rot; + << " at " << tran << " with no rotation"; #endif thickTot = 0; zpos = -hthick; @@ -507,7 +507,7 @@ void DDHGCalHEAlgo::positionMix(const DDLogicalPart& glog, cpv.position(glog2, glog1, copy, r1, rot); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalHEAlgo: Position " << glog2.name() << " number " << copy << " in " - << glog1.name() << " at " << r1 << " with " << rot; + << glog1.name() << " at " << r1 << " with no rotation"; #endif if (layerSenseBot_[ly] != 0) { #ifdef EDM_ML_DEBUG @@ -591,7 +591,7 @@ void DDHGCalHEAlgo::positionSensitive(const DDLogicalPart& glog, #ifdef EDM_ML_DEBUG ++ntype[type]; edm::LogVerbatim("HGCalGeom") << "DDHGCalHEAlgo: " << name << " number " << copy << " positioned in " - << glog.ddname() << " at " << tran << " with " << rotation; + << glog.ddname() << " at " << tran << " with no rotation"; #endif } } diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalHEFileAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalHEFileAlgo.cc index f7b135ec85879..79855c0748031 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalHEFileAlgo.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalHEFileAlgo.cc @@ -355,7 +355,7 @@ void DDHGCalHEFileAlgo::constructLayers(const DDLogicalPart& module, DDCompactVi ++copyNumber_[ii]; #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalHEFileAlgo: " << glog.name() << " number " << copy << " positioned in " - << module.name() << " at " << r1 << " with " << rot; + << module.name() << " at " << r1 << " with no rotation"; #endif zz += hthick; } // End of loop over layers in a block @@ -407,7 +407,7 @@ void DDHGCalHEFileAlgo::positionMix(const DDLogicalPart& glog, cpv.position(glog1, glog, 1, tran, rot); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalHEFileAlgo: " << glog1.name() << " number 1 positioned in " << glog.name() - << " at " << tran << " with " << rot; + << " at " << tran << " with no rotation"; #endif double thickTot(0), zpos(-hthick); for (unsigned int ly = 0; ly < layerTypeTop_.size(); ++ly) { @@ -437,7 +437,7 @@ void DDHGCalHEFileAlgo::positionMix(const DDLogicalPart& glog, cpv.position(glog2, glog1, copy, r1, rot); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalHEFileAlgo: Position " << glog2.name() << " number " << copy << " in " - << glog1.name() << " at " << r1 << " with " << rot; + << glog1.name() << " at " << r1 << " with no rotation"; #endif ++copyNumberTop_[ii]; zpos += hthickl; @@ -463,7 +463,7 @@ void DDHGCalHEFileAlgo::positionMix(const DDLogicalPart& glog, cpv.position(glog1, glog, 1, tran, rot); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalHEFileAlgo: " << glog1.name() << " number 1 positioned in " << glog.name() - << " at " << tran << " with " << rot; + << " at " << tran << " with no rotation"; #endif thickTot = 0; zpos = -hthick; @@ -494,7 +494,7 @@ void DDHGCalHEFileAlgo::positionMix(const DDLogicalPart& glog, cpv.position(glog2, glog1, copy, r1, rot); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalHEFileAlgo: Position " << glog2.name() << " number " << copy << " in " - << glog1.name() << " at " << r1 << " with " << rot; + << glog1.name() << " at " << r1 << " with no rotation"; #endif if (layerSenseBot_[ly] != 0) { #ifdef EDM_ML_DEBUG @@ -581,7 +581,7 @@ void DDHGCalHEFileAlgo::positionSensitive( ++ntype[type]; edm::LogVerbatim("HGCalGeom") << " DDHGCalHEFileAlgo: " << name << " number " << copy << " type " << layertype << ":" << type << " positioned in " << glog.ddname() << " at " << tran - << " with " << rotation; + << " with no rotation"; #endif } } diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalWafer8.cc b/Geometry/HGCalCommonData/plugins/DDHGCalWafer8.cc index e2d96bfe987d3..3e548f5c551b9 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalWafer8.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalWafer8.cc @@ -141,7 +141,7 @@ void DDHGCalWafer8::execute(DDCompactView& cpv) { cpv.position(DDName(cellNames_[cell]), glog, copy, tran, rot); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalWafer8: " << cellNames_[cell] << " number " << copy << " position in " - << glog.name() << " at " << tran << " with " << rot; + << glog.name() << " at " << tran << " with no rotation"; #endif } } diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalWaferF.cc b/Geometry/HGCalCommonData/plugins/DDHGCalWaferF.cc index 512fff2791492..476781c405725 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalWaferF.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalWaferF.cc @@ -159,7 +159,7 @@ void DDHGCalWaferF::execute(DDCompactView& cpv) { cpv.position(glogs[i], glogM, copyNumber_[i], tran0, rot); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalWaferF: " << glogs[i].name() << " number " << copyNumber_[i] - << " positioned in " << glogM.name() << " at " << tran0 << " with " << rot; + << " positioned in " << glogM.name() << " at " << tran0 << " with no rotation"; #endif ++copyNumber_[i]; zi += layerThick_[i]; @@ -200,8 +200,9 @@ void DDHGCalWaferF::execute(DDCompactView& cpv) { int copy = HGCalTypes::packCellTypeUV(cellType_, u, v); cpv.position(DDName(cellNames_[cell]), glogs[i], copy, tran, rot); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalWaferF: " << cellNames_[cell] << " number " << copy - << " positioned in " << glogs[i].name() << " at " << tran << " with " << rot; + edm::LogVerbatim("HGCalGeom") + << "DDHGCalWaferF: " << cellNames_[cell] << " number " << copy << " positioned in " << glogs[i].name() + << " at " << tran << " with no rotation"; #endif } }