detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-08-09 06:40:29 +02:00
Code Issues Actions Packages Releases Activity

update default values in server defs
Build on RHEL9 docker image / build (push) Successful in 3m36s
Details
Build on RHEL8 docker image / build (push) Successful in 4m49s
Details
Run Simulator Tests on local RHEL9 / build (push) Failing after 11m15s
Details
Run Simulator Tests on local RHEL8 / build (push) Failing after 13m22s
Details

Browse Source
This commit is contained in:
muelle_m1
2026-03-19 11:30:40 +01:00
parent 27ea49c8e8
commit 0415911279
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
+1 -1
View File
@@ -66,7 +66,7 @@ uint8_t adcEnableMask_10g = 0xFF;
uint32_t transceiverMask = DEFAULT_TRANSCEIVER_MASK;
int32_t clkPhase[NUM_CLOCKS] = {};
uint32_t clkFrequency[NUM_CLOCKS] = {40000000, 20000000, 20000000, 200000000};
uint32_t clkFrequency[NUM_CLOCKS] = {DEFAULT_RUN_CLK, DEFAULT_ADC_CLK, DEFAULT_SYNC_CLK, DEFAULT_DBIT_CLK};
int dacValues[NDAC] = {};
// software limit that depends on the current chip on the ctb
int vLimit = 0;
slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
+4 -4
View File
@@ -50,10 +50,10 @@
#define DEFAULT_VLIMIT (-100)
#define DEFAULT_TIMING_MODE (AUTO_TIMING)
#define DEFAULT_TX_UDP_PORT (0x7e9a)
#define DEFAULT_RUN_CLK (200) // 40
#define DEFAULT_ADC_CLK (40) // 20
#define DEFAULT_SYNC_CLK (40) // 20
#define DEFAULT_DBIT_CLK (200)
#define DEFAULT_RUN_CLK (80000000) // 80
#define DEFAULT_ADC_CLK (40000000) // 40
#define DEFAULT_SYNC_CLK (40000000) // 40
#define DEFAULT_DBIT_CLK (200000000)
#define NS_TO_CLK_CYCLE (1E-9) // ns to MHz
#define DEFAULT_TRANSCEIVER_MASK (0x3)
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+1 -7
View File
@@ -5931,13 +5931,7 @@ int get_clock_frequency(int file_des) {
retval = getFrequency(c);
char *clock_names[] = {CLK_NAMES};
LOG(logDEBUG1,
("retval %s clock (%d) frequency: %d %s\n", clock_names[c], (int)c,
retval,
myDetectorType == XILINX_CHIPTESTBOARD
? "kHz"
: (myDetectorType == GOTTHARD2 || myDetectorType == MYTHEN3
? "Hz"
: "MHz")));
("retval %s clock (%d) frequency: %d %s\n", clock_names[c], (int)c, retval, "Hz"));
}
#endif
return Server_SendResult(file_des, INT32, &retval, sizeof(retval));