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

Exposing vector of strings for loading parameters (#147)

Browse Source
This commit is contained in:
Erik Fröjdh 2020-08-27 16:17:56 +02:00 committed by GitHub
parent a1e06ca7a9
commit 7eafceb0f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/slsdet/detector.py
View File

@ -119,9 +119,10 @@ class Detector(CppDetectorApi):
return NotImplementedError("parameters is set only") return NotImplementedError("parameters is set only")
@parameters.setter @parameters.setter
def parameters(self, fname): def parameters(self, value):
fname = ut.make_string_path(fname) if isinstance(value, str):
self.loadParameters(fname) value = ut.make_string_path(value)
self.loadParameters(value)
@property @property
def hostname(self): def hostname(self):

4
python/src/detector.cpp
View File

@ -36,6 +36,10 @@ void init_det(py::module &m) {
(void (Detector::*)(const std::string &)) & (void (Detector::*)(const std::string &)) &
Detector::loadParameters, Detector::loadParameters,
py::arg()) py::arg())
.def("loadParameters",
(void (Detector::*)(const std::vector<std::string> &)) &
Detector::loadParameters,
py::arg())
.def("getHostname", .def("getHostname",
(Result<std::string>(Detector::*)(sls::Positions) const) & (Result<std::string>(Detector::*)(sls::Positions) const) &
Detector::getHostname, Detector::getHostname,

2
slsDetectorSoftware/include/Detector.h
View File

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

36
slsDetectorSoftware/src/Detector.cpp
View File

@ -60,29 +60,31 @@ void Detector::loadConfig(const std::string &fname) {
} }
void Detector::loadParameters(const std::string &fname) { void Detector::loadParameters(const std::string &fname) {
CmdProxy proxy(this); std::ifstream input_file(fname);
CmdParser parser; if (!input_file) {
std::ifstream input_file;
input_file.open(fname.c_str(), std::ios_base::in);
if (!input_file.is_open()) {
throw RuntimeError("Could not open configuration file " + fname + throw RuntimeError("Could not open configuration file " + fname +
" for reading"); " for reading");
} }
std::string current_line; std::vector<std::string> parameters;
while (input_file.good()) { for (std::string line; std::getline(input_file, line);) {
getline(input_file, current_line); if (line.find('#') != std::string::npos) {
if (current_line.find('#') != std::string::npos) { line.erase(line.find('#'));
current_line.erase(current_line.find('#'));
} }
LOG(logDEBUG1) << "current_line after removing comments:\n\t" if (line.length() > 1) {
<< current_line; parameters.push_back(line);
if (current_line.length() > 1) {
parser.Parse(current_line);
proxy.Call(parser.command(), parser.arguments(),
parser.detector_id(), defs::PUT_ACTION);
} }
} }
input_file.close(); loadParameters(parameters);
}
void Detector::loadParameters(const std::vector<std::string> &parameters) {
CmdProxy proxy(this);
CmdParser parser;
for (const auto &current_line : parameters) {
parser.Parse(current_line);
proxy.Call(parser.command(), parser.arguments(), parser.detector_id(),
defs::PUT_ACTION);
}
} }
Result<std::string> Detector::getHostname(Positions pos) const { Result<std::string> Detector::getHostname(Positions pos) const {