Skip to content

Commit afa8c6c

Browse files
shahor02shahor02
committed
Suppress ACO detector, add TST instead
1 parent 7517e83 commit afa8c6c

8 files changed

Lines changed: 13 additions & 15 deletions

File tree

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class DetID
7575
static constexpr ID FT0 = 12;
7676
static constexpr ID FV0 = 13;
7777
static constexpr ID FDD = 14;
78-
static constexpr ID ACO = 15;
78+
static constexpr ID TST = 15;
7979
static constexpr ID CTP = 16;
8080
#ifdef ENABLE_UPGRADES
8181
static constexpr ID IT3 = 17;
@@ -175,25 +175,25 @@ class DetID
175175
// detector names, will be defined in DataSources
176176
static constexpr const char* sDetNames[nDetectors + 1] = ///< defined detector names
177177
#ifdef ENABLE_UPGRADES
178-
{"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "ACO", "CTP", "IT3", "TRK", "FT3", nullptr};
178+
{"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "TST", "CTP", "IT3", "TRK", "FT3", nullptr};
179179
#else
180-
{"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "ACO", "CTP", nullptr};
180+
{"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "TST", "CTP", nullptr};
181181
#endif
182182

183183
static constexpr std::array<o2h::DataOrigin, nDetectors>
184184
sOrigins = ///< detector data origins
185185
{o2h::gDataOriginITS, o2h::gDataOriginTPC, o2h::gDataOriginTRD, o2h::gDataOriginTOF, o2h::gDataOriginPHS,
186186
o2h::gDataOriginCPV, o2h::gDataOriginEMC, o2h::gDataOriginHMP, o2h::gDataOriginMFT, o2h::gDataOriginMCH,
187187
o2h::gDataOriginMID, o2h::gDataOriginZDC, o2h::gDataOriginFT0, o2h::gDataOriginFV0, o2h::gDataOriginFDD,
188-
o2h::gDataOriginACO, o2h::gDataOriginCTP
188+
o2h::gDataOriginTST, o2h::gDataOriginCTP
189189
#ifdef ENABLE_UPGRADES
190190
,
191191
o2h::gDataOriginIT3, o2h::gDataOriginTRK, o2h::gDataOriginFT3
192192
#endif
193193
};
194194
#endif // GPUCA_GPUCODE_DEVICE
195195

196-
ClassDefNV(DetID, 3);
196+
ClassDefNV(DetID, 4);
197197
};
198198

199199
namespace detid_internal
@@ -203,7 +203,7 @@ GPUconstexpr() DetID::mask_t sMasks[DetID::nDetectors] = ///< detectot masks
203203
{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)),
204204
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)),
205205
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)),
206-
DetID::mask_t(math_utils::bit2Mask(DetID::ACO)), DetID::mask_t(math_utils::bit2Mask(DetID::CTP))
206+
DetID::mask_t(math_utils::bit2Mask(DetID::TST)), DetID::mask_t(math_utils::bit2Mask(DetID::CTP))
207207
#ifdef ENABLE_UPGRADES
208208
,
209209
DetID::mask_t(math_utils::bit2Mask(DetID::IT3)), DetID::mask_t(math_utils::bit2Mask(DetID::TRK)), DetID::mask_t(math_utils::bit2Mask(DetID::FT3))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class SimTraits
8787
/*FT0*/ VS{ "FT0Hit" },
8888
/*FV0*/ VS{ "FV0Hit" },
8989
/*FDD*/ VS{ "FDDHit" },
90-
/*ACO*/ VS{ "ACOHit" },
90+
/*TST*/ VS{ "TSTHit" }, // former ACO
9191
/*CTP*/ VS{ "CTPHit" }
9292
#ifdef ENABLE_UPGRADES
9393
,

‎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::ACO, 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::First, DetID::Last;
3131

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

‎DataFormats/Headers/include/Headers/DAQID.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ namespace header
2424
/// Source IDs used by DAQ
2525

2626
constexpr o2::header::DataOrigin gDataOriginUnloaded{"UNL"};
27-
constexpr o2::header::DataOrigin gDataOriginTST{"TST"};
2827

2928
class DAQID
3029
{

‎DataFormats/Headers/include/Headers/DataHeader.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,6 @@ using DataDescription = Descriptor<gSizeDataDescriptionString>;
550550
constexpr o2::header::DataOrigin gDataOriginAny{"***"};
551551
constexpr o2::header::DataOrigin gDataOriginInvalid{"NIL"};
552552
constexpr o2::header::DataOrigin gDataOriginFLP{"FLP"};
553-
constexpr o2::header::DataOrigin gDataOriginACO{"ACO"};
554553
constexpr o2::header::DataOrigin gDataOriginCPV{"CPV"};
555554
constexpr o2::header::DataOrigin gDataOriginCTP{"CTP"};
556555
constexpr o2::header::DataOrigin gDataOriginEMC{"EMC"};
@@ -567,6 +566,7 @@ constexpr o2::header::DataOrigin gDataOriginTOF{"TOF"};
567566
constexpr o2::header::DataOrigin gDataOriginTPC{"TPC"};
568567
constexpr o2::header::DataOrigin gDataOriginTRD{"TRD"};
569568
constexpr o2::header::DataOrigin gDataOriginZDC{"ZDC"};
569+
constexpr o2::header::DataOrigin gDataOriginTST{"TST"};
570570

571571
constexpr o2::header::DataOrigin gDataOriginIT3{"IT3"};
572572
constexpr o2::header::DataOrigin gDataOriginTRK{"TRK"};

‎Detectors/Raw/src/RawFileReader.cxx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -766,11 +766,10 @@ o2h::DataOrigin RawFileReader::getDataOrigin(const std::string& ors)
766766
{
767767
constexpr int NGoodOrigins = 20;
768768
constexpr std::array<o2h::DataOrigin, NGoodOrigins> goodOrigins{
769-
o2h::gDataOriginFLP, o2h::gDataOriginACO, o2h::gDataOriginCPV, o2h::gDataOriginCTP, o2h::gDataOriginEMC,
769+
o2h::gDataOriginFLP, o2h::gDataOriginTST, o2h::gDataOriginCPV, o2h::gDataOriginCTP, o2h::gDataOriginEMC,
770770
o2h::gDataOriginFT0, o2h::gDataOriginFV0, o2h::gDataOriginFDD, o2h::gDataOriginHMP, o2h::gDataOriginITS,
771771
o2h::gDataOriginMCH, o2h::gDataOriginMFT, o2h::gDataOriginMID, o2h::gDataOriginPHS, o2h::gDataOriginTOF,
772-
o2h::gDataOriginTPC, o2h::gDataOriginTRD, o2h::gDataOriginZDC,
773-
"TST"};
772+
o2h::gDataOriginTPC, o2h::gDataOriginTRD, o2h::gDataOriginZDC};
774773

775774
for (auto orgood : goodOrigins) {
776775
if (ors == orgood.as<std::string>()) {

‎EventVisualisation/View/src/Initializer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void Initializer::setupGeometry()
131131

132132
multiView->drawGeometryForDetector(detName, false, true, false);
133133
} else { // default
134-
if (detName != "ACO") {
134+
if (detName != "TST") {
135135
multiView->drawGeometryForDetector(detName);
136136
}
137137
}

‎macro/CreateGRPECSObject.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ using GRPECSObject = o2::parameters::GRPECSObject;
2727
// Simple macro to exemplify how to fill a GRPECS object (GRP object containing the information that come from ECS)
2828

2929
// The list of detectors in the readout, read-out continuously, or in the trigger are passed as DetID::mask_it; this is a std::bitset<32>, with the following meaning per bit:
30-
// {"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "ACO", "CTP"}
30+
// {"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "TST", "CTP"}
3131

3232
// e.g.
3333
/*

0 commit comments

Comments
 (0)