Merge branch 'fix_ftdecay_voigt' into 'develop'

fix values of FTDecayFunctionVoigt 1D & 2D

See merge request !62

CHANGELOG

@@ -4,8 +4,10 @@ BornAgain-1.20?
     * Remove unused/undocumented functions Layer::setThickness, setMaterial
     * Rename SimulationResult::axis to convertedBinCenters
   > GUI changes:
-    * Support "*.0001" files generated by Nicos at SANS-1 of MLZ / FRM2
+    * Support "*.001" files generated by Nicos at SANS-1 of MLZ / FRM2
     * Improved file chooser for 2d data import
+  > Bug fixes:
+    * Correct initialization of FTDecayFunction1DVoigt and FTDecayFunction2DVoigt
   > Internal refactoring:
     * Mac installer: corrections done immediately after release of 1.19.0
 

Sample/Correlations/FTDecay1D.cpp

@@ -112,7 +112,7 @@ FTDecayFunction1DVoigt::FTDecayFunction1DVoigt(const std::vector<double> P)
          {{"Eta", "", "balances between Gauss (eta=0) and Cauchy (eta=1) limiting cases", -INF,
            +INF, 0}}},
         P)
-    , m_eta(m_P[0])
+    , m_eta(m_P[1])
 {
 }
 

Sample/Correlations/FTDecay2D.cpp

@@ -120,7 +120,7 @@ FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(const std::vector<double> P)
          {{"Eta", "", "balances between Gauss (eta=0) and Cauchy (eta=1) limiting cases", -INF,
            +INF, 0}}},
         P)
-    , m_eta(m_P[0])
+    , m_eta(m_P[3])
 {
 }
 
@@ -132,7 +132,7 @@ FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double decay_length_x, double dec
 
 FTDecayFunction2DVoigt* FTDecayFunction2DVoigt::clone() const
 {
-    return new FTDecayFunction2DVoigt(m_decay_length_x, m_decay_length_y, m_eta, m_gamma);
+    return new FTDecayFunction2DVoigt(m_decay_length_x, m_decay_length_y, m_gamma, m_eta);
 }
 
 double FTDecayFunction2DVoigt::evaluate(double qx, double qy) const