Skip to content

Commit 7cc4a66

Browse files
author
Sunanda
committed
Make some changes to inititalize V19 reconstruction geometry for HGCal
1 parent 275ceb6 commit 7cc4a66

File tree

6 files changed

+114
-54
lines changed

6 files changed

+114
-54
lines changed

‎Geometry/HGCalCommonData/interface/HGCalParameters.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ 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 { return (scintFine(indx) ? ((irad >= iradMinBHFine_[indx]) && (irad <= (iradMaxBHFine_[indx] + 1))) : ((irad >= iradMinBH_[indx]) && (irad <= (iradMaxBH_[indx] + 1)))); }
8183
std::array<int, 4> getID(unsigned int k) const;
8284

8385
std::string name_;
@@ -186,6 +188,8 @@ class HGCalParameters {
186188
std::vector<double> radiusLayer_[2];
187189
std::vector<int> iradMinBH_;
188190
std::vector<int> iradMaxBH_;
191+
std::vector<int> iradMinBHFine_;
192+
std::vector<int> iradMaxBHFine_;
189193
double minTileSize_ = 0.;
190194
std::vector<int> firstModule_;
191195
std::vector<int> lastModule_;
@@ -218,6 +222,8 @@ class HGCalParameters {
218222
double calibCellRLD_ = 0.;
219223
std::vector<int> calibCellFullLD_;
220224
std::vector<int> calibCellPartLD_;
225+
int tileUVMax_ = 0;
226+
int tileUVMaxFine_ = 0;
221227

222228
COND_SERIALIZABLE;
223229

‎Geometry/HGCalCommonData/src/HGCalCassette.cc‎

Lines changed: 8 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,9 @@
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 " << shifts.size();
14+
#endif
1115
shifts_.insert(shifts_.end(), shifts.begin(), shifts.end());
1216
if (both)
1317
shiftsScnt_.insert(shiftsScnt_.end(), shifts.begin(), shifts.end());
@@ -35,6 +39,7 @@ void HGCalCassette::setParameter(int cassette, const std::vector<double>& shifts
3539
}
3640

3741
void HGCalCassette::setParameterScint(const std::vector<double>& shifts) {
42+
shifts_.insert(shifts_.end(), shifts.begin(), shifts.end());
3843
shiftsScnt_.insert(shiftsScnt_.end(), shifts.begin(), shifts.end());
3944
#ifdef EDM_ML_DEBUG
4045
for (uint32_t j1 = 0; j1 < shifts.size(); j1 += 12) {
@@ -55,6 +60,9 @@ void HGCalCassette::setParameterScint(const std::vector<double>& shifts) {
5560
std::pair<double, double> HGCalCassette::getShift(int layer, int zside, int cassette, bool scnt) const {
5661
int locc = (zside < 0) ? (cassette - 1) : (typeHE_ ? positHE_[cassette - 1] : positEE_[cassette - 1]);
5762
int loc = 2 * (cassette_ * (layer - 1) + locc);
63+
#ifdef EDM_ML_DEBUG
64+
edm::LogVerbatim("HGCalGeom") << "HGCalCassette::getShift: layer|zside|cassett|scnt " << layer << ":" << zside << ":" << cassette << ":" << scnt << " loc " << locc << ":" << loc << " size " << shiftsScnt_.size() << ":" << shifts_.size();
65+
#endif
5866
std::pair<double, double> xy = (typeHE_ && scnt) ? (std::make_pair(-zside * shiftsScnt_[loc], shiftsScnt_[loc + 1]))
5967
: (std::make_pair(-zside * shifts_[loc], shifts_[loc + 1]));
6068
#ifdef EDM_ML_DEBUG

‎Geometry/HGCalCommonData/src/HGCalDDDConstants.cc‎

Lines changed: 57 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ 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_ << " waferHex6:waverHex8 " << waferHexagon6() << ":" << waferHexagon8() << " cassettte " << cassetteMode();
2929
#endif
3030
if (waferHexagon6() || waferHexagon8()) {
3131
rmax_ = (HGCalParameters::k_ScaleFromDDD * (hgpar_->waferR_) * std::cos(30._deg));
@@ -53,7 +53,10 @@ HGCalDDDConstants::HGCalDDDConstants(const HGCalParameters* hp, const std::strin
5353
cellOffset_.reset();
5454
}
5555
if (cassetteMode()) {
56-
hgcassette_.setParameter(hgpar_->cassettes_, hgpar_->cassetteShift_);
56+
if (mode_ == HGCalGeometryMode::TrapezoidFineCell)
57+
hgcassette_.setParameter(hgpar_->cassettes_, hgpar_->cassetteShiftTile_, true);
58+
else
59+
hgcassette_.setParameter(hgpar_->cassettes_, hgpar_->cassetteShift_, true);
5760
#ifdef EDM_ML_DEBUG
5861
edm::LogVerbatim("HGCalGeom") << "HGCalDDDConstants::Setup HGCalCassette for " << hgpar_->cassettes_
5962
<< " cassettes";
@@ -228,7 +231,7 @@ std::array<int, 3> HGCalDDDConstants::assignCellTrap(float x, float y, float z,
228231
double r = std::sqrt(xx * xx + yy * yy);
229232
auto ir = std::lower_bound(hgpar_->radiusLayer_[type].begin(), hgpar_->radiusLayer_[type].end(), r);
230233
irad = static_cast<int>(ir - hgpar_->radiusLayer_[type].begin());
231-
irad = std::clamp(irad, hgpar_->iradMinBH_[indx.first], hgpar_->iradMaxBH_[indx.first]);
234+
irad = hgpar_->scintFine(indx.first) ? (std::clamp(irad, hgpar_->iradMinBHFine_[indx.first], hgpar_->iradMaxBHFine_[indx.first])) : (std::clamp(irad, hgpar_->iradMinBH_[indx.first], hgpar_->iradMaxBH_[indx.first]));
232235
#ifdef EDM_ML_DEBUG
233236
edm::LogVerbatim("HGCalGeomT") << "assignCellTrap Input " << x << ":" << y << ":" << z << ":" << layer << ":" << reco
234237
<< " x|y|r " << xx << ":" << yy << ":" << r << " phi " << phi << ":"
@@ -238,20 +241,34 @@ std::array<int, 3> HGCalDDDConstants::assignCellTrap(float x, float y, float z,
238241
if (tileRingEdge(r, layer, irad)) {
239242
if (std::abs(r - hgpar_->radiusLayer_[type][irad - 1]) < tol_) {
240243
--irad;
241-
if (irad <= hgpar_->iradMinBH_[indx.first])
242-
irad = hgpar_->iradMinBH_[indx.first];
244+
if (hgpar_->scintFine(indx.first)) {
245+
if (irad <= hgpar_->iradMinBHFine_[indx.first])
246+
irad = hgpar_->iradMinBHFine_[indx.first];
247+
} else {
248+
if (irad <= hgpar_->iradMinBH_[indx.first])
249+
irad = hgpar_->iradMinBH_[indx.first];
250+
}
243251
} else {
244252
++irad;
245-
if (irad > hgpar_->iradMaxBH_[indx.first])
246-
irad = hgpar_->iradMaxBH_[indx.first];
253+
if (hgpar_->scintFine(indx.first)) {
254+
if (irad > hgpar_->iradMaxBHFine_[indx.first])
255+
irad = hgpar_->iradMaxBHFine_[indx.first];
256+
} else {
257+
if (irad > hgpar_->iradMaxBH_[indx.first])
258+
irad = hgpar_->iradMaxBH_[indx.first];
259+
}
247260
}
248261
#ifdef EDM_ML_DEBUG
249-
edm::LogVerbatim("HGCalGeomT") << "assignCellTrap: ring # modified to " << irad << ":"
250-
<< hgpar_->iradMinBH_[indx.first] << ":" << hgpar_->iradMaxBH_[indx.first];
251-
;
262+
std::ostringstream st1;
263+
st1 << "assignCellTrap: ring # in ring type " << hgpar_->scintFine(indx.first) << "modified to " << irad;
264+
if (irad > hgpar_->iradMaxBHFine_[indx.first])
265+
st1 << ":" << hgpar_->iradMinBHFine_[indx.first] << ":" << hgpar_->iradMaxBHFine_[indx.first];
266+
else
267+
st1 << ":" << hgpar_->iradMinBH_[indx.first] << ":" << hgpar_->iradMaxBH_[indx.first];
268+
edm::LogVerbatim("HGCalGeomT") << st1.str();
252269
#endif
253270
} else if (tilePhiEdge(phi, layer, iphi)) {
254-
if (std::abs(phi - hgpar_->scintCellSize(layer) * (iphi - 1)) < tol_) {
271+
if (std::abs(phi - hgpar_->scintCellSize(layer) * (iphi - 1)) < tol_) {
255272
--iphi;
256273
if (iphi <= 0)
257274
iphi = 1;
@@ -445,7 +462,10 @@ double HGCalDDDConstants::distFromEdgeTrap(double x, double y, double z) const {
445462
// Take the smaller value
446463
auto ir = std::lower_bound(hgpar_->radiusLayer_[type].begin(), hgpar_->radiusLayer_[type].end(), r);
447464
int irad = static_cast<int>(ir - hgpar_->radiusLayer_[type].begin());
448-
irad = std::clamp(irad, hgpar_->iradMinBH_[indx], hgpar_->iradMaxBH_[indx]);
465+
if (hgpar_->scintFine(indx))
466+
irad = std::clamp(irad, hgpar_->iradMinBHFine_[indx], hgpar_->iradMaxBHFine_[indx]);
467+
else
468+
irad = std::clamp(irad, hgpar_->iradMinBH_[indx], hgpar_->iradMaxBH_[indx]);
449469
int iphi = 1 + static_cast<int>(phi / cell);
450470
double dphi = std::max(0.0, (0.5 * cell - std::abs(phi - (iphi - 0.5) * cell)));
451471
double dist = std::min((r - hgpar_->radiusLayer_[type][irad - 1]), (hgpar_->radiusLayer_[type][irad] - r));
@@ -516,9 +536,18 @@ std::pair<int, int> HGCalDDDConstants::getREtaRange(int lay) const {
516536
int irmin(0), irmax(0);
517537
if (tileTrapezoid()) {
518538
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];
539+
if (indx >= 0) {
540+
if (hgpar_->scintFine(indx)) {
541+
if (indx < static_cast<int>(hgpar_->iradMinBHFine_.size())) {
542+
irmin = hgpar_->iradMinBHFine_[indx];
543+
irmax = hgpar_->iradMaxBHFine_[indx];
544+
}
545+
} else {
546+
if (indx < static_cast<int>(hgpar_->iradMinBH_.size())) {
547+
irmin = hgpar_->iradMinBH_[indx];
548+
irmax = hgpar_->iradMaxBH_[indx];
549+
}
550+
}
522551
}
523552
}
524553
return std::make_pair(irmin, irmax);
@@ -745,16 +774,11 @@ bool HGCalDDDConstants::isValidTrap(int zside, int layer, int irad, int iphi) co
745774
const auto& indx = getIndex(layer, true);
746775
if (indx.first < 0)
747776
return false;
748-
bool ok = ((irad >= hgpar_->iradMinBH_[indx.first]) && (irad <= (hgpar_->iradMaxBH_[indx.first] + 1)) && (iphi > 0) &&
749-
(iphi <= hgpar_->scintCells(layer)));
777+
bool ok = ((hgpar_->scintValidRing(indx.first, irad)) && (iphi > 0) && (iphi <= hgpar_->scintCells(layer)));
750778
bool valid = ((ok && trapezoidFile()) ? tileExist(zside, layer, irad, iphi) : ok);
751779
#ifdef EDM_ML_DEBUG
752780
bool tileEx = trapezoidFile() ? tileExist(zside, layer, irad, iphi) : true;
753-
edm::LogVerbatim("HGCalGeomT") << "HGCalDDDConstants::isValidityTrap: Input " << zside << ":" << layer << ":" << irad
754-
<< ":" << iphi << " Range on Ring " << hgpar_->iradMinBH_[indx.first] << ":"
755-
<< (hgpar_->iradMaxBH_[indx.first] + 1)
756-
<< " Range on phi 0:" << hgpar_->scintCells(layer) << " tileExist " << tileEx
757-
<< " Valid " << ok << ":" << valid;
781+
edm::LogVerbatim("HGCalGeomT") << "HGCalDDDConstants::isValidityTrap: Input " << zside << ":" << layer << ":" << irad << ":" << iphi << " Range on Ring " << hgpar_->scintValidRing(indx.first, irad) << " Range on phi 0:" << hgpar_->scintCells(layer) << " tileExist " << tileEx << " Valid " << ok << ":" << tileExist(zside, layer, irad, iphi) << ":" << valid;
758782
#endif
759783
return valid;
760784
}
@@ -977,19 +1001,24 @@ std::pair<float, float> HGCalDDDConstants::locateCellTrap(
9771001
int zside, int lay, int irad, int iphi, bool reco, bool debug) const {
9781002
float x(0), y(0);
9791003
const auto& indx = getIndex(lay, reco);
1004+
edm::LogVerbatim("HGCalGeom") << "locateCellTrap:: Input " << lay << ":" << irad << ":" << iphi << ":" << zside << ":" << reco << ":" << indx.first;
1005+
debug = true;
9801006
if (indx.first >= 0) {
9811007
int ir = std::abs(irad);
9821008
int type = hgpar_->scintType(lay);
9831009
double phi = (iphi - 0.5) * indx.second;
9841010
double z = hgpar_->zLayerHex_[indx.first];
9851011
double r = 0.5 * (hgpar_->radiusLayer_[type][ir - 1] + hgpar_->radiusLayer_[type][ir]);
9861012
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;
1013+
if (debug) {
1014+
std::ostringstream st1;
1015+
st1 << "locateCellTrap:: Input " << lay << ":" << irad << ":" << iphi << ":" << reco << " indx " << indx.first << " IR " << ir << ":";
1016+
if (hgpar_->scintFine(indx.first))
1017+
st1 << hgpar_->iradMinBHFine_[indx.first] << ":" << hgpar_->iradMaxBHFine_[indx.first];
1018+
else
1019+
st1 << hgpar_->iradMinBH_[indx.first] << ":" << hgpar_->iradMaxBH_[indx.first];
1020+
edm::LogVerbatim("HGCalGeom") << st1.str() << " Type " << type << " Z " << indx.first << ":" << z << " phi " << phi << ":" << convertRadToDeg(phi) << " R " << r << ":" << range.first << ":" << range.second << " file " << (!trapezoidFile()) << " CassetteMode " << cassetteMode();
1021+
}
9931022
if (!trapezoidFile())
9941023
r = std::max(range.first, std::min(r, range.second));
9951024
x = r * std::cos(phi);

‎Geometry/HGCalCommonData/src/HGCalGeomParameters.cc‎

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2393,19 +2393,23 @@ 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+
php.iradMinBHFine_.emplace_back(1 + php.tileRingFineRange_[k1].first);
2397+
php.iradMaxBHFine_.emplace_back(1 + php.tileRingFineRange_[k1].second);
2398+
php.iradMinBH_.emplace_back(1 + php.tileRingRange_[k2].first);
2399+
php.iradMaxBH_.emplace_back(1 + php.tileRingRange_[k2].second);
23962400
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);
23992401
++k1;
24002402
} else {
2401-
php.iradMinBH_.emplace_back(1 + php.tileRingRange_[k2].first);
2402-
php.iradMaxBH_.emplace_back(1 + php.tileRingRange_[k2].second);
24032403
++k2;
24042404
}
24052405
#ifdef EDM_ML_DEBUG
24062406
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();
2407+
if (php.nPhiLayer_[k] > 288)
2408+
edm::LogVerbatim("HGCalGeom") << "New Layer " << k << " Type " << kk << " Low edge " << php.iradMinBHFine_.back()
2409+
<< " Top edge " << php.iradMaxBHFine_.back();
2410+
else
2411+
edm::LogVerbatim("HGCalGeom") << "New Layer " << k << " Type " << kk << " Low edge " << php.iradMinBH_.back()
2412+
<< " Top edge " << php.iradMaxBH_.back();
24092413
#endif
24102414
}
24112415
} else {
@@ -2475,8 +2479,13 @@ void HGCalGeomParameters::loadCellTrapezoid(HGCalParameters& php) {
24752479
edm::LogVerbatim("HGCalGeom") << "Modified irhigh " << irhigh << " dr " << drhigh;
24762480
#endif
24772481
}
2478-
php.iradMinBH_.emplace_back(irlow);
2479-
php.iradMaxBH_.emplace_back(irhigh);
2482+
if (php.nPhiLayer_[k] > 288) {
2483+
php.iradMinBHFine_.emplace_back(irlow);
2484+
php.iradMaxBHFine_.emplace_back(irhigh);
2485+
} else {
2486+
php.iradMinBH_.emplace_back(irlow);
2487+
php.iradMaxBH_.emplace_back(irhigh);
2488+
}
24802489
#ifdef EDM_ML_DEBUG
24812490
edm::LogVerbatim("HGCalGeom") << "Old Layer " << k << " Type " << kk << " Low edge " << irlow << ":" << drlow
24822491
<< " Top edge " << irhigh << ":" << drhigh;
@@ -2493,22 +2502,29 @@ void HGCalGeomParameters::loadCellTrapezoid(HGCalParameters& php) {
24932502

24942503
// Now define the volumes
24952504
int im(0);
2496-
php.waferUVMax_ = 0;
2505+
php.tileUVMax_ = php.tileUVMaxFine_ = 00;
24972506
HGCalParameters::hgtrap mytr;
24982507
mytr.alpha = 0.0;
24992508
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;
2509+
if (php.nPhiLayer_[k] > 288) {
2510+
if (php.iradMaxBHFine_[k] > php.tileUVMaxFine_)
2511+
php.tileUVMaxFine_ = php.iradMaxBHFine_[k];
2512+
} else {
2513+
if (php.iradMaxBH_[k] > php.tileUVMax_)
2514+
php.tileUVMax_ = php.iradMaxBH_[k];
2515+
}
2516+
int kk = (php.nPhiLayer_[k] > 288) ? 0 : 1;
25032517
int irm = php.radiusLayer_[kk].size() - 1;
2518+
int irmin = (php.nPhiLayer_[k] > 288) ? php.iradMinBHFine_[k] : php.iradMinBH_[k];
2519+
int irmax = (php.nPhiLayer_[k] > 288) ? php.iradMaxBHFine_[k] : php.iradMaxBH_[k];
25042520
#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)];
2521+
double rmin = php.radiusLayer_[kk][std::max((irmin - 1), 0)];
2522+
double rmax = php.radiusLayer_[kk][std::min(irmax, irm)];
25072523
edm::LogVerbatim("HGCalGeom") << "Layer " << php.firstLayer_ + k << ":" << kk << " Radius range "
2508-
<< php.iradMinBH_[k] << ":" << php.iradMaxBH_[k] << ":" << rmin << ":" << rmax;
2524+
<< irmin << ":" << irmax << ":" << rmin << ":" << rmax;
25092525
#endif
25102526
mytr.lay = php.firstLayer_ + k;
2511-
for (int irad = php.iradMinBH_[k]; irad <= php.iradMaxBH_[k]; ++irad) {
2527+
for (int irad = irmin; irad <= irmax; ++irad) {
25122528
double rmin = php.radiusLayer_[kk][std::max((irad - 1), 0)];
25132529
double rmax = php.radiusLayer_[kk][std::min(irad, irm)];
25142530
mytr.bl = 0.5 * rmin * php.scintCellSize(mytr.lay);
@@ -2523,19 +2539,20 @@ void HGCalGeomParameters::loadCellTrapezoid(HGCalParameters& php) {
25232539
mytr.dz *= HGCalParameters::k_ScaleToDDD;
25242540
mytr.cellSize *= HGCalParameters::k_ScaleFromDDD;
25252541
php.fillModule(mytr, false);
2526-
if (irad == php.iradMinBH_[k])
2527-
php.firstModule_.emplace_back(im);
2542+
if (irad == irmin)
2543+
php.firstModule_.emplace_back(im);
25282544
++im;
2529-
if (irad == php.iradMaxBH_[k] - 1)
2530-
php.lastModule_.emplace_back(im);
2545+
if (irad == irmax)
2546+
php.lastModule_.emplace_back(im);
25312547
}
25322548
}
2533-
php.nSectors_ = php.waferUVMax_;
2549+
php.nSectors_ = std::max(php.tileUVMax_, php.tileUVMaxFine_);
25342550
#ifdef EDM_ML_DEBUG
2535-
edm::LogVerbatim("HGCalGeom") << "Maximum radius index " << php.waferUVMax_;
2551+
edm::LogVerbatim("HGCalGeom") << "Maximum radius index " << php.tileUVMax_ << ":" << php.tileUVMaxFine_;
25362552
for (unsigned int k = 0; k < php.firstModule_.size(); ++k)
25372553
edm::LogVerbatim("HGCalGeom") << "Layer " << k + php.firstLayer_ << " Modules " << php.firstModule_[k] << ":"
2538-
<< php.lastModule_[k];
2554+
<< php.lastModule_[k];
2555+
25392556
#endif
25402557
}
25412558

‎Geometry/HGCalGeometry/src/HGCalGeometry.cc‎

Lines changed: 2 additions & 2 deletions
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,7 +120,7 @@ void HGCalGeometry::newCell(
120120
#endif
121121
} else {
122122
edm::LogWarning("HGCalGeom") << "Check " << HGCScintillatorDetId(idc) << " from " << HGCScintillatorDetId(detId)
123-
<< " ERROR ???";
123+
<< " Mode " << m_topology.dddConstants().geomMode() << ":" << m_topology.geomMode() << " Valid " << m_topology.tileTrapezoid() << ":" << m_topology.valid(idc) <<" ERROR ???";
124124
}
125125
} else {
126126
#ifdef EDM_ML_DEBUG

‎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)