detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-25 07:40:03 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/slsReceiver/receiver_defs.h
View File

@ -11,13 +11,12 @@
#define FIFO_SIZE 25000 #define FIFO_SIZE 25000
#define GOTTHARD_ALIGNED_FRAME_SIZE 4096
#define GOTTHARD_ALIGNED_FRAME_SIZE 4096
#define GOTTHARD_PACKETS_PER_FRAME 2 #define GOTTHARD_PACKETS_PER_FRAME 2
#define GOTTHARD_BUFFER_SIZE 1286*GOTTHARD_PACKETS_PER_FRAME #define GOTTHARD_BUFFER_SIZE 1286*GOTTHARD_PACKETS_PER_FRAME
#define GOTTHARD_DATA_BYTES 1280*GOTTHARD_PACKETS_PER_FRAME #define GOTTHARD_DATA_BYTES 1280*GOTTHARD_PACKETS_PER_FRAME
#define GOTTHARD_SHORT_PACKETS_PER_FRAME 1 #define GOTTHARD_SHORT_PACKETS_PER_FRAME 1
#define GOTTHARD_SHORT_BUFFER_SIZE 518 #define GOTTHARD_SHORT_BUFFER_SIZE 518
#define GOTTHARD_SHORT_DATABYTES 512 #define GOTTHARD_SHORT_DATABYTES 512
@ -25,12 +24,15 @@
#define MOENCH_ALIGNED_FRAME_SIZE 65536 #define MOENCH_ALIGNED_FRAME_SIZE 65536
#define MOENCH_PACKETS_PER_FRAME 40 #define MOENCH_PACKETS_PER_FRAME 40
#define MOENCH_BUFFER_SIZE 1286*MOENCH_PACKETS_PER_FRAME #define MOENCH_BUFFER_SIZE 1286*MOENCH_PACKETS_PER_FRAME
#define MOENCH_DATA_BYTES 1280*MOENCH_PACKETS_PER_FRAME #define MOENCH_DATA_BYTES 1280*MOENCH_PACKETS_PER_FRAME
#define MOENCH_BYTES_PER_ADC 40*2
#define MOENCH_PIXELS_IN_X_DIMENSION 160
#define MOENCH_BYTES_PER_X_DIMENSION 160*MOENCH_PIXELS_IN_X_DIMENSION

4
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -344,6 +344,8 @@ int slsReceiverFunctionList::startListening(){
rc = udpSocket->ReceiveDataOnly(buffer,bufferSize); rc = udpSocket->ReceiveDataOnly(buffer,bufferSize);
if( rc < 0) if( rc < 0)
cerr << "recvfrom() failed" << endl; cerr << "recvfrom() failed" << endl;
if(rc<bufferSize)
cerr << "LESS than buffersize received" << rc << endl;
//start for each scan //start for each scan
if(startFrameIndex==-1){ if(startFrameIndex==-1){
@ -507,7 +509,7 @@ int slsReceiverFunctionList::startWriting(){
//default writing to file //default writing to file
else { else {
if(sfilefd) if(sfilefd)
memcpy(address,wbuf, bufferSize); memcpy((((char*)address)+bufferSize*framesInFile),wbuf, bufferSize);
else{ else{
cout << "You do not have permissions to overwrite: " << savefilename << endl; cout << "You do not have permissions to overwrite: " << savefilename << endl;
usleep(50000); usleep(50000);

21
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

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