Skip to content
Snippets Groups Projects
Commit 94551a67 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rename namespace preporcessor -> COmputing::Slicing

parent 8fb51760
No related branches found
No related tags found
1 merge request!565further consequences of big refactoring
...@@ -164,7 +164,7 @@ std::vector<ZLimits> Compute::Slicing::particleRegions(const MultiLayer& multila ...@@ -164,7 +164,7 @@ std::vector<ZLimits> Compute::Slicing::particleRegions(const MultiLayer& multila
const double offset = (i == 0) ? 0 : bottom_coords[i - 1]; const double offset = (i == 0) ? 0 : bottom_coords[i - 1];
for (const auto* layout : layer->layouts()) for (const auto* layout : layer->layouts())
for (const auto& particle : layout->particles()) 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(); return layer_fill_limits.layerZLimits();
......
...@@ -204,7 +204,7 @@ size_t zToSliceIndex(double z, const SliceStack& slices) ...@@ -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, std::pair<size_t, size_t> SliceIndexSpan(const IParticle& particle, const SliceStack& slices,
double z_ref) double z_ref)
{ {
const ZLimits zSpan = preprocessor::zSpan(&particle); const ZLimits zSpan = Computing::Slicing::zSpan(&particle);
const double zbottom = zSpan.zBottom(); const double zbottom = zSpan.zBottom();
const double ztop = zSpan.zTop(); const double ztop = zSpan.zTop();
const double eps = const double eps =
...@@ -250,7 +250,7 @@ ProcessedLayout makeProcessedLayout(const ParticleLayout& layout, const SliceSta ...@@ -250,7 +250,7 @@ ProcessedLayout makeProcessedLayout(const ParticleLayout& layout, const SliceSta
limits = {slice.zBottom() - z1, slice.zTop() - z1}; limits = {slice.zBottom() - z1, slice.zTop() - z1};
} }
ParticleInSlice pis = ParticleInSlice pis =
preprocessor::createParticleInSlice(subparticle.get(), limits); Computing::Slicing::createParticleInSlice(subparticle.get(), limits);
pis.sliced_ff->setAmbientMaterial(slices.at(iSlice).material()); pis.sliced_ff->setAmbientMaterial(slices.at(iSlice).material());
std::unique_ptr<SumDWBA> computer; std::unique_ptr<SumDWBA> computer;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering // BornAgain: simulate and fit reflection and scattering
// //
//! @file Resample/Processed/Slicer.cpp //! @file Resample/Processed/Slicer.cpp
//! @brief Implements function preprocessor::sliceFormFactor //! @brief Implements function Computing::Slicing::sliceFormFactor
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING) //! @license GNU General Public License v3 or higher (see COPYING)
...@@ -244,13 +244,13 @@ IReParticle* processBasis(const IParticle* basis) ...@@ -244,13 +244,13 @@ IReParticle* processBasis(const IParticle* basis)
} }
return result; return result;
} }
return preprocessor::createParticleInSlice(basis, {}).sliced_ff.release(); return Computing::Slicing::createParticleInSlice(basis, {}).sliced_ff.release();
} }
} // namespace } // namespace
ZLimits preprocessor::zSpan(const IParticle* particle) ZLimits Computing::Slicing::zSpan(const IParticle* particle)
{ {
if (const auto* p = dynamic_cast<const ParticleComposition*>(particle)) { if (const auto* p = dynamic_cast<const ParticleComposition*>(particle)) {
const auto subparticles = p->decompose(); const auto subparticles = p->decompose();
...@@ -266,7 +266,7 @@ ZLimits preprocessor::zSpan(const IParticle* particle) ...@@ -266,7 +266,7 @@ ZLimits preprocessor::zSpan(const IParticle* particle)
return {bot, top}; return {bot, top};
} }
ParticleInSlice preprocessor::createParticleInSlice(const IParticle* particle, ParticleInSlice Computing::Slicing::createParticleInSlice(const IParticle* particle,
const ZLimits& limits) const ZLimits& limits)
{ {
if (const auto* p = dynamic_cast<const Particle*>(particle)) { if (const auto* p = dynamic_cast<const Particle*>(particle)) {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering // BornAgain: simulate and fit reflection and scattering
// //
//! @file Resample/Processed/Slicer.h //! @file Resample/Processed/Slicer.h
//! @brief Defines function preprocessor::sliceFormFactor //! @brief Defines function Computing::Slicing::sliceFormFactor
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING) //! @license GNU General Public License v3 or higher (see COPYING)
...@@ -27,13 +27,13 @@ class ParticleInSlice; ...@@ -27,13 +27,13 @@ class ParticleInSlice;
class ReParticle; class ReParticle;
class ZLimits; class ZLimits;
namespace preprocessor { namespace Computing::Slicing {
ParticleInSlice createParticleInSlice(const IParticle* particle, const ZLimits&); ParticleInSlice createParticleInSlice(const IParticle* particle, const ZLimits&);
ZLimits zSpan(const IParticle* particle); ZLimits zSpan(const IParticle* particle);
} // namespace preprocessor } // namespace Computing::Slicing
#endif // BORNAGAIN_RESAMPLE_PROCESSED_SLICER_H #endif // BORNAGAIN_RESAMPLE_PROCESSED_SLICER_H
#endif // USER_API #endif // USER_API
...@@ -1145,11 +1145,14 @@ Computes the Fresnel R coefficient for the top layer only. Introduced in order t ...@@ -1145,11 +1145,14 @@ Computes the Fresnel R coefficient for the top layer only. Introduced in order t
"; ";
// File: namespacepreprocessor.xml // File: namespaceComputing.xml
%feature("docstring") preprocessor::createParticleInSlice "ParticleInSlice preprocessor::createParticleInSlice(const IParticle *particle, const ZLimits &)
// 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)
"; ";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment