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

merge resolved

Browse Source
This commit is contained in:
maliakal_d
2019-06-11 15:56:13 +02:00
parent d3467432a9 1fed3553b9
commit 3c1df02414
27 changed files with 5419 additions and 4660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -796,6 +796,10 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
int getDataBytes(int detPos = -1);
/**
* Returns the number of detectors in the multi structure*/
size_t size() const{ return detectors.size();}
/**
* Set/get dacs value
* @param val value (in V)

5
slsDetectorSoftware/include/slsDetector.h
View File

@ -16,6 +16,7 @@
class multiSlsDetector;
class ServerInterface;
#define SLS_SHMVERSION 0x190515
@ -176,10 +177,10 @@ struct sharedSlsDetector {
int rxReadFreq;
/** zmq tcp src ip address in client (only data) **/
char zmqip[MAX_STR_LENGTH];
sls::IpAddr zmqip;
/** zmq tcp src ip address in receiver (only data) **/
char rxZmqip[MAX_STR_LENGTH];
sls::IpAddr rxZmqip;
/** gap pixels enable */
int gappixels;