detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-07 10:30:41 +02:00
Code Issues Actions Packages Releases Activity

clang-format with clang-format version 17

Browse Source
This commit is contained in:
Mazzoleni Alice Francesca 2025-04-11 11:38:56 +02:00
parent 598154645c
commit 3297707ab7
18 changed files with 63 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
View File

@ -8,8 +8,10 @@
#define REQRD_FRMWR_VRSN 0x230705 #define REQRD_FRMWR_VRSN 0x230705
#define NUM_HARDWARE_VERSIONS (1) #define NUM_HARDWARE_VERSIONS (1)
#define HARDWARE_VERSION_NUMBERS {0x3f} #define HARDWARE_VERSION_NUMBERS \
#define HARDWARE_VERSION_NAMES {"5.1"} { 0x3f }
#define HARDWARE_VERSION_NAMES \
{ "5.1" }
#define LINKED_SERVER_NAME "ctbDetectorServer" #define LINKED_SERVER_NAME "ctbDetectorServer"

3
slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -7,7 +7,8 @@
#define NUM_HARDWARE_VERSIONS (2) #define NUM_HARDWARE_VERSIONS (2)
#define HARDWARE_VERSION_NUMBERS {0x0, 0x1}; #define HARDWARE_VERSION_NUMBERS {0x0, 0x1};
#define HARDWARE_VERSION_NAMES {"FX70T", "FX30T"} #define HARDWARE_VERSION_NAMES \
{ "FX70T", "FX30T" }
#define REQUIRED_FIRMWARE_VERSION (32) #define REQUIRED_FIRMWARE_VERSION (32)
// virtual ones renamed for consistency // virtual ones renamed for consistency

3
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -9,7 +9,8 @@
#define NUM_HARDWARE_VERSIONS (2) #define NUM_HARDWARE_VERSIONS (2)
#define HARDWARE_VERSION_NUMBERS {0x0, 0x2}; #define HARDWARE_VERSION_NUMBERS {0x0, 0x2};
#define HARDWARE_VERSION_NAMES {"1.0", "1.2"} #define HARDWARE_VERSION_NAMES \
{ "1.0", "1.2" }
#define LINKED_SERVER_NAME "gotthard2DetectorServer" #define LINKED_SERVER_NAME "gotthard2DetectorServer"

12
slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@ -9,8 +9,10 @@
#define REQRD_FRMWRE_VRSN 0x250208 // 2.0 pcb (version = 011) #define REQRD_FRMWRE_VRSN 0x250208 // 2.0 pcb (version = 011)
#define NUM_HARDWARE_VERSIONS (2) #define NUM_HARDWARE_VERSIONS (2)
#define HARDWARE_VERSION_NUMBERS {0x2, 0x3} #define HARDWARE_VERSION_NUMBERS \
#define HARDWARE_VERSION_NAMES {"1.0", "2.0"} { 0x2, 0x3 }
#define HARDWARE_VERSION_NAMES \
{ "1.0", "2.0" }
#define ID_FILE "detid_jungfrau.txt" #define ID_FILE "detid_jungfrau.txt"
#define LINKED_SERVER_NAME "jungfrauDetectorServer" #define LINKED_SERVER_NAME "jungfrauDetectorServer"
@ -215,8 +217,10 @@ enum MASTERINDEX { MASTER_HARDWARE, OW_MASTER, OW_SLAVE };
#define NUMSETTINGS (2) #define NUMSETTINGS (2)
#define NSPECIALDACS (3) #define NSPECIALDACS (3)
#define SPECIALDACINDEX {J_VREF_PRECH, J_VREF_DS, J_VREF_COMP}; #define SPECIALDACINDEX {J_VREF_PRECH, J_VREF_DS, J_VREF_COMP};
#define SPECIAL_DEFAULT_DYNAMIC_GAIN_VALS {1450, 480, 420} #define SPECIAL_DEFAULT_DYNAMIC_GAIN_VALS \
#define SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS {1550, 450, 620} { 1450, 480, 420 }
#define SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS \
{ 1550, 450, 620 }
enum NETWORKINDEX { TXN_FRAME, FLOWCTRL_10G }; enum NETWORKINDEX { TXN_FRAME, FLOWCTRL_10G };
enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS }; enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS };

6
slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
View File

@ -8,8 +8,10 @@
#define REQRD_FRMWRE_VRSN 0x231026 // 2.0 pcb (version = 011) #define REQRD_FRMWRE_VRSN 0x231026 // 2.0 pcb (version = 011)
#define NUM_HARDWARE_VERSIONS (2) #define NUM_HARDWARE_VERSIONS (2)
#define HARDWARE_VERSION_NUMBERS {0x2, 0x3} #define HARDWARE_VERSION_NUMBERS \
#define HARDWARE_VERSION_NAMES {"1.0", "2.0"} { 0x2, 0x3 }
#define HARDWARE_VERSION_NAMES \
{ "1.0", "2.0" }
#define ID_FILE ("detid_moench.txt") #define ID_FILE ("detid_moench.txt")
#define LINKED_SERVER_NAME "moenchDetectorServer" #define LINKED_SERVER_NAME "moenchDetectorServer"

12
slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
View File

@ -9,7 +9,8 @@
#define NUM_HARDWARE_VERSIONS (2) #define NUM_HARDWARE_VERSIONS (2)
#define HARDWARE_VERSION_NUMBERS {0x0, 0x2}; #define HARDWARE_VERSION_NUMBERS {0x0, 0x2};
#define HARDWARE_VERSION_NAMES {"1.0", "1.2"} #define HARDWARE_VERSION_NAMES \
{ "1.0", "1.2" }
#define LINKED_SERVER_NAME "mythen3DetectorServer" #define LINKED_SERVER_NAME "mythen3DetectorServer"
@ -132,9 +133,12 @@ enum ADCINDEX { TEMP_FPGA };
#define NUMSETTINGS (3) #define NUMSETTINGS (3)
#define NSPECIALDACS (2) #define NSPECIALDACS (2)
#define SPECIALDACINDEX {M_VRPREAMP, M_VRSHAPER}; #define SPECIALDACINDEX {M_VRPREAMP, M_VRSHAPER};
#define SPECIAL_DEFAULT_STANDARD_DAC_VALS {1100, 1280} #define SPECIAL_DEFAULT_STANDARD_DAC_VALS \
#define SPECIAL_DEFAULT_FAST_DAC_VALS {300, 1500} { 1100, 1280 }
#define SPECIAL_DEFAULT_HIGHGAIN_DAC_VALS {1300, 1100} #define SPECIAL_DEFAULT_FAST_DAC_VALS \
{ 300, 1500 }
#define SPECIAL_DEFAULT_HIGHGAIN_DAC_VALS \
{ 1300, 1100 }
enum CLKINDEX { SYSTEM_C0, SYSTEM_C1, SYSTEM_C2, NUM_CLOCKS }; enum CLKINDEX { SYSTEM_C0, SYSTEM_C1, SYSTEM_C2, NUM_CLOCKS };
#define NUM_CLOCKS_TO_SET (1) #define NUM_CLOCKS_TO_SET (1)