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

camel case -> ZSpan

parent cd7ff960
No related branches found
No related tags found
1 merge request!1240change some fct names to camel case; rm sone unused fcts; relegate ad-hoc minus sign to vecOfLambdaAlphaPhi
......@@ -60,7 +60,7 @@ public:
//! form factor's shape. This is used for SSCA calculations
virtual double radialExtension() const = 0;
virtual Span Z_span() const = 0;
virtual Span ZSpan() const = 0;
//! Returns the total volume of the particle of this form factor's shape
virtual double volume() const;
......
......@@ -40,12 +40,12 @@ double ReCompound::radialExtension() const
return result;
}
Span ReCompound::Z_span() const
Span ReCompound::ZSpan() const
{
ASSERT(!m_components.empty());
Span result = m_components[0]->Z_span();
Span result = m_components[0]->ZSpan();
for (size_t i = 1; i < m_components.size(); ++i)
result = Span::unite(result, m_components[i]->Z_span());
result = Span::unite(result, m_components[i]->ZSpan());
return result;
}
......
......@@ -36,7 +36,7 @@ public:
double radialExtension() const override;
Span Z_span() const override;
Span ZSpan() const override;
void addFormFactor(const IReParticle& formfactor);
......
......@@ -48,9 +48,9 @@ double ReMesocrystal::radialExtension() const
return m_outer_shape->radialExtension();
}
Span ReMesocrystal::Z_span() const
Span ReMesocrystal::ZSpan() const
{
return m_outer_shape->Z_span();
return m_outer_shape->ZSpan();
}
complex_t ReMesocrystal::theFF(const WavevectorInfo& wavevectors) const
......
......@@ -42,7 +42,7 @@ public:
double volume() const override;
double radialExtension() const override;
Span Z_span() const override;
Span ZSpan() const override;
complex_t theFF(const WavevectorInfo& wavevectors) const override;
SpinMatrix thePolFF(const WavevectorInfo& wavevectors) const override;
......
......@@ -113,7 +113,7 @@ SpinMatrix ReParticle::thePolFF(const WavevectorInfo& wavevectors) const
return result;
}
Span ReParticle::Z_span() const
Span ReParticle::ZSpan() const
{
RotMatrix transform = m_rotMatrix ? *m_rotMatrix : RotMatrix();
std::unique_ptr<const IRotation> total_rotation(IRotation::createRotation(transform));
......
......@@ -48,7 +48,7 @@ public:
double radialExtension() const override;
Span Z_span() const override;
Span ZSpan() const override;
const IFormFactor* iformfactor() const;
......
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