diff --git a/manual/manual-client/Eiger_short.tex b/manual/manual-client/Eiger_short.tex index fbed8a593..62fb5ae3d 100644 --- a/manual/manual-client/Eiger_short.tex +++ b/manual/manual-client/Eiger_short.tex @@ -757,13 +757,19 @@ Set it correctly with: \begin{verbatim} sysctl net.core.netdev_max_backlog=250000 sysctl net.core.rmem_default=$((100*1024*1024)) +sysctl net.core.rmem_max=$((100*1024*1024)) \end{verbatim} -Last, you can disable power saving in teh CPU frequency: +Last, you can disable power saving in the CPU frequency (chose the appropriate command for your system): \begin{verbatim} cpupower frequency-info cpupower frequency-set -g performance \end{verbatim} +or +\begin{verbatim} +cpufreq-info +for i in `seq 0 7`; do cpufreq-set -c $i -g performance; done +\end{verbatim} It can help to increase the fifo size of the receiver to {\tt{rx\_fifodepth}} to 1000 images \begin{verbatim} diff --git a/slsDetectorServers/ctbDetectorServer/gitInfo.txt b/slsDetectorServers/ctbDetectorServer/gitInfo.txt index 6ce3eda20..cf7869e3c 100644 --- a/slsDetectorServers/ctbDetectorServer/gitInfo.txt +++ b/slsDetectorServers/ctbDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 5bf37a4f0d840820e676f11419e98c0203d700eb -Revision: 44 +Repsitory UUID: 7cd5bc8b2db6e89fbec4c06c65e683cf788338c0 +Revision: 46 Branch: jungfrau Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4472 -Last Changed Date: 2019-03-22 14:25:24.000000002 +0100 ../slsDetectorServer/ALTERA_PLL.h +Last Changed Rev: 4474 +Last Changed Date: 2019-03-26 15:01:04.000000002 +0100 ./slsDetectorServer_defs.h diff --git a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h index d4e816469..d54dbb3d4 100644 --- a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h +++ b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "5bf37a4f0d840820e676f11419e98c0203d700eb" +#define GITREPUUID "7cd5bc8b2db6e89fbec4c06c65e683cf788338c0" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4472 -#define GITDATE 0x20190322 +#define GITREV 0x4474 +#define GITDATE 0x20190326 #define GITBRANCH "jungfrau" diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index 70185def6..6b1a5ab0e 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -1649,7 +1649,9 @@ void configurePhase(enum CLKINDEX ind, int val) { FILE_LOG(logINFO, ("Configuring Phase of C%d(%s) to %d\n", ind, clock_names[ind], val)); int phase = 0; - int maxShifts = ((ind == ADC_CLK) ? MAX_PHASE_SHIFTS_ADC_CLK : MAX_PHASE_SHIFTS_DBIT_CLK); + int maxShifts = (PLL_VCO_FREQ_MHZ / clkDivider[ind]) * MAX_PHASE_SHIFTS_STEPS; + FILE_LOG(logDEBUG1, ("Clock: %d MHz, VCO:%d MHz, Max Phase shifts:%d\n", + clkDivider[ind], PLL_VCO_FREQ_MHZ, maxShifts)); // delay clk if (relativePhase > 0) { diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h index ddb428694..3a2f65da0 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h @@ -80,8 +80,7 @@ enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, /* Defines in the Firmware */ #define MAX_PATTERN_LENGTH (0xFFFF) #define DIGITAL_IO_DELAY_MAXIMUM_PS ((OUTPUT_DELAY_0_OTPT_STTNG_MSK >> OUTPUT_DELAY_0_OTPT_STTNG_OFST) * OUTPUT_DELAY_0_OTPT_STTNG_STEPS) -#define MAX_PHASE_SHIFTS_ADC_CLK (320) -#define MAX_PHASE_SHIFTS_DBIT_CLK (32) +#define MAX_PHASE_SHIFTS_STEPS (8) #define WAIT_TME_US_FR_ACQDONE_REG (100) // wait time in us after acquisition done to ensure there is no data in fifo #define WAIT_TIME_US_PLL (10 * 1000) diff --git a/slsDetectorServers/moenchDetectorServer/gitInfo.txt b/slsDetectorServers/moenchDetectorServer/gitInfo.txt index a7a56f57f..167e2dec8 100644 --- a/slsDetectorServers/moenchDetectorServer/gitInfo.txt +++ b/slsDetectorServers/moenchDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorPackage/slsDetectorServers/moenchDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: cd5aea895b07b7af25e3fb74a341a861f9aa291c -Revision: 21 +Repsitory UUID: 7cd5bc8b2db6e89fbec4c06c65e683cf788338c0 +Revision: 22 Branch: jungfrau Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4473 -Last Changed Date: 2019-03-22 17:13:44.000000002 +0100 ../slsDetectorServer/slsDetectorServer_funcs.c +Last Changed Rev: 4474 +Last Changed Date: 2019-03-26 15:01:04.000000002 +0100 ./slsDetectorServer_defs.h diff --git a/slsDetectorServers/moenchDetectorServer/gitInfoMoench.h b/slsDetectorServers/moenchDetectorServer/gitInfoMoench.h index 540b4d733..d54dbb3d4 100644 --- a/slsDetectorServers/moenchDetectorServer/gitInfoMoench.h +++ b/slsDetectorServers/moenchDetectorServer/gitInfoMoench.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "cd5aea895b07b7af25e3fb74a341a861f9aa291c" +#define GITREPUUID "7cd5bc8b2db6e89fbec4c06c65e683cf788338c0" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4473 -#define GITDATE 0x20190322 +#define GITREV 0x4474 +#define GITDATE 0x20190326 #define GITBRANCH "jungfrau" diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index 49343265b..e049418ea 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -1292,7 +1292,9 @@ void configurePhase(enum CLKINDEX ind, int val) { int phase = 0; - int maxShifts = ((ind == ADC_CLK) ? MAX_PHASE_SHIFTS_ADC_CLK : MAX_PHASE_SHIFTS_DBIT_CLK); + int maxShifts = (PLL_VCO_FREQ_MHZ / clkDivider[ind]) * MAX_PHASE_SHIFTS_STEPS; + FILE_LOG(logDEBUG1, ("Clock: %d MHz, VCO:%d MHz, Max Phase shifts:%d\n", + clkDivider[ind], PLL_VCO_FREQ_MHZ, maxShifts)); // delay clk if (relativePhase > 0) { diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h index 4c9cabf60..9e512eb0b 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h @@ -61,8 +61,7 @@ enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7}; /* Defines in the Firmware */ #define MAX_PATTERN_LENGTH (0xFFFF) #define DIGITAL_IO_DELAY_MAXIMUM_PS ((OUTPUT_DELAY_0_OTPT_STTNG_MSK >> OUTPUT_DELAY_0_OTPT_STTNG_OFST) * OUTPUT_DELAY_0_OTPT_STTNG_STEPS) -#define MAX_PHASE_SHIFTS_ADC_CLK (320) -#define MAX_PHASE_SHIFTS_DBIT_CLK (32) +#define MAX_PHASE_SHIFTS_STEPS (8) #define WAIT_TME_US_FR_ACQDONE_REG (100) // wait time in us after acquisition done to ensure there is no data in fifo #define WAIT_TIME_US_PLL (10 * 1000)