detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 21:24:36 +01:00
Code Issues Actions Packages Releases Activity

using new CmdLineParser

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-16 18:46:34 +01:00
parent db0807bf7b
commit 76da6a07aa
5 changed files with 77 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -805,9 +805,6 @@ int multiSlsDetector::execCommand(const std::string& cmd, int detPos) {
int multiSlsDetector::readConfigurationFile(const std::string &fname) {
freeSharedMemory();
setupMultiDetector();
char *args[100];
char myargs[100][1000];
FILE_LOG(logINFO) << "Loading configuration file: " << fname;
std::ifstream input_file;
@@ -820,16 +817,7 @@ int multiSlsDetector::readConfigurationFile(const std::string &fname) {
current_line.erase(current_line.find('#'));
FILE_LOG(logDEBUG1) << "current_line after removing comments:\n\t" << current_line;
if (current_line.length() > 1) {
std::istringstream line_stream(current_line);
int n_arguments = 0;
std::string current_argument;
while (line_stream.good()) {
line_stream >> current_argument;
sls::strcpy_safe(myargs[n_arguments], current_argument.c_str());
args[n_arguments] = myargs[n_arguments];
++n_arguments;
}
multiSlsDetectorClient(n_arguments, args, PUT_ACTION, this);
multiSlsDetectorClient(current_line, PUT_ACTION, this);
}
}
input_file.close();