From a6a0bf6643d76bbc0cc130cf030ace63bf2b6ffa Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Mon, 24 Apr 2023 15:13:14 +0200
Subject: [PATCH] materialData --> materialValue
---
GUI/Model/FromCore/ItemizeSample.cpp | 2 +-
Resample/Slice/KzComputation.cpp | 2 +-
Resample/Slice/ProfileHelper.cpp | 4 +--
Sample/Material/IMaterialImpl.h | 2 +-
Sample/Material/Material.cpp | 8 ++---
Sample/Material/Material.h | 2 +-
Sample/Material/MaterialBySLDImpl.cpp | 2 +-
Sample/Material/MaterialBySLDImpl.h | 2 +-
Sample/Material/MaterialUtils.cpp | 4 +--
Sample/Material/RefractiveMaterialImpl.cpp | 2 +-
Sample/Material/RefractiveMaterialImpl.h | 2 +-
Sim/Export/SampleToPython.cpp | 2 +-
Tests/Unit/Resample/MaterialTest.cpp | 30 +++++++++----------
.../Unit/Resample/MultilayerAveragingTest.cpp | 4 +--
auto/Wrap/libBornAgainSample_wrap.cpp | 8 ++---
15 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/GUI/Model/FromCore/ItemizeSample.cpp b/GUI/Model/FromCore/ItemizeSample.cpp
index 204f4c10859..bcb21bf9087 100644
--- a/GUI/Model/FromCore/ItemizeSample.cpp
+++ b/GUI/Model/FromCore/ItemizeSample.cpp
@@ -537,7 +537,7 @@ MaterialItem* findMaterialItem(MaterialModel& matItems, const ISampleNode* node)
if (result)
return result;
- complex_t material_data = material->materialData();
+ complex_t material_data = material->materialValue();
if (material->typeID() == MATERIAL_TYPES::RefractiveMaterial) {
result = matItems.addRefractiveMaterialItem(materialName, material_data.real(),
material_data.imag());
diff --git a/Resample/Slice/KzComputation.cpp b/Resample/Slice/KzComputation.cpp
index 69eda83989f..03ae0f2ea8a 100644
--- a/Resample/Slice/KzComputation.cpp
+++ b/Resample/Slice/KzComputation.cpp
@@ -24,7 +24,7 @@ complex_t normalizedSLD(const Material& material)
{
ASSERT(material.typeID() == MATERIAL_TYPES::MaterialBySLD);
- complex_t sld = std::conj(material.materialData()) / (Units::angstrom * Units::angstrom);
+ complex_t sld = std::conj(material.materialValue()) / (Units::angstrom * Units::angstrom);
sld *= 4.0 * M_PI;
return sld;
}
diff --git a/Resample/Slice/ProfileHelper.cpp b/Resample/Slice/ProfileHelper.cpp
index 21a943c1d7d..56514f99f55 100644
--- a/Resample/Slice/ProfileHelper.cpp
+++ b/Resample/Slice/ProfileHelper.cpp
@@ -45,13 +45,13 @@ ProfileHelper::ProfileHelper(const SliceStack& stack)
// and beta, as is done here.
std::vector<complex_t> ProfileHelper::calculateProfile(const std::vector<double>& z_values) const
{
- const complex_t top_value = !m_stack.empty() ? m_stack.at(0).material().materialData() : 0.0;
+ const complex_t top_value = !m_stack.empty() ? m_stack.at(0).material().materialValue() : 0.0;
std::vector<complex_t> result(z_values.size(), top_value);
for (size_t i = 1; i < m_stack.size(); ++i) {
const Slice& slice = m_stack.at(i);
const Slice& sliceAbove = m_stack.at(i - 1);
const complex_t sld_diff =
- slice.material().materialData() - sliceAbove.material().materialData();
+ slice.material().materialValue() - sliceAbove.material().materialValue();
for (size_t j = 0; j < z_values.size(); ++j) {
const double arg = (z_values[j] - slice.hig());
const LayerRoughness* roughness = slice.topRoughness();
diff --git a/Sample/Material/IMaterialImpl.h b/Sample/Material/IMaterialImpl.h
index 3f0895e8aa9..4a99c17d4e0 100644
--- a/Sample/Material/IMaterialImpl.h
+++ b/Sample/Material/IMaterialImpl.h
@@ -48,7 +48,7 @@ public:
virtual complex_t refractiveIndex2(double wavelength) const = 0;
//! Returns underlying material data
- virtual complex_t materialData() const = 0;
+ virtual complex_t materialValue() const = 0;
//! Returns type of material implementation
virtual MATERIAL_TYPES typeID() const = 0;
diff --git a/Sample/Material/Material.cpp b/Sample/Material/Material.cpp
index 1a1fed19aa1..79a094221ce 100644
--- a/Sample/Material/Material.cpp
+++ b/Sample/Material/Material.cpp
@@ -80,14 +80,14 @@ R3 Material::magnetization() const
return m_material_impl->magnetization();
}
-complex_t Material::materialData() const
+complex_t Material::materialValue() const
{
- return m_material_impl->materialData();
+ return m_material_impl->materialValue();
}
bool Material::isDefaultMaterial() const
{
- return materialData() == complex_t() && isScalarMaterial();
+ return materialValue() == complex_t() && isScalarMaterial();
}
bool Material::isEmpty() const
@@ -123,7 +123,7 @@ bool operator==(const Material& left, const Material& right)
return false;
if (left.magnetization() != right.magnetization())
return false;
- if (left.materialData() != right.materialData())
+ if (left.materialValue() != right.materialValue())
return false;
if (left.typeID() != right.typeID())
return false;
diff --git a/Sample/Material/Material.h b/Sample/Material/Material.h
index d8898ef69d8..3a9da4edc75 100644
--- a/Sample/Material/Material.h
+++ b/Sample/Material/Material.h
@@ -75,7 +75,7 @@ public:
R3 magnetization() const;
//! Returns delta + i beta.
- complex_t materialData() const;
+ complex_t materialValue() const;
//! Returns true if material underlying data is nullptr
bool isEmpty() const;
diff --git a/Sample/Material/MaterialBySLDImpl.cpp b/Sample/Material/MaterialBySLDImpl.cpp
index aae5fd183a0..ab3642cd28d 100644
--- a/Sample/Material/MaterialBySLDImpl.cpp
+++ b/Sample/Material/MaterialBySLDImpl.cpp
@@ -56,7 +56,7 @@ complex_t MaterialBySLDImpl::refractiveIndex2(double wavelength) const
}
// Returns underlying material SLD in AA^-2
-complex_t MaterialBySLDImpl::materialData() const
+complex_t MaterialBySLDImpl::materialValue() const
{
return complex_t(m_sld_real * square_angstroms, m_sld_imag * square_angstroms);
}
diff --git a/Sample/Material/MaterialBySLDImpl.h b/Sample/Material/MaterialBySLDImpl.h
index 93ddabd28bc..7213b8350e4 100644
--- a/Sample/Material/MaterialBySLDImpl.h
+++ b/Sample/Material/MaterialBySLDImpl.h
@@ -37,7 +37,7 @@ public:
complex_t refractiveIndex2(double wavelength) const override;
//! Returns underlying material SLD in AA^-2
- complex_t materialData() const override;
+ complex_t materialValue() const override;
//! Returns type of material implementation
MATERIAL_TYPES typeID() const override { return MATERIAL_TYPES::MaterialBySLD; }
diff --git a/Sample/Material/MaterialUtils.cpp b/Sample/Material/MaterialUtils.cpp
index d17b820ef63..a2684cc2b8c 100644
--- a/Sample/Material/MaterialUtils.cpp
+++ b/Sample/Material/MaterialUtils.cpp
@@ -109,10 +109,10 @@ Material MaterialUtils::averagedMaterial(const std::string& name,
"Invalid mixture of different material definitions (refractive index vs SLD)");
avgeMagn += w * mat.magnetization();
if (type == MATERIAL_TYPES::RefractiveMaterial) {
- const complex_t mdc = std::conj(mat.materialData());
+ const complex_t mdc = std::conj(mat.materialValue());
avgeData += w * (mdc * mdc - 2.0 * mdc);
} else if (type == MATERIAL_TYPES::MaterialBySLD) {
- avgeData += w * mat.materialData();
+ avgeData += w * mat.materialValue();
} else
ASSERT(false);
}
diff --git a/Sample/Material/RefractiveMaterialImpl.cpp b/Sample/Material/RefractiveMaterialImpl.cpp
index 77439b63515..397e1f601f0 100644
--- a/Sample/Material/RefractiveMaterialImpl.cpp
+++ b/Sample/Material/RefractiveMaterialImpl.cpp
@@ -42,7 +42,7 @@ complex_t RefractiveMaterialImpl::refractiveIndex2(double) const
return result * result;
}
-complex_t RefractiveMaterialImpl::materialData() const
+complex_t RefractiveMaterialImpl::materialValue() const
{
return complex_t(m_delta, m_beta);
}
diff --git a/Sample/Material/RefractiveMaterialImpl.h b/Sample/Material/RefractiveMaterialImpl.h
index ef902f1e12d..a2fa50cfd09 100644
--- a/Sample/Material/RefractiveMaterialImpl.h
+++ b/Sample/Material/RefractiveMaterialImpl.h
@@ -40,7 +40,7 @@ public:
complex_t refractiveIndex2(double wavelength) const override;
//! Returns underlying material data
- complex_t materialData() const override;
+ complex_t materialValue() const override;
//! Returns type of material implementation
MATERIAL_TYPES typeID() const override { return MATERIAL_TYPES::RefractiveMaterial; }
diff --git a/Sim/Export/SampleToPython.cpp b/Sim/Export/SampleToPython.cpp
index b4cba243a89..8318d0e23a7 100644
--- a/Sim/Export/SampleToPython.cpp
+++ b/Sim/Export/SampleToPython.cpp
@@ -103,7 +103,7 @@ std::string defineMaterials(const MaterialKeyHandler& matHandler)
const Material* p_material = it.second;
const auto factory_name = factory_names.find(p_material->typeID());
ASSERT(factory_name != factory_names.cend());
- const complex_t& material_data = p_material->materialData();
+ const complex_t& material_data = p_material->materialValue();
if (p_material->isScalarMaterial()) {
result << indent() << matHandler.mat2key(p_material) << " = ba." << factory_name->second
<< "(\"" << p_material->materialName() << "\", "
diff --git a/Tests/Unit/Resample/MaterialTest.cpp b/Tests/Unit/Resample/MaterialTest.cpp
index 9bc5d64ae04..34b27f594a2 100644
--- a/Tests/Unit/Resample/MaterialTest.cpp
+++ b/Tests/Unit/Resample/MaterialTest.cpp
@@ -14,27 +14,27 @@ TEST(MaterialTest, MaterialConstruction)
R3 magnetism = R3(3.0, 4.0, 5.0);
Material material = RefractiveMaterial("MagMaterial", refIndex, magnetism);
- EXPECT_EQ(material_data, material.materialData());
+ EXPECT_EQ(material_data, material.materialValue());
EXPECT_EQ(magnetism, material.magnetization());
Material material2 =
RefractiveMaterial("MagMaterial", material_data.real(), material_data.imag(), magnetism);
- EXPECT_EQ(material_data, material2.materialData());
+ EXPECT_EQ(material_data, material2.materialValue());
EXPECT_EQ(magnetism, material2.magnetization());
Material material3 =
MaterialBySLD("MagMaterial", material_data.real(), material_data.imag(), magnetism);
- EXPECT_EQ(material_data, material3.materialData());
+ EXPECT_EQ(material_data, material3.materialValue());
EXPECT_EQ(magnetism, material3.magnetization());
R3 default_magnetism = R3{};
Material material4 = RefractiveMaterial("Material", refIndex);
- EXPECT_EQ(material_data, material4.materialData());
+ EXPECT_EQ(material_data, material4.materialValue());
EXPECT_EQ(default_magnetism, material4.magnetization());
Material material5 = RefractiveMaterial("Material", material_data.real(), material_data.imag());
- EXPECT_EQ(material_data, material5.materialData());
+ EXPECT_EQ(material_data, material5.materialValue());
EXPECT_EQ(default_magnetism, material5.magnetization());
Material material6 = MaterialBySLD("Material", material_data.real(), material_data.imag());
@@ -51,13 +51,13 @@ TEST(MaterialTest, MaterialTransform)
Material material = RefractiveMaterial("Material", refIndex, magnetism);
Material material2 = material.rotatedMaterial(transform.rotMatrix());
- EXPECT_EQ(material_data, material2.materialData());
+ EXPECT_EQ(material_data, material2.materialValue());
EXPECT_EQ(transformed_mag, material2.magnetization());
Material material3 =
MaterialBySLD("Material", material_data.real(), material_data.imag(), magnetism);
Material material4 = material.rotatedMaterial(transform.rotMatrix());
- EXPECT_EQ(material_data, material4.materialData());
+ EXPECT_EQ(material_data, material4.materialValue());
EXPECT_EQ(transformed_mag, material4.magnetization());
}
@@ -66,8 +66,8 @@ TEST(MaterialTest, DefaultMaterials)
Material material = Vacuum();
const double dummy_wavelength = 1.0;
- EXPECT_EQ(material.materialData(), complex_t());
- EXPECT_EQ(material.materialData(), MaterialBySLD().materialData());
+ EXPECT_EQ(material.materialValue(), complex_t());
+ EXPECT_EQ(material.materialValue(), MaterialBySLD().materialValue());
EXPECT_EQ(material.magnetization(), R3{});
EXPECT_EQ(material.magnetization(), MaterialBySLD().magnetization());
@@ -141,8 +141,8 @@ TEST(MaterialTest, AverageRefractiveMaterials)
const Material material_avr = MaterialUtils::averagedMaterial(material, regions);
EXPECT_EQ(material_avr.magnetization(), magnetization);
- EXPECT_DOUBLE_EQ(material_avr.materialData().real(), 0.5);
- EXPECT_DOUBLE_EQ(material_avr.materialData().imag(), 0.5);
+ EXPECT_DOUBLE_EQ(material_avr.materialValue().real(), 0.5);
+ EXPECT_DOUBLE_EQ(material_avr.materialValue().imag(), 0.5);
EXPECT_TRUE(material_avr.typeID() == MATERIAL_TYPES::RefractiveMaterial);
const Material material3 = MaterialBySLD("Material3", 0.5, 0.5, magnetization);
@@ -157,8 +157,8 @@ TEST(MaterialTest, AverageSLDMaterials)
const Material material_avr = MaterialUtils::averagedMaterial(material, regions);
EXPECT_EQ(material_avr.magnetization(), magnetization);
- EXPECT_DOUBLE_EQ(material_avr.materialData().real(), 0.5);
- EXPECT_DOUBLE_EQ(material_avr.materialData().imag(), 0.5);
+ EXPECT_DOUBLE_EQ(material_avr.materialValue().real(), 0.5);
+ EXPECT_DOUBLE_EQ(material_avr.materialValue().imag(), 0.5);
EXPECT_TRUE(material_avr.typeID() == MATERIAL_TYPES::MaterialBySLD);
}
@@ -211,7 +211,7 @@ TEST(MaterialTest, MaterialCopy)
Material material = RefractiveMaterial("MagMaterial", refIndex, magnetism);
Material copy = material;
- EXPECT_EQ(material_data, copy.materialData());
+ EXPECT_EQ(material_data, copy.materialValue());
EXPECT_EQ(magnetism, copy.magnetization());
EXPECT_TRUE(material == copy);
}
@@ -224,6 +224,6 @@ TEST(MaterialTest, MaterialMove)
Material material = RefractiveMaterial("MagMaterial", refIndex, magnetism);
Material moved_material(std::move(material));
- EXPECT_EQ(material_data, moved_material.materialData());
+ EXPECT_EQ(material_data, moved_material.materialValue());
EXPECT_EQ(magnetism, moved_material.magnetization());
}
diff --git a/Tests/Unit/Resample/MultilayerAveragingTest.cpp b/Tests/Unit/Resample/MultilayerAveragingTest.cpp
index 864754370b8..30eadc70401 100644
--- a/Tests/Unit/Resample/MultilayerAveragingTest.cpp
+++ b/Tests/Unit/Resample/MultilayerAveragingTest.cpp
@@ -57,8 +57,8 @@ TEST(MultilayerAveragingTest, AverageMultilayer)
EXPECT_EQ(sample_1.numberOfSlices(), sample_2.numberOfSlices());
for (size_t i = 0; i < sample_1.numberOfSlices(); ++i) {
- auto mat_1 = sample_1.avgeSlice(i).material().materialData();
- auto mat_2 = sample_2.avgeSlice(i).material().materialData();
+ auto mat_1 = sample_1.avgeSlice(i).material().materialValue();
+ auto mat_2 = sample_2.avgeSlice(i).material().materialValue();
EXPECT_DOUBLE_EQ(mat_1.real(), mat_2.real());
EXPECT_DOUBLE_EQ(mat_1.imag(), mat_2.imag());
}
diff --git a/auto/Wrap/libBornAgainSample_wrap.cpp b/auto/Wrap/libBornAgainSample_wrap.cpp
index ac6755c4b6c..77bcf0d6939 100644
--- a/auto/Wrap/libBornAgainSample_wrap.cpp
+++ b/auto/Wrap/libBornAgainSample_wrap.cpp
@@ -30153,7 +30153,7 @@ SWIGINTERN PyObject *_wrap_Material_materialData(PyObject *self, PyObject *args)
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_materialData" "', argument " "1"" of type '" "Material const *""'");
}
arg1 = reinterpret_cast< Material * >(argp1);
- result = ((Material const *)arg1)->materialData();
+ result = ((Material const *)arg1)->materialValue();
resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
return resultobj;
fail:
@@ -30966,7 +30966,7 @@ SWIGINTERN PyObject *_wrap_IMaterialImpl_materialData(PyObject *self, PyObject *
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMaterialImpl_materialData" "', argument " "1"" of type '" "IMaterialImpl const *""'");
}
arg1 = reinterpret_cast< IMaterialImpl * >(argp1);
- result = ((IMaterialImpl const *)arg1)->materialData();
+ result = ((IMaterialImpl const *)arg1)->materialValue();
resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
return resultobj;
fail:
@@ -31335,7 +31335,7 @@ SWIGINTERN PyObject *_wrap_RefractiveMaterialImpl_materialData(PyObject *self, P
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RefractiveMaterialImpl_materialData" "', argument " "1"" of type '" "RefractiveMaterialImpl const *""'");
}
arg1 = reinterpret_cast< RefractiveMaterialImpl * >(argp1);
- result = ((RefractiveMaterialImpl const *)arg1)->materialData();
+ result = ((RefractiveMaterialImpl const *)arg1)->materialValue();
resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
return resultobj;
fail:
@@ -31546,7 +31546,7 @@ SWIGINTERN PyObject *_wrap_MaterialBySLDImpl_materialData(PyObject *self, PyObje
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MaterialBySLDImpl_materialData" "', argument " "1"" of type '" "MaterialBySLDImpl const *""'");
}
arg1 = reinterpret_cast< MaterialBySLDImpl * >(argp1);
- result = ((MaterialBySLDImpl const *)arg1)->materialData();
+ result = ((MaterialBySLDImpl const *)arg1)->materialValue();
resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
return resultobj;
fail:
--
GitLab