Skip to content

Commit

Permalink
Update HGCSiliconDetId in view of adding a fourth type of wafer: high…
Browse files Browse the repository at this point in the history 
… density but thicker (backport of #43196)
  • Loading branch information
Sunanda committed Nov 6, 2023
1 parent d4c1531 commit cb09616
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 48 deletions.
97 changes: 58 additions & 39 deletions DataFormats/ForwardDetId/interface/HGCSiliconDetId.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,39 @@
[25:25] z-side (0 for +z; 1 for -z)
[26:27] Type (0 fine divisions of wafer with 120 mum thick silicon
1 coarse divisions of wafer with 200 mum thick silicon
2 coarse divisions of wafer with 300 mum thick silicon)
2 coarse divisions of wafer with 300 mum thick silicon
3 fine divisions of wafer with 200 mum thick silicon)
[28:31] Detector type (HGCalEE or HGCalHSi)
*/
class HGCSiliconDetId : public DetId {
public:
enum waferType { HGCalFine = 0, HGCalCoarseThin = 1, HGCalCoarseThick = 2 };
static const int HGCalFineN = 12;
static const int HGCalCoarseN = 8;
static const int HGCalFineTrigger = 3;
static const int HGCalCoarseTrigger = 2;
enum waferType { HGCalFine = 0, HGCalCoarseThin = 1, HGCalCoarseThick = 2, HGCalFineThick = 3 };
static constexpr int32_t HGCalHighDensityN = 12;
static constexpr int32_t HGCalLowDensityN = 8;
static constexpr int32_t HGCalFineTrigger = 3;
static constexpr int32_t HGCalCoarseTrigger = 2;
static constexpr int32_t HGCal0Depletion = 120;
static constexpr int32_t HGCal1Depletion = 200;
static constexpr int32_t HGCal2Depletion = 300;

/** Create a null cellid*/
constexpr HGCSiliconDetId() : DetId() {}
/** Create cellid from raw id (0=invalid tower id) */
constexpr HGCSiliconDetId(uint32_t rawid) : DetId(rawid) {}
/** Constructor from subdetector, zplus, layer, module, cell numbers */
constexpr HGCSiliconDetId(
DetId::Detector det, int zp, int type, int layer, int waferU, int waferV, int cellU, int cellV)
constexpr HGCSiliconDetId(DetId::Detector det,
int32_t zp,
int32_t type,
int32_t layer,
int32_t waferU,
int32_t waferV,
int32_t cellU,
int32_t cellV)
: DetId(det, ForwardEmpty) {
int waferUabs(std::abs(waferU)), waferVabs(std::abs(waferV));
int waferUsign = (waferU >= 0) ? 0 : 1;
int waferVsign = (waferV >= 0) ? 0 : 1;
int zside = (zp < 0) ? 1 : 0;
int32_t waferUabs(std::abs(waferU)), waferVabs(std::abs(waferV));
int32_t waferUsign = (waferU >= 0) ? 0 : 1;
int32_t waferVsign = (waferV >= 0) ? 0 : 1;
int32_t zside = (zp < 0) ? 1 : 0;
id_ |= (((cellU & kHGCalCellUMask) << kHGCalCellUOffset) | ((cellV & kHGCalCellVMask) << kHGCalCellVOffset) |
((waferUabs & kHGCalWaferUMask) << kHGCalWaferUOffset) |
((waferUsign & kHGCalWaferUSignMask) << kHGCalWaferUSignOffset) |
Expand Down Expand Up @@ -84,42 +94,49 @@ class HGCSiliconDetId : public DetId {
constexpr DetId::Detector subdet() const { return det(); }

/// get the type
constexpr int type() const { return (id_ >> kHGCalTypeOffset) & kHGCalTypeMask; }
constexpr int32_t type() const { return (id_ >> kHGCalTypeOffset) & kHGCalTypeMask; }
constexpr bool lowDensity() const { return ((type() == HGCalCoarseThin) || (type() == HGCalCoarseThick)); }
constexpr bool highDensity() const { return ((type() == HGCalFine) || (type() == HGCalFineThick)); }
constexpr int32_t depletion() const {
return ((type() == HGCalFine) ? HGCal0Depletion
: ((type() == HGCalCoarseThick) ? HGCal2Depletion : HGCal1Depletion));
}

/// get the z-side of the cell (1/-1)
constexpr int zside() const { return (((id_ >> kHGCalZsideOffset) & kHGCalZsideMask) ? -1 : 1); }
constexpr int32_t zside() const { return (((id_ >> kHGCalZsideOffset) & kHGCalZsideMask) ? -1 : 1); }

/// get the layer #
constexpr int layer() const { return (id_ >> kHGCalLayerOffset) & kHGCalLayerMask; }
constexpr int32_t layer() const { return (id_ >> kHGCalLayerOffset) & kHGCalLayerMask; }

/// get the cell #'s in u,v or in x,y
constexpr int cellU() const { return (id_ >> kHGCalCellUOffset) & kHGCalCellUMask; }
constexpr int cellV() const { return (id_ >> kHGCalCellVOffset) & kHGCalCellVMask; }
constexpr std::pair<int, int> cellUV() const { return std::pair<int, int>(cellU(), cellV()); }
constexpr int cellX() const {
int N = (type() == HGCalFine) ? HGCalFineN : HGCalCoarseN;
constexpr int32_t cellU() const { return (id_ >> kHGCalCellUOffset) & kHGCalCellUMask; }
constexpr int32_t cellV() const { return (id_ >> kHGCalCellVOffset) & kHGCalCellVMask; }
constexpr std::pair<int32_t, int32_t> cellUV() const { return std::pair<int32_t, int32_t>(cellU(), cellV()); }
constexpr int32_t cellX() const {
int32_t N = ((type() == HGCalFine) || (type() == HGCalFineThick)) ? HGCalHighDensityN : HGCalLowDensityN;
return (3 * (cellV() - N) + 2);
}
constexpr int cellY() const {
int N = (type() == HGCalFine) ? HGCalFineN : HGCalCoarseN;
constexpr int32_t cellY() const {
int32_t N = ((type() == HGCalFine) || (type() == HGCalFineThick)) ? HGCalHighDensityN : HGCalLowDensityN;
return (2 * cellU() - (N + cellV()));
}
constexpr std::pair<int, int> cellXY() const { return std::pair<int, int>(cellX(), cellY()); }
constexpr std::pair<int32_t, int32_t> cellXY() const { return std::pair<int32_t, int32_t>(cellX(), cellY()); }

/// get the wafer #'s in u,v or in x,y
constexpr int waferUAbs() const { return (id_ >> kHGCalWaferUOffset) & kHGCalWaferUMask; }
constexpr int waferVAbs() const { return (id_ >> kHGCalWaferVOffset) & kHGCalWaferVMask; }
constexpr int waferU() const {
constexpr int32_t waferUAbs() const { return (id_ >> kHGCalWaferUOffset) & kHGCalWaferUMask; }
constexpr int32_t waferVAbs() const { return (id_ >> kHGCalWaferVOffset) & kHGCalWaferVMask; }
constexpr int32_t waferU() const {
return (((id_ >> kHGCalWaferUSignOffset) & kHGCalWaferUSignMask) ? -waferUAbs() : waferUAbs());
}
constexpr int waferV() const {
constexpr int32_t waferV() const {
return (((id_ >> kHGCalWaferVSignOffset) & kHGCalWaferVSignMask) ? -waferVAbs() : waferVAbs());
}
constexpr std::pair<int, int> waferUV() const { return std::pair<int, int>(waferU(), waferV()); }
constexpr int waferX() const { return (-2 * waferU() + waferV()); }
constexpr int waferY() const { return (2 * waferV()); }
constexpr std::pair<int, int> waferXY() const { return std::pair<int, int>(waferX(), waferY()); }
constexpr void unpack(int& ty, int& zs, int& ly, int& wU, int& wV, int& cU, int& cV) const {
constexpr std::pair<int32_t, int32_t> waferUV() const { return std::pair<int32_t, int32_t>(waferU(), waferV()); }
constexpr int32_t waferX() const { return (-2 * waferU() + waferV()); }
constexpr int32_t waferY() const { return (2 * waferV()); }
constexpr std::pair<int32_t, int32_t> waferXY() const { return std::pair<int32_t, int32_t>(waferX(), waferY()); }
constexpr void unpack(
int32_t& ty, int32_t& zs, int32_t& ly, int32_t& wU, int32_t& wV, int32_t& cU, int32_t& cV) const {
ty = type();
zs = zside();
ly = layer();
Expand All @@ -130,21 +147,23 @@ class HGCSiliconDetId : public DetId {
}

// get trigger cell u,v
constexpr int triggerCellU() const {
int N = (type() == HGCalFine) ? HGCalFineN : HGCalCoarseN;
int NT = (type() == HGCalFine) ? HGCalFineTrigger : HGCalCoarseTrigger;
constexpr int32_t triggerCellU() const {
int32_t N = ((type() == HGCalFine) || (type() == HGCalFineThick)) ? HGCalHighDensityN : HGCalLowDensityN;
int32_t NT = ((type() == HGCalFine) || (type() == HGCalFineThick)) ? HGCalFineTrigger : HGCalCoarseTrigger;
return (cellU() >= N && cellV() >= N)
? cellU() / NT
: ((cellU() < N && cellU() <= cellV()) ? cellU() / NT : (1 + (cellU() - (cellV() % NT + 1)) / NT));
}
constexpr int triggerCellV() const {
int N = (type() == HGCalFine) ? HGCalFineN : HGCalCoarseN;
int NT = (type() == HGCalFine) ? HGCalFineTrigger : HGCalCoarseTrigger;
constexpr int32_t triggerCellV() const {
int32_t N = ((type() == HGCalFine) || (type() == HGCalFineThick)) ? HGCalHighDensityN : HGCalLowDensityN;
int32_t NT = ((type() == HGCalFine) || (type() == HGCalFineThick)) ? HGCalFineTrigger : HGCalCoarseTrigger;
return (cellU() >= N && cellV() >= N)
? cellV() / NT
: ((cellU() < N && cellU() <= cellV()) ? ((cellV() - cellU()) / NT + cellU() / NT) : cellV() / NT);
}
constexpr std::pair<int, int> triggerCellUV() const { return std::pair<int, int>(triggerCellU(), triggerCellV()); }
constexpr std::pair<int32_t, int32_t> triggerCellUV() const {
return std::pair<int32_t, int32_t>(triggerCellU(), triggerCellV());
}

/// consistency check : no bits left => no overhead
constexpr bool isEE() const { return (det() == HGCalEE); }
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/ForwardDetId/src/HGCSiliconDetIdToModule.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ HGCSiliconDetIdToModule::HGCSiliconDetIdToModule() {}

std::vector<HGCSiliconDetId> HGCSiliconDetIdToModule::getDetIds(HGCSiliconDetId const& id) const {
std::vector<HGCSiliconDetId> ids;
int nCells = (id.type() == 0) ? HGCSiliconDetId::HGCalFineN : HGCSiliconDetId::HGCalCoarseN;
int nCells = (id.type() == 0) ? HGCSiliconDetId::HGCalHighDensityN : HGCSiliconDetId::HGCalLowDensityN;
for (int u = 0; u < 2 * nCells; ++u) {
for (int v = 0; v < 2 * nCells; ++v) {
if (((v - u) < nCells) && (u - v) <= nCells) {
Expand All @@ -18,7 +18,7 @@ std::vector<HGCSiliconDetId> HGCSiliconDetIdToModule::getDetIds(HGCSiliconDetId

std::vector<HGCalTriggerDetId> HGCSiliconDetIdToModule::getDetTriggerIds(HGCSiliconDetId const& id) const {
std::vector<HGCalTriggerDetId> ids;
int nCells = HGCSiliconDetId::HGCalFineN / HGCSiliconDetId::HGCalFineTrigger;
int nCells = HGCSiliconDetId::HGCalHighDensityN / HGCSiliconDetId::HGCalFineTrigger;
int subdet = (id.det() == DetId::HGCalEE) ? HGCalEETrigger : HGCalHSiTrigger;
for (int u = 0; u < 2 * nCells; ++u) {
for (int v = 0; v < 2 * nCells; ++v) {
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/ForwardDetId/test/testHGCDetId.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <string>

void testCell(int type) {
int N = (type == 0) ? HGCSiliconDetId::HGCalFineN : HGCSiliconDetId::HGCalCoarseN;
int N = (type == 0) ? HGCSiliconDetId::HGCalHighDensityN : HGCSiliconDetId::HGCalLowDensityN;
const int waferu(0), waferv(0), layer(1), zside(1);
std::map<std::pair<int, int>, int> triggers;
int ntot(0);
Expand Down Expand Up @@ -125,7 +125,7 @@ void testScint(int layer) {
}

void testTriggerCell(int type) {
int N = (type == 0) ? HGCSiliconDetId::HGCalFineN : HGCSiliconDetId::HGCalCoarseN;
int N = (type == 0) ? HGCSiliconDetId::HGCalHighDensityN : HGCSiliconDetId::HGCalLowDensityN;
const int waferu(0), waferv(0), layer(1);
std::string error[2] = {"ERROR", "OK"};
int ntot(0), nerror(0);
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/test/HGCalPartialWaferTester.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void HGCalPartialWaferTester::analyze(const edm::Event&, const edm::EventSetup&
edm::LogVerbatim("HGCalGeom") << "\n\nPartial Type " << partialType << " Orientation " << orientation
<< " Wafer " << waferU << ":" << waferV << " in layer " << layer << " at "
<< xy.first << ":" << xy.second << "\n\n";
int nCells = (type == 0) ? HGCSiliconDetId::HGCalFineN : HGCSiliconDetId::HGCalCoarseN;
int nCells = (type == 0) ? HGCSiliconDetId::HGCalHighDensityN : HGCSiliconDetId::HGCalLowDensityN;
for (int i = 0; i < nTrials_; i++) {
int ui = std::floor(nCells * 0.0002 * (rand() % 10000));
int vi = std::floor(nCells * 0.0002 * (rand() % 10000));
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/test/HGCalValidHexTester.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void HGCalValidHexTester::analyze(const edm::Event& iEvent, const edm::EventSetu
edm::LogVerbatim("HGCalGeom") << nameDetector_ << " Layers = " << hgdc.layers(true) << " Sectors = " << hgdc.sectors()
<< "\n";
for (unsigned int k = 0; k < layers_.size(); ++k) {
int nCells = (types_[k] == 0) ? HGCSiliconDetId::HGCalFineN : HGCSiliconDetId::HGCalCoarseN;
int nCells = (types_[k] == 0) ? HGCSiliconDetId::HGCalHighDensityN : HGCSiliconDetId::HGCalLowDensityN;
int ncell(0);
for (int u = 0; u < 2 * nCells; ++u) {
for (int v = 0; v < 2 * nCells; ++v) {
Expand Down
4 changes: 2 additions & 2 deletions Geometry/HGCalGeometry/src/HGCalMouseBite.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ HGCalMouseBite::HGCalMouseBite(const HGCalDDDConstants& hgc, const bool rot) {
<< projXY[k].first << ":" << projXY[k].second;
#endif
static const double sqrt3 = std::sqrt(3.0);
int nf(HGCSiliconDetId::HGCalFineN);
int nf(HGCSiliconDetId::HGCalHighDensityN);
int nf2 = nf / 2;
double delXF = wafersize / (3.0 * nf);
double delYF = 0.5 * delXF * sqrt3;
Expand All @@ -48,7 +48,7 @@ HGCalMouseBite::HGCalMouseBite(const HGCalDDDConstants& hgc, const bool rot) {
edm::LogVerbatim("HGCalGeom") << "[" << k << "] = (" << rejectFine_[k] / 100 << ", " << rejectFine_[k] % 100
<< ")";
#endif
int nc(HGCSiliconDetId::HGCalCoarseN);
int nc(HGCSiliconDetId::HGCalLowDensityN);
int nc2 = nc / 2;
double delXC = hgc.getParameter()->waferSize_ / (3.0 * nc);
double delYC = 0.5 * delXC * sqrt3;
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalGeometry/test/HGCalGeometryMouseBiteTester.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void HGCalGeometryMouseBiteTester::analyze(const edm::Event&, const edm::EventSe
int zside(1), layer(1), waferU(1), waferV(1);
int types[] = {0, 1};
for (int type : types) {
int ncell = (type == 0) ? HGCSiliconDetId::HGCalFineN : HGCSiliconDetId::HGCalCoarseN;
int ncell = (type == 0) ? HGCSiliconDetId::HGCalHighDensityN : HGCSiliconDetId::HGCalLowDensityN;
edm::LogVerbatim("HGCalGeomX") << "zside " << zside << " layer " << layer << " wafer " << waferU << ":" << waferV
<< " type " << type << " cells " << ncell;
for (int u = 0; u < 2 * ncell; ++u) {
Expand Down

0 comments on commit cb09616

Please sign in to comment.