diff --git a/slsReceiverSoftware/src/UDPBaseImplementation.cpp b/slsReceiverSoftware/src/UDPBaseImplementation.cpp index de09ae694..1c6b1a976 100644 --- a/slsReceiverSoftware/src/UDPBaseImplementation.cpp +++ b/slsReceiverSoftware/src/UDPBaseImplementation.cpp @@ -203,7 +203,9 @@ inline char* UDPBaseImplementation::setFilePath(const char c[]){ FILE_LOG(logDEB } } FILE_LOG(logDEBUG) << __AT__ << getFilePath(); +#ifdef VERBOSE cout << getFilePath() << " " << filePath << endl; +#endif return getFilePath(); } diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp index 145ad5ca0..29843ff94 100644 --- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp +++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp @@ -866,7 +866,7 @@ void UDPStandardImplementation::readFrame(char* c,char** raw, uint32_t &fnum, ui //point to gui data if (guiData == NULL){ guiData = latestData; - cout <<"gui data not null anymore" << endl; + //cout <<"gui data not null anymore" << endl; } //copy data and filename @@ -875,22 +875,26 @@ void UDPStandardImplementation::readFrame(char* c,char** raw, uint32_t &fnum, ui fstartind = getStartFrameIndex(); //could not get gui data - if(!guiDataReady){cout<<"gui data not ready"< DO_NOTHING){ @@ -1645,7 +1653,7 @@ int UDPStandardImplementation::startListening(){ /* if(!ithread){*/ rc = udpSocket[ithread]->ReceiveDataOnly(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS, maxBufferSize); - cout<<"value:"<fnum)<fnum)<pop(wbuf[i]); numpackets = (uint16_t)(*((uint16_t*)wbuf[i])); //#ifdef VERYDEBUG @@ -1855,11 +1863,11 @@ int loop; //#endif } -//#ifdef VERYDEBUG +#ifdef VERYDEBUG cout << ithread << " numpackets:" << dec << numpackets << endl; cout << ithread << " *** writer popped from fifo " << (void*) wbuf[0]<< endl; cout << ithread << " *** writer popped from fifo " << (void*) wbuf[1]<< endl; -//#endif +#endif //last dummy packet @@ -1910,8 +1918,10 @@ int loop; } - if(myDetectorType == EIGER) {cout<<"gonna copy frame"<push(wbuf[i])); #ifdef VERYDEBUG @@ -2080,9 +2090,9 @@ int i; cout << ithread << " going to push in dummy buffer:" << (void*)buffer[ithread] << " with num packets:"<< (*((uint16_t*)(buffer[ithread]))) << endl; #endif while(!fifo[ithread]->push(buffer[ithread])); -//#ifdef VERYDEBUG +#ifdef VERYDEBUG cout << ithread << " pushed in dummy buffer:" << (void*)buffer[ithread] << endl; -//#endif +#endif } //reset mask and exit loop @@ -2128,9 +2138,9 @@ void UDPStandardImplementation::stopWriting(int ithread, char* wbuffer[]){ FILE_LOG(logDEBUG) << __AT__ << " called"; int i,j; -//#ifdef VERYDEBUG +#ifdef VERYDEBUG cout << ithread << " **********************popped last dummy frame:" << (void*)wbuffer[0] << endl; -//#endif +#endif //free fifo for(i=0;i