Skip to content

Phase2-hgx365K The ordering of wafer types corrected and also ID from position is corrected for HGCal #50043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
Feb 6, 2026
Merged

Phase2-hgx365K The ordering of wafer types corrected and also ID from position is corrected for HGCal #50043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Geometry/HGCalCommonData/interface/HGCalDDDConstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "DataFormats/ForwardDetId/interface/HGCScintillatorDetId.h"
#include "DataFormats/ForwardDetId/interface/HGCSiliconDetId.h"
#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "Geometry/HGCalCommonData/interface/HGCalCassette.h"
#include "Geometry/HGCalCommonData/interface/HGCalCell.h"
#include "Geometry/HGCalCommonData/interface/HGCalCellOffset.h"
Expand Down Expand Up @@ -42,6 +43,7 @@ class HGCalDDDConstants {
std::array<int, 5> assignCellHex(float x, float y, int zside, int lay, bool reco, bool extend, bool debug) const;
std::array<int, 3> assignCellTrap(float x, float y, float z, int lay, bool reco) const;
std::vector<int> calibCells(bool hd, bool full) const {
edm::LogVerbatim("HGCal") << "hd " << hd << " full " << full;
if (hd) {
return (full ? hgpar_->calibCellFullHD_ : hgpar_->calibCellPartHD_);
} else {
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1784,7 +1784,7 @@ void HGCalDDDConstants::waferFromPosition(const double x,
<< " Type " << (ktr->second).type << ":" << (ktr->second).part << ":"
<< (ktr->second).orient << ":" << (ktr->second).cassette;
} else {
if (mode_ == HGCalGeometryMode::Hexagon8FineCell) {
if (mode_ >= HGCalGeometryMode::Hexagon8Cassette) {
if (debug)
edm::LogVerbatim("HGCalGeom") << "Cannot find waferinformation --> Skip this " << layer << ":" << waferU
<< ":" << waferV << " wafer assignment";
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/src/HGCalTypes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ int32_t HGCalTypes::getUnpackedCell6(int id) { return (id % faccell6_); }
int32_t HGCalTypes::layerType(int type) {
static const int32_t layerTypeX[7] = {HGCalTypes::WaferCenter,
HGCalTypes::WaferCenterB,
HGCalTypes::WaferCenterR,
HGCalTypes::CornerCenterYp,
HGCalTypes::CornerCenterYm,
HGCalTypes::WaferCenterR,
HGCalTypes::CornerCenterXp,
HGCalTypes::CornerCenterXm};
return ((type >= 0) && (type < 7)) ? layerTypeX[type] : HGCalTypes::WaferCenter;
Expand Down