Skip to content

Commit 53dcb8b

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47772 from bsunanda/Phase2-hgx363
Phase2-hgx363 Make some changes to initialize V19 reconstruction geometry for HGCal
2 parents 57cf61c + d8acae6 commit 53dcb8b

File tree

6 files changed

+127
-46
lines changed

6 files changed

+127
-46
lines changed

‎Geometry/HGCalCommonData/interface/HGCalParameters.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,12 @@ class HGCalParameters {
7777
void scaleTrForm(double);
7878
int scintCells(const int layer) const { return nPhiBinBH_[scintType(layer)]; }
7979
double scintCellSize(const int layer) const { return cellSize_[scintType(layer)]; }
80+
bool scintFine(int indx) const { return ((!tileRingFineR_.empty()) && (nPhiLayer_[indx] > 288)); }
8081
int scintType(const int layer) const { return ((layer < layerFrontBH_[1]) ? 0 : 1); }
82+
bool scintValidRing(int indx, int irad) const {
83+
return (scintFine(indx) ? ((irad >= iradMinBHFine_[indx]) && (irad <= (iradMaxBHFine_[indx] + 1)))
84+
: ((irad >= iradMinBH_[indx]) && (irad <= (iradMaxBH_[indx] + 1))));
85+
}
8186
std::array<int, 4> getID(unsigned int k) const;
8287

8388
std::string name_;
@@ -186,6 +191,8 @@ class HGCalParameters {
186191
std::vector<double> radiusLayer_[2];
187192
std::vector<int> iradMinBH_;
188193
std::vector<int> iradMaxBH_;
194+
std::vector<int> iradMinBHFine_;
195+
std::vector<int> iradMaxBHFine_;
189196
double minTileSize_ = 0.;
190197
std::vector<int> firstModule_;
191198
std::vector<int> lastModule_;
@@ -218,6 +225,8 @@ class HGCalParameters {
218225
double calibCellRLD_ = 0.;
219226
std::vector<int> calibCellFullLD_;
220227
std::vector<int> calibCellPartLD_;
228+
int tileUVMax_ = 0;
229+
int tileUVMaxFine_ = 0;
221230

222231
COND_SERIALIZABLE;
223232

‎Geometry/HGCalCommonData/src/HGCalCassette.cc‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
#include "FWCore/MessageLogger/interface/MessageLogger.h"
23
#include "Geometry/HGCalCommonData/interface/HGCalCassette.h"
34
#include <algorithm>
@@ -8,6 +9,10 @@
89
void HGCalCassette::setParameter(int cassette, const std::vector<double>& shifts, bool both) {
910
cassette_ = cassette;
1011
typeHE_ = (cassette_ >= 12);
12+
#ifdef EDM_ML_DEBUG
13+
edm::LogVerbatim("HGCalGeom") << "HGCalCassette::setParameter Cassette" << cassette << " Both " << both << " Size "
14+
<< shifts.size();
15+
#endif
1116
shifts_.insert(shifts_.end(), shifts.begin(), shifts.end());
1217
if (both)
1318
shiftsScnt_.insert(shiftsScnt_.end(), shifts.begin(), shifts.end());
@@ -35,6 +40,7 @@ void HGCalCassette::setParameter(int cassette, const std::vector<double>& shifts
3540
}
3641

3742
void HGCalCassette::setParameterScint(const std::vector<double>& shifts) {
43+
shifts_.insert(shifts_.end(), shifts.begin(), shifts.end());
3844
shiftsScnt_.insert(shiftsScnt_.end(), shifts.begin(), shifts.end());
3945
#ifdef EDM_ML_DEBUG
4046
for (uint32_t j1 = 0; j1 < shifts.size(); j1 += 12) {
@@ -55,6 +61,11 @@ void HGCalCassette::setParameterScint(const std::vector<double>& shifts) {
5561
std::pair<double, double> HGCalCassette::getShift(int layer, int zside, int cassette, bool scnt) const {
5662
int locc = (zside < 0) ? (cassette - 1) : (typeHE_ ? positHE_[cassette - 1] : positEE_[cassette - 1]);
5763
int loc = 2 * (cassette_ * (layer - 1) + locc);
64+
#ifdef EDM_ML_DEBUG
65+
edm::LogVerbatim("HGCalGeom") << "HGCalCassette::getShift: layer|zside|cassett|scnt " << layer << ":" << zside << ":"
66+
<< cassette << ":" << scnt << " loc " << locc << ":" << loc << " size "
67+
<< shiftsScnt_.size() << ":" << shifts_.size();
68+
#endif
5869
std::pair<double, double> xy = (typeHE_ && scnt) ? (std::make_pair(-zside * shiftsScnt_[loc], shiftsScnt_[loc + 1]))
5970
: (std::make_pair(-zside * shifts_[loc], shifts_[loc + 1]));
6071
#ifdef EDM_ML_DEBUG

‎Geometry/HGCalCommonData/src/HGCalDDDConstants.cc‎

Lines changed: 66 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ using namespace geant_units::operators;
2525
HGCalDDDConstants::HGCalDDDConstants(const HGCalParameters* hp, const std::string& name)
2626
: hgpar_(hp), sqrt3_(std::sqrt(3.0)), mode_(hgpar_->mode_), fullAndPart_(waferHexagon8File()) {
2727
#ifdef EDM_ML_DEBUG
28-
edm::LogVerbatim("HGCalGeom") << "HGCalDDDConstants::Mode " << mode_ << " FullAndPart " << fullAndPart_;
28+
edm::LogVerbatim("HGCalGeom") << "HGCalDDDConstants::Mode " << mode_ << " FullAndPart " << fullAndPart_
29+
<< " waferHex6:waverHex8 " << waferHexagon6() << ":" << waferHexagon8() << " cassettte "
30+
<< cassetteMode();
2931
#endif
3032
if (waferHexagon6() || waferHexagon8()) {
3133
rmax_ = (HGCalParameters::k_ScaleFromDDD * (hgpar_->waferR_) * std::cos(30._deg));
@@ -53,7 +55,10 @@ HGCalDDDConstants::HGCalDDDConstants(const HGCalParameters* hp, const std::strin
5355
cellOffset_.reset();
5456
}
5557
if (cassetteMode()) {
56-
hgcassette_.setParameter(hgpar_->cassettes_, hgpar_->cassetteShift_);
58+
if (mode_ == HGCalGeometryMode::TrapezoidFineCell)
59+
hgcassette_.setParameter(hgpar_->cassettes_, hgpar_->cassetteShiftTile_, true);
60+
else
61+
hgcassette_.setParameter(hgpar_->cassettes_, hgpar_->cassetteShift_, true);
5762
#ifdef EDM_ML_DEBUG
5863
edm::LogVerbatim("HGCalGeom") << "HGCalDDDConstants::Setup HGCalCassette for " << hgpar_->cassettes_
5964
<< " cassettes";
@@ -228,7 +233,9 @@ std::array<int, 3> HGCalDDDConstants::assignCellTrap(float x, float y, float z,
228233
double r = std::sqrt(xx * xx + yy * yy);
229234
auto ir = std::lower_bound(hgpar_->radiusLayer_[type].begin(), hgpar_->radiusLayer_[type].end(), r);
230235
irad = static_cast<int>(ir - hgpar_->radiusLayer_[type].begin());
231-
irad = std::clamp(irad, hgpar_->iradMinBH_[indx.first], hgpar_->iradMaxBH_[indx.first]);
236+
irad = hgpar_->scintFine(indx.first)
237+
? (std::clamp(irad, hgpar_->iradMinBHFine_[indx.first], hgpar_->iradMaxBHFine_[indx.first]))
238+
: (std::clamp(irad, hgpar_->iradMinBH_[indx.first], hgpar_->iradMaxBH_[indx.first]));
232239
#ifdef EDM_ML_DEBUG
233240
edm::LogVerbatim("HGCalGeomT") << "assignCellTrap Input " << x << ":" << y << ":" << z << ":" << layer << ":" << reco
234241
<< " x|y|r " << xx << ":" << yy << ":" << r << " phi " << phi << ":"
@@ -238,17 +245,31 @@ std::array<int, 3> HGCalDDDConstants::assignCellTrap(float x, float y, float z,
238245
if (tileRingEdge(r, layer, irad)) {
239246
if (std::abs(r - hgpar_->radiusLayer_[type][irad - 1]) < tol_) {
240247
--irad;
241-
if (irad <= hgpar_->iradMinBH_[indx.first])
242-
irad = hgpar_->iradMinBH_[indx.first];
248+
if (hgpar_->scintFine(indx.first)) {
249+
if (irad <= hgpar_->iradMinBHFine_[indx.first])
250+
irad = hgpar_->iradMinBHFine_[indx.first];
251+
} else {
252+
if (irad <= hgpar_->iradMinBH_[indx.first])
253+
irad = hgpar_->iradMinBH_[indx.first];
254+
}
243255
} else {
244256
++irad;
245-
if (irad > hgpar_->iradMaxBH_[indx.first])
246-
irad = hgpar_->iradMaxBH_[indx.first];
257+
if (hgpar_->scintFine(indx.first)) {
258+
if (irad > hgpar_->iradMaxBHFine_[indx.first])
259+
irad = hgpar_->iradMaxBHFine_[indx.first];
260+
} else {
261+
if (irad > hgpar_->iradMaxBH_[indx.first])
262+
irad = hgpar_->iradMaxBH_[indx.first];
263+
}
247264
}
248265
#ifdef EDM_ML_DEBUG
249-
edm::LogVerbatim("HGCalGeomT") << "assignCellTrap: ring # modified to " << irad << ":"
250-
<< hgpar_->iradMinBH_[indx.first] << ":" << hgpar_->iradMaxBH_[indx.first];
251-
;
266+
std::ostringstream st1;
267+
st1 << "assignCellTrap: ring # in ring type " << hgpar_->scintFine(indx.first) << "modified to " << irad;
268+
if (irad > hgpar_->iradMaxBHFine_[indx.first])
269+
st1 << ":" << hgpar_->iradMinBHFine_[indx.first] << ":" << hgpar_->iradMaxBHFine_[indx.first];
270+
else
271+
st1 << ":" << hgpar_->iradMinBH_[indx.first] << ":" << hgpar_->iradMaxBH_[indx.first];
272+
edm::LogVerbatim("HGCalGeomT") << st1.str();
252273
#endif
253274
} else if (tilePhiEdge(phi, layer, iphi)) {
254275
if (std::abs(phi - hgpar_->scintCellSize(layer) * (iphi - 1)) < tol_) {
@@ -445,7 +466,10 @@ double HGCalDDDConstants::distFromEdgeTrap(double x, double y, double z) const {
445466
// Take the smaller value
446467
auto ir = std::lower_bound(hgpar_->radiusLayer_[type].begin(), hgpar_->radiusLayer_[type].end(), r);
447468
int irad = static_cast<int>(ir - hgpar_->radiusLayer_[type].begin());
448-
irad = std::clamp(irad, hgpar_->iradMinBH_[indx], hgpar_->iradMaxBH_[indx]);
469+
if (hgpar_->scintFine(indx))
470+
irad = std::clamp(irad, hgpar_->iradMinBHFine_[indx], hgpar_->iradMaxBHFine_[indx]);
471+
else
472+
irad = std::clamp(irad, hgpar_->iradMinBH_[indx], hgpar_->iradMaxBH_[indx]);
449473
int iphi = 1 + static_cast<int>(phi / cell);
450474
double dphi = std::max(0.0, (0.5 * cell - std::abs(phi - (iphi - 0.5) * cell)));
451475
double dist = std::min((r - hgpar_->radiusLayer_[type][irad - 1]), (hgpar_->radiusLayer_[type][irad] - r));
@@ -516,9 +540,18 @@ std::pair<int, int> HGCalDDDConstants::getREtaRange(int lay) const {
516540
int irmin(0), irmax(0);
517541
if (tileTrapezoid()) {
518542
int indx = layerIndex(lay, false);
519-
if ((indx >= 0) && (indx < static_cast<int>(hgpar_->iradMinBH_.size()))) {
520-
irmin = hgpar_->iradMinBH_[indx];
521-
irmax = hgpar_->iradMaxBH_[indx];
543+
if (indx >= 0) {
544+
if (hgpar_->scintFine(indx)) {
545+
if (indx < static_cast<int>(hgpar_->iradMinBHFine_.size())) {
546+
irmin = hgpar_->iradMinBHFine_[indx];
547+
irmax = hgpar_->iradMaxBHFine_[indx];
548+
}
549+
} else {
550+
if (indx < static_cast<int>(hgpar_->iradMinBH_.size())) {
551+
irmin = hgpar_->iradMinBH_[indx];
552+
irmax = hgpar_->iradMaxBH_[indx];
553+
}
554+
}
522555
}
523556
}
524557
return std::make_pair(irmin, irmax);
@@ -745,16 +778,14 @@ bool HGCalDDDConstants::isValidTrap(int zside, int layer, int irad, int iphi) co
745778
const auto& indx = getIndex(layer, true);
746779
if (indx.first < 0)
747780
return false;
748-
bool ok = ((irad >= hgpar_->iradMinBH_[indx.first]) && (irad <= (hgpar_->iradMaxBH_[indx.first] + 1)) && (iphi > 0) &&
749-
(iphi <= hgpar_->scintCells(layer)));
781+
bool ok = ((hgpar_->scintValidRing(indx.first, irad)) && (iphi > 0) && (iphi <= hgpar_->scintCells(layer)));
750782
bool valid = ((ok && trapezoidFile()) ? tileExist(zside, layer, irad, iphi) : ok);
751783
#ifdef EDM_ML_DEBUG
752784
bool tileEx = trapezoidFile() ? tileExist(zside, layer, irad, iphi) : true;
753785
edm::LogVerbatim("HGCalGeomT") << "HGCalDDDConstants::isValidityTrap: Input " << zside << ":" << layer << ":" << irad
754-
<< ":" << iphi << " Range on Ring " << hgpar_->iradMinBH_[indx.first] << ":"
755-
<< (hgpar_->iradMaxBH_[indx.first] + 1)
786+
<< ":" << iphi << " Range on Ring " << hgpar_->scintValidRing(indx.first, irad)
756787
<< " Range on phi 0:" << hgpar_->scintCells(layer) << " tileExist " << tileEx
757-
<< " Valid " << ok << ":" << valid;
788+
<< " Valid " << ok << ":" << tileExist(zside, layer, irad, iphi) << ":" << valid;
758789
#endif
759790
return valid;
760791
}
@@ -977,19 +1008,29 @@ std::pair<float, float> HGCalDDDConstants::locateCellTrap(
9771008
int zside, int lay, int irad, int iphi, bool reco, bool debug) const {
9781009
float x(0), y(0);
9791010
const auto& indx = getIndex(lay, reco);
1011+
edm::LogVerbatim("HGCalGeom") << "locateCellTrap:: Input " << lay << ":" << irad << ":" << iphi << ":" << zside << ":"
1012+
<< reco << ":" << indx.first;
1013+
debug = true;
9801014
if (indx.first >= 0) {
9811015
int ir = std::abs(irad);
9821016
int type = hgpar_->scintType(lay);
9831017
double phi = (iphi - 0.5) * indx.second;
9841018
double z = hgpar_->zLayerHex_[indx.first];
9851019
double r = 0.5 * (hgpar_->radiusLayer_[type][ir - 1] + hgpar_->radiusLayer_[type][ir]);
9861020
std::pair<double, double> range = rangeR(z, true);
987-
if (debug)
988-
edm::LogVerbatim("HGCalGeom") << "locateCellTrap:: Input " << lay << ":" << irad << ":" << iphi << ":" << reco
989-
<< " IR " << ir << ":" << hgpar_->iradMinBH_[indx.first] << ":"
990-
<< hgpar_->iradMaxBH_[indx.first] << " Type " << type << " Z " << indx.first << ":"
991-
<< z << " phi " << phi << ":" << convertRadToDeg(phi) << " R " << r << ":"
992-
<< range.first << ":" << range.second;
1021+
if (debug) {
1022+
std::ostringstream st1;
1023+
st1 << "locateCellTrap:: Input " << lay << ":" << irad << ":" << iphi << ":" << reco << " indx " << indx.first
1024+
<< " IR " << ir << ":";
1025+
if (hgpar_->scintFine(indx.first))
1026+
st1 << hgpar_->iradMinBHFine_[indx.first] << ":" << hgpar_->iradMaxBHFine_[indx.first];
1027+
else
1028+
st1 << hgpar_->iradMinBH_[indx.first] << ":" << hgpar_->iradMaxBH_[indx.first];
1029+
edm::LogVerbatim("HGCalGeom") << st1.str() << " Type " << type << " Z " << indx.first << ":" << z << " phi "
1030+
<< phi << ":" << convertRadToDeg(phi) << " R " << r << ":" << range.first << ":"
1031+
<< range.second << " file " << (!trapezoidFile()) << " CassetteMode "
1032+
<< cassetteMode();
1033+
}
9931034
if (!trapezoidFile())
9941035
r = std::max(range.first, std::min(r, range.second));
9951036
x = r * std::cos(phi);

‎Geometry/HGCalCommonData/src/HGCalGeomParameters.cc‎

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2393,19 +2393,27 @@ void HGCalGeomParameters::loadCellTrapezoid(HGCalParameters& php) {
23932393
#endif
23942394
unsigned int k1(0), k2(0);
23952395
for (unsigned int k = 0; k < php.zLayerHex_.size(); ++k) {
2396+
if (!php.tileRingFineRange_.empty()) {
2397+
php.iradMinBHFine_.emplace_back(1 + php.tileRingFineRange_[k1].first);
2398+
php.iradMaxBHFine_.emplace_back(1 + php.tileRingFineRange_[k1].second);
2399+
}
2400+
if (!php.tileRingRange_.empty()) {
2401+
php.iradMinBH_.emplace_back(1 + php.tileRingRange_[k2].first);
2402+
php.iradMaxBH_.emplace_back(1 + php.tileRingRange_[k2].second);
2403+
}
23962404
if (php.nPhiLayer_[k] > 288) {
2397-
php.iradMinBH_.emplace_back(1 + php.tileRingFineRange_[k1].first);
2398-
php.iradMaxBH_.emplace_back(1 + php.tileRingFineRange_[k1].second);
23992405
++k1;
24002406
} else {
2401-
php.iradMinBH_.emplace_back(1 + php.tileRingRange_[k2].first);
2402-
php.iradMaxBH_.emplace_back(1 + php.tileRingRange_[k2].second);
24032407
++k2;
24042408
}
24052409
#ifdef EDM_ML_DEBUG
24062410
int kk = php.scintType(php.firstLayer_ + static_cast<int>(k));
2407-
edm::LogVerbatim("HGCalGeom") << "New Layer " << k << " Type " << kk << " Low edge " << php.iradMinBH_.back()
2408-
<< " Top edge " << php.iradMaxBH_.back();
2411+
if (php.nPhiLayer_[k] > 288)
2412+
edm::LogVerbatim("HGCalGeom") << "New Layer " << k << " Type " << kk << " Low edge "
2413+
<< php.iradMinBHFine_.back() << " Top edge " << php.iradMaxBHFine_.back();
2414+
else
2415+
edm::LogVerbatim("HGCalGeom") << "New Layer " << k << " Type " << kk << " Low edge " << php.iradMinBH_.back()
2416+
<< " Top edge " << php.iradMaxBH_.back();
24092417
#endif
24102418
}
24112419
} else {
@@ -2475,6 +2483,8 @@ void HGCalGeomParameters::loadCellTrapezoid(HGCalParameters& php) {
24752483
edm::LogVerbatim("HGCalGeom") << "Modified irhigh " << irhigh << " dr " << drhigh;
24762484
#endif
24772485
}
2486+
php.iradMinBHFine_.emplace_back(irlow);
2487+
php.iradMaxBHFine_.emplace_back(irhigh);
24782488
php.iradMinBH_.emplace_back(irlow);
24792489
php.iradMaxBH_.emplace_back(irhigh);
24802490
#ifdef EDM_ML_DEBUG
@@ -2493,22 +2503,29 @@ void HGCalGeomParameters::loadCellTrapezoid(HGCalParameters& php) {
24932503

24942504
// Now define the volumes
24952505
int im(0);
2496-
php.waferUVMax_ = 0;
2506+
php.tileUVMax_ = php.tileUVMaxFine_ = 00;
24972507
HGCalParameters::hgtrap mytr;
24982508
mytr.alpha = 0.0;
24992509
for (unsigned int k = 0; k < php.zLayerHex_.size(); ++k) {
2500-
if (php.iradMaxBH_[k] > php.waferUVMax_)
2501-
php.waferUVMax_ = php.iradMaxBH_[k];
2502-
int kk = ((php.firstLayer_ + static_cast<int>(k)) < php.layerFrontBH_[1]) ? 0 : 1;
2510+
if (php.nPhiLayer_[k] > 288) {
2511+
if (php.iradMaxBHFine_[k] > php.tileUVMaxFine_)
2512+
php.tileUVMaxFine_ = php.iradMaxBHFine_[k];
2513+
} else {
2514+
if (php.iradMaxBH_[k] > php.tileUVMax_)
2515+
php.tileUVMax_ = php.iradMaxBH_[k];
2516+
}
2517+
int kk = (php.nPhiLayer_[k] > 288) ? 0 : 1;
25032518
int irm = php.radiusLayer_[kk].size() - 1;
2519+
int irmin = (php.nPhiLayer_[k] > 288) ? php.iradMinBHFine_[k] : php.iradMinBH_[k];
2520+
int irmax = (php.nPhiLayer_[k] > 288) ? php.iradMaxBHFine_[k] : php.iradMaxBH_[k];
25042521
#ifdef EDM_ML_DEBUG
2505-
double rmin = php.radiusLayer_[kk][std::max((php.iradMinBH_[k] - 1), 0)];
2506-
double rmax = php.radiusLayer_[kk][std::min(php.iradMaxBH_[k], irm)];
2507-
edm::LogVerbatim("HGCalGeom") << "Layer " << php.firstLayer_ + k << ":" << kk << " Radius range "
2508-
<< php.iradMinBH_[k] << ":" << php.iradMaxBH_[k] << ":" << rmin << ":" << rmax;
2522+
double rmin = php.radiusLayer_[kk][std::max((irmin - 1), 0)];
2523+
double rmax = php.radiusLayer_[kk][std::min(irmax, irm)];
2524+
edm::LogVerbatim("HGCalGeom") << "Layer " << php.firstLayer_ + k << ":" << kk << " Radius range " << irmin << ":"
2525+
<< irmax << ":" << rmin << ":" << rmax;
25092526
#endif
25102527
mytr.lay = php.firstLayer_ + k;
2511-
for (int irad = php.iradMinBH_[k]; irad <= php.iradMaxBH_[k]; ++irad) {
2528+
for (int irad = irmin; irad <= irmax; ++irad) {
25122529
double rmin = php.radiusLayer_[kk][std::max((irad - 1), 0)];
25132530
double rmax = php.radiusLayer_[kk][std::min(irad, irm)];
25142531
mytr.bl = 0.5 * rmin * php.scintCellSize(mytr.lay);
@@ -2523,19 +2540,20 @@ void HGCalGeomParameters::loadCellTrapezoid(HGCalParameters& php) {
25232540
mytr.dz *= HGCalParameters::k_ScaleToDDD;
25242541
mytr.cellSize *= HGCalParameters::k_ScaleFromDDD;
25252542
php.fillModule(mytr, false);
2526-
if (irad == php.iradMinBH_[k])
2543+
if (irad == irmin)
25272544
php.firstModule_.emplace_back(im);
25282545
++im;
2529-
if (irad == php.iradMaxBH_[k] - 1)
2546+
if (irad == irmax)
25302547
php.lastModule_.emplace_back(im);
25312548
}
25322549
}
2533-
php.nSectors_ = php.waferUVMax_;
2550+
php.nSectors_ = std::max(php.tileUVMax_, php.tileUVMaxFine_);
25342551
#ifdef EDM_ML_DEBUG
2535-
edm::LogVerbatim("HGCalGeom") << "Maximum radius index " << php.waferUVMax_;
2552+
edm::LogVerbatim("HGCalGeom") << "Maximum radius index " << php.tileUVMax_ << ":" << php.tileUVMaxFine_;
25362553
for (unsigned int k = 0; k < php.firstModule_.size(); ++k)
25372554
edm::LogVerbatim("HGCalGeom") << "Layer " << k + php.firstLayer_ << " Modules " << php.firstModule_[k] << ":"
25382555
<< php.lastModule_[k];
2556+
25392557
#endif
25402558
}
25412559

‎Geometry/HGCalGeometry/src/HGCalGeometry.cc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
typedef CaloCellGeometry::Tr3D Tr3D;
2222
typedef std::vector<float> ParmVec;
2323

24-
//#define EDM_ML_DEBUG
24+
#define EDM_ML_DEBUG
2525

2626
const bool debugLocate = false;
2727

@@ -120,6 +120,8 @@ void HGCalGeometry::newCell(
120120
#endif
121121
} else {
122122
edm::LogWarning("HGCalGeom") << "Check " << HGCScintillatorDetId(idc) << " from " << HGCScintillatorDetId(detId)
123+
<< " Mode " << m_topology.dddConstants().geomMode() << ":" << m_topology.geomMode()
124+
<< " Valid " << m_topology.tileTrapezoid() << ":" << m_topology.valid(idc)
123125
<< " ERROR ???";
124126
}
125127
} else {

‎SimG4CMS/Calo/src/HGCalNumberingScheme.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ HGCalNumberingScheme::HGCalNumberingScheme(const HGCalDDDConstants& hgc,
2929
<< HGCalGeometryMode::Hexagon8File << ":" << HGCalGeometryMode::Hexagon8Module << ":"
3030
<< ":" << HGCalGeometryMode::Hexagon8Cassette << ":" << HGCalGeometryMode::Trapezoid << ":"
3131
<< HGCalGeometryMode::TrapezoidFile << ":" << HGCalGeometryMode::TrapezoidModule << ":"
32-
<< HGCalGeometryMode::TrapezoidCassette;
32+
<< HGCalGeometryMode::TrapezoidCassette << ":" << HGCalGeometryMode::TrapezoidFineCell;
3333
#endif
3434
firstLayer_ = hgcons_.getLayerOffset();
3535
if (!fileName.empty()) {

0 commit comments

Comments
 (0)