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

no change

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-02-11 11:22:54 +01:00
parent b54f3628ae
commit 8863a9f880
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

12
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4564,16 +4564,16 @@ int* multiSlsDetector::readFrameFromReceiver(char* fName, int &fIndex){
n=detectors[id]->getDataBytes();
if(getDetectorsType() == EIGER){
cout << "fname:"<<fName<<" findex:"<<fIndex<<endl;
cout<<"n:"<<n<<endl;
cout<<"maxchan:"<<detectors[id]->getMaxNumberOfChannels()<<" n:"<<n<<endl;
//cout << "fname:"<<fName<<" findex:"<<fIndex<<endl;
//cout<<"n:"<<n<<endl;
//cout<<"maxchan:"<<detectors[id]->getMaxNumberOfChannels()<<" n:"<<n<<endl;
dr = (double)n/detectors[id]->getMaxNumberOfChannels();
cout << "dr:"<<dr<<endl;
//cout << "dr:"<<dr<<endl;
k=(int)(detectors[id]->getMaxNumberOfChannels(X)*dr);//bit mode
cout << "k:"<<k<<endl;
//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;
//cout << "offsetY"<<offsetY<< " offsetX:"<<offsetX<<endl;
for(i=0; i< 256;i++){
memcpy((((char*)p) + offsetY + offsetX + ((int)(i*maxX*dr))) ,(((char*)retdet) + (i*k)),k);//bit mode
}