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

using file index from zmq

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-28 14:45:48 +01:00
parent a89847538d
commit 8388d1f503
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
slsReceiverSoftware/include/ZmqSocket.h
View File

@ -375,10 +375,11 @@ public:
* @param frameIndex address of frame index * @param frameIndex address of frame index
* @param subframeIndex address of subframe index * @param subframeIndex address of subframe index
* @param filename address of file name * @param filename address of file name
* @param fileindex address of file index
* @returns 0 if error or end of acquisition, else 1 * @returns 0 if error or end of acquisition, else 1
*/ */
int ReceiveHeader(const int index, uint64_t &acqIndex, int ReceiveHeader(const int index, uint64_t &acqIndex,
uint64_t &frameIndex, uint32_t &subframeIndex, std::string &filename) uint64_t &frameIndex, uint32_t &subframeIndex, std::string &filename, uint64_t &fileIndex)
{ {
zmq_msg_t message; zmq_msg_t message;
zmq_msg_init (&message); zmq_msg_init (&message);
@ -388,7 +389,7 @@ public:
#ifdef ZMQ_DETAIL #ifdef ZMQ_DETAIL
cprintf( BLUE,"Header %d [%d] Length: %d Header:%s \n", index, portno, len, (char*) zmq_msg_data (&message) ); cprintf( BLUE,"Header %d [%d] Length: %d Header:%s \n", index, portno, len, (char*) zmq_msg_data (&message) );
#endif #endif
if ( ParseHeader (index, len, message, acqIndex, frameIndex, subframeIndex, filename, dummy)) { if ( ParseHeader (index, len, message, acqIndex, frameIndex, subframeIndex, filename, fileIndex, dummy)) {
#ifdef ZMQ_DETAIL #ifdef ZMQ_DETAIL
cprintf( RED,"Parsed Header %d [%d] Length: %d Header:%s \n", index, portno, len, (char*) zmq_msg_data (&message) ); cprintf( RED,"Parsed Header %d [%d] Length: %d Header:%s \n", index, portno, len, (char*) zmq_msg_data (&message) );
#endif #endif
@ -450,16 +451,18 @@ public:
* @param frameIndex address of frame index * @param frameIndex address of frame index
* @param subframeIndex address of subframe index * @param subframeIndex address of subframe index
* @param filename address of file name * @param filename address of file name
* @param fileindex address of file index
* @param dummy true if end of acquisition else false * @param dummy true if end of acquisition else false
* @returns true if successfull else false * @returns true if successfull else false
*/ */
int ParseHeader(const int index, int length, zmq_msg_t& message, uint64_t &acqIndex, int ParseHeader(const int index, int length, zmq_msg_t& message, uint64_t &acqIndex,
uint64_t &frameIndex, uint32_t &subframeIndex, std::string &filename, bool& dummy) uint64_t &frameIndex, uint32_t &subframeIndex, std::string &filename, uint64_t &fileIndex, bool& dummy)
{ {
acqIndex = -1; acqIndex = -1;
frameIndex = -1; frameIndex = -1;
subframeIndex = -1; subframeIndex = -1;
fileIndex = -1;
dummy = true; dummy = true;
Document d; Document d;
@ -480,6 +483,7 @@ public:
if (!dummy) { if (!dummy) {
acqIndex = d["acqIndex"].GetUint64(); acqIndex = d["acqIndex"].GetUint64();
frameIndex = d["fIndex"].GetUint64(); frameIndex = d["fIndex"].GetUint64();
fileIndex = d["fileIndex"].GetUint64();
if(d["bitmode"].GetUint()==32 && d["detType"].GetUint() == slsReceiverDefs::EIGER) { if(d["bitmode"].GetUint()==32 && d["detType"].GetUint() == slsReceiverDefs::EIGER) {
subframeIndex = d["expLength"].GetUint(); subframeIndex = d["expLength"].GetUint();
} }
@ -490,9 +494,10 @@ public:
"\tAcqIndex:%lu\n" "\tAcqIndex:%lu\n"
"\tFrameIndex:%lu\n" "\tFrameIndex:%lu\n"
"\tSubIndex:%u\n" "\tSubIndex:%u\n"
"\tFileIndex:%lu\n"
"\tBitMode:%u\n" "\tBitMode:%u\n"
"\tDetType:%u\n", "\tDetType:%u\n",
index, (int)dummy, acqIndex, frameIndex, subframeIndex, index, (int)dummy, acqIndex, frameIndex, subframeIndex, fileIndex,
d["bitmode"].GetUint(),d["detType"].GetUint()); d["bitmode"].GetUint(),d["detType"].GetUint());
#endif #endif
return 1; return 1;