From 41140c882ad5faf2e35d7199561ada98ad318b22 Mon Sep 17 00:00:00 2001
From: johnson_i <johnson_i@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Fri, 13 Sep 2013 13:18:02 +0000
Subject: [PATCH] 2nd ci, Eiger class added, DAC test

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@669 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../slsDetectorFunctionList.h                 | 22 +------------------
 .../slsDetectorServer_funcs.c                 | 13 ++++++-----
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h b/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
index 52d9c45cb..2841ef8ec 100644
--- a/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
+++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
@@ -11,24 +11,6 @@
 
 
 
-
-/*
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <asm/page.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <unistd.h>
-*/
-
 /****************************************************
 This functions are used by the slsDetectroServer_funcs interface.
 Here are the definitions, but the actual implementation should be done for each single detector.
@@ -38,9 +20,7 @@ Here are the definitions, but the actual implementation should be done for each
 
 
 
-int mapCSP0(void);
-int initializeDetectorStructure();
-int setupDetector();
+int initDetector();
 
 int setNMod(int nm, enum dimension dim);
 int getNModBoard(enum dimension arg);
diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
index 9eba14edf..f43cd7e92 100755
--- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
+++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
@@ -40,7 +40,8 @@ const enum detectorType myDetectorType=GENERIC;
 char mess[1000];
 char *dataretval=NULL;
 int dataret;
-extern int dataBytes;
+//extern 
+int dataBytes = 10;
 
 
 
@@ -48,15 +49,11 @@ extern int dataBytes;
 int init_detector(int b) {
 #ifdef VIRTUAL
 	printf("This is a VIRTUAL detector\n");
-#endif
-#ifdef SLS_DETECTOR_FUNCTION_LIST
-	mapCSP0();
 #endif
 	//only for control server
 	if(b){
 #ifdef SLS_DETECTOR_FUNCTION_LIST
-		initializeDetectorStructure();
-		setupDetector();
+		initDetector();
 #endif
 	}
 	strcpy(mess,"dummy message");
@@ -2974,7 +2971,11 @@ int read_counter_block(int file_des) {
 	int n;
 	int startACQ;
 	//char *retval=NULL;
+#ifdef GOTTHARDD
 	char CounterVals[NCHAN*NCHIP];
+#else
+	char CounterVals[dataBytes];
+#endif
 
 	sprintf(mess,"Read counter block failed\n");