detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 12:27:14 +02:00
Code Issues Actions Packages Releases Activity

fixed gui for new header

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-03-20 09:27:38 +01:00
parent dc77b07c92
commit 4b388f56b2
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5162,12 +5162,13 @@ int multiSlsDetector::createReceivingDataSockets(const bool destroy){
int multiSlsDetector::getData(const int isocket, const bool masking, int* image, const int size, int &acqIndex, int &frameIndex, int &subframeIndex, string &filename){ int multiSlsDetector::getData(const int isocket, const bool masking, int* image, const int size, uint64_t &acqIndex, uint64_t &frameIndex, uint32_t &subframeIndex, string &filename){
zmq_msg_t message; zmq_msg_t message;
//scan header------------------------------------------------------------------- //scan header-------------------------------------------------------------------
zmq_msg_init (&message); zmq_msg_init (&message);
//cprintf(BLUE,"%d going to receive message\n", isocket);
int len = zmq_msg_recv(&message, zmqsocket[isocket], 0); int len = zmq_msg_recv(&message, zmqsocket[isocket], 0);
if (len == -1) { if (len == -1) {
cprintf(BG_RED,"Could not read header for socket %d\n",isocket); cprintf(BG_RED,"Could not read header for socket %d\n",isocket);
@ -5178,7 +5179,7 @@ int multiSlsDetector::getData(const int isocket, const bool masking, int* image,
// error if you print it // error if you print it
// cout << isocket << " header len:"<<len<<" value:"<< (char*)zmq_msg_data(&message)<<endl; // cprintf(BLUE,"%d header len:%d value:%s\n",isocket, len, (char*)zmq_msg_data(&message));
//cprintf(BLUE,"%d header %d\n",isocket,len); //cprintf(BLUE,"%d header %d\n",isocket,len);
rapidjson::Document d; rapidjson::Document d;
d.Parse( (char*)zmq_msg_data(&message), zmq_msg_size(&message)); d.Parse( (char*)zmq_msg_data(&message), zmq_msg_size(&message));
@ -5197,10 +5198,14 @@ int multiSlsDetector::getData(const int isocket, const bool masking, int* image,
cout << isocket << "type: " << d["type"].GetString() << endl; cout << isocket << "type: " << d["type"].GetString() << endl;
#endif #endif
if(d["acqIndex"].GetInt()!=-9){ //!isocket && if(d["acqIndex"].GetUint64()!=-1){ //!isocket &&
acqIndex = d["acqIndex"].GetInt(); acqIndex = d["acqIndex"].GetUint64();
frameIndex = d["fIndex"].GetInt(); frameIndex = d["fIndex"].GetUint64();
subframeIndex = d["subfnum"].GetInt(); subframeIndex = -1;
if(d["bitmode"].GetInt()==32 && d["detType"].GetUint()== EIGER) {
cprintf(BLUE,"eiger 32 bitmode\n");
subframeIndex = d["expLength"].GetUint();
}
filename = d["fname"].GetString(); filename = d["fname"].GetString();
#ifdef VERYVERBOSE #ifdef VERYVERBOSE
cout << "Acquisition index: " << acqIndex << endl; cout << "Acquisition index: " << acqIndex << endl;
@ -5275,9 +5280,9 @@ void multiSlsDetector::readFrameFromReceiver(){
} }
//gui variables //gui variables
int currentAcquisitionIndex = -1; uint64_t currentAcquisitionIndex = -1;
int currentFrameIndex = -1; uint64_t currentFrameIndex = -1;
int currentSubFrameIndex = -1; uint32_t currentSubFrameIndex = -1;
string currentFileName = ""; string currentFileName = "";
//getting sls values //getting sls values

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1410,7 +1410,7 @@ private:
/** /**
* Gets data from socket * Gets data from socket
*/ */
int getData(const int isocket, const bool masking, int* image, const int size, int &acqIndex, int &frameIndex, int &subframeIndex, string &filename); int getData(const int isocket, const bool masking, int* image, const int size, 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;

6
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "d377e39dfb25b3d8a11652bf6ede0f185c86bd21" #define SVNREPUUIDLIB "47364f3d330963633264a8dcfcbdf4195b916068"
//#define SVNREV 0x1333 //#define SVNREV 0x1334
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal" #define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1333 #define SVNREVLIB 0x1334
#define SVNDATELIB 0x20170315 #define SVNDATELIB 0x20170315
// //