Skip to content

GeometryManager::getSensID supports up to 2^17 sensors for DetID>FOCAL #15656

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

Open
shahor02 wants to merge 1 commit into
base: dev
Choose a base branch
from
+4 −3
Open

GeometryManager::getSensID supports up to 2^17 sensors for DetID>FOCAL #15656

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
7 changes: 4 additions & 3 deletions Detectors/Base/include/DetectorsBase/GeometryManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class GeometryManager : public TObject
static int getSensID(o2::detectors::DetID detid, int sensid)
{
/// compose combined detector+sensor ID for sensitive volumes
return (detid << sDetOffset) | (sensid & sSensorMask);
return detid <= o2::detectors::DetID::FOC ? ((detid << sDetOffset) | (sensid & sSensorMask)) : ((detid << sDetOffsetLarge) | (sensid & sSensorMaskLarge));
}

/// Default destructor
Expand Down Expand Up @@ -140,8 +140,9 @@ class GeometryManager : public TObject
private:
/// sensitive volume identifier composed from (det_ID<<sDetOffset)|(sensid&sSensorMask)
static constexpr UInt_t sDetOffset = 15; /// detector identifier will start from this bit
static constexpr UInt_t sSensorMask =
(0x1 << sDetOffset) - 1; /// mask=max sensitive volumes allowed per detector (0xffff)
static constexpr UInt_t sSensorMask = (0x1 << sDetOffset) - 1; /// mask=max sensitive volumes allowed per detector (32767)
static constexpr UInt_t sDetOffsetLarge = 17; /// detector identifier will start from this bit for detectors after the FOC
static constexpr UInt_t sSensorMaskLarge = (0x1 << sDetOffsetLarge) - 1; /// mask=max sensitive volumes allowed per detector (131071)
static std::mutex sTGMutex;

ClassDefOverride(GeometryManager, 0); // Manager of geometry information for alignment
Expand Down