Skip to content

Fixes needed after distribution upgrade #15596

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

Open
davidrohr wants to merge 2 commits into
base: dev
Choose a base branch
from
+8 −8
Open

Fixes needed after distribution upgrade #15596

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
3d4b9c4
Fix compiler warning
davidrohr Jul 14, 2026
3eaf063
GPU Standalone Display: Switch to Qt6
davidrohr Jul 14, 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
4 changes: 2 additions & 2 deletions GPU/GPUTracking/Definitions/GPUSettingsList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ AddOptionRTC(hipTailFilterAlpha, float, 0.5f, "", 0, "Smoothing factor for the e
AddOptionRTC(occupancyMapTimeBins, uint16_t, 16, "", 0, "Number of timebins per histogram bin of occupancy map (0 = disable occupancy map)")
AddOptionRTC(occupancyMapTimeBinsAverage, uint16_t, 0, "", 0, "Number of timebins +/- to use for the averaging")
AddOptionRTC(trackFitCovLimit, uint16_t, 1000, "", 0, "Abort fit when y/z cov exceed the limit")
AddOptionRTC(addErrorsCECrossing, uint8_t, 0, "", 0, "Add additional custom track errors when crossing CE, 0 = no custom errors but att 0.5 to sigma_z^2, 1 = only to cov diagonal, 2 = preserve correlations")
AddOptionRTC(addErrorsCECrossing, uint8_t, 0, "", 0, "Add additional custom track errors when crossing CE, 0 = no custom errors but add 0.5 to sigma_z^2, 1 = only to cov diagonal, 2 = preserve correlations")
AddOptionRTC(trackMergerMinPartHits, uint8_t, 10, "", 0, "Minimum hits of track part during track merging")
AddOptionRTC(trackMergerMinTotalHits, uint8_t, 20, "", 0, "Minimum total of track part during track merging")
AddOptionRTC(mergerCERowLimit, uint8_t, 5, "", 0, "Distance from first / last row in order to attempt merging accross CE")
Expand Down Expand Up @@ -305,7 +305,7 @@ AddHelp("help", 'h')
EndConfig()

// Scaling factors for gpu buffer size estimation
BeginSubConfig(GPUSettingsProcessingScaling, scaling, configStandalone.proc, "SCALING", 0, "Processing settings for neural network clusterizer", proc_scaling)
BeginSubConfig(GPUSettingsProcessingScaling, scaling, configStandalone.proc, "SCALING", 0, "Memory scaling factor settings", proc_scaling)
AddOption(offset, float, 1000., "", 0, "Scaling Factor: offset")
AddOption(hitOffset, float, 20000, "", 0, "Scaling Factor: hitOffset")
AddOption(tpcPeaksPerDigit, float, 0.2, "", 0, "Scaling Factor: tpcPeaksPerDigit")
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Standalone/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ if(GPUCA_BUILD_EVENT_DISPLAY)
set(Vulkan_FOUND OFF)
endif()
if(GPUCA_BUILD_EVENT_DISPLAY_QT)
find_package(Qt5 COMPONENTS Widgets REQUIRED)
find_package(Qt6 COMPONENTS Widgets REQUIRED)
endif()
else()
set(OpenGL_FOUND OFF)
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ GPUd() void GPUTRDTracker_t<TRDTRK, PROP>::RecalcTrkltCovDy(const float tilt, co
{
float t2 = tilt * tilt; // tan^2 (tilt)
float c2 = 1.f / (1.f + t2); // cos^2 (tilt)
float sy2 = mRecoParam->getRPhiRes(snp, CAMath::Abs(pull), occupancy);
// float sy2 = mRecoParam->getRPhiRes(snp, CAMath::Abs(pull), occupancy);
float sdy2 = mRecoParam->getDyRes(snp, occupancy);
cov[3] = mRecoParam->getCorrYDy() * CAMath::Sqrt(sdy2 * c2);
cov[4] = -tilt * mRecoParam->getCorrYDy() * CAMath::Sqrt(sdy2 * c2);
Expand Down
8 changes: 4 additions & 4 deletions GPU/GPUTracking/display/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
set_package_properties(Fontconfig PROPERTIES TYPE OPTIONAL)
find_package(O2GPUWayland)
set_package_properties(O2GPUWayland PROPERTIES TYPE OPTIONAL)
find_package(Qt5 COMPONENTS Widgets)
set_package_properties(Qt5 PROPERTIES TYPE OPTIONAL)
find_package(Qt6 COMPONENTS Widgets)
set_package_properties(Qt6 PROPERTIES TYPE OPTIONAL)
endif()

if(Vulkan_FOUND)
Expand All @@ -46,7 +46,7 @@ endif()
if(Freetype_FOUND)
set(GPUCA_EVENT_DISPLAY_FREETYPE ON)
endif()
if(Qt5_FOUND)
if(Qt6_FOUND)
set(GPUCA_EVENT_DISPLAY_QT ON)
endif()

Expand Down Expand Up @@ -222,7 +222,7 @@ endif()

if(GPUCA_EVENT_DISPLAY_QT)
target_compile_definitions(${targetName} PRIVATE GPUCA_BUILD_EVENT_DISPLAY_QT)
target_link_libraries(${targetName} PRIVATE Qt5::Widgets)
target_link_libraries(${targetName} PRIVATE Qt6::Widgets)
endif()

target_link_libraries(${targetName} PRIVATE TBB::tbb)