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

changed constructor

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-24 11:12:24 +01:00
parent c3472f295b
commit a1c0d28ddb
16 changed files with 113 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -17,7 +17,7 @@
class multiSlsDetector;
class SharedMemory;
class ClientInterface;
class ServerInterface;
class MySocketTCP;
#define SLS_SHMVERSION 0x181005
@ -273,7 +273,10 @@ public:
* @param id sls detector id (position in detectors list)
* @param verify true to verify if shared memory version matches existing one
*/
explicit slsDetector(detectorType type, int multiId = 0, int id = 0, bool verify = true);
explicit slsDetector(const std::string& hostname,
int multiId = 0,
int id = 0,
bool verify = true);
/**
* Constructor called when opening existing shared memory
@ -326,7 +329,7 @@ public:
* Connects to them to set up online flag
* @param name hostname
*/
void setHostname(const char *name);
void setHostname(const std::string& hostname);
/**
* Gets the hostname of detector
@ -1774,13 +1777,13 @@ private:
sharedSlsDetector *thisDetector {nullptr};
/** control socket interface */
ClientInterface *thisDetectorControl {nullptr};
ServerInterface *thisDetectorControl {nullptr};
/** stop socket interface */
ClientInterface *thisDetectorStop {nullptr};
ServerInterface *thisDetectorStop {nullptr};
/** receiver interface */
ClientInterface *thisReceiver {nullptr};
ServerInterface *thisReceiver {nullptr};
/** socket for control commands */
MySocketTCP *controlSocket {nullptr};