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

Merge branch 'dhanya_devel'

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-02-10 14:43:17 +01:00
commit 5c34db9cb1
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/eigerDetectorServer/Beb.c
View File

@ -529,16 +529,18 @@ int Beb_RequestNImages(unsigned int beb_number, unsigned int left_right, int ten
unsigned int i; unsigned int i;
for(i=0;i<nimages;i++){ for(i=0;i<nimages;i++){
//header then data request //header then data request
//usleep(10000); // usleep(10000);
if(!Beb_SendMultiReadRequest(beb_number,left_right,ten_gig,dst_number,1,header_size,test_just_send_out_packets_no_wait)){printf("Send failed\n");return 0;} if(!Beb_SendMultiReadRequest(beb_number,left_right,ten_gig,dst_number,1,header_size,test_just_send_out_packets_no_wait)){printf("Send failed\n");return 0;}
//usleep(10000); // usleep(10000);
if(!Beb_SendMultiReadRequest(beb_number,left_right,ten_gig,dst_number,npackets,packet_size,test_just_send_out_packets_no_wait)){printf("Send failed\n");return 0;} if(!Beb_SendMultiReadRequest(beb_number,left_right,ten_gig,dst_number,npackets,packet_size,test_just_send_out_packets_no_wait)){printf("Send failed\n");return 0;}
// usleep(0); usleep(1000);
if(in_two_requests){if(!Beb_SendMultiReadRequest(beb_number,left_right,ten_gig,dst_number,npackets,packet_size,test_just_send_out_packets_no_wait)){printf("Send failed\n");return 0;} if(in_two_requests){if(!Beb_SendMultiReadRequest(beb_number,left_right,ten_gig,dst_number,npackets,packet_size,test_just_send_out_packets_no_wait)){printf("Send failed\n");return 0;}
} }
} }
*/ */
unsigned int i; unsigned int i;
for(i=0;i<nimages;i++){ for(i=0;i<nimages;i++){
//header then data request //header then data request
@ -550,6 +552,7 @@ int Beb_RequestNImages(unsigned int beb_number, unsigned int left_right, int ten
} }
} }
return 1; return 1;
} }

19
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4543,7 +4543,7 @@ int* multiSlsDetector::readFrameFromReceiver(char* fName, int &fIndex){
} }
int n; int n;
int i,k,offsetX, offsetY, maxX, maxY;; int i,k,offsetX, offsetY, maxX, maxY; double dr;
int* retval=new int[nel]; int* retval=new int[nel];
int *retdet, *p=retval; int *retdet, *p=retval;
string fullFName=""; string fullFName="";
@ -4560,15 +4560,22 @@ int* multiSlsDetector::readFrameFromReceiver(char* fName, int &fIndex){
retdet=detectors[id]->readFrameFromReceiver(fName,fIndex); retdet=detectors[id]->readFrameFromReceiver(fName,fIndex);
if(detectors[id]->getErrorMask()) if(detectors[id]->getErrorMask())
setErrorMask(getErrorMask()|(1<<id)); setErrorMask(getErrorMask()|(1<<id));
if (retdet) { if ((retdet) &&(fIndex!=-1)) {
n=detectors[id]->getDataBytes(); n=detectors[id]->getDataBytes();
if(getDetectorsType() == EIGER){ if(getDetectorsType() == EIGER){
k=detectors[id]->getMaxNumberOfChannels(X)*2;/**bit mode*/ cout << "fname:"<<fName<<" findex:"<<fIndex<<endl;
offsetY = ((maxY - (thisMultiDetector->offsetY[id] + detectors[id]->getMaxNumberOfChannels(Y))) * maxX)*2;/**bit mode*/ cout<<"n:"<<n<<endl;
offsetX = thisMultiDetector->offsetX[id]*2; cout<<"maxchan:"<<detectors[id]->getMaxNumberOfChannels()<<" n:"<<n<<endl;
dr = (double)n/detectors[id]->getMaxNumberOfChannels();
cout << "dr:"<<dr<<endl;
k=(int)(detectors[id]->getMaxNumberOfChannels(X)*dr);//bit mode
cout << "k:"<<k<<endl;
offsetY = (int)(((maxY - (thisMultiDetector->offsetY[id] + detectors[id]->getMaxNumberOfChannels(Y))) * maxX)*dr);//bit mode
offsetX = (int)(thisMultiDetector->offsetX[id]*dr);
cout << "offsetY"<<offsetY<< " offsetX:"<<offsetX<<endl;
for(i=0; i< 256;i++){ for(i=0; i< 256;i++){
memcpy((((char*)p) + offsetY + offsetX + (i*maxX*2)/**bit mode*/) ,(((char*)retdet) + (i*k)),k); memcpy((((char*)p) + offsetY + offsetX + ((int)(i*maxX*dr))) ,(((char*)retdet) + (i*k)),k);//bit mode
} }
} }
else{ else{