diff --git a/RELEASE.txt b/RELEASE.txt index 98ca8695b..e90c6c2c5 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -80,7 +80,8 @@ This document describes the differences between 4.2.0 and 4.1.1 releases. 3. Dynamic range 4, 8 or 16 changes the clock divider to full speed, whereas dynamic range of 32 still changes the clock divider to - quarter speed. + quarter speed. So, default is dynamic range of 16 and full speed + at detector server start up. 4. Setting activate to 0 sent to both control and stop server. So, deactivate a module can be done even if FEB communication fails. diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster index e6906adcd..7aa6e8ca7 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster differ diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave index 914428861..7a7ea169d 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave differ diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.2.0.24.2 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.2.0.24.2 index 758872213..a7dc4bb8d 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.2.0.24.2 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.2.0.24.2 differ diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h index 40e0ec321..d0a4688eb 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h @@ -80,7 +80,7 @@ enum NETWORKINDEX {TXN_LEFT, TXN_RIGHT, TXN_FRAME,FLOWCTRL_10G}; #define DEFAULT_READOUT_MODE (PARALLEL) #define DEFAULT_READOUT_STOREINRAM_MODE (CONTINOUS_RO) #define DEFAULT_READOUT_OVERFLOW32_MODE (NOOVERFLOW) -#define DEFAULT_CLK_SPEED (HALF_SPEED) +#define DEFAULT_CLK_SPEED (FULL_SPEED) #define DEFAULT_IO_DELAY (650) #define DEFAULT_TIMING_MODE (AUTO_TIMING) #define DEFAULT_PHOTON_ENERGY (-1)