diff --git a/Base/Element/DepthprobeElement.cpp b/Base/Element/DepthprobeElement.cpp
index abe0207183d2865fcac7c902a2d4aa3c59ca4238..ee1bf8e06ea577456028ec9a3cafdbda4e4d079d 100644
--- a/Base/Element/DepthprobeElement.cpp
+++ b/Base/Element/DepthprobeElement.cpp
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file Base/Element/DepthprobeElement.cpp
-//! @brief Implements class DepthProbeElement.
+//! @brief Implements class DepthprobeElement.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -16,7 +16,7 @@
#include "Base/Axis/IAxis.h"
#include "Base/Vector/GisasDirection.h"
-DepthProbeElement::DepthProbeElement(double wavelength, double alpha_i, const IAxis* z_positions,
+DepthprobeElement::DepthprobeElement(double wavelength, double alpha_i, const IAxis* z_positions,
bool calculation_flag)
: IElement(PolMatrices())
, m_wavelength(wavelength)
@@ -26,11 +26,11 @@ DepthProbeElement::DepthProbeElement(double wavelength, double alpha_i, const IA
{
if (!z_positions)
throw std::runtime_error(
- "Error in DepthProbeElement::DepthProbeElement: z positions are not specified");
+ "Error in DepthprobeElement::DepthprobeElement: z positions are not specified");
m_intensities.resize(z_positions->size(), 0.0);
}
-DepthProbeElement::DepthProbeElement(DepthProbeElement&& other) noexcept
+DepthprobeElement::DepthprobeElement(DepthprobeElement&& other) noexcept
: IElement(PolMatrices())
, m_wavelength(other.m_wavelength)
, m_alpha_i(other.m_alpha_i)
@@ -40,9 +40,9 @@ DepthProbeElement::DepthProbeElement(DepthProbeElement&& other) noexcept
{
}
-DepthProbeElement::~DepthProbeElement() = default;
+DepthprobeElement::~DepthprobeElement() = default;
-R3 DepthProbeElement::getKi() const
+R3 DepthprobeElement::getKi() const
{
return vecOfLambdaAlphaPhi(m_wavelength, m_alpha_i);
}
diff --git a/Base/Element/DepthprobeElement.h b/Base/Element/DepthprobeElement.h
index 64080a72b909cd6b2c338ff9edde812d29e9c640..ed358582e2c4c1a851252bb26727d3e80b6404aa 100644
--- a/Base/Element/DepthprobeElement.h
+++ b/Base/Element/DepthprobeElement.h
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file Base/Element/DepthprobeElement.h
-//! @brief Defines class DepthProbeElement.
+//! @brief Defines class DepthprobeElement.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -24,14 +24,14 @@
class IAxis;
-class DepthProbeElement : public IElement {
+class DepthprobeElement : public IElement {
public:
- DepthProbeElement(double wavelength, double alpha_i, const IAxis* z_positions,
+ DepthprobeElement(double wavelength, double alpha_i, const IAxis* z_positions,
bool calculation_flag);
- DepthProbeElement(const DepthProbeElement& other) = delete;
- DepthProbeElement(DepthProbeElement&& other) noexcept;
+ DepthprobeElement(const DepthprobeElement& other) = delete;
+ DepthprobeElement(DepthprobeElement&& other) noexcept;
- ~DepthProbeElement();
+ ~DepthprobeElement();
double wavelength() const { return m_wavelength; }
double alphaI() const { return m_alpha_i; }
@@ -42,7 +42,7 @@ public:
{
static_assert(
std::is_assignable<std::valarray<double>, typename std::decay<T>::type>::value,
- "Error in DepthProbeElement::setIntensities: wrong type of input data.");
+ "Error in DepthprobeElement::setIntensities: wrong type of input data.");
m_intensities = std::forward<T>(intensities);
}
diff --git a/Device/Beam/Beam.h b/Device/Beam/Beam.h
index 78cbac7d175687131269ac9a6f560033c17ce5e3..b4c37dca7359681f5bb926d67fe2ac6c01ba722e 100644
--- a/Device/Beam/Beam.h
+++ b/Device/Beam/Beam.h
@@ -109,7 +109,7 @@ private:
double m_wavenumber;
R3 m_k;
- friend class DepthProbeSimulationTest;
+ friend class DepthprobeSimulationTest;
};
// Factory functions in global namespace:
diff --git a/Device/Coord/CoordSystem2D.cpp b/Device/Coord/CoordSystem2D.cpp
index 5cba01b5e43c843b1a9c3e1ea7afd9834ac614bd..518a71bfcf231dd8a9389e8d1a0b365947a404a8 100644
--- a/Device/Coord/CoordSystem2D.cpp
+++ b/Device/Coord/CoordSystem2D.cpp
@@ -301,36 +301,36 @@ std::vector<std::map<Coords, std::string>> OffspecCoords::createNameMaps() const
}
// ************************************************************************************************
-// class DepthProbeCoords
+// class DepthprobeCoords
// ************************************************************************************************
const std::string z_axis_name = "Position [nm]";
-DepthProbeCoords::DepthProbeCoords(const std::vector<const IAxis*>& axes, const R3& ki)
+DepthprobeCoords::DepthprobeCoords(const std::vector<const IAxis*>& axes, const R3& ki)
: CoordSystem2D(axes, ki)
{
}
-DepthProbeCoords::DepthProbeCoords(const DepthProbeCoords& other)
+DepthprobeCoords::DepthprobeCoords(const DepthprobeCoords& other)
: CoordSystem2D(other)
{
}
-DepthProbeCoords::~DepthProbeCoords() = default;
+DepthprobeCoords::~DepthprobeCoords() = default;
-DepthProbeCoords* DepthProbeCoords::clone() const
+DepthprobeCoords* DepthprobeCoords::clone() const
{
- return new DepthProbeCoords(*this);
+ return new DepthprobeCoords(*this);
}
-std::vector<Coords> DepthProbeCoords::availableUnits() const
+std::vector<Coords> DepthprobeCoords::availableUnits() const
{
auto result = CoordSystem2D::availableUnits();
result.push_back(Coords::QSPACE);
return result;
}
-double DepthProbeCoords::calculateValue(size_t i_axis, Coords units, double value) const
+double DepthprobeCoords::calculateValue(size_t i_axis, Coords units, double value) const
{
const auto& available_units = availableUnits();
if (std::find(available_units.begin(), available_units.end(), units) == available_units.cend())
@@ -348,7 +348,7 @@ double DepthProbeCoords::calculateValue(size_t i_axis, Coords units, double valu
}
}
-std::string DepthProbeCoords::nameOfAxis(size_t i_axis, const Coords units) const
+std::string DepthprobeCoords::nameOfAxis(size_t i_axis, const Coords units) const
{
const auto& name_maps = createNameMaps();
ASSERT(i_axis < name_maps.size());
@@ -358,7 +358,7 @@ std::string DepthProbeCoords::nameOfAxis(size_t i_axis, const Coords units) cons
return it->second;
}
-std::vector<std::map<Coords, std::string>> DepthProbeCoords::createNameMaps() const
+std::vector<std::map<Coords, std::string>> DepthprobeCoords::createNameMaps() const
{
return {DataUtils::AxisNames::specAxis, DataUtils::AxisNames::sampleDepthAxis};
}
diff --git a/Device/Coord/CoordSystem2D.h b/Device/Coord/CoordSystem2D.h
index 855cbf12fffd47c41b1423393588b345413275a6..40fa120a78ad917be25cddf5754a0e8bc7eba36b 100644
--- a/Device/Coord/CoordSystem2D.h
+++ b/Device/Coord/CoordSystem2D.h
@@ -127,15 +127,15 @@ private:
};
-//! DepthProbeCoords class handles the unit translations for depth probe simulations
+//! DepthprobeCoords class handles the unit translations for depth probe simulations
//! Its default units are radians for x-axis and nm for y-axis
-class DepthProbeCoords : public CoordSystem2D {
+class DepthprobeCoords : public CoordSystem2D {
public:
- DepthProbeCoords(const std::vector<const IAxis*>& axes, const R3& ki);
- ~DepthProbeCoords() override;
+ DepthprobeCoords(const std::vector<const IAxis*>& axes, const R3& ki);
+ ~DepthprobeCoords() override;
- DepthProbeCoords* clone() const override;
+ DepthprobeCoords* clone() const override;
std::vector<Coords> availableUnits() const override;
@@ -144,7 +144,7 @@ public:
std::string nameOfAxis(size_t i_axis, Coords units = Coords::UNDEFINED) const override;
private:
- DepthProbeCoords(const DepthProbeCoords& other); //!< used by clone()
+ DepthprobeCoords(const DepthprobeCoords& other); //!< used by clone()
double calculateValue(size_t, Coords units, double value) const override;
std::vector<std::map<Coords, std::string>> createNameMaps() const override;
};
diff --git a/Examples/varia/DepthProbe.py b/Examples/varia/DepthProbe.py
index e6de2421b5dff9eb408faadbd594617001846d8e..acc408fed280026c29f4e8fcfdc651718066b460 100755
--- a/Examples/varia/DepthProbe.py
+++ b/Examples/varia/DepthProbe.py
@@ -73,7 +73,7 @@ def get_simulation(sample):
alpha_distr = ba.DistributionGaussian(0, d_ang)
footprint = ba.FootprintSquare(beam_sample_ratio)
- simulation = ba.DepthProbeSimulation(sample)
+ simulation = ba.DepthprobeSimulation(sample)
simulation.setBeamParameters(wl, na, ai_min, ai_max, footprint)
simulation.setzSpan(nz, z_min, z_max)
simulation.addParameterDistribution(
diff --git a/GUI/Model/CatDevice/InstrumentItemCatalog.cpp b/GUI/Model/CatDevice/InstrumentItemCatalog.cpp
index 9cb3cd25dbea01de8a38745cee3748473507da34..18d443f34af37ae260724305f71f0762eb5afc03 100644
--- a/GUI/Model/CatDevice/InstrumentItemCatalog.cpp
+++ b/GUI/Model/CatDevice/InstrumentItemCatalog.cpp
@@ -25,15 +25,15 @@ InstrumentItem* InstrumentItemCatalog::create(Type type)
return new OffspecInstrumentItem();
case Type::Specular:
return new SpecularInstrumentItem();
- case Type::DepthProbe:
- return new DepthProbeInstrumentItem();
+ case Type::Depthprobe:
+ return new DepthprobeInstrumentItem();
}
ASSERT(false);
}
QVector<InstrumentItemCatalog::Type> InstrumentItemCatalog::types()
{
- return {Type::GISAS, Type::Offspec, Type::Specular, Type::DepthProbe};
+ return {Type::GISAS, Type::Offspec, Type::Specular, Type::Depthprobe};
}
UiInfo InstrumentItemCatalog::uiInfo(Type type)
@@ -45,7 +45,7 @@ UiInfo InstrumentItemCatalog::uiInfo(Type type)
return {"Off specular", "", ""};
case Type::Specular:
return {"Specular", "", ""};
- case Type::DepthProbe:
+ case Type::Depthprobe:
return {"Depth probe", "", ""};
}
ASSERT(false);
@@ -59,8 +59,8 @@ InstrumentItemCatalog::Type InstrumentItemCatalog::type(const InstrumentItem* it
return Type::Offspec;
if (dynamic_cast<const SpecularInstrumentItem*>(item))
return Type::Specular;
- if (dynamic_cast<const DepthProbeInstrumentItem*>(item))
- return Type::DepthProbe;
+ if (dynamic_cast<const DepthprobeInstrumentItem*>(item))
+ return Type::Depthprobe;
ASSERT(false);
}
diff --git a/GUI/Model/CatDevice/InstrumentItemCatalog.h b/GUI/Model/CatDevice/InstrumentItemCatalog.h
index 6a82b9229dbaf7244a0927d6b2f4fffbf8ddaf9e..d6de56ba20c5651792e3804a8c2d5ba446606be8 100644
--- a/GUI/Model/CatDevice/InstrumentItemCatalog.h
+++ b/GUI/Model/CatDevice/InstrumentItemCatalog.h
@@ -26,7 +26,7 @@ public:
using CatalogedType = InstrumentItem;
// Do not change the numbering! It is serialized!
- enum class Type : uint8_t { GISAS = 0, Offspec = 1, Specular = 2, DepthProbe = 3 };
+ enum class Type : uint8_t { GISAS = 0, Offspec = 1, Specular = 2, Depthprobe = 3 };
//! Creates the item of the given type.
static InstrumentItem* create(Type type);
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index cd48b76e6252219e52b8997de5396e4a17e0f891..adff97348c417155a16cf64a77b9fd479fbe69d9 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -336,10 +336,10 @@ QString SpecularInstrumentItem::defaultName() const
}
// ************************************************************************************************
-// class DepthProbeInstrumentItem
+// class DepthprobeInstrumentItem
// ************************************************************************************************
-DepthProbeInstrumentItem::DepthProbeInstrumentItem()
+DepthprobeInstrumentItem::DepthprobeInstrumentItem()
{
m_beamItem.reset(new SpecularBeamItem(this));
@@ -354,7 +354,7 @@ DepthProbeInstrumentItem::DepthProbeInstrumentItem()
RealLimits::limitless());
}
-void DepthProbeInstrumentItem::writeTo(QXmlStreamWriter* w) const
+void DepthprobeInstrumentItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -369,7 +369,7 @@ void DepthProbeInstrumentItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
}
-void DepthProbeInstrumentItem::readFrom(QXmlStreamReader* r)
+void DepthprobeInstrumentItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -392,34 +392,34 @@ void DepthProbeInstrumentItem::readFrom(QXmlStreamReader* r)
}
}
-SpecularBeamItem* DepthProbeInstrumentItem::beamItem() const
+SpecularBeamItem* DepthprobeInstrumentItem::beamItem() const
{
return beamItemCast<SpecularBeamItem>();
}
-std::vector<int> DepthProbeInstrumentItem::shape() const
+std::vector<int> DepthprobeInstrumentItem::shape() const
{
return std::vector<int>(); // no certain shape to avoid linking to real data
}
-void DepthProbeInstrumentItem::updateToRealData(const RealItem*)
+void DepthprobeInstrumentItem::updateToRealData(const RealItem*)
{
- throw std::runtime_error("DepthProbeInstrumentItem::updateToRealData()");
+ throw std::runtime_error("DepthprobeInstrumentItem::updateToRealData()");
}
-QString DepthProbeInstrumentItem::defaultName() const
+QString DepthprobeInstrumentItem::defaultName() const
{
- return "DepthProbe";
+ return "Depthprobe";
}
-QString DepthProbeInstrumentItem::instrumentType() const
+QString DepthprobeInstrumentItem::instrumentType() const
{
return "Depth probe";
}
-DepthProbeSimulation* DepthProbeInstrumentItem::createSimulation(const MultiLayer& sample) const
+DepthprobeSimulation* DepthprobeInstrumentItem::createSimulation(const MultiLayer& sample) const
{
- auto* simulation = new DepthProbeSimulation(sample);
+ auto* simulation = new DepthprobeSimulation(sample);
auto* const axis_item = beamItem()->inclinationAxisItem();
auto axis = axis_item->createAxis(Units::deg);
@@ -438,11 +438,11 @@ DepthProbeSimulation* DepthProbeInstrumentItem::createSimulation(const MultiLaye
return simulation;
}
-const ICoordSystem* DepthProbeInstrumentItem::createCoordSystem() const
+const ICoordSystem* DepthprobeInstrumentItem::createCoordSystem() const
{
if (!m_coosys)
throw std::runtime_error(
- "DepthProbeSimulation::createCoordSystem: DepthProbeSimulation not yet initialized");
+ "DepthprobeSimulation::createCoordSystem: DepthprobeSimulation not yet initialized");
// TODO set pol filters ?
return m_coosys.get(); // TODO NOW RESTORE createSimulation()->createCoordSystem();
}
diff --git a/GUI/Model/Device/InstrumentItems.h b/GUI/Model/Device/InstrumentItems.h
index d6408ca6c5dbdb8d087bee97442159d89a7d8ce2..403c7f102b9e36154a38d0aa42a5ca28a33d8684 100644
--- a/GUI/Model/Device/InstrumentItems.h
+++ b/GUI/Model/Device/InstrumentItems.h
@@ -29,7 +29,7 @@
class BackgroundItem;
class DataItem;
-class DepthProbeSimulation;
+class DepthprobeSimulation;
class Instrument;
class MaskContainerItem;
class MultiLayer;
@@ -143,9 +143,9 @@ public:
};
-class DepthProbeInstrumentItem : public InstrumentItem {
+class DepthprobeInstrumentItem : public InstrumentItem {
public:
- DepthProbeInstrumentItem();
+ DepthprobeInstrumentItem();
void writeTo(QXmlStreamWriter* w) const override;
void readFrom(QXmlStreamReader* r) override;
@@ -159,7 +159,7 @@ public:
// FIXME switch to base ISimulation class after InstrumentItem refactoring and
// after ISimulation gets createCoordSystem method
- DepthProbeSimulation* createSimulation(const MultiLayer& sample) const;
+ DepthprobeSimulation* createSimulation(const MultiLayer& sample) const;
const ICoordSystem* createCoordSystem() const override;
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 4a695a6e87e18cab4abf062560ce7f412fec3ce1..8f7fa26d62a2163b3a3298b4fa4aba07ac719fa0 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -240,7 +240,7 @@ bool JobItem::isIntensityJob() const
{
return instrumentItem()->is<GISASInstrumentItem>()
|| instrumentItem()->is<OffspecInstrumentItem>()
- || instrumentItem()->is<DepthProbeInstrumentItem>();
+ || instrumentItem()->is<DepthprobeInstrumentItem>();
}
SampleItem* JobItem::sampleItem()
diff --git a/GUI/Model/Model/ParameterTreeUtils.cpp b/GUI/Model/Model/ParameterTreeUtils.cpp
index a8470dbe7409dd6eddc3a1f68aa2d3d3a8bd57bc..16a548879aa03d7b6915d52038a0985b82f7266b 100644
--- a/GUI/Model/Model/ParameterTreeUtils.cpp
+++ b/GUI/Model/Model/ParameterTreeUtils.cpp
@@ -336,7 +336,7 @@ void ParameterTreeBuilder::addInstrument()
addBeamDistribution(beamLabel, beamItem->azimuthalAngleItem(), "Azimuthal angle");
addDetector(label, os->detectorItem());
addPolarization(label, instrument);
- } else if (instrument->is<DepthProbeInstrumentItem>()) {
+ } else if (instrument->is<DepthprobeInstrumentItem>()) {
auto* beamLabel = new ParameterLabelItem("Parameters", label);
addBeamDistribution(beamLabel, beamItem->wavelengthItem(), "Wavelength");
// TODO implement correctly "Inclination angle" which is scanned
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index 40164179ff3f24997c3df9680b790d23ab86a7bb..fa120982705e2d8b274d709d0934bcc742ec7994 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -51,8 +51,8 @@ public:
Gisas = 0x1,
Offspec = 0x2,
Specular = 0x4,
- DepthProbe = 0x8,
- All = Gisas | Offspec | Specular | DepthProbe
+ Depthprobe = 0x8,
+ All = Gisas | Offspec | Specular | Depthprobe
};
Q_DECLARE_FLAGS(Functionalities, Functionality)
Q_FLAG(Functionalities)
diff --git a/GUI/Model/ToCore/SimulationToCore.cpp b/GUI/Model/ToCore/SimulationToCore.cpp
index 1cca80d327737bddeef3dbd44250ab682c32ee7c..1cec5a8cb902ac5998ba94da7dbed257fc735281 100644
--- a/GUI/Model/ToCore/SimulationToCore.cpp
+++ b/GUI/Model/ToCore/SimulationToCore.cpp
@@ -148,8 +148,8 @@ SpecularSimulation* createSpecularSimulation(std::unique_ptr<MultiLayer> sample,
return result;
}
-DepthProbeSimulation* createDepthProbeSimulation(std::unique_ptr<MultiLayer> sample,
- const DepthProbeInstrumentItem* item)
+DepthprobeSimulation* createDepthprobeSimulation(std::unique_ptr<MultiLayer> sample,
+ const DepthprobeInstrumentItem* item)
{
return item->createSimulation(*sample);
}
@@ -176,8 +176,8 @@ GUI::Transform::ToCore::itemsToSimulation(const SampleItem* sampleItem,
else if (const auto* specular_instrument =
dynamic_cast<const SpecularInstrumentItem*>(instrumentItem))
result.reset(createSpecularSimulation(std::move(sample), specular_instrument));
- else if (const auto* penetrator = dynamic_cast<const DepthProbeInstrumentItem*>(instrumentItem))
- result.reset(createDepthProbeSimulation(std::move(sample), penetrator));
+ else if (const auto* penetrator = dynamic_cast<const DepthprobeInstrumentItem*>(instrumentItem))
+ result.reset(createDepthprobeSimulation(std::move(sample), penetrator));
else
ASSERT(0);
diff --git a/GUI/View/Import/ImportDataView.cpp b/GUI/View/Import/ImportDataView.cpp
index 443e7df5d8b6d44073dd0744097c6b657b5e5607..cd10e5ce0c12e3b05fb63792d82c6bec1c70a94f 100644
--- a/GUI/View/Import/ImportDataView.cpp
+++ b/GUI/View/Import/ImportDataView.cpp
@@ -81,5 +81,5 @@ void ImportDataView::updateFunctionalityNarrowing()
m_selectorWidget->m_import2dDataAction->setVisible(
m_document->functionalities().testFlag(ProjectDocument::Gisas)
|| m_document->functionalities().testFlag(ProjectDocument::Offspec)
- || m_document->functionalities().testFlag(ProjectDocument::DepthProbe));
+ || m_document->functionalities().testFlag(ProjectDocument::Depthprobe));
}
diff --git a/GUI/View/Import/RealDataSelectorWidget.cpp b/GUI/View/Import/RealDataSelectorWidget.cpp
index 86ee88d5d3bcff894701d0e21fb72889ac192280..93b93d9df4eb1396be400926d4fafaf5245b132b 100644
--- a/GUI/View/Import/RealDataSelectorWidget.cpp
+++ b/GUI/View/Import/RealDataSelectorWidget.cpp
@@ -358,7 +358,7 @@ void RealDataSelectorWidget::updateFunctionalities()
visibleRanks << 1;
if (m_document->functionalities().testFlag(ProjectDocument::Gisas)
|| m_document->functionalities().testFlag(ProjectDocument::Offspec)
- || m_document->functionalities().testFlag(ProjectDocument::DepthProbe))
+ || m_document->functionalities().testFlag(ProjectDocument::Depthprobe))
visibleRanks << 2;
m_itemTreeModel->setVisibleRanks(visibleRanks);
diff --git a/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp b/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp
index 9c0810c0abec13a18c2a4fe0953d022a6fdd9871..14a08b126c9e5170a1bcc218037876dc09c83a3e 100644
--- a/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp
+++ b/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/Instrument/DepthprobeInstrumentEditor.cpp
-//! @brief Implements class DepthProbeInstrumentEditor
+//! @brief Implements class DepthprobeInstrumentEditor
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -24,8 +24,8 @@
#include <QGridLayout>
#include <QVBoxLayout>
-DepthProbeInstrumentEditor::DepthProbeInstrumentEditor(QWidget* parent,
- DepthProbeInstrumentItem* instrument)
+DepthprobeInstrumentEditor::DepthprobeInstrumentEditor(QWidget* parent,
+ DepthprobeInstrumentItem* instrument)
: QWidget(parent)
{
ASSERT(instrument);
@@ -59,11 +59,11 @@ DepthProbeInstrumentEditor::DepthProbeInstrumentEditor(QWidget* parent,
layout->addStretch();
connect(m_wavelengthEditor, &DistributionEditor::distributionChanged, this,
- &DepthProbeInstrumentEditor::dataChanged);
+ &DepthprobeInstrumentEditor::dataChanged);
connect(inclinationEditor, &InclinationAnglesEditor::dataChanged, this,
- &DepthProbeInstrumentEditor::dataChanged);
+ &DepthprobeInstrumentEditor::dataChanged);
connect(depthAxisEditor, &AxisPropertyEditor::dataChanged, this,
- &DepthProbeInstrumentEditor::dataChanged);
+ &DepthprobeInstrumentEditor::dataChanged);
connect(polMatricesAnalysisEditor, &PolarizationAnalysisEditor::dataChanged, this,
- &DepthProbeInstrumentEditor::dataChanged);
+ &DepthprobeInstrumentEditor::dataChanged);
}
diff --git a/GUI/View/Instrument/DepthprobeInstrumentEditor.h b/GUI/View/Instrument/DepthprobeInstrumentEditor.h
index d192217afb9b4cfcc0c979bcfdfd7525ce7cb73e..a81b0d8911697a97c713d105f8312db7f3ed56b3 100644
--- a/GUI/View/Instrument/DepthprobeInstrumentEditor.h
+++ b/GUI/View/Instrument/DepthprobeInstrumentEditor.h
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/Instrument/DepthprobeInstrumentEditor.h
-//! @brief Defines class DepthProbeInstrumentEditor
+//! @brief Defines class DepthprobeInstrumentEditor
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -17,13 +17,13 @@
#include <QWidget>
-class DepthProbeInstrumentItem;
+class DepthprobeInstrumentItem;
-class DepthProbeInstrumentEditor : public QWidget {
+class DepthprobeInstrumentEditor : public QWidget {
Q_OBJECT
public:
- DepthProbeInstrumentEditor(QWidget* parent, DepthProbeInstrumentItem* item);
+ DepthprobeInstrumentEditor(QWidget* parent, DepthprobeInstrumentItem* item);
signals:
void dataChanged();
diff --git a/GUI/View/Instrument/InstrumentLibraryEditor.cpp b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
index e0ee426c015800ee8d91f7cb966c550e3c691cb2..50fc323e941e131e0b5c120460a93b0767b25276 100644
--- a/GUI/View/Instrument/InstrumentLibraryEditor.cpp
+++ b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
@@ -88,9 +88,9 @@ void InstrumentLibraryEditor::setSpecularEnabled(bool b)
m_treeModel->setTypeEnabled(InstrumentsTreeModel::Specular, b);
}
-void InstrumentLibraryEditor::setDepthProbeEnabled(bool b)
+void InstrumentLibraryEditor::setDepthprobeEnabled(bool b)
{
- m_treeModel->setTypeEnabled(InstrumentsTreeModel::DepthProbe, b);
+ m_treeModel->setTypeEnabled(InstrumentsTreeModel::Depthprobe, b);
}
InstrumentItem* InstrumentLibraryEditor::execChoose()
@@ -235,9 +235,9 @@ void InstrumentLibraryEditor::createWidgetsForCurrentInstrument()
connect(editor, &GISASInstrumentEditor::dataChanged, this,
&InstrumentLibraryEditor::onInstrumentChangedByEditor);
layout->addWidget(editor);
- } else if (auto* dp = dynamic_cast<DepthProbeInstrumentItem*>(currentInstrument)) {
- auto* editor = new DepthProbeInstrumentEditor(m_ui->scrollArea, dp);
- connect(editor, &DepthProbeInstrumentEditor::dataChanged, this,
+ } else if (auto* dp = dynamic_cast<DepthprobeInstrumentItem*>(currentInstrument)) {
+ auto* editor = new DepthprobeInstrumentEditor(m_ui->scrollArea, dp);
+ connect(editor, &DepthprobeInstrumentEditor::dataChanged, this,
&InstrumentLibraryEditor::onInstrumentChangedByEditor);
layout->addWidget(editor);
} else
@@ -307,7 +307,7 @@ QVariant InstrumentLibraryEditor::TreeModel::data(const QModelIndex& index, int
return QIcon(":/images/offspec_instrument_new.svg");
case Specular:
return QIcon(":/images/specular_instrument_new.svg");
- case DepthProbe:
+ case Depthprobe:
return QIcon(":/images/depth_instrument_new.svg");
default:
break;
diff --git a/GUI/View/Instrument/InstrumentLibraryEditor.h b/GUI/View/Instrument/InstrumentLibraryEditor.h
index e847dc2429bd10679ef7f0d5e6826c08a154e02d..4e74ba9138a925cd0fb694ba1c9e8d8fcf49057a 100644
--- a/GUI/View/Instrument/InstrumentLibraryEditor.h
+++ b/GUI/View/Instrument/InstrumentLibraryEditor.h
@@ -35,7 +35,7 @@ public:
void setGisasEnabled(bool b);
void setOffspecEnabled(bool b);
void setSpecularEnabled(bool b);
- void setDepthProbeEnabled(bool b);
+ void setDepthprobeEnabled(bool b);
//! Execute the dialog for choosing an instrument from the library.
//! Returns nullptr if canceled
diff --git a/GUI/View/Instrument/InstrumentListModel.cpp b/GUI/View/Instrument/InstrumentListModel.cpp
index ee8b49955e22977eca401b12e14a0a6b81a6b99b..43325a955b69f31cbcc2adb1326306ff5f8714dc 100644
--- a/GUI/View/Instrument/InstrumentListModel.cpp
+++ b/GUI/View/Instrument/InstrumentListModel.cpp
@@ -32,9 +32,9 @@ QString defaultInstrumentName<SpecularInstrumentItem>()
}
template <>
-QString defaultInstrumentName<DepthProbeInstrumentItem>()
+QString defaultInstrumentName<DepthprobeInstrumentItem>()
{
- return "DepthProbe";
+ return "Depthprobe";
}
template <>
@@ -88,7 +88,7 @@ QVariant InstrumentListModel::data(const QModelIndex& index, int role) const
return m_offspecIcon;
if (dynamic_cast<const SpecularInstrumentItem*>(item))
return m_specularIcon;
- if (dynamic_cast<const DepthProbeInstrumentItem*>(item))
+ if (dynamic_cast<const DepthprobeInstrumentItem*>(item))
return m_depthProbeIcon;
return {};
}
@@ -125,9 +125,9 @@ QModelIndex InstrumentListModel::addNewSpecularInstrument()
return addNewInstrument<SpecularInstrumentItem>();
}
-QModelIndex InstrumentListModel::addNewDepthProbeInstrument()
+QModelIndex InstrumentListModel::addNewDepthprobeInstrument()
{
- return addNewInstrument<DepthProbeInstrumentItem>();
+ return addNewInstrument<DepthprobeInstrumentItem>();
}
void InstrumentListModel::removeInstrument(const QModelIndex& index)
diff --git a/GUI/View/Instrument/InstrumentListModel.h b/GUI/View/Instrument/InstrumentListModel.h
index 2951bb21c869558918b2fa819906d79dd90e3378..ac4e1fc3c15fccef672275f214129bb3110457f9 100644
--- a/GUI/View/Instrument/InstrumentListModel.h
+++ b/GUI/View/Instrument/InstrumentListModel.h
@@ -40,7 +40,7 @@ public:
QModelIndex addNewGISASInstrument();
QModelIndex addNewOffspecInstrument();
QModelIndex addNewSpecularInstrument();
- QModelIndex addNewDepthProbeInstrument();
+ QModelIndex addNewDepthprobeInstrument();
void removeInstrument(const QModelIndex& index);
diff --git a/GUI/View/Instrument/InstrumentListView.cpp b/GUI/View/Instrument/InstrumentListView.cpp
index 60265d72e2a0ac1f6f60935f1e9eae6fb023289d..b88ffb514ae4b9e93eb44e19c0351698c6c05eb9 100644
--- a/GUI/View/Instrument/InstrumentListView.cpp
+++ b/GUI/View/Instrument/InstrumentListView.cpp
@@ -73,11 +73,11 @@ InstrumentListView::InstrumentListView(ProjectDocument* document, QWidget* paren
connect(m_newSpecularAction, &QAction::triggered, this, &InstrumentListView::onNewSpecular);
addAction(m_newSpecularAction);
- m_newDepthProbeAction = new QAction("New depth probe", this);
- m_newDepthProbeAction->setIcon(QIcon(":/images/shape-square-plus.svg"));
- m_newDepthProbeAction->setToolTip("Add new depth probe instrument with default settings");
- connect(m_newDepthProbeAction, &QAction::triggered, this, &InstrumentListView::onNewDepthProbe);
- addAction(m_newDepthProbeAction);
+ m_newDepthprobeAction = new QAction("New depth probe", this);
+ m_newDepthprobeAction->setIcon(QIcon(":/images/shape-square-plus.svg"));
+ m_newDepthprobeAction->setToolTip("Add new depth probe instrument with default settings");
+ connect(m_newDepthprobeAction, &QAction::triggered, this, &InstrumentListView::onNewDepthprobe);
+ addAction(m_newDepthprobeAction);
m_separatorAction1 = new QAction(this);
m_separatorAction1->setSeparator(true);
@@ -140,7 +140,7 @@ QSize InstrumentListView::minimumSizeHint() const
QList<QAction*> InstrumentListView::toolbarActions() const
{
return {m_newGisasAction, m_newOffspecAction, m_newSpecularAction,
- m_newDepthProbeAction, m_separatorAction1, m_removeAction,
+ m_newDepthprobeAction, m_separatorAction1, m_removeAction,
m_copyAction, m_separatorAction2, m_storeInLibraryAction,
m_loadFromLibraryAction};
}
@@ -182,9 +182,9 @@ void InstrumentListView::onNewSpecular()
m_listView->selectionModel()->select(idx, QItemSelectionModel::ClearAndSelect);
}
-void InstrumentListView::onNewDepthProbe()
+void InstrumentListView::onNewDepthprobe()
{
- QModelIndex idx = m_model->addNewDepthProbeInstrument();
+ QModelIndex idx = m_model->addNewDepthprobeInstrument();
m_listView->selectionModel()->select(idx, QItemSelectionModel::ClearAndSelect);
}
@@ -221,7 +221,7 @@ void InstrumentListView::onStoreInLibrary()
dlg.setGisasEnabled(m_document->functionalities().testFlag(ProjectDocument::Gisas));
dlg.setOffspecEnabled(m_document->functionalities().testFlag(ProjectDocument::Offspec));
dlg.setSpecularEnabled(m_document->functionalities().testFlag(ProjectDocument::Specular));
- dlg.setDepthProbeEnabled(m_document->functionalities().testFlag(ProjectDocument::DepthProbe));
+ dlg.setDepthprobeEnabled(m_document->functionalities().testFlag(ProjectDocument::Depthprobe));
dlg.execAdd(*instrument);
}
@@ -237,7 +237,7 @@ void InstrumentListView::onLoadFromLibrary()
dlg.setGisasEnabled(m_document->functionalities().testFlag(ProjectDocument::Gisas));
dlg.setOffspecEnabled(m_document->functionalities().testFlag(ProjectDocument::Offspec));
dlg.setSpecularEnabled(m_document->functionalities().testFlag(ProjectDocument::Specular));
- dlg.setDepthProbeEnabled(m_document->functionalities().testFlag(ProjectDocument::DepthProbe));
+ dlg.setDepthprobeEnabled(m_document->functionalities().testFlag(ProjectDocument::Depthprobe));
auto* instrumentToCopy = dlg.execChoose();
if (instrumentToCopy == nullptr)
@@ -254,7 +254,7 @@ void InstrumentListView::updateFunctionalityNarrowing()
m_newGisasAction->setVisible(f.testFlag(ProjectDocument::Gisas));
m_newOffspecAction->setVisible(f.testFlag(ProjectDocument::Offspec));
m_newSpecularAction->setVisible(f.testFlag(ProjectDocument::Specular));
- m_newDepthProbeAction->setVisible(f.testFlag(ProjectDocument::DepthProbe));
+ m_newDepthprobeAction->setVisible(f.testFlag(ProjectDocument::Depthprobe));
m_copyAction->setVisible(!m_document->singleInstrumentMode());
}
diff --git a/GUI/View/Instrument/InstrumentListView.h b/GUI/View/Instrument/InstrumentListView.h
index 02bd7535c5b89fe942a95950963adc37dc9977b9..2230b03e6dcd9979351a83606fa1b3cd15fbc7f1 100644
--- a/GUI/View/Instrument/InstrumentListView.h
+++ b/GUI/View/Instrument/InstrumentListView.h
@@ -48,7 +48,7 @@ private slots:
void onNewGisas();
void onNewOffspec();
void onNewSpecular();
- void onNewDepthProbe();
+ void onNewDepthprobe();
void onRemove();
void onCopy();
@@ -70,7 +70,7 @@ private:
QAction* m_newGisasAction;
QAction* m_newOffspecAction;
QAction* m_newSpecularAction;
- QAction* m_newDepthProbeAction;
+ QAction* m_newDepthprobeAction;
QAction* m_separatorAction1;
QAction* m_removeAction;
QAction* m_copyAction;
diff --git a/GUI/View/Instrument/InstrumentView.cpp b/GUI/View/Instrument/InstrumentView.cpp
index 04d2c1acbc54feb4551c78a0b7fbdcbfea0407c5..084e49295774ef2616e8bf939a8d8e04ec07e60c 100644
--- a/GUI/View/Instrument/InstrumentView.cpp
+++ b/GUI/View/Instrument/InstrumentView.cpp
@@ -139,9 +139,9 @@ void InstrumentView::createWidgetsForCurrentInstrument()
connect(editor, &GISASInstrumentEditor::dataChanged, this,
&InstrumentView::onInstrumentChangedByEditor);
layout->addWidget(editor);
- } else if (auto* dp = dynamic_cast<DepthProbeInstrumentItem*>(currentInstrument)) {
- auto* editor = new DepthProbeInstrumentEditor(m_scrollArea, dp);
- connect(editor, &DepthProbeInstrumentEditor::dataChanged, this,
+ } else if (auto* dp = dynamic_cast<DepthprobeInstrumentItem*>(currentInstrument)) {
+ auto* editor = new DepthprobeInstrumentEditor(m_scrollArea, dp);
+ connect(editor, &DepthprobeInstrumentEditor::dataChanged, this,
&InstrumentView::onInstrumentChangedByEditor);
layout->addWidget(editor);
} else
diff --git a/GUI/View/Instrument/InstrumentsTreeModel.cpp b/GUI/View/Instrument/InstrumentsTreeModel.cpp
index cffd3a2d8a0c5c6a82bcd63b75d64fbfd8478189..8eb575e379cfbe53623de17db8d44b20f25c926e 100644
--- a/GUI/View/Instrument/InstrumentsTreeModel.cpp
+++ b/GUI/View/Instrument/InstrumentsTreeModel.cpp
@@ -66,7 +66,7 @@ QList<InstrumentsTreeModel::InstrumentType> InstrumentsTreeModel::visibleTypes()
forType(Gisas);
forType(Offspec);
forType(Specular);
- forType(DepthProbe);
+ forType(Depthprobe);
return result;
}
@@ -86,9 +86,9 @@ QVector<InstrumentItem*> InstrumentsTreeModel::instrumentItems(InstrumentType ty
return m_model->instrumentItems([](const InstrumentItem* p) {
return dynamic_cast<const SpecularInstrumentItem*>(p) != nullptr;
});
- case DepthProbe:
+ case Depthprobe:
return m_model->instrumentItems([](const InstrumentItem* p) {
- return dynamic_cast<const DepthProbeInstrumentItem*>(p) != nullptr;
+ return dynamic_cast<const DepthprobeInstrumentItem*>(p) != nullptr;
});
default:
return {};
@@ -175,8 +175,8 @@ QVariant InstrumentsTreeModel::data(const QModelIndex& index, int role) const
title = "Offspec";
else if (index == indexOfHeadline(Specular))
title = "Specular";
- else if (index == indexOfHeadline(DepthProbe))
- title = "DepthProbe";
+ else if (index == indexOfHeadline(Depthprobe))
+ title = "Depthprobe";
switch (role) {
case Qt::DisplayRole:
@@ -233,7 +233,7 @@ QVariant InstrumentsTreeModel::data(const QModelIndex& index, int role) const
return QIcon(":/images/offspec_instrument.svg");
case Specular:
return QIcon(":/images/specular_instrument.svg");
- case DepthProbe:
+ case Depthprobe:
return QIcon(":/images/depth_instrument.svg");
default:
break;
@@ -326,8 +326,8 @@ InstrumentsTreeModel::InstrumentType InstrumentsTreeModel::instrumentType(Instru
if (item->is<SpecularInstrumentItem>())
return Specular;
- if (item->is<DepthProbeInstrumentItem>())
- return DepthProbe;
+ if (item->is<DepthprobeInstrumentItem>())
+ return Depthprobe;
ASSERT(false);
return None;
diff --git a/GUI/View/Instrument/InstrumentsTreeModel.h b/GUI/View/Instrument/InstrumentsTreeModel.h
index 6895b48ad79bbaad027ffa13cb4402ecc5768cc2..849fe5057963d9f0a6fc90d1ae9d302d28ab0620 100644
--- a/GUI/View/Instrument/InstrumentsTreeModel.h
+++ b/GUI/View/Instrument/InstrumentsTreeModel.h
@@ -31,8 +31,8 @@ public:
Gisas = 0x1,
Offspec = 0x2,
Specular = 0x4,
- DepthProbe = 0x8,
- All = Gisas | Offspec | Specular | DepthProbe
+ Depthprobe = 0x8,
+ All = Gisas | Offspec | Specular | Depthprobe
};
Q_DECLARE_FLAGS(VisibleInstrumentTypes, InstrumentType)
diff --git a/GUI/View/Toplevel/ProjectSettingsView.cpp b/GUI/View/Toplevel/ProjectSettingsView.cpp
index 5846b1214a672f015d81c855895ade0ef2f26432..408ced7ce477bff9db42f1c0090af9c889f0d6f0 100644
--- a/GUI/View/Toplevel/ProjectSettingsView.cpp
+++ b/GUI/View/Toplevel/ProjectSettingsView.cpp
@@ -91,7 +91,7 @@ void ProjectSettingsView::writeFunctionalityToUI()
m_ui->gisasCheck->setChecked(f.testFlag(ProjectDocument::Gisas));
m_ui->offspecCheck->setChecked(f.testFlag(ProjectDocument::Offspec));
m_ui->reflectometryCheck->setChecked(f.testFlag(ProjectDocument::Specular));
- m_ui->depthCheck->setChecked(f.testFlag(ProjectDocument::DepthProbe));
+ m_ui->depthCheck->setChecked(f.testFlag(ProjectDocument::Depthprobe));
}
void ProjectSettingsView::updateInformation()
@@ -173,6 +173,6 @@ ProjectDocument::Functionalities ProjectSettingsView::functionalities() const
f.setFlag(ProjectDocument::Gisas, m_ui->gisasCheck->isChecked());
f.setFlag(ProjectDocument::Offspec, m_ui->offspecCheck->isChecked());
f.setFlag(ProjectDocument::Specular, m_ui->reflectometryCheck->isChecked());
- f.setFlag(ProjectDocument::DepthProbe, m_ui->depthCheck->isChecked());
+ f.setFlag(ProjectDocument::Depthprobe, m_ui->depthCheck->isChecked());
return f;
}
diff --git a/Sim/Computation/DepthprobeComputation.cpp b/Sim/Computation/DepthprobeComputation.cpp
index 050897fb51dadbb93ddc82c54b89b251b319a48e..896de64ff318a2e68694a12a5a6084df2c202d37 100644
--- a/Sim/Computation/DepthprobeComputation.cpp
+++ b/Sim/Computation/DepthprobeComputation.cpp
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file Sim/Computation/DepthprobeComputation.cpp
-//! @brief Implements class DepthProbeComputation.
+//! @brief Implements class DepthprobeComputation.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -20,23 +20,23 @@
#include "Resample/Flux/ScalarFlux.h"
#include "Resample/Processed/ReSample.h"
-DepthProbeComputation::DepthProbeComputation(const ReSample& re_sample,
+DepthprobeComputation::DepthprobeComputation(const ReSample& re_sample,
const SimulationOptions& options,
ProgressHandler& progress,
- DepthProbeElementIter begin_it,
- DepthProbeElementIter end_it)
+ DepthprobeElementIter begin_it,
+ DepthprobeElementIter end_it)
: IComputation(re_sample, options, progress)
, m_begin_it(begin_it)
, m_end_it(end_it)
{
}
-DepthProbeComputation::~DepthProbeComputation() = default;
+DepthprobeComputation::~DepthprobeComputation() = default;
-void DepthProbeComputation::runProtected()
+void DepthprobeComputation::runProtected()
{
for (auto it = m_begin_it; it != m_end_it; ++it) {
- DepthProbeElement& ele = *it;
+ DepthprobeElement& ele = *it;
if (!ele.isCalculated())
continue;
diff --git a/Sim/Computation/DepthprobeComputation.h b/Sim/Computation/DepthprobeComputation.h
index a9c540ee4fcbbaa9d5507d1842eccd0197d6469e..7fc75a6a2e8df2bd2ad68cc0e15711afbdcf7565 100644
--- a/Sim/Computation/DepthprobeComputation.h
+++ b/Sim/Computation/DepthprobeComputation.h
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file Sim/Computation/DepthprobeComputation.h
-//! @brief Declares class DepthProbeComputation.
+//! @brief Declares class DepthprobeComputation.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -21,26 +21,26 @@
#include "Sim/Computation/IComputation.h"
#include <vector>
-class DepthProbeElement;
+class DepthprobeElement;
class ReSample;
//! Performs a single-threaded depth probe computation with given sample.
//!
//! Controlled by the multi-threading machinery in ISimulation::runSingleSimulation().
-class DepthProbeComputation : public IComputation {
- using DepthProbeElementIter = std::vector<DepthProbeElement>::iterator;
+class DepthprobeComputation : public IComputation {
+ using DepthprobeElementIter = std::vector<DepthprobeElement>::iterator;
public:
- DepthProbeComputation(const ReSample& re_sample, const SimulationOptions& options,
- ProgressHandler& progress, DepthProbeElementIter begin_it,
- DepthProbeElementIter end_it);
- ~DepthProbeComputation() override;
+ DepthprobeComputation(const ReSample& re_sample, const SimulationOptions& options,
+ ProgressHandler& progress, DepthprobeElementIter begin_it,
+ DepthprobeElementIter end_it);
+ ~DepthprobeComputation() override;
private:
void runProtected() override;
- DepthProbeElementIter m_begin_it, m_end_it;
+ DepthprobeElementIter m_begin_it, m_end_it;
};
#endif // BORNAGAIN_SIM_COMPUTATION_DEPTHPROBECOMPUTATION_H
diff --git a/Sim/Simulation/DepthprobeSimulation.cpp b/Sim/Simulation/DepthprobeSimulation.cpp
index 1b706836a4c70599cb2fb605bc6d7407b0ce66b4..01c265c4d0bfdfd792d5be824cbf2df05a38e39d 100644
--- a/Sim/Simulation/DepthprobeSimulation.cpp
+++ b/Sim/Simulation/DepthprobeSimulation.cpp
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file Sim/Simulation/DepthprobeSimulation.cpp
-//! @brief Implements class DepthProbeSimulation
+//! @brief Implements class DepthprobeSimulation
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -33,15 +33,15 @@ const double zero_alpha_i = 0.0;
} // namespace
-DepthProbeSimulation::DepthProbeSimulation(const MultiLayer& sample)
+DepthprobeSimulation::DepthprobeSimulation(const MultiLayer& sample)
: ISimulation(sample)
, m_beam(Beam::horizontalBeam().clone())
{
}
-DepthProbeSimulation::~DepthProbeSimulation() = default;
+DepthprobeSimulation::~DepthprobeSimulation() = default;
-std::vector<const INode*> DepthProbeSimulation::nodeChildren() const
+std::vector<const INode*> DepthprobeSimulation::nodeChildren() const
{
std::vector<const INode*> result = ISimulation::nodeChildren();
result.push_back(m_beam.get());
@@ -49,7 +49,7 @@ std::vector<const INode*> DepthProbeSimulation::nodeChildren() const
}
//! init callbacks for setting the parameter values
-void DepthProbeSimulation::initDistributionHandler()
+void DepthprobeSimulation::initDistributionHandler()
{
for (const auto& distribution : m_distribution_handler.getDistributions()) {
const auto* dc = const_cast<ParameterDistribution*>(&distribution);
@@ -73,12 +73,12 @@ void DepthProbeSimulation::initDistributionHandler()
}
}
-size_t DepthProbeSimulation::numberOfElements() const
+size_t DepthprobeSimulation::numberOfElements() const
{
return alphaAxis()->size();
}
-SimulationResult DepthProbeSimulation::pack_result() const
+SimulationResult DepthprobeSimulation::pack_result() const
{
validityCheck();
@@ -94,56 +94,56 @@ SimulationResult DepthProbeSimulation::pack_result() const
return {*data, *coordsSystem};
}
-void DepthProbeSimulation::setzSpan(size_t n_bins, double z_min, double z_max)
+void DepthprobeSimulation::setzSpan(size_t n_bins, double z_min, double z_max)
{
if (z_max <= z_min)
- throw std::runtime_error("Error in DepthProbeSimulation::setZSpan: maximum on-axis value "
+ throw std::runtime_error("Error in DepthprobeSimulation::setZSpan: maximum on-axis value "
"is less or equal to the minimum one");
m_z_axis = std::make_unique<FixedBinAxis>("z", n_bins, z_min, z_max);
}
-const IAxis* DepthProbeSimulation::alphaAxis() const
+const IAxis* DepthprobeSimulation::alphaAxis() const
{
if (!m_alpha_axis)
- throw std::runtime_error("Error in DepthProbeSimulation::alphaAxis: incident angle axis "
+ throw std::runtime_error("Error in DepthprobeSimulation::alphaAxis: incident angle axis "
"was not initialized.");
return m_alpha_axis.get();
}
-const IAxis* DepthProbeSimulation::zAxis() const
+const IAxis* DepthprobeSimulation::zAxis() const
{
if (!m_z_axis)
- throw std::runtime_error("Error in DepthProbeSimulation::zAxis: position axis "
+ throw std::runtime_error("Error in DepthprobeSimulation::zAxis: position axis "
"was not initialized.");
return m_z_axis.get();
}
#ifndef SWIG
-const ICoordSystem* DepthProbeSimulation::createCoordSystem() const
+const ICoordSystem* DepthprobeSimulation::createCoordSystem() const
{
std::vector<const IAxis*> axes({m_alpha_axis->clone(), m_z_axis->clone()});
- return new DepthProbeCoords(axes, m_beam->ki());
+ return new DepthprobeCoords(axes, m_beam->ki());
}
#endif
-void DepthProbeSimulation::setBeamParameters(double lambda, int nbins, double alpha_i_min,
+void DepthprobeSimulation::setBeamParameters(double lambda, int nbins, double alpha_i_min,
double alpha_i_max, const IFootprintFactor* beam_shape)
{
FixedBinAxis alpha_axis("alpha_i", static_cast<size_t>(nbins), alpha_i_min, alpha_i_max);
if (lambda <= 0.0)
throw std::runtime_error(
- "Error in DepthProbeSimulation::setBeamParameters: wavelength must be positive.");
+ "Error in DepthprobeSimulation::setBeamParameters: wavelength must be positive.");
if (alpha_axis.min() < 0.0)
throw std::runtime_error(
- "Error in DepthProbeSimulation::setBeamParameters: minimum value on "
+ "Error in DepthprobeSimulation::setBeamParameters: minimum value on "
"angle axis is negative.");
if (alpha_axis.min() >= alpha_axis.max())
throw std::runtime_error(
- "Error in DepthProbeSimulation::setBeamParameters: alpha bounds are not sorted.");
+ "Error in DepthprobeSimulation::setBeamParameters: alpha bounds are not sorted.");
if (alpha_axis.size() == 0)
throw std::runtime_error(
- "Error in DepthProbeSimulation::setBeamParameters: angle axis is empty");
+ "Error in DepthprobeSimulation::setBeamParameters: angle axis is empty");
m_alpha_axis.reset(alpha_axis.clone());
@@ -156,9 +156,9 @@ void DepthProbeSimulation::setBeamParameters(double lambda, int nbins, double al
m_beam->setFootprintFactor(*beam_shape);
}
-void DepthProbeSimulation::initElementVector()
+void DepthprobeSimulation::initElementVector()
{
- std::vector<DepthProbeElement> result;
+ std::vector<DepthprobeElement> result;
const double wavelength = m_beam->wavelength();
const double angle_shift = m_beam->alpha_i();
@@ -177,41 +177,41 @@ void DepthProbeSimulation::initElementVector()
}
std::unique_ptr<IComputation>
-DepthProbeSimulation::createComputation(const ReSample& re_sample, size_t start, size_t n_elements)
+DepthprobeSimulation::createComputation(const ReSample& re_sample, size_t start, size_t n_elements)
{
ASSERT(start < m_depth_eles.size() && start + n_elements <= m_depth_eles.size());
const auto& begin = m_depth_eles.begin() + static_cast<long>(start);
- return std::make_unique<DepthProbeComputation>(re_sample, options(), progress(), begin,
+ return std::make_unique<DepthprobeComputation>(re_sample, options(), progress(), begin,
begin + static_cast<long>(n_elements));
}
-void DepthProbeSimulation::validityCheck() const
+void DepthprobeSimulation::validityCheck() const
{
const MultiLayer* current_sample = sample();
if (!current_sample)
throw std::runtime_error(
- "Error in DepthProbeSimulation::validityCheck: no sample found in the simulation.");
+ "Error in DepthprobeSimulation::validityCheck: no sample found in the simulation.");
const size_t data_size = m_depth_eles.size();
if (data_size != alphaAxis()->size())
throw std::runtime_error(
- "Error in DepthProbeSimulation::validityCheck: length of simulation "
+ "Error in DepthprobeSimulation::validityCheck: length of simulation "
"element vector is not equal to the number of inclination angles");
}
-void DepthProbeSimulation::validateParametrization(const ParameterDistribution& par_distr) const
+void DepthprobeSimulation::validateParametrization(const ParameterDistribution& par_distr) const
{
const bool zero_mean = par_distr.getDistribution()->mean() == 0.0;
if (zero_mean)
return;
/* TODO come back to this after refactoring of distribution handling
if (par_distr.whichParameter() == ParameterDistribution::BeamInclinationAngle)
- throw std::runtime_error("Error in DepthProbeSimulation: parameter distribution of "
+ throw std::runtime_error("Error in DepthprobeSimulation: parameter distribution of "
"beam inclination angle should have zero mean.");
*/
}
-void DepthProbeSimulation::normalize(size_t start_ind, size_t n_elements)
+void DepthprobeSimulation::normalize(size_t start_ind, size_t n_elements)
{
const double beam_intensity = m_beam->intensity();
for (size_t i = start_ind, stop_point = start_ind + n_elements; i < stop_point; ++i) {
@@ -225,21 +225,21 @@ void DepthProbeSimulation::normalize(size_t start_ind, size_t n_elements)
}
}
-void DepthProbeSimulation::addBackgroundIntensity(size_t, size_t)
+void DepthprobeSimulation::addBackgroundIntensity(size_t, size_t)
{
if (background())
throw std::runtime_error(
- "Error: nonzero background is not supported by DepthProbeSimulation");
+ "Error: nonzero background is not supported by DepthprobeSimulation");
}
-void DepthProbeSimulation::addDataToCache(double weight)
+void DepthprobeSimulation::addDataToCache(double weight)
{
ASSERT(m_depth_eles.size() == m_cache.size());
for (size_t i = 0, size = m_depth_eles.size(); i < size; ++i)
m_cache[i] += m_depth_eles[i].getIntensities() * weight;
}
-void DepthProbeSimulation::moveDataFromCache()
+void DepthprobeSimulation::moveDataFromCache()
{
ASSERT(m_depth_eles.size() == m_cache.size());
for (size_t i = 0, size = m_depth_eles.size(); i < size; ++i)
diff --git a/Sim/Simulation/DepthprobeSimulation.h b/Sim/Simulation/DepthprobeSimulation.h
index c1aceaa98a3b570c758342ec6c8712db2a22c6d5..ec3c0f8a8bba1bfc19bbb2202e3323106cf50060 100644
--- a/Sim/Simulation/DepthprobeSimulation.h
+++ b/Sim/Simulation/DepthprobeSimulation.h
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file Sim/Simulation/DepthprobeSimulation.h
-//! @brief Defines class DepthProbeSimulation
+//! @brief Defines class DepthprobeSimulation
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -37,12 +37,12 @@ class IShape2D;
//! Only refraction, reflection and attenuation of the incoming beam are accounted for.
//! @ingroup simulation
-class DepthProbeSimulation : public ISimulation {
+class DepthprobeSimulation : public ISimulation {
public:
- DepthProbeSimulation(const MultiLayer& sample);
- ~DepthProbeSimulation() override;
+ DepthprobeSimulation(const MultiLayer& sample);
+ ~DepthprobeSimulation() override;
- std::string className() const final { return "DepthProbeSimulation"; }
+ std::string className() const final { return "DepthprobeSimulation"; }
std::vector<const INode*> nodeChildren() const override;
@@ -114,7 +114,7 @@ private:
std::unique_ptr<IAxis> m_alpha_axis;
std::unique_ptr<IAxis> m_z_axis;
- std::vector<DepthProbeElement> m_depth_eles; // TODO remerge with ISimulation2D::m_eles
+ std::vector<DepthprobeElement> m_depth_eles; // TODO remerge with ISimulation2D::m_eles
std::vector<std::valarray<double>> m_cache;
#endif
};
diff --git a/Sim/Simulation/ISimulation.h b/Sim/Simulation/ISimulation.h
index 9c3095e47f983479d6aa8e2283fc1b02848d13df..7c8e470a18d539d14559bc1a518a53da1893e685 100644
--- a/Sim/Simulation/ISimulation.h
+++ b/Sim/Simulation/ISimulation.h
@@ -32,7 +32,7 @@ class SimulationResult;
//! Abstract base class, holds the infrastructure to run a simulation.
//!
-//! Base class of SpecularSimulation, ISimulation2D and DepthProbeSimulation.
+//! Base class of SpecularSimulation, ISimulation2D and DepthprobeSimulation.
//!
//! Holds an instrument and sample model. Provides the common infrastructure
//! to run a simulation: multithreading, batch processing, averaging over
diff --git a/Tests/SimFactory/MakeSimulations.cpp b/Tests/SimFactory/MakeSimulations.cpp
index d6332c7d112d8d17fda79c39c05e641e1730056d..caef84a4fcf246765a149c81981ca5f4f8b69169 100644
--- a/Tests/SimFactory/MakeSimulations.cpp
+++ b/Tests/SimFactory/MakeSimulations.cpp
@@ -466,8 +466,8 @@ test::makeSimulation::TOFRWithPointwiseResolution(const MultiLayer& sample)
// depth probe simulations
// ************************************************************************************************
-std::unique_ptr<DepthProbeSimulation>
-test::makeSimulation::BasicDepthProbe(const MultiLayer& sample)
+std::unique_ptr<DepthprobeSimulation>
+test::makeSimulation::BasicDepthprobe(const MultiLayer& sample)
{
const double wavelength = 10 * angstrom;
const size_t n_alpha = 20;
@@ -477,7 +477,7 @@ test::makeSimulation::BasicDepthProbe(const MultiLayer& sample)
const double z_min = -100.0 * Units::nm;
const double z_max = 100.0 * Units::nm;
- auto result = std::make_unique<DepthProbeSimulation>(sample);
+ auto result = std::make_unique<DepthprobeSimulation>(sample);
result->setBeamParameters(wavelength, n_alpha, alpha_min, alpha_max);
result->setzSpan(n_z, z_min, z_max);
diff --git a/Tests/SimFactory/MakeSimulations.h b/Tests/SimFactory/MakeSimulations.h
index 0d324530d21bcdee8dbc23a9c3cf7951f6037b18..9a62d181635f365a2cc146db5eaa6a4fb7b31805 100644
--- a/Tests/SimFactory/MakeSimulations.h
+++ b/Tests/SimFactory/MakeSimulations.h
@@ -21,7 +21,7 @@
#include <memory>
#include <string>
-class DepthProbeSimulation;
+class DepthprobeSimulation;
class ISpecularScan;
class MultiLayer;
class OffspecSimulation;
@@ -66,7 +66,7 @@ std::unique_ptr<SpecularSimulation> SpecularDivergentBeam(const MultiLayer& samp
std::unique_ptr<SpecularSimulation> TOFRWithRelativeResolution(const MultiLayer& sample);
std::unique_ptr<SpecularSimulation> TOFRWithPointwiseResolution(const MultiLayer& sample);
-std::unique_ptr<DepthProbeSimulation> BasicDepthProbe(const MultiLayer& sample);
+std::unique_ptr<DepthprobeSimulation> BasicDepthprobe(const MultiLayer& sample);
} // namespace test::makeSimulation
diff --git a/Tests/Suite/Common/TestSuite.h b/Tests/Suite/Common/TestSuite.h
index ab60fcf290c21f26161983e1727e2b54354c331c..a3e5806e062216b5a9d4c7140544a3dffe059d3d 100644
--- a/Tests/Suite/Common/TestSuite.h
+++ b/Tests/Suite/Common/TestSuite.h
@@ -726,11 +726,11 @@ TEST(TESTNAME, PolarizedFeNiBilayerSpinFlipNC)
}
}
-TEST(TESTNAME, DepthProbeTest)
+TEST(TESTNAME, DepthprobeTest)
{
auto* sample = ExemplarySamples::createHomogeneousMultilayer();
- auto sim = test::makeSimulation::BasicDepthProbe(*sample);
- EXPECT_TRUE(runTest("DepthProbeTest", *sim, 1e-10));
+ auto sim = test::makeSimulation::BasicDepthprobe(*sample);
+ EXPECT_TRUE(runTest("DepthprobeTest", *sim, 1e-10));
}
#endif // GUI_STD_TEST
diff --git a/Tests/Unit/Device/DepthProbeConverterTest.cpp b/Tests/Unit/Device/DepthProbeConverterTest.cpp
index 9a11988775fdaf198cfb2094468fb134071c01da..3472b8a69340b077d47f666d31ffcd2228542363 100644
--- a/Tests/Unit/Device/DepthProbeConverterTest.cpp
+++ b/Tests/Unit/Device/DepthProbeConverterTest.cpp
@@ -5,13 +5,13 @@
#include "Device/Coord/CoordSystem2D.h"
#include "Tests/GTestWrapper/google_test.h"
-class DepthProbeCoordsTest : public ::testing::Test {
+class DepthprobeCoordsTest : public ::testing::Test {
protected:
- DepthProbeCoordsTest();
+ DepthprobeCoordsTest();
- void checkMainFunctionality(const DepthProbeCoords& test_object);
- void checkAlphaAxis(Coords units, const DepthProbeCoords& test_object);
- void checkZAxis(Coords units, const DepthProbeCoords& test_object);
+ void checkMainFunctionality(const DepthprobeCoords& test_object);
+ void checkAlphaAxis(Coords units, const DepthprobeCoords& test_object);
+ void checkZAxis(Coords units, const DepthprobeCoords& test_object);
const double m_alpha_start = 0.5; // first axis value in rads
const double m_alpha_end = 1.0; // last axis value in rads
const double m_z_start = -30.0;
@@ -21,14 +21,14 @@ protected:
std::vector<const IAxis*> m_axes;
};
-DepthProbeCoordsTest::DepthProbeCoordsTest()
+DepthprobeCoordsTest::DepthprobeCoordsTest()
: m_beam(Beam::horizontalBeam())
, m_axes({new FixedBinAxis("Angles", m_nbins, m_alpha_start, m_alpha_end), // angles in radians
new FixedBinAxis("Positions", m_nbins, m_z_start, m_z_end)}) // z positions in nm
{
}
-void DepthProbeCoordsTest::checkMainFunctionality(const DepthProbeCoords& test_object)
+void DepthprobeCoordsTest::checkMainFunctionality(const DepthprobeCoords& test_object)
{
EXPECT_EQ(test_object.rank(), 2u);
@@ -63,7 +63,7 @@ void DepthProbeCoordsTest::checkMainFunctionality(const DepthProbeCoords& test_o
checkZAxis(Coords::NBINS, test_object);
}
-void DepthProbeCoordsTest::checkAlphaAxis(Coords units, const DepthProbeCoords& test_object)
+void DepthprobeCoordsTest::checkAlphaAxis(Coords units, const DepthprobeCoords& test_object)
{
std::unique_ptr<IAxis> axis(test_object.createConvertedAxis(0, units));
EXPECT_TRUE(dynamic_cast<const FixedBinAxis*>(axis.get()));
@@ -73,7 +73,7 @@ void DepthProbeCoordsTest::checkAlphaAxis(Coords units, const DepthProbeCoords&
EXPECT_EQ(axis->max(), test_object.calculateMax(0, units));
}
-void DepthProbeCoordsTest::checkZAxis(Coords units, const DepthProbeCoords& test_object)
+void DepthprobeCoordsTest::checkZAxis(Coords units, const DepthprobeCoords& test_object)
{
std::unique_ptr<IAxis> axis(test_object.createConvertedAxis(1, units));
EXPECT_TRUE(dynamic_cast<const FixedBinAxis*>(axis.get()));
@@ -89,15 +89,15 @@ void DepthProbeCoordsTest::checkZAxis(Coords units, const DepthProbeCoords& test
EXPECT_NEAR(axis->max(), test_max, std::abs(test_max) * 1e-10);
}
-TEST_F(DepthProbeCoordsTest, DepthProbeCoords)
+TEST_F(DepthprobeCoordsTest, DepthprobeCoords)
{
- DepthProbeCoords converter(m_axes, m_beam.ki());
+ DepthprobeCoords converter(m_axes, m_beam.ki());
checkMainFunctionality(converter);
}
-TEST_F(DepthProbeCoordsTest, DepthProbeCoordsExceptions)
+TEST_F(DepthprobeCoordsTest, DepthprobeCoordsExceptions)
{
- DepthProbeCoords converter(m_axes, m_beam.ki());
+ DepthprobeCoords converter(m_axes, m_beam.ki());
EXPECT_FAILED_ASSERT(converter.nameOfAxis(0, Coords::MM));
EXPECT_FAILED_ASSERT(converter.nameOfAxis(1, Coords::MM));
@@ -116,9 +116,9 @@ TEST_F(DepthProbeCoordsTest, DepthProbeCoordsExceptions)
EXPECT_FAILED_ASSERT(converter.createConvertedAxis(2, Coords::UNDEFINED));
}
-TEST_F(DepthProbeCoordsTest, DepthProbeCoordsClone)
+TEST_F(DepthprobeCoordsTest, DepthprobeCoordsClone)
{
- DepthProbeCoords converter(m_axes, m_beam.ki());
- std::unique_ptr<DepthProbeCoords> converter_clone(converter.clone());
+ DepthprobeCoords converter(m_axes, m_beam.ki());
+ std::unique_ptr<DepthprobeCoords> converter_clone(converter.clone());
checkMainFunctionality(*converter_clone);
}
diff --git a/Tests/Unit/GUI/TestSessionXML.cpp b/Tests/Unit/GUI/TestSessionXML.cpp
index a31518a2e2ff0ec13db86280e8e4eac84a774760..9dc753ba201208f99f5dc74fd6844e4820bd6add 100644
--- a/Tests/Unit/GUI/TestSessionXML.cpp
+++ b/Tests/Unit/GUI/TestSessionXML.cpp
@@ -154,12 +154,12 @@ TEST(TestSessionXML, SpecularInstrumentItem)
EXPECT_EQ(a1, a2);
}
-TEST(TestSessionXML, DepthProbeInstrumentItem)
+TEST(TestSessionXML, DepthprobeInstrumentItem)
{
- DepthProbeInstrumentItem instrument;
+ DepthprobeInstrumentItem instrument;
const auto a1 = serialize(instrument);
- DepthProbeInstrumentItem target;
+ DepthprobeInstrumentItem target;
deserialize(target, a1);
// checking top items in source and target models
diff --git a/auto/Wrap/libBornAgainSim.py b/auto/Wrap/libBornAgainSim.py
index 814f310b352e64ffd17e38dc75d4753bec8aa4a2..22116351c73efb4a8378c2a132cbd057da96ad92 100644
--- a/auto/Wrap/libBornAgainSim.py
+++ b/auto/Wrap/libBornAgainSim.py
@@ -2977,55 +2977,55 @@ class ScatteringSimulation(ISimulation2D):
# Register ScatteringSimulation in _libBornAgainSim:
_libBornAgainSim.ScatteringSimulation_swigregister(ScatteringSimulation)
-class DepthProbeSimulation(ISimulation):
- r"""Proxy of C++ DepthProbeSimulation class."""
+class DepthprobeSimulation(ISimulation):
+ r"""Proxy of C++ DepthprobeSimulation class."""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
def __init__(self, sample):
- r"""__init__(DepthProbeSimulation self, MultiLayer const & sample) -> DepthProbeSimulation"""
- _libBornAgainSim.DepthProbeSimulation_swiginit(self, _libBornAgainSim.new_DepthProbeSimulation(sample))
- __swig_destroy__ = _libBornAgainSim.delete_DepthProbeSimulation
+ r"""__init__(DepthprobeSimulation self, MultiLayer const & sample) -> DepthprobeSimulation"""
+ _libBornAgainSim.DepthprobeSimulation_swiginit(self, _libBornAgainSim.new_DepthprobeSimulation(sample))
+ __swig_destroy__ = _libBornAgainSim.delete_DepthprobeSimulation
def className(self):
- r"""className(DepthProbeSimulation self) -> std::string"""
- return _libBornAgainSim.DepthProbeSimulation_className(self)
+ r"""className(DepthprobeSimulation self) -> std::string"""
+ return _libBornAgainSim.DepthprobeSimulation_className(self)
def nodeChildren(self):
- r"""nodeChildren(DepthProbeSimulation self) -> swig_dummy_type_const_inode_vector"""
- return _libBornAgainSim.DepthProbeSimulation_nodeChildren(self)
+ r"""nodeChildren(DepthprobeSimulation self) -> swig_dummy_type_const_inode_vector"""
+ return _libBornAgainSim.DepthprobeSimulation_nodeChildren(self)
def setBeamParameters(self, _lambda, nbins, alpha_i_min, alpha_i_max, beam_shape=None):
- r"""setBeamParameters(DepthProbeSimulation self, double _lambda, int nbins, double alpha_i_min, double alpha_i_max, IFootprintFactor const * beam_shape=None)"""
- return _libBornAgainSim.DepthProbeSimulation_setBeamParameters(self, _lambda, nbins, alpha_i_min, alpha_i_max, beam_shape)
+ r"""setBeamParameters(DepthprobeSimulation self, double _lambda, int nbins, double alpha_i_min, double alpha_i_max, IFootprintFactor const * beam_shape=None)"""
+ return _libBornAgainSim.DepthprobeSimulation_setBeamParameters(self, _lambda, nbins, alpha_i_min, alpha_i_max, beam_shape)
def setzSpan(self, n_bins, z_min, z_max):
- r"""setzSpan(DepthProbeSimulation self, size_t n_bins, double z_min, double z_max)"""
- return _libBornAgainSim.DepthProbeSimulation_setzSpan(self, n_bins, z_min, z_max)
+ r"""setzSpan(DepthprobeSimulation self, size_t n_bins, double z_min, double z_max)"""
+ return _libBornAgainSim.DepthprobeSimulation_setzSpan(self, n_bins, z_min, z_max)
def alphaAxis(self):
- r"""alphaAxis(DepthProbeSimulation self) -> IAxis"""
- return _libBornAgainSim.DepthProbeSimulation_alphaAxis(self)
+ r"""alphaAxis(DepthprobeSimulation self) -> IAxis"""
+ return _libBornAgainSim.DepthprobeSimulation_alphaAxis(self)
def zAxis(self):
- r"""zAxis(DepthProbeSimulation self) -> IAxis"""
- return _libBornAgainSim.DepthProbeSimulation_zAxis(self)
+ r"""zAxis(DepthprobeSimulation self) -> IAxis"""
+ return _libBornAgainSim.DepthprobeSimulation_zAxis(self)
def force_polarized(self):
- r"""force_polarized(DepthProbeSimulation self) -> bool"""
- return _libBornAgainSim.DepthProbeSimulation_force_polarized(self)
+ r"""force_polarized(DepthprobeSimulation self) -> bool"""
+ return _libBornAgainSim.DepthprobeSimulation_force_polarized(self)
def initDistributionHandler(self):
- r"""initDistributionHandler(DepthProbeSimulation self)"""
- return _libBornAgainSim.DepthProbeSimulation_initDistributionHandler(self)
+ r"""initDistributionHandler(DepthprobeSimulation self)"""
+ return _libBornAgainSim.DepthprobeSimulation_initDistributionHandler(self)
def beam(self):
- r"""beam(DepthProbeSimulation self) -> Beam &"""
- return _libBornAgainSim.DepthProbeSimulation_beam(self)
+ r"""beam(DepthprobeSimulation self) -> Beam &"""
+ return _libBornAgainSim.DepthprobeSimulation_beam(self)
-# Register DepthProbeSimulation in _libBornAgainSim:
-_libBornAgainSim.DepthProbeSimulation_swigregister(DepthProbeSimulation)
+# Register DepthprobeSimulation in _libBornAgainSim:
+_libBornAgainSim.DepthprobeSimulation_swigregister(DepthprobeSimulation)
class SpecularSimulation(ISimulation):
r"""Proxy of C++ SpecularSimulation class."""
diff --git a/auto/Wrap/libBornAgainSim_wrap.cpp b/auto/Wrap/libBornAgainSim_wrap.cpp
index eebfa84eccb52addf8cf330c4c17a968e3978dee..64c1cb786e37f1d2c80fe0c9e507f52fb1243f38 100644
--- a/auto/Wrap/libBornAgainSim_wrap.cpp
+++ b/auto/Wrap/libBornAgainSim_wrap.cpp
@@ -3390,7 +3390,7 @@ namespace Swig {
#define SWIGTYPE_p_Beam swig_types[1]
#define SWIGTYPE_p_ChiSquaredModule swig_types[2]
#define SWIGTYPE_p_ConstantBackground swig_types[3]
-#define SWIGTYPE_p_DepthProbeSimulation swig_types[4]
+#define SWIGTYPE_p_DepthprobeSimulation swig_types[4]
#define SWIGTYPE_p_FitObjective swig_types[5]
#define SWIGTYPE_p_IAxis swig_types[6]
#define SWIGTYPE_p_IBackground swig_types[7]
@@ -7041,7 +7041,7 @@ SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_
#include "Sim/Scan/AlphaScan.h"
#include "Sim/Scan/QzScan.h"
#include "Sim/Scan/ScanResolution.h"
-#include "Sim/Simulation/DepthProbeSimulation.h"
+#include "Sim/Simulation/DepthprobeSimulation.h"
#include "Sim/Simulation/ScatteringSimulation.h"
#include "Sim/Simulation/OffspecSimulation.h"
#include "Sim/Simulation/SpecularSimulation.h"
@@ -36324,46 +36324,46 @@ SWIGINTERN PyObject *ScatteringSimulation_swiginit(PyObject *SWIGUNUSEDPARM(self
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DepthprobeSimulation(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
MultiLayer *arg1 = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
- DepthProbeSimulation *result = 0 ;
+ DepthprobeSimulation *result = 0 ;
if (!args) SWIG_fail;
swig_obj[0] = args;
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 &""'");
+ 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 &""'");
+ 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 );
+ 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_delete_DepthProbeSimulation(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_DepthprobeSimulation(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
- DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
+ DepthprobeSimulation *arg1 = (DepthprobeSimulation *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, SWIG_POINTER_DISOWN | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthprobeSimulation, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DepthProbeSimulation" "', argument " "1"" of type '" "DepthProbeSimulation *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DepthprobeSimulation" "', argument " "1"" of type '" "DepthprobeSimulation *""'");
}
- arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
+ arg1 = reinterpret_cast< DepthprobeSimulation * >(argp1);
delete arg1;
resultobj = SWIG_Py_Void();
return resultobj;
@@ -36372,9 +36372,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_className(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_DepthprobeSimulation_className(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
- DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
+ DepthprobeSimulation *arg1 = (DepthprobeSimulation *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -36382,12 +36382,12 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_className(PyObject *self, PyObje
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthprobeSimulation, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_className" "', argument " "1"" of type '" "DepthProbeSimulation const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthprobeSimulation_className" "', argument " "1"" of type '" "DepthprobeSimulation const *""'");
}
- arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
- result = ((DepthProbeSimulation const *)arg1)->className();
+ arg1 = reinterpret_cast< DepthprobeSimulation * >(argp1);
+ result = ((DepthprobeSimulation const *)arg1)->className();
resultobj = SWIG_From_std_string(static_cast< std::string >(result));
return resultobj;
fail:
@@ -36395,9 +36395,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_nodeChildren(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_DepthprobeSimulation_nodeChildren(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
- DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
+ DepthprobeSimulation *arg1 = (DepthprobeSimulation *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -36405,12 +36405,12 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_nodeChildren(PyObject *self, PyO
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthprobeSimulation, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_nodeChildren" "', argument " "1"" of type '" "DepthProbeSimulation const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthprobeSimulation_nodeChildren" "', argument " "1"" of type '" "DepthprobeSimulation const *""'");
}
- arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
- result = ((DepthProbeSimulation const *)arg1)->nodeChildren();
+ arg1 = reinterpret_cast< DepthprobeSimulation * >(argp1);
+ result = ((DepthprobeSimulation const *)arg1)->nodeChildren();
resultobj = swig::from(static_cast< std::vector< INode const*,std::allocator< INode const * > > >(result));
return resultobj;
fail:
@@ -36418,9 +36418,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_DepthprobeSimulation_setBeamParameters__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
- DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
+ DepthprobeSimulation *arg1 = (DepthprobeSimulation *) 0 ;
double arg2 ;
int arg3 ;
double arg4 ;
@@ -36440,34 +36440,34 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters__SWIG_0(PyObje
int res6 = 0 ;
if ((nobjs < 6) || (nobjs > 6)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthprobeSimulation, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "1"" of type '" "DepthProbeSimulation *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthprobeSimulation_setBeamParameters" "', argument " "1"" of type '" "DepthprobeSimulation *""'");
}
- arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
+ arg1 = reinterpret_cast< DepthprobeSimulation * >(argp1);
ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "2"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DepthprobeSimulation_setBeamParameters" "', argument " "2"" of type '" "double""'");
}
arg2 = static_cast< double >(val2);
ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "3"" of type '" "int""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DepthprobeSimulation_setBeamParameters" "', argument " "3"" of type '" "int""'");
}
arg3 = static_cast< int >(val3);
ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "4"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DepthprobeSimulation_setBeamParameters" "', argument " "4"" of type '" "double""'");
}
arg4 = static_cast< double >(val4);
ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
if (!SWIG_IsOK(ecode5)) {
- SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "5"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "DepthprobeSimulation_setBeamParameters" "', argument " "5"" of type '" "double""'");
}
arg5 = static_cast< double >(val5);
res6 = SWIG_ConvertPtr(swig_obj[5], &argp6,SWIGTYPE_p_IFootprintFactor, 0 | 0 );
if (!SWIG_IsOK(res6)) {
- SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "6"" of type '" "IFootprintFactor const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "DepthprobeSimulation_setBeamParameters" "', argument " "6"" of type '" "IFootprintFactor const *""'");
}
arg6 = reinterpret_cast< IFootprintFactor * >(argp6);
(arg1)->setBeamParameters(arg2,arg3,arg4,arg5,(IFootprintFactor const *)arg6);
@@ -36478,9 +36478,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_DepthprobeSimulation_setBeamParameters__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
- DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
+ DepthprobeSimulation *arg1 = (DepthprobeSimulation *) 0 ;
double arg2 ;
int arg3 ;
double arg4 ;
@@ -36497,29 +36497,29 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters__SWIG_1(PyObje
int ecode5 = 0 ;
if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthprobeSimulation, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "1"" of type '" "DepthProbeSimulation *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthprobeSimulation_setBeamParameters" "', argument " "1"" of type '" "DepthprobeSimulation *""'");
}
- arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
+ arg1 = reinterpret_cast< DepthprobeSimulation * >(argp1);
ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "2"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DepthprobeSimulation_setBeamParameters" "', argument " "2"" of type '" "double""'");
}
arg2 = static_cast< double >(val2);
ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "3"" of type '" "int""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DepthprobeSimulation_setBeamParameters" "', argument " "3"" of type '" "int""'");
}
arg3 = static_cast< int >(val3);
ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "4"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DepthprobeSimulation_setBeamParameters" "', argument " "4"" of type '" "double""'");
}
arg4 = static_cast< double >(val4);
ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
if (!SWIG_IsOK(ecode5)) {
- SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "5"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "DepthprobeSimulation_setBeamParameters" "', argument " "5"" of type '" "double""'");
}
arg5 = static_cast< double >(val5);
(arg1)->setBeamParameters(arg2,arg3,arg4,arg5);
@@ -36530,18 +36530,18 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_DepthprobeSimulation_setBeamParameters(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[7] = {
0
};
- if (!(argc = SWIG_Python_UnpackTuple(args, "DepthProbeSimulation_setBeamParameters", 0, 6, argv))) SWIG_fail;
+ if (!(argc = SWIG_Python_UnpackTuple(args, "DepthprobeSimulation_setBeamParameters", 0, 6, argv))) SWIG_fail;
--argc;
if (argc == 5) {
int _v = 0;
void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_DepthProbeSimulation, 0);
+ int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_DepthprobeSimulation, 0);
_v = SWIG_CheckState(res);
if (_v) {
{
@@ -36564,7 +36564,7 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters(PyObject *self
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_DepthProbeSimulation_setBeamParameters__SWIG_1(self, argc, argv);
+ return _wrap_DepthprobeSimulation_setBeamParameters__SWIG_1(self, argc, argv);
}
}
}
@@ -36574,7 +36574,7 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters(PyObject *self
if (argc == 6) {
int _v = 0;
void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_DepthProbeSimulation, 0);
+ int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_DepthprobeSimulation, 0);
_v = SWIG_CheckState(res);
if (_v) {
{
@@ -36601,7 +36601,7 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters(PyObject *self
int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_IFootprintFactor, 0);
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_DepthProbeSimulation_setBeamParameters__SWIG_0(self, argc, argv);
+ return _wrap_DepthprobeSimulation_setBeamParameters__SWIG_0(self, argc, argv);
}
}
}
@@ -36611,17 +36611,17 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters(PyObject *self
}
fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'DepthProbeSimulation_setBeamParameters'.\n"
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'DepthprobeSimulation_setBeamParameters'.\n"
" Possible C/C++ prototypes are:\n"
- " DepthProbeSimulation::setBeamParameters(double,int,double,double,IFootprintFactor const *)\n"
- " DepthProbeSimulation::setBeamParameters(double,int,double,double)\n");
+ " DepthprobeSimulation::setBeamParameters(double,int,double,double,IFootprintFactor const *)\n"
+ " DepthprobeSimulation::setBeamParameters(double,int,double,double)\n");
return 0;
}
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setzSpan(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_DepthprobeSimulation_setzSpan(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
- DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
+ DepthprobeSimulation *arg1 = (DepthprobeSimulation *) 0 ;
size_t arg2 ;
double arg3 ;
double arg4 ;
@@ -36635,25 +36635,25 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setzSpan(PyObject *self, PyObjec
int ecode4 = 0 ;
PyObject *swig_obj[4] ;
- if (!SWIG_Python_UnpackTuple(args, "DepthProbeSimulation_setzSpan", 4, 4, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 | 0 );
+ if (!SWIG_Python_UnpackTuple(args, "DepthprobeSimulation_setzSpan", 4, 4, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthprobeSimulation, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_setzSpan" "', argument " "1"" of type '" "DepthProbeSimulation *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthprobeSimulation_setzSpan" "', argument " "1"" of type '" "DepthprobeSimulation *""'");
}
- arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
+ arg1 = reinterpret_cast< DepthprobeSimulation * >(argp1);
ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DepthProbeSimulation_setzSpan" "', argument " "2"" of type '" "size_t""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DepthprobeSimulation_setzSpan" "', argument " "2"" of type '" "size_t""'");
}
arg2 = static_cast< size_t >(val2);
ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DepthProbeSimulation_setzSpan" "', argument " "3"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DepthprobeSimulation_setzSpan" "', argument " "3"" of type '" "double""'");
}
arg3 = static_cast< double >(val3);
ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DepthProbeSimulation_setzSpan" "', argument " "4"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DepthprobeSimulation_setzSpan" "', argument " "4"" of type '" "double""'");
}
arg4 = static_cast< double >(val4);
(arg1)->setzSpan(arg2,arg3,arg4);
@@ -36664,9 +36664,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_alphaAxis(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_DepthprobeSimulation_alphaAxis(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
- DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
+ DepthprobeSimulation *arg1 = (DepthprobeSimulation *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -36674,12 +36674,12 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_alphaAxis(PyObject *self, PyObje
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthprobeSimulation, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_alphaAxis" "', argument " "1"" of type '" "DepthProbeSimulation const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthprobeSimulation_alphaAxis" "', argument " "1"" of type '" "DepthprobeSimulation const *""'");
}
- arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
- result = (IAxis *)((DepthProbeSimulation const *)arg1)->alphaAxis();
+ arg1 = reinterpret_cast< DepthprobeSimulation * >(argp1);
+ result = (IAxis *)((DepthprobeSimulation const *)arg1)->alphaAxis();
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IAxis, 0 | 0 );
return resultobj;
fail:
@@ -36687,9 +36687,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_zAxis(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_DepthprobeSimulation_zAxis(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
- DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
+ DepthprobeSimulation *arg1 = (DepthprobeSimulation *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -36697,12 +36697,12 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_zAxis(PyObject *self, PyObject *
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthprobeSimulation, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_zAxis" "', argument " "1"" of type '" "DepthProbeSimulation const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthprobeSimulation_zAxis" "', argument " "1"" of type '" "DepthprobeSimulation const *""'");
}
- arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
- result = (IAxis *)((DepthProbeSimulation const *)arg1)->zAxis();
+ arg1 = reinterpret_cast< DepthprobeSimulation * >(argp1);
+ result = (IAxis *)((DepthprobeSimulation const *)arg1)->zAxis();
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IAxis, 0 | 0 );
return resultobj;
fail:
@@ -36710,9 +36710,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_force_polarized(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_DepthprobeSimulation_force_polarized(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
- DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
+ DepthprobeSimulation *arg1 = (DepthprobeSimulation *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -36720,12 +36720,12 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_force_polarized(PyObject *self,
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthprobeSimulation, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_force_polarized" "', argument " "1"" of type '" "DepthProbeSimulation const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthprobeSimulation_force_polarized" "', argument " "1"" of type '" "DepthprobeSimulation const *""'");
}
- arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
- result = (bool)((DepthProbeSimulation const *)arg1)->force_polarized();
+ arg1 = reinterpret_cast< DepthprobeSimulation * >(argp1);
+ result = (bool)((DepthprobeSimulation const *)arg1)->force_polarized();
resultobj = SWIG_From_bool(static_cast< bool >(result));
return resultobj;
fail:
@@ -36733,20 +36733,20 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_initDistributionHandler(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_DepthprobeSimulation_initDistributionHandler(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
- DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
+ DepthprobeSimulation *arg1 = (DepthprobeSimulation *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthprobeSimulation, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_initDistributionHandler" "', argument " "1"" of type '" "DepthProbeSimulation *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthprobeSimulation_initDistributionHandler" "', argument " "1"" of type '" "DepthprobeSimulation *""'");
}
- arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
+ arg1 = reinterpret_cast< DepthprobeSimulation * >(argp1);
(arg1)->initDistributionHandler();
resultobj = SWIG_Py_Void();
return resultobj;
@@ -36755,9 +36755,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_beam(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_DepthprobeSimulation_beam(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
- DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
+ DepthprobeSimulation *arg1 = (DepthprobeSimulation *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -36765,11 +36765,11 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_beam(PyObject *self, PyObject *a
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthprobeSimulation, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_beam" "', argument " "1"" of type '" "DepthProbeSimulation *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthprobeSimulation_beam" "', argument " "1"" of type '" "DepthprobeSimulation *""'");
}
- arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
+ arg1 = reinterpret_cast< DepthprobeSimulation * >(argp1);
result = (Beam *) &(arg1)->beam();
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Beam, 0 | 0 );
return resultobj;
@@ -36778,14 +36778,14 @@ fail:
}
-SWIGINTERN PyObject *DepthProbeSimulation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *DepthprobeSimulation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_DepthProbeSimulation, SWIG_NewClientData(obj));
+ SWIG_TypeNewClientData(SWIGTYPE_p_DepthprobeSimulation, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *DepthProbeSimulation_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *DepthprobeSimulation_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
return SWIG_Python_InitShadowInstance(args);
}
@@ -39738,19 +39738,19 @@ static PyMethodDef SwigMethods[] = {
{ "ScatteringSimulation_className", _wrap_ScatteringSimulation_className, METH_O, "ScatteringSimulation_className(ScatteringSimulation self) -> std::string"},
{ "ScatteringSimulation_swigregister", ScatteringSimulation_swigregister, METH_O, NULL},
{ "ScatteringSimulation_swiginit", ScatteringSimulation_swiginit, METH_VARARGS, NULL},
- { "new_DepthProbeSimulation", _wrap_new_DepthProbeSimulation, METH_O, "new_DepthProbeSimulation(MultiLayer const & sample) -> DepthProbeSimulation"},
- { "delete_DepthProbeSimulation", _wrap_delete_DepthProbeSimulation, METH_O, "delete_DepthProbeSimulation(DepthProbeSimulation self)"},
- { "DepthProbeSimulation_className", _wrap_DepthProbeSimulation_className, METH_O, "DepthProbeSimulation_className(DepthProbeSimulation self) -> std::string"},
- { "DepthProbeSimulation_nodeChildren", _wrap_DepthProbeSimulation_nodeChildren, METH_O, "DepthProbeSimulation_nodeChildren(DepthProbeSimulation self) -> swig_dummy_type_const_inode_vector"},
- { "DepthProbeSimulation_setBeamParameters", _wrap_DepthProbeSimulation_setBeamParameters, METH_VARARGS, "DepthProbeSimulation_setBeamParameters(DepthProbeSimulation self, double _lambda, int nbins, double alpha_i_min, double alpha_i_max, IFootprintFactor const * beam_shape=None)"},
- { "DepthProbeSimulation_setzSpan", _wrap_DepthProbeSimulation_setzSpan, METH_VARARGS, "DepthProbeSimulation_setzSpan(DepthProbeSimulation self, size_t n_bins, double z_min, double z_max)"},
- { "DepthProbeSimulation_alphaAxis", _wrap_DepthProbeSimulation_alphaAxis, METH_O, "DepthProbeSimulation_alphaAxis(DepthProbeSimulation self) -> IAxis"},
- { "DepthProbeSimulation_zAxis", _wrap_DepthProbeSimulation_zAxis, METH_O, "DepthProbeSimulation_zAxis(DepthProbeSimulation self) -> IAxis"},
- { "DepthProbeSimulation_force_polarized", _wrap_DepthProbeSimulation_force_polarized, METH_O, "DepthProbeSimulation_force_polarized(DepthProbeSimulation self) -> bool"},
- { "DepthProbeSimulation_initDistributionHandler", _wrap_DepthProbeSimulation_initDistributionHandler, METH_O, "DepthProbeSimulation_initDistributionHandler(DepthProbeSimulation self)"},
- { "DepthProbeSimulation_beam", _wrap_DepthProbeSimulation_beam, METH_O, "DepthProbeSimulation_beam(DepthProbeSimulation self) -> Beam &"},
- { "DepthProbeSimulation_swigregister", DepthProbeSimulation_swigregister, METH_O, NULL},
- { "DepthProbeSimulation_swiginit", DepthProbeSimulation_swiginit, METH_VARARGS, NULL},
+ { "new_DepthprobeSimulation", _wrap_new_DepthprobeSimulation, METH_O, "new_DepthprobeSimulation(MultiLayer const & sample) -> DepthprobeSimulation"},
+ { "delete_DepthprobeSimulation", _wrap_delete_DepthprobeSimulation, METH_O, "delete_DepthprobeSimulation(DepthprobeSimulation self)"},
+ { "DepthprobeSimulation_className", _wrap_DepthprobeSimulation_className, METH_O, "DepthprobeSimulation_className(DepthprobeSimulation self) -> std::string"},
+ { "DepthprobeSimulation_nodeChildren", _wrap_DepthprobeSimulation_nodeChildren, METH_O, "DepthprobeSimulation_nodeChildren(DepthprobeSimulation self) -> swig_dummy_type_const_inode_vector"},
+ { "DepthprobeSimulation_setBeamParameters", _wrap_DepthprobeSimulation_setBeamParameters, METH_VARARGS, "DepthprobeSimulation_setBeamParameters(DepthprobeSimulation self, double _lambda, int nbins, double alpha_i_min, double alpha_i_max, IFootprintFactor const * beam_shape=None)"},
+ { "DepthprobeSimulation_setzSpan", _wrap_DepthprobeSimulation_setzSpan, METH_VARARGS, "DepthprobeSimulation_setzSpan(DepthprobeSimulation self, size_t n_bins, double z_min, double z_max)"},
+ { "DepthprobeSimulation_alphaAxis", _wrap_DepthprobeSimulation_alphaAxis, METH_O, "DepthprobeSimulation_alphaAxis(DepthprobeSimulation self) -> IAxis"},
+ { "DepthprobeSimulation_zAxis", _wrap_DepthprobeSimulation_zAxis, METH_O, "DepthprobeSimulation_zAxis(DepthprobeSimulation self) -> IAxis"},
+ { "DepthprobeSimulation_force_polarized", _wrap_DepthprobeSimulation_force_polarized, METH_O, "DepthprobeSimulation_force_polarized(DepthprobeSimulation self) -> bool"},
+ { "DepthprobeSimulation_initDistributionHandler", _wrap_DepthprobeSimulation_initDistributionHandler, METH_O, "DepthprobeSimulation_initDistributionHandler(DepthprobeSimulation self)"},
+ { "DepthprobeSimulation_beam", _wrap_DepthprobeSimulation_beam, METH_O, "DepthprobeSimulation_beam(DepthprobeSimulation self) -> Beam &"},
+ { "DepthprobeSimulation_swigregister", DepthprobeSimulation_swigregister, METH_O, NULL},
+ { "DepthprobeSimulation_swiginit", DepthprobeSimulation_swiginit, METH_VARARGS, NULL},
{ "delete_SpecularSimulation", _wrap_delete_SpecularSimulation, METH_O, "delete_SpecularSimulation(SpecularSimulation self)"},
{ "new_SpecularSimulation", _wrap_new_SpecularSimulation, METH_VARARGS, "\n"
"SpecularSimulation(ISpecularScan scan, MultiLayer const & sample)\n"
@@ -39900,8 +39900,8 @@ static void *_p_IntensityFunctionSqrtTo_p_IIntensityFunction(void *x, int *SWIGU
static void *_p_ConstantBackgroundTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (IBackground *) ((ConstantBackground *) x));
}
-static void *_p_DepthProbeSimulationTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((INode *) (ISimulation *) ((DepthProbeSimulation *) x));
+static void *_p_DepthprobeSimulationTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((INode *) (ISimulation *) ((DepthprobeSimulation *) x));
}
static void *_p_IBackgroundTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) ((IBackground *) x));
@@ -39927,8 +39927,8 @@ static void *_p_ScatteringSimulationTo_p_INode(void *x, int *SWIGUNUSEDPARM(newm
static void *_p_SpecularSimulationTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISimulation *) ((SpecularSimulation *) x));
}
-static void *_p_DepthProbeSimulationTo_p_ISimulation(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ISimulation *) ((DepthProbeSimulation *) x));
+static void *_p_DepthprobeSimulationTo_p_ISimulation(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISimulation *) ((DepthprobeSimulation *) x));
}
static void *_p_ISimulation2DTo_p_ISimulation(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISimulation *) ((ISimulation2D *) x));
@@ -39964,7 +39964,7 @@ static swig_type_info _swigt__p_AlphaScan = {"_p_AlphaScan", "AlphaScan *", 0, 0
static swig_type_info _swigt__p_Beam = {"_p_Beam", "Beam *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_ChiSquaredModule = {"_p_ChiSquaredModule", "ChiSquaredModule *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_ConstantBackground = {"_p_ConstantBackground", "ConstantBackground *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_DepthProbeSimulation = {"_p_DepthProbeSimulation", "DepthProbeSimulation *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_DepthprobeSimulation = {"_p_DepthprobeSimulation", "DepthprobeSimulation *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_FitObjective = {"_p_FitObjective", "FitObjective *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IAxis = {"_p_IAxis", "IAxis *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IBackground = {"_p_IBackground", "IBackground *", 0, 0, (void*)0, 0};
@@ -40061,7 +40061,7 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_Beam,
&_swigt__p_ChiSquaredModule,
&_swigt__p_ConstantBackground,
- &_swigt__p_DepthProbeSimulation,
+ &_swigt__p_DepthprobeSimulation,
&_swigt__p_FitObjective,
&_swigt__p_IAxis,
&_swigt__p_IBackground,
@@ -40158,7 +40158,7 @@ static swig_cast_info _swigc__p_AlphaScan[] = { {&_swigt__p_AlphaScan, 0, 0, 0}
static swig_cast_info _swigc__p_Beam[] = { {&_swigt__p_Beam, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_ChiSquaredModule[] = { {&_swigt__p_ChiSquaredModule, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_ConstantBackground[] = { {&_swigt__p_ConstantBackground, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_DepthProbeSimulation[] = { {&_swigt__p_DepthProbeSimulation, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_DepthprobeSimulation[] = { {&_swigt__p_DepthprobeSimulation, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_FitObjective[] = { {&_swigt__p_FitObjective, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IAxis[] = { {&_swigt__p_IAxis, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IBackground[] = { {&_swigt__p_IBackground, 0, 0, 0}, {&_swigt__p_ConstantBackground, _p_ConstantBackgroundTo_p_IBackground, 0, 0}, {&_swigt__p_PoissonBackground, _p_PoissonBackgroundTo_p_IBackground, 0, 0},{0, 0, 0, 0}};
@@ -40169,10 +40169,10 @@ static swig_cast_info _swigc__p_IDetector[] = { {&_swigt__p_IDetector, 0, 0, 0}
static swig_cast_info _swigc__p_IDistribution1D[] = { {&_swigt__p_IDistribution1D, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IFootprintFactor[] = { {&_swigt__p_IFootprintFactor, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IIntensityFunction[] = { {&_swigt__p_IIntensityFunction, 0, 0, 0}, {&_swigt__p_IntensityFunctionLog, _p_IntensityFunctionLogTo_p_IIntensityFunction, 0, 0}, {&_swigt__p_IntensityFunctionSqrt, _p_IntensityFunctionSqrtTo_p_IIntensityFunction, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_INode[] = { {&_swigt__p_INode, 0, 0, 0}, {&_swigt__p_ConstantBackground, _p_ConstantBackgroundTo_p_INode, 0, 0}, {&_swigt__p_DepthProbeSimulation, _p_DepthProbeSimulationTo_p_INode, 0, 0}, {&_swigt__p_IBackground, _p_IBackgroundTo_p_INode, 0, 0}, {&_swigt__p_ISampleNode, _p_ISampleNodeTo_p_INode, 0, 0}, {&_swigt__p_ISimulation, _p_ISimulationTo_p_INode, 0, 0}, {&_swigt__p_ISimulation2D, _p_ISimulation2DTo_p_INode, 0, 0}, {&_swigt__p_OffspecSimulation, _p_OffspecSimulationTo_p_INode, 0, 0}, {&_swigt__p_PoissonBackground, _p_PoissonBackgroundTo_p_INode, 0, 0}, {&_swigt__p_ScatteringSimulation, _p_ScatteringSimulationTo_p_INode, 0, 0}, {&_swigt__p_SpecularSimulation, _p_SpecularSimulationTo_p_INode, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_INode[] = { {&_swigt__p_INode, 0, 0, 0}, {&_swigt__p_ConstantBackground, _p_ConstantBackgroundTo_p_INode, 0, 0}, {&_swigt__p_DepthprobeSimulation, _p_DepthprobeSimulationTo_p_INode, 0, 0}, {&_swigt__p_IBackground, _p_IBackgroundTo_p_INode, 0, 0}, {&_swigt__p_ISampleNode, _p_ISampleNodeTo_p_INode, 0, 0}, {&_swigt__p_ISimulation, _p_ISimulationTo_p_INode, 0, 0}, {&_swigt__p_ISimulation2D, _p_ISimulation2DTo_p_INode, 0, 0}, {&_swigt__p_OffspecSimulation, _p_OffspecSimulationTo_p_INode, 0, 0}, {&_swigt__p_PoissonBackground, _p_PoissonBackgroundTo_p_INode, 0, 0}, {&_swigt__p_ScatteringSimulation, _p_ScatteringSimulationTo_p_INode, 0, 0}, {&_swigt__p_SpecularSimulation, _p_SpecularSimulationTo_p_INode, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IRangedDistribution[] = { {&_swigt__p_IRangedDistribution, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IShape2D[] = { {&_swigt__p_IShape2D, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ISimulation[] = { {&_swigt__p_ISimulation, 0, 0, 0}, {&_swigt__p_DepthProbeSimulation, _p_DepthProbeSimulationTo_p_ISimulation, 0, 0}, {&_swigt__p_ISimulation2D, _p_ISimulation2DTo_p_ISimulation, 0, 0}, {&_swigt__p_OffspecSimulation, _p_OffspecSimulationTo_p_ISimulation, 0, 0}, {&_swigt__p_ScatteringSimulation, _p_ScatteringSimulationTo_p_ISimulation, 0, 0}, {&_swigt__p_SpecularSimulation, _p_SpecularSimulationTo_p_ISimulation, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ISimulation[] = { {&_swigt__p_ISimulation, 0, 0, 0}, {&_swigt__p_DepthprobeSimulation, _p_DepthprobeSimulationTo_p_ISimulation, 0, 0}, {&_swigt__p_ISimulation2D, _p_ISimulation2DTo_p_ISimulation, 0, 0}, {&_swigt__p_OffspecSimulation, _p_OffspecSimulationTo_p_ISimulation, 0, 0}, {&_swigt__p_ScatteringSimulation, _p_ScatteringSimulationTo_p_ISimulation, 0, 0}, {&_swigt__p_SpecularSimulation, _p_SpecularSimulationTo_p_ISimulation, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_ISimulation2D[] = { {&_swigt__p_ISimulation2D, 0, 0, 0}, {&_swigt__p_OffspecSimulation, _p_OffspecSimulationTo_p_ISimulation2D, 0, 0}, {&_swigt__p_ScatteringSimulation, _p_ScatteringSimulationTo_p_ISimulation2D, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_ISpecularScan[] = { {&_swigt__p_ISpecularScan, 0, 0, 0}, {&_swigt__p_AlphaScan, _p_AlphaScanTo_p_ISpecularScan, 0, 0}, {&_swigt__p_QzScan, _p_QzScanTo_p_ISpecularScan, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IVarianceFunction[] = { {&_swigt__p_IVarianceFunction, 0, 0, 0}, {&_swigt__p_VarianceConstantFunction, _p_VarianceConstantFunctionTo_p_IVarianceFunction, 0, 0}, {&_swigt__p_VarianceSimFunction, _p_VarianceSimFunctionTo_p_IVarianceFunction, 0, 0},{0, 0, 0, 0}};
@@ -40255,7 +40255,7 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_Beam,
_swigc__p_ChiSquaredModule,
_swigc__p_ConstantBackground,
- _swigc__p_DepthProbeSimulation,
+ _swigc__p_DepthprobeSimulation,
_swigc__p_FitObjective,
_swigc__p_IAxis,
_swigc__p_IBackground,