From d751c626b38e58a909c7f1ea5887f7de8ddc3f49 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 20 Sep 2016 10:42:43 +0200 Subject: [PATCH] done with eiger --- .../multiSlsDetector/multiSlsDetector.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index faad273d3..bdb813614 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -5040,10 +5040,12 @@ void multiSlsDetector::startReceivingData(){ currentFrameIndex = d["fIndex"].GetInt(); currentSubFrameIndex = d["subfnum"].GetInt(); strcpy(currentFileName ,d["fname"].GetString()); - cout << ithread << "Acquisition index: " << currentAcquisitionIndex << endl; - cout << ithread << "Frame index: " << currentFrameIndex << endl; - cout << ithread << "Subframe index: " << currentSubFrameIndex << endl; - cout << ithread << "File name: " << currentFileName << endl; +#ifdef VERYVERBOSE + cout << "Acquisition index: " << currentAcquisitionIndex << endl; + cout << "Frame index: " << currentFrameIndex << endl; + cout << "Subframe index: " << currentSubFrameIndex << endl; + cout << "File name: " << currentFileName << endl; +#endif } // close the message zmq_msg_close(&message); @@ -5056,7 +5058,9 @@ void multiSlsDetector::startReceivingData(){ //end of socket ("end") if (len < 1024*256 ) { if(!len) cprintf(RED,"Received no data in socket for %d\n", ithread); +#ifdef VERYVERBOSE cprintf(RED,"End of socket for %d\n", ithread); +#endif zmq_msg_close(&message); singleframe[ithread] = NULL; pthread_mutex_lock(&ms); @@ -5158,7 +5162,7 @@ void multiSlsDetector::readFrameFromReceiver(){ //construct complete image and send to callback 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 for(int ireadout=0; ireadout