From 8bba57e77d9a5aea799a4532018cdd5b2aa69ef1 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 28 Nov 2017 16:32:15 +0100 Subject: [PATCH] fix to not have sls_receiver_defs in zmqSocket.h incldue --- slsReceiverSoftware/include/ZmqSocket.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slsReceiverSoftware/include/ZmqSocket.h b/slsReceiverSoftware/include/ZmqSocket.h index 8eb0d80d0..b16dc21b7 100644 --- a/slsReceiverSoftware/include/ZmqSocket.h +++ b/slsReceiverSoftware/include/ZmqSocket.h @@ -21,6 +21,8 @@ using namespace rapidjson; +#define MAX_STR_LENGTH 1000 + //#define ZMQ_DETAIL class ZmqSocket { @@ -484,9 +486,7 @@ public: acqIndex = d["acqIndex"].GetUint64(); frameIndex = d["fIndex"].GetUint64(); fileIndex = d["fileIndex"].GetUint64(); - if(d["bitmode"].GetUint()==32 && d["detType"].GetUint() == slsReceiverDefs::EIGER) { - subframeIndex = d["expLength"].GetUint(); - } + subframeIndex = d["expLength"].GetUint(); filename = d["fname"].GetString(); } #ifdef VERYVERBOSE