detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +02:00
Code Issues Actions Packages Releases Activity

2nd ci, Eiger class added, DAC test

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@669 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
johnson_i 2013-09-13 13:18:02 +00:00
parent 8f4a2cc182
commit 41140c882a
2 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -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. This functions are used by the slsDetectroServer_funcs interface.
Here are the definitions, but the actual implementation should be done for each single detector. 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 initDetector();
int initializeDetectorStructure();
int setupDetector();
int setNMod(int nm, enum dimension dim); int setNMod(int nm, enum dimension dim);
int getNModBoard(enum dimension arg); int getNModBoard(enum dimension arg);

13
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -40,7 +40,8 @@ const enum detectorType myDetectorType=GENERIC;
char mess[1000]; char mess[1000];
char *dataretval=NULL; char *dataretval=NULL;
int dataret; int dataret;
extern int dataBytes; //extern
int dataBytes = 10;
@ -48,15 +49,11 @@ extern int dataBytes;
int init_detector(int b) { int init_detector(int b) {
#ifdef VIRTUAL #ifdef VIRTUAL
printf("This is a VIRTUAL detector\n"); printf("This is a VIRTUAL detector\n");
#endif
#ifdef SLS_DETECTOR_FUNCTION_LIST
mapCSP0();
#endif #endif
//only for control server //only for control server
if(b){ if(b){
#ifdef SLS_DETECTOR_FUNCTION_LIST #ifdef SLS_DETECTOR_FUNCTION_LIST
initializeDetectorStructure(); initDetector();
setupDetector();
#endif #endif
} }
strcpy(mess,"dummy message"); strcpy(mess,"dummy message");
@ -2974,7 +2971,11 @@ int read_counter_block(int file_des) {
int n; int n;
int startACQ; int startACQ;
//char *retval=NULL; //char *retval=NULL;
#ifdef GOTTHARDD
char CounterVals[NCHAN*NCHIP]; char CounterVals[NCHAN*NCHIP];
#else
char CounterVals[dataBytes];
#endif
sprintf(mess,"Read counter block failed\n"); sprintf(mess,"Read counter block failed\n");