From 2372f93dd93ab59eb731debb75a32c1657ca9c37 Mon Sep 17 00:00:00 2001 From: Martin Mueller Date: Thu, 19 Mar 2026 15:23:50 +0100 Subject: [PATCH] update help and comments --- pyctbgui/pyctbgui/services/Acquisition.py | 6 ------ python/slsdet/detector.py | 6 +++--- slsDetectorServers/slsDetectorServer/src/XILINX_PLL.c | 2 +- .../xilinx_ctbDetectorServer/slsDetectorFunctionList.c | 4 ++-- slsDetectorSoftware/generator/commands.yaml | 6 +++--- slsDetectorSoftware/generator/extended_commands.yaml | 8 +++----- 6 files changed, 12 insertions(+), 20 deletions(-) diff --git a/pyctbgui/pyctbgui/services/Acquisition.py b/pyctbgui/pyctbgui/services/Acquisition.py index 58c972c51..10bb1c5c8 100644 --- a/pyctbgui/pyctbgui/services/Acquisition.py +++ b/pyctbgui/pyctbgui/services/Acquisition.py @@ -58,12 +58,6 @@ class AcquisitionTab(QtWidgets.QWidget): self.view.spinBoxADCPipeline.setDisabled(True) self.view.spinBoxDBITPhase.setDisabled(True) self.view.spinBoxDBITPipeline.setDisabled(True) - self.view.labelRunF.setText("Run Clock Frequency (kHz):") - self.view.labelDBITF.setText("DBIT Clock Frequency (kHz):") - self.view.labelADCF.setText("ADC Clock Frequency (kHz):") - self.view.spinBoxRunF.setMaximum(250000) - self.view.spinBoxDBITF.setMaximum(250000) - self.view.spinBoxADCF.setMaximum(250000) def connect_ui(self): # For Acquistions Tab diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index 2d1c782c3..a5e152988 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -3521,7 +3521,7 @@ class Detector(CppDetectorApi): def runclk(self): """ [Ctb][Xilinx Ctb] Sets Run clock frequency in MHz. \n - Accepts floating point inputs + Accepts decimal inputs """ freq_hz = element_if_equal(self.getRUNClock()) @@ -3613,7 +3613,7 @@ class Detector(CppDetectorApi): def dbitclk(self): """ [Ctb][Xilinx Ctb] Sets clock for latching the digital bits in MHz. \n - Accepts floating point inputs + Accepts decimal inputs """ freq_hz = element_if_equal(self.getDBITClock()) if isinstance(freq_hz, list): @@ -3750,7 +3750,7 @@ class Detector(CppDetectorApi): def adcclk(self): """ [Ctb][Xilinx Ctb] Sets ADC clock frequency in MHz. \n - Accepts floating point inputs + Accepts decimal inputs """ freq_hz = element_if_equal(self.getADCClock()) diff --git a/slsDetectorServers/slsDetectorServer/src/XILINX_PLL.c b/slsDetectorServers/slsDetectorServer/src/XILINX_PLL.c index e6f8a04bb..09f31df52 100644 --- a/slsDetectorServers/slsDetectorServer/src/XILINX_PLL.c +++ b/slsDetectorServers/slsDetectorServer/src/XILINX_PLL.c @@ -78,7 +78,7 @@ int XILINX_PLL_setFrequency(uint32_t clk_index, uint32_t freq) { return 1; } if (freq < XILINX_PLL_MIN_FREQ || freq > XILINX_PLL_MAX_FREQ) { - LOG(logERROR, ("XILINX_PLL: Frequency %d kHz is out of range\n", freq)); + LOG(logERROR, ("XILINX_PLL: Frequency %d Hz is out of range\n", freq)); return 1; } diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c index 962b9d3fa..c33542260 100644 --- a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c @@ -1982,11 +1982,11 @@ int setFrequency(enum CLKINDEX ind, int val) { } char *clock_names[] = {CLK_NAMES}; - LOG(logINFO, ("\tSetting %s clock (%d) frequency to %d kHz\n", + LOG(logINFO, ("\tSetting %s clock (%d) frequency to %d Hz\n", clock_names[ind], ind, val)); if (XILINX_PLL_setFrequency(ind, val) == FAIL) { - LOG(logERROR, ("\tCould not set %s clock (%d) frequency to %d kHz\n", + LOG(logERROR, ("\tCould not set %s clock (%d) frequency to %d Hz\n", clock_names[ind], ind, val)); return FAIL; } diff --git a/slsDetectorSoftware/generator/commands.yaml b/slsDetectorSoftware/generator/commands.yaml index dd0960a09..5c6bed695 100644 --- a/slsDetectorSoftware/generator/commands.yaml +++ b/slsDetectorSoftware/generator/commands.yaml @@ -1272,7 +1272,7 @@ asamples: function: setNumberOfAnalogSamples adcclk: - help: "[n_clk in MHz]\n\t[Ctb] ADC clock frequency in MHz.\n\t[xilinx Ctb] ADC clock frequency in kHz." + help: "[n_clk in MHz]\n\t[Ctb][xilinx Ctb] ADC clock frequency in MHz." inherit_actions: INTEGER_COMMAND_VEC_ID actions: GET: @@ -1281,7 +1281,7 @@ adcclk: function: setADCClock runclk: - help: "[n_clk in MHz]\n\t[Ctb] Run clock in MHz.\n\t[xilinx Ctb] Run clock in kHz." + help: "[n_clk in MHz]\n\t[Ctb][xilinx Ctb] Run clock in MHz." inherit_actions: INTEGER_COMMAND_VEC_ID actions: GET: @@ -1318,7 +1318,7 @@ romode: input_types: [ defs::readoutMode ] dbitclk: - help: "[n_clk in MHz]\n\t[Ctb] Clock for latching the digital bits in MHz.\n\t[xilinx Ctb] Clock for latching the digital bits in kHz." + help: "[n_clk in MHz]\n\t[Ctb][xilinx Ctb] Clock for latching the digital bits in MHz." inherit_actions: INTEGER_COMMAND_VEC_ID actions: GET: diff --git a/slsDetectorSoftware/generator/extended_commands.yaml b/slsDetectorSoftware/generator/extended_commands.yaml index ef4b12918..f40089fea 100644 --- a/slsDetectorSoftware/generator/extended_commands.yaml +++ b/slsDetectorSoftware/generator/extended_commands.yaml @@ -106,8 +106,7 @@ adcclk: store_result_in_t: false command_name: adcclk function_alias: adcclk - help: "[n_clk in MHz]\n\t[Ctb] ADC clock frequency in MHz.\n\t[xilinx Ctb] ADC clock\ - \ frequency in kHz." + help: "[n_clk in MHz]\n\t[Ctb][xilinx Ctb] ADC clock frequency in MHz." infer_action: true template: true adcenable: @@ -2195,8 +2194,7 @@ dbitclk: store_result_in_t: false command_name: dbitclk function_alias: dbitclk - help: "[n_clk in MHz]\n\t[Ctb] Clock for latching the digital bits in MHz.\n\t[xilinx\ - \ Ctb] Clock for latching the digital bits in kHz." + help: "[n_clk in MHz]\n\t[Ctb][xilinx Ctb] Clock for latching the digital bits in MHz." infer_action: true template: true dbitphase: @@ -8227,7 +8225,7 @@ runclk: store_result_in_t: false command_name: runclk function_alias: runclk - help: "[n_clk in MHz]\n\t[Ctb] Run clock in MHz.\n\t[xilinx Ctb] Run clock in kHz." + help: "[n_clk in MHz]\n\t[Ctb][xilinx Ctb] Run clock in MHz." infer_action: true template: true runtime: