From d30a839eff76fcc25a584219c680f6248935826b Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 10 Oct 2017 16:54:50 +0200 Subject: [PATCH 1/4] file writer class should be created only if file write enabled, x coord fixed to reflect hardcoded values as detector does not send this value yet --- slsReceiverSoftware/include/DataProcessor.h | 3 ++ slsReceiverSoftware/src/DataProcessor.cpp | 48 +++++++++++++-------- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/slsReceiverSoftware/include/DataProcessor.h b/slsReceiverSoftware/include/DataProcessor.h index 0f20f23e1..668fdb2d4 100644 --- a/slsReceiverSoftware/include/DataProcessor.h +++ b/slsReceiverSoftware/include/DataProcessor.h @@ -311,6 +311,9 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject { /** timer beginning stamp for random streaming */ struct timespec timerBegin; + /** x coord hardcoded, as detector does not send them yet **/ + uint16_t xcoord; + //acquisition start diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index b3dbc0462..00038a193 100644 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -47,6 +47,7 @@ DataProcessor::DataProcessor(Fifo*& f, fileFormat* ftype, bool* fwenable, bool* streamingFrequency(freq), streamingTimerInMs(timer), currentFreqCount(0), + xcoord(0), acquisitionStartedFlag(false), measurementStartedFlag(false), firstAcquisitionIndex(0), @@ -208,7 +209,7 @@ int DataProcessor::SetThreadPriority(int priority) { void DataProcessor::SetFileFormat(const fileFormat f) { - if (file->GetFileType() != f) { + if (file && file->GetFileType() != f) { //remember the pointer values before they are destroyed int nd[MAX_DIMENSIONS];nd[0] = 0; nd[1] = 0; char* fname=0; char* fpath=0; uint64_t* findex=0; bool* frindexenable=0; @@ -228,30 +229,37 @@ void DataProcessor::SetupFileWriter(int* nd, char* fname, char* fpath, uint64_t* if (g) generalData = g; + // fix xcoord as detector is not providing it right now + xcoord = ((NumberofDataProcessors > (*nunits)) ? index : ((*dindex) * (*nunits)) + index); + if (file) delete file; - switch(*fileFormatType){ + if (*fileWriteEnable) { + switch(*fileFormatType){ #ifdef HDF5C - case HDF5: - file = new HDF5File(index, generalData->maxFramesPerFile, &generalData->packetsPerFrame, - nd, fname, fpath, findex, - frindexenable, owenable, - dindex, nunits, nf, dr, portno, - generalData->nPixelsX, generalData->nPixelsY); - break; + case HDF5: + file = new HDF5File(index, generalData->maxFramesPerFile, &generalData->packetsPerFrame, + nd, fname, fpath, findex, + frindexenable, owenable, + dindex, nunits, nf, dr, portno, + generalData->nPixelsX, generalData->nPixelsY); + break; #endif - default: - file = new BinaryFile(index, generalData->maxFramesPerFile, &generalData->packetsPerFrame, - nd, fname, fpath, findex, - frindexenable, owenable, - dindex, nunits, nf, dr, portno); - break; + default: + file = new BinaryFile(index, generalData->maxFramesPerFile, &generalData->packetsPerFrame, + nd, fname, fpath, findex, + frindexenable, owenable, + dindex, nunits, nf, dr, portno); + break; + } } } // only the first file int DataProcessor::CreateNewFile(bool en, uint64_t nf, uint64_t at, uint64_t st, uint64_t ap) { + if (file == NULL) + return FAIL; file->CloseAllFiles(); if (file->CreateMasterFile(en, generalData->imageSize, generalData->nPixelsX, generalData->nPixelsY, at, st, ap) == FAIL) @@ -268,7 +276,7 @@ void DataProcessor::CloseFiles() { } void DataProcessor::EndofAcquisition(uint64_t numf) { - if (*fileWriteEnable && file->GetFileType() == HDF5) { + if (file && file->GetFileType() == HDF5) { file->EndofAcquisition(numf); } } @@ -312,7 +320,8 @@ void DataProcessor::StopProcessing(char* buf) { else fifo->FreeAddress(buf); - file->CloseCurrentFile(); + if (file) + file->CloseCurrentFile(); StopRunning(); #ifdef VERBOSE FILE_LOG(logINFO) << index << ": Processing Completed"; @@ -355,7 +364,10 @@ void DataProcessor::ProcessAnImage(char* buf) { } - if (*fileWriteEnable) + // fix x coord that is currently not provided by detector + header->xCoord = xcoord; + + if (file) file->WriteToFile(buf, generalData->imageSize + sizeof(sls_detector_header), fnum-firstMeasurementIndex, nump); if (rawDataReadyCallBack) { From 75b94e661422f47387236806110c032028b6aced Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 18 Oct 2017 12:29:46 +0200 Subject: [PATCH 2/4] fixed file write enable bug from the last patch --- slsReceiverSoftware/include/DataProcessor.h | 9 +++++---- .../include/UDPStandardImplementation.h | 6 ++++++ slsReceiverSoftware/src/DataProcessor.cpp | 17 +++++++++-------- .../src/UDPStandardImplementation.cpp | 19 +++++++++++++++++-- 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/slsReceiverSoftware/include/DataProcessor.h b/slsReceiverSoftware/include/DataProcessor.h index 668fdb2d4..b3ba0fabd 100644 --- a/slsReceiverSoftware/include/DataProcessor.h +++ b/slsReceiverSoftware/include/DataProcessor.h @@ -26,14 +26,14 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject { * Calls Base Class CreateThread(), sets ErrorMask if error and increments NumberofDataProcessors * @param f address of Fifo pointer * @param ftype pointer to file format type - * @param fwenable pointer to file writer enable + * @param fwenable file writer enable * @param dsEnable pointer to data stream enable * @param freq pointer to streaming frequency * @param timer pointer to timer if streaming frequency is random * @param dataReadycb pointer to data ready call back function * @param pDataReadycb pointer to arguments of data ready call back function */ - DataProcessor(Fifo*& f, fileFormat* ftype, bool* fwenable, bool* dsEnable, + DataProcessor(Fifo*& f, fileFormat* ftype, bool fwenable, bool* dsEnable, uint32_t* freq, uint32_t* timer, void (*dataReadycb)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, char*, uint32_t, void*), @@ -156,6 +156,7 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject { /** * Set up file writer object and call backs + * @param fwe file write enable * @param nd pointer to number of detectors in each dimension * @param fname pointer to file name prefix * @param fpath pointer to file path @@ -169,7 +170,7 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject { * @param portno pointer to udp port number * @param g address of GeneralData (Detector Data) pointer */ - void SetupFileWriter(int* nd, char* fname, char* fpath, uint64_t* findex, + void SetupFileWriter(bool fwe, int* nd, char* fname, char* fpath, uint64_t* findex, bool* frindexenable, bool* owenable, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno, GeneralData* g = 0); @@ -297,7 +298,7 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject { fileFormat* fileFormatType; /** File Write Enable */ - bool* fileWriteEnable; + bool fileWriteEnable; /** Pointer to Streaming frequency, if 0, sending random images with a timer */ uint32_t* streamingFrequency; diff --git a/slsReceiverSoftware/include/UDPStandardImplementation.h b/slsReceiverSoftware/include/UDPStandardImplementation.h index 9f6fc73e2..86ffbf07c 100644 --- a/slsReceiverSoftware/include/UDPStandardImplementation.h +++ b/slsReceiverSoftware/include/UDPStandardImplementation.h @@ -59,6 +59,12 @@ class UDPStandardImplementation: private virtual slsReceiverDefs, public UDPBase */ void setFileFormat(slsReceiverDefs::fileFormat f); + /** + * Set File Write Enable + * @param b true for file write enable, else false + */ + void setFileWriteEnable(const bool b); + /** * Set Short Frame Enabled, later will be moved to getROI (so far only for gotthard) * @param i index of adc enabled, else -1 if all enabled diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index 00038a193..88c68e171 100644 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -31,7 +31,7 @@ uint64_t DataProcessor::RunningMask(0x0); pthread_mutex_t DataProcessor::Mutex = PTHREAD_MUTEX_INITIALIZER; -DataProcessor::DataProcessor(Fifo*& f, fileFormat* ftype, bool* fwenable, bool* dsEnable, +DataProcessor::DataProcessor(Fifo*& f, fileFormat* ftype, bool fwenable, bool* dsEnable, uint32_t* freq, uint32_t* timer, void (*dataReadycb)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, char*, uint32_t, void*), @@ -216,26 +216,27 @@ void DataProcessor::SetFileFormat(const fileFormat f) { bool* owenable=0; int* dindex=0; int* nunits=0; uint64_t* nf = 0; uint32_t* dr = 0; uint32_t* port = 0; file->GetMemberPointerValues(nd, fname, fpath, findex, frindexenable, owenable, dindex, nunits, nf, dr, port); //create file writer with same pointers - SetupFileWriter(nd, fname, fpath, findex, frindexenable, owenable, dindex, nunits, nf, dr, port); + SetupFileWriter(fileWriteEnable, nd, fname, fpath, findex, frindexenable, owenable, dindex, nunits, nf, dr, port); } } - -void DataProcessor::SetupFileWriter(int* nd, char* fname, char* fpath, uint64_t* findex, +void DataProcessor::SetupFileWriter(bool fwe, int* nd, char* fname, char* fpath, uint64_t* findex, bool* frindexenable, bool* owenable, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno, GeneralData* g) { + fileWriteEnable = fwe; if (g) generalData = g; - // fix xcoord as detector is not providing it right now xcoord = ((NumberofDataProcessors > (*nunits)) ? index : ((*dindex) * (*nunits)) + index); - if (file) - delete file; - if (*fileWriteEnable) { + if (file) { + delete file; file = 0; + } + + if (fileWriteEnable) { switch(*fileFormatType){ #ifdef HDF5C case HDF5: diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp index 759dea8e9..eac50649c 100644 --- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp +++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp @@ -129,6 +129,21 @@ void UDPStandardImplementation::setFileFormat(const fileFormat f){ } +void UDPStandardImplementation::setFileWriteEnable(const bool b){ + + if (fileWriteEnable != b){ + fileWriteEnable = b; + for (unsigned int i = 0; i < dataProcessor.size(); ++i) { + dataProcessor[i]->SetupFileWriter(fileWriteEnable, (int*)numDet, fileName, filePath, &fileIndex, &frameIndexEnable, + &overwriteEnable, &detID, &numThreads, &numberOfFrames, &dynamicRange, &udpPortNum[i], generalData); + } + } + + FILE_LOG(logINFO) << "File Write Enable: " << stringEnable(fileWriteEnable); +} + + + int UDPStandardImplementation::setShortFrameEnable(const int i) { if (myDetectorType != GOTTHARD) { @@ -315,7 +330,7 @@ int UDPStandardImplementation::setDetectorType(const detectorType d) { for ( int i=0; i < numThreads; ++i ) { listener.push_back(new Listener(myDetectorType, fifo[i], &status, &udpPortNum[i], eth, &activated, &numberOfFrames, &dynamicRange)); dataProcessor.push_back(new DataProcessor(fifo[i], &fileFormatType, - &fileWriteEnable, &dataStreamEnable, &frameToGuiFrequency, &frameToGuiTimerinMS, + fileWriteEnable, &dataStreamEnable, &frameToGuiFrequency, &frameToGuiTimerinMS, rawDataReadyCallBack,pRawDataReady)); if (Listener::GetErrorMask() || DataProcessor::GetErrorMask()) { FILE_LOG (logERROR) << "Error: Could not creates listener/dataprocessor threads (index:" << i << ")"; @@ -350,7 +365,7 @@ void UDPStandardImplementation::setDetectorPositionId(const int i){ detID = i; FILE_LOG(logINFO) << "Detector Position Id:" << detID; for (unsigned int i = 0; i < dataProcessor.size(); ++i) { - dataProcessor[i]->SetupFileWriter((int*)numDet, fileName, filePath, &fileIndex, &frameIndexEnable, + dataProcessor[i]->SetupFileWriter( fileWriteEnable, (int*)numDet, fileName, filePath, &fileIndex, &frameIndexEnable, &overwriteEnable, &detID, &numThreads, &numberOfFrames, &dynamicRange, &udpPortNum[i], generalData); } } From 5388b54eff7a086e336db416144793c0bed1d87f Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 18 Oct 2017 15:52:08 +0200 Subject: [PATCH 3/4] updaterev --- slsReceiverSoftware/gitInfo.txt | 10 +++++----- slsReceiverSoftware/include/gitInfoReceiver.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index d7fa274b9..5330a7f88 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git -Repsitory UUID: 253d74aaf3dfa161c067b00907c52001815f5bfe -Revision: 655 -Branch: 3.0 +Repsitory UUID: 820bd8c6a08b5ac05dc6e28e6cfd5674f07d57f7 +Revision: 658 +Branch: hotfix2 Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 660 -Last Changed Date: 2017-09-01 13:56:44.000000002 +0200 ./include/ZmqSocket.h +Last Changed Rev: 663 +Last Changed Date: 2017-10-18 15:51:33.000000002 +0200 ./src/UDPStandardImplementation.cpp diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 4f3fe1623..0f9304146 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "253d74aaf3dfa161c067b00907c52001815f5bfe" -//#define SVNREV 0x660 +#define SVNREPUUID "820bd8c6a08b5ac05dc6e28e6cfd5674f07d57f7" +//#define SVNREV 0x663 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x660 -#define SVNDATE 0x20170901 +#define SVNREV 0x663 +#define SVNDATE 0x20171018 // From 801817b749e4916049e28993ea3e3e70aaacca33 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 19 Oct 2017 14:41:12 +0200 Subject: [PATCH 4/4] bug fix to the merge --- slsReceiverSoftware/src/UDPStandardImplementation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp index 29552e217..93dc34b45 100644 --- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp +++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp @@ -384,7 +384,7 @@ void UDPStandardImplementation::setDetectorPositionId(const int i){ detID = i; FILE_LOG(logINFO) << "Detector Position Id:" << detID; for (unsigned int i = 0; i < dataProcessor.size(); ++i) { - dataProcessor[i]->SetupFileWriter(fileWriteEnable(int*)numDet, fileName, filePath, &fileIndex, + dataProcessor[i]->SetupFileWriter(fileWriteEnable, (int*)numDet, fileName, filePath, &fileIndex, &overwriteEnable, &detID, &numThreads, &numberOfFrames, &dynamicRange, &udpPortNum[i], generalData); } }