diff --git a/Core/Multilayer/MultiLayer.cpp b/Core/Multilayer/MultiLayer.cpp
index d101ca2680c3de7460ef2437d3b6b3dccdbcbecf..f819e4334da45bb5ca7d79697311d7839b6ecf0b 100644
--- a/Core/Multilayer/MultiLayer.cpp
+++ b/Core/Multilayer/MultiLayer.cpp
@@ -35,19 +35,19 @@ MultiLayer::~MultiLayer() = default;
MultiLayer* MultiLayer::clone() const
{
- std::unique_ptr<MultiLayer> P_result(new MultiLayer());
- P_result->setCrossCorrLength(crossCorrLength());
- P_result->setExternalField(externalField());
- P_result->setRoughnessModel(roughnessModel());
+ std::unique_ptr<MultiLayer> ret(new MultiLayer());
+ ret->setCrossCorrLength(crossCorrLength());
+ ret->setExternalField(externalField());
+ ret->setRoughnessModel(roughnessModel());
for (size_t i = 0; i < numberOfLayers(); ++i) {
- auto p_interface = i > 0 ? m_interfaces[i - 1] : nullptr;
- std::unique_ptr<Layer> P_layer(m_layers[i]->clone());
- if (i > 0 && p_interface->getRoughness())
- P_result->addLayerWithTopRoughness(*P_layer, *p_interface->getRoughness());
+ const auto* interface = i > 0 ? m_interfaces[i - 1] : nullptr;
+ Layer* layer = m_layers[i]->clone();
+ if (i > 0 && interface->getRoughness())
+ ret->addLayerWithTopRoughness(*layer, *interface->getRoughness());
else
- P_result->addLayer(*P_layer);
+ ret->addLayer(*layer);
}
- return P_result.release();
+ return ret.release();
}
//! Adds layer with default (zero) roughness
@@ -60,19 +60,19 @@ void MultiLayer::addLayer(const Layer& layer)
//! Adds layer with top roughness
void MultiLayer::addLayerWithTopRoughness(const Layer& layer, const LayerRoughness& roughness)
{
- Layer* p_new_layer = layer.clone();
+ Layer* new_layer = layer.clone();
if (numberOfLayers()) {
// not the top layer
- const Layer* p_last_layer = m_layers.back();
+ const Layer* last_layer = m_layers.back();
LayerInterface* interface(nullptr);
if (roughness.getSigma() != 0.0)
- interface = LayerInterface::createRoughInterface(p_last_layer, p_new_layer, roughness);
+ interface = LayerInterface::createRoughInterface(last_layer, new_layer, roughness);
else
- interface = LayerInterface::createSmoothInterface(p_last_layer, p_new_layer);
+ interface = LayerInterface::createSmoothInterface(last_layer, new_layer);
addAndRegisterInterface(interface);
} else {
// the top layer
- if (p_new_layer->thickness() != 0.0)
+ if (new_layer->thickness() != 0.0)
throw std::runtime_error(
"Invalid call to MultiLayer::addLayer(): the semi-infinite top layer "
"must have a pro forma thickness of 0");
@@ -82,7 +82,7 @@ void MultiLayer::addLayerWithTopRoughness(const Layer& layer, const LayerRoughne
"Invalid call to MultiLayer::addLayer(): the semi-infinite top layer "
"cannot have roughness.");
}
- addAndRegisterLayer(p_new_layer);
+ addAndRegisterLayer(new_layer);
}
const Layer* MultiLayer::layer(size_t i_layer) const
@@ -114,17 +114,17 @@ void MultiLayer::setRoughnessModel(RoughnessModel roughnessModel)
std::vector<const INode*> MultiLayer::getChildren() const
{
- std::vector<const INode*> result;
- const size_t layer_size = m_layers.size();
- result.reserve(layer_size + m_interfaces.size());
-
- for (size_t i = 0; i < layer_size; ++i) {
- result.push_back(m_layers[i]);
- const LayerInterface* p_interface = MultiLayerUtils::LayerBottomInterface(*this, i);
- if (p_interface)
- result.push_back(p_interface);
+ std::vector<const INode*> ret;
+ const size_t N = m_layers.size();
+ ret.reserve(N + m_interfaces.size());
+
+ for (size_t i = 0; i < N; ++i) {
+ ret.push_back(m_layers[i]);
+ const LayerInterface* interface = MultiLayerUtils::LayerBottomInterface(*this, i);
+ if (interface)
+ ret.push_back(interface);
}
- return result;
+ return ret;
}
void MultiLayer::addAndRegisterLayer(Layer* child)
@@ -143,13 +143,8 @@ void MultiLayer::addAndRegisterInterface(LayerInterface* child)
void MultiLayer::handleLayerThicknessRegistration()
{
size_t n_layers = numberOfLayers();
- for (size_t i = 0; i < numberOfLayers(); ++i) {
- if (i == 0 || i == n_layers - 1) {
- m_layers[i]->registerThickness(false);
- } else {
- m_layers[i]->registerThickness(true);
- }
- }
+ for (size_t i = 0; i < numberOfLayers(); ++i)
+ m_layers[i]->registerThickness(i>0 && i<n_layers - 1);
}
size_t MultiLayer::check_layer_index(size_t i_layer) const
diff --git a/Core/SampleBuilderEngine/FixedBuilder.cpp b/Core/SampleBuilderEngine/FixedBuilder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..786dc4df6679e8be7840210672ce08a802986f0b
--- /dev/null
+++ b/Core/SampleBuilderEngine/FixedBuilder.cpp
@@ -0,0 +1,26 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Core/SampleBuilderEngine/FixedBuilder.cpp
+//! @brief Implements class FixedBuilder.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2020
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************** //
+
+#include "Core/SampleBuilderEngine/FixedBuilder.h"
+#include "Core/Multilayer/MultiLayer.h"
+
+FixedBuilder::FixedBuilder(const MultiLayer& sample)
+ : m_sample(sample.clone())
+{
+}
+
+MultiLayer* FixedBuilder::buildSample() const
+{
+ return m_sample->clone();
+}
diff --git a/Core/SampleBuilderEngine/FixedBuilder.h b/Core/SampleBuilderEngine/FixedBuilder.h
new file mode 100644
index 0000000000000000000000000000000000000000..fd5576fc149a913b4639065a66b02e669951c7a4
--- /dev/null
+++ b/Core/SampleBuilderEngine/FixedBuilder.h
@@ -0,0 +1,35 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Core/SampleBuilderEngine/FixedBuilder.h
+//! @brief Defines class FixedBuilder.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2020
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************** //
+
+#ifndef BORNAGAIN_CORE_SAMPLEBUILDERENGINE_FIXEDBUILDER_H
+#define BORNAGAIN_CORE_SAMPLEBUILDERENGINE_FIXEDBUILDER_H
+
+#include "Core/SampleBuilderEngine/ISampleBuilder.h"
+#include <memory>
+
+class MultiLayer;
+
+//! A trivial sample builder class that builds a fixed sample.
+
+class FixedBuilder : public ISampleBuilder
+{
+public:
+ FixedBuilder() = delete;
+ FixedBuilder(const MultiLayer&);
+ MultiLayer* buildSample() const;
+private:
+ std::unique_ptr<const MultiLayer> m_sample;
+};
+
+#endif // BORNAGAIN_CORE_SAMPLEBUILDERENGINE_FIXEDBUILDER_H
diff --git a/Core/SampleBuilderEngine/ISampleBuilder.h b/Core/SampleBuilderEngine/ISampleBuilder.h
index e4903bee55905b934987b069f284709442017873..ab40d540d68542ffbfcecd43fc4854dd75359543 100644
--- a/Core/SampleBuilderEngine/ISampleBuilder.h
+++ b/Core/SampleBuilderEngine/ISampleBuilder.h
@@ -29,11 +29,7 @@ public:
virtual MultiLayer* buildSample() const = 0;
- virtual MultiLayer* createSampleByIndex(size_t index)
- {
- (void)index;
- return buildSample();
- }
+ virtual MultiLayer* createSampleByIndex(size_t) { return buildSample(); }
virtual size_t size() { return 1; }
};
diff --git a/Core/SampleBuilderEngine/SampleBuilderNode.cpp b/Core/SampleBuilderEngine/SampleBuilderNode.cpp
index fd1a782ab3752071f98291c99fe9b1f823044b35..02f3c49dd1ca98004ecc2cb457cd4aa660db59b7 100644
--- a/Core/SampleBuilderEngine/SampleBuilderNode.cpp
+++ b/Core/SampleBuilderEngine/SampleBuilderNode.cpp
@@ -13,6 +13,7 @@
// ************************************************************************** //
#include "Core/SampleBuilderEngine/SampleBuilderNode.h"
+#include "Core/Basics/Assert.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/SampleBuilderEngine/ISampleBuilder.h"
@@ -45,7 +46,7 @@ SampleBuilderNode& SampleBuilderNode::operator=(const SampleBuilderNode& other)
//! Sets sample builder and borrows its parameters.
-void SampleBuilderNode::setSampleBuilder(builder_t sample_builder)
+void SampleBuilderNode::setSBN(const std::shared_ptr<ISampleBuilder>& sample_builder)
{
if (!sample_builder)
throw std::runtime_error("SampleContainer::setSampleBuilder() -> Error. "
@@ -69,15 +70,13 @@ void SampleBuilderNode::reset()
std::unique_ptr<MultiLayer> SampleBuilderNode::createMultiLayer()
{
- if (!m_sample_builder)
- throw std::runtime_error("SampleBuilderNode::createMultiLayer() -> Error. Absent builder");
-
+ ASSERT(m_sample_builder);
return std::unique_ptr<MultiLayer>(m_sample_builder->buildSample());
}
//! Returns current sample builder.
-SampleBuilderNode::builder_t SampleBuilderNode::builder() const
+std::shared_ptr<ISampleBuilder> SampleBuilderNode::builder() const
{
return m_sample_builder;
}
diff --git a/Core/SampleBuilderEngine/SampleBuilderNode.h b/Core/SampleBuilderEngine/SampleBuilderNode.h
index 39e051909ff4260280be3280d979fe176f0e109b..a71d2c464880257ea71ed46b9d60bc1c974e6a89 100644
--- a/Core/SampleBuilderEngine/SampleBuilderNode.h
+++ b/Core/SampleBuilderEngine/SampleBuilderNode.h
@@ -20,19 +20,19 @@
class ISampleBuilder;
-//! Enfolds MultiLayerBuilder to have it in INode tree.
+//! Wraps an ISampleBuilder, and puts it in an INode tree.
+//! Used by SampleProvider.
//! @ingroup simulation_internal
class SampleBuilderNode : public INode
{
public:
- using builder_t = std::shared_ptr<ISampleBuilder>;
SampleBuilderNode();
SampleBuilderNode(const SampleBuilderNode& other);
SampleBuilderNode& operator=(const SampleBuilderNode& other);
- void setSampleBuilder(builder_t sample_builder);
+ void setSBN(const std::shared_ptr<ISampleBuilder>& sample_builder);
void reset();
@@ -42,12 +42,12 @@ public:
explicit operator bool() const;
- builder_t builder() const;
+ std::shared_ptr<ISampleBuilder> builder() const;
private:
void borrow_builder_parameters();
- builder_t m_sample_builder;
+ std::shared_ptr<ISampleBuilder> m_sample_builder;
};
#endif // BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLEBUILDERNODE_H
diff --git a/Core/SampleBuilderEngine/SampleProvider.cpp b/Core/SampleBuilderEngine/SampleProvider.cpp
index 9e9da3dc2b6ecc2599fee083ffe53b7f5f8bc70e..f975fe2073c56bdf2a59b0ff9614ce06a194ae05 100644
--- a/Core/SampleBuilderEngine/SampleProvider.cpp
+++ b/Core/SampleBuilderEngine/SampleProvider.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/SampleBuilderEngine/SampleProvider.h"
-#include "Core/Basics/Assert.h"
#include "Core/Multilayer/MultiLayer.h"
SampleProvider::SampleProvider() {}
@@ -24,14 +23,15 @@ SampleProvider::SampleProvider(const SampleProvider& other) : INode()
setSample(*other.m_multilayer);
if (other.m_sample_builder)
- setSampleBuilder(other.m_sample_builder.builder());
+ setBuilder(other.m_sample_builder.builder());
}
SampleProvider& SampleProvider::operator=(const SampleProvider& other)
{
if (this != &other) {
SampleProvider tmp(other);
- tmp.swapContent(*this);
+ std::swap(m_multilayer, tmp.m_multilayer);
+ std::swap(m_sample_builder, tmp.m_sample_builder);
}
return *this;
}
@@ -45,9 +45,9 @@ void SampleProvider::setSample(const MultiLayer& multilayer)
m_sample_builder.reset();
}
-void SampleProvider::setSampleBuilder(const std::shared_ptr<ISampleBuilder> sample_builder)
+void SampleProvider::setBuilder(const std::shared_ptr<ISampleBuilder>& sample_builder)
{
- m_sample_builder.setSampleBuilder(sample_builder);
+ m_sample_builder.setSBN(sample_builder);
m_sample_builder.setParent(parent());
m_multilayer.reset();
}
@@ -67,34 +67,24 @@ void SampleProvider::updateSample()
m_multilayer = m_sample_builder.createMultiLayer();
if (!m_multilayer)
- throw std::runtime_error("SampleProvider::updateSample() -> Error. No sample.");
+ throw std::runtime_error(
+ "SampleProvider::updateSample called before sample or builder was set");
}
std::vector<const INode*> SampleProvider::getChildren() const
{
- std::vector<const INode*> result;
- if (m_sample_builder) {
- result.push_back(&m_sample_builder);
- } else {
- if (m_multilayer)
- result.push_back(m_multilayer.get());
- }
- return result;
+ if (m_sample_builder)
+ return {&m_sample_builder};
+ if (m_multilayer)
+ return {m_multilayer.get()};
+ return {};
}
void SampleProvider::setParent(const INode* newParent)
{
INode::setParent(newParent);
- if (m_sample_builder) {
+ if (m_sample_builder)
m_sample_builder.setParent(parent());
- } else {
- if (m_multilayer)
- m_multilayer->setParent(parent());
- }
-}
-
-void SampleProvider::swapContent(SampleProvider& other)
-{
- std::swap(m_multilayer, other.m_multilayer);
- std::swap(m_sample_builder, other.m_sample_builder);
+ else if (m_multilayer)
+ m_multilayer->setParent(parent());
}
diff --git a/Core/SampleBuilderEngine/SampleProvider.h b/Core/SampleBuilderEngine/SampleProvider.h
index e9ad4f101d03d37a252ed7b26e444a10d27cab75..1ca5f6c8564cf9dc020277424f57db0286b0d8de 100644
--- a/Core/SampleBuilderEngine/SampleProvider.h
+++ b/Core/SampleBuilderEngine/SampleProvider.h
@@ -20,8 +20,9 @@
class MultiLayer;
-//! Gives access to the sample to simulate. Sample can come either directly from
-//! the user or from SampleBuilder.
+//! Holds either a Sample, or a SampleBuilderNode (which holds an ISampleBuilder).
+//! Used in Simulation, which holds a SampleProvider member.
+
//! @ingroup simulation_internal
class SampleProvider : public INode
@@ -34,7 +35,7 @@ public:
void setSample(const MultiLayer& multilayer);
- void setSampleBuilder(const std::shared_ptr<ISampleBuilder> sample_builder);
+ void setBuilder(const std::shared_ptr<ISampleBuilder>& sample_builder);
const MultiLayer* sample() const;
@@ -47,8 +48,6 @@ public:
void setParent(const INode* newParent) override;
private:
- void swapContent(SampleProvider& other);
-
std::unique_ptr<MultiLayer> m_multilayer;
SampleBuilderNode m_sample_builder;
};
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index 77d69ae579089655b1419fd82fa56e1cb31e92cf..b65d7e4de0d6c68348b10d5c9d4b07d92be6f41e 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -39,17 +39,6 @@ DepthProbeSimulation::DepthProbeSimulation() : Simulation()
initialize();
}
-DepthProbeSimulation::DepthProbeSimulation(const MultiLayer& sample) : Simulation(sample)
-{
- initialize();
-}
-
-DepthProbeSimulation::DepthProbeSimulation(const std::shared_ptr<ISampleBuilder> sample_builder)
- : Simulation(sample_builder)
-{
- initialize();
-}
-
DepthProbeSimulation::~DepthProbeSimulation() = default;
DepthProbeSimulation* DepthProbeSimulation::clone() const
diff --git a/Core/Simulation/DepthProbeSimulation.h b/Core/Simulation/DepthProbeSimulation.h
index 9a9178e9bb406a103c6238e1f479629636bb07c0..cb144e9916ab00248391855e250d675805bed99a 100644
--- a/Core/Simulation/DepthProbeSimulation.h
+++ b/Core/Simulation/DepthProbeSimulation.h
@@ -35,8 +35,6 @@ class DepthProbeSimulation : public Simulation
{
public:
DepthProbeSimulation();
- DepthProbeSimulation(const MultiLayer& sample);
- DepthProbeSimulation(const std::shared_ptr<ISampleBuilder> sample_builder);
~DepthProbeSimulation() override;
DepthProbeSimulation* clone() const override;
diff --git a/Core/Simulation/GISASSimulation.cpp b/Core/Simulation/GISASSimulation.cpp
index dc65afae45180d020157c9518a50a864c9ec3c28..5576b5ef405a536da5428a6598f491734a4f504f 100644
--- a/Core/Simulation/GISASSimulation.cpp
+++ b/Core/Simulation/GISASSimulation.cpp
@@ -26,17 +26,6 @@ GISASSimulation::GISASSimulation()
initialize();
}
-GISASSimulation::GISASSimulation(const MultiLayer& p_sample) : Simulation2D(p_sample)
-{
- initialize();
-}
-
-GISASSimulation::GISASSimulation(const std::shared_ptr<ISampleBuilder> p_sample_builder)
- : Simulation2D(p_sample_builder)
-{
- initialize();
-}
-
void GISASSimulation::prepareSimulation()
{
if (m_instrument.getDetectorDimension() != 2)
diff --git a/Core/Simulation/GISASSimulation.h b/Core/Simulation/GISASSimulation.h
index 75e82cdb32b623aada12c01a9dd985f04eed6afe..7a553f9763970086bf1d9824ae90fc333939013b 100644
--- a/Core/Simulation/GISASSimulation.h
+++ b/Core/Simulation/GISASSimulation.h
@@ -28,9 +28,6 @@ class GISASSimulation : public Simulation2D
{
public:
GISASSimulation();
- GISASSimulation(const MultiLayer& p_sample);
- GISASSimulation(const std::shared_ptr<ISampleBuilder> p_sample_builder);
-
~GISASSimulation() {}
GISASSimulation* clone() const override { return new GISASSimulation(*this); }
diff --git a/Core/Simulation/OffSpecSimulation.cpp b/Core/Simulation/OffSpecSimulation.cpp
index e691416fe70c5afbb8cd4506c0e83252de09c092..e6c5587af7ca04fb1d89037457cfe5616fc78ef0 100644
--- a/Core/Simulation/OffSpecSimulation.cpp
+++ b/Core/Simulation/OffSpecSimulation.cpp
@@ -28,17 +28,6 @@ OffSpecSimulation::OffSpecSimulation()
initialize();
}
-OffSpecSimulation::OffSpecSimulation(const MultiLayer& p_sample) : Simulation2D(p_sample)
-{
- initialize();
-}
-
-OffSpecSimulation::OffSpecSimulation(const std::shared_ptr<ISampleBuilder> p_sample_builder)
- : Simulation2D(p_sample_builder)
-{
- initialize();
-}
-
void OffSpecSimulation::prepareSimulation()
{
checkInitialization();
diff --git a/Core/Simulation/OffSpecSimulation.h b/Core/Simulation/OffSpecSimulation.h
index 8d816842e9f33ace9ef7d900783cc14d20eb278f..ae01237923e611f4ab253fe42cf7dfa22fef1a00 100644
--- a/Core/Simulation/OffSpecSimulation.h
+++ b/Core/Simulation/OffSpecSimulation.h
@@ -27,9 +27,6 @@ class OffSpecSimulation : public Simulation2D
{
public:
OffSpecSimulation();
- OffSpecSimulation(const MultiLayer& p_sample);
- OffSpecSimulation(const std::shared_ptr<class ISampleBuilder> p_sample_builder);
-
~OffSpecSimulation() final {}
OffSpecSimulation* clone() const override { return new OffSpecSimulation(*this); }
diff --git a/Core/Simulation/Simulation.cpp b/Core/Simulation/Simulation.cpp
index f89feb77d0153799d1b30dd8ce80fb5d0106ca1e..198a9f095164fb9b9cf895f7afe8a52c31674f38 100644
--- a/Core/Simulation/Simulation.cpp
+++ b/Core/Simulation/Simulation.cpp
@@ -31,27 +31,84 @@
namespace
{
-size_t getIndexStep(size_t total_size, size_t n_handlers);
-size_t getStartIndex(size_t n_handlers, size_t current_handler, size_t n_elements);
-size_t getNumberOfElements(size_t n_handlers, size_t current_handler, size_t n_elements);
-void runComputations(std::vector<std::unique_ptr<IComputation>> computations);
-} // namespace
-Simulation::Simulation()
+size_t getIndexStep(size_t total_size, size_t n_handlers)
{
- initialize();
+ ASSERT(total_size > 0);
+ ASSERT(n_handlers > 0);
+ size_t result = total_size / n_handlers;
+ return total_size % n_handlers ? ++result : result;
}
-Simulation::Simulation(const MultiLayer& p_sample)
+size_t getStartIndex(size_t n_handlers, size_t current_handler, size_t n_elements)
{
- initialize();
- m_sample_provider.setSample(p_sample);
+ const size_t handler_size = getIndexStep(n_elements, static_cast<size_t>(n_handlers));
+ const size_t start_index = current_handler * handler_size;
+ if (start_index >= n_elements)
+ return n_elements;
+ return start_index;
+}
+
+size_t getNumberOfElements(size_t n_handlers, size_t current_handler, size_t n_elements)
+{
+ const size_t handler_size = getIndexStep(n_elements, static_cast<size_t>(n_handlers));
+ const size_t start_index = current_handler * handler_size;
+ if (start_index >= n_elements)
+ return 0;
+ return std::min(handler_size, n_elements - start_index);
}
-Simulation::Simulation(const std::shared_ptr<ISampleBuilder> p_sample_builder)
+void runComputations(std::vector<std::unique_ptr<IComputation>> computations)
+{
+ ASSERT(!computations.empty());
+
+ if (computations.size() == 1) { // Running computation in current thread
+ auto& computation = computations.front();
+ computation->run();
+ if (computation->isCompleted())
+ return;
+ std::string message = computation->errorMessage();
+ throw Exceptions::RuntimeErrorException("Error in runComputations: Simulation has "
+ "terminated unexpectedly with following error: "
+ "message.\n"
+ + message);
+ }
+
+ // Running computations in several threads.
+ // The number of threads is equal to the number of computations.
+
+ std::vector<std::unique_ptr<std::thread>> threads;
+
+ // Run simulations in n threads.
+ for (auto& comp : computations)
+ threads.emplace_back(new std::thread([&comp]() { comp->run(); }));
+
+ // Wait for threads to complete.
+ for (auto& thread : threads)
+ thread->join();
+
+ // Check successful completion.
+ std::vector<std::string> failure_messages;
+ for (auto& comp : computations)
+ if (!comp->isCompleted())
+ failure_messages.push_back(comp->errorMessage());
+
+ if (failure_messages.size() == 0)
+ return;
+ throw Exceptions::RuntimeErrorException(
+ "Error in runComputations: "
+ "At least one simulation thread has terminated unexpectedly.\n"
+ "Messages: "
+ + StringUtils::join(failure_messages, " --- "));
+}
+
+} // namespace
+
+// ************************************************************************** //
+
+Simulation::Simulation()
{
initialize();
- m_sample_provider.setSampleBuilder(p_sample_builder);
}
Simulation::Simulation(const Simulation& other)
@@ -64,7 +121,13 @@ Simulation::Simulation(const Simulation& other)
initialize();
}
-Simulation::~Simulation() {}
+Simulation::~Simulation() = default;
+
+void Simulation::initialize()
+{
+ registerChild(&m_instrument);
+ registerChild(&m_sample_provider);
+}
//! Initializes a progress monitor that prints to stdout.
void Simulation::setTerminalProgressMonitor()
@@ -141,12 +204,12 @@ void Simulation::runSimulation()
if (batch_size == 0)
return;
- std::unique_ptr<ParameterPool> P_param_pool(createParameterTree());
+ std::unique_ptr<ParameterPool> param_pool(createParameterTree());
for (size_t index = 0; index < param_combinations; ++index) {
- double weight = m_distribution_handler.setParameterValues(P_param_pool.get(), index);
+ double weight = m_distribution_handler.setParameterValues(param_pool.get(), index);
runSingleSimulation(batch_start, batch_size, weight);
}
- m_distribution_handler.setParameterToMeans(P_param_pool.get());
+ m_distribution_handler.setParameterToMeans(param_pool.get());
moveDataFromCache();
transferResultsToIntensityMap();
}
@@ -174,9 +237,9 @@ const MultiLayer* Simulation::sample() const
return m_sample_provider.sample();
}
-void Simulation::setSampleBuilder(const std::shared_ptr<class ISampleBuilder> p_sample_builder)
+void Simulation::setSampleBuilder(const std::shared_ptr<class ISampleBuilder>& sample_builder)
{
- m_sample_provider.setSampleBuilder(p_sample_builder);
+ m_sample_provider.setBuilder(sample_builder);
}
void Simulation::setBackground(const IBackground& bg)
@@ -235,12 +298,6 @@ void Simulation::runSingleSimulation(size_t batch_start, size_t batch_size, doub
addDataToCache(weight);
}
-void Simulation::initialize()
-{
- registerChild(&m_instrument);
- registerChild(&m_sample_provider);
-}
-
//! Convert user data to SimulationResult object for later drawing in various axes units.
//! User data will be cropped to the ROI defined in the simulation, amplitudes in areas
//! corresponding to the masked areas of the detector will be set to zero.
@@ -284,76 +341,3 @@ SimulationResult Simulation::convertData(const OutputData<double>& data,
return SimulationResult(*roi_data, *converter);
}
-
-namespace
-{
-size_t getIndexStep(size_t total_size, size_t n_handlers)
-{
- ASSERT(total_size > 0);
- ASSERT(n_handlers > 0);
- size_t result = total_size / n_handlers;
- return total_size % n_handlers ? ++result : result;
-}
-
-size_t getStartIndex(size_t n_handlers, size_t current_handler, size_t n_elements)
-{
- const size_t handler_size = getIndexStep(n_elements, static_cast<size_t>(n_handlers));
- const size_t start_index = current_handler * handler_size;
- if (start_index >= n_elements)
- return n_elements;
- return start_index;
-}
-
-size_t getNumberOfElements(size_t n_handlers, size_t current_handler, size_t n_elements)
-{
- const size_t handler_size = getIndexStep(n_elements, static_cast<size_t>(n_handlers));
- const size_t start_index = current_handler * handler_size;
- if (start_index >= n_elements)
- return 0;
- return std::min(handler_size, n_elements - start_index);
-}
-
-void runComputations(std::vector<std::unique_ptr<IComputation>> computations)
-{
- ASSERT(!computations.empty());
-
- if (computations.size() == 1) { // Running computation in current thread
- auto& computation = computations.front();
- computation->run();
- if (computation->isCompleted())
- return;
- std::string message = computation->errorMessage();
- throw Exceptions::RuntimeErrorException("Error in runComputations: Simulation has "
- "terminated unexpectedly with following error: "
- "message.\n"
- + message);
- }
-
- // Running computations in several threads.
- // The number of threads is equal to the number of computations.
-
- std::vector<std::unique_ptr<std::thread>> threads;
-
- // Run simulations in n threads.
- for (auto& comp : computations)
- threads.emplace_back(new std::thread([&comp]() { comp->run(); }));
-
- // Wait for threads to complete.
- for (auto& thread : threads)
- thread->join();
-
- // Check successful completion.
- std::vector<std::string> failure_messages;
- for (auto& comp : computations)
- if (!comp->isCompleted())
- failure_messages.push_back(comp->errorMessage());
-
- if (failure_messages.size() == 0)
- return;
- throw Exceptions::RuntimeErrorException(
- "Error in runComputations: "
- "At least one simulation thread has terminated unexpectedly.\n"
- "Messages: "
- + StringUtils::join(failure_messages, " --- "));
-}
-} // unnamed namespace
diff --git a/Core/Simulation/Simulation.h b/Core/Simulation/Simulation.h
index 87e7623480ae01aeb1f9b9fe64c90e525088c6e3..a81e66c757df09debb4970a39914e9552a032ba8 100644
--- a/Core/Simulation/Simulation.h
+++ b/Core/Simulation/Simulation.h
@@ -39,8 +39,6 @@ class Simulation : public ICloneable, public INode
{
public:
Simulation();
- Simulation(const MultiLayer& p_sample);
- Simulation(const std::shared_ptr<ISampleBuilder> p_sample_builder);
virtual ~Simulation();
virtual Simulation* clone() const = 0;
@@ -72,7 +70,7 @@ public:
void setSample(const MultiLayer& sample);
const MultiLayer* sample() const;
- void setSampleBuilder(const std::shared_ptr<ISampleBuilder> sample_builder);
+ void setSampleBuilder(const std::shared_ptr<ISampleBuilder>& sample_builder);
void setBackground(const IBackground& bg);
const IBackground* background() const { return mP_background.get(); }
diff --git a/Core/Simulation/Simulation2D.cpp b/Core/Simulation/Simulation2D.cpp
index 17c03328c6be8c755a1141010268039f43262e86..830e5054331e023198faaae2d1329cc88255ddb5 100644
--- a/Core/Simulation/Simulation2D.cpp
+++ b/Core/Simulation/Simulation2D.cpp
@@ -22,13 +22,6 @@
Simulation2D::Simulation2D() = default;
-Simulation2D::Simulation2D(const MultiLayer& p_sample) : Simulation(p_sample) {}
-
-Simulation2D::Simulation2D(const std::shared_ptr<ISampleBuilder> p_sample_builder)
- : Simulation(p_sample_builder)
-{
-}
-
Simulation2D::~Simulation2D() = default;
void Simulation2D::prepareSimulation()
diff --git a/Core/Simulation/Simulation2D.h b/Core/Simulation/Simulation2D.h
index bb01010dd9c444de8c50f8ca6d7b9b77065b14a9..abba751dbc8552f77cd54a41ae266295eb1fb70f 100644
--- a/Core/Simulation/Simulation2D.h
+++ b/Core/Simulation/Simulation2D.h
@@ -28,8 +28,6 @@ class Simulation2D : public Simulation
{
public:
Simulation2D();
- Simulation2D(const MultiLayer& p_sample);
- Simulation2D(const std::shared_ptr<ISampleBuilder> p_sample_builder);
~Simulation2D() override;
Simulation2D* clone() const override = 0;
diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp
index 09193e048b27ab825428c1a659779326112196f6..14b465b96416141b0ca9b9e852ce3b11488348d1 100644
--- a/Core/Simulation/SpecularSimulation.cpp
+++ b/Core/Simulation/SpecularSimulation.cpp
@@ -47,17 +47,6 @@ SpecularSimulation::SpecularSimulation() : Simulation()
initialize();
}
-SpecularSimulation::SpecularSimulation(const MultiLayer& sample) : Simulation(sample)
-{
- initialize();
-}
-
-SpecularSimulation::SpecularSimulation(const std::shared_ptr<ISampleBuilder> sample_builder)
- : Simulation(sample_builder)
-{
- initialize();
-}
-
SpecularSimulation::~SpecularSimulation() = default;
SpecularSimulation* SpecularSimulation::clone() const
diff --git a/Core/Simulation/SpecularSimulation.h b/Core/Simulation/SpecularSimulation.h
index db5af4f797c51d02dc37f850c3db6017b06836ba..04e003bd895e6e8d1a591331f8bd28bdfb300753 100644
--- a/Core/Simulation/SpecularSimulation.h
+++ b/Core/Simulation/SpecularSimulation.h
@@ -35,8 +35,6 @@ class SpecularSimulation : public Simulation
{
public:
SpecularSimulation();
- SpecularSimulation(const MultiLayer& sample);
- SpecularSimulation(const std::shared_ptr<ISampleBuilder> sample_builder);
~SpecularSimulation() override;
SpecularSimulation* clone() const override;
diff --git a/Core/StandardSamples/MagneticLayersBuilder.cpp b/Core/StandardSamples/MagneticLayersBuilder.cpp
index a027ec1736c06dd27d039c8dceae9a4cd395b352..15ddf65a42cfa3831ecd3210c7ba354171691c24 100644
--- a/Core/StandardSamples/MagneticLayersBuilder.cpp
+++ b/Core/StandardSamples/MagneticLayersBuilder.cpp
@@ -29,6 +29,29 @@ namespace
const double sphere_radius = 5 * Units::nanometer;
+MultiLayer* parametricBuild(double sigmaRoughness, RoughnessModel roughnessModel)
+{
+ MultiLayer* multi_layer = new MultiLayer();
+
+ kvector_t substr_field = kvector_t(0.0, 1e6, 0.0);
+ kvector_t layer_field = kvector_t(1e6, 1e6, 0.0);
+ Material vacuum_material = HomogeneousMaterial("Vacuum", 0.0, 0.0);
+ Material substrate_material = HomogeneousMaterial("Substrate", 7e-6, 2e-8, substr_field);
+ Material layer_material = HomogeneousMaterial("MagLayer", 6e-4, 2e-8, layer_field);
+
+ auto roughness = LayerRoughness();
+ roughness.setSigma(sigmaRoughness * Units::angstrom);
+
+ Layer vacuum_layer(vacuum_material);
+ Layer substrate_layer(substrate_material);
+ Layer layer(layer_material, 200 * Units::angstrom);
+ multi_layer->addLayer(vacuum_layer);
+ multi_layer->addLayerWithTopRoughness(layer, roughness);
+ multi_layer->addLayerWithTopRoughness(substrate_layer, roughness);
+ multi_layer->setRoughnessModel(roughnessModel);
+ return multi_layer;
+}
+
} // namespace
MultiLayer* MagneticSubstrateZeroFieldBuilder::buildSample() const
@@ -103,31 +126,7 @@ MultiLayer* MagneticLayerBuilder::buildSample() const
MultiLayer* SimpleMagneticRotationBuilder::buildSample() const
{
- return builder();
-}
-
-MultiLayer* SimpleMagneticRotationBuilder::builder(double sigmaRoughness,
- RoughnessModel roughnessModel) const
-{
- MultiLayer* multi_layer = new MultiLayer();
-
- kvector_t substr_field = kvector_t(0.0, 1e6, 0.0);
- kvector_t layer_field = kvector_t(1e6, 1e6, 0.0);
- Material vacuum_material = HomogeneousMaterial("Vacuum", 0.0, 0.0);
- Material substrate_material = HomogeneousMaterial("Substrate", 7e-6, 2e-8, substr_field);
- Material layer_material = HomogeneousMaterial("MagLayer", 6e-4, 2e-8, layer_field);
-
- auto roughness = LayerRoughness();
- roughness.setSigma(sigmaRoughness * Units::angstrom);
-
- Layer vacuum_layer(vacuum_material);
- Layer substrate_layer(substrate_material);
- Layer layer(layer_material, 200 * Units::angstrom);
- multi_layer->addLayer(vacuum_layer);
- multi_layer->addLayerWithTopRoughness(layer, roughness);
- multi_layer->addLayerWithTopRoughness(substrate_layer, roughness);
- multi_layer->setRoughnessModel(roughnessModel);
- return multi_layer;
+ return parametricBuild(0., RoughnessModel::TANH);
}
size_t SimpleMagneticRotationBuilder::size()
@@ -140,15 +139,15 @@ MultiLayer* SimpleMagneticRotationBuilder::createSampleByIndex(size_t index)
switch (index) {
case 0:
- return builder(0.);
+ return parametricBuild(0., RoughnessModel::TANH);
case 1:
setName("Tanh");
- return builder(2., RoughnessModel::TANH);
+ return parametricBuild(2., RoughnessModel::TANH);
case 2:
setName("NC");
- return builder(2., RoughnessModel::NEVOT_CROCE);
+ return parametricBuild(2., RoughnessModel::NEVOT_CROCE);
default:
ASSERT(0);
diff --git a/Core/StandardSamples/MagneticLayersBuilder.h b/Core/StandardSamples/MagneticLayersBuilder.h
index 906bd2540704e675566247fd6f4bf66d7b749fa5..8d51bc763dfb485096a32dc6099eb302db49c55a 100644
--- a/Core/StandardSamples/MagneticLayersBuilder.h
+++ b/Core/StandardSamples/MagneticLayersBuilder.h
@@ -25,9 +25,6 @@ class MagneticSubstrateZeroFieldBuilder : public ISampleBuilder
{
public:
MultiLayer* buildSample() const;
-
-private:
- double m_sphere_radius;
};
//! Builds sample: ambient and one magnetized layer on a non-magnetized substrate.
@@ -46,9 +43,6 @@ class MagneticLayerBuilder : public ISampleBuilder
{
public:
MultiLayer* buildSample() const;
-
-private:
- double m_sphere_radius;
};
//! Builds sample: magnetic layer on a magnetic substrate with the fields rotated by 90°
@@ -61,10 +55,6 @@ public:
MultiLayer* createSampleByIndex(size_t index) override;
size_t size() override;
-
-private:
- MultiLayer* builder(double sigmaRoughness = 0.,
- RoughnessModel roughnessModel = RoughnessModel::TANH) const;
};
//! Builds sample: rotated magnetic spheres in substrate layer with a unit magnetic field.
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.cpp b/GUI/coregui/Models/DomainSimulationBuilder.cpp
index dc11ed2a1513dcf78e2d9a591ef0ab22ea947b44..c962d3e8c437506df24e9bb2d9856ca0d93fd789 100644
--- a/GUI/coregui/Models/DomainSimulationBuilder.cpp
+++ b/GUI/coregui/Models/DomainSimulationBuilder.cpp
@@ -97,39 +97,38 @@ void addBackgroundToSimulation(const InstrumentItem& instrument, Simulation& sim
}
std::unique_ptr<GISASSimulation> createGISASSimulation(std::unique_ptr<MultiLayer> P_multilayer,
- const GISASInstrumentItem* gisasInstrument,
+ const GISASInstrumentItem* instrument,
const SimulationOptionsItem* optionsItem)
{
- std::unique_ptr<GISASSimulation> gisas(new GISASSimulation);
- auto P_instrument = DomainObjectBuilder::buildInstrument(*gisasInstrument);
- gisas->setSample(*P_multilayer);
- gisas->setInstrument(*P_instrument);
- TransformToDomain::addDistributionParametersToSimulation(*gisasInstrument->beamItem(),
- *gisas.get());
+ std::unique_ptr<GISASSimulation> ret(new GISASSimulation);
+ auto P_instrument = DomainObjectBuilder::buildInstrument(*instrument);
+ ret->setSample(*P_multilayer);
+ ret->setInstrument(*P_instrument);
+ TransformToDomain::addDistributionParametersToSimulation(*instrument->beamItem(), *ret);
// Simulation options
if (optionsItem)
- TransformToDomain::setSimulationOptions(gisas.get(), *optionsItem);
+ TransformToDomain::setSimulationOptions(ret.get(), *optionsItem);
- addBackgroundToSimulation(*gisasInstrument, *gisas);
+ addBackgroundToSimulation(*instrument, *ret);
- return gisas;
+ return ret;
}
std::unique_ptr<OffSpecSimulation>
createOffSpecSimulation(std::unique_ptr<MultiLayer> P_multilayer,
- const OffSpecInstrumentItem* offspecInstrument,
+ const OffSpecInstrumentItem* instrument,
const SimulationOptionsItem* optionsItem)
{
- std::unique_ptr<OffSpecSimulation> offspec(new OffSpecSimulation);
- auto P_instrument = DomainObjectBuilder::buildInstrument(*offspecInstrument);
- offspec->setSample(*P_multilayer);
- offspec->setInstrument(*P_instrument);
+ std::unique_ptr<OffSpecSimulation> ret(new OffSpecSimulation);
+ auto P_instrument = DomainObjectBuilder::buildInstrument(*instrument);
+ ret->setSample(*P_multilayer);
+ ret->setInstrument(*P_instrument);
- auto beamItem = offspecInstrument->beamItem();
+ auto beamItem = instrument->beamItem();
auto axisItem = dynamic_cast<BasicAxisItem*>(
- offspecInstrument->getItem(OffSpecInstrumentItem::P_ALPHA_AXIS));
- offspec->setBeamParameters(beamItem->getWavelength(), *axisItem->createAxis(Units::degree),
+ instrument->getItem(OffSpecInstrumentItem::P_ALPHA_AXIS));
+ ret->setBeamParameters(beamItem->getWavelength(), *axisItem->createAxis(Units::degree),
beamItem->getAzimuthalAngle());
// TODO Take care about distributions
@@ -138,22 +137,22 @@ createOffSpecSimulation(std::unique_ptr<MultiLayer> P_multilayer,
// Simulation options
if (optionsItem)
- TransformToDomain::setSimulationOptions(offspec.get(), *optionsItem);
+ TransformToDomain::setSimulationOptions(ret.get(), *optionsItem);
- addBackgroundToSimulation(*offspecInstrument, *offspec);
+ addBackgroundToSimulation(*instrument, *ret);
- return offspec;
+ return ret;
}
std::unique_ptr<SpecularSimulation>
createSpecularSimulation(std::unique_ptr<MultiLayer> P_multilayer,
- const SpecularInstrumentItem* specular_instrument,
+ const SpecularInstrumentItem* instrument,
const SimulationOptionsItem* options_item)
{
- std::unique_ptr<SpecularSimulation> specular_simulation =
- std::make_unique<SpecularSimulation>(*P_multilayer);
+ std::unique_ptr<SpecularSimulation> ret = std::make_unique<SpecularSimulation>();
+ ret->setSample(*P_multilayer);
- auto beam_item = specular_instrument->beamItem();
+ auto beam_item = instrument->beamItem();
const auto axis_item = beam_item->currentInclinationAxisItem();
const auto footprint = beam_item->currentFootprintItem();
@@ -162,16 +161,16 @@ createSpecularSimulation(std::unique_ptr<MultiLayer> P_multilayer,
TransformToDomain::addBeamDivergencesToScan(*beam_item, scan);
- specular_simulation->setBeamIntensity(beam_item->getIntensity());
- specular_simulation->setScan(scan);
+ ret->setBeamIntensity(beam_item->getIntensity());
+ ret->setScan(scan);
// Simulation options
if (options_item)
- TransformToDomain::setSimulationOptions(specular_simulation.get(), *options_item);
+ TransformToDomain::setSimulationOptions(ret.get(), *options_item);
- addBackgroundToSimulation(*specular_instrument, *specular_simulation);
+ addBackgroundToSimulation(*instrument, *ret);
- return specular_simulation;
+ return ret;
}
std::unique_ptr<DepthProbeSimulation>
@@ -179,13 +178,13 @@ createDepthProbeSimulation(std::unique_ptr<MultiLayer> P_multilayer,
const DepthProbeInstrumentItem* instrument,
const SimulationOptionsItem* options_item)
{
- std::unique_ptr<DepthProbeSimulation> simulation = instrument->createSimulation();
- simulation->setSample(*P_multilayer.get());
+ std::unique_ptr<DepthProbeSimulation> ret = instrument->createSimulation();
+ ret->setSample(*P_multilayer);
if (options_item)
- TransformToDomain::setSimulationOptions(simulation.get(), *options_item);
+ TransformToDomain::setSimulationOptions(ret.get(), *options_item);
- return simulation;
+ return ret;
}
} // namespace
diff --git a/Tests/Functional/Python/PyFit/fitobjective_api.py b/Tests/Functional/Python/PyFit/fitobjective_api.py
index fc58382e98737ca03eb4ee7a605ab10ec4b445c0..3de3426e85309b6b493c7aa5fa7f151e3f741395 100644
--- a/Tests/Functional/Python/PyFit/fitobjective_api.py
+++ b/Tests/Functional/Python/PyFit/fitobjective_api.py
@@ -29,7 +29,8 @@ class SimulationBuilder:
ml.addLayer(ba.Layer(material))
ml.addLayer(ba.Layer(material))
- simulation = ba.GISASSimulation(ml)
+ simulation = ba.GISASSimulation()
+ simulation.setSample(ml)
simulation.setDetectorParameters(self.m_ncol, 0.0, 1.0, self.m_nrow, 0.0, 1.0)
return simulation
diff --git a/Tests/UnitTests/Core/Fitting/FittingTestHelper.h b/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
index 32e8786857d7b44e6c38a4007aa060a9df58aa0d..fc4043d3a0a4b8e7f626e2d063b8fa4650c5350a 100644
--- a/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
+++ b/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
@@ -33,7 +33,8 @@ public:
multilayer.addLayer(Layer(material));
multilayer.addLayer(Layer(material));
- std::unique_ptr<GISASSimulation> result(new GISASSimulation(multilayer));
+ std::unique_ptr<GISASSimulation> result(new GISASSimulation());
+ result->setSample(multilayer);
result->setDetectorParameters(m_nx, m_xmin, m_xmax, m_ny, m_ymin, m_ymax);
m_builder_calls++;
diff --git a/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp b/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp
index 4a7737da33b4320580f5d35704b909fabe3f91ea..e32f0460bcd11b79aadbca11f523666c01cb6523 100644
--- a/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp
@@ -1,31 +1,24 @@
#include "Core/Simulation/GISASSimulation.h"
-#include "Core/Beam/Beam.h"
#include "Core/Intensity/OutputData.h"
-#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/SampleBuilderEngine/ISampleBuilder.h"
#include "Tests/GTestWrapper/google_test.h"
-#include <cmath>
-#include <memory>
-class GISASSimulationTest : public ::testing::Test
-{
-protected:
- GISASSimulation m_simulation;
-};
+class GISASSimulationTest : public ::testing::Test {};
TEST_F(GISASSimulationTest, SimulationInitialState)
{
- EXPECT_EQ(nullptr, m_simulation.sample());
- EXPECT_EQ(0u, m_simulation.intensityMapSize());
- EXPECT_THROW(m_simulation.result(), std::runtime_error);
- EXPECT_EQ(1u, m_simulation.getChildren().size());
+ GISASSimulation simulation;
+ EXPECT_EQ(nullptr, simulation.sample());
+ EXPECT_EQ(0u, simulation.intensityMapSize());
+ EXPECT_THROW(simulation.result(), std::runtime_error);
+ EXPECT_EQ(1u, simulation.getChildren().size());
}
TEST_F(GISASSimulationTest, SimulationConstruction)
{
- MultiLayer multi_layer;
- GISASSimulation simulation(multi_layer);
+ GISASSimulation simulation;
+ simulation.setSample(MultiLayer());
EXPECT_NE(nullptr, simulation.sample());
EXPECT_EQ(0u, simulation.intensityMapSize());
EXPECT_THROW(simulation.result(), std::runtime_error);
@@ -38,19 +31,23 @@ TEST_F(GISASSimulationTest, SimulationConstruction)
EXPECT_EQ(2u, simulation.getChildren().size());
}
-TEST_F(GISASSimulationTest, SimulationClone)
+TEST_F(GISASSimulationTest, SimulationClone1)
{
- auto p_clone = m_simulation.clone();
+ GISASSimulation simulation;
+ auto p_clone = simulation.clone();
EXPECT_EQ(nullptr, p_clone->sample());
EXPECT_EQ(0u, p_clone->intensityMapSize());
EXPECT_THROW(p_clone->result(), std::runtime_error);
EXPECT_EQ(1u, p_clone->getChildren().size());
delete p_clone;
+}
- MultiLayer multi_layer;
- GISASSimulation simulation(multi_layer);
+TEST_F(GISASSimulationTest, SimulationClone2)
+{
+ GISASSimulation simulation;
+ simulation.setSample(MultiLayer());
simulation.setDetectorParameters(10, -2.0, 2.0, 20, 0.0, 2.0);
- p_clone = simulation.clone();
+ auto p_clone = simulation.clone();
EXPECT_NE(nullptr, p_clone->sample());
EXPECT_EQ(200u, p_clone->intensityMapSize());
EXPECT_NO_THROW(p_clone->result());
diff --git a/Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp b/Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp
index c7d1a4e1e882e1be8755b4c1316cc7903c462f4a..fa0e9fdfea739ff65a36225c1ae3016f3f97c78d 100644
--- a/Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp
+++ b/Tests/UnitTests/Core/Other/SampleBuilderNodeTest.cpp
@@ -47,7 +47,7 @@ TEST_F(SampleBuilderNodeTest, builderParameters)
// setting builder
std::shared_ptr<ISampleBuilder> builder(new SampleBuilderNodeTest::TestBuilder(33.0));
- builderNode.setSampleBuilder(builder);
+ builderNode.setSBN(builder);
EXPECT_EQ(bool(builderNode), true);
// checks that still no children
@@ -66,7 +66,7 @@ TEST_F(SampleBuilderNodeTest, builderParameters)
builderNode.reset();
EXPECT_EQ(builder.use_count(), 1);
EXPECT_EQ(builderNode.parameterPool()->size(), 0u);
- EXPECT_THROW(builderNode.createMultiLayer(), std::runtime_error);
+ EXPECT_DEATH(builderNode.createMultiLayer(), ".*");
}
//! Checks assignment operator.
@@ -75,7 +75,7 @@ TEST_F(SampleBuilderNodeTest, assignmentOperator)
{
SampleBuilderNode builderNode;
std::shared_ptr<ISampleBuilder> builder(new SampleBuilderNodeTest::TestBuilder(33.0));
- builderNode.setSampleBuilder(builder);
+ builderNode.setSBN(builder);
// checking assignment
SampleBuilderNode node2;
diff --git a/Tests/UnitTests/Core/Other/SampleProviderTest.cpp b/Tests/UnitTests/Core/Other/SampleProviderTest.cpp
index d5210516ce967b9c8e6808046732a576c3e48b49..0ad3003208c9483d945cd102b482f12691e3ef48 100644
--- a/Tests/UnitTests/Core/Other/SampleProviderTest.cpp
+++ b/Tests/UnitTests/Core/Other/SampleProviderTest.cpp
@@ -87,7 +87,7 @@ TEST_F(SampleProviderTest, sampleBuilder)
// Setting sample builder, original sample should gone.
std::shared_ptr<ISampleBuilder> builder(new SampleProviderTest::TestBuilder(33.0));
EXPECT_EQ(builder.use_count(), 1);
- provider.setSampleBuilder(builder);
+ provider.setBuilder(builder);
EXPECT_EQ(builder.use_count(), 2);
EXPECT_EQ(provider.sample(), nullptr);
@@ -153,7 +153,7 @@ TEST_F(SampleProviderTest, builderInSimulationContext)
SampleProvider& provider = sim.m_provider;
std::shared_ptr<ISampleBuilder> builder(new SampleProviderTest::TestBuilder(33.0));
- provider.setSampleBuilder(builder);
+ provider.setBuilder(builder);
provider.updateSample();
// provider's sample should not have neither parent nor children
diff --git a/auto/Wrap/doxygen_core.i b/auto/Wrap/doxygen_core.i
index 3aa5c53f4702c818d46de97d5007f5027eed0029..f35591954aac5501f373df67d03b4a5e1dfc7752 100644
--- a/auto/Wrap/doxygen_core.i
+++ b/auto/Wrap/doxygen_core.i
@@ -133,10 +133,7 @@ Provides exactly the same sample as SLDSlicedCylindersBuilder, but with cylinde
C++ includes: SlicedCylindersBuilder.h
";
-%feature("docstring") AveragedSlicedCylindersBuilder::AveragedSlicedCylindersBuilder "AveragedSlicedCylindersBuilder::AveragedSlicedCylindersBuilder()
-";
-
-%feature("docstring") AveragedSlicedCylindersBuilder::buildSample "MultiLayer * AveragedSlicedCylindersBuilder::buildSample() const override
+%feature("docstring") AveragedSlicedCylindersBuilder::buildSample "MultiLayer * AveragedSlicedCylindersBuilder::buildSample() const
";
@@ -282,7 +279,7 @@ C++ includes: ParaCrystalBuilder.h
%feature("docstring") Basic2DParaCrystalBuilder::buildSample "MultiLayer * Basic2DParaCrystalBuilder::buildSample() const
";
-%feature("docstring") Basic2DParaCrystalBuilder::createSample "MultiLayer * Basic2DParaCrystalBuilder::createSample(size_t index)
+%feature("docstring") Basic2DParaCrystalBuilder::createSampleByIndex "MultiLayer * Basic2DParaCrystalBuilder::createSampleByIndex(size_t index)
";
@@ -638,18 +635,6 @@ creation on Bin1DKVector from alpha and phi bins
";
-// File: classBoxCompositionBuilder.xml
-%feature("docstring") BoxCompositionBuilder "
-
-Parent class to test all kind of compositions made out of boxes. Reproduces Python functional test transform_BoxComposition.py
-
-C++ includes: BoxCompositionBuilder.h
-";
-
-%feature("docstring") BoxCompositionBuilder::BoxCompositionBuilder "BoxCompositionBuilder::BoxCompositionBuilder()
-";
-
-
// File: classBoxCompositionRotateXBuilder.xml
%feature("docstring") BoxCompositionRotateXBuilder "
@@ -658,9 +643,6 @@ Two boxes in particle composition rotated in X by 90 degrees.
C++ includes: BoxCompositionBuilder.h
";
-%feature("docstring") BoxCompositionRotateXBuilder::BoxCompositionRotateXBuilder "BoxCompositionRotateXBuilder::BoxCompositionRotateXBuilder()
-";
-
%feature("docstring") BoxCompositionRotateXBuilder::buildSample "MultiLayer * BoxCompositionRotateXBuilder::buildSample() const
";
@@ -673,9 +655,6 @@ Two boxes in particle composition rotated in Y by 90 degrees.
C++ includes: BoxCompositionBuilder.h
";
-%feature("docstring") BoxCompositionRotateYBuilder::BoxCompositionRotateYBuilder "BoxCompositionRotateYBuilder::BoxCompositionRotateYBuilder()
-";
-
%feature("docstring") BoxCompositionRotateYBuilder::buildSample "MultiLayer * BoxCompositionRotateYBuilder::buildSample() const
";
@@ -688,9 +667,6 @@ Two boxes in particle composition rotated in Z and Y by 90 degrees.
C++ includes: BoxCompositionBuilder.h
";
-%feature("docstring") BoxCompositionRotateZandYBuilder::BoxCompositionRotateZandYBuilder "BoxCompositionRotateZandYBuilder::BoxCompositionRotateZandYBuilder()
-";
-
%feature("docstring") BoxCompositionRotateZandYBuilder::buildSample "MultiLayer * BoxCompositionRotateZandYBuilder::buildSample() const
";
@@ -703,9 +679,6 @@ Two boxes in particle composition rotated in Z by 90 degrees.
C++ includes: BoxCompositionBuilder.h
";
-%feature("docstring") BoxCompositionRotateZBuilder::BoxCompositionRotateZBuilder "BoxCompositionRotateZBuilder::BoxCompositionRotateZBuilder()
-";
-
%feature("docstring") BoxCompositionRotateZBuilder::buildSample "MultiLayer * BoxCompositionRotateZBuilder::buildSample() const
";
@@ -718,9 +691,6 @@ Builds sample: square boxes in a square lattice
C++ includes: BoxesSquareLatticeBuilder.h
";
-%feature("docstring") BoxesSquareLatticeBuilder::BoxesSquareLatticeBuilder "BoxesSquareLatticeBuilder::BoxesSquareLatticeBuilder()
-";
-
%feature("docstring") BoxesSquareLatticeBuilder::buildSample "MultiLayer * BoxesSquareLatticeBuilder::buildSample() const
";
@@ -733,9 +703,6 @@ Two different boxes are first rotated and then composed, composition is then rot
C++ includes: BoxCompositionBuilder.h
";
-%feature("docstring") BoxStackCompositionBuilder::BoxStackCompositionBuilder "BoxStackCompositionBuilder::BoxStackCompositionBuilder()
-";
-
%feature("docstring") BoxStackCompositionBuilder::buildSample "MultiLayer * BoxStackCompositionBuilder::buildSample() const
";
@@ -757,9 +724,6 @@ Builds sample: 2D lattice with different disorder (IsGISAXS example #6).
C++ includes: TwoDimLatticeBuilder.h
";
-%feature("docstring") CenteredSquareLatticeBuilder::CenteredSquareLatticeBuilder "CenteredSquareLatticeBuilder::CenteredSquareLatticeBuilder()
-";
-
%feature("docstring") CenteredSquareLatticeBuilder::buildSample "MultiLayer * CenteredSquareLatticeBuilder::buildSample() const
";
@@ -1079,9 +1043,6 @@ Rotation and translation of core shell box particle in 3 layers system.
C++ includes: CoreShellParticleBuilder.h
";
-%feature("docstring") CoreShellBoxRotateZandYBuilder::CoreShellBoxRotateZandYBuilder "CoreShellBoxRotateZandYBuilder::CoreShellBoxRotateZandYBuilder()
-";
-
%feature("docstring") CoreShellBoxRotateZandYBuilder::buildSample "MultiLayer * CoreShellBoxRotateZandYBuilder::buildSample() const
";
@@ -1094,9 +1055,6 @@ Builds sample: Core Shell Nanoparticles (IsGISAXS example #11).
C++ includes: CoreShellParticleBuilder.h
";
-%feature("docstring") CoreShellParticleBuilder::CoreShellParticleBuilder "CoreShellParticleBuilder::CoreShellParticleBuilder()
-";
-
%feature("docstring") CoreShellParticleBuilder::buildSample "MultiLayer * CoreShellParticleBuilder::buildSample() const
";
@@ -1109,9 +1067,6 @@ Builds sample: cosine ripple within the 1D-paracrystal model.
C++ includes: RipplesBuilder.h
";
-%feature("docstring") CosineRippleBuilder::CosineRippleBuilder "CosineRippleBuilder::CosineRippleBuilder()
-";
-
%feature("docstring") CosineRippleBuilder::buildSample "MultiLayer * CosineRippleBuilder::buildSample() const
";
@@ -1257,9 +1212,6 @@ Builds sample: mixture of different particles (IsGISAXS example #7).
C++ includes: CustomMorphologyBuilder.h
";
-%feature("docstring") CustomMorphologyBuilder::CustomMorphologyBuilder "CustomMorphologyBuilder::CustomMorphologyBuilder()
-";
-
%feature("docstring") CustomMorphologyBuilder::buildSample "MultiLayer * CustomMorphologyBuilder::buildSample() const
";
@@ -1272,9 +1224,6 @@ Builds sample: mixture of cylinders and prisms without interference (IsGISAXS ex
C++ includes: CylindersAndPrismsBuilder.h
";
-%feature("docstring") CylindersAndPrismsBuilder::CylindersAndPrismsBuilder "CylindersAndPrismsBuilder::CylindersAndPrismsBuilder()
-";
-
%feature("docstring") CylindersAndPrismsBuilder::buildSample "MultiLayer * CylindersAndPrismsBuilder::buildSample() const
";
@@ -1317,9 +1266,6 @@ Builds sample: size spacing correlation approximation (IsGISAXS example #15).
C++ includes: SizeDistributionModelsBuilder.h
";
-%feature("docstring") CylindersInSSCABuilder::CylindersInSSCABuilder "CylindersInSSCABuilder::CylindersInSSCABuilder()
-";
-
%feature("docstring") CylindersInSSCABuilder::buildSample "MultiLayer * CylindersInSSCABuilder::buildSample() const
";
@@ -1332,9 +1278,6 @@ Cylinders in BA with size distributions (IsGISAXS example #3, part II).
C++ includes: ParticleDistributionsBuilder.h
";
-%feature("docstring") CylindersWithSizeDistributionBuilder::CylindersWithSizeDistributionBuilder "CylindersWithSizeDistributionBuilder::CylindersWithSizeDistributionBuilder()
-";
-
%feature("docstring") CylindersWithSizeDistributionBuilder::buildSample "MultiLayer * CylindersWithSizeDistributionBuilder::buildSample() const
";
@@ -2263,81 +2206,45 @@ Returns true if area defined by two bins is inside or on border of ellipse; more
";
-// File: classFeNiBiLayer.xml
-%feature("docstring") FeNiBiLayer "
+// File: classFeNiBilayerBuilder.xml
+%feature("docstring") FeNiBilayerBuilder "";
-Creates the sample demonstrating an Fe-Ni Bilayer with and without roughness
-
-C++ includes: FeNiBiLayerBuilder.h
+%feature("docstring") FeNiBilayerBuilder::buildSample "MultiLayer * FeNiBilayerBuilder::buildSample() const
";
-%feature("docstring") FeNiBiLayer::FeNiBiLayer "FeNiBiLayer::FeNiBiLayer()
-";
-%feature("docstring") FeNiBiLayer::FeNiBiLayer "FeNiBiLayer::FeNiBiLayer(Options opt)
-";
+// File: classFeNiBilayerNCBuilder.xml
+%feature("docstring") FeNiBilayerNCBuilder "";
-%feature("docstring") FeNiBiLayer::release "MultiLayer* FeNiBiLayer::release()
+%feature("docstring") FeNiBilayerNCBuilder::buildSample "MultiLayer * FeNiBilayerNCBuilder::buildSample() const
";
-// File: classFeNiBiLayerBuilder.xml
-%feature("docstring") FeNiBiLayerBuilder "";
+// File: classFeNiBilayerSpinFlipBuilder.xml
+%feature("docstring") FeNiBilayerSpinFlipBuilder "";
-%feature("docstring") FeNiBiLayerBuilder::FeNiBiLayerBuilder "FeNiBiLayerBuilder::FeNiBiLayerBuilder()
+%feature("docstring") FeNiBilayerSpinFlipBuilder::buildSample "MultiLayer * FeNiBilayerSpinFlipBuilder::buildSample() const
";
-%feature("docstring") FeNiBiLayerBuilder::buildSample "MultiLayer * FeNiBiLayerBuilder::buildSample() const
-";
+// File: classFeNiBilayerSpinFlipNCBuilder.xml
+%feature("docstring") FeNiBilayerSpinFlipNCBuilder "";
-// File: classFeNiBiLayerNCBuilder.xml
-%feature("docstring") FeNiBiLayerNCBuilder "";
-
-%feature("docstring") FeNiBiLayerNCBuilder::FeNiBiLayerNCBuilder "FeNiBiLayerNCBuilder::FeNiBiLayerNCBuilder()
-";
-
-%feature("docstring") FeNiBiLayerNCBuilder::buildSample "MultiLayer * FeNiBiLayerNCBuilder::buildSample() const
+%feature("docstring") FeNiBilayerSpinFlipNCBuilder::buildSample "MultiLayer * FeNiBilayerSpinFlipNCBuilder::buildSample() const
";
-// File: classFeNiBiLayerSpinFlipBuilder.xml
-%feature("docstring") FeNiBiLayerSpinFlipBuilder "";
-
-%feature("docstring") FeNiBiLayerSpinFlipBuilder::FeNiBiLayerSpinFlipBuilder "FeNiBiLayerSpinFlipBuilder::FeNiBiLayerSpinFlipBuilder()
-";
+// File: classFeNiBilayerSpinFlipTanhBuilder.xml
+%feature("docstring") FeNiBilayerSpinFlipTanhBuilder "";
-%feature("docstring") FeNiBiLayerSpinFlipBuilder::buildSample "MultiLayer * FeNiBiLayerSpinFlipBuilder::buildSample() const
+%feature("docstring") FeNiBilayerSpinFlipTanhBuilder::buildSample "MultiLayer * FeNiBilayerSpinFlipTanhBuilder::buildSample() const
";
-// File: classFeNiBiLayerSpinFlipNCBuilder.xml
-%feature("docstring") FeNiBiLayerSpinFlipNCBuilder "";
-
-%feature("docstring") FeNiBiLayerSpinFlipNCBuilder::FeNiBiLayerSpinFlipNCBuilder "FeNiBiLayerSpinFlipNCBuilder::FeNiBiLayerSpinFlipNCBuilder()
-";
+// File: classFeNiBilayerTanhBuilder.xml
+%feature("docstring") FeNiBilayerTanhBuilder "";
-%feature("docstring") FeNiBiLayerSpinFlipNCBuilder::buildSample "MultiLayer * FeNiBiLayerSpinFlipNCBuilder::buildSample() const
-";
-
-
-// File: classFeNiBiLayerSpinFlipTanhBuilder.xml
-%feature("docstring") FeNiBiLayerSpinFlipTanhBuilder "";
-
-%feature("docstring") FeNiBiLayerSpinFlipTanhBuilder::FeNiBiLayerSpinFlipTanhBuilder "FeNiBiLayerSpinFlipTanhBuilder::FeNiBiLayerSpinFlipTanhBuilder()
-";
-
-%feature("docstring") FeNiBiLayerSpinFlipTanhBuilder::buildSample "MultiLayer * FeNiBiLayerSpinFlipTanhBuilder::buildSample() const
-";
-
-
-// File: classFeNiBiLayerTanhBuilder.xml
-%feature("docstring") FeNiBiLayerTanhBuilder "";
-
-%feature("docstring") FeNiBiLayerTanhBuilder::FeNiBiLayerTanhBuilder "FeNiBiLayerTanhBuilder::FeNiBiLayerTanhBuilder()
-";
-
-%feature("docstring") FeNiBiLayerTanhBuilder::buildSample "MultiLayer * FeNiBiLayerTanhBuilder::buildSample() const
+%feature("docstring") FeNiBilayerTanhBuilder::buildSample "MultiLayer * FeNiBilayerTanhBuilder::buildSample() const
";
@@ -2363,9 +2270,6 @@ Builds sample: 2D finite lattice with thermal disorder.
C++ includes: TwoDimLatticeBuilder.h
";
-%feature("docstring") FiniteSquareLatticeBuilder::FiniteSquareLatticeBuilder "FiniteSquareLatticeBuilder::FiniteSquareLatticeBuilder()
-";
-
%feature("docstring") FiniteSquareLatticeBuilder::buildSample "MultiLayer * FiniteSquareLatticeBuilder::buildSample() const
";
@@ -5719,9 +5623,6 @@ Builds sample: cylinders with hard disk Percus-Yevick interference.
C++ includes: PercusYevickBuilder.h
";
-%feature("docstring") HardDiskBuilder::HardDiskBuilder "HardDiskBuilder::HardDiskBuilder()
-";
-
%feature("docstring") HardDiskBuilder::buildSample "MultiLayer * HardDiskBuilder::buildSample() const
";
@@ -5767,9 +5668,6 @@ Builds sample: cylinders with 2DDL structure factor (IsGISAXS example #4).
C++ includes: ParaCrystalBuilder.h
";
-%feature("docstring") HexParaCrystalBuilder::HexParaCrystalBuilder "HexParaCrystalBuilder::HexParaCrystalBuilder()
-";
-
%feature("docstring") HexParaCrystalBuilder::buildSample "MultiLayer * HexParaCrystalBuilder::buildSample() const
";
@@ -6036,9 +5934,6 @@ Builds a sample with 10 interchanging homogeneous layers of Ti and Ni on silicon
C++ includes: HomogeneousMultilayerBuilder.h
";
-%feature("docstring") HomogeneousMultilayerBuilder::HomogeneousMultilayerBuilder "HomogeneousMultilayerBuilder::HomogeneousMultilayerBuilder()
-";
-
%feature("docstring") HomogeneousMultilayerBuilder::buildSample "MultiLayer * HomogeneousMultilayerBuilder::buildSample() const
";
@@ -8368,7 +8263,9 @@ perform the actual integration over the ranges [min_array, max_array]
// File: classIntensityDataIOFactory.xml
%feature("docstring") IntensityDataIOFactory "
-Provides users with possibility to read and write IntensityData from/to files in different format. Type of the file will be deduced from file name. *.txt - ASCII file with 2D array [nrow][ncol], layout as in numpy. *.int - BornAgain internal ASCII format. *.tif - 32-bits tiff file. If file name ends woth \"*.gz\" or \"*.bz2\" the file will be zipped on the fly using appropriate algorithm. Usage:
+Provides users with possibility to read and write IntensityData from/to files in different format. Type of the file will be deduced from file name. *.txt - ASCII file with 2D array [nrow][ncol], layout as in numpy. *.int - BornAgain internal ASCII format. *.tif - 32-bits tiff file. If file name ends woth \"*.gz\" or \"*.bz2\" the file will be zipped on the fly using appropriate algorithm.
+
+Usage:
C++ includes: IntensityDataIOFactory.h
";
@@ -9517,7 +9414,7 @@ C++ includes: IRegistry.h
%feature("docstring") IRegistry::getItem "const ValueType* IRegistry< ValueType >::getItem(const std::string &key) const
";
-%feature("docstring") IRegistry::keys "std::vector<std::string> IRegistry< ValueType >::keys()
+%feature("docstring") IRegistry::keys "std::vector<std::string> IRegistry< ValueType >::keys() const
";
%feature("docstring") IRegistry::size "size_t IRegistry< ValueType >::size() const
@@ -9628,7 +9525,7 @@ C++ includes: ISampleBuilder.h
%feature("docstring") ISampleBuilder::buildSample "virtual MultiLayer* ISampleBuilder::buildSample() const =0
";
-%feature("docstring") ISampleBuilder::createSample "virtual MultiLayer* ISampleBuilder::createSample(size_t index)
+%feature("docstring") ISampleBuilder::createSampleByIndex "virtual MultiLayer* ISampleBuilder::createSampleByIndex(size_t index)
";
%feature("docstring") ISampleBuilder::size "virtual size_t ISampleBuilder::size()
@@ -9741,15 +9638,6 @@ Returns true if area defined by two bins is inside or on border of polygon (more
";
-// File: classISingleton.xml
-%feature("docstring") ISingleton "
-
-Base class for singletons.
-
-C++ includes: ISingleton.h
-";
-
-
// File: classIsotropicGaussPeakShape.xml
%feature("docstring") IsotropicGaussPeakShape "
@@ -9996,7 +9884,7 @@ C++ includes: NodeIterator.h
%feature("docstring") IteratorState::IteratorState "IteratorState::IteratorState(const INode *single_element)
";
-%feature("docstring") IteratorState::IteratorState "IteratorState::IteratorState(std::vector< const INode *> samples)
+%feature("docstring") IteratorState::IteratorState "IteratorState::IteratorState(std::vector< const INode * > samples)
";
%feature("docstring") IteratorState::~IteratorState "virtual IteratorState::~IteratorState()
@@ -10206,9 +10094,6 @@ Builds sample: cylinders with 1DDL structure factor.
C++ includes: LatticeBuilder.h
";
-%feature("docstring") Lattice1DBuilder::Lattice1DBuilder "Lattice1DBuilder::Lattice1DBuilder()
-";
-
%feature("docstring") Lattice1DBuilder::buildSample "MultiLayer * Lattice1DBuilder::buildSample() const
";
@@ -10477,7 +10362,7 @@ Returns lateral correlation length.
// File: classLayersWithAbsorptionBuilder.xml
%feature("docstring") LayersWithAbsorptionBuilder "
-The LayersWithAbsorptionBuilder class generates a multilayer with 3 layers with absorption (refractive index has imaginary part).The middle layer is populated with particles. Requires IComponentService which generates form factors, used for bulk form factors testing.
+The LayersWithAbsorptionBuilder class generates a multilayer with 3 layers with absorption (refractive index has imaginary part). The middle layer is populated with particles. Requires IComponentService which generates form factors, used for bulk form factors testing.
C++ includes: LayersWithAbsorptionBuilder.h
";
@@ -10491,7 +10376,7 @@ C++ includes: LayersWithAbsorptionBuilder.h
%feature("docstring") LayersWithAbsorptionBuilder::buildSample "MultiLayer * LayersWithAbsorptionBuilder::buildSample() const
";
-%feature("docstring") LayersWithAbsorptionBuilder::createSample "MultiLayer * LayersWithAbsorptionBuilder::createSample(size_t index)
+%feature("docstring") LayersWithAbsorptionBuilder::createSampleByIndex "MultiLayer * LayersWithAbsorptionBuilder::createSampleByIndex(size_t index)
";
%feature("docstring") LayersWithAbsorptionBuilder::size "size_t LayersWithAbsorptionBuilder::size()
@@ -10506,12 +10391,6 @@ The LayersWithAbsorptionBySLDBuilder class generates a multilayer with 3 layers
C++ includes: LayersWithAbsorptionBySLDBuilder.h
";
-%feature("docstring") LayersWithAbsorptionBySLDBuilder::LayersWithAbsorptionBySLDBuilder "LayersWithAbsorptionBySLDBuilder::LayersWithAbsorptionBySLDBuilder()
-";
-
-%feature("docstring") LayersWithAbsorptionBySLDBuilder::~LayersWithAbsorptionBySLDBuilder "LayersWithAbsorptionBySLDBuilder::~LayersWithAbsorptionBySLDBuilder()
-";
-
%feature("docstring") LayersWithAbsorptionBySLDBuilder::buildSample "MultiLayer * LayersWithAbsorptionBySLDBuilder::buildSample() const
";
@@ -10721,9 +10600,6 @@ Builds sample: cylinders with magnetic material and non-zero magnetic field.
C++ includes: MagneticParticlesBuilder.h
";
-%feature("docstring") MagneticCylindersBuilder::MagneticCylindersBuilder "MagneticCylindersBuilder::MagneticCylindersBuilder()
-";
-
%feature("docstring") MagneticCylindersBuilder::buildSample "MultiLayer * MagneticCylindersBuilder::buildSample() const
";
@@ -10736,9 +10612,6 @@ Builds sample: magnetic spheres in a magnetized layer on a non-magnetized substr
C++ includes: MagneticLayersBuilder.h
";
-%feature("docstring") MagneticLayerBuilder::MagneticLayerBuilder "MagneticLayerBuilder::MagneticLayerBuilder()
-";
-
%feature("docstring") MagneticLayerBuilder::buildSample "MultiLayer * MagneticLayerBuilder::buildSample() const
";
@@ -10799,9 +10672,6 @@ Builds sample: cylinders with magnetic material and zero magnetic field.
C++ includes: MagneticParticlesBuilder.h
";
-%feature("docstring") MagneticParticleZeroFieldBuilder::MagneticParticleZeroFieldBuilder "MagneticParticleZeroFieldBuilder::MagneticParticleZeroFieldBuilder()
-";
-
%feature("docstring") MagneticParticleZeroFieldBuilder::buildSample "MultiLayer * MagneticParticleZeroFieldBuilder::buildSample() const
";
@@ -10814,9 +10684,6 @@ Builds sample: rotated magnetic spheres in substrate layer with a unit magnetic
C++ includes: MagneticLayersBuilder.h
";
-%feature("docstring") MagneticRotationBuilder::MagneticRotationBuilder "MagneticRotationBuilder::MagneticRotationBuilder()
-";
-
%feature("docstring") MagneticRotationBuilder::buildSample "MultiLayer * MagneticRotationBuilder::buildSample() const
";
@@ -10829,9 +10696,6 @@ Builds sample: spheres with magnetization inside substrate.
C++ includes: MagneticParticlesBuilder.h
";
-%feature("docstring") MagneticSpheresBuilder::MagneticSpheresBuilder "MagneticSpheresBuilder::MagneticSpheresBuilder()
-";
-
%feature("docstring") MagneticSpheresBuilder::buildSample "MultiLayer * MagneticSpheresBuilder::buildSample() const
";
@@ -10844,9 +10708,6 @@ Builds sample: spheres in substrate layer with a zero magnetic field.
C++ includes: MagneticLayersBuilder.h
";
-%feature("docstring") MagneticSubstrateZeroFieldBuilder::MagneticSubstrateZeroFieldBuilder "MagneticSubstrateZeroFieldBuilder::MagneticSubstrateZeroFieldBuilder()
-";
-
%feature("docstring") MagneticSubstrateZeroFieldBuilder::buildSample "MultiLayer * MagneticSubstrateZeroFieldBuilder::buildSample() const
";
@@ -11240,9 +11101,6 @@ Builds sample: cylindrical mesocrystal composed of spheres in a cubic lattice.
C++ includes: MesoCrystalBuilder.h
";
-%feature("docstring") MesoCrystalBuilder::MesoCrystalBuilder "MesoCrystalBuilder::MesoCrystalBuilder()
-";
-
%feature("docstring") MesoCrystalBuilder::buildSample "MultiLayer * MesoCrystalBuilder::buildSample() const
";
@@ -11365,7 +11223,7 @@ Indicates if the peak shape encodes angular disorder, in which case all peaks in
// File: classMultiLayer.xml
%feature("docstring") MultiLayer "
-Our sample model: a stack of layers one below the other.Example of system of 4 layers (3 interfaces):
+Our sample model: a stack of layers one below the other. Example of system of 4 layers (3 interfaces):
ambience layer #0 ------ interface #0 z=0.0 Fe, 20A layer #1 ------ interface #1 z=-20.0 Cr, 40A layer #2 ------ interface #2 z=-60.0 substrate layer #3
@@ -11453,9 +11311,6 @@ Builds sample: layers with correlated roughness.
C++ includes: MultiLayerWithNCRoughnessBuilder.h
";
-%feature("docstring") MultiLayerWithNCRoughnessBuilder::MultiLayerWithNCRoughnessBuilder "MultiLayerWithNCRoughnessBuilder::MultiLayerWithNCRoughnessBuilder()
-";
-
%feature("docstring") MultiLayerWithNCRoughnessBuilder::buildSample "MultiLayer * MultiLayerWithNCRoughnessBuilder::buildSample() const override
";
@@ -11468,9 +11323,6 @@ Builds sample: layers with correlated roughness.
C++ includes: MultiLayerWithRoughnessBuilder.h
";
-%feature("docstring") MultiLayerWithRoughnessBuilder::MultiLayerWithRoughnessBuilder "MultiLayerWithRoughnessBuilder::MultiLayerWithRoughnessBuilder()
-";
-
%feature("docstring") MultiLayerWithRoughnessBuilder::buildSample "MultiLayer * MultiLayerWithRoughnessBuilder::buildSample() const
";
@@ -11483,9 +11335,6 @@ Builds sample: mixture of cylinders and prisms without interference, using multi
C++ includes: MultipleLayoutBuilder.h
";
-%feature("docstring") MultipleLayoutBuilder::MultipleLayoutBuilder "MultipleLayoutBuilder::MultipleLayoutBuilder()
-";
-
%feature("docstring") MultipleLayoutBuilder::buildSample "MultiLayer * MultipleLayoutBuilder::buildSample() const
";
@@ -11725,37 +11574,6 @@ C++ includes: ZLimits.h
";
-// File: classFeNiBiLayer_1_1Options.xml
-%feature("docstring") FeNiBiLayer::Options "";
-
-%feature("docstring") FeNiBiLayer::Options::Options "FeNiBiLayer::Options::Options()
-";
-
-%feature("docstring") FeNiBiLayer::Options::NBiLayers "Options FeNiBiLayer::Options::NBiLayers(int n)
-";
-
-%feature("docstring") FeNiBiLayer::Options::angle "Options FeNiBiLayer::Options::angle(double angle)
-";
-
-%feature("docstring") FeNiBiLayer::Options::magnetizationMagnitude "Options FeNiBiLayer::Options::magnetizationMagnitude(double M)
-";
-
-%feature("docstring") FeNiBiLayer::Options::thicknessFe "Options FeNiBiLayer::Options::thicknessFe(double t)
-";
-
-%feature("docstring") FeNiBiLayer::Options::thicknessNi "Options FeNiBiLayer::Options::thicknessNi(double t)
-";
-
-%feature("docstring") FeNiBiLayer::Options::sigmaRoughness "Options FeNiBiLayer::Options::sigmaRoughness(double r)
-";
-
-%feature("docstring") FeNiBiLayer::Options::effectiveSLD "Options FeNiBiLayer::Options::effectiveSLD(int i)
-";
-
-%feature("docstring") FeNiBiLayer::Options::roughnessModel "Options FeNiBiLayer::Options::roughnessModel(RoughnessModel rm)
-";
-
-
// File: classOrderedMap.xml
%feature("docstring") OrderedMap "
@@ -12420,7 +12238,7 @@ Returns number of parameters in the pool.
Adds parameter to the pool, and returns reference to the input pointer.
-Returning the input pointer allows us to concatenate function calls like pool->addParameter( new RealParameter(...) ).setLimits(-1,+1).setFixed().setUnit(\"nm\")
+Returning the input pointer allows us to concatenate function calls like pool->addParameter( new RealParameter(...) ).setLimits(-1,+1).setFixed().setUnit(\"nm\")
";
%feature("docstring") ParameterPool::parameter "RealParameter * ParameterPool::parameter(const std::string &name)
@@ -12606,9 +12424,6 @@ Builds sample: two layers of spheres at hex lattice.
C++ includes: ParticleCompositionBuilder.h
";
-%feature("docstring") ParticleCompositionBuilder::ParticleCompositionBuilder "ParticleCompositionBuilder::ParticleCompositionBuilder()
-";
-
%feature("docstring") ParticleCompositionBuilder::buildSample "MultiLayer * ParticleCompositionBuilder::buildSample() const
";
@@ -12711,24 +12526,24 @@ Returns a vector of children (const).
";
-// File: classParticleInTheAirBuilder.xml
-%feature("docstring") ParticleInTheAirBuilder "
+// File: classParticleInVacuumBuilder.xml
+%feature("docstring") ParticleInVacuumBuilder "
-The ParticleInTheAirBuilder class generates a multilayer with single air layer populated with particles of certain types. Requires IComponentService which generates form factors, used for bulk form factors testing.
+The ParticleInVacuumBuilder class generates a multilayer with single vacuum layer populated with particles of certain types. Requires IComponentService which generates form factors, used for bulk form factors testing.
-C++ includes: ParticleInTheAirBuilder.h
+C++ includes: ParticleInVacuumBuilder.h
";
-%feature("docstring") ParticleInTheAirBuilder::ParticleInTheAirBuilder "ParticleInTheAirBuilder::ParticleInTheAirBuilder()
+%feature("docstring") ParticleInVacuumBuilder::ParticleInVacuumBuilder "ParticleInVacuumBuilder::ParticleInVacuumBuilder()
";
-%feature("docstring") ParticleInTheAirBuilder::buildSample "MultiLayer * ParticleInTheAirBuilder::buildSample() const
+%feature("docstring") ParticleInVacuumBuilder::buildSample "MultiLayer * ParticleInVacuumBuilder::buildSample() const
";
-%feature("docstring") ParticleInTheAirBuilder::createSample "MultiLayer * ParticleInTheAirBuilder::createSample(size_t index)
+%feature("docstring") ParticleInVacuumBuilder::createSampleByIndex "MultiLayer * ParticleInVacuumBuilder::createSampleByIndex(size_t index)
";
-%feature("docstring") ParticleInTheAirBuilder::size "size_t ParticleInTheAirBuilder::size()
+%feature("docstring") ParticleInVacuumBuilder::size "size_t ParticleInVacuumBuilder::size()
";
@@ -12960,6 +12775,43 @@ weight_factors:
user-defined weighting factors. Used linearly, no matter which norm is chosen.
";
+%feature("docstring") PoissonLikeMetric::computeFromArrays "double Chi2Metric::computeFromArrays(std::vector< double > sim_data, std::vector< double > exp_data, std::vector< double > uncertainties, std::vector< double > weight_factors) const override
+
+Computes metric value from data arrays. Negative values in exp_data are ignored as well as non-positive weight_factors and uncertainties. All arrays involved in the computation must be of the same size.
+
+Parameters:
+-----------
+
+sim_data:
+array with simulated intensities.
+
+exp_data:
+array with intensity values obtained from an experiment.
+
+uncertainties:
+array with experimental data uncertainties.
+
+weight_factors:
+user-defined weighting factors. Used linearly, no matter which norm is chosen.
+";
+
+%feature("docstring") PoissonLikeMetric::computeFromArrays "double Chi2Metric::computeFromArrays(std::vector< double > sim_data, std::vector< double > exp_data, std::vector< double > weight_factors) const override
+
+Computes metric value from data arrays. Negative values in exp_data are ignored as well as non-positive weight_factors. All arrays involved in the computation must be of the same size.
+
+Parameters:
+-----------
+
+sim_data:
+array with simulated intensities.
+
+exp_data:
+array with intensity values obtained from an experiment.
+
+weight_factors:
+user-defined weighting factors. Used linearly, no matter which norm is chosen.
+";
+
// File: classPoissonNoiseBackground.xml
%feature("docstring") PoissonNoiseBackground "
@@ -13025,7 +12877,7 @@ Gets the polarization analyzer operator (in spin basis along z-axis)
// File: classPolygon.xml
%feature("docstring") Polygon "
-A polygon in 2D space.Polygon defined by two arrays with x and y coordinates of points. Sizes of arrays should coincide. If polygon is unclosed (the last point doesn't repeat the first one), it will be closed automatically.
+A polygon in 2D space. Polygon defined by two arrays with x and y coordinates of points. Sizes of arrays should coincide. If polygon is unclosed (the last point doesn't repeat the first one), it will be closed automatically.
C++ includes: Polygon.h
";
@@ -13589,9 +13441,6 @@ Builds sample: cylinders with 1DDL structure factor (IsGISAXS example #4).
C++ includes: ParaCrystalBuilder.h
";
-%feature("docstring") RadialParaCrystalBuilder::RadialParaCrystalBuilder "RadialParaCrystalBuilder::RadialParaCrystalBuilder()
-";
-
%feature("docstring") RadialParaCrystalBuilder::buildSample "MultiLayer * RadialParaCrystalBuilder::buildSample() const
";
@@ -14094,9 +13943,6 @@ Builds sample: 2D paracrystal lattice (IsGISAXS example #8).
C++ includes: ParaCrystalBuilder.h
";
-%feature("docstring") RectParaCrystalBuilder::RectParaCrystalBuilder "RectParaCrystalBuilder::RectParaCrystalBuilder()
-";
-
%feature("docstring") RectParaCrystalBuilder::buildSample "MultiLayer * RectParaCrystalBuilder::buildSample() const
";
@@ -14238,6 +14084,43 @@ weight_factors:
user-defined weighting factors. Used linearly, no matter which norm is chosen.
";
+%feature("docstring") RelativeDifferenceMetric::computeFromArrays "double Chi2Metric::computeFromArrays(std::vector< double > sim_data, std::vector< double > exp_data, std::vector< double > uncertainties, std::vector< double > weight_factors) const override
+
+Computes metric value from data arrays. Negative values in exp_data are ignored as well as non-positive weight_factors and uncertainties. All arrays involved in the computation must be of the same size.
+
+Parameters:
+-----------
+
+sim_data:
+array with simulated intensities.
+
+exp_data:
+array with intensity values obtained from an experiment.
+
+uncertainties:
+array with experimental data uncertainties.
+
+weight_factors:
+user-defined weighting factors. Used linearly, no matter which norm is chosen.
+";
+
+%feature("docstring") RelativeDifferenceMetric::computeFromArrays "double Chi2Metric::computeFromArrays(std::vector< double > sim_data, std::vector< double > exp_data, std::vector< double > weight_factors) const override
+
+Computes metric value from data arrays. Negative values in exp_data are ignored as well as non-positive weight_factors. All arrays involved in the computation must be of the same size.
+
+Parameters:
+-----------
+
+sim_data:
+array with simulated intensities.
+
+exp_data:
+array with intensity values obtained from an experiment.
+
+weight_factors:
+user-defined weighting factors. Used linearly, no matter which norm is chosen.
+";
+
// File: classResolutionFunction2DGaussian.xml
%feature("docstring") ResolutionFunction2DGaussian "
@@ -14326,9 +14209,6 @@ Builds sample: Pyramids, rotated pyramids on top of substrate (IsGISAXS example
C++ includes: RotatedPyramidsBuilder.h
";
-%feature("docstring") RotatedPyramidsBuilder::RotatedPyramidsBuilder "RotatedPyramidsBuilder::RotatedPyramidsBuilder()
-";
-
%feature("docstring") RotatedPyramidsBuilder::buildSample "MultiLayer * RotatedPyramidsBuilder::buildSample() const
";
@@ -14356,9 +14236,6 @@ Builds sample: 2D lattice with different disorder (IsGISAXS example #6).
C++ includes: TwoDimLatticeBuilder.h
";
-%feature("docstring") RotatedSquareLatticeBuilder::RotatedSquareLatticeBuilder "RotatedSquareLatticeBuilder::RotatedSquareLatticeBuilder()
-";
-
%feature("docstring") RotatedSquareLatticeBuilder::buildSample "MultiLayer * RotatedSquareLatticeBuilder::buildSample() const
";
@@ -14659,7 +14536,7 @@ C++ includes: SampleBuilderFactory.h
%feature("docstring") SampleBuilderFactory::SampleBuilderFactory "SampleBuilderFactory::SampleBuilderFactory()
";
-%feature("docstring") SampleBuilderFactory::createSample "MultiLayer * SampleBuilderFactory::createSample(const std::string &name)
+%feature("docstring") SampleBuilderFactory::createSampleByName "MultiLayer * SampleBuilderFactory::createSampleByName(const std::string &name)
Retrieves a SampleBuilder from the registry, does the build, and returns the result.
";
@@ -15155,9 +15032,6 @@ Builds sample: ambient and one magnetized layer on a non-magnetized substrate.
C++ includes: MagneticLayersBuilder.h
";
-%feature("docstring") SimpleMagneticLayerBuilder::SimpleMagneticLayerBuilder "SimpleMagneticLayerBuilder::SimpleMagneticLayerBuilder()
-";
-
%feature("docstring") SimpleMagneticLayerBuilder::buildSample "MultiLayer * SimpleMagneticLayerBuilder::buildSample() const
";
@@ -15170,13 +15044,10 @@ Builds sample: magnetic layer on a magnetic substrate with the fields rotated by
C++ includes: MagneticLayersBuilder.h
";
-%feature("docstring") SimpleMagneticRotationBuilder::SimpleMagneticRotationBuilder "SimpleMagneticRotationBuilder::SimpleMagneticRotationBuilder()
-";
-
%feature("docstring") SimpleMagneticRotationBuilder::buildSample "MultiLayer * SimpleMagneticRotationBuilder::buildSample() const override
";
-%feature("docstring") SimpleMagneticRotationBuilder::createSample "MultiLayer * SimpleMagneticRotationBuilder::createSample(size_t index) override
+%feature("docstring") SimpleMagneticRotationBuilder::createSampleByIndex "MultiLayer * SimpleMagneticRotationBuilder::createSampleByIndex(size_t index) override
";
%feature("docstring") SimpleMagneticRotationBuilder::size "size_t SimpleMagneticRotationBuilder::size() override
@@ -15780,9 +15651,6 @@ Creates the sample demonstrating size distribution model in decoupling approxima
C++ includes: SizeDistributionModelsBuilder.h
";
-%feature("docstring") SizeDistributionDAModelBuilder::SizeDistributionDAModelBuilder "SizeDistributionDAModelBuilder::SizeDistributionDAModelBuilder()
-";
-
%feature("docstring") SizeDistributionDAModelBuilder::buildSample "MultiLayer * SizeDistributionDAModelBuilder::buildSample() const
";
@@ -15795,9 +15663,6 @@ Creates the sample demonstrating size distribution model in local monodisperse a
C++ includes: SizeDistributionModelsBuilder.h
";
-%feature("docstring") SizeDistributionLMAModelBuilder::SizeDistributionLMAModelBuilder "SizeDistributionLMAModelBuilder::SizeDistributionLMAModelBuilder()
-";
-
%feature("docstring") SizeDistributionLMAModelBuilder::buildSample "MultiLayer * SizeDistributionLMAModelBuilder::buildSample() const
";
@@ -15810,9 +15675,6 @@ Creates the sample demonstrating size distribution model in size space coupling
C++ includes: SizeDistributionModelsBuilder.h
";
-%feature("docstring") SizeDistributionSSCAModelBuilder::SizeDistributionSSCAModelBuilder "SizeDistributionSSCAModelBuilder::SizeDistributionSSCAModelBuilder()
-";
-
%feature("docstring") SizeDistributionSSCAModelBuilder::buildSample "MultiLayer * SizeDistributionSSCAModelBuilder::buildSample() const
";
@@ -15825,10 +15687,7 @@ Provides exactly the same sample as SlicedCylindersBuilder, but with sld-based
C++ includes: SlicedCylindersBuilder.h
";
-%feature("docstring") SLDSlicedCylindersBuilder::SLDSlicedCylindersBuilder "SLDSlicedCylindersBuilder::SLDSlicedCylindersBuilder()
-";
-
-%feature("docstring") SLDSlicedCylindersBuilder::buildSample "MultiLayer * SLDSlicedCylindersBuilder::buildSample() const override
+%feature("docstring") SLDSlicedCylindersBuilder::buildSample "MultiLayer * SLDSlicedCylindersBuilder::buildSample() const
";
@@ -15897,9 +15756,6 @@ Builds sample: spherical composition made of top+bottom spherical cups
C++ includes: SlicedCompositionBuilder.h
";
-%feature("docstring") SlicedCompositionBuilder::SlicedCompositionBuilder "SlicedCompositionBuilder::SlicedCompositionBuilder()
-";
-
%feature("docstring") SlicedCompositionBuilder::buildSample "MultiLayer * SlicedCompositionBuilder::buildSample() const
";
@@ -15912,10 +15768,7 @@ Builds sample: cylinders on a silicon substrate
C++ includes: SlicedCylindersBuilder.h
";
-%feature("docstring") SlicedCylindersBuilder::SlicedCylindersBuilder "SlicedCylindersBuilder::SlicedCylindersBuilder()
-";
-
-%feature("docstring") SlicedCylindersBuilder::buildSample "MultiLayer * SlicedCylindersBuilder::buildSample() const override
+%feature("docstring") SlicedCylindersBuilder::buildSample "MultiLayer * SlicedCylindersBuilder::buildSample() const
";
@@ -16533,9 +16386,6 @@ Builds sample: 2D finite lattice of 2D finite lattices (superlattice).
C++ includes: TwoDimLatticeBuilder.h
";
-%feature("docstring") SuperLatticeBuilder::SuperLatticeBuilder "SuperLatticeBuilder::SuperLatticeBuilder()
-";
-
%feature("docstring") SuperLatticeBuilder::buildSample "MultiLayer * SuperLatticeBuilder::buildSample() const
";
@@ -16543,9 +16393,6 @@ C++ includes: TwoDimLatticeBuilder.h
// File: classThickAbsorptiveSampleBuilder.xml
%feature("docstring") ThickAbsorptiveSampleBuilder "";
-%feature("docstring") ThickAbsorptiveSampleBuilder::ThickAbsorptiveSampleBuilder "ThickAbsorptiveSampleBuilder::ThickAbsorptiveSampleBuilder()
-";
-
%feature("docstring") ThickAbsorptiveSampleBuilder::buildSample "MultiLayer * ThickAbsorptiveSampleBuilder::buildSample() const override
";
@@ -16683,9 +16530,6 @@ Rotated box in 3 layers system.
C++ includes: TransformationsBuilder.h
";
-%feature("docstring") TransformBoxBuilder::TransformBoxBuilder "TransformBoxBuilder::TransformBoxBuilder()
-";
-
%feature("docstring") TransformBoxBuilder::buildSample "MultiLayer * TransformBoxBuilder::buildSample() const
";
@@ -16738,9 +16582,6 @@ Builds sample: two layers with rough interface.
C++ includes: TwoLayerRoughnessBuilder.h
";
-%feature("docstring") TwoLayerRoughnessBuilder::TwoLayerRoughnessBuilder "TwoLayerRoughnessBuilder::TwoLayerRoughnessBuilder()
-";
-
%feature("docstring") TwoLayerRoughnessBuilder::buildSample "MultiLayer * TwoLayerRoughnessBuilder::buildSample() const
";
@@ -17101,10 +16942,10 @@ C++ includes: WavevectorInfo.h
";
-// File: classFourierTransform_1_1Workspace.xml
+// File: classConvolve_1_1Workspace.xml
-// File: classConvolve_1_1Workspace.xml
+// File: classFourierTransform_1_1Workspace.xml
// File: classZLimits.xml
@@ -17134,193 +16975,205 @@ C++ includes: ZLimits.h
";
-// File: namespace_0D106.xml
+// File: namespace_0d105.xml
-// File: namespace_0D112.xml
+// File: namespace_0d111.xml
-// File: namespace_0D116.xml
+// File: namespace_0d115.xml
-// File: namespace_0D147.xml
+// File: namespace_0d146.xml
-// File: namespace_0D159.xml
+// File: namespace_0d158.xml
-// File: namespace_0D16.xml
+// File: namespace_0d16.xml
-// File: namespace_0D167.xml
+// File: namespace_0d166.xml
-// File: namespace_0D172.xml
+// File: namespace_0d171.xml
-// File: namespace_0D181.xml
+// File: namespace_0d180.xml
-// File: namespace_0D183.xml
+// File: namespace_0d182.xml
-// File: namespace_0D187.xml
+// File: namespace_0d186.xml
-// File: namespace_0D2.xml
+// File: namespace_0d2.xml
-// File: namespace_0D24.xml
+// File: namespace_0d24.xml
-// File: namespace_0D249.xml
+// File: namespace_0d248.xml
-// File: namespace_0D252.xml
+// File: namespace_0d251.xml
-// File: namespace_0D254.xml
+// File: namespace_0d253.xml
-// File: namespace_0D263.xml
+// File: namespace_0d262.xml
-// File: namespace_0D267.xml
+// File: namespace_0d266.xml
-// File: namespace_0D271.xml
+// File: namespace_0d270.xml
-// File: namespace_0D277.xml
+// File: namespace_0d276.xml
-// File: namespace_0D281.xml
+// File: namespace_0d280.xml
-// File: namespace_0D295.xml
+// File: namespace_0d294.xml
-// File: namespace_0D319.xml
+// File: namespace_0d318.xml
-// File: namespace_0D326.xml
+// File: namespace_0d325.xml
-// File: namespace_0D328.xml
+// File: namespace_0d327.xml
-// File: namespace_0D330.xml
+// File: namespace_0d329.xml
-// File: namespace_0D350.xml
+// File: namespace_0d349.xml
-// File: namespace_0D354.xml
+// File: namespace_0d353.xml
-// File: namespace_0D358.xml
+// File: namespace_0d357.xml
-// File: namespace_0D372.xml
+// File: namespace_0d371.xml
-// File: namespace_0D381.xml
+// File: namespace_0d380.xml
-// File: namespace_0D385.xml
+// File: namespace_0d384.xml
-// File: namespace_0D395.xml
+// File: namespace_0d394.xml
-// File: namespace_0D397.xml
+// File: namespace_0d396.xml
-// File: namespace_0D4.xml
+// File: namespace_0d4.xml
-// File: namespace_0D403.xml
+// File: namespace_0d402.xml
-// File: namespace_0D405.xml
+// File: namespace_0d404.xml
-// File: namespace_0D407.xml
+// File: namespace_0d406.xml
-// File: namespace_0D409.xml
+// File: namespace_0d408.xml
-// File: namespace_0D411.xml
+// File: namespace_0d410.xml
-// File: namespace_0D413.xml
+// File: namespace_0d412.xml
-// File: namespace_0D417.xml
+// File: namespace_0d416.xml
-// File: namespace_0D419.xml
+// File: namespace_0d418.xml
-// File: namespace_0D429.xml
+// File: namespace_0d428.xml
-// File: namespace_0D442.xml
+// File: namespace_0d441.xml
-// File: namespace_0D451.xml
+// File: namespace_0d450.xml
-// File: namespace_0D453.xml
+// File: namespace_0d452.xml
-// File: namespace_0D469.xml
+// File: namespace_0d468.xml
-// File: namespace_0D490.xml
+// File: namespace_0d489.xml
-// File: namespace_0D497.xml
+// File: namespace_0d496.xml
-// File: namespace_0D499.xml
+// File: namespace_0d498.xml
-// File: namespace_0D504.xml
+// File: namespace_0d504.xml
-// File: namespace_0D514.xml
+// File: namespace_0d516.xml
-// File: namespace_0D537.xml
+// File: namespace_0d539.xml
-// File: namespace_0D545.xml
+// File: namespace_0d547.xml
-// File: namespace_0D551.xml
+// File: namespace_0d553.xml
-// File: namespace_0D553.xml
+// File: namespace_0d555.xml
-// File: namespace_0D581.xml
+// File: namespace_0d571.xml
-// File: namespace_0D630.xml
+// File: namespace_0d583.xml
-// File: namespace_0D86.xml
+// File: namespace_0d589.xml
-// File: namespace_0D88.xml
+// File: namespace_0d593.xml
-// File: namespace_0D90.xml
+// File: namespace_0d611.xml
-// File: namespace_0D94.xml
+// File: namespace_0d630.xml
+
+
+// File: namespace_0d85.xml
+
+
+// File: namespace_0d87.xml
+
+
+// File: namespace_0d89.xml
+
+
+// File: namespace_0d93.xml
// File: namespacealgo.xml
@@ -17703,7 +17556,7 @@ Function for calculating the reduced potential, used for obtaining the Fresnel c
Utility to compute magnetization correction for reduced potential and scattering length density.
";
-%feature("docstring") MaterialUtils::checkMaterialTypes "MATERIAL_TYPES MaterialUtils::checkMaterialTypes(const std::vector< const Material *> &materials)
+%feature("docstring") MaterialUtils::checkMaterialTypes "MATERIAL_TYPES MaterialUtils::checkMaterialTypes(const std::vector< const Material * > &materials)
Checks if all non-default materials in materials are of the same type and returns this type. If several types of materials are involved, InvalidMaterialType identifier is returned.
";
@@ -18133,6 +17986,9 @@ A path to import BornAgain library. If empty, relies on PYTHONPATH
";
+// File: namespacerefMat.xml
+
+
// File: namespaceripples.xml
%feature("docstring") ripples::factor_x_box "complex_t ripples::factor_x_box(complex_t q, double l)
";
@@ -18506,9 +18362,6 @@ Returns exp(I*z), where I is the imaginary unit.
// File: ICloneable_8h.xml
-// File: ISingleton_8h.xml
-
-
// File: MathConstants_8h.xml
@@ -20052,6 +19905,9 @@ Creates averaged material. Square refractive index of returned material is arith
// File: ScalarRTCoefficients_8h.xml
+// File: IRegistry_8h.xml
+
+
// File: ISampleBuilder_8cpp.xml
@@ -20064,6 +19920,12 @@ Creates averaged material. Square refractive index of returned material is arith
// File: SampleBuilderNode_8h.xml
+// File: SampleComponents_8cpp.xml
+
+
+// File: SampleComponents_8h.xml
+
+
// File: SampleProvider_8cpp.xml
@@ -20339,10 +20201,10 @@ Generate vertices of centered ellipse with given semi-axes at height z.
// File: CylindersBuilder_8h.xml
-// File: FeNiBiLayerBuilder_8cpp.xml
+// File: FeNiBilayerBuilder_8cpp.xml
-// File: FeNiBiLayerBuilder_8h.xml
+// File: FeNiBilayerBuilder_8h.xml
// File: HomogeneousMultilayerBuilder_8cpp.xml
@@ -20351,9 +20213,6 @@ Generate vertices of centered ellipse with given semi-axes at height z.
// File: HomogeneousMultilayerBuilder_8h.xml
-// File: IRegistry_8h.xml
-
-
// File: LatticeBuilder_8cpp.xml
@@ -20428,10 +20287,10 @@ Generate vertices of centered ellipse with given semi-axes at height z.
// File: ParticleDistributionsBuilder_8h.xml
-// File: ParticleInTheAirBuilder_8cpp.xml
+// File: ParticleInVacuumBuilder_8cpp.xml
-// File: ParticleInTheAirBuilder_8h.xml
+// File: ParticleInVacuumBuilder_8h.xml
// File: PercusYevickBuilder_8cpp.xml
@@ -20446,6 +20305,9 @@ Generate vertices of centered ellipse with given semi-axes at height z.
// File: PlainMultiLayerBySLDBuilder_8h.xml
+// File: ReferenceMaterials_8h.xml
+
+
// File: ResonatorBuilder_8cpp.xml
@@ -20470,12 +20332,6 @@ Generate vertices of centered ellipse with given semi-axes at height z.
// File: SampleBuilderFactory_8h.xml
-// File: SampleComponents_8cpp.xml
-
-
-// File: SampleComponents_8h.xml
-
-
// File: SizeDistributionModelsBuilder_8cpp.xml
diff --git a/auto/Wrap/doxygen_fit.i b/auto/Wrap/doxygen_fit.i
index 1e7c7b83d3bcb821d3ba1113710c6adc60944693..5c21bb88aa3dbec62e22a87db8d1490042884fd1 100644
--- a/auto/Wrap/doxygen_fit.i
+++ b/auto/Wrap/doxygen_fit.i
@@ -1375,28 +1375,28 @@ Internal state of a WallclockTimer object.
";
-// File: namespace_0D11.xml
+// File: namespace_0d11.xml
-// File: namespace_0D25.xml
+// File: namespace_0d25.xml
-// File: namespace_0D29.xml
+// File: namespace_0d29.xml
-// File: namespace_0D31.xml
+// File: namespace_0d31.xml
-// File: namespace_0D35.xml
+// File: namespace_0d35.xml
-// File: namespace_0D37.xml
+// File: namespace_0d37.xml
-// File: namespace_0D4.xml
+// File: namespace_0d4.xml
-// File: namespace_0D41.xml
+// File: namespace_0d41.xml
// File: namespaceFit.xml
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index bf7929771344e121ba6489a905230b540268b552..33eedbf361fa73a845850066197b8715813b9a16 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -5775,7 +5775,7 @@ class Polygon(IShape2D):
r"""
- A polygon in 2D space.Polygon defined by two arrays with x and y coordinates of points. Sizes of arrays should coincide. If polygon is unclosed (the last point doesn't repeat the first one), it will be closed automatically.
+ A polygon in 2D space. Polygon defined by two arrays with x and y coordinates of points. Sizes of arrays should coincide. If polygon is unclosed (the last point doesn't repeat the first one), it will be closed automatically.
C++ includes: Polygon.h
@@ -7501,7 +7501,7 @@ class ParameterPool(ICloneable):
Adds parameter to the pool, and returns reference to the input pointer.
- Returning the input pointer allows us to concatenate function calls like pool->addParameter( new RealParameter(...) ).setLimits(-1,+1).setFixed().setUnit("nm")
+ Returning the input pointer allows us to concatenate function calls like pool->addParameter( new RealParameter(...) ).setLimits(-1,+1).setFixed().setUnit("nm")
"""
return _libBornAgainCore.ParameterPool_addParameter(self, newPar)
@@ -14008,9 +14008,13 @@ class ISampleBuilder(IParameterized):
"""
return _libBornAgainCore.ISampleBuilder_buildSample(self)
- def createSampleByIndex(self, index):
- r"""createSampleByIndex(ISampleBuilder self, size_t index) -> MultiLayer"""
- return _libBornAgainCore.ISampleBuilder_createSampleByIndex(self, index)
+ def createSampleByIndex(self, arg0):
+ r"""
+ createSampleByIndex(ISampleBuilder self, size_t arg0) -> MultiLayer
+ virtual MultiLayer* ISampleBuilder::createSampleByIndex(size_t index)
+
+ """
+ return _libBornAgainCore.ISampleBuilder_createSampleByIndex(self, arg0)
def size(self):
r"""
@@ -14370,7 +14374,7 @@ class MultiLayer(ISample):
r"""
- Our sample model: a stack of layers one below the other.Example of system of 4 layers (3 interfaces):
+ Our sample model: a stack of layers one below the other. Example of system of 4 layers (3 interfaces):
ambience layer #0 ------ interface #0 z=0.0 Fe, 20A layer #1 ------ interface #1 z=-20.0 Cr, 40A layer #2 ------ interface #2 z=-60.0 substrate layer #3
@@ -17328,7 +17332,7 @@ class Simulation(ICloneable, INode):
def setSampleBuilderCpp(self, sample_builder):
r"""
- setSampleBuilderCpp(Simulation self, std::shared_ptr< ISampleBuilder > const sample_builder)
+ setSampleBuilderCpp(Simulation self, std::shared_ptr< ISampleBuilder > const & sample_builder)
void Simulation::setSampleBuilder(const std::shared_ptr< ISampleBuilder > sample_builder)
"""
@@ -17602,15 +17606,13 @@ class GISASSimulation(Simulation2D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, *args):
+ def __init__(self):
r"""
__init__(GISASSimulation self) -> GISASSimulation
- __init__(GISASSimulation self, MultiLayer p_sample) -> GISASSimulation
- __init__(GISASSimulation self, std::shared_ptr< ISampleBuilder > const p_sample_builder) -> GISASSimulation
GISASSimulation::GISASSimulation(const std::shared_ptr< ISampleBuilder > p_sample_builder)
"""
- _libBornAgainCore.GISASSimulation_swiginit(self, _libBornAgainCore.new_GISASSimulation(*args))
+ _libBornAgainCore.GISASSimulation_swiginit(self, _libBornAgainCore.new_GISASSimulation())
__swig_destroy__ = _libBornAgainCore.delete_GISASSimulation
def clone(self):
@@ -17680,15 +17682,13 @@ class DepthProbeSimulation(Simulation):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, *args):
+ def __init__(self):
r"""
__init__(DepthProbeSimulation self) -> DepthProbeSimulation
- __init__(DepthProbeSimulation self, MultiLayer sample) -> DepthProbeSimulation
- __init__(DepthProbeSimulation self, std::shared_ptr< ISampleBuilder > const sample_builder) -> DepthProbeSimulation
DepthProbeSimulation::DepthProbeSimulation(const std::shared_ptr< ISampleBuilder > sample_builder)
"""
- _libBornAgainCore.DepthProbeSimulation_swiginit(self, _libBornAgainCore.new_DepthProbeSimulation(*args))
+ _libBornAgainCore.DepthProbeSimulation_swiginit(self, _libBornAgainCore.new_DepthProbeSimulation())
__swig_destroy__ = _libBornAgainCore.delete_DepthProbeSimulation
def clone(self):
@@ -17785,15 +17785,13 @@ class SpecularSimulation(Simulation):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, *args):
+ def __init__(self):
r"""
__init__(SpecularSimulation self) -> SpecularSimulation
- __init__(SpecularSimulation self, MultiLayer sample) -> SpecularSimulation
- __init__(SpecularSimulation self, std::shared_ptr< ISampleBuilder > const sample_builder) -> SpecularSimulation
SpecularSimulation::SpecularSimulation(const std::shared_ptr< ISampleBuilder > sample_builder)
"""
- _libBornAgainCore.SpecularSimulation_swiginit(self, _libBornAgainCore.new_SpecularSimulation(*args))
+ _libBornAgainCore.SpecularSimulation_swiginit(self, _libBornAgainCore.new_SpecularSimulation())
__swig_destroy__ = _libBornAgainCore.delete_SpecularSimulation
def clone(self):
@@ -17895,15 +17893,13 @@ class OffSpecSimulation(Simulation2D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, *args):
+ def __init__(self):
r"""
__init__(OffSpecSimulation self) -> OffSpecSimulation
- __init__(OffSpecSimulation self, MultiLayer p_sample) -> OffSpecSimulation
- __init__(OffSpecSimulation self, std::shared_ptr< ISampleBuilder > const p_sample_builder) -> OffSpecSimulation
OffSpecSimulation::OffSpecSimulation(const std::shared_ptr< class ISampleBuilder > p_sample_builder)
"""
- _libBornAgainCore.OffSpecSimulation_swiginit(self, _libBornAgainCore.new_OffSpecSimulation(*args))
+ _libBornAgainCore.OffSpecSimulation_swiginit(self, _libBornAgainCore.new_OffSpecSimulation())
__swig_destroy__ = _libBornAgainCore.delete_OffSpecSimulation
def clone(self):
@@ -18158,7 +18154,9 @@ class IntensityDataIOFactory(object):
r"""
- Provides users with possibility to read and write IntensityData from/to files in different format. Type of the file will be deduced from file name. *.txt - ASCII file with 2D array [nrow][ncol], layout as in numpy. *.int - BornAgain internal ASCII format. *.tif - 32-bits tiff file. If file name ends woth "*.gz" or "*.bz2" the file will be zipped on the fly using appropriate algorithm. Usage:
+ Provides users with possibility to read and write IntensityData from/to files in different format. Type of the file will be deduced from file name. *.txt - ASCII file with 2D array [nrow][ncol], layout as in numpy. *.int - BornAgain internal ASCII format. *.tif - 32-bits tiff file. If file name ends woth "*.gz" or "*.bz2" the file will be zipped on the fly using appropriate algorithm.
+
+ Usage:
C++ includes: IntensityDataIOFactory.h
@@ -18202,7 +18200,9 @@ class IntensityDataIOFactory(object):
__init__(IntensityDataIOFactory self) -> IntensityDataIOFactory
- Provides users with possibility to read and write IntensityData from/to files in different format. Type of the file will be deduced from file name. *.txt - ASCII file with 2D array [nrow][ncol], layout as in numpy. *.int - BornAgain internal ASCII format. *.tif - 32-bits tiff file. If file name ends woth "*.gz" or "*.bz2" the file will be zipped on the fly using appropriate algorithm. Usage:
+ Provides users with possibility to read and write IntensityData from/to files in different format. Type of the file will be deduced from file name. *.txt - ASCII file with 2D array [nrow][ncol], layout as in numpy. *.int - BornAgain internal ASCII format. *.tif - 32-bits tiff file. If file name ends woth "*.gz" or "*.bz2" the file will be zipped on the fly using appropriate algorithm.
+
+ Usage:
C++ includes: IntensityDataIOFactory.h
@@ -22077,7 +22077,13 @@ class SampleBuilderFactory(SampleBuilderFactoryTemp):
_libBornAgainCore.SampleBuilderFactory_swiginit(self, _libBornAgainCore.new_SampleBuilderFactory())
def createSampleByName(self, name):
- r"""createSampleByName(SampleBuilderFactory self, std::string const & name) -> MultiLayer"""
+ r"""
+ createSampleByName(SampleBuilderFactory self, std::string const & name) -> MultiLayer
+ MultiLayer * SampleBuilderFactory::createSampleByName(const std::string &name)
+
+ Retrieves a SampleBuilder from the registry, does the build, and returns the result.
+
+ """
return _libBornAgainCore.SampleBuilderFactory_createSampleByName(self, name)
__swig_destroy__ = _libBornAgainCore.delete_SampleBuilderFactory
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 8483c301e1878d4a2dfdc4072d183bce1f82ae96..a91c21eda728189598a306803a3eb14b70bd50ac 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -10694,14 +10694,14 @@ MultiLayer *SwigDirector_ISampleBuilder::buildSample() const {
}
-MultiLayer *SwigDirector_ISampleBuilder::createSampleByIndex(size_t index) {
+MultiLayer *SwigDirector_ISampleBuilder::createSampleByIndex(size_t arg0) {
MultiLayer *c_result = 0 ;
void *swig_argp ;
int swig_res ;
swig_owntype own ;
swig::SwigVar_PyObject obj0;
- obj0 = SWIG_From_size_t(static_cast< size_t >(index));
+ obj0 = SWIG_From_size_t(static_cast< size_t >(arg0));
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ISampleBuilder.__init__.");
}
@@ -100684,11 +100684,12 @@ fail:
SWIGINTERN PyObject *_wrap_Simulation_setSampleBuilderCpp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
Simulation *arg1 = (Simulation *) 0 ;
- std::shared_ptr< ISampleBuilder > arg2 ;
+ std::shared_ptr< ISampleBuilder > *arg2 = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 ;
int res2 = 0 ;
+ std::shared_ptr< ISampleBuilder > tempshared2 ;
PyObject *swig_obj[2] ;
if (!SWIG_Python_UnpackTuple(args, "Simulation_setSampleBuilderCpp", 2, 2, swig_obj)) SWIG_fail;
@@ -100701,12 +100702,17 @@ SWIGINTERN PyObject *_wrap_Simulation_setSampleBuilderCpp(PyObject *SWIGUNUSEDPA
int newmem = 0;
res2 = SWIG_ConvertPtrAndOwn(swig_obj[1], &argp2, SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t, 0 , &newmem);
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_setSampleBuilderCpp" "', argument " "2"" of type '" "std::shared_ptr< ISampleBuilder > const""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_setSampleBuilderCpp" "', argument " "2"" of type '" "std::shared_ptr< ISampleBuilder > const &""'");
+ }
+ if (newmem & SWIG_CAST_NEW_MEMORY) {
+ if (argp2) tempshared2 = *reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp2);
+ delete reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp2);
+ arg2 = &tempshared2;
+ } else {
+ arg2 = (argp2) ? reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp2) : &tempshared2;
}
- if (argp2) arg2 = *(reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp2));
- if (newmem & SWIG_CAST_NEW_MEMORY) delete reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp2);
}
- (arg1)->setSampleBuilder(arg2);
+ (arg1)->setSampleBuilder((std::shared_ptr< ISampleBuilder > const &)*arg2);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -101889,11 +101895,11 @@ SWIGINTERN PyObject *Simulation2D_swigregister(PyObject *SWIGUNUSEDPARM(self), P
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_new_GISASSimulation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_GISASSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
GISASSimulation *result = 0 ;
- if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "new_GISASSimulation", 0, 0, 0)) SWIG_fail;
result = (GISASSimulation *)new GISASSimulation();
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_GISASSimulation, SWIG_POINTER_NEW | 0 );
return resultobj;
@@ -101902,93 +101908,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_GISASSimulation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- MultiLayer *arg1 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- GISASSimulation *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_MultiLayer, 0 | 0);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GISASSimulation" "', argument " "1"" of type '" "MultiLayer const &""'");
- }
- if (!argp1) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_GISASSimulation" "', argument " "1"" of type '" "MultiLayer const &""'");
- }
- arg1 = reinterpret_cast< MultiLayer * >(argp1);
- result = (GISASSimulation *)new GISASSimulation((MultiLayer const &)*arg1);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_GISASSimulation, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_GISASSimulation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- std::shared_ptr< ISampleBuilder > arg1 ;
- void *argp1 ;
- int res1 = 0 ;
- GISASSimulation *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- {
- int newmem = 0;
- res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t, 0 , &newmem);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GISASSimulation" "', argument " "1"" of type '" "std::shared_ptr< ISampleBuilder > const""'");
- }
- if (argp1) arg1 = *(reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp1));
- if (newmem & SWIG_CAST_NEW_MEMORY) delete reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp1);
- }
- result = (GISASSimulation *)new GISASSimulation(arg1);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_GISASSimulation, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_GISASSimulation(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[2] = {
- 0
- };
-
- if (!(argc = SWIG_Python_UnpackTuple(args, "new_GISASSimulation", 0, 1, argv))) SWIG_fail;
- --argc;
- if (argc == 0) {
- return _wrap_new_GISASSimulation__SWIG_0(self, argc, argv);
- }
- if (argc == 1) {
- int _v;
- int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_MultiLayer, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_new_GISASSimulation__SWIG_1(self, argc, argv);
- }
- }
- if (argc == 1) {
- int _v;
- int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_new_GISASSimulation__SWIG_2(self, argc, argv);
- }
- }
-
-fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_GISASSimulation'.\n"
- " Possible C/C++ prototypes are:\n"
- " GISASSimulation::GISASSimulation()\n"
- " GISASSimulation::GISASSimulation(MultiLayer const &)\n"
- " GISASSimulation::GISASSimulation(std::shared_ptr< ISampleBuilder > const)\n");
- return 0;
-}
-
-
SWIGINTERN PyObject *_wrap_delete_GISASSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
GISASSimulation *arg1 = (GISASSimulation *) 0 ;
@@ -102187,11 +102106,11 @@ SWIGINTERN PyObject *GISASSimulation_swiginit(PyObject *SWIGUNUSEDPARM(self), Py
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
DepthProbeSimulation *result = 0 ;
- if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "new_DepthProbeSimulation", 0, 0, 0)) SWIG_fail;
result = (DepthProbeSimulation *)new DepthProbeSimulation();
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DepthProbeSimulation, SWIG_POINTER_NEW | 0 );
return resultobj;
@@ -102200,93 +102119,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- MultiLayer *arg1 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- DepthProbeSimulation *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_MultiLayer, 0 | 0);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_DepthProbeSimulation" "', argument " "1"" of type '" "MultiLayer const &""'");
- }
- if (!argp1) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_DepthProbeSimulation" "', argument " "1"" of type '" "MultiLayer const &""'");
- }
- arg1 = reinterpret_cast< MultiLayer * >(argp1);
- result = (DepthProbeSimulation *)new DepthProbeSimulation((MultiLayer const &)*arg1);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DepthProbeSimulation, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- std::shared_ptr< ISampleBuilder > arg1 ;
- void *argp1 ;
- int res1 = 0 ;
- DepthProbeSimulation *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- {
- int newmem = 0;
- res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t, 0 , &newmem);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_DepthProbeSimulation" "', argument " "1"" of type '" "std::shared_ptr< ISampleBuilder > const""'");
- }
- if (argp1) arg1 = *(reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp1));
- if (newmem & SWIG_CAST_NEW_MEMORY) delete reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp1);
- }
- result = (DepthProbeSimulation *)new DepthProbeSimulation(arg1);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DepthProbeSimulation, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[2] = {
- 0
- };
-
- if (!(argc = SWIG_Python_UnpackTuple(args, "new_DepthProbeSimulation", 0, 1, argv))) SWIG_fail;
- --argc;
- if (argc == 0) {
- return _wrap_new_DepthProbeSimulation__SWIG_0(self, argc, argv);
- }
- if (argc == 1) {
- int _v;
- int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_MultiLayer, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_new_DepthProbeSimulation__SWIG_1(self, argc, argv);
- }
- }
- if (argc == 1) {
- int _v;
- int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_new_DepthProbeSimulation__SWIG_2(self, argc, argv);
- }
- }
-
-fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DepthProbeSimulation'.\n"
- " Possible C/C++ prototypes are:\n"
- " DepthProbeSimulation::DepthProbeSimulation()\n"
- " DepthProbeSimulation::DepthProbeSimulation(MultiLayer const &)\n"
- " DepthProbeSimulation::DepthProbeSimulation(std::shared_ptr< ISampleBuilder > const)\n");
- return 0;
-}
-
-
SWIGINTERN PyObject *_wrap_delete_DepthProbeSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
@@ -102710,11 +102542,11 @@ SWIGINTERN PyObject *DepthProbeSimulation_swiginit(PyObject *SWIGUNUSEDPARM(self
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_SpecularSimulation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_SpecularSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
SpecularSimulation *result = 0 ;
- if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "new_SpecularSimulation", 0, 0, 0)) SWIG_fail;
result = (SpecularSimulation *)new SpecularSimulation();
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SpecularSimulation, SWIG_POINTER_NEW | 0 );
return resultobj;
@@ -102723,93 +102555,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_SpecularSimulation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- MultiLayer *arg1 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- SpecularSimulation *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_MultiLayer, 0 | 0);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SpecularSimulation" "', argument " "1"" of type '" "MultiLayer const &""'");
- }
- if (!argp1) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SpecularSimulation" "', argument " "1"" of type '" "MultiLayer const &""'");
- }
- arg1 = reinterpret_cast< MultiLayer * >(argp1);
- result = (SpecularSimulation *)new SpecularSimulation((MultiLayer const &)*arg1);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SpecularSimulation, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_SpecularSimulation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- std::shared_ptr< ISampleBuilder > arg1 ;
- void *argp1 ;
- int res1 = 0 ;
- SpecularSimulation *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- {
- int newmem = 0;
- res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t, 0 , &newmem);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SpecularSimulation" "', argument " "1"" of type '" "std::shared_ptr< ISampleBuilder > const""'");
- }
- if (argp1) arg1 = *(reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp1));
- if (newmem & SWIG_CAST_NEW_MEMORY) delete reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp1);
- }
- result = (SpecularSimulation *)new SpecularSimulation(arg1);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SpecularSimulation, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_SpecularSimulation(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[2] = {
- 0
- };
-
- if (!(argc = SWIG_Python_UnpackTuple(args, "new_SpecularSimulation", 0, 1, argv))) SWIG_fail;
- --argc;
- if (argc == 0) {
- return _wrap_new_SpecularSimulation__SWIG_0(self, argc, argv);
- }
- if (argc == 1) {
- int _v;
- int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_MultiLayer, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_new_SpecularSimulation__SWIG_1(self, argc, argv);
- }
- }
- if (argc == 1) {
- int _v;
- int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_new_SpecularSimulation__SWIG_2(self, argc, argv);
- }
- }
-
-fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_SpecularSimulation'.\n"
- " Possible C/C++ prototypes are:\n"
- " SpecularSimulation::SpecularSimulation()\n"
- " SpecularSimulation::SpecularSimulation(MultiLayer const &)\n"
- " SpecularSimulation::SpecularSimulation(std::shared_ptr< ISampleBuilder > const)\n");
- return 0;
-}
-
-
SWIGINTERN PyObject *_wrap_delete_SpecularSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
SpecularSimulation *arg1 = (SpecularSimulation *) 0 ;
@@ -103041,11 +102786,11 @@ SWIGINTERN PyObject *SpecularSimulation_swiginit(PyObject *SWIGUNUSEDPARM(self),
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_OffSpecSimulation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_OffSpecSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
OffSpecSimulation *result = 0 ;
- if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "new_OffSpecSimulation", 0, 0, 0)) SWIG_fail;
result = (OffSpecSimulation *)new OffSpecSimulation();
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OffSpecSimulation, SWIG_POINTER_NEW | 0 );
return resultobj;
@@ -103054,93 +102799,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_OffSpecSimulation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- MultiLayer *arg1 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- OffSpecSimulation *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_MultiLayer, 0 | 0);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_OffSpecSimulation" "', argument " "1"" of type '" "MultiLayer const &""'");
- }
- if (!argp1) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_OffSpecSimulation" "', argument " "1"" of type '" "MultiLayer const &""'");
- }
- arg1 = reinterpret_cast< MultiLayer * >(argp1);
- result = (OffSpecSimulation *)new OffSpecSimulation((MultiLayer const &)*arg1);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OffSpecSimulation, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_OffSpecSimulation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- std::shared_ptr< ISampleBuilder > arg1 ;
- void *argp1 ;
- int res1 = 0 ;
- OffSpecSimulation *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- {
- int newmem = 0;
- res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t, 0 , &newmem);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_OffSpecSimulation" "', argument " "1"" of type '" "std::shared_ptr< ISampleBuilder > const""'");
- }
- if (argp1) arg1 = *(reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp1));
- if (newmem & SWIG_CAST_NEW_MEMORY) delete reinterpret_cast< std::shared_ptr< ISampleBuilder > * >(argp1);
- }
- result = (OffSpecSimulation *)new OffSpecSimulation(arg1);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OffSpecSimulation, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_OffSpecSimulation(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[2] = {
- 0
- };
-
- if (!(argc = SWIG_Python_UnpackTuple(args, "new_OffSpecSimulation", 0, 1, argv))) SWIG_fail;
- --argc;
- if (argc == 0) {
- return _wrap_new_OffSpecSimulation__SWIG_0(self, argc, argv);
- }
- if (argc == 1) {
- int _v;
- int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_MultiLayer, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_new_OffSpecSimulation__SWIG_1(self, argc, argv);
- }
- }
- if (argc == 1) {
- int _v;
- int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_new_OffSpecSimulation__SWIG_2(self, argc, argv);
- }
- }
-
-fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_OffSpecSimulation'.\n"
- " Possible C/C++ prototypes are:\n"
- " OffSpecSimulation::OffSpecSimulation()\n"
- " OffSpecSimulation::OffSpecSimulation(MultiLayer const &)\n"
- " OffSpecSimulation::OffSpecSimulation(std::shared_ptr< ISampleBuilder > const)\n");
- return 0;
-}
-
-
SWIGINTERN PyObject *_wrap_delete_OffSpecSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
OffSpecSimulation *arg1 = (OffSpecSimulation *) 0 ;
@@ -124654,7 +124312,7 @@ static PyMethodDef SwigMethods[] = {
"\n"
"Adds parameter to the pool, and returns reference to the input pointer.\n"
"\n"
- "Returning the input pointer allows us to concatenate function calls like pool->addParameter( new RealParameter(...) ).setLimits(-1,+1).setFixed().setUnit(\"nm\") \n"
+ "Returning the input pointer allows us to concatenate function calls like pool->addParameter( new RealParameter(...) ).setLimits(-1,+1).setFixed().setUnit(\"nm\") \n"
"\n"
""},
{ "ParameterPool_parameter", _wrap_ParameterPool_parameter, METH_VARARGS, "\n"
@@ -128432,7 +128090,11 @@ static PyMethodDef SwigMethods[] = {
"virtual MultiLayer* ISampleBuilder::buildSample() const =0\n"
"\n"
""},
- { "ISampleBuilder_createSampleByIndex", _wrap_ISampleBuilder_createSampleByIndex, METH_VARARGS, "ISampleBuilder_createSampleByIndex(ISampleBuilder self, size_t index) -> MultiLayer"},
+ { "ISampleBuilder_createSampleByIndex", _wrap_ISampleBuilder_createSampleByIndex, METH_VARARGS, "\n"
+ "ISampleBuilder_createSampleByIndex(ISampleBuilder self, size_t arg0) -> MultiLayer\n"
+ "virtual MultiLayer* ISampleBuilder::createSampleByIndex(size_t index)\n"
+ "\n"
+ ""},
{ "ISampleBuilder_size", _wrap_ISampleBuilder_size, METH_O, "\n"
"ISampleBuilder_size(ISampleBuilder self) -> size_t\n"
"virtual size_t ISampleBuilder::size()\n"
@@ -130303,7 +129965,7 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ "Simulation_setSampleBuilderCpp", _wrap_Simulation_setSampleBuilderCpp, METH_VARARGS, "\n"
- "Simulation_setSampleBuilderCpp(Simulation self, std::shared_ptr< ISampleBuilder > const sample_builder)\n"
+ "Simulation_setSampleBuilderCpp(Simulation self, std::shared_ptr< ISampleBuilder > const & sample_builder)\n"
"void Simulation::setSampleBuilder(const std::shared_ptr< ISampleBuilder > sample_builder)\n"
"\n"
""},
@@ -130481,10 +130143,8 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ "Simulation2D_swigregister", Simulation2D_swigregister, METH_O, NULL},
- { "new_GISASSimulation", _wrap_new_GISASSimulation, METH_VARARGS, "\n"
- "GISASSimulation()\n"
- "GISASSimulation(MultiLayer p_sample)\n"
- "new_GISASSimulation(std::shared_ptr< ISampleBuilder > const p_sample_builder) -> GISASSimulation\n"
+ { "new_GISASSimulation", _wrap_new_GISASSimulation, METH_NOARGS, "\n"
+ "new_GISASSimulation() -> GISASSimulation\n"
"GISASSimulation::GISASSimulation(const std::shared_ptr< ISampleBuilder > p_sample_builder)\n"
"\n"
""},
@@ -130535,10 +130195,8 @@ static PyMethodDef SwigMethods[] = {
""},
{ "GISASSimulation_swigregister", GISASSimulation_swigregister, METH_O, NULL},
{ "GISASSimulation_swiginit", GISASSimulation_swiginit, METH_VARARGS, NULL},
- { "new_DepthProbeSimulation", _wrap_new_DepthProbeSimulation, METH_VARARGS, "\n"
- "DepthProbeSimulation()\n"
- "DepthProbeSimulation(MultiLayer sample)\n"
- "new_DepthProbeSimulation(std::shared_ptr< ISampleBuilder > const sample_builder) -> DepthProbeSimulation\n"
+ { "new_DepthProbeSimulation", _wrap_new_DepthProbeSimulation, METH_NOARGS, "\n"
+ "new_DepthProbeSimulation() -> DepthProbeSimulation\n"
"DepthProbeSimulation::DepthProbeSimulation(const std::shared_ptr< ISampleBuilder > sample_builder)\n"
"\n"
""},
@@ -130603,10 +130261,8 @@ static PyMethodDef SwigMethods[] = {
""},
{ "DepthProbeSimulation_swigregister", DepthProbeSimulation_swigregister, METH_O, NULL},
{ "DepthProbeSimulation_swiginit", DepthProbeSimulation_swiginit, METH_VARARGS, NULL},
- { "new_SpecularSimulation", _wrap_new_SpecularSimulation, METH_VARARGS, "\n"
- "SpecularSimulation()\n"
- "SpecularSimulation(MultiLayer sample)\n"
- "new_SpecularSimulation(std::shared_ptr< ISampleBuilder > const sample_builder) -> SpecularSimulation\n"
+ { "new_SpecularSimulation", _wrap_new_SpecularSimulation, METH_NOARGS, "\n"
+ "new_SpecularSimulation() -> SpecularSimulation\n"
"SpecularSimulation::SpecularSimulation(const std::shared_ptr< ISampleBuilder > sample_builder)\n"
"\n"
""},
@@ -130671,10 +130327,8 @@ static PyMethodDef SwigMethods[] = {
""},
{ "SpecularSimulation_swigregister", SpecularSimulation_swigregister, METH_O, NULL},
{ "SpecularSimulation_swiginit", SpecularSimulation_swiginit, METH_VARARGS, NULL},
- { "new_OffSpecSimulation", _wrap_new_OffSpecSimulation, METH_VARARGS, "\n"
- "OffSpecSimulation()\n"
- "OffSpecSimulation(MultiLayer p_sample)\n"
- "new_OffSpecSimulation(std::shared_ptr< ISampleBuilder > const p_sample_builder) -> OffSpecSimulation\n"
+ { "new_OffSpecSimulation", _wrap_new_OffSpecSimulation, METH_NOARGS, "\n"
+ "new_OffSpecSimulation() -> OffSpecSimulation\n"
"OffSpecSimulation::OffSpecSimulation(const std::shared_ptr< class ISampleBuilder > p_sample_builder)\n"
"\n"
""},
@@ -130835,7 +130489,9 @@ static PyMethodDef SwigMethods[] = {
"new_IntensityDataIOFactory() -> IntensityDataIOFactory\n"
"\n"
"\n"
- "Provides users with possibility to read and write IntensityData from/to files in different format. Type of the file will be deduced from file name. *.txt - ASCII file with 2D array [nrow][ncol], layout as in numpy. *.int - BornAgain internal ASCII format. *.tif - 32-bits tiff file. If file name ends woth \"*.gz\" or \"*.bz2\" the file will be zipped on the fly using appropriate algorithm. Usage:\n"
+ "Provides users with possibility to read and write IntensityData from/to files in different format. Type of the file will be deduced from file name. *.txt - ASCII file with 2D array [nrow][ncol], layout as in numpy. *.int - BornAgain internal ASCII format. *.tif - 32-bits tiff file. If file name ends woth \"*.gz\" or \"*.bz2\" the file will be zipped on the fly using appropriate algorithm.\n"
+ "\n"
+ "Usage:\n"
"\n"
"C++ includes: IntensityDataIOFactory.h\n"
"\n"
@@ -133119,7 +132775,13 @@ static PyMethodDef SwigMethods[] = {
"SampleBuilderFactory::SampleBuilderFactory()\n"
"\n"
""},
- { "SampleBuilderFactory_createSampleByName", _wrap_SampleBuilderFactory_createSampleByName, METH_VARARGS, "SampleBuilderFactory_createSampleByName(SampleBuilderFactory self, std::string const & name) -> MultiLayer"},
+ { "SampleBuilderFactory_createSampleByName", _wrap_SampleBuilderFactory_createSampleByName, METH_VARARGS, "\n"
+ "SampleBuilderFactory_createSampleByName(SampleBuilderFactory self, std::string const & name) -> MultiLayer\n"
+ "MultiLayer * SampleBuilderFactory::createSampleByName(const std::string &name)\n"
+ "\n"
+ "Retrieves a SampleBuilder from the registry, does the build, and returns the result. \n"
+ "\n"
+ ""},
{ "delete_SampleBuilderFactory", _wrap_delete_SampleBuilderFactory, METH_O, "delete_SampleBuilderFactory(SampleBuilderFactory self)"},
{ "SampleBuilderFactory_swigregister", SampleBuilderFactory_swigregister, METH_O, NULL},
{ "SampleBuilderFactory_swiginit", SampleBuilderFactory_swiginit, METH_VARARGS, NULL},
diff --git a/auto/Wrap/libBornAgainCore_wrap.h b/auto/Wrap/libBornAgainCore_wrap.h
index 5a82c364336f9d1364d110283061fcf778672932..f67c0f84b1874ef8eb2d3bd0d3e4aa7d0bbfe22a 100644
--- a/auto/Wrap/libBornAgainCore_wrap.h
+++ b/auto/Wrap/libBornAgainCore_wrap.h
@@ -479,7 +479,7 @@ public:
virtual ParameterPool *createParameterTree() const;
virtual void onChange();
virtual MultiLayer *buildSample() const;
- virtual MultiLayer *createSampleByIndex(size_t index);
+ virtual MultiLayer *createSampleByIndex(size_t arg0);
virtual size_t size();
/* Internal director utilities */