Skip to content

Commit ee96e8d

Browse files
pkurashpkurash
committed
change detector name
1 parent c3553cb commit ee96e8d

File tree

24 files changed

+153
-151
lines changed

24 files changed

+153
-151
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] != "FD") {
102+
activeModules[i] != "FD3") {
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] == "FD") {
117+
activeModules[i] == "FD3") {
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::FD ||
135+
d == DetID::FD3 ||
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::FD && 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::FD3 && d != DetID::MI3) {
156156
activeModules.emplace_back(DetID::getName(d));
157157
}
158158
}

‎DataFormats/Detectors/Upgrades/ALICE3/CMakeLists.txt‎

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

12-
add_subdirectory(FD)
12+
add_subdirectory(FD3)

DataFormats/Detectors/Upgrades/ALICE3/FD/CMakeLists.txt renamed to DataFormats/Detectors/Upgrades/ALICE3/FD3/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
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(DataFormatsFD
12+
o2_add_library(DataFormatsFD3
1313
SOURCES src/Hit.cxx
14-
PUBLIC_LINK_LIBRARIES O2::FDBase
14+
PUBLIC_LINK_LIBRARIES O2::FD3Base
1515
O2::SimulationDataFormat
1616
O2::CommonDataFormat
1717
Microsoft.GSL::GSL
1818
O2::DetectorsCommonDataFormats
1919
)
2020

21-
o2_target_root_dictionary(DataFormatsFD
22-
HEADERS include/DataFormatsFD/Hit.h
21+
o2_target_root_dictionary(DataFormatsFD3
22+
HEADERS include/DataFormatsFD3/Hit.h
2323
)

DataFormats/Detectors/Upgrades/ALICE3/FD/include/DataFormatsFD/Hit.h renamed to DataFormats/Detectors/Upgrades/ALICE3/FD3/include/DataFormatsFD3/Hit.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// or submit itself to any jurisdiction.
1111

1212
/// \file Hit.h
13-
/// \brief Definition of the FD Hit class (based on ITSMFT and FV0)
13+
/// \brief Definition of the FD3 Hit class (based on ITSMFT and FV0)
1414

1515
#ifndef ALICEO2_FVD_HIT_H_
1616
#define ALICEO2_FVD_HIT_H_
@@ -23,7 +23,7 @@
2323

2424
namespace o2
2525
{
26-
namespace fd
26+
namespace fd3
2727
{
2828

2929
class Hit : public o2::BasicXYZEHit<float, float>
@@ -109,17 +109,17 @@ Hit::Hit(int trackID,
109109
{
110110
}
111111

112-
} // namespace fd
112+
} // namespace fd3
113113
} // namespace o2
114114

115115
#ifdef USESHM
116116
namespace std
117117
{
118118
template <>
119-
class allocator<o2::fd::Hit> : public o2::utils::ShmAllocator<o2::fd::Hit>
119+
class allocator<o2::fd3::Hit> : public o2::utils::ShmAllocator<o2::fd3::Hit>
120120
{
121121
};
122122

123123
} // namespace std
124124
#endif /* USESHM */
125-
#endif /* ALICEO2_FD_HIT_H_ */
125+
#endif /* ALICEO2_FD3_HIT_H_ */

DataFormats/Detectors/Upgrades/ALICE3/FD/src/DataFormatsFDLinkDef.h renamed to DataFormats/Detectors/Upgrades/ALICE3/FD3/src/DataFormatsFD3LinkDef.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#pragma link off all classes;
1616
#pragma link off all functions;
1717

18-
#pragma link C++ class o2::fd::Hit + ;
19-
#pragma link C++ class vector < o2::fd::Hit> + ;
18+
#pragma link C++ class o2::fd3::Hit + ;
19+
#pragma link C++ class vector < o2::fd3::Hit> + ;
2020

2121
#endif

DataFormats/Detectors/Upgrades/ALICE3/FD/src/Hit.cxx renamed to DataFormats/Detectors/Upgrades/ALICE3/FD3/src/Hit.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
/// \file Hit.cxx
1313
/// \brief Implementation of the Hit class
1414

15-
#include "DataFormatsFD/Hit.h"
15+
#include "DataFormatsFD3/Hit.h"
1616
#include <iostream>
1717

18-
ClassImp(o2::fd::Hit);
18+
ClassImp(o2::fd3::Hit);
1919

2020
namespace o2
2121
{
22-
namespace fd
22+
namespace fd3
2323
{
2424

2525
void Hit::Print(const Option_t* opt) const
@@ -31,5 +31,5 @@ void Hit::Print(const Option_t* opt) const
3131
GetStartX(), GetStartY(), GetStartZ(), GetX(), GetY(), GetZ());
3232
}
3333

34-
} // namespace fd
34+
} // namespace fd3
3535
} // namespace o2

‎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(FD)
15+
add_subdirectory(FD3)
1616
add_subdirectory(FT3)
1717
add_subdirectory(FCT)
1818
add_subdirectory(AOD)

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

File renamed without changes.

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

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

55
# ALICE 3 FORWARD DETECTOR
66

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

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

Detectors/Upgrades/ALICE3/FD/base/CMakeLists.txt renamed to Detectors/Upgrades/ALICE3/FD3/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(FDBase
12+
o2_add_library(FD3Base
1313
SOURCES src/GeometryTGeo.cxx
14-
src/FDBaseParam.cxx
14+
src/FD3BaseParam.cxx
1515
PUBLIC_LINK_LIBRARIES O2::DetectorsBase)
1616

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

0 commit comments

Comments
 (0)