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

added latest changes

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@478 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
maliakal_d
2013-03-01 10:36:20 +00:00
parent 9d8b621adf
commit e3d68d05c6
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsReceiver/Makefile
View File

@ -1,5 +1,5 @@
CC = g++ CC = g++
CLAGS += -DSLS_RECEIVER_FUNCTION_LIST -DGOTTHARDD -UHRIXCALLBACK #-DTESTWRITE CLAGS += -DSLS_RECEIVER_FUNCTION_LIST -DGOTTHARDD -DUHRIXCALLBACK #-DTESTWRITE
LDLIBS += -lm -lstdc++ -lpthread LDLIBS += -lm -lstdc++ -lpthread
INCLUDES = -I ../MySocketTCP -I ../commonFiles -I ../usersFunctions -I ../slsDetectorAnalysis -I . INCLUDES = -I ../MySocketTCP -I ../commonFiles -I ../usersFunctions -I ../slsDetectorAnalysis -I .

11
slsDetectorSoftware/slsReceiver/UHRIXCallback.cpp
View File

@ -3,7 +3,9 @@
int UHRIXCallbackDataFunc(char* d, int np, FILE* fd, void* p){ int UHRIXCallbackDataFunc(char* d, int np, FILE* fd, void* p){
int i; int i,j,jmax=6;
u_int16_t da;
//#ifdef VERBOSE //#ifdef VERBOSE
//printf("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU Receiver Data received \n"); //printf("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU Receiver Data received \n");
@ -12,10 +14,11 @@ int UHRIXCallbackDataFunc(char* d, int np, FILE* fd, void* p){
else{ else{
// printf("received %d bytes of data\n",np); // printf("received %d bytes of data\n",np);
// printf("index:%d\n",(int)(*(int*)d)); // printf("index:%d\n",(int)(*(int*)d));
for ( i=0; i<(np-4)/2; i++) for ( i=0; i<(np-4)/2-jmax+1; i++)
{ {
d[i*2+4]=i; //((int16_t *)d)[i+2] -= ((int16_t *)d)[i+3];
d[i*2+5]=0; //((int16_t *)d)[i+2] *= ((int16_t *)d)[i+2];
for (j=1; j<jmax; j++) ((int16_t *)d)[i+2] += ((int16_t *)d)[i+2+j];
} }
} }