@@ -87,8 +87,8 @@ class DetID
8787 static constexpr ID RCH = 23 ;
8888 static constexpr ID MI3 = 24 ;
8989 static constexpr ID ECL = 25 ;
90- static constexpr ID FD = 26 ;
91- static constexpr ID Last = FD ;
90+ static constexpr ID FD3 = 26 ;
91+ static constexpr ID Last = FD3 ;
9292#else
9393 static constexpr ID Last = FOC; // /< if extra detectors added, update this !!!
9494#endif
@@ -182,7 +182,7 @@ class DetID
182182 // detector names, will be defined in DataSources
183183 static constexpr const char * sDetNames [nDetectors + 1 ] = // /< defined detector names
184184#ifdef ENABLE_UPGRADES
185- {" ITS" , " TPC" , " TRD" , " TOF" , " PHS" , " CPV" , " EMC" , " HMP" , " MFT" , " MCH" , " MID" , " ZDC" , " FT0" , " FV0" , " FDD" , " TST" , " CTP" , " FOC" , " IT3" , " TRK" , " FT3" , " FCT" , " TF3" , " RCH" , " MI3" , " ECL" , " FD " , nullptr };
185+ {" ITS" , " TPC" , " TRD" , " TOF" , " PHS" , " CPV" , " EMC" , " HMP" , " MFT" , " MCH" , " MID" , " ZDC" , " FT0" , " FV0" , " FDD" , " TST" , " CTP" , " FOC" , " IT3" , " TRK" , " FT3" , " FCT" , " TF3" , " RCH" , " MI3" , " ECL" , " FD3 " , nullptr };
186186#else
187187 {" ITS" , " TPC" , " TRD" , " TOF" , " PHS" , " CPV" , " EMC" , " HMP" , " MFT" , " MCH" , " MID" , " ZDC" , " FT0" , " FV0" , " FDD" , " TST" , " CTP" , " FOC" , nullptr };
188188#endif
@@ -196,7 +196,7 @@ class DetID
196196#ifdef ENABLE_UPGRADES
197197 ,
198198 o2h::gDataOriginIT3 , o2h::gDataOriginTRK , o2h::gDataOriginFT3 , o2h::gDataOriginFCT , o2h::gDataOriginTF3 ,
199- o2h::gDataOriginRCH , o2h::gDataOriginMI3 , o2h::gDataOriginECL , o2h::gDataOriginFD
199+ o2h::gDataOriginRCH , o2h::gDataOriginMI3 , o2h::gDataOriginECL , o2h::gDataOriginFD3
200200#endif
201201 };
202202#endif // GPUCA_GPUCODE_DEVICE
@@ -216,7 +216,7 @@ GPUconstexpr() DetID::mask_t sMasks[DetID::nDetectors] = ///< detectot masks
216216#ifdef ENABLE_UPGRADES
217217 ,
218218 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)), DetID::mask_t (math_utils::bit2Mask (DetID::TF3)),
219- DetID::mask_t (math_utils::bit2Mask (DetID::RCH)), DetID::mask_t (math_utils::bit2Mask (DetID::MI3)), DetID::mask_t (math_utils::bit2Mask (DetID::ECL)), DetID::mask_t (math_utils::bit2Mask (DetID::FD ))
219+ DetID::mask_t (math_utils::bit2Mask (DetID::RCH)), DetID::mask_t (math_utils::bit2Mask (DetID::MI3)), DetID::mask_t (math_utils::bit2Mask (DetID::ECL)), DetID::mask_t (math_utils::bit2Mask (DetID::FD3 ))
220220#endif
221221};
222222} // namespace detid_internal
0 commit comments