From 94551a678d6fe018af797bf3d20cb09cb851be35 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 17 Dec 2021 11:24:44 +0100
Subject: [PATCH] rename namespace preporcessor -> COmputing::Slicing
---
Resample/Processed/ParticleRegions.cpp | 2 +-
Resample/Processed/ProcessedSample.cpp | 4 ++--
Resample/Processed/Slicer.cpp | 8 ++++----
Resample/Processed/Slicer.h | 6 +++---
auto/Wrap/doxygenResample.i | 9 ++++++---
5 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/Resample/Processed/ParticleRegions.cpp b/Resample/Processed/ParticleRegions.cpp
index 1af476f49ce..685400ceb4e 100644
--- a/Resample/Processed/ParticleRegions.cpp
+++ b/Resample/Processed/ParticleRegions.cpp
@@ -164,7 +164,7 @@ std::vector<ZLimits> Compute::Slicing::particleRegions(const MultiLayer& multila
const double offset = (i == 0) ? 0 : bottom_coords[i - 1];
for (const auto* layout : layer->layouts())
for (const auto& particle : layout->particles())
- layer_fill_limits.update(preprocessor::zSpan(particle.get()), offset);
+ layer_fill_limits.update(Computing::Slicing::zSpan(particle.get()), offset);
}
}
return layer_fill_limits.layerZLimits();
diff --git a/Resample/Processed/ProcessedSample.cpp b/Resample/Processed/ProcessedSample.cpp
index 8931db7d36d..60c94f12a07 100644
--- a/Resample/Processed/ProcessedSample.cpp
+++ b/Resample/Processed/ProcessedSample.cpp
@@ -204,7 +204,7 @@ size_t zToSliceIndex(double z, const SliceStack& slices)
std::pair<size_t, size_t> SliceIndexSpan(const IParticle& particle, const SliceStack& slices,
double z_ref)
{
- const ZLimits zSpan = preprocessor::zSpan(&particle);
+ const ZLimits zSpan = Computing::Slicing::zSpan(&particle);
const double zbottom = zSpan.zBottom();
const double ztop = zSpan.zTop();
const double eps =
@@ -250,7 +250,7 @@ ProcessedLayout makeProcessedLayout(const ParticleLayout& layout, const SliceSta
limits = {slice.zBottom() - z1, slice.zTop() - z1};
}
ParticleInSlice pis =
- preprocessor::createParticleInSlice(subparticle.get(), limits);
+ Computing::Slicing::createParticleInSlice(subparticle.get(), limits);
pis.sliced_ff->setAmbientMaterial(slices.at(iSlice).material());
std::unique_ptr<SumDWBA> computer;
diff --git a/Resample/Processed/Slicer.cpp b/Resample/Processed/Slicer.cpp
index 03062ef00c6..5c6a02f1641 100644
--- a/Resample/Processed/Slicer.cpp
+++ b/Resample/Processed/Slicer.cpp
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file Resample/Processed/Slicer.cpp
-//! @brief Implements function preprocessor::sliceFormFactor
+//! @brief Implements function Computing::Slicing::sliceFormFactor
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -244,13 +244,13 @@ IReParticle* processBasis(const IParticle* basis)
}
return result;
}
- return preprocessor::createParticleInSlice(basis, {}).sliced_ff.release();
+ return Computing::Slicing::createParticleInSlice(basis, {}).sliced_ff.release();
}
} // namespace
-ZLimits preprocessor::zSpan(const IParticle* particle)
+ZLimits Computing::Slicing::zSpan(const IParticle* particle)
{
if (const auto* p = dynamic_cast<const ParticleComposition*>(particle)) {
const auto subparticles = p->decompose();
@@ -266,7 +266,7 @@ ZLimits preprocessor::zSpan(const IParticle* particle)
return {bot, top};
}
-ParticleInSlice preprocessor::createParticleInSlice(const IParticle* particle,
+ParticleInSlice Computing::Slicing::createParticleInSlice(const IParticle* particle,
const ZLimits& limits)
{
if (const auto* p = dynamic_cast<const Particle*>(particle)) {
diff --git a/Resample/Processed/Slicer.h b/Resample/Processed/Slicer.h
index 00696e4a8a2..de58f78aa3c 100644
--- a/Resample/Processed/Slicer.h
+++ b/Resample/Processed/Slicer.h
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file Resample/Processed/Slicer.h
-//! @brief Defines function preprocessor::sliceFormFactor
+//! @brief Defines function Computing::Slicing::sliceFormFactor
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -27,13 +27,13 @@ class ParticleInSlice;
class ReParticle;
class ZLimits;
-namespace preprocessor {
+namespace Computing::Slicing {
ParticleInSlice createParticleInSlice(const IParticle* particle, const ZLimits&);
ZLimits zSpan(const IParticle* particle);
-} // namespace preprocessor
+} // namespace Computing::Slicing
#endif // BORNAGAIN_RESAMPLE_PROCESSED_SLICER_H
#endif // USER_API
diff --git a/auto/Wrap/doxygenResample.i b/auto/Wrap/doxygenResample.i
index b25d4f1429e..8d909f34947 100644
--- a/auto/Wrap/doxygenResample.i
+++ b/auto/Wrap/doxygenResample.i
@@ -1145,11 +1145,14 @@ Computes the Fresnel R coefficient for the top layer only. Introduced in order t
";
-// File: namespacepreprocessor.xml
-%feature("docstring") preprocessor::createParticleInSlice "ParticleInSlice preprocessor::createParticleInSlice(const IParticle *particle, const ZLimits &)
+// File: namespaceComputing.xml
+
+
+// File: namespaceComputing_1_1Slicing.xml
+%feature("docstring") Computing::Slicing::createParticleInSlice "ParticleInSlice Computing::Slicing::createParticleInSlice(const IParticle *particle, const ZLimits &)
";
-%feature("docstring") preprocessor::zSpan "ZLimits preprocessor::zSpan(const IParticle *particle)
+%feature("docstring") Computing::Slicing::zSpan "ZLimits Computing::Slicing::zSpan(const IParticle *particle)
";
--
GitLab