From a4e876f5aa8030fb1f2c1d30fda4b4e02d0f1f3d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Thu, 18 Aug 2016 09:57:47 +0200
Subject: [PATCH] use delegate constructor
---
Core/Aggregate/InterferenceFunction1DLattice.cpp | 15 ++++++---------
Core/Aggregate/InterferenceFunction1DLattice.h | 1 -
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/Core/Aggregate/InterferenceFunction1DLattice.cpp b/Core/Aggregate/InterferenceFunction1DLattice.cpp
index 0b23f84f95a..6d67615d4ff 100644
--- a/Core/Aggregate/InterferenceFunction1DLattice.cpp
+++ b/Core/Aggregate/InterferenceFunction1DLattice.cpp
@@ -24,7 +24,12 @@
//! @param length: Lattice length
//! @param xi: rotation of lattice with respect to x-axis
InterferenceFunction1DLattice::InterferenceFunction1DLattice(double length, double xi)
- : m_lattice_params(length, xi), mp_pdf(nullptr), m_na(0)
+ : InterferenceFunction1DLattice(Lattice1DParameters(length, xi))
+{}
+
+InterferenceFunction1DLattice::InterferenceFunction1DLattice(
+ const Lattice1DParameters& lattice_params)
+ : m_lattice_params(lattice_params), mp_pdf(nullptr), m_na(0)
{
setName(BornAgain::InterferenceFunction1DLatticeType);
init_parameters();
@@ -81,14 +86,6 @@ double InterferenceFunction1DLattice::evaluate(const kvector_t q) const
return result/a;
}
-InterferenceFunction1DLattice::InterferenceFunction1DLattice(
- const Lattice1DParameters& lattice_params)
- : m_lattice_params(lattice_params), mp_pdf(nullptr), m_na(0)
-{
- setName(BornAgain::InterferenceFunction1DLatticeType);
- init_parameters();
-}
-
void InterferenceFunction1DLattice::init_parameters()
{
registerParameter(BornAgain::Length, &m_lattice_params.m_length).setUnit("nm").setNonnegative();
diff --git a/Core/Aggregate/InterferenceFunction1DLattice.h b/Core/Aggregate/InterferenceFunction1DLattice.h
index d944958e6ad..c67ea4f5538 100644
--- a/Core/Aggregate/InterferenceFunction1DLattice.h
+++ b/Core/Aggregate/InterferenceFunction1DLattice.h
@@ -45,7 +45,6 @@ public:
private:
InterferenceFunction1DLattice(const Lattice1DParameters& lattice_params);
- //! Registers some class members for later access via parameter pool
void init_parameters();
Lattice1DParameters m_lattice_params;
--
GitLab