diff --git a/App/inc/TestFumiliLMA.h b/App/inc/TestFumiliLMA.h
index 54a4489e3fac08eceaf2f81a7c7c267f252a099d..86afed5d0bb262f3bed8497eeb6f7691725073a5 100644
--- a/App/inc/TestFumiliLMA.h
+++ b/App/inc/TestFumiliLMA.h
@@ -88,15 +88,18 @@ public:
class SincXSincYFunctionObject : public IFunctionObject
{
public:
- double operator()(const double *xx, const double *pars )
+ double operator()(const double *, const double * )
{
- const double x = xx[0];
- const double y = xx[1];
- const double p0=pars[0];
- const double p1=pars[1];
- const double p2=pars[2];
- double value = p0 * MathFunctions::Sinc(x-p1) * MathFunctions::Sinc(y-p2);
- return value;
+// throw Exceptions::NotImplementedException("Cleanup the code!");
+// const double x = xx[0];
+// const double y = xx[1];
+// const double p0=pars[0];
+// const double p1=pars[1];
+// const double p2=pars[2];
+//// double value = p0 * MathFunctions::Sinc(x-p1) * MathFunctions::Sinc(y-p2);
+// return value;
+ throw Exceptions::NotImplementedException("Cleanup the code!");
+
}
};
diff --git a/App/src/TestBugs.cpp b/App/src/TestBugs.cpp
index d6477344de0f40948d6d727b3e3c7632c39751cf..aa08c3b193f5a642d760793689ad81583c6ca438 100644
--- a/App/src/TestBugs.cpp
+++ b/App/src/TestBugs.cpp
@@ -38,28 +38,30 @@ void TestBugs::execute()
void TestBugs::test_item339()
{
- std::cout << "TestBugs::test_item339() -> " << std::endl;
+// std::cout << "TestBugs::test_item339() -> " << std::endl;
- complex_t n_particle(1.0-6e-4, 2e-8);
- HomogeneousMaterial mParticle("Particle", n_particle );
+// complex_t n_particle(1.0-6e-4, 2e-8);
+// HomogeneousMaterial mParticle("Particle", n_particle );
- FormFactorTruncatedSphere sphere_ff(8.0*Units::nanometer, 8.0*Units::nanometer);
+// FormFactorTruncatedSphere sphere_ff(8.0*Units::nanometer, 8.0*Units::nanometer);
- Particle particle(mParticle, sphere_ff);
+// Particle particle(mParticle, sphere_ff);
- InterferenceFunction2DParaCrystal *interf =
- InterferenceFunction2DParaCrystal::createHexagonal(20.0*Units::nanometer,
- 0.0,20.0*Units::micrometer, 20.0*Units::micrometer);
+// InterferenceFunction2DParaCrystal *interf =
+// InterferenceFunction2DParaCrystal::createHexagonal(20.0*Units::nanometer,
+// 0.0,20.0*Units::micrometer, 20.0*Units::micrometer);
- ParticleLayout *decoration = new ParticleLayout();
+// ParticleLayout *decoration = new ParticleLayout();
- decoration->addParticle(particle, 1.0);
+// decoration->addParticle(particle, 1.0);
- decoration->addInterferenceFunction(interf);
+// decoration->addInterferenceFunction(interf);
+ throw Exceptions::NotImplementedException("Cleanup the code!");
+
}
diff --git a/App/src/TestDetectorResolution.cpp b/App/src/TestDetectorResolution.cpp
index 7cfbb486959cd2da2212c4a71771e9d23e81c2c6..f5f040981e4125b350df9d7b8a5fb42d90d46ac3 100644
--- a/App/src/TestDetectorResolution.cpp
+++ b/App/src/TestDetectorResolution.cpp
@@ -50,33 +50,35 @@ void TestDetectorResolution::execute()
void TestDetectorResolution::initializeSample()
{
- delete mp_sample;
- MultiLayer *p_multi_layer = new MultiLayer();
- complex_t n_air(1.0, 0.0);
- complex_t n_substrate(1.0-5e-6, 2e-8);
- HomogeneousMaterial air_material("Air", n_air);
- HomogeneousMaterial substrate_material("Substrate", n_substrate);
- HomogeneousMaterial particle_material("Particle", 5e-5, 2e-8);
+// delete mp_sample;
+// MultiLayer *p_multi_layer = new MultiLayer();
+// complex_t n_air(1.0, 0.0);
+// complex_t n_substrate(1.0-5e-6, 2e-8);
+// HomogeneousMaterial air_material("Air", n_air);
+// HomogeneousMaterial substrate_material("Substrate", n_substrate);
+// HomogeneousMaterial particle_material("Particle", 5e-5, 2e-8);
- Layer air_layer;
- air_layer.setMaterial(air_material);
- Layer substrate_layer;
- substrate_layer.setMaterial(substrate_material);
- InterferenceFunctionRadialParaCrystal *p_interference_function =
- new InterferenceFunctionRadialParaCrystal(20.0*Units::nanometer,
- 1e7*Units::nanometer);
- FTDistribution1DGauss pdf(7*Units::nanometer);
- p_interference_function->setProbabilityDistribution(pdf);
- Particle particle(particle_material, FormFactorCylinder(5*Units::nanometer,
- 5*Units::nanometer));
- ParticleLayout particle_layout(particle);
- particle_layout.addInterferenceFunction(p_interference_function);
+// Layer air_layer;
+// air_layer.setMaterial(air_material);
+// Layer substrate_layer;
+// substrate_layer.setMaterial(substrate_material);
+// InterferenceFunctionRadialParaCrystal *p_interference_function =
+// new InterferenceFunctionRadialParaCrystal(20.0*Units::nanometer,
+// 1e7*Units::nanometer);
+// FTDistribution1DGauss pdf(7*Units::nanometer);
+// p_interference_function->setProbabilityDistribution(pdf);
+// Particle particle(particle_material, FormFactorCylinder(5*Units::nanometer,
+// 5*Units::nanometer));
+// ParticleLayout particle_layout(particle);
+// particle_layout.addInterferenceFunction(p_interference_function);
- air_layer.addLayout(particle_layout);
+// air_layer.addLayout(particle_layout);
+
+// p_multi_layer->addLayer(air_layer);
+// p_multi_layer->addLayer(substrate_layer);
+// mp_sample = p_multi_layer;
+ throw Exceptions::NotImplementedException("Cleanup the code!");
- p_multi_layer->addLayer(air_layer);
- p_multi_layer->addLayer(substrate_layer);
- mp_sample = p_multi_layer;
}
diff --git a/App/src/TestFittingModule2.cpp b/App/src/TestFittingModule2.cpp
index 61c785c2896d88f9b37a756fdff50c6693c607e7..3a01758e530b0a84244515acdfa629745104b75a 100644
--- a/App/src/TestFittingModule2.cpp
+++ b/App/src/TestFittingModule2.cpp
@@ -382,32 +382,34 @@ TestFittingModule2::SampleBuilder::SampleBuilder()
ISample *TestFittingModule2::SampleBuilder::buildSample() const
{
- MultiLayer *p_multi_layer = new MultiLayer();
- complex_t n_air(1.0, 0.0);
- complex_t n_substrate(1.0-6e-6, 2e-8);
- complex_t n_particle(1.0-6e-4, 2e-8);
- HomogeneousMaterial air_material("Air", n_air);
- HomogeneousMaterial substrate_material("Substrate", n_substrate);
- HomogeneousMaterial particle_material("Particle", n_particle);
- Layer air_layer;
- air_layer.setMaterial(air_material);
- Layer substrate_layer;
- substrate_layer.setMaterial(substrate_material);
- ParticleLayout particle_layout;
- Particle particle1(particle_material, FormFactorCylinder(
- m_cylinder_radius, m_cylinder_height) );
- Particle particle2(particle_material, FormFactorPrism3(
- m_prism3_length, m_prism3_height) );
- particle_layout.addParticle(particle1, m_cylinder_ratio);
- particle_layout.addParticle(particle2, 1.0 - m_cylinder_ratio);
- particle_layout.addInterferenceFunction(new InterferenceFunctionNone());
-
- air_layer.addLayout(particle_layout);
-
- p_multi_layer->addLayer(air_layer);
- p_multi_layer->addLayer(substrate_layer);
-
- return p_multi_layer;
+// MultiLayer *p_multi_layer = new MultiLayer();
+// complex_t n_air(1.0, 0.0);
+// complex_t n_substrate(1.0-6e-6, 2e-8);
+// complex_t n_particle(1.0-6e-4, 2e-8);
+// HomogeneousMaterial air_material("Air", n_air);
+// HomogeneousMaterial substrate_material("Substrate", n_substrate);
+// HomogeneousMaterial particle_material("Particle", n_particle);
+// Layer air_layer;
+// air_layer.setMaterial(air_material);
+// Layer substrate_layer;
+// substrate_layer.setMaterial(substrate_material);
+// ParticleLayout particle_layout;
+// Particle particle1(particle_material, FormFactorCylinder(
+// m_cylinder_radius, m_cylinder_height) );
+// Particle particle2(particle_material, FormFactorPrism3(
+// m_prism3_length, m_prism3_height) );
+// particle_layout.addParticle(particle1, m_cylinder_ratio);
+// particle_layout.addParticle(particle2, 1.0 - m_cylinder_ratio);
+// particle_layout.addInterferenceFunction(new InterferenceFunctionNone());
+
+// air_layer.addLayout(particle_layout);
+
+// p_multi_layer->addLayer(air_layer);
+// p_multi_layer->addLayer(substrate_layer);
+
+// return p_multi_layer;
+ throw Exceptions::NotImplementedException("Cleanup the code!");
+
}
diff --git a/App/src/TestFittingModule3.cpp b/App/src/TestFittingModule3.cpp
index a9256f93368d190b7148cb60f9abed0487cc5dbf..fdbaadccfcbe6ada93d1cdbefae406853873dd0d 100644
--- a/App/src/TestFittingModule3.cpp
+++ b/App/src/TestFittingModule3.cpp
@@ -111,36 +111,38 @@ void TestFittingModule3::initializeSimulation()
/* ************************************************************************* */
void TestFittingModule3::initializeSample()
{
- delete m_sample;
- double cylinder_height = 5.0*Units::nanometer;
- double cylinder_radius = 5.0*Units::nanometer;
- double prism3_length = 10.0*Units::nanometer;
- double prism3_height = 5.0*Units::nanometer;
- MultiLayer *p_multi_layer = new MultiLayer();
- complex_t n_air(1.0, 0.0);
- complex_t n_substrate(1.0-6e-6, 2e-8);
- complex_t n_particle(1.0-6e-4, 2e-8);
- HomogeneousMaterial air_material("Air", n_air);
- HomogeneousMaterial substrate_material("Substrate", n_substrate);
- HomogeneousMaterial particle_material("Particle", n_particle);
- Layer air_layer;
- air_layer.setMaterial(air_material);
- Layer substrate_layer;
- substrate_layer.setMaterial(substrate_material);
- Particle particle1(particle_material, FormFactorCylinder(
- cylinder_radius, cylinder_height) );
- Particle particle2(particle_material, FormFactorPrism3(
- prism3_length, prism3_height) );
- ParticleLayout particle_layout;
- particle_layout.addParticle(particle1, 0.2);
- particle_layout.addParticle(particle2, 0.8);
- particle_layout.addInterferenceFunction(new InterferenceFunctionNone());
-
- air_layer.addLayout(particle_layout);
-
- p_multi_layer->addLayer(air_layer);
- p_multi_layer->addLayer(substrate_layer);
- m_sample = p_multi_layer;
+// delete m_sample;
+// double cylinder_height = 5.0*Units::nanometer;
+// double cylinder_radius = 5.0*Units::nanometer;
+// double prism3_length = 10.0*Units::nanometer;
+// double prism3_height = 5.0*Units::nanometer;
+// MultiLayer *p_multi_layer = new MultiLayer();
+// complex_t n_air(1.0, 0.0);
+// complex_t n_substrate(1.0-6e-6, 2e-8);
+// complex_t n_particle(1.0-6e-4, 2e-8);
+// HomogeneousMaterial air_material("Air", n_air);
+// HomogeneousMaterial substrate_material("Substrate", n_substrate);
+// HomogeneousMaterial particle_material("Particle", n_particle);
+// Layer air_layer;
+// air_layer.setMaterial(air_material);
+// Layer substrate_layer;
+// substrate_layer.setMaterial(substrate_material);
+// Particle particle1(particle_material, FormFactorCylinder(
+// cylinder_radius, cylinder_height) );
+// Particle particle2(particle_material, FormFactorPrism3(
+// prism3_length, prism3_height) );
+// ParticleLayout particle_layout;
+// particle_layout.addParticle(particle1, 0.2);
+// particle_layout.addParticle(particle2, 0.8);
+// particle_layout.addInterferenceFunction(new InterferenceFunctionNone());
+
+// air_layer.addLayout(particle_layout);
+
+// p_multi_layer->addLayer(air_layer);
+// p_multi_layer->addLayer(substrate_layer);
+// m_sample = p_multi_layer;
+
+ throw Exceptions::NotImplementedException("Cleanup the code!");
}
diff --git a/App/src/TestFormFactors.cpp b/App/src/TestFormFactors.cpp
index 195162c520e62c457a29b70236e2141f91e22595..b3f9f32471b3914cb1ca2ea6044dce157f9a75dc 100644
--- a/App/src/TestFormFactors.cpp
+++ b/App/src/TestFormFactors.cpp
@@ -128,126 +128,130 @@ void TestFormFactors::execute()
void TestFormFactors::run_isgisaxs_simulation(IFormFactor *p_form_factor)
{
- HomogeneousMaterial air_material("Air", 0.0, 0.0);
- HomogeneousMaterial particle_material("Particle", 6e-4, 2e-8);
-
- //building sample
- MultiLayer multi_layer;
- Layer air_layer;
- air_layer.setMaterial(air_material);
-
- mp_form_factor=p_form_factor;
- Particle particle(particle_material, *mp_form_factor);
- ParticleLayout particle_layout(particle);
- particle_layout.addInterferenceFunction(new InterferenceFunctionNone());
- air_layer.addLayout(particle_layout);
- multi_layer.addLayer(air_layer);
-
- // building simulation
- GISASSimulation simulation(mp_options);
- IsGISAXSDetector detector;
- detector.setDetectorParameters(100, 0.0*Units::degree, 2.0*Units::degree,
- 100, 0.0*Units::degree, 2.0*Units::degree);
- simulation.setDetector(detector);
-
- simulation.setSample(multi_layer);
- simulation.runSimulation();
- std::cout << mp_form_factor->getName().substr(10) <<std::endl;
- IntensityDataIOFactory::writeOutputData(*simulation.getOutputData(),
- "this_"+mp_form_factor->getName().substr(10)+"_BA.ima");
+// HomogeneousMaterial air_material("Air", 0.0, 0.0);
+// HomogeneousMaterial particle_material("Particle", 6e-4, 2e-8);
+
+// //building sample
+// MultiLayer multi_layer;
+// Layer air_layer;
+// air_layer.setMaterial(air_material);
+
+// mp_form_factor=p_form_factor;
+// Particle particle(particle_material, *mp_form_factor);
+// ParticleLayout particle_layout(particle);
+// particle_layout.addInterferenceFunction(new InterferenceFunctionNone());
+// air_layer.addLayout(particle_layout);
+// multi_layer.addLayer(air_layer);
+
+// // building simulation
+// GISASSimulation simulation(mp_options);
+// IsGISAXSDetector detector;
+// detector.setDetectorParameters(100, 0.0*Units::degree, 2.0*Units::degree,
+// 100, 0.0*Units::degree, 2.0*Units::degree);
+// simulation.setDetector(detector);
+
+// simulation.setSample(multi_layer);
+// simulation.runSimulation();
+// std::cout << mp_form_factor->getName().substr(10) <<std::endl;
+// IntensityDataIOFactory::writeOutputData(*simulation.getOutputData(),
+// "this_"+mp_form_factor->getName().substr(10)+"_BA.ima");
+ throw Exceptions::NotImplementedException("Cleanup the code!");
+
}
void TestFormFactors::finalise()
{
- std::vector< CompareStruct > tocompare;
- tocompare.push_back( CompareStruct(getOutputPath()+"isgi_cylinder_BA.ima",
- "this_Cylinder_BA.ima",
- "Cylinder BA Formfactor"));
+// std::vector< CompareStruct > tocompare;
+// tocompare.push_back( CompareStruct(getOutputPath()+"isgi_cylinder_BA.ima",
+// "this_Cylinder_BA.ima",
+// "Cylinder BA Formfactor"));
+
+// tocompare.push_back( CompareStruct(getOutputPath()+"isgi_box_BA.ima",
+// "this_Box_BA.ima", "Box BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+"isgi_box_BA.ima",
- "this_Box_BA.ima", "Box BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+"isgi_cone_BA.ima",
+// "this_Cone_BA.ima", "Cone BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+"isgi_cone_BA.ima",
- "this_Cone_BA.ima", "Cone BA Formfactor"));
+// tocompare.push_back( CompareStruct( getOutputPath()+"isgi_cone6_BA.ima",
+// "this_Cone6_BA.ima", "Cone6 BA Formfactor"));
- tocompare.push_back( CompareStruct( getOutputPath()+"isgi_cone6_BA.ima",
- "this_Cone6_BA.ima", "Cone6 BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+
+// "isgi_full_sphere_BA.ima",
+// "this_FullSphere_BA.ima","Full Sphere BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+
- "isgi_full_sphere_BA.ima",
- "this_FullSphere_BA.ima","Full Sphere BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+
+// "isgi_parallelepiped_BA.ima",
+// "this_Parallelepiped_BA.ima","Parallelepiped BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+
- "isgi_parallelepiped_BA.ima",
- "this_Parallelepiped_BA.ima","Parallelepiped BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+"isgi_prism3_BA.ima",
+// "this_Prism3_BA.ima", "Prism3 BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+"isgi_prism3_BA.ima",
- "this_Prism3_BA.ima", "Prism3 BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+"isgi_prism6_BA.ima",
+// "this_Prism6_BA.ima", "Prism6 BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+"isgi_prism6_BA.ima",
- "this_Prism6_BA.ima", "Prism6 BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+"isgi_pyramid_BA.ima",
+// "this_Pyramid_BA.ima","Pyramid BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+"isgi_pyramid_BA.ima",
- "this_Pyramid_BA.ima","Pyramid BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+"isgi_sphere_BA.ima",
+// "this_Sphere_BA.ima","Sphere BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+"isgi_sphere_BA.ima",
- "this_Sphere_BA.ima","Sphere BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+
+// "isgi_tetrahedron_BA.ima",
+// "this_Tetrahedron_BA.ima","Tetrahedron BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+
- "isgi_tetrahedron_BA.ima",
- "this_Tetrahedron_BA.ima","Tetrahedron BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+
+// "isgi_cuboctahedron_BA.ima",
+// "this_Cuboctahedron_BA.ima","Cuboctahedron BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+
- "isgi_cuboctahedron_BA.ima",
- "this_Cuboctahedron_BA.ima","Cuboctahedron BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+
+// "isgi_aniso_pyramid_BA.ima",
+// "this_AnisoPyramid_BA.ima", "AnisoPyramid BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+
- "isgi_aniso_pyramid_BA.ima",
- "this_AnisoPyramid_BA.ima", "AnisoPyramid BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+"isgi_ellipsoid_BA.ima",
+// "this_EllipsoidalCylinder_BA.ima","EllipsoidalCylinder BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+"isgi_ellipsoid_BA.ima",
- "this_EllipsoidalCylinder_BA.ima","EllipsoidalCylinder BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+"isgi_full_spheroid_BA.ima",
+// "this_FullSpheroid_BA.ima", "FullSpheroid BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+"isgi_full_spheroid_BA.ima",
- "this_FullSpheroid_BA.ima", "FullSpheroid BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+"isgi_spheroid_BA.ima",
+// "this_Spheroid_BA.ima", "Spheroid BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+"isgi_spheroid_BA.ima",
- "this_Spheroid_BA.ima", "Spheroid BA Formfactor"));
+// tocompare.push_back( CompareStruct(getOutputPath()+
+// "isgi_hemi_ellipsoid_BA.ima","this_HemiEllipsoid_BA.ima",
+// "HemiEllipsoid BA Formfactor"));
- tocompare.push_back( CompareStruct(getOutputPath()+
- "isgi_hemi_ellipsoid_BA.ima","this_HemiEllipsoid_BA.ima",
- "HemiEllipsoid BA Formfactor"));
+// const double threshold(2e-10);
- const double threshold(2e-10);
+// for(size_t i=0; i<tocompare.size(); ++i) {
+// OutputData<double> *isgi_data = IntensityDataIOFactory::readOutputData(
+// tocompare[i].isginame);
+// OutputData<double> *our_data = IntensityDataIOFactory::readOutputData(
+// tocompare[i].thisname);
- for(size_t i=0; i<tocompare.size(); ++i) {
- OutputData<double> *isgi_data = IntensityDataIOFactory::readOutputData(
- tocompare[i].isginame);
- OutputData<double> *our_data = IntensityDataIOFactory::readOutputData(
- tocompare[i].thisname);
+// IsGISAXSTools::drawOutputDataComparisonResults(*our_data, *isgi_data,
+// tocompare[i].descr, tocompare[i].descr);
- IsGISAXSTools::drawOutputDataComparisonResults(*our_data, *isgi_data,
- tocompare[i].descr, tocompare[i].descr);
+// *our_data -= *isgi_data;
+// *our_data /= *isgi_data;
- *our_data -= *isgi_data;
- *our_data /= *isgi_data;
+// double diff(0);
+// for(OutputData<double>::const_iterator it =
+// our_data->begin(); it!=our_data->end(); ++it) {
+// diff+= std::abs(*it);
+// }
+// diff /= our_data->getAllocatedSize();
- double diff(0);
- for(OutputData<double>::const_iterator it =
- our_data->begin(); it!=our_data->end(); ++it) {
- diff+= std::abs(*it);
- }
- diff /= our_data->getAllocatedSize();
+// bool status_ok(true);
+// if( diff > threshold || MathFunctions::isnan(diff) ) status_ok=false;
+// std::cout << m_name << tocompare[i].descr<<" " << diff << " " <<
+// (status_ok ? "[OK]" : "[FAILED]") << std::endl;
- bool status_ok(true);
- if( diff > threshold || MathFunctions::isnan(diff) ) status_ok=false;
- std::cout << m_name << tocompare[i].descr<<" " << diff << " " <<
- (status_ok ? "[OK]" : "[FAILED]") << std::endl;
+// delete isgi_data;
+// delete our_data;
+// }
- delete isgi_data;
- delete our_data;
- }
+ throw Exceptions::NotImplementedException("Cleanup the code!");
}
diff --git a/App/src/TestIsGISAXS12.cpp b/App/src/TestIsGISAXS12.cpp
index a2d72751e043d407e9c72cda084eee8c2726fc0e..fef9fde9e319dc442c00d6b58512f69f7c27725d 100644
--- a/App/src/TestIsGISAXS12.cpp
+++ b/App/src/TestIsGISAXS12.cpp
@@ -475,63 +475,65 @@ void TestIsGISAXS12::TestSampleBuilder::init_parameters()
ISample *TestIsGISAXS12::TestSampleBuilder::buildSample() const
{
- MultiLayer *p_multi_layer = new MultiLayer();
-
- complex_t n_particle(1.0-6e-4, 2e-8);
- HomogeneousMaterial air_material("Air", 0.0, 0.0);
- HomogeneousMaterial substrate_material("Substrate", 6e-6, 2e-8);
- HomogeneousMaterial particle_material("Particle", n_particle);
-
- Layer air_layer(air_material);
-
- // preparing nano particles prototypes for seeding layer's particle_layout
- double particle_probability1 = m_particle_probability1;
-// double particle_probability2 = 1. - m_particle_probability1;
- double particle_probability2 = m_particle_probability2;
-
- double radius1 = m_particle_radius1;
- double radius2 = m_particle_radius2;
- double height1 = m_height_aspect_ratio1*radius1;
- double height2 = m_height_aspect_ratio2*radius2;
- FormFactorCylinder p_ff_cylinder1(radius1, height1);
- Particle cylinder1(particle_material, p_ff_cylinder1 );
-
- FormFactorCylinder p_ff_cylinder2(radius2, height2);
- Particle cylinder2(particle_material, p_ff_cylinder2 );
-
- // radius of nanoparticles will be sampled with gaussian probability
- int nbins=20;
- double sigma1 = radius1*m_dispersion_radius1;
- double sigma2 = radius2*m_dispersion_radius2;
- int nfwhm(2); // to have xmin=average-nfwhm*FWHM, xmax=average+nfwhm*FWHM (nfwhm = xR/2, where xR is what is defined in isgisaxs *.inp file)
- DistributionGaussian gauss1(radius1, sigma1);
- DistributionGaussian gauss2(radius2, sigma2);
-
- ParticleLayout particle_layout;
- InterferenceFunctionRadialParaCrystal *p_interference_function =
- new InterferenceFunctionRadialParaCrystal(m_interf_distance,
- 1e7*Units::nanometer); // peak_distance, corr_length
- FTDistribution1DGauss pdf(m_interf_width);
- p_interference_function->setProbabilityDistribution(pdf);
- particle_layout.addInterferenceFunction(p_interference_function);
-
- // building nano particles
- ParameterDistribution par_distr1("*/radius", gauss1, nbins, nfwhm);
- ParticleDistribution particle_collection1(cylinder1, par_distr1);
- particle_layout.addParticle(particle_collection1, particle_probability1);
- ParameterDistribution par_distr2("*/radius", gauss2, nbins, nfwhm);
- ParticleDistribution particle_collection2(cylinder2, par_distr2);
- particle_layout.addParticle(particle_collection2, particle_probability2);
-
- air_layer.addLayout(particle_layout);
-
- p_multi_layer->addLayer(air_layer);
-
- Layer substrate_layer;
- substrate_layer.setMaterial(substrate_material);
- p_multi_layer->addLayer(substrate_layer);
-
- return p_multi_layer;
+// MultiLayer *p_multi_layer = new MultiLayer();
+
+// complex_t n_particle(1.0-6e-4, 2e-8);
+// HomogeneousMaterial air_material("Air", 0.0, 0.0);
+// HomogeneousMaterial substrate_material("Substrate", 6e-6, 2e-8);
+// HomogeneousMaterial particle_material("Particle", n_particle);
+
+// Layer air_layer(air_material);
+
+// // preparing nano particles prototypes for seeding layer's particle_layout
+// double particle_probability1 = m_particle_probability1;
+//// double particle_probability2 = 1. - m_particle_probability1;
+// double particle_probability2 = m_particle_probability2;
+
+// double radius1 = m_particle_radius1;
+// double radius2 = m_particle_radius2;
+// double height1 = m_height_aspect_ratio1*radius1;
+// double height2 = m_height_aspect_ratio2*radius2;
+// FormFactorCylinder p_ff_cylinder1(radius1, height1);
+// Particle cylinder1(particle_material, p_ff_cylinder1 );
+
+// FormFactorCylinder p_ff_cylinder2(radius2, height2);
+// Particle cylinder2(particle_material, p_ff_cylinder2 );
+
+// // radius of nanoparticles will be sampled with gaussian probability
+// int nbins=20;
+// double sigma1 = radius1*m_dispersion_radius1;
+// double sigma2 = radius2*m_dispersion_radius2;
+// int nfwhm(2); // to have xmin=average-nfwhm*FWHM, xmax=average+nfwhm*FWHM (nfwhm = xR/2, where xR is what is defined in isgisaxs *.inp file)
+// DistributionGaussian gauss1(radius1, sigma1);
+// DistributionGaussian gauss2(radius2, sigma2);
+
+// ParticleLayout particle_layout;
+// InterferenceFunctionRadialParaCrystal *p_interference_function =
+// new InterferenceFunctionRadialParaCrystal(m_interf_distance,
+// 1e7*Units::nanometer); // peak_distance, corr_length
+// FTDistribution1DGauss pdf(m_interf_width);
+// p_interference_function->setProbabilityDistribution(pdf);
+// particle_layout.addInterferenceFunction(p_interference_function);
+
+// // building nano particles
+// ParameterDistribution par_distr1("*/radius", gauss1, nbins, nfwhm);
+// ParticleDistribution particle_collection1(cylinder1, par_distr1);
+// particle_layout.addParticle(particle_collection1, particle_probability1);
+// ParameterDistribution par_distr2("*/radius", gauss2, nbins, nfwhm);
+// ParticleDistribution particle_collection2(cylinder2, par_distr2);
+// particle_layout.addParticle(particle_collection2, particle_probability2);
+
+// air_layer.addLayout(particle_layout);
+
+// p_multi_layer->addLayer(air_layer);
+
+// Layer substrate_layer;
+// substrate_layer.setMaterial(substrate_material);
+// p_multi_layer->addLayer(substrate_layer);
+
+// return p_multi_layer;
+ throw Exceptions::NotImplementedException("Cleanup the code!");
+
}
diff --git a/App/src/TestIsGISAXS5.cpp b/App/src/TestIsGISAXS5.cpp
index e6971fcbda4511d95c34d14a28b7400e210ad8d8..608426f28f55c7bdb43a2aeeadf7412f08b0161a 100644
--- a/App/src/TestIsGISAXS5.cpp
+++ b/App/src/TestIsGISAXS5.cpp
@@ -303,46 +303,49 @@ void TestIsGISAXS5::SampleBuilder::init_parameters()
ISample *TestIsGISAXS5::SampleBuilder::buildSample() const
{
- MultiLayer *p_multi_layer = new MultiLayer();
-
- complex_t n_particle(1.0 - 6e-4, 2e-8);
- HomogeneousMaterial air_material("Air", 0.0, 0.0);
- HomogeneousMaterial substrate_material("Substrate", 6e-6, 2e-8);
- HomogeneousMaterial particle_material("Particle", n_particle);
-
- Layer air_layer(air_material);
- double height = m_height_aspect_ratio * m_particle_radius;
- FormFactorCylinder ff_cylinder(m_particle_radius, height);
- Particle cylinder(particle_material, ff_cylinder);
-
- // radius of nanoparticles will be sampled with gaussian probability
- int nbins = 20;
- double sigma = m_particle_radius * m_dispersion_radius;
- int nfwhm(2); // to have xmin=average-nfwhm*FWHM, xmax=average+nfwhm*FWHM (nfwhm = xR/2, where
- // xR is what is defined in isgisaxs *.inp file)
- DistributionGaussian gauss(m_particle_radius, sigma);
-
- ParticleLayout particle_layout;
- InterferenceFunctionRadialParaCrystal *p_interference_function
- = new InterferenceFunctionRadialParaCrystal(
- m_interf_distance, 1e7 * Units::nanometer); // peak_distance, corr_length
- FTDistribution1DGauss pdf(m_interf_width);
- p_interference_function->setProbabilityDistribution(pdf);
- particle_layout.addInterferenceFunction(p_interference_function);
-
- // building nano particles
- ParameterDistribution par_distr("*/radius", gauss, nbins, nfwhm);
- ParticleDistribution particle_collection(cylinder, par_distr);
- particle_layout.addParticle(particle_collection);
-
- // add layout to layer
- air_layer.addLayout(particle_layout);
-
- p_multi_layer->addLayer(air_layer);
-
- Layer substrate_layer;
- substrate_layer.setMaterial(substrate_material);
- p_multi_layer->addLayer(substrate_layer);
-
- return p_multi_layer;
+// MultiLayer *p_multi_layer = new MultiLayer();
+
+// complex_t n_particle(1.0 - 6e-4, 2e-8);
+// HomogeneousMaterial air_material("Air", 0.0, 0.0);
+// HomogeneousMaterial substrate_material("Substrate", 6e-6, 2e-8);
+// HomogeneousMaterial particle_material("Particle", n_particle);
+
+// Layer air_layer(air_material);
+// double height = m_height_aspect_ratio * m_particle_radius;
+// FormFactorCylinder ff_cylinder(m_particle_radius, height);
+// Particle cylinder(particle_material, ff_cylinder);
+
+// // radius of nanoparticles will be sampled with gaussian probability
+// int nbins = 20;
+// double sigma = m_particle_radius * m_dispersion_radius;
+// int nfwhm(2); // to have xmin=average-nfwhm*FWHM, xmax=average+nfwhm*FWHM (nfwhm = xR/2, where
+// // xR is what is defined in isgisaxs *.inp file)
+// DistributionGaussian gauss(m_particle_radius, sigma);
+
+// ParticleLayout particle_layout;
+// InterferenceFunctionRadialParaCrystal *p_interference_function
+// = new InterferenceFunctionRadialParaCrystal(
+// m_interf_distance, 1e7 * Units::nanometer); // peak_distance, corr_length
+// FTDistribution1DGauss pdf(m_interf_width);
+// p_interference_function->setProbabilityDistribution(pdf);
+// particle_layout.addInterferenceFunction(p_interference_function);
+
+// // building nano particles
+// ParameterDistribution par_distr("*/radius", gauss, nbins, nfwhm);
+// ParticleDistribution particle_collection(cylinder, par_distr);
+// particle_layout.addParticle(particle_collection);
+
+// // add layout to layer
+// air_layer.addLayout(particle_layout);
+
+// p_multi_layer->addLayer(air_layer);
+
+// Layer substrate_layer;
+// substrate_layer.setMaterial(substrate_material);
+// p_multi_layer->addLayer(substrate_layer);
+
+// return p_multi_layer;
+
+ throw Exceptions::NotImplementedException("Cleanup the code!");
+
}
diff --git a/App/src/TestPolarizedMeso.cpp b/App/src/TestPolarizedMeso.cpp
index d063c89d7c1d41c4a81d9816e411fdc1b629eb91..c53055b50b240086752ee3500b1d3aff432a0b2c 100644
--- a/App/src/TestPolarizedMeso.cpp
+++ b/App/src/TestPolarizedMeso.cpp
@@ -78,52 +78,55 @@ void TestPolarizedMeso::execute()
MultiLayer* TestPolarizedMeso::createSample() const
{
- // create mesocrystal
- double surface_density =
- m_surface_filling_ratio/m_meso_width/m_meso_width;
- kvector_t magnetic_field(3.4, 3.4, 3.4);
- HomogeneousMagneticMaterial particle_material("nanoparticle",2.84e-5, 4.7e-7, magnetic_field);
-
- // Create multilayer
- MultiLayer *p_multi_layer = new MultiLayer();
-
- HomogeneousMaterial air_material("Air", 0.0, 0.0);
- HomogeneousMaterial substrate_material("Substrate", 7.57e-6, 1.73e-7);
- Layer air_layer;
- air_layer.setMaterial(air_material);
- Layer substrate_layer;
- substrate_layer.setMaterial(substrate_material);
- IInterferenceFunction *p_interference_funtion =
- new InterferenceFunctionNone();
- ParticleLayout particle_layout;
- size_t n_max_phi_rotation_steps = 1;
- size_t n_sizes = 2;
-
- double phi_step = Units::PI/4.0/n_max_phi_rotation_steps;
- double phi_start = 0.0;
- for (size_t i=0; i<n_max_phi_rotation_steps; ++i) {
- for (size_t j=0; j<n_sizes; ++j) {
- RotationZ transform(phi_start + i*phi_step);
- double meso_size = m_meso_width + j*m_meso_size_steps;
- FormFactorBox ff_box(meso_size, meso_size, meso_size);
- boost::scoped_ptr<MesoCrystal> meso(createMeso(
- m_lattice_length_a, m_lattice_length_c,
- particle_material, m_nanoparticle_size, &ff_box) );
- particle_layout.addParticle(*meso, 1.0, kvector_t(0,0,0), transform);
- }
- }
-
- particle_layout.setTotalParticleSurfaceDensity(surface_density);
- particle_layout.addInterferenceFunction(p_interference_funtion);
-
- air_layer.addLayout(particle_layout);
-
- LayerRoughness roughness(m_roughness, 0.3, 500.0*Units::nanometer);
-
- p_multi_layer->addLayer(air_layer);
- p_multi_layer->addLayerWithTopRoughness(substrate_layer, roughness);
-
- return p_multi_layer;
+ throw Exceptions::NotImplementedException("Cleanup the code!");
+
+// // create mesocrystal
+// double surface_density =
+// m_surface_filling_ratio/m_meso_width/m_meso_width;
+// kvector_t magnetic_field(3.4, 3.4, 3.4);
+// HomogeneousMagneticMaterial particle_material("nanoparticle",2.84e-5, 4.7e-7, magnetic_field);
+
+// // Create multilayer
+// MultiLayer *p_multi_layer = new MultiLayer();
+
+// HomogeneousMaterial air_material("Air", 0.0, 0.0);
+// HomogeneousMaterial substrate_material("Substrate", 7.57e-6, 1.73e-7);
+// Layer air_layer;
+// air_layer.setMaterial(air_material);
+// Layer substrate_layer;
+// substrate_layer.setMaterial(substrate_material);
+// IInterferenceFunction *p_interference_funtion =
+// new InterferenceFunctionNone();
+// ParticleLayout particle_layout;
+// size_t n_max_phi_rotation_steps = 1;
+// size_t n_sizes = 2;
+
+// double phi_step = Units::PI/4.0/n_max_phi_rotation_steps;
+// double phi_start = 0.0;
+// for (size_t i=0; i<n_max_phi_rotation_steps; ++i) {
+// for (size_t j=0; j<n_sizes; ++j) {
+// RotationZ transform(phi_start + i*phi_step);
+// double meso_size = m_meso_width + j*m_meso_size_steps;
+// FormFactorBox ff_box(meso_size, meso_size, meso_size);
+// boost::scoped_ptr<MesoCrystal> meso(createMeso(
+// m_lattice_length_a, m_lattice_length_c,
+// particle_material, m_nanoparticle_size, &ff_box) );
+// particle_layout.addParticle(*meso, 1.0, kvector_t(0,0,0), transform);
+// }
+// }
+
+// particle_layout.setTotalParticleSurfaceDensity(surface_density);
+// particle_layout.addInterferenceFunction(p_interference_funtion);
+
+// air_layer.addLayout(particle_layout);
+
+// LayerRoughness roughness(m_roughness, 0.3, 500.0*Units::nanometer);
+
+// p_multi_layer->addLayer(air_layer);
+// p_multi_layer->addLayerWithTopRoughness(substrate_layer, roughness);
+
+// return p_multi_layer;
+ return 0;
}
MesoCrystal* TestPolarizedMeso::createMeso(double a, double c,
diff --git a/App/src/TestRipple1.cpp b/App/src/TestRipple1.cpp
index bd7adf56f100744656a1a8a34f3d32a204572a8e..24884ea46a478fe0998cd12649a0c608fc82d694 100644
--- a/App/src/TestRipple1.cpp
+++ b/App/src/TestRipple1.cpp
@@ -173,37 +173,40 @@ void TestRipple1::TestSampleBuilder::init_parameters()
ISample *TestRipple1::TestSampleBuilder::buildSample() const
{
- MultiLayer *p_multi_layer = new MultiLayer();
+// MultiLayer *p_multi_layer = new MultiLayer();
- complex_t n_particle(1.0-6e-4, 2e-8);
- HomogeneousMaterial air_material("Air", 0.0, 0.0);
- HomogeneousMaterial substrate_material("Substrate", 6e-6, 2e-8);
- HomogeneousMaterial particle_material("Particle", n_particle);
+// complex_t n_particle(1.0-6e-4, 2e-8);
+// HomogeneousMaterial air_material("Air", 0.0, 0.0);
+// HomogeneousMaterial substrate_material("Substrate", 6e-6, 2e-8);
+// HomogeneousMaterial particle_material("Particle", n_particle);
- Layer air_layer(air_material);
- FormFactorRipple1 ff_ripple1(m_l, m_w, m_h);
- Particle ripple(particle_material, ff_ripple1);
+// Layer air_layer(air_material);
+// FormFactorRipple1 ff_ripple1(m_l, m_w, m_h);
+// Particle ripple(particle_material, ff_ripple1);
- ParticleLayout particle_layout;
- particle_layout.addParticle(ripple, 1.0);
- InterferenceFunctionRadialParaCrystal *p_interference_function =
- new InterferenceFunctionRadialParaCrystal(m_interf_distance,
- 1e7*Units::nanometer); // peak_distance, corr_length
- FTDistribution1DGauss pdf(m_interf_width);
- p_interference_function->setProbabilityDistribution(pdf);
- particle_layout.addInterferenceFunction(p_interference_function);
+// ParticleLayout particle_layout;
+// particle_layout.addParticle(ripple, 1.0);
+// InterferenceFunctionRadialParaCrystal *p_interference_function =
+// new InterferenceFunctionRadialParaCrystal(m_interf_distance,
+// 1e7*Units::nanometer); // peak_distance, corr_length
+// FTDistribution1DGauss pdf(m_interf_width);
+// p_interference_function->setProbabilityDistribution(pdf);
+// particle_layout.addInterferenceFunction(p_interference_function);
- // making layer holding all whose nano particles
- air_layer.addLayout(particle_layout);
+// // making layer holding all whose nano particles
+// air_layer.addLayout(particle_layout);
- p_multi_layer->addLayer(air_layer);
+// p_multi_layer->addLayer(air_layer);
+
+// Layer substrate_layer;
+// substrate_layer.setMaterial(substrate_material);
+// p_multi_layer->addLayer(substrate_layer);
+
+// return p_multi_layer;
+ throw Exceptions::NotImplementedException("Cleanup the code!");
- Layer substrate_layer;
- substrate_layer.setMaterial(substrate_material);
- p_multi_layer->addLayer(substrate_layer);
- return p_multi_layer;
}
void TestRipple1::plot_results()
diff --git a/App/src/TestRipple2.cpp b/App/src/TestRipple2.cpp
index 507334cd7bcebf4a95aa4ec9b496b1723f0ce44f..a0e49fc840c039b225c6099d5a8b1efd01c93a6c 100644
--- a/App/src/TestRipple2.cpp
+++ b/App/src/TestRipple2.cpp
@@ -175,37 +175,38 @@ void TestRipple2::TestSampleBuilder::init_parameters()
ISample *TestRipple2::TestSampleBuilder::buildSample() const
{
- MultiLayer *p_multi_layer = new MultiLayer();
+// MultiLayer *p_multi_layer = new MultiLayer();
- complex_t n_particle(1.0-6e-4, 2e-8);
- HomogeneousMaterial air_material("Air", 0.0, 0.0);
- HomogeneousMaterial substrate_material("Substrate", 6e-6, 2e-8);
- HomogeneousMaterial particle_material("Particle", n_particle);
+// complex_t n_particle(1.0-6e-4, 2e-8);
+// HomogeneousMaterial air_material("Air", 0.0, 0.0);
+// HomogeneousMaterial substrate_material("Substrate", 6e-6, 2e-8);
+// HomogeneousMaterial particle_material("Particle", n_particle);
- Layer air_layer(air_material);
- FormFactorRipple2 ff_ripple2(m_l, m_w, m_h, m_d);
- Particle ripple(particle_material, ff_ripple2 );
+// Layer air_layer(air_material);
+// FormFactorRipple2 ff_ripple2(m_l, m_w, m_h, m_d);
+// Particle ripple(particle_material, ff_ripple2 );
- ParticleLayout particle_layout;
- particle_layout.addParticle(ripple, 1.0);
- InterferenceFunctionRadialParaCrystal *p_interference_function =
- new InterferenceFunctionRadialParaCrystal(m_interf_distance,
- 1e7*Units::nanometer); // peak_distance, corr_length
- FTDistribution1DGauss pdf(m_interf_width);
- p_interference_function->setProbabilityDistribution(pdf);
- particle_layout.addInterferenceFunction(p_interference_function);
+// ParticleLayout particle_layout;
+// particle_layout.addParticle(ripple, 1.0);
+// InterferenceFunctionRadialParaCrystal *p_interference_function =
+// new InterferenceFunctionRadialParaCrystal(m_interf_distance,
+// 1e7*Units::nanometer); // peak_distance, corr_length
+// FTDistribution1DGauss pdf(m_interf_width);
+// p_interference_function->setProbabilityDistribution(pdf);
+// particle_layout.addInterferenceFunction(p_interference_function);
- // making layer holding all whose nano particles
- air_layer.addLayout(particle_layout);
+// // making layer holding all whose nano particles
+// air_layer.addLayout(particle_layout);
- p_multi_layer->addLayer(air_layer);
+// p_multi_layer->addLayer(air_layer);
- Layer substrate_layer;
- substrate_layer.setMaterial(substrate_material);
- p_multi_layer->addLayer(substrate_layer);
+// Layer substrate_layer;
+// substrate_layer.setMaterial(substrate_material);
+// p_multi_layer->addLayer(substrate_layer);
- return p_multi_layer;
+// return p_multi_layer;
+ throw Exceptions::NotImplementedException("Cleanup the code!");
}
void TestRipple2::plot_results()
diff --git a/App/src/TestRootTree.cpp b/App/src/TestRootTree.cpp
index a1df920e08ec311aa6d24ef85fa39643562f09e8..31b249839b4e65c4d68393da8629889d34e993dc 100644
--- a/App/src/TestRootTree.cpp
+++ b/App/src/TestRootTree.cpp
@@ -377,54 +377,55 @@ void TestRootTree::simple_read()
//!
-void TestRootTree::initializeMesoCrystal(
- double meso_alpha, double meso_phi, double nanopart_radius)
+void TestRootTree::initializeMesoCrystal(double /* meso_alpha */, double /* meso_phi*/, double /*nanopart_radius*/)
{
- (void)nanopart_radius;
- delete mp_sample;
- // create mesocrystal
- double meso_radius = 300*Units::nanometer;
- double surface_filling_ratio = 0.25;
- double surface_density = surface_filling_ratio/Units::PI/meso_radius/meso_radius;
- complex_t n_particle(1.0-1.55e-5, 1.37e-6);
- complex_t avg_n_squared_meso = 0.7886*n_particle*n_particle + 0.2114;
- complex_t n_avg = std::sqrt(surface_filling_ratio*avg_n_squared_meso +
- 1.0 - surface_filling_ratio);
-// complex_t n_particle_adapted = std::sqrt(n_avg*n_avg + n_particle*n_particle - 1.0);
-// FormFactorCylinder ff_meso(meso_radius, 0.2*Units::micrometer);
-
- // Create multilayer
- MultiLayer *p_multi_layer = new MultiLayer();
- complex_t n_air(1.0, 0.0);
- complex_t n_substrate(1.0-7.57e-6, 1.73e-7);
-
- HomogeneousMaterial air_material("Air", n_air);
- HomogeneousMaterial average_layer_material("Averagelayer", n_avg);
- HomogeneousMaterial substrate_material("Substrate", n_substrate);
- Layer air_layer;
- air_layer.setMaterial(air_material);
- Layer avg_layer;
- avg_layer.setMaterial(average_layer_material);
- avg_layer.setThickness(0.2*Units::micrometer);
- Layer substrate_layer;
- substrate_layer.setMaterial(substrate_material);
- IInterferenceFunction *p_interference_funtion =
- new InterferenceFunctionNone();
- ParticleLayout particle_layout;
-
- //double R = nanopart_radius;
- RotationZ transform1(meso_phi);
- RotationY transform2(meso_alpha);
-
- particle_layout.setTotalParticleSurfaceDensity(surface_density);
- particle_layout.addInterferenceFunction(p_interference_funtion);
-
- avg_layer.addLayout(particle_layout);
-
- p_multi_layer->addLayer(air_layer);
- p_multi_layer->addLayer(avg_layer);
- p_multi_layer->addLayer(substrate_layer);
- mp_sample = p_multi_layer;
+// (void)nanopart_radius;
+// delete mp_sample;
+// // create mesocrystal
+// double meso_radius = 300*Units::nanometer;
+// double surface_filling_ratio = 0.25;
+// double surface_density = surface_filling_ratio/Units::PI/meso_radius/meso_radius;
+// complex_t n_particle(1.0-1.55e-5, 1.37e-6);
+// complex_t avg_n_squared_meso = 0.7886*n_particle*n_particle + 0.2114;
+// complex_t n_avg = std::sqrt(surface_filling_ratio*avg_n_squared_meso +
+// 1.0 - surface_filling_ratio);
+//// complex_t n_particle_adapted = std::sqrt(n_avg*n_avg + n_particle*n_particle - 1.0);
+//// FormFactorCylinder ff_meso(meso_radius, 0.2*Units::micrometer);
+
+// // Create multilayer
+// MultiLayer *p_multi_layer = new MultiLayer();
+// complex_t n_air(1.0, 0.0);
+// complex_t n_substrate(1.0-7.57e-6, 1.73e-7);
+
+// HomogeneousMaterial air_material("Air", n_air);
+// HomogeneousMaterial average_layer_material("Averagelayer", n_avg);
+// HomogeneousMaterial substrate_material("Substrate", n_substrate);
+// Layer air_layer;
+// air_layer.setMaterial(air_material);
+// Layer avg_layer;
+// avg_layer.setMaterial(average_layer_material);
+// avg_layer.setThickness(0.2*Units::micrometer);
+// Layer substrate_layer;
+// substrate_layer.setMaterial(substrate_material);
+// IInterferenceFunction *p_interference_funtion =
+// new InterferenceFunctionNone();
+// ParticleLayout particle_layout;
+
+// //double R = nanopart_radius;
+// RotationZ transform1(meso_phi);
+// RotationY transform2(meso_alpha);
+
+// particle_layout.setTotalParticleSurfaceDensity(surface_density);
+// particle_layout.addInterferenceFunction(p_interference_funtion);
+
+// avg_layer.addLayout(particle_layout);
+
+// p_multi_layer->addLayer(air_layer);
+// p_multi_layer->addLayer(avg_layer);
+// p_multi_layer->addLayer(substrate_layer);
+// mp_sample = p_multi_layer;
+
+ throw Exceptions::NotImplementedException("Cleanup the code!");
}
diff --git a/dev-tools/log/perf_history.txt b/dev-tools/log/perf_history.txt
index d03957adbc041889330b438e5809509e239f28bd..0c50c8d3360f4c7f01df465af5e6481c22a738c3 100644
--- a/dev-tools/log/perf_history.txt
+++ b/dev-tools/log/perf_history.txt
@@ -495,4 +495,6 @@
# PreRelease. If I try to backup mP_specular_info->getInCoefficients(alpha_i, 0.0, wavelength)); in InterferenceFunctionStrategy
| 2015-10-29 09:41:25 | jcnsopc126 | linuxx8664gcc | 0 | 19.921 | 2.416 | 0.984 | 1.654 | 0.778 | 3.333 | 1.027 | 2.923 | 1.505 | 2.359 | 2.942 |
-
+# PreRelease-1.5.0
+| date | hostname | sysinfo | tr | total | MultiLayer | CylindersInD | RotatedPyram | CoreShell | SquareLattic | RadialParaCr | HexParaCryst | SSCA | Mesocrystal | PolMagCyl |
+| 2016-02-11 14:10:57 | jcnsopc126 | linuxx8664gcc | 0 | 18.247 | 1.981 | 0.920 | 1.418 | 0.696 | 2.578 | 0.950 | 3.899 | 1.381 | 2.008 | 2.417 |