Skip to content

Please consider the following formatting changes to #15121 #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alibuild wants to merge 2 commits into from
Closed

Please consider the following formatting changes to #15121 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
722f81c
Avoid unintended usage of GPUO2ConfigurableParam.h
davidrohr Mar 5, 2026
166593f
Please consider the following formatting changes
alibuild Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Detectors/TPC/workflow/src/CalibdEdxSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/// \brief Workflow for time based dE/dx calibration.
/// \author Thiago Badaró <thiago.saramela@usp.br>

#include "GPUO2InterfaceConfiguration.inc"
#include "TPCWorkflow/CalibdEdxSpec.h"

// o2 includes
Expand All @@ -26,7 +27,6 @@
#include "Framework/DataProcessorSpec.h"
#include "Framework/ConfigParamRegistry.h"
#include "Framework/CCDBParamSpec.h"
#include "GPUO2ConfigurableParam.h"
#include "TPCCalibration/CalibdEdx.h"
#include "TPCWorkflow/ProcessingHelpers.h"
#include "TPCBaseRecSim/CDBTypes.h"
Expand Down Expand Up @@ -70,8 +70,9 @@ class CalibdEdxDevice : public Task
mCalib->setElectronCut(fitThreshold, fitPasses, fitThresholdLowFactor);
mCalib->setMaterialType(mMatType);

mCustomdEdxFileName = o2::gpu::GPUConfigurableParamGPUSettingsO2::Instance().dEdxCorrFile;
mDisableTimeGain = o2::gpu::GPUConfigurableParamGPUSettingsO2::Instance().dEdxDisableResidualGain;
const auto& gpuConfig = GPU_GET_CONFIG(GPUSettingsO2);
mCustomdEdxFileName = gpuConfig.dEdxCorrFile;
mDisableTimeGain = gpuConfig.dEdxDisableResidualGain;

if (mDisableTimeGain) {
LOGP(info, "TimeGain correction was disabled via GPU_global.dEdxDisableResidualGain=1");
Expand Down
7 changes: 4 additions & 3 deletions Detectors/TPC/workflow/src/CalibratordEdxSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/// \brief Workflow for time based dE/dx calibration.
/// \author Thiago Badaró <thiago.saramela@usp.br>

#include "GPUO2InterfaceConfiguration.inc"
#include "TPCWorkflow/CalibratordEdxSpec.h"

#include <vector>
Expand All @@ -29,7 +30,6 @@
#include "Framework/DataProcessorSpec.h"
#include "Framework/ConfigParamRegistry.h"
#include "Framework/CCDBParamSpec.h"
#include "GPUO2ConfigurableParam.h"
#include "TPCCalibration/CalibratordEdx.h"
#include "TPCWorkflow/ProcessingHelpers.h"
#include "DetectorsBase/GRPGeomHelper.h"
Expand Down Expand Up @@ -86,8 +86,9 @@ class CalibratordEdxDevice : public Task
mCalibrator->setTrackDebug(trackDebug);
mCalibrator->setMakeGaussianFits(makeGaussianFits);

mCustomdEdxFileName = o2::gpu::GPUConfigurableParamGPUSettingsO2::Instance().dEdxCorrFile;
mDisableTimeGain = o2::gpu::GPUConfigurableParamGPUSettingsO2::Instance().dEdxDisableResidualGain;
const auto& gpuConfig = GPU_GET_CONFIG(GPUSettingsO2);
mCustomdEdxFileName = gpuConfig.dEdxCorrFile;
mDisableTimeGain = gpuConfig.dEdxDisableResidualGain;

if (mDisableTimeGain) {
LOGP(info, "TimeGain correction was disabled via GPU_global.dEdxDisableResidualGain=1");
Expand Down
4 changes: 2 additions & 2 deletions GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ using namespace o2::gpu;
#define AddOptionArray(name, type, count, default, optname, optnameshort, help, ...)
#define AddOptionArrayRTC(...) AddOptionArray(__VA_ARGS__)
#define AddSubConfig(name, instance)
#define BeginSubConfig(name, instance, parent, preoptname, preoptnameshort, descr, o2prefix) O2ParamImpl(GPUCA_M_CAT(GPUConfigurableParam, name))
#define BeginSubConfig(name, instance, parent, preoptname, preoptnameshort, descr, o2prefix) O2ParamImpl(internal::GPUCA_M_CAT(GPUConfigurableParam, name))
#define BeginHiddenConfig(...)
#define EndConfig()
#define AddCustomCPP(...)
Expand Down Expand Up @@ -73,7 +73,7 @@ GPUSettingsO2 GPUO2InterfaceConfiguration::ReadConfigurableParam(GPUO2InterfaceC
#define BeginSubConfig(name, instance, parent, preoptname, preoptnameshort, descr, o2prefix) \
name instance; \
{ \
const auto& src = GPUCA_M_CAT(GPUConfigurableParam, name)::Instance(); \
const auto& src = internal::GPUCA_M_CAT(GPUConfigurableParam, name)::Instance(); \
name& dst = instance;
#define BeginHiddenConfig(name, instance) {
#define EndConfig() }
Expand Down
10 changes: 8 additions & 2 deletions GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,18 @@
#define AddOptionArray(name, type, count, default, optname, optnameshort, help, ...) type name[count] = {GPUCA_M_STRIP(default)};
#define AddSubConfig(name, instance)
#define BeginSubConfig(name, instance, parent, preoptname, preoptnameshort, descr, o2prefix) \
namespace internal \
{ \
struct GPUCA_M_CAT(GPUConfigurableParam, name) : public o2::conf::ConfigurableParamHelper<GPUCA_M_CAT(GPUConfigurableParam, name)> { \
O2ParamDef(GPUCA_M_CAT(GPUConfigurableParam, name), GPUCA_M_STR(GPUCA_M_CAT(GPU_, o2prefix))) public:
#define BeginHiddenConfig(name, instance) struct GPUCA_M_CAT(GPUConfigurableParam, name) {
#define BeginHiddenConfig(name, instance) \
namespace internal \
{ \
struct GPUCA_M_CAT(GPUConfigurableParam, name) {
#define EndConfig() \
} \
;
; \
} // namespace internal
#define AddCustomCPP(...) __VA_ARGS__
#define AddHelp(...)
#define AddShortcut(...)
Expand Down
32 changes: 16 additions & 16 deletions GPU/GPUTracking/GPUTrackingLinkDef_O2_DataTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@
#pragma link C++ class o2::gpu::GPUTRDTrack_t < o2::gpu::trackInterface < o2::track::TrackParCov>> + ;
#pragma link C++ class std::vector < o2::gpu::GPUTRDTrack_t < o2::gpu::trackInterface < o2::track::TrackParCov>>> + ;
#ifdef GPUCA_O2_LIB
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsO2 + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsRec + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsRecTPC + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsRecTRD + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsRecDynamic + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessing + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessingParam + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessingRTC + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessingRTCtechnical + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessingNNclusterizer + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplay + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplayLight + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplayHeavy + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplayRenderer + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplayVulkan + ;
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsQA + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsO2 + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsRec + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsRecTPC + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsRecTRD + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsRecDynamic + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsProcessing + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsProcessingParam + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsProcessingRTC + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsProcessingRTCtechnical + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsProcessingNNclusterizer + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsDisplay + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsDisplayLight + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsDisplayHeavy + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsDisplayRenderer + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsDisplayVulkan + ;
#pragma link C++ class o2::gpu::internal::GPUConfigurableParamGPUSettingsQA + ;
#endif
#pragma link C++ class o2::gpu::GPUTPCGMMergedTrackHit + ;
#pragma link C++ class o2::tpc::CalibdEdxTrackTopologyPol + ;
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Interface/GPUO2InterfaceConfiguration.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

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

Expand Down