From cd7cfadac8fae1171e645b5d376b140eff39fca7 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Tue, 21 Aug 2012 13:38:01 +0000
Subject: [PATCH] changes in gotthard

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@225 951219d9-93cf-4727-9268-0efd64621fa3
---
 slsDetectorSoftware/Makefile                              | 2 +-
 slsDetectorSoftware/commonFiles/sls_detector_defs.h       | 8 +++-----
 .../gotthardDetectorServer/firmware_funcs.c               | 4 ++--
 slsDetectorSoftware/gotthardDetectorServer/server_funcs.c | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile
index 8b945437d..c250f3b76 100644
--- a/slsDetectorSoftware/Makefile
+++ b/slsDetectorSoftware/Makefile
@@ -1,5 +1,5 @@
 CFLAGS= -DC_ONLY 
-FLAGS= -DVERBOSE -DVERYVERBOSE -DDACS_INT
+FLAGS+= -DDACS_INT #-DVERBOSE -DVERYVERBOSE
 INCLUDES= -IcommonFiles -IslsDetector -IMySocketTCP -IusersFunctions -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis
 
 #EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/SL5-x86/ -Wl,-R/usr/local/epics/base/lib/SL5-x86  -lca -lCom 
diff --git a/slsDetectorSoftware/commonFiles/sls_detector_defs.h b/slsDetectorSoftware/commonFiles/sls_detector_defs.h
index f99f65f9d..94078e65b 100755
--- a/slsDetectorSoftware/commonFiles/sls_detector_defs.h
+++ b/slsDetectorSoftware/commonFiles/sls_detector_defs.h
@@ -12,17 +12,15 @@
 /** maxmimum number of detectors ina multidetector structure*/
 #define MAXDET 100
 
-typedef double double32_t;
-typedef int int32_t;   
+typedef  double double32_t;
+typedef  float float32_t;
+typedef  int int32_t;
 typedef char mystring[MAX_STR_LENGTH];
 typedef double mysteps[MAX_SCAN_STEPS];
 
 
 #ifdef DACS_INT
 typedef int dacs_t;
-//typedef uint32_t  dacs_t;
-//#elif DACS_INT_CSERVER
-//typedef u_int32_t dacs_t;
 #else
 typedef float dacs_t;
 #endif
diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
index 89ba4a1bc..bfb51aba6 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
@@ -228,9 +228,9 @@ int setPhaseShiftOnce(){
   //Checking if it is power on(negative number)
   if(((reg&0xFFFF0000)>>16)>0){
     bus_w(addr,0x0);   //clear the reg
-#ifdef VERBOSE
+//#ifdef VERBOSE
     printf("Implementing Phase Shift-Reg:%x\n",bus_r(addr));
-#endif
+//#endif
     //phase shift
     for (i=1;i<PHASE_SHIFT;i++) {
       bus_w(addr,(INT_RSTN_BIT|ENET_RESETN_BIT|SW1_BIT|PHASE_STEP_BIT));//0x2821
diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
index d58001e95..9ce3c803f 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@@ -71,7 +71,7 @@ int init_detector( int b) {
     testFpga();
     testRAM();
     //gotthard specific
-    setPhaseShiftOnce();
+    //setPhaseShiftOnce();
     setDAQRegister();
     setSettings(GET_SETTINGS,-1);
     //Initialization