diff --git a/slsDetectorSoftware/slsReceiver/Makefile b/slsDetectorSoftware/slsReceiver/Makefile index e4a96a288..627e32cea 100644 --- a/slsDetectorSoftware/slsReceiver/Makefile +++ b/slsDetectorSoftware/slsReceiver/Makefile @@ -1,5 +1,5 @@ CC = g++ - CLAGS += -DSLS_RECEIVER_FUNCTION_LIST -DGOTTHARDD -UHRIXCALLBACK #-DTESTWRITE + CLAGS += -DSLS_RECEIVER_FUNCTION_LIST -DGOTTHARDD -DUHRIXCALLBACK #-DTESTWRITE LDLIBS += -lm -lstdc++ -lpthread INCLUDES = -I ../MySocketTCP -I ../commonFiles -I ../usersFunctions -I ../slsDetectorAnalysis -I . diff --git a/slsDetectorSoftware/slsReceiver/UHRIXCallback.cpp b/slsDetectorSoftware/slsReceiver/UHRIXCallback.cpp index 7813e675d..e45115a06 100644 --- a/slsDetectorSoftware/slsReceiver/UHRIXCallback.cpp +++ b/slsDetectorSoftware/slsReceiver/UHRIXCallback.cpp @@ -3,8 +3,10 @@ int UHRIXCallbackDataFunc(char* d, int np, FILE* fd, void* p){ - int i; - + int i,j,jmax=6; + u_int16_t da; + + //#ifdef VERBOSE //printf("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU Receiver Data received \n"); if (d==NULL) @@ -12,10 +14,11 @@ int UHRIXCallbackDataFunc(char* d, int np, FILE* fd, void* p){ else{ // printf("received %d bytes of data\n",np); // 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; - d[i*2+5]=0; + //((int16_t *)d)[i+2] -= ((int16_t *)d)[i+3]; + //((int16_t *)d)[i+2] *= ((int16_t *)d)[i+2]; + for (j=1; j