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

done with eiger

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-09-20 10:42:43 +02:00
parent 904d21d0be
commit d751c626b3
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5040,10 +5040,12 @@ void multiSlsDetector::startReceivingData(){
currentFrameIndex = d["fIndex"].GetInt(); currentFrameIndex = d["fIndex"].GetInt();
currentSubFrameIndex = d["subfnum"].GetInt(); currentSubFrameIndex = d["subfnum"].GetInt();
strcpy(currentFileName ,d["fname"].GetString()); strcpy(currentFileName ,d["fname"].GetString());
cout << ithread << "Acquisition index: " << currentAcquisitionIndex << endl; #ifdef VERYVERBOSE
cout << ithread << "Frame index: " << currentFrameIndex << endl; cout << "Acquisition index: " << currentAcquisitionIndex << endl;
cout << ithread << "Subframe index: " << currentSubFrameIndex << endl; cout << "Frame index: " << currentFrameIndex << endl;
cout << ithread << "File name: " << currentFileName << endl; cout << "Subframe index: " << currentSubFrameIndex << endl;
cout << "File name: " << currentFileName << endl;
#endif
} }
// close the message // close the message
zmq_msg_close(&message); zmq_msg_close(&message);
@ -5056,7 +5058,9 @@ void multiSlsDetector::startReceivingData(){
//end of socket ("end") //end of socket ("end")
if (len < 1024*256 ) { if (len < 1024*256 ) {
if(!len) cprintf(RED,"Received no data in socket for %d\n", ithread); if(!len) cprintf(RED,"Received no data in socket for %d\n", ithread);
#ifdef VERYVERBOSE
cprintf(RED,"End of socket for %d\n", ithread); cprintf(RED,"End of socket for %d\n", ithread);
#endif
zmq_msg_close(&message); zmq_msg_close(&message);
singleframe[ithread] = NULL; singleframe[ithread] = NULL;
pthread_mutex_lock(&ms); pthread_mutex_lock(&ms);
@ -5158,7 +5162,7 @@ void multiSlsDetector::readFrameFromReceiver(){
//construct complete image and send to callback //construct complete image and send to callback
while(true){ while(true){
memset(((char*)multiframe),0x0,slsdatabytes*thisMultiDetector->numberOfDetectors); //reset frame memory memset(((char*)multiframe),0xFF,slsdatabytes*thisMultiDetector->numberOfDetectors); //reset frame memory
//post all of them to start //post all of them to start
for(int ireadout=0; ireadout<numReadouts; ++ireadout){ for(int ireadout=0; ireadout<numReadouts; ++ireadout){