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

the memcpy wasnt incremementing in receiver.

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@519 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-04-18 13:38:21 +00:00
parent 0efaaa5520
commit 5ab6d9076d
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -875,7 +875,7 @@ int slsReceiverFuncs::read_frame(){
int slsReceiverFuncs::moench_read_frame(){
ret=OK;
char fName[MAX_STR_LENGTH]="";
int arg = -1,i;
int arg = -1,i,j,y;
int bufferSize = MOENCH_BUFFER_SIZE;
@ -894,6 +894,7 @@ int slsReceiverFuncs::moench_read_frame(){
int index=-1;//,index2=-1;
int startIndex=-1;
int count=0;
int offset=0;
strcpy(mess,"Could not read frame\n");
@ -921,10 +922,28 @@ int slsReceiverFuncs::moench_read_frame(){
index = startIndex;
cout << "didnt get data. Gui will try again" << endl;
/*
//copy data 80 bytes, then in y direction
offset = 4;y=0;
for(i=0;i<MOENCH_PACKETS_PER_FRAME;i++){
for(j=0;j<onedatasize/MOENCH_BYTES_PER_ADC;j++){
memcpy((((char*)retval) + y*MOENCH_BYTES_PER_X_DIMENSION + j*MOENCH_BYTES_PER_ADC),
(((char*) origVal) + offset + j*MOENCH_BYTES_PER_ADC) ,
MOENCH_BYTES_PER_ADC);
if (offset == 4) offset = 10;
else offset = 4;
if (y == MOENCH_PIXELS_IN_X_DIMENSION-1) y=0;
else y++;
}
}
*/
for(i=0;i<MOENCH_PACKETS_PER_FRAME;i=i+2){
memcpy((((char*)retval)+ onedatasize*i), (((char*) origVal)+4+ onebuffersize*i) , onedatasize);
memcpy((((char*)retval)+ onedatasize*(i+1)), (((char*) origVal)+10+onedatasize+ onebuffersize*i),onedatasize);
}
}else{
//upto 40 indices, look at just index1 and index2 for now
index=(int)(*(int*)raw);