From 0ea9cc34b01ede06d3f3b194d1d87086a000a97e Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Fri, 23 Oct 2015 10:57:45 +0200
Subject: [PATCH] changed gotthard dynamic gain value and fixed bug of writing
 settings enum with  more offset to not mixup with conf gain value in firmware

---
 slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c | 4 ++--
 slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h      | 4 ++--
 slsDetectorSoftware/moenchDetectorServer/registers_m.h      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
index 97aaef95f..615427959 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
@@ -1170,7 +1170,7 @@ int initConfGain(int isettings,int val,int imod){
   retval=(bus_r(addr)&GAIN_MASK);
 #ifdef VERBOSE
   printf("Value read from Gain reg is %d\n",retval);
-#endif 
+#endif
   if((val!=-1)&&(retval!=val))
     return -1;
 
@@ -1183,7 +1183,7 @@ int initConfGain(int isettings,int val,int imod){
       retval=((bus_r(addr)&SETTINGS_MASK)>>SETTINGS_OFFSET);
 #ifdef VERBOSE
     printf("Settings read from reg is %d\n",retval);
-#endif 
+#endif
     if((isettings!=-1)&&(retval!=isettings)){
       printf("\n\nSettings r\n\n");
     return -1;
diff --git a/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h b/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h
index 2e04bd713..25ef63f3a 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h
@@ -9,8 +9,8 @@
 #define RGSH1VALS {300,200,400}
 #define RGSH2VALS {260,300,260}
 
-//high,dynamic,low,medium,very high
-#define CONF_GAIN     {0,0,  0,  1,  6,  2,  1}//dynamic gain confgain yet to be figured out-probably 8 or 16
+//                         high,dynamic,low,medium,very high
+#define CONF_GAIN     {0,0,  0,  8,      6,  2,      1}//dynamic gain confgain yet to be figured out-probably 8 or 16
  
 
 #define DEFAULTGAIN {11.66,9.32,14.99}
diff --git a/slsDetectorSoftware/moenchDetectorServer/registers_m.h b/slsDetectorSoftware/moenchDetectorServer/registers_m.h
index c0f74dafd..3b563c096 100755
--- a/slsDetectorSoftware/moenchDetectorServer/registers_m.h
+++ b/slsDetectorSoftware/moenchDetectorServer/registers_m.h
@@ -291,7 +291,7 @@
 #define GAIN_MASK                    0x0000000f 
 #define GAIN_OFFSET                  0  
 #define SETTINGS_MASK                0x000000f0
-#define SETTINGS_OFFSET              4 
+#define SETTINGS_OFFSET              8
 
 
 /* CHIP_OF_INTRST_REG */