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

removed prints

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-11-04 13:49:16 +01:00
parent 947a0e5f41
commit e2299b5269
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -1761,7 +1761,6 @@ void UDPStandardImplementation::startDataCallback(){
zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE); zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE);
//send data //send data
zmq_send(zmqsocket, buffer, oneframesize, 0); zmq_send(zmqsocket, buffer, oneframesize, 0);
cout<<"sent last dummy"<<endl;
newFrame = false; newFrame = false;
} }
@ -1769,9 +1768,9 @@ void UDPStandardImplementation::startDataCallback(){
//send final header //send final header
//update frame details //update frame details
//#ifdef DEBUG #ifdef DEBUG
cout << "sending dummy" << endl; cout << "sending dummy" << endl;
//#endif #endif
frameIndex = -9; frameIndex = -9;
acquisitionIndex = -9; acquisitionIndex = -9;
subframeIndex = -9; subframeIndex = -9;
@ -1779,14 +1778,13 @@ void UDPStandardImplementation::startDataCallback(){
zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE); zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE);
//send final data //send final data
zmq_send (zmqsocket, "end", 3, 0); zmq_send (zmqsocket, "end", 3, 0);
cout<<"dummy sent"<<endl;
pthread_mutex_lock(&statusMutex); pthread_mutex_lock(&statusMutex);
dataCallbackThreadsMask^=(1<<ithread); dataCallbackThreadsMask^=(1<<ithread);
pthread_mutex_unlock(&statusMutex); pthread_mutex_unlock(&statusMutex);
//#ifdef DEBUG #ifdef DEBUG
cprintf(GREEN,"Data Streaming %d: packets sent:%d\n",ithread,datapacketscaught); cprintf(GREEN,"Data Streaming %d: packets sent:%d\n",ithread,datapacketscaught);
//#endif #endif
continue; continue;
} }
@ -1813,10 +1811,8 @@ void UDPStandardImplementation::startDataCallback(){
subframeIndex = -1; subframeIndex = -1;
int len = sprintf(buf,jsonFmt,type,shape, acquisitionIndex, frameIndex, subframeIndex,completeFileName[ithread]); int len = sprintf(buf,jsonFmt,type,shape, acquisitionIndex, frameIndex, subframeIndex,completeFileName[ithread]);
zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE); zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE);
cout<<"sent header"<<endl;
//send data //send data
zmq_send(zmqsocket, latestData[ithread]+JFRAU_FILE_FRAME_HEADER_LENGTH, oneframesize, 0); zmq_send(zmqsocket, latestData[ithread]+JFRAU_FILE_FRAME_HEADER_LENGTH, oneframesize, 0);
cout<<"sent data"<<endl;
//start clock after sending //start clock after sending
if(!frameToGuiFrequency){ if(!frameToGuiFrequency){
randomSendNow = false; randomSendNow = false;