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

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

Browse Source
This commit is contained in:
maliakal_d
2019-11-27 17:29:26 +01:00
parent 9455a5fba1 a28fa66e54
commit ad0fb44573
14 changed files with 241 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/src/Detector.cpp
View File

@ -1,5 +1,5 @@
#include "Detector.h"
#include "CmdLineParser.h"
#include "CmdParser.h"
#include "CmdProxy.h"
#include "container_utils.h"
#include "detectorData.h"
@ -58,7 +58,7 @@ void Detector::loadConfig(const std::string &fname) {
void Detector::loadParameters(const std::string &fname) {
CmdProxy proxy(this);
CmdLineParser parser;
CmdParser parser;
std::ifstream input_file;
input_file.open(fname.c_str(), std::ios_base::in);
if (!input_file.is_open()) {