detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-07 10:30:41 +02:00
Code Issues Actions Packages Releases Activity

small bugs in nchan, nchip and dacs_int flag wasnt included

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@616 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-06-19 09:34:27 +00:00
parent f390b7bba7
commit e1ba4ff34d
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/eigerDetectorServer/Makefile
View File

@ -1,6 +1,6 @@
CC = powerpc-4xx-softfloat-gcc CC = powerpc-4xx-softfloat-gcc
CCX = powerpc-4xx-softfloat-g++ CCX = powerpc-4xx-softfloat-g++
CLAGS += -Wall -DDACS_INT -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST #-DVERBOSE #-DVIRTUAL CLAGS += -Wall -DDACS_INT -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT #-DVERBOSE #-DVIRTUAL
LDLIBS += -lm -lstdc++ LDLIBS += -lm -lstdc++
PROGS = eigerDetectorServer PROGS = eigerDetectorServer

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

18
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -82,7 +82,7 @@ int mapCSP0(void) {
int initializeDetectorStructure(){ int initializeDetectorStructure(){
printf("EIGER 5\n"); printf("EIGER 9\n");
int imod; int imod;
int n=getNModBoard(X)*getNModBoard(Y); int n=getNModBoard(X)*getNModBoard(Y);
#ifdef VERBOSE #ifdef VERBOSE
@ -386,14 +386,14 @@ int calculateDataBytes(){
return 0; return 0;
} }
int getTotalNumberOfChannels(){return 0;} int getTotalNumberOfChannels(){return NCHIP*NCHAN*nModBoard;}
int getTotalNumberOfChips(){return 0;} int getTotalNumberOfChips(){return NCHIP*nModBoard;}
int getTotalNumberOfModules(){return 0;} int getTotalNumberOfModules(){return nModBoard;}
int getNumberOfChannelsPerChip(){return 0;} int getNumberOfChannelsPerChip(){return NCHAN;}
int getNumberOfChannelsPerModule(){return 0;} int getNumberOfChannelsPerModule(){return NCHAN*NCHIP;}
int getNumberOfChipsPerModule(){return 0;} int getNumberOfChipsPerModule(){return NCHIP;}
int getNumberOfDACsPerModule(){return 0;} int getNumberOfDACsPerModule(){return NDAC;}
int getNumberOfADCsPerModule(){return 0;} int getNumberOfADCsPerModule(){return NADC;}

2
slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -18,7 +18,7 @@
#define NCHAN 256*256 #define NCHAN 256*256
#define NCHIP 4*1 #define NCHIP 4*1
#define NDAC 16 #define NDAC 16
#define NADC 1 #define NADC 0
#define NMAXMODX 1 #define NMAXMODX 1
#define NMAXMODY 1 #define NMAXMODY 1
#define NMAXMOD NMAXMODX*NMAXMODY #define NMAXMOD NMAXMODX*NMAXMODY