From 32cf46a8a397a28d89bd5a4a1e9f8a6f52967ee6 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 18 Nov 2019 11:00:25 +0100 Subject: [PATCH] moved cmdlineparser.h to includes, Paralel calls edited to throw exception if no detector added --- slsDetectorSoftware/{src => include}/CmdLineParser.h | 0 slsDetectorSoftware/include/multiSlsDetector.h | 8 ++++++++ 2 files changed, 8 insertions(+) rename slsDetectorSoftware/{src => include}/CmdLineParser.h (100%) diff --git a/slsDetectorSoftware/src/CmdLineParser.h b/slsDetectorSoftware/include/CmdLineParser.h similarity index 100% rename from slsDetectorSoftware/src/CmdLineParser.h rename to slsDetectorSoftware/include/CmdLineParser.h diff --git a/slsDetectorSoftware/include/multiSlsDetector.h b/slsDetectorSoftware/include/multiSlsDetector.h index bc9f29d29..8398c392c 100755 --- a/slsDetectorSoftware/include/multiSlsDetector.h +++ b/slsDetectorSoftware/include/multiSlsDetector.h @@ -89,6 +89,8 @@ class multiSlsDetector : public virtual slsDetectorDefs { std::vector positions, typename NonDeduced::type... Args) { + if (detectors.size() == 0) + throw sls::RuntimeError("No detectors added"); if (positions.empty() || (positions.size() == 1 && positions[0] == -1)) { positions.resize(detectors.size()); @@ -115,6 +117,8 @@ class multiSlsDetector : public virtual slsDetectorDefs { std::vector positions, typename NonDeduced::type... Args) const { + if (detectors.size() == 0) + throw sls::RuntimeError("No detectors added"); if (positions.empty() || (positions.size() == 1 && positions[0] == -1)) { positions.resize(detectors.size()); @@ -141,6 +145,8 @@ class multiSlsDetector : public virtual slsDetectorDefs { std::vector positions, typename NonDeduced::type... Args) { + if (detectors.size() == 0) + throw sls::RuntimeError("No detectors added"); if (positions.empty() || (positions.size() == 1 && positions[0] == -1)) { positions.resize(detectors.size()); @@ -164,6 +170,8 @@ class multiSlsDetector : public virtual slsDetectorDefs { std::vector positions, typename NonDeduced::type... Args) const { + if (detectors.size() == 0) + throw sls::RuntimeError("No detectors added"); if (positions.empty() || (positions.size() == 1 && positions[0] == -1)) { positions.resize(detectors.size());