Prepare for ISimulation w/o Instrument

Core/Simulation/ISimulation.cpp

@@ -19,6 +19,7 @@
 #include "Core/Computation/IComputation.h"
 #include "Core/Simulation/MPISimulation.h"
 #include "Device/Beam/Beam.h"
+#include "Resample/Options/SimulationOptions.h"
 #include "Resample/Processed/ProcessedSample.h"
 #include "Sample/Multilayer/MultilayerUtils.h"
 #include "Sample/SampleBuilderEngine/ISampleBuilder.h"
@@ -105,20 +106,24 @@ void runComputations(std::vector<std::unique_ptr<IComputation>>& computations)
 //  ************************************************************************************************
 
 ISimulation::ISimulation(const Beam& beam, const MultiLayer& sample, const IDetector& detector)
-    : m_instrument(beam, detector)
+    : m_options(std::make_unique<SimulationOptions>())
+    , m_instrument(beam, detector)
 {
     setSample(sample);
     initialize();
 }
 
 #ifndef SWIG
-ISimulation::ISimulation(const Beam& beam, const IDetector& detector) : m_instrument(beam, detector)
+ISimulation::ISimulation(const Beam& beam, const IDetector& detector)
+    : m_options(std::make_unique<SimulationOptions>())
+    , m_instrument(beam, detector)
 {
     initialize();
 }
 #endif // SWIG
 
 ISimulation::ISimulation()
+    : m_options(std::make_unique<SimulationOptions>())
 {
     initialize();
 }
@@ -131,6 +136,19 @@ void ISimulation::initialize()
     registerChild(&m_sample_provider);
 }
 
+void ISimulation::setOptions(const SimulationOptions& options) {
+    ASSERT(m_options);
+    *m_options = options;
+}
+
+const SimulationOptions& ISimulation::options() const {
+    ASSERT(m_options);
+    return *m_options; }
+
+SimulationOptions& ISimulation::options() {
+    ASSERT(m_options);
+    return *m_options; }
+
 //! Initializes a progress monitor that prints to stdout.
 void ISimulation::setTerminalProgressMonitor()
 {
@@ -170,8 +188,8 @@ void ISimulation::runSimulation()
     m_progress.setExpectedNTicks(param_combinations * total_size);
 
     // restrict calculation to current batch
-    const size_t n_batches = m_options.getNumberOfBatches();
-    const size_t current_batch = m_options.getCurrentBatch();
+    const size_t n_batches = m_options->getNumberOfBatches();
+    const size_t current_batch = m_options->getCurrentBatch();
 
     const size_t batch_start = startIndex(n_batches, current_batch, total_size);
     const size_t batch_size = batchSize(n_batches, current_batch, total_size);
@@ -293,7 +311,7 @@ void ISimulation::runSingleSimulation(const ProcessedSample& re_sample, size_t b
 {
     initElementVector();
 
-    const size_t n_threads = m_options.getNumberOfThreads();
+    const size_t n_threads = m_options->getNumberOfThreads();
     ASSERT(n_threads > 0);
 
     std::vector<std::unique_ptr<IComputation>> computations;