From f5feb081ab6dec73a8cc665b4a15a7479c98cd2d Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 25 Apr 2019 19:20:13 +0200 Subject: [PATCH] removing header metadata for ctb binary files --- slsReceiverSoftware/include/BinaryFile.h | 6 ++- .../include/BinaryFileStatic.h | 41 ++++++++++------- slsReceiverSoftware/include/GeneralData.h | 8 +++- slsReceiverSoftware/src/BinaryFile.cpp | 46 ++++++++++++------- slsReceiverSoftware/src/DataProcessor.cpp | 2 +- 5 files changed, 67 insertions(+), 36 deletions(-) diff --git a/slsReceiverSoftware/include/BinaryFile.h b/slsReceiverSoftware/include/BinaryFile.h index 8d9324df7..5ff32d86b 100755 --- a/slsReceiverSoftware/include/BinaryFile.h +++ b/slsReceiverSoftware/include/BinaryFile.h @@ -33,11 +33,12 @@ class BinaryFile : private virtual slsDetectorDefs, public File, public BinaryFi * @param dr pointer to dynamic range * @param portno pointer to udp port number for logging * @param smode pointer to silent mode + * @param hwenable header writer enable (ctb) */ BinaryFile(int ind, uint32_t* maxf, int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno, - bool* smode); + bool* smode, bool hwenable); /** * Destructor @@ -116,5 +117,8 @@ class BinaryFile : private virtual slsDetectorDefs, public File, public BinaryFi /** Number of actual packets caught in file */ uint64_t numActualPacketsInFile; + /** Header writer enable */ + bool headerWriteEnable; + }; diff --git a/slsReceiverSoftware/include/BinaryFileStatic.h b/slsReceiverSoftware/include/BinaryFileStatic.h index b528f8d73..2b67d7bfc 100755 --- a/slsReceiverSoftware/include/BinaryFileStatic.h +++ b/slsReceiverSoftware/include/BinaryFileStatic.h @@ -100,6 +100,7 @@ class BinaryFileStatic { * @param fd pointer to file handle * @param fname master file name * @param owenable overwrite enable + * @param hwenable header write enable * @param dr dynamic range * @param tenE ten giga enable * @param size image size @@ -114,7 +115,7 @@ class BinaryFileStatic { * @param version version of software for binary writing * @returns 0 for success and 1 for fail */ - static int CreateMasterDataFile(FILE*& fd, std::string fname, bool owenable, + static int CreateMasterDataFile(FILE*& fd, std::string fname, bool owenable, bool hwenable, uint32_t dr, bool tenE, uint32_t size, uint32_t nPixelsX, uint32_t nPixelsY, uint64_t nf, uint32_t maxf, @@ -135,6 +136,24 @@ class BinaryFileStatic { return 1; } time_t t = time(0); + char header[MAX_STR_LENGTH]; + strcpy(header, + "#Frame Header\n" + "Frame Number : 8 bytes\n" + "SubFrame Number/ExpLength : 4 bytes\n" + "Packet Number : 4 bytes\n" + "Bunch ID : 8 bytes\n" + "Timestamp : 8 bytes\n" + "Module Id : 2 bytes\n" + "Row : 2 bytes\n" + "Column : 2 bytes\n" + "Reserved : 2 bytes\n" + "Debug : 4 bytes\n" + "Round Robin Number : 2 bytes\n" + "Detector Type : 1 byte\n" + "Header Version : 1 byte\n" + "Packets Caught Mask : 64 bytes\n"); + char message[MAX_MASTER_FILE_LENGTH]; sprintf(message, "Version : %.1f\n" @@ -151,21 +170,7 @@ class BinaryFileStatic { "Period (ns) : %lld\n" "Timestamp : %s\n\n" - "#Frame Header\n" - "Frame Number : 8 bytes\n" - "SubFrame Number/ExpLength : 4 bytes\n" - "Packet Number : 4 bytes\n" - "Bunch ID : 8 bytes\n" - "Timestamp : 8 bytes\n" - "Module Id : 2 bytes\n" - "Row : 2 bytes\n" - "Column : 2 bytes\n" - "Reserved : 2 bytes\n" - "Debug : 4 bytes\n" - "Round Robin Number : 2 bytes\n" - "Detector Type : 1 byte\n" - "Header Version : 1 byte\n" - "Packets Caught Mask : 64 bytes\n" + "%s" , version, dr, @@ -179,7 +184,9 @@ class BinaryFileStatic { (long long int)subexposuretime, (long long int)subperiod, (long long int)acquisitionPeriod, - ctime(&t)); + ctime(&t), + (hwenable ? header : "") + ); if (strlen(message) > MAX_MASTER_FILE_LENGTH) { FILE_LOG(logERROR) << "Master File Size " << strlen(message) << " is greater than max str size " << MAX_MASTER_FILE_LENGTH; diff --git a/slsReceiverSoftware/include/GeneralData.h b/slsReceiverSoftware/include/GeneralData.h index a6513bae8..bafb9928c 100755 --- a/slsReceiverSoftware/include/GeneralData.h +++ b/slsReceiverSoftware/include/GeneralData.h @@ -87,6 +87,9 @@ public: /** default udp socket buffer size */ uint32_t defaultUdpSocketBufferSize; + /** header write enable */ + bool headerWriteEnable; + @@ -114,7 +117,8 @@ public: nPixelsYComplete(0), imageSizeComplete(0), standardheader(false), - defaultUdpSocketBufferSize(RECEIVE_SOCKET_BUFFER_SIZE) + defaultUdpSocketBufferSize(RECEIVE_SOCKET_BUFFER_SIZE), + headerWriteEnable(true) {}; /** Destructor */ @@ -253,6 +257,7 @@ public: FILE_LOG(level) << "Complete Image Size: " << imageSizeComplete; FILE_LOG(level) << "Standard Header: " << standardheader; FILE_LOG(level) << "UDP Socket Buffer Size: " << defaultUdpSocketBufferSize; + FILE_LOG(level) << "Header Write Enable: " << headerWriteEnable; }; }; @@ -576,6 +581,7 @@ public: fifoBufferHeaderSize= FIFO_HEADER_NUMBYTES + sizeof(slsDetectorDefs::sls_receiver_header); defaultFifoDepth = 2500; standardheader = true; + headerWriteEnable = false; }; /** diff --git a/slsReceiverSoftware/src/BinaryFile.cpp b/slsReceiverSoftware/src/BinaryFile.cpp index 12ba62a03..2f86ca12b 100755 --- a/slsReceiverSoftware/src/BinaryFile.cpp +++ b/slsReceiverSoftware/src/BinaryFile.cpp @@ -16,11 +16,12 @@ FILE* BinaryFile::masterfd = nullptr; BinaryFile::BinaryFile(int ind, uint32_t* maxf, int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno, - bool* smode): + bool* smode, bool hwenable): File(ind, maxf, nd, fname, fpath, findex, owenable, dindex, nunits, nf, dr, portno, smode), filefd(nullptr), numFramesInFile(0), - numActualPacketsInFile(0) + numActualPacketsInFile(0), + headerWriteEnable(hwenable) { #ifdef VERBOSE PrintMembers(); @@ -79,6 +80,11 @@ int BinaryFile::WriteToFile(char* buffer, int buffersize, uint64_t fnum, uint32_ // write to file int ret = 0; + // remove header for ctb + if (!headerWriteEnable) { + buffersize -= sizeof(sls_receiver_header); + buffer += sizeof(sls_receiver_header); + } // contiguous bitset if (sizeof(sls_bitset) == sizeof(bitset_storage)) { @@ -87,21 +93,29 @@ int BinaryFile::WriteToFile(char* buffer, int buffersize, uint64_t fnum, uint32_ // not contiguous bitset else { - // write detector header - ret = BinaryFileStatic::WriteDataFile(filefd, buffer, sizeof(sls_detector_header)); - // get contiguous representation of bit mask - bitset_storage storage; - memset(storage, 0 , sizeof(bitset_storage)); - sls_bitset bits = *(sls_bitset*)(buffer + sizeof(sls_detector_header)); - for (int i = 0; i < MAX_NUM_PACKETS; ++i) - storage[i >> 3] |= (bits[i] << (i & 7)); - // write bitmask - ret += BinaryFileStatic::WriteDataFile(filefd, (char*)storage, sizeof(bitset_storage)); + if (headerWriteEnable) { + // write detector header + ret = BinaryFileStatic::WriteDataFile(filefd, buffer, sizeof(sls_detector_header)); + + // get contiguous representation of bit mask + bitset_storage storage; + memset(storage, 0 , sizeof(bitset_storage)); + sls_bitset bits = *(sls_bitset*)(buffer + sizeof(sls_detector_header)); + for (int i = 0; i < MAX_NUM_PACKETS; ++i) + storage[i >> 3] |= (bits[i] << (i & 7)); + // write bitmask + ret += BinaryFileStatic::WriteDataFile(filefd, (char*)storage, sizeof(bitset_storage)); - // write data - ret += BinaryFileStatic::WriteDataFile(filefd, - buffer + sizeof(sls_detector_header), buffersize - sizeof(sls_receiver_header)); + // write data + ret += BinaryFileStatic::WriteDataFile(filefd, + buffer + sizeof(sls_detector_header), buffersize - sizeof(sls_receiver_header)); + } + + else { + // write only data + ret += BinaryFileStatic::WriteDataFile(filefd, buffer, buffersize); + } } // if write error @@ -127,7 +141,7 @@ int BinaryFile::CreateMasterFile(bool en, uint32_t size, FILE_LOG(logINFO) << "Master File: " << masterFileName; } return BinaryFileStatic::CreateMasterDataFile(masterfd, masterFileName, - *overWriteEnable, + *overWriteEnable, headerWriteEnable, *dynamicRange, en, size, nx, ny, *numImages, *maxFramesPerFile, at, st, sp, ap, BINARY_WRITER_VERSION); } diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index a39865bd6..3e1217ad2 100755 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -235,7 +235,7 @@ void DataProcessor::SetupFileWriter(bool fwe, int* nd, uint32_t* maxf, default: file = new BinaryFile(index, maxf, nd, fname, fpath, findex, owenable, - dindex, nunits, nf, dr, portno, silentMode); + dindex, nunits, nf, dr, portno, silentMode, generalData->headerWriteEnable); break; } }