Skip to content

Commit 5d87118

Browse files
davidrohrdavidrohr
committed
Avoid unintended usage of GPUO2ConfigurableParam.h
1 parent 997f387 commit 5d87118

File tree

6 files changed

+37
-28
lines changed

6 files changed

+37
-28
lines changed

‎Detectors/TPC/workflow/src/CalibdEdxSpec.cxx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/// \brief Workflow for time based dE/dx calibration.
1414
/// \author Thiago Badaró <thiago.saramela@usp.br>
1515

16+
#include "GPUO2InterfaceConfiguration.inc"
1617
#include "TPCWorkflow/CalibdEdxSpec.h"
1718

1819
// o2 includes
@@ -26,7 +27,6 @@
2627
#include "Framework/DataProcessorSpec.h"
2728
#include "Framework/ConfigParamRegistry.h"
2829
#include "Framework/CCDBParamSpec.h"
29-
#include "GPUO2ConfigurableParam.h"
3030
#include "TPCCalibration/CalibdEdx.h"
3131
#include "TPCWorkflow/ProcessingHelpers.h"
3232
#include "TPCBaseRecSim/CDBTypes.h"
@@ -70,8 +70,9 @@ class CalibdEdxDevice : public Task
7070
mCalib->setElectronCut(fitThreshold, fitPasses, fitThresholdLowFactor);
7171
mCalib->setMaterialType(mMatType);
7272

73-
mCustomdEdxFileName = o2::gpu::GPUConfigurableParamGPUSettingsO2::Instance().dEdxCorrFile;
74-
mDisableTimeGain = o2::gpu::GPUConfigurableParamGPUSettingsO2::Instance().dEdxDisableResidualGain;
73+
const auto& gpuConfig = GPU_GET_CONFIG(GPUSettingsO2);
74+
mCustomdEdxFileName = gpuConfig.dEdxCorrFile;
75+
mDisableTimeGain = gpuConfig.dEdxDisableResidualGain;
7576

7677
if (mDisableTimeGain) {
7778
LOGP(info, "TimeGain correction was disabled via GPU_global.dEdxDisableResidualGain=1");

‎Detectors/TPC/workflow/src/CalibratordEdxSpec.cxx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/// \brief Workflow for time based dE/dx calibration.
1414
/// \author Thiago Badaró <thiago.saramela@usp.br>
1515

16+
#include "GPUO2InterfaceConfiguration.inc"
1617
#include "TPCWorkflow/CalibratordEdxSpec.h"
1718

1819
#include <vector>
@@ -29,7 +30,6 @@
2930
#include "Framework/DataProcessorSpec.h"
3031
#include "Framework/ConfigParamRegistry.h"
3132
#include "Framework/CCDBParamSpec.h"
32-
#include "GPUO2ConfigurableParam.h"
3333
#include "TPCCalibration/CalibratordEdx.h"
3434
#include "TPCWorkflow/ProcessingHelpers.h"
3535
#include "DetectorsBase/GRPGeomHelper.h"
@@ -86,8 +86,9 @@ class CalibratordEdxDevice : public Task
8686
mCalibrator->setTrackDebug(trackDebug);
8787
mCalibrator->setMakeGaussianFits(makeGaussianFits);
8888

89-
mCustomdEdxFileName = o2::gpu::GPUConfigurableParamGPUSettingsO2::Instance().dEdxCorrFile;
90-
mDisableTimeGain = o2::gpu::GPUConfigurableParamGPUSettingsO2::Instance().dEdxDisableResidualGain;
89+
const auto& gpuConfig = GPU_GET_CONFIG(GPUSettingsO2);
90+
mCustomdEdxFileName = gpuConfig.dEdxCorrFile;
91+
mDisableTimeGain = gpuConfig.dEdxDisableResidualGain;
9192

9293
if (mDisableTimeGain) {
9394
LOGP(info, "TimeGain correction was disabled via GPU_global.dEdxDisableResidualGain=1");

‎GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ using namespace o2::gpu;
2929
#define AddOptionArray(name, type, count, default, optname, optnameshort, help, ...)
3030
#define AddOptionArrayRTC(...) AddOptionArray(__VA_ARGS__)
3131
#define AddSubConfig(name, instance)
32-
#define BeginSubConfig(name, instance, parent, preoptname, preoptnameshort, descr, o2prefix) O2ParamImpl(GPUCA_M_CAT(GPUConfigurableParam, name))
32+
#define BeginSubConfig(name, instance, parent, preoptname, preoptnameshort, descr, o2prefix) O2ParamImpl(internal::GPUCA_M_CAT(GPUConfigurableParam, name))
3333
#define BeginHiddenConfig(...)
3434
#define EndConfig()
3535
#define AddCustomCPP(...)
@@ -73,7 +73,7 @@ GPUSettingsO2 GPUO2InterfaceConfiguration::ReadConfigurableParam(GPUO2InterfaceC
7373
#define BeginSubConfig(name, instance, parent, preoptname, preoptnameshort, descr, o2prefix) \
7474
name instance; \
7575
{ \
76-
const auto& src = GPUCA_M_CAT(GPUConfigurableParam, name)::Instance(); \
76+
const auto& src = internal::GPUCA_M_CAT(GPUConfigurableParam, name)::Instance(); \
7777
name& dst = instance;
7878
#define BeginHiddenConfig(name, instance) {
7979
#define EndConfig() }

‎GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.h‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "GPUDefMacros.h"
3030
#include <vector>
3131

32+
// clang-format off
3233
#define BeginNamespace(name) \
3334
namespace name \
3435
{
@@ -42,12 +43,17 @@
4243
#define AddOptionArray(name, type, count, default, optname, optnameshort, help, ...) type name[count] = {GPUCA_M_STRIP(default)};
4344
#define AddSubConfig(name, instance)
4445
#define BeginSubConfig(name, instance, parent, preoptname, preoptnameshort, descr, o2prefix) \
46+
namespace internal \
47+
{ \
4548
struct GPUCA_M_CAT(GPUConfigurableParam, name) : public o2::conf::ConfigurableParamHelper<GPUCA_M_CAT(GPUConfigurableParam, name)> { \
4649
O2ParamDef(GPUCA_M_CAT(GPUConfigurableParam, name), GPUCA_M_STR(GPUCA_M_CAT(GPU_, o2prefix))) public:
47-
#define BeginHiddenConfig(name, instance) struct GPUCA_M_CAT(GPUConfigurableParam, name) {
50+
#define BeginHiddenConfig(name, instance) \
51+
namespace internal \
52+
{ \
53+
struct GPUCA_M_CAT(GPUConfigurableParam, name) {
4854
#define EndConfig() \
49-
} \
50-
;
55+
}; \
56+
} // namespace internal
5157
#define AddCustomCPP(...) __VA_ARGS__
5258
#define AddHelp(...)
5359
#define AddShortcut(...)
@@ -71,5 +77,6 @@
7177
#undef AddCustomCPP
7278
#undef AddHelp
7379
#undef AddShortcut
80+
// clang-format on
7481

7582
#endif

‎GPU/GPUTracking/GPUTrackingLinkDef_O2_DataTypes.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@
2222
#pragma link C++ class o2::gpu::GPUTRDTrack_t < o2::gpu::trackInterface < o2::track::TrackParCov>> + ;
2323
#pragma link C++ class std::vector < o2::gpu::GPUTRDTrack_t < o2::gpu::trackInterface < o2::track::TrackParCov>>> + ;
2424
#ifdef GPUCA_O2_LIB
25-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsO2 + ;
26-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsRec + ;
27-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsRecTPC + ;
28-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsRecTRD + ;
29-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsRecDynamic + ;
30-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessing + ;
31-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessingParam + ;
32-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessingRTC + ;
33-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessingRTCtechnical + ;
34-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessingNNclusterizer + ;
35-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplay + ;
36-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplayLight + ;
37-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplayHeavy + ;
38-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplayRenderer + ;
39-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplayVulkan + ;
40-
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsQA + ;
25+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsO2 + ;
26+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsRec + ;
27+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsRecTPC + ;
28+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsRecTRD + ;
29+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsRecDynamic + ;
30+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsProcessing + ;
31+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsProcessingParam + ;
32+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsProcessingRTC + ;
33+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsProcessingRTCtechnical + ;
34+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsProcessingNNclusterizer + ;
35+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsDisplay + ;
36+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsDisplayLight + ;
37+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsDisplayHeavy + ;
38+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsDisplayRenderer + ;
39+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsDisplayVulkan + ;
40+
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsQA + ;
4141
#endif
4242
#pragma link C++ class o2::gpu::GPUTPCGMMergedTrackHit + ;
4343
#pragma link C++ class o2::tpc::CalibdEdxTrackTopologyPol + ;

‎GPU/GPUTracking/Interface/GPUO2InterfaceConfiguration.inc‎

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

3131
#define GPU_GET_CONFIG(configName) []() -> decltype(auto) { \
3232
static_assert(!std::is_same_v<o2::gpu::configName, o2::gpu::GPUSettingsProcessing>); \
33-
return o2::gpu::GPUCA_M_CAT(GPUConfigurableParam, configName)::Instance(); \
33+
return o2::gpu::internal::GPUCA_M_CAT(GPUConfigurableParam, configName)::Instance(); \
3434
}()
3535
#endif
3636

0 commit comments

Comments
 (0)