Skip to content

Commit fbf4595

Browse files
pkurashpkurash
committed
change name of the detector
1 parent a38641e commit fbf4595

File tree

23 files changed

+98
-98
lines changed

23 files changed

+98
-98
lines changed

‎Common/SimConfig/src/SimConfig.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
9999
activeModules[i] != "RCH" &&
100100
activeModules[i] != "MI3" &&
101101
activeModules[i] != "ECL" &&
102-
activeModules[i] != "FVD") {
102+
activeModules[i] != "FD") {
103103
LOGP(fatal, "List of active modules contains {}, which is not a module from the upgrades.", activeModules[i]);
104104
}
105105
}
@@ -114,7 +114,7 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
114114
activeModules[i] == "RCH" ||
115115
activeModules[i] == "MI3" ||
116116
activeModules[i] == "ECL" ||
117-
activeModules[i] == "FVD") {
117+
activeModules[i] == "FD") {
118118
LOGP(fatal, "List of active modules contains {}, which is not a run 3 module", activeModules[i]);
119119
}
120120
}
@@ -132,7 +132,7 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
132132
d == DetID::TF3 ||
133133
d == DetID::RCH ||
134134
d == DetID::ECL ||
135-
d == DetID::FVD ||
135+
d == DetID::FD ||
136136
d == DetID::MI3) {
137137
activeModules.emplace_back(DetID::getName(d));
138138
}
@@ -152,7 +152,7 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
152152
activeModules.emplace_back("SHIL");
153153
for (int d = DetID::First; d <= DetID::Last; ++d) {
154154
#ifdef ENABLE_UPGRADES
155-
if (d != DetID::IT3 && d != DetID::TRK && d != DetID::FT3 && d != DetID::FCT && d != DetID::TF3 && d != DetID::RCH && d != DetID::ECL && d != DetID::FVD && d != DetID::MI3) {
155+
if (d != DetID::IT3 && d != DetID::TRK && d != DetID::FT3 && d != DetID::FCT && d != DetID::TF3 && d != DetID::RCH && d != DetID::ECL && d != DetID::FD && d != DetID::MI3) {
156156
activeModules.emplace_back(DetID::getName(d));
157157
}
158158
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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 FVD = 26;
91-
static constexpr ID Last = FVD;
90+
static constexpr ID FD = 26;
91+
static constexpr ID Last = FD;
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", "FVD", 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", "FD", 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::gDataOriginFVD
199+
o2h::gDataOriginRCH, o2h::gDataOriginMI3, o2h::gDataOriginECL, o2h::gDataOriginFD
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::FVD))
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))
220220
#endif
221221
};
222222
} // namespace detid_internal

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class SimTraits
100100
/*RCH*/ VS{ "RCHHit" },
101101
/*MI3*/ VS{ "MI3Hit" },
102102
/*ECL*/ VS{ "ECLHit" },
103-
/*FVD*/ VS{ "FVDHit" }
103+
/*FD */ VS{ "FDHit" }
104104
#endif
105105
};
106106
// clang-format on

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ constexpr o2::header::DataOrigin gDataOriginTF3{"TF3"};
588588
constexpr o2::header::DataOrigin gDataOriginRCH{"RCH"};
589589
constexpr o2::header::DataOrigin gDataOriginMI3{"MI3"};
590590
constexpr o2::header::DataOrigin gDataOriginECL{"ECL"}; // upgrades
591-
constexpr o2::header::DataOrigin gDataOriginFVD{"FVD"}; // upgrades
591+
constexpr o2::header::DataOrigin gDataOriginFD{"FD"}; // upgrades
592592

593593
constexpr o2::header::DataOrigin gDataOriginGPU{"GPU"};
594594

‎Detectors/Upgrades/ALICE3/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
add_subdirectory(Passive)
1313
add_subdirectory(TRK)
1414
add_subdirectory(ECal)
15-
add_subdirectory(FVD)
15+
add_subdirectory(FD)
1616
add_subdirectory(FT3)
1717
add_subdirectory(FCT)
1818
add_subdirectory(AOD)

Detectors/Upgrades/ALICE3/FVD/CMakeLists.txt renamed to Detectors/Upgrades/ALICE3/FD/CMakeLists.txt

File renamed without changes.

Detectors/Upgrades/ALICE3/FVD/README.md renamed to Detectors/Upgrades/ALICE3/FD/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# ALICE 3 FORVARD DETECTOR
66

7-
This is top page for the FVD detector documentation.
7+
This is top page for the FD detector documentation.
88

99
<!-- doxy
1010
/doxy -->

Detectors/Upgrades/ALICE3/FVD/base/CMakeLists.txt renamed to Detectors/Upgrades/ALICE3/FD/base/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
# granted to it by virtue of its status as an Intergovernmental Organization
1010
# or submit itself to any jurisdiction.
1111

12-
o2_add_library(FVDBase
12+
o2_add_library(FDBase
1313
SOURCES src/GeometryTGeo.cxx
14-
src/FVDBaseParam.cxx
14+
src/FDBaseParam.cxx
1515
PUBLIC_LINK_LIBRARIES O2::DetectorsBase)
1616

17-
o2_target_root_dictionary(FVDBase
18-
HEADERS include/FVDBase/GeometryTGeo.h
19-
include/FVDBase/Constants.h
20-
include/FVDBase/FVDBaseParam.h)
17+
o2_target_root_dictionary(FDBase
18+
HEADERS include/FDBase/GeometryTGeo.h
19+
include/FDBase/Constants.h
20+
include/FDBase/FDBaseParam.h)

Detectors/Upgrades/ALICE3/FVD/base/README.md renamed to Detectors/Upgrades/ALICE3/FD/base/README.md

File renamed without changes.

Detectors/Upgrades/ALICE3/FVD/base/include/FVDBase/Constants.h renamed to Detectors/Upgrades/ALICE3/FD/base/include/FDBase/Constants.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
///
1515
/// \author Maciej Slupecki, University of Jyvaskyla, Finland
1616

17-
#ifndef ALICEO2_FVD_CONSTANTS_
18-
#define ALICEO2_FVD_CONSTANTS_
17+
#ifndef ALICEO2_FD_CONSTANTS_
18+
#define ALICEO2_FD_CONSTANTS_
1919

2020
namespace o2
2121
{
22-
namespace fvd
22+
namespace fd
2323
{
2424
struct Constants {
2525
static constexpr int nsect = 8;
2626
static constexpr int nringsA = 5;
2727
static constexpr int nringsC = 6;
2828
};
2929

30-
} // namespace fvd
30+
} // namespace fd
3131
} // namespace o2
3232
#endif

0 commit comments

Comments
 (0)