From 4e54d1c318329d88d33668b14fcf51345b1ec4ed Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 7 Apr 2020 09:35:43 +0200
Subject: [PATCH] eiger: default clkspeed full speed for dr 16

---
 RELEASE.txt                                   |   3 ++-
 .../bin/eigerDetectorServer_virtualMaster     | Bin 98512 -> 98512 bytes
 .../bin/eigerDetectorServer_virtualSlave      | Bin 98512 -> 98512 bytes
 .../bin/eigerDetectorServerv4.2.0.24.2        | Bin 310956 -> 310956 bytes
 .../slsDetectorServer_defs.h                  |   2 +-
 5 files changed, 3 insertions(+), 2 deletions(-)

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 e6906adcd427d53296576093527fd5c091029bf9..7aa6e8ca73c00868c420901da043119c3b51d100 100755
GIT binary patch
delta 42
zcmV+_0M-A{fd<fl2C#$z6fRU*;XZvvE3LJne^*w*qjh=ggR__dG06b{v&zc`wT-0{
A9smFU

delta 42
zcmV+_0M-A{fd<fl2C#$z6pIjueDG0}w^)O_a>pX;PBTFi7_*oHG06b|v&zc`wT-0`
AIsgCw

diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave
index 91442886142505e1d6e6a9f5a0bf03c0741a650e..7a7ea169da2e6183d7b77a2cd0bcb131813f9149 100755
GIT binary patch
delta 42
zcmV+_0M-A{fd<fl2C#$z6nSU&&k8r6ZxKzvwg95btc+pE;Io(lG06b{v&zc`wVq=W
Ay8r+H

delta 42
zcmV+_0M-A{fd<fl2C#$z6wHdwXY>&160P-9jSu!LPl;-Y&$E~UG06b|v&zc`wX<v#
A8~^|S

diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.2.0.24.2 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.2.0.24.2
index 758872213dc0212e5fbddc21ae7ee235d3f5fff5..a7dc4bb8d3d4e4170c8c312f6a37ae77ef1f0f12 100755
GIT binary patch
delta 31
kcmZ4US7^;&p@uDt+}w-|?L6F!K+FWh%-eamSr%*t0HezY$N&HU

delta 31
jcmZ4US7^;&p@uDt+}w<e?L6Ed%ml>D+j+QI7HkFpquvO~

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)