From 482d87aef13d1835bf8bab6a41de2a3c3a99b30a Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 2 Aug 2016 20:00:14 +0200
Subject: [PATCH] correct missing "\n" in FormFactor export

---
 .../InterferenceFunctionRadialParaCrystal.cpp | 29 ++----------------
 .../InterferenceFunctionRadialParaCrystal.h   | 30 +++++++------------
 Core/Export/PyGenVisitor.cpp                  |  5 ++--
 3 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp
index 453d687674a..c40df680c24 100644
--- a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp
+++ b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp
@@ -57,11 +57,6 @@ InterferenceFunctionRadialParaCrystal* InterferenceFunctionRadialParaCrystal::cl
     return result;
 }
 
-void InterferenceFunctionRadialParaCrystal::accept(ISampleVisitor* visitor) const
-{
-    visitor->visit(this);
-}
-
 std::string InterferenceFunctionRadialParaCrystal::to_str(int indent) const
 {
     std::stringstream ss;
@@ -118,31 +113,13 @@ complex_t InterferenceFunctionRadialParaCrystal::FTPDF(double qpar) const
     complex_t phase = exp_I(qpar*m_peak_distance);
     double amplitude = mP_pdf->evaluate(qpar);
     complex_t result = phase*amplitude;
-    if (m_use_damping_length) {
+    if (m_use_damping_length)
         result *= std::exp(-m_peak_distance/m_damping_length);
-    }
     return result;
 }
 
-void InterferenceFunctionRadialParaCrystal::setProbabilityDistribution(
-        const IFTDistribution1D &pdf)
+void InterferenceFunctionRadialParaCrystal::setProbabilityDistribution(const IFTDistribution1D &pdf)
 {
-    if (mP_pdf.get() != &pdf) {
+    if (mP_pdf.get() != &pdf)
         mP_pdf.reset(pdf.clone());
-    }
-}
-
-const IFTDistribution1D* InterferenceFunctionRadialParaCrystal::getProbabilityDistribution() const
-{
-    return mP_pdf.get();
-}
-
-double InterferenceFunctionRadialParaCrystal::getPeakDistance() const
-{
-    return m_peak_distance;
-}
-
-double InterferenceFunctionRadialParaCrystal::getDampingLength() const
-{
-    return m_damping_length;
 }
diff --git a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
index 0a8eda6c739..6f0ebfcb991 100644
--- a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
+++ b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
@@ -32,44 +32,36 @@ public:
     virtual ~InterferenceFunctionRadialParaCrystal() {}
     virtual InterferenceFunctionRadialParaCrystal* clone() const;
 
-    virtual void accept(ISampleVisitor* visitor) const;
+    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
 
     //! Returns textual representation of *this and its descendants.
     virtual std::string to_str(int indent=0) const;
 
-    //! Sets size of coherence domain
-    void setDomainSize(double size) { m_domain_size = size; }
-
-    //! Returns size of coherence domain
-    double getDomainSize() const { return m_domain_size; }
-
-    //! Sets size-spacing coupling parameter
     void setKappa(double kappa) { m_kappa = kappa; }
-
-    //! Gets size-spacing coupling parameter
     virtual double getKappa() const { return m_kappa; }
 
+    void setDomainSize(double size) { m_domain_size = size; }
+    double getDomainSize() const { return m_domain_size; }
+
     virtual double evaluate(const kvector_t q) const;
     //TODO: replace these with strategy pattern for different algorithms
     complex_t FTPDF(double qpar) const;
 
-    //! Sets the Fourier transformed probability distribution of the nearest particle
     void setProbabilityDistribution(const IFTDistribution1D& pdf);
+    const IFTDistribution1D* getProbabilityDistribution() const { return mP_pdf.get(); }
 
-    //! Gets the Fourier transformed probability distribution of the nearest particle
-    const IFTDistribution1D* getProbabilityDistribution() const;
-
-    double getPeakDistance() const;
+    double getPeakDistance() const { return m_peak_distance; }
 
-    double getDampingLength() const;
+    double getDampingLength() const { return m_damping_length; }
 
 protected:
     double m_peak_distance; //!< the distance to the first neighbor peak
     double m_damping_length; //!< damping length of paracrystal
-    std::unique_ptr<IFTDistribution1D> mP_pdf; //!< pdf of nearest particle
+    //! Fourier transformed probability distribution of the nearest particle
+    std::unique_ptr<IFTDistribution1D> mP_pdf;
     bool m_use_damping_length;
-    double m_kappa;
-    double m_domain_size;
+    double m_kappa; //!< Size-spacing coupling parameter
+    double m_domain_size; //!< Size of coherence domain
 
 private:
     //! Registers some class members for later access via parameter pool
diff --git a/Core/Export/PyGenVisitor.cpp b/Core/Export/PyGenVisitor.cpp
index 2d0386ae00e..420a15c7e1a 100644
--- a/Core/Export/PyGenVisitor.cpp
+++ b/Core/Export/PyGenVisitor.cpp
@@ -222,7 +222,7 @@ std::string PyGenVisitor::defineFormFactors() const
     for (auto it=themap->begin(); it!=themap->end(); ++it) {
         const IFormFactor* p_ff = it->first;
         result << indent() << it->second << " = ba.FormFactor" << p_ff->getName() << "("
-               << PyGenTools::argumentList(p_ff) << ")";
+               << PyGenTools::argumentList(p_ff) << ")\n";
     }
     return result.str();
 }
@@ -761,10 +761,9 @@ std::string PyGenVisitor::defineRoughnesses() const
     std::ostringstream result;
     result << std::setprecision(12);
     result << "\n" << indent() << "# Defining Roughness Parameters\n";
-    for (auto it=themap->begin(); it!=themap->end(); ++it) {
+    for (auto it=themap->begin(); it!=themap->end(); ++it)
         result << indent() << it->second << " = ba.LayerRoughness("
                <<  PyGenTools::argumentList(it->first) << ")\n";
-    }
     return result.str();
 }
 
-- 
GitLab