GPU Standalone Display: Switch to Qt6

Author: davidrohr

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")

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)

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)