From 3d4b9c460812ef20409a8a687150353087b234f0 Mon Sep 17 00:00:00 2001 From: David Rohr Date: Tue, 14 Jul 2026 10:42:10 +0200 Subject: [PATCH 1/2] Fix compiler warning --- GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx b/GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx index 324acc9451f36..f5f8f08b1138e 100644 --- a/GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx +++ b/GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx @@ -1056,7 +1056,7 @@ GPUd() void GPUTRDTracker_t::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); From 3eaf0631075221a40630ee261e30297db5c2a670 Mon Sep 17 00:00:00 2001 From: David Rohr Date: Tue, 14 Jul 2026 10:42:20 +0200 Subject: [PATCH 2/2] GPU Standalone Display: Switch to Qt6 --- GPU/GPUTracking/Definitions/GPUSettingsList.h | 4 ++-- GPU/GPUTracking/Standalone/CMakeLists.txt | 2 +- GPU/GPUTracking/display/CMakeLists.txt | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/GPU/GPUTracking/Definitions/GPUSettingsList.h b/GPU/GPUTracking/Definitions/GPUSettingsList.h index 40f7a34e699c9..8609bc7c96516 100644 --- a/GPU/GPUTracking/Definitions/GPUSettingsList.h +++ b/GPU/GPUTracking/Definitions/GPUSettingsList.h @@ -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") @@ -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") diff --git a/GPU/GPUTracking/Standalone/CMakeLists.txt b/GPU/GPUTracking/Standalone/CMakeLists.txt index 0c04f5e562fef..a4c5817d1f7f9 100644 --- a/GPU/GPUTracking/Standalone/CMakeLists.txt +++ b/GPU/GPUTracking/Standalone/CMakeLists.txt @@ -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) diff --git a/GPU/GPUTracking/display/CMakeLists.txt b/GPU/GPUTracking/display/CMakeLists.txt index 82ce0d4a9b190..eb7a0dc6d6400 100644 --- a/GPU/GPUTracking/display/CMakeLists.txt +++ b/GPU/GPUTracking/display/CMakeLists.txt @@ -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) @@ -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() @@ -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)