From a5f192546455589c265268b030ab7c852cf9cda0 Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Wed, 21 Nov 2012 13:53:59 +0100
Subject: [PATCH] temp
---
App/src/TestMesoCrystal1.cpp | 22 +++++++++----------
.../src/LayerDecoratorDWBASimulation.cpp | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/App/src/TestMesoCrystal1.cpp b/App/src/TestMesoCrystal1.cpp
index 7024b06310c..1b852575a9f 100644
--- a/App/src/TestMesoCrystal1.cpp
+++ b/App/src/TestMesoCrystal1.cpp
@@ -44,12 +44,12 @@ void TestMesoCrystal1::execute()
if (mp_intensity_output) delete mp_intensity_output;
GISASExperiment experiment(mp_options);
experiment.setSampleBuilder(mp_sample_builder);
- experiment.setDetectorParameters(256, 0.3*Units::degree, 0.073
- , 256, -0.4*Units::degree, 0.066);
+// experiment.setDetectorParameters(256, 0.3*Units::degree, 0.073
+// , 256, -0.4*Units::degree, 0.066);
// experiment.setDetectorParameters(218, 0.0201647, 0.0599528, 218, 0.00010879, 0.0399347); // values as in experimental sample from TestMesoCrystal2
-// experiment.setDetectorParameters(2, 0.96*Units::degree, 0.962*Units::degree
-// , 2 , 0.376*Units::degree, 0.378*Units::degree);
- experiment.setDetectorResolutionFunction(new ResolutionFunction2DSimple(0.0004, 0.0004));
+ experiment.setDetectorParameters(100, -std::sqrt(M_PI)*Units::degree, 2.0*Units::degree
+ , 100 , 0.5*Units::degree, 3.5*Units::degree);
+ experiment.setDetectorResolutionFunction(new ResolutionFunction2DSimple(0.00017, 0.00017));
experiment.setBeamParameters(1.77*Units::angstrom, -0.4*Units::degree, 0.0*Units::degree);
experiment.setBeamIntensity(8e12);
@@ -83,14 +83,14 @@ void TestMesoCrystal1::execute()
// MesoCrystalBuilder member definitions
/* ************************************************************************* */
MesoCrystalBuilder::MesoCrystalBuilder()
-: m_meso_radius(1000*Units::nanometer)
+: m_meso_radius(1000.0*Units::nanometer)
, m_surface_filling_ratio(0.25)
, m_meso_height(0.5*Units::micrometer)
-, m_sigma_meso_height(5*Units::nanometer)
-, m_sigma_meso_radius(50*Units::nanometer)
-, m_lattice_length_a(6.2*Units::nanometer)
-, m_nanoparticle_radius(5.7*Units::nanometer)
-, m_sigma_nanoparticle_radius(0.1*Units::nanometer)
+, m_sigma_meso_height(5.0*Units::nanometer)
+, m_sigma_meso_radius(50.0*Units::nanometer)
+, m_lattice_length_a(6.15*Units::nanometer)
+, m_nanoparticle_radius(4.3*Units::nanometer)
+, m_sigma_nanoparticle_radius(0.14*Units::nanometer)
, m_sigma_lattice_length_a(1.5*Units::nanometer)
, m_roughness(1.0*Units::nanometer)
// attempt 0
diff --git a/Core/Algorithms/src/LayerDecoratorDWBASimulation.cpp b/Core/Algorithms/src/LayerDecoratorDWBASimulation.cpp
index 8d116d2af6a..e5434f25b84 100644
--- a/Core/Algorithms/src/LayerDecoratorDWBASimulation.cpp
+++ b/Core/Algorithms/src/LayerDecoratorDWBASimulation.cpp
@@ -31,7 +31,7 @@ void LayerDecoratorDWBASimulation::run()
IInterferenceFunctionStrategy *p_strategy = createAndInitStrategy();
calculateCoherentIntensity(p_strategy);
- calculateInCoherentIntensity();
+// calculateInCoherentIntensity();
delete p_strategy;
--
GitLab