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

corr namespace name

parent 33c4dc3a
No related branches found
No related tags found
1 merge request!565further consequences of big refactoring
......@@ -29,11 +29,10 @@ class IRotation;
class Material;
class WavevectorInfo;
//! Abstract base class for all form factors.
//! Abstract base class for reprocessed particles.
//!
//! The actual form factor is returned by the complex valued function IReParticle::evaluate,
//! which depends on the incoming and outgoing wave vectors ki and kf.
//! If it only depends on the scattering vector q=ki-kf, then it is a DecoratedBorn.
//! Reprocessing is necessary to handle particles that cross material layers.
//! These particles are divided into several.
class IReParticle : public ICloneable {
protected:
......
......@@ -22,8 +22,7 @@
#include "Resample/Particle/IReParticle.h"
#include "Sample/Lattice/Lattice3D.h"
//! The form factor of a MesoCrystal.
//! @ingroup formfactors
//! A reprocessed MesoCrystal.
class ReMesocrystal : public IReParticle {
public:
......
......@@ -28,11 +28,7 @@ class IBornFF;
class Material;
class RotMatrix;
//! Encapsulates another formfactor and adds extra functionality
//! (a scalar factor, a position-dependent phase factor, ...).
//!
//! This class is designed according to the Decorator Pattern.
//! It inherits from IReParticle _and_ has a member of type IReParticle*.
//! A reprocessed simple particle, with shape m_ff.
class ReParticle : public IReParticle {
public:
......
......@@ -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(Computing::Slicing::zSpan(particle.get()), offset);
layer_fill_limits.update(Compute::Slicing::zSpan(particle.get()), offset);
}
}
return layer_fill_limits.layerZLimits();
......
......@@ -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 = Computing::Slicing::zSpan(&particle);
const ZLimits zSpan = Compute::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 =
Computing::Slicing::createParticleInSlice(subparticle.get(), limits);
Compute::Slicing::createParticleInSlice(subparticle.get(), limits);
pis.sliced_ff->setAmbientMaterial(slices.at(iSlice).material());
std::unique_ptr<SumDWBA> computer;
......
......@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file Resample/Processed/Slicer.cpp
//! @brief Implements function Computing::Slicing::sliceFormFactor
//! @brief Implements function Compute::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 Computing::Slicing::createParticleInSlice(basis, {}).sliced_ff.release();
return Compute::Slicing::createParticleInSlice(basis, {}).sliced_ff.release();
}
} // namespace
ParticleInSlice Computing::Slicing::createParticleInSlice(const IParticle* particle,
ParticleInSlice Compute::Slicing::createParticleInSlice(const IParticle* particle,
const ZLimits& limits)
{
if (const auto* p = dynamic_cast<const Particle*>(particle)) {
......@@ -350,7 +350,7 @@ ParticleInSlice Computing::Slicing::createParticleInSlice(const IParticle* parti
ASSERT(0);
}
ZLimits Computing::Slicing::zSpan(const IParticle* particle)
ZLimits Compute::Slicing::zSpan(const IParticle* particle)
{
if (const auto* p = dynamic_cast<const ParticleComposition*>(particle)) {
const auto subparticles = p->decompose();
......
......@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file Resample/Processed/Slicer.h
//! @brief Defines function Computing::Slicing::sliceFormFactor
//! @brief Defines function Compute::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 Computing::Slicing {
namespace Compute::Slicing {
ParticleInSlice createParticleInSlice(const IParticle* particle, const ZLimits&);
ZLimits zSpan(const IParticle* particle);
} // namespace Computing::Slicing
} // namespace Compute::Slicing
#endif // BORNAGAIN_RESAMPLE_PROCESSED_SLICER_H
#endif // USER_API
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment