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

fixed frames from receiver to flip accordingly, also display frame index as not visible from filename

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@345 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-11-15 11:19:50 +00:00
parent 89ddfa9b51
commit e4e46920cd
15 changed files with 131 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5678,12 +5678,13 @@ int slsDetector::resetFramesCaught(int index){
int* slsDetector::readFrameFromReceiver(){
int* slsDetector::readFrameFromReceiver(char* fName, int &fIndex){
//cout<<"databytes:"<<thisDetector->dataBytes<<" headerlength:"<<HEADERLENGTH<<endl;
int fnum=F_READ_FRAME;
int nel=(thisDetector->dataBytes+HEADERLENGTH)/sizeof(int);//2572/
int* retval=new int[nel];
int* origVal=new int[nel];
int arg[2];
int ret=FAIL;
int n;
char mess[100]="Nothing";
@ -5705,6 +5706,8 @@ int* slsDetector::readFrameFromReceiver(){
delete [] retval;
return NULL;
} else {
n=dataSocket->ReceiveDataOnly(fName,MAX_STR_LENGTH);
n=dataSocket->ReceiveDataOnly(arg,sizeof(arg));
n=dataSocket->ReceiveDataOnly(origVal,thisDetector->dataBytes+HEADERLENGTH);
#ifdef VERBOSE
std::cout<< "Received "<< n << " data bytes" << std::endl;
@ -5717,8 +5720,15 @@ int* slsDetector::readFrameFromReceiver(){
return NULL;
}//worked
else{
memcpy(retval,((char*) origVal)+2, getDataBytes()/2);
memcpy((((char*)retval)+getDataBytes()/2), ((char*) origVal)+8+getDataBytes()/2, getDataBytes()/2);
fIndex=arg[0];
if(arg[1]){
memcpy(retval,((char*) origVal)+2, getDataBytes()/2);
memcpy((((char*)retval)+getDataBytes()/2), ((char*) origVal)+8+getDataBytes()/2, getDataBytes()/2);
}
else{
memcpy((((char*)retval)+getDataBytes()/2),((char*) origVal)+2, getDataBytes()/2);
memcpy(retval, ((char*) origVal)+8+getDataBytes()/2, getDataBytes()/2);
}
}
}
dataSocket->Disconnect();