Skip to content

Commit dd35564

Browse files
committed
Use C++14 namespaces
1 parent 6b844f1 commit dd35564

File tree

3 files changed

+11
-17
lines changed

3 files changed

+11
-17
lines changed

Detectors/TRD/pid/include/TRDPID/ML.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
#include <array>
2828
#include <string>
2929

30-
namespace o2
31-
{
32-
namespace trd
30+
namespace o2::trd
3331
{
3432

3533
/// This is the ML Base class which defines the interface all machine learning
@@ -123,7 +121,6 @@ class PY final : public ML
123121
ClassDefNV(PY, 1);
124122
};
125123

126-
} // namespace trd
127-
} // namespace o2
124+
} // namespace o2::trd
128125

129126
#endif

Detectors/ZDC/fastsimulation/include/Processors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ std::vector<int> readClassifier(const Ort::Value& value, size_t batchSize);
8181
std::vector<std::array<long, 5>> calculateChannels(const Ort::Value& value, size_t batchSize);
8282

8383
} // namespace o2::zdc::fastsim::processors
84-
#endif // O2_ZDC_FAST_SIMULATIONS_PROCESSORS_H
84+
#endif // O2_ZDC_FAST_SIMULATIONS_PROCESSORS_H

Detectors/ZDC/simulation/include/ZDCSimulation/Detector.h

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ class StandardScaler;
4242

4343
class FairVolume;
4444

45-
namespace o2
46-
{
47-
namespace zdc
45+
namespace o2::zdc
4846
{
4947

5048
class Detector : public o2::base::DetImpl<Detector>
@@ -197,10 +195,10 @@ class Detector : public o2::base::DetImpl<Detector>
197195
/// Container for hit data
198196
std::vector<o2::zdc::Hit>* mHits;
199197

200-
float mLumiLength = 0; //TODO: make part of configurable params
201-
float mTCLIAAPERTURE = 3.5; //TODO: make part of configurable params
202-
float mTCLIAAPERTURENEG = 3.5; //TODO: make part of configurable params
203-
float mVCollSideCCentreY = 0.; //TODO: make part of configurable params
198+
float mLumiLength = 0; // TODO: make part of configurable params
199+
float mTCLIAAPERTURE = 3.5; // TODO: make part of configurable params
200+
float mTCLIAAPERTURENEG = 3.5; // TODO: make part of configurable params
201+
float mVCollSideCCentreY = 0.; // TODO: make part of configurable params
204202

205203
int mZNENVVolID = -1; // the volume id for the neutron det envelope volume
206204
int mZPENVVolID = -1; // the volume id for the proton det envelope volume
@@ -240,12 +238,12 @@ class Detector : public o2::base::DetImpl<Detector>
240238

241239
// fastsim model wrapper
242240
#ifdef ZDC_FASTSIM_ONNX
243-
fastsim::NeuralFastSimulation* mFastSimClassifier = nullptr; //! no ROOT serialization
241+
fastsim::NeuralFastSimulation* mFastSimClassifier = nullptr; //! no ROOT serialization
244242
fastsim::NeuralFastSimulation* mFastSimModelNeutron = nullptr; //!
245243
fastsim::NeuralFastSimulation* mFastSimModelProton = nullptr; //!
246244

247245
// Scalers for models inputs
248-
fastsim::processors::StandardScaler* mClassifierScaler = nullptr; //!
246+
fastsim::processors::StandardScaler* mClassifierScaler = nullptr; //!
249247
fastsim::processors::StandardScaler* mModelScalerNeutron = nullptr; //!
250248
fastsim::processors::StandardScaler* mModelScalerProton = nullptr; //!
251249

@@ -273,8 +271,7 @@ class Detector : public o2::base::DetImpl<Detector>
273271
friend class o2::base::DetImpl;
274272
ClassDefOverride(Detector, 1);
275273
};
276-
} // namespace zdc
277-
} // namespace o2
274+
} // namespace o2::zdc
278275

279276
#ifdef USESHM
280277
namespace o2

0 commit comments

Comments
 (0)