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

moving subframenumber into a 32 bit number

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-02-28 15:29:53 +01:00
parent 2024eb5d6e
commit fa6d18e9b2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5174,7 +5174,7 @@ int multiSlsDetector::createReceivingDataSockets(const bool destroy){
int multiSlsDetector::getData(const int isocket, const bool masking, int* image, const int size, 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)) if (!zmqSocket[isocket]->ReceiveHeader(isocket, acqIndex, frameIndex, subframeIndex, filename))
return FAIL; return FAIL;
@ -5220,7 +5220,7 @@ void multiSlsDetector::readFrameFromReceiver(){
//gui variables //gui variables
uint64_t currentAcquisitionIndex = -1; uint64_t currentAcquisitionIndex = -1;
uint64_t currentFrameIndex = -1; uint64_t currentFrameIndex = -1;
uint64_t currentSubFrameIndex = -1; uint32_t currentSubFrameIndex = -1;
string currentFileName = ""; string currentFileName = "";
//getting sls values //getting sls values

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1440,7 +1440,7 @@ private:
* @param filename address of file name * @param filename address of file name
*/ */
int getData(const int isocket, const bool masking, int* image, const int size, 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 */ /** Ensures if sockets created successfully */
bool dataSocketsStarted; bool dataSocketsStarted;