From fa6d18e9b2bbb2e2e5e6971eb966234b433f6255 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Tue, 28 Feb 2017 15:29:53 +0100
Subject: [PATCH] moving subframenumber into a 32 bit number

---
 slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 4 ++--
 slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 671a037f6..de97a2cea 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -5174,7 +5174,7 @@ int multiSlsDetector::createReceivingDataSockets(const bool destroy){
 
 
 int multiSlsDetector::getData(const int isocket, const bool masking, int* image, const int size,
-		uint64_t &acqIndex, uint64_t &frameIndex, uint64_t &subframeIndex, string &filename){
+		uint64_t &acqIndex, uint64_t &frameIndex, uint32_t &subframeIndex, string &filename){
 
 	if (!zmqSocket[isocket]->ReceiveHeader(isocket, acqIndex, frameIndex, subframeIndex, filename))
 		return FAIL;
@@ -5220,7 +5220,7 @@ void multiSlsDetector::readFrameFromReceiver(){
 	//gui variables
 	uint64_t currentAcquisitionIndex = -1;
 	uint64_t currentFrameIndex = -1;
-	uint64_t currentSubFrameIndex = -1;
+	uint32_t currentSubFrameIndex = -1;
 	string currentFileName = "";
 
 	//getting sls values
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
index 704f256f1..c8a0e8664 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
@@ -1440,7 +1440,7 @@ private:
 	 * @param filename address of file name
 	 */
 	int getData(const int isocket, const bool masking, int* image, const int size,
-			uint64_t &acqIndex, uint64_t &frameIndex, uint64_t &subframeIndex, string &filename);
+			uint64_t &acqIndex, uint64_t &frameIndex, uint32_t &subframeIndex, string &filename);
 
 	/** Ensures if sockets created successfully */
 	bool dataSocketsStarted;