detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-18 15:57:13 +02:00
Code Issues Actions 1 Packages Releases Activity

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
maliakal_d
2020-08-27 17:58:21 +02:00
parent f19799343e 2e4783f296
commit 786b14e88b
6 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/include/Detector.h
View File

@ -53,6 +53,8 @@ class Detector {
/** Shared memory not freed prior. Set up per measurement. */
void loadParameters(const std::string &fname);
void loadParameters(const std::vector<std::string>& parameters);
Result<std::string> getHostname(Positions pos = {}) const;
/* Frees shared memory, adds detectors to the list */