From 943362d0a23d6d9434b2c857ed1fb7a796265534 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Sat, 23 Oct 2021 03:48:10 +0200 Subject: [PATCH 1/4] Try to resolve some issues for scintillator part of HGCal Geometry --- .../interface/HGCalDDDConstants.h | 25 ++++++- Geometry/HGCalGeometry/src/HGCalGeometry.cc | 9 ++- .../HGCalGeometry/src/HGCalGeometryLoader.cc | 59 ++++++++------- .../test/python/testHGCalCellDumpDDD_cfg.py | 74 ++++++++++++++----- 4 files changed, 119 insertions(+), 48 deletions(-) diff --git a/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h b/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h index 9c57276430d86..af4b7517ee2be 100644 --- a/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h +++ b/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h @@ -11,17 +11,19 @@ * */ -#include -#include #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/ForwardDetId/interface/HGCScintillatorDetId.h" #include "DataFormats/ForwardDetId/interface/HGCSiliconDetId.h" +#include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "Geometry/HGCalCommonData/interface/HGCalGeometryMode.h" #include "Geometry/HGCalCommonData/interface/HGCalGeomTools.h" #include "Geometry/HGCalCommonData/interface/HGCalParameters.h" #include "Geometry/HGCalCommonData/interface/HGCalTileIndex.h" #include "Geometry/HGCalCommonData/interface/HGCalTypes.h" +#include +#include +#include #include class HGCalDDDConstants { @@ -109,6 +111,12 @@ class HGCalDDDConstants { std::pair rowColumnWafer(const int wafer) const; int sectors() const { return hgpar_->nSectors_; } std::pair simToReco(int cell, int layer, int mod, bool half) const; + bool tileExist(int zside, int layer, int ring, int phi) const { + int indx = HGCalTileIndex::tileIndex(layer, ring, 0); + auto itr = hgpar_->tileInfoMap_.find(indx); + bool ok = (itr == hgpar_->tileInfoMap_.end()) ? false : HGCalTileIndex::tileExist(itr->second.hex, zside, phi); + return ok; + } int tileSiPM(int sipm) const { return ((sipm > 0) ? HGCalTypes::SiPMSmall : HGCalTypes::SiPMLarge); } bool tileTrapezoid() const { return ((mode_ == HGCalGeometryMode::Trapezoid) || (mode_ == HGCalGeometryMode::TrapezoidFile) || @@ -181,6 +189,19 @@ class HGCalDDDConstants { double waferSepar(bool reco) const { return (reco ? hgpar_->sensorSeparation_ : HGCalParameters::k_ScaleToDDD * hgpar_->sensorSeparation_); } + GlobalPoint waferLocal2Global(HepGeom::Point3D& loc, const DetId& id, bool useWafer, bool reco, bool debug) const { + HGCSiliconDetId detid(id); + double x(0), y(0); + if (useWafer) { + auto xyw = waferPositionNoRot(detid.layer(), detid.waferU(), detid.waferV(), reco, debug); + x = xyw.first; + y = xyw.second; + } + auto xy = getXY(detid.layer(), (x + loc.x()), (y + loc.y()), false); + double zz = (detid.zside() < 0) ? -(loc.z() + waferZ(detid.layer(), reco)) : (loc.z() + waferZ(detid.layer(), reco)); + double xx = (detid.zside() < 0) ? -xy.first : xy.first; + return GlobalPoint(xx, xy.second, zz); + } double waferSize(bool reco) const { return (reco ? hgpar_->waferSize_ : HGCalParameters::k_ScaleToDDD * hgpar_->waferSize_); } diff --git a/Geometry/HGCalGeometry/src/HGCalGeometry.cc b/Geometry/HGCalGeometry/src/HGCalGeometry.cc index 967c00cfc76a5..d483ecb84667d 100644 --- a/Geometry/HGCalGeometry/src/HGCalGeometry.cc +++ b/Geometry/HGCalGeometry/src/HGCalGeometry.cc @@ -277,7 +277,8 @@ HGCalGeometry::CornersVec HGCalGeometry::getCorners(const DetId& detid) const { HGCalTopology::DecodedDetId id = m_topology.decode(detid); if (cellIndex < m_cellVec2.size() && m_det == DetId::HGCalHSc) { GlobalPoint v = getPosition(detid); - std::pair rr = m_topology.dddConstants().cellSizeTrap(id.iType, id.iSec1); + int type = std::min(id.iType, 1); + std::pair rr = m_topology.dddConstants().cellSizeTrap(type, id.iSec1); float dr = k_half * (rr.second - rr.first); float dfi = m_cellVec2[cellIndex].param()[FlatTrd::k_Cell]; float dz = id.zSide * m_cellVec2[cellIndex].param()[FlatTrd::k_dZ]; @@ -329,7 +330,8 @@ HGCalGeometry::CornersVec HGCalGeometry::get8Corners(const DetId& detid) const { HGCalTopology::DecodedDetId id = m_topology.decode(detid); if (cellIndex < m_cellVec2.size() && m_det == DetId::HGCalHSc) { GlobalPoint v = getPosition(detid); - std::pair rr = m_topology.dddConstants().cellSizeTrap(id.iType, id.iSec1); + int type = std::min(id.iType, 1); + std::pair rr = m_topology.dddConstants().cellSizeTrap(type, id.iSec1); float dr = k_half * (rr.second - rr.first); float dfi = m_cellVec2[cellIndex].param()[FlatTrd::k_Cell]; float dz = id.zSide * m_cellVec2[cellIndex].param()[FlatTrd::k_dZ]; @@ -372,7 +374,8 @@ HGCalGeometry::CornersVec HGCalGeometry::getNewCorners(const DetId& detid) const HGCalTopology::DecodedDetId id = m_topology.decode(detid); if (cellIndex < m_cellVec2.size() && m_det == DetId::HGCalHSc) { GlobalPoint v = getPosition(detid); - std::pair rr = m_topology.dddConstants().cellSizeTrap(id.iType, id.iSec1); + int type = std::min(id.iType, 1); + std::pair rr = m_topology.dddConstants().cellSizeTrap(type, id.iSec1); float dr = k_half * (rr.second - rr.first); float dfi = m_cellVec2[cellIndex].param()[FlatTrd::k_Cell]; float dz = -id.zSide * m_cellVec2[cellIndex].param()[FlatTrd::k_dZ]; diff --git a/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc b/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc index 41159ec9113ec..ab19732a40cda 100644 --- a/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc +++ b/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc @@ -29,10 +29,12 @@ HGCalGeometry* HGCalGeometryLoader::build(const HGCalTopology& topology) { : (int)HGCalGeometry::k_NumberOfParametersPerHex); uint32_t numberOfShapes = (topology.tileTrapezoid() ? HGCalGeometry::k_NumberOfShapesTrd : HGCalGeometry::k_NumberOfShapes); + HGCalGeometryMode::GeometryMode mode = topology.geomMode(); + bool test = (mode == HGCalGeometryMode::TrapezoidModule); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "Number of Cells " << numberOfCells << ":" << numberExpected << " for sub-detector " << topology.subDetector() << " Shapes " << numberOfShapes << ":" << parametersPerShape_ - << " mode " << topology.geomMode(); + << " mode " << mode; #endif geom->allocateCorners(numberOfCells); geom->allocatePar(numberOfShapes, parametersPerShape_); @@ -99,31 +101,34 @@ HGCalGeometry* HGCalGeometryLoader::build(const HGCalTopology& topology) { id.setType(typm.first); id.setSiPM(typm.second); } - DetId detId = static_cast(id); - const auto& w = topology.dddConstants().locateCellTrap(layer, ring, iphi, true); - double xx = (zside > 0) ? w.first : -w.first; - CLHEP::Hep3Vector h3v(xx, w.second, mytr.h3v.z()); - const HepGeom::Transform3D ht3d(mytr.hr, h3v); + bool ok = test ? topology.dddConstants().tileExist(zside, layer, ring, iphi) : true; #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "HGCalGeometryLoader::rad:phi:type " << ring * zside << ":" << iphi << ":" - << type << " DetId " << HGCScintillatorDetId(detId) << " " << std::hex - << detId.rawId() << std::dec << " transf " << ht3d.getTranslation() << " R " - << ht3d.getTranslation().perp() << " and " << ht3d.getRotation(); + edm::LogVerbatim("HGCalGeom") << "HGCalGeometryLoader::layer:rad:phi:type:sipm " << layer << ":" << ring * zside << ":" << iphi << ":" << type << ":" << typm.first << ":" << typm.second << " Test " << test << ":" << ok; #endif - HGCalParameters::hgtrap vol = topology.dddConstants().getModule(md, false, true); - params[FlatTrd::k_dZ] = vol.dz; - params[FlatTrd::k_Theta] = params[FlatTrd::k_Phi] = 0; - params[FlatTrd::k_dY1] = params[FlatTrd::k_dY2] = vol.h; - params[FlatTrd::k_dX1] = params[FlatTrd::k_dX3] = vol.bl; - params[FlatTrd::k_dX2] = params[FlatTrd::k_dX4] = vol.tl; - params[FlatTrd::k_Alp1] = params[FlatTrd::k_Alp2] = 0; - params[FlatTrd::k_Cell] = topology.dddConstants().cellSizeHex(type); - - buildGeom(params, ht3d, detId, geom, 1); - counter++; + if (ok) { + DetId detId = static_cast(id); + const auto& w = topology.dddConstants().locateCellTrap(layer, ring, iphi, true); + double xx = (zside > 0) ? w.first : -w.first; + CLHEP::Hep3Vector h3v(xx, w.second, mytr.h3v.z()); + const HepGeom::Transform3D ht3d(mytr.hr, h3v); #ifdef EDM_ML_DEBUG - ++kount; + edm::LogVerbatim("HGCalGeom") << "HGCalGeometryLoader::rad:phi:type " << ring * zside << ":" << iphi << ":" << type " DetId " << HGCScintillatorDetId(detId) << " " << std::hex << detId.rawId() << std::dec << " transf " << ht3d.getTranslation() << " R " << ht3d.getTranslation().perp() << " and " << ht3d.getRotation(); #endif + HGCalParameters::hgtrap vol = topology.dddConstants().getModule(md, false, true); + params[FlatTrd::k_dZ] = vol.dz; + params[FlatTrd::k_Theta] = params[FlatTrd::k_Phi] = 0; + params[FlatTrd::k_dY1] = params[FlatTrd::k_dY2] = vol.h; + params[FlatTrd::k_dX1] = params[FlatTrd::k_dX3] = vol.bl; + params[FlatTrd::k_dX2] = params[FlatTrd::k_dX4] = vol.tl; + params[FlatTrd::k_Alp1] = params[FlatTrd::k_Alp2] = 0; + params[FlatTrd::k_Cell] = topology.dddConstants().cellSizeHex(type); + + buildGeom(params, ht3d, detId, geom, 1); + counter++; +#ifdef EDM_ML_DEBUG + ++kount; +#endif + } } ++ring; } @@ -172,9 +177,13 @@ HGCalGeometry* HGCalGeometryLoader::build(const HGCalTopology& topology) { geom->sortDetIds(); if (counter != numberExpected) { - edm::LogError("HGCalGeom") << "Inconsistent # of cells: expected " << numberExpected << ":" << numberOfCells - << " , inited " << counter; - assert(counter == numberExpected); + if (test) { + edm::LogVerbatim("HGCalGeom") << "Inconsistent # of cells: expected " << numberExpected << ":" << numberOfCells << " , inited " << counter; + } else { + edm::LogError("HGCalGeom") << "Inconsistent # of cells: expected " << numberExpected << ":" << numberOfCells + << " , inited " << counter; + assert(counter == numberExpected); + } } return geom; diff --git a/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py index d4dfb42a17272..4fa2445b4449d 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py @@ -1,23 +1,61 @@ +############################################################################### +# Way to use this: +# cmsRun testHGCalCellDumpDDD_cfg.py geometry=D86 +# +# Options for geometry D49, D68, D77, D83, D84, D86 +# +############################################################################### import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C11_cff import Phase2C11 - -process = cms.Process("HcalGeometryTest",Phase2C11) - -process.load("Geometry.CMSCommonData.cmsExtendedGeometry2026D71XML_cfi") -process.load("Geometry.EcalCommonData.ecalSimulationParameters_cff") -process.load("Geometry.HcalCommonData.hcalDDDSimConstants_cff") -process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi") -process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi") -process.load("Geometry.CaloEventSetup.HGCalV9Topology_cfi") -process.load("Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi") -process.load("Geometry.CaloEventSetup.CaloTopology_cfi") -process.load("Geometry.CaloEventSetup.CaloGeometry_cff") -process.load("Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi") -process.load("Geometry.EcalMapping.EcalMapping_cfi") -process.load("Geometry.EcalMapping.EcalMappingRecord_cfi") -process.load("Geometry.HcalCommonData.hcalDDDRecConstants_cfi") -process.load("Geometry.HcalEventSetup.hcalTopologyIdeal_cfi") +import os, sys, imp, re +import FWCore.ParameterSet.VarParsing as VarParsing + +#################################################################### +### SETUP OPTIONS +options = VarParsing.VarParsing('standard') +options.register('geometry', + "D86", + VarParsing.VarParsing.multiplicity.singleton, + VarParsing.VarParsing.varType.string, + "geometry of operations: D49, D68, D84, D77, D83, D86") + +### get and parse the command line arguments +options.parseArguments() + +print(options) + +#################################################################### +# Use the options + +if (options.geometry == "D49"): + from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 + process = cms.Process('PROD',Phase2C9) + process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +elif (options.geometry == "D68"): + from Configuration.Eras.Era_Phase2C12_cff import Phase2C12 + process = cms.Process('PROD',Phase2C12) + process.load('Configuration.Geometry.GeometryExtended2026D68Reco_cff') +elif (options.geometry == "D83"): + from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process('PROD',Phase2C11M9) + process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') +elif (options.geometry == "D84"): + from Configuration.Eras.Era_Phase2C11_cff import Phase2C11 + process = cms.Process('PROD',Phase2C11) + process.load('Configuration.Geometry.GeometryExtended2026D84Reco_cff') +elif (options.geometry == "D86"): + from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process('PROD',Phase2C11M9) + process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff') +else: + from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process('PROD',Phase2C11M9) + process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff') + process.load("Geometry.HGCalGeometry.hgcalGeometryDump_cfi") +process.load('FWCore.MessageService.MessageLogger_cfi') + +if hasattr(process,'MessageLogger'): + process.MessageLogger.HGCalGeom=dict() process.source = cms.Source("EmptySource") process.maxEvents = cms.untracked.PSet( From b0dc745cee90362d173e5e23fb05671fc1a92286 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Sat, 23 Oct 2021 04:03:51 +0200 Subject: [PATCH 2/4] Code check --- .../interface/HGCalDDDConstants.h | 6 ++- .../HGCalGeometry/src/HGCalGeometryLoader.cc | 54 ++++++++++--------- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h b/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h index af4b7517ee2be..eab00db0929c5 100644 --- a/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h +++ b/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h @@ -189,7 +189,8 @@ class HGCalDDDConstants { double waferSepar(bool reco) const { return (reco ? hgpar_->sensorSeparation_ : HGCalParameters::k_ScaleToDDD * hgpar_->sensorSeparation_); } - GlobalPoint waferLocal2Global(HepGeom::Point3D& loc, const DetId& id, bool useWafer, bool reco, bool debug) const { + GlobalPoint waferLocal2Global( + HepGeom::Point3D& loc, const DetId& id, bool useWafer, bool reco, bool debug) const { HGCSiliconDetId detid(id); double x(0), y(0); if (useWafer) { @@ -198,7 +199,8 @@ class HGCalDDDConstants { y = xyw.second; } auto xy = getXY(detid.layer(), (x + loc.x()), (y + loc.y()), false); - double zz = (detid.zside() < 0) ? -(loc.z() + waferZ(detid.layer(), reco)) : (loc.z() + waferZ(detid.layer(), reco)); + double zz = + (detid.zside() < 0) ? -(loc.z() + waferZ(detid.layer(), reco)) : (loc.z() + waferZ(detid.layer(), reco)); double xx = (detid.zside() < 0) ? -xy.first : xy.first; return GlobalPoint(xx, xy.second, zz); } diff --git a/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc b/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc index ab19732a40cda..76b44761fae11 100644 --- a/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc +++ b/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc @@ -101,34 +101,39 @@ HGCalGeometry* HGCalGeometryLoader::build(const HGCalTopology& topology) { id.setType(typm.first); id.setSiPM(typm.second); } - bool ok = test ? topology.dddConstants().tileExist(zside, layer, ring, iphi) : true; + bool ok = test ? topology.dddConstants().tileExist(zside, layer, ring, iphi) : true; #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "HGCalGeometryLoader::layer:rad:phi:type:sipm " << layer << ":" << ring * zside << ":" << iphi << ":" << type << ":" << typm.first << ":" << typm.second << " Test " << test << ":" << ok; + edm::LogVerbatim("HGCalGeom") << "HGCalGeometryLoader::layer:rad:phi:type:sipm " << layer << ":" + << ring * zside << ":" << iphi << ":" << type << ":" << typm.first << ":" + << typm.second << " Test " << test << ":" << ok; #endif - if (ok) { - DetId detId = static_cast(id); - const auto& w = topology.dddConstants().locateCellTrap(layer, ring, iphi, true); - double xx = (zside > 0) ? w.first : -w.first; - CLHEP::Hep3Vector h3v(xx, w.second, mytr.h3v.z()); - const HepGeom::Transform3D ht3d(mytr.hr, h3v); + if (ok) { + DetId detId = static_cast(id); + const auto& w = topology.dddConstants().locateCellTrap(layer, ring, iphi, true); + double xx = (zside > 0) ? w.first : -w.first; + CLHEP::Hep3Vector h3v(xx, w.second, mytr.h3v.z()); + const HepGeom::Transform3D ht3d(mytr.hr, h3v); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "HGCalGeometryLoader::rad:phi:type " << ring * zside << ":" << iphi << ":" << type " DetId " << HGCScintillatorDetId(detId) << " " << std::hex << detId.rawId() << std::dec << " transf " << ht3d.getTranslation() << " R " << ht3d.getTranslation().perp() << " and " << ht3d.getRotation(); + edm::LogVerbatim("HGCalGeom") + << "HGCalGeometryLoader::rad:phi:type " << ring * zside << ":" << iphi << ":" << type " DetId " + << HGCScintillatorDetId(detId) << " " << std::hex << detId.rawId() << std::dec << " transf " + << ht3d.getTranslation() << " R " << ht3d.getTranslation().perp() << " and " << ht3d.getRotation(); #endif - HGCalParameters::hgtrap vol = topology.dddConstants().getModule(md, false, true); - params[FlatTrd::k_dZ] = vol.dz; - params[FlatTrd::k_Theta] = params[FlatTrd::k_Phi] = 0; - params[FlatTrd::k_dY1] = params[FlatTrd::k_dY2] = vol.h; - params[FlatTrd::k_dX1] = params[FlatTrd::k_dX3] = vol.bl; - params[FlatTrd::k_dX2] = params[FlatTrd::k_dX4] = vol.tl; - params[FlatTrd::k_Alp1] = params[FlatTrd::k_Alp2] = 0; - params[FlatTrd::k_Cell] = topology.dddConstants().cellSizeHex(type); - - buildGeom(params, ht3d, detId, geom, 1); - counter++; + HGCalParameters::hgtrap vol = topology.dddConstants().getModule(md, false, true); + params[FlatTrd::k_dZ] = vol.dz; + params[FlatTrd::k_Theta] = params[FlatTrd::k_Phi] = 0; + params[FlatTrd::k_dY1] = params[FlatTrd::k_dY2] = vol.h; + params[FlatTrd::k_dX1] = params[FlatTrd::k_dX3] = vol.bl; + params[FlatTrd::k_dX2] = params[FlatTrd::k_dX4] = vol.tl; + params[FlatTrd::k_Alp1] = params[FlatTrd::k_Alp2] = 0; + params[FlatTrd::k_Cell] = topology.dddConstants().cellSizeHex(type); + + buildGeom(params, ht3d, detId, geom, 1); + counter++; #ifdef EDM_ML_DEBUG - ++kount; + ++kount; #endif - } + } } ++ring; } @@ -178,10 +183,11 @@ HGCalGeometry* HGCalGeometryLoader::build(const HGCalTopology& topology) { if (counter != numberExpected) { if (test) { - edm::LogVerbatim("HGCalGeom") << "Inconsistent # of cells: expected " << numberExpected << ":" << numberOfCells << " , inited " << counter; + edm::LogVerbatim("HGCalGeom") << "Inconsistent # of cells: expected " << numberExpected << ":" << numberOfCells + << " , inited " << counter; } else { edm::LogError("HGCalGeom") << "Inconsistent # of cells: expected " << numberExpected << ":" << numberOfCells - << " , inited " << counter; + << " , inited " << counter; assert(counter == numberExpected); } } From 13942181d52f01517ddb83be5b152253571177ac Mon Sep 17 00:00:00 2001 From: Sunanda Date: Wed, 27 Oct 2021 12:57:36 +0200 Subject: [PATCH 3/4] Take care of static analyzer report --- Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc b/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc index 76b44761fae11..9eac1af9a3252 100644 --- a/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc +++ b/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc @@ -115,7 +115,7 @@ HGCalGeometry* HGCalGeometryLoader::build(const HGCalTopology& topology) { const HepGeom::Transform3D ht3d(mytr.hr, h3v); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") - << "HGCalGeometryLoader::rad:phi:type " << ring * zside << ":" << iphi << ":" << type " DetId " + << "HGCalGeometryLoader::rad:phi:type " << ring * zside << ":" << iphi << ":" << type << " DetId " << HGCScintillatorDetId(detId) << " " << std::hex << detId.rawId() << std::dec << " transf " << ht3d.getTranslation() << " R " << ht3d.getTranslation().perp() << " and " << ht3d.getRotation(); #endif From fe2bc0cacd7ef9c8032c1f185d892db570eb132c Mon Sep 17 00:00:00 2001 From: Sunanda Date: Wed, 27 Oct 2021 13:13:32 +0200 Subject: [PATCH 4/4] Code check --- Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc b/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc index 9eac1af9a3252..2357f1fd8f888 100644 --- a/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc +++ b/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc @@ -115,7 +115,7 @@ HGCalGeometry* HGCalGeometryLoader::build(const HGCalTopology& topology) { const HepGeom::Transform3D ht3d(mytr.hr, h3v); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") - << "HGCalGeometryLoader::rad:phi:type " << ring * zside << ":" << iphi << ":" << type << " DetId " + << "HGCalGeometryLoader::rad:phi:type " << ring * zside << ":" << iphi << ":" << type << " DetId " << HGCScintillatorDetId(detId) << " " << std::hex << detId.rawId() << std::dec << " transf " << ht3d.getTranslation() << " R " << ht3d.getTranslation().perp() << " and " << ht3d.getRotation(); #endif