Skip to content
Snippets Groups Projects
Commit 0389f9fc authored by Ganeva, Marina's avatar Ganeva, Marina
Browse files

-iqr changed to iqr in the formfactor ripple.

parent 1bc0d920
No related branches found
No related tags found
No related merge requests found
...@@ -65,7 +65,7 @@ void TestRipple2::execute() ...@@ -65,7 +65,7 @@ void TestRipple2::execute()
// initializing simulation and sample builder // initializing simulation and sample builder
initializeSimulation(); initializeSimulation();
mp_simulation->runSimulation(); mp_simulation->runSimulation();
//save_results(); //save_results();
plot_results(); plot_results();
// plot the pure formfactor // plot the pure formfactor
...@@ -79,7 +79,7 @@ void TestRipple2::save_results() ...@@ -79,7 +79,7 @@ void TestRipple2::save_results()
{ {
// run simulation for default sample parameters // run simulation for default sample parameters
//mp_simulation->runSimulation(); //mp_simulation->runSimulation();
std::string filename(getOutputPath()+"test_ripple2_asym.ima"); std::string filename(getOutputPath()+"test_ripple2_sym.ima");
OutputDataIOFactory::writeIntensityData(*(mp_simulation->getIntensityData()), OutputDataIOFactory::writeIntensityData(*(mp_simulation->getIntensityData()),
filename); filename);
} }
...@@ -157,7 +157,7 @@ TestRipple2::TestSampleBuilder::TestSampleBuilder() ...@@ -157,7 +157,7 @@ TestRipple2::TestSampleBuilder::TestSampleBuilder()
: m_w(20.0*Units::nanometer) : m_w(20.0*Units::nanometer)
, m_h(4.0*Units::nanometer) , m_h(4.0*Units::nanometer)
, m_l(100.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_distance(20.0*Units::nanometer)
, m_interf_width(4.0*Units::nanometer) , m_interf_width(4.0*Units::nanometer)
{ {
......
...@@ -62,7 +62,7 @@ complex_t FormFactorRipple2::Integrand(double Z, void* params) const ...@@ -62,7 +62,7 @@ complex_t FormFactorRipple2::Integrand(double Z, void* params) const
{ {
(void)params; // to avoid unused-variable warning (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)); 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. //! Complex formfactor.
......
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment