diff --git a/App/src/TestRipple2.cpp b/App/src/TestRipple2.cpp index 47d208f81053d04f4a9599f1f53843abb1d2756e..bfca0c3235a818be189b46b68419bb967222cf52 100644 --- a/App/src/TestRipple2.cpp +++ b/App/src/TestRipple2.cpp @@ -65,7 +65,7 @@ void TestRipple2::execute() // initializing simulation and sample builder initializeSimulation(); mp_simulation->runSimulation(); - //save_results(); + //save_results(); plot_results(); // plot the pure formfactor @@ -79,7 +79,7 @@ void TestRipple2::save_results() { // run simulation for default sample parameters //mp_simulation->runSimulation(); - std::string filename(getOutputPath()+"test_ripple2_asym.ima"); + std::string filename(getOutputPath()+"test_ripple2_sym.ima"); OutputDataIOFactory::writeIntensityData(*(mp_simulation->getIntensityData()), filename); } @@ -157,7 +157,7 @@ TestRipple2::TestSampleBuilder::TestSampleBuilder() : m_w(20.0*Units::nanometer) , m_h(4.0*Units::nanometer) , m_l(100.0*Units::nanometer) - , m_d(3.0*Units::nanometer) + , m_d(0.0*Units::nanometer) , m_interf_distance(20.0*Units::nanometer) , m_interf_width(4.0*Units::nanometer) { diff --git a/Core/FormFactors/src/FormFactorRipple2.cpp b/Core/FormFactors/src/FormFactorRipple2.cpp index 2eb78a78d26c0acea214ce515b47c7dee6843127..b79f9460aa4b763efbaf3bdedc58f016dada1c1d 100644 --- a/Core/FormFactors/src/FormFactorRipple2.cpp +++ b/Core/FormFactors/src/FormFactorRipple2.cpp @@ -62,7 +62,7 @@ complex_t FormFactorRipple2::Integrand(double Z, void* params) const { (void)params; // to avoid unused-variable warning complex_t p1 = (1.0-Z/m_height)*MathFunctions::Sinc(m_q.y()*m_width*0.5*(1.0-Z/m_height)); - return p1*std::exp(-1.0*complex_t(0.0, 1.0)*(m_q.y()*m_d*(1-Z/m_height) + m_q.z()*Z)); + return p1*std::exp(complex_t(0.0, 1.0)*(m_q.y()*m_d*(1-Z/m_height) + m_q.z()*Z)); } //! Complex formfactor. diff --git a/Tests/ReferenceData/BornAgain/test_ripple2_asym.ima.gz b/Tests/ReferenceData/BornAgain/test_ripple2_asym.ima.gz index 7fafdfdce27ee889060b793841dd78711a3724cd..fc8528a2d424089521e967544cda74db502081e7 100644 Binary files a/Tests/ReferenceData/BornAgain/test_ripple2_asym.ima.gz and b/Tests/ReferenceData/BornAgain/test_ripple2_asym.ima.gz differ diff --git a/Tests/ReferenceData/BornAgain/test_ripple2_sym.ima.gz b/Tests/ReferenceData/BornAgain/test_ripple2_sym.ima.gz index b7f97da41e7e5894e1393ff92b4192f1d2206ba8..9eab067bd9c645dce641d1eac323647e31af5edd 100644 Binary files a/Tests/ReferenceData/BornAgain/test_ripple2_sym.ima.gz and b/Tests/ReferenceData/BornAgain/test_ripple2_sym.ima.gz differ