Skip to content

Commit 05d28f5

Browse files
mfasDashahor02
mfasDa
authored and
shahor02
committed
[FOCAL-10] Add DetID for FOCAL
1 parent d8c3eb4 commit 05d28f5

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

  • DataFormats/Detectors/Common

‎DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/DetID.h‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,15 @@ class DetID
7777
static constexpr ID FDD = 14;
7878
static constexpr ID TST = 15;
7979
static constexpr ID CTP = 16;
80+
static constexpr ID FOC = 17;
8081
#ifdef ENABLE_UPGRADES
81-
static constexpr ID IT3 = 17;
82-
static constexpr ID TRK = 18;
83-
static constexpr ID FT3 = 19;
84-
static constexpr ID FCT = 20;
82+
static constexpr ID IT3 = 18;
83+
static constexpr ID TRK = 19;
84+
static constexpr ID FT3 = 20;
85+
static constexpr ID FCT = 21;
8586
static constexpr ID Last = FCT;
8687
#else
87-
static constexpr ID Last = CTP; ///< if extra detectors added, update this !!!
88+
static constexpr ID Last = FOC; ///< if extra detectors added, update this !!!
8889
#endif
8990
static constexpr ID First = ITS;
9091

@@ -176,17 +177,17 @@ class DetID
176177
// detector names, will be defined in DataSources
177178
static constexpr const char* sDetNames[nDetectors + 1] = ///< defined detector names
178179
#ifdef ENABLE_UPGRADES
179-
{"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "TST", "CTP", "IT3", "TRK", "FT3", "FCT", nullptr};
180+
{"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "TST", "CTP", "FOC", "IT3", "TRK", "FT3", "FCT", nullptr};
180181
#else
181-
{"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "TST", "CTP", nullptr};
182+
{"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "TST", "CTP", "FOC", nullptr};
182183
#endif
183184

184185
static constexpr std::array<o2h::DataOrigin, nDetectors>
185186
sOrigins = ///< detector data origins
186187
{o2h::gDataOriginITS, o2h::gDataOriginTPC, o2h::gDataOriginTRD, o2h::gDataOriginTOF, o2h::gDataOriginPHS,
187188
o2h::gDataOriginCPV, o2h::gDataOriginEMC, o2h::gDataOriginHMP, o2h::gDataOriginMFT, o2h::gDataOriginMCH,
188189
o2h::gDataOriginMID, o2h::gDataOriginZDC, o2h::gDataOriginFT0, o2h::gDataOriginFV0, o2h::gDataOriginFDD,
189-
o2h::gDataOriginTST, o2h::gDataOriginCTP
190+
o2h::gDataOriginTST, o2h::gDataOriginCTP, o2h::gDataOriginFOC
190191
#ifdef ENABLE_UPGRADES
191192
,
192193
o2h::gDataOriginIT3, o2h::gDataOriginTRK, o2h::gDataOriginFT3, o2h::gDataOriginFCT
@@ -204,9 +205,9 @@ GPUconstexpr() DetID::mask_t sMasks[DetID::nDetectors] = ///< detectot masks
204205
{DetID::mask_t(math_utils::bit2Mask(DetID::ITS)), DetID::mask_t(math_utils::bit2Mask(DetID::TPC)), DetID::mask_t(math_utils::bit2Mask(DetID::TRD)), DetID::mask_t(math_utils::bit2Mask(DetID::TOF)), DetID::mask_t(math_utils::bit2Mask(DetID::PHS)),
205206
DetID::mask_t(math_utils::bit2Mask(DetID::CPV)), DetID::mask_t(math_utils::bit2Mask(DetID::EMC)), DetID::mask_t(math_utils::bit2Mask(DetID::HMP)), DetID::mask_t(math_utils::bit2Mask(DetID::MFT)), DetID::mask_t(math_utils::bit2Mask(DetID::MCH)),
206207
DetID::mask_t(math_utils::bit2Mask(DetID::MID)), DetID::mask_t(math_utils::bit2Mask(DetID::ZDC)), DetID::mask_t(math_utils::bit2Mask(DetID::FT0)), DetID::mask_t(math_utils::bit2Mask(DetID::FV0)), DetID::mask_t(math_utils::bit2Mask(DetID::FDD)),
207-
DetID::mask_t(math_utils::bit2Mask(DetID::TST)), DetID::mask_t(math_utils::bit2Mask(DetID::CTP))
208+
DetID::mask_t(math_utils::bit2Mask(DetID::TST)), DetID::mask_t(math_utils::bit2Mask(DetID::CTP)), DetID::mask_t(math_utils::bit2Mask(DetID::FOC))
208209
#ifdef ENABLE_UPGRADES
209-
,
210+
,
210211
DetID::mask_t(math_utils::bit2Mask(DetID::IT3)), DetID::mask_t(math_utils::bit2Mask(DetID::TRK)), DetID::mask_t(math_utils::bit2Mask(DetID::FT3)), DetID::mask_t(math_utils::bit2Mask(DetID::FCT))
211212
#endif
212213
};

‎DataFormats/Detectors/Common/src/DetID.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ constexpr const char* DetID::sDetNames[DetID::nDetectors + 1];
2727

2828
// redundant declarations
2929
constexpr DetID::ID DetID::ITS, DetID::TPC, DetID::TRD, DetID::TOF, DetID::PHS, DetID::CPV, DetID::EMC,
30-
DetID::HMP, DetID::MFT, DetID::MCH, DetID::MID, DetID::ZDC, DetID::FT0, DetID::FV0, DetID::FDD, DetID::TST, DetID::CTP, DetID::First, DetID::Last;
30+
DetID::HMP, DetID::MFT, DetID::MCH, DetID::MID, DetID::ZDC, DetID::FT0, DetID::FV0, DetID::FDD, DetID::TST, DetID::CTP, DetID::FOC, DetID::First, DetID::Last;
3131

3232
#ifdef ENABLE_UPGRADES
3333
constexpr DetID::ID DetID::IT3;

0 commit comments

Comments
 (0)