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

almost done

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-09-15 10:17:16 +02:00
parent 33807b7fac
commit 0f9a841c4a
5 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4969,10 +4969,13 @@ void multiSlsDetector::readFrameFromReceiver(){
//determine number of half readouts and maxX and maxY
int maxX=0,maxY=0;
int numReadout = 1;
bool checkbottom = false;
if(getDetectorsType() == EIGER){
numReadout = 2;
maxX = thisMultiDetector->numberOfChannel[X];
maxY = thisMultiDetector->numberOfChannel[Y];
checkbottom = true;
}
//Note:num threads correspond to num detectors as task calls each slsdet
@ -5031,6 +5034,7 @@ void multiSlsDetector::readFrameFromReceiver(){
while(true){
memset(((char*)multiframe),0x0,slsdatabytes*thisMultiDetector->numberOfDetectors);
@ -5056,7 +5060,7 @@ void multiSlsDetector::readFrameFromReceiver(){
//assemble data
//eiger, so interleaving
//eiger, so interleaving between ports in one readout itself
if(maxX){
//if(ireadout == 3){
@ -5064,19 +5068,29 @@ void multiSlsDetector::readFrameFromReceiver(){
if(!(ireadout%numReadout)) offsetX = thisMultiDetector->offsetX[idet];
else offsetX = thisMultiDetector->offsetX[idet] + halfreadoutoffset;
offsetX *= bytesperchannel;
cprintf(BLUE,"offsetx:%d offsety:%d maxx:%d slsmaxX:%d slsmaxY:%d bytesperchannel:%d\n",
offsetX,offsetY,maxX,slsmaxX,slsmaxY,bytesperchannel);
//cprintf(BLUE,"offsetx:%d offsety:%d maxx:%d slsmaxX:%d slsmaxY:%d bytesperchannel:%d\n",
// offsetX,offsetY,maxX,slsmaxX,slsmaxY,bytesperchannel);
cprintf(BLUE,"copying bytes:%d\n", (slsmaxX/numReadout)*bytesperchannel);
//cprintf(BLUE,"copying bytes:%d\n", (slsmaxX/numReadout)*bytesperchannel);
//itnerleaving with other detectors
for(int i=0;i<slsmaxY;i++){
memcpy(((char*)multiframe) + offsetY + offsetX + (i*maxX*bytesperchannel),
(char*)slsframe[ireadout]+ i*(slsmaxX/numReadout)*bytesperchannel,
(slsmaxX/numReadout)*bytesperchannel);
//bottom
if(((idet+1)%2) == 0){
for(int i=0;i<slsmaxY;++i)
memcpy(((char*)multiframe) + offsetY + offsetX + ((slsmaxY-i)*maxX*bytesperchannel),
(char*)slsframe[ireadout]+ i*(slsmaxX/numReadout)*bytesperchannel,
(slsmaxX/numReadout)*bytesperchannel);
}
//top
else{
for(int i=0;i<slsmaxY;++i)
memcpy(((char*)multiframe) + offsetY + offsetX + (i*maxX*bytesperchannel),
(char*)slsframe[ireadout]+ i*(slsmaxX/numReadout)*bytesperchannel,
(slsmaxX/numReadout)*bytesperchannel);
}
//}//end of ireadout
}
@ -5105,7 +5119,7 @@ void multiSlsDetector::readFrameFromReceiver(){
dataReady(thisData, framecount, framecount, pCallbackArg);//should be fnum and subfnum from json header
delete thisData;
fdata = NULL;
cout<<"Send frame #"<< framecount << " to gui"<<endl;
//cout<<"Send frame #"<< framecount << " to gui"<<endl;
}
framecount++;