From 275e37d29e8f215ec116d5566f9c14c222cc6702 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Wed, 4 Jan 2023 15:09:14 +0100
Subject: [PATCH] camel case -> ZSpan
---
Resample/Particle/IReParticle.h | 2 +-
Resample/Particle/ReCompound.cpp | 6 +++---
Resample/Particle/ReCompound.h | 2 +-
Resample/Particle/ReMesocrystal.cpp | 4 ++--
Resample/Particle/ReMesocrystal.h | 2 +-
Resample/Particle/ReParticle.cpp | 2 +-
Resample/Particle/ReParticle.h | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Resample/Particle/IReParticle.h b/Resample/Particle/IReParticle.h
index 0d9e0c9a6b4..32ecf18945e 100644
--- a/Resample/Particle/IReParticle.h
+++ b/Resample/Particle/IReParticle.h
@@ -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;
diff --git a/Resample/Particle/ReCompound.cpp b/Resample/Particle/ReCompound.cpp
index 4601bccddd3..2493643af6d 100644
--- a/Resample/Particle/ReCompound.cpp
+++ b/Resample/Particle/ReCompound.cpp
@@ -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;
}
diff --git a/Resample/Particle/ReCompound.h b/Resample/Particle/ReCompound.h
index 0ad67e1c4cf..b3af6fd5cc4 100644
--- a/Resample/Particle/ReCompound.h
+++ b/Resample/Particle/ReCompound.h
@@ -36,7 +36,7 @@ public:
double radialExtension() const override;
- Span Z_span() const override;
+ Span ZSpan() const override;
void addFormFactor(const IReParticle& formfactor);
diff --git a/Resample/Particle/ReMesocrystal.cpp b/Resample/Particle/ReMesocrystal.cpp
index 8d53a5b138f..1b5a8b48f69 100644
--- a/Resample/Particle/ReMesocrystal.cpp
+++ b/Resample/Particle/ReMesocrystal.cpp
@@ -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
diff --git a/Resample/Particle/ReMesocrystal.h b/Resample/Particle/ReMesocrystal.h
index 50783f66de9..cde372f95e1 100644
--- a/Resample/Particle/ReMesocrystal.h
+++ b/Resample/Particle/ReMesocrystal.h
@@ -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;
diff --git a/Resample/Particle/ReParticle.cpp b/Resample/Particle/ReParticle.cpp
index 02249d1b629..5f0e9b65a45 100644
--- a/Resample/Particle/ReParticle.cpp
+++ b/Resample/Particle/ReParticle.cpp
@@ -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));
diff --git a/Resample/Particle/ReParticle.h b/Resample/Particle/ReParticle.h
index 85e9a7f3ed9..50d2fffdd38 100644
--- a/Resample/Particle/ReParticle.h
+++ b/Resample/Particle/ReParticle.h
@@ -48,7 +48,7 @@ public:
double radialExtension() const override;
- Span Z_span() const override;
+ Span ZSpan() const override;
const IFormFactor* iformfactor() const;
--
GitLab