From b6741f207d95f1a53b7d590b498aa98225a2b3dc Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 16 Nov 2020 18:32:34 +0100
Subject: [PATCH] ParticleLayoutComputation: rm "p_"
---
Core/Computation/ParticleLayoutComputation.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Core/Computation/ParticleLayoutComputation.cpp b/Core/Computation/ParticleLayoutComputation.cpp
index 1397aed4a96..b6d1e2dd917 100644
--- a/Core/Computation/ParticleLayoutComputation.cpp
+++ b/Core/Computation/ParticleLayoutComputation.cpp
@@ -27,23 +27,23 @@ std::unique_ptr<IInterferenceFunctionStrategy>
processedInterferenceFunction(const ProcessedLayout& layout, const SimulationOptions& sim_params,
bool polarized)
{
- const IInterferenceFunction* p_iff = layout.interferenceFunction();
- if (p_iff && layout.numberOfSlices() > 1 && !p_iff->supportsMultilayer())
+ const IInterferenceFunction* iff = layout.interferenceFunction();
+ if (iff && layout.numberOfSlices() > 1 && !iff->supportsMultilayer())
throw std::runtime_error("LayoutStrategyBuilder::checkInterferenceFunction: "
"interference function does not support multiple layers");
- auto p_radial_para = dynamic_cast<const InterferenceFunctionRadialParaCrystal*>(p_iff);
+ auto radial_para = dynamic_cast<const InterferenceFunctionRadialParaCrystal*>(iff);
const std::vector<FormFactorCoherentSum>& weighted_formfactors = layout.formFactorList();
std::unique_ptr<IInterferenceFunctionStrategy> result;
- if (p_radial_para && p_radial_para->kappa() > 0.0) {
- double kappa = p_radial_para->kappa();
- return std::make_unique<SSCApproximationStrategy>(weighted_formfactors, p_iff, sim_params,
+ if (radial_para && radial_para->kappa() > 0.0) {
+ double kappa = radial_para->kappa();
+ return std::make_unique<SSCApproximationStrategy>(weighted_formfactors, iff, sim_params,
polarized, kappa);
}
- return std::make_unique<DecouplingApproximationStrategy>(weighted_formfactors, p_iff,
+ return std::make_unique<DecouplingApproximationStrategy>(weighted_formfactors, iff,
sim_params, polarized);
}
--
GitLab