simplify builders

Core/StandardSamples/CoreShellParticleBuilder.cpp

@@ -27,8 +27,6 @@
 
 MultiLayer* CoreShellParticleBuilder::buildSample() const
 {
-    MultiLayer* multi_layer = new MultiLayer();
-
     Material air_material = HomogeneousMaterial("Air", 0.0, 0.0);
 
     complex_t n_particle_shell(1.0 - 1e-4, 2e-8);
@@ -51,6 +49,7 @@ MultiLayer* CoreShellParticleBuilder::buildSample() const
 
     air_layer.addLayout(particle_layout);
 
+    MultiLayer* multi_layer = new MultiLayer();
     multi_layer->addLayer(air_layer);
     return multi_layer;
 }

Core/StandardSamples/CoreShellParticleBuilder.h

@@ -17,15 +17,12 @@
 
 #include "Core/SampleBuilderEngine/ISampleBuilder.h"
 
-class ISample;
-
 //! Builds sample: Core Shell Nanoparticles (IsGISAXS example #11).
 //! @ingroup standard_samples
 
 class CoreShellParticleBuilder : public ISampleBuilder
 {
 public:
-    CoreShellParticleBuilder() {}
     MultiLayer* buildSample() const;
 };
 
@@ -35,7 +32,6 @@ public:
 class CoreShellBoxRotateZandYBuilder : public ISampleBuilder
 {
 public:
-    CoreShellBoxRotateZandYBuilder() {}
     MultiLayer* buildSample() const;
 };
 

Core/StandardSamples/CustomMorphologyBuilder.cpp

@@ -19,13 +19,10 @@
 #include "Core/Material/MaterialFactoryFuncs.h"
 #include "Core/Multilayer/Layer.h"
 #include "Core/Multilayer/MultiLayer.h"
-#include "Core/Parametrization/RealParameter.h"
 #include "Core/Particle/Particle.h"
 
 MultiLayer* CustomMorphologyBuilder::buildSample() const
 {
-    MultiLayer* multi_layer = new MultiLayer();
-
     Material air_material = HomogeneousMaterial("Air", 0.0, 0.0);
     Material particle_material = HomogeneousMaterial("Particle", 6e-4, 2e-8);
 
@@ -104,7 +101,8 @@ MultiLayer* CustomMorphologyBuilder::buildSample() const
     particle_layout.addParticle(p10, 0.5);
 
     air_layer.addLayout(particle_layout);
-    multi_layer->addLayer(air_layer);
 
+    MultiLayer* multi_layer = new MultiLayer();
+    multi_layer->addLayer(air_layer);
     return multi_layer;
 }

Core/StandardSamples/CustomMorphologyBuilder.h

@@ -17,15 +17,12 @@
 
 #include "Core/SampleBuilderEngine/ISampleBuilder.h"
 
-class ISample;
-
 //! Builds sample: mixture of different particles (IsGISAXS example #7).
 //! @ingroup standard_samples
 
 class CustomMorphologyBuilder : public ISampleBuilder
 {
 public:
-    CustomMorphologyBuilder() {}
     MultiLayer* buildSample() const;
 };
 

Core/StandardSamples/CylindersAndPrismsBuilder.cpp

@@ -20,11 +20,8 @@
 #include "Core/Material/MaterialFactoryFuncs.h"
 #include "Core/Multilayer/Layer.h"
 #include "Core/Multilayer/MultiLayer.h"
-#include "Core/Parametrization/RealParameter.h"
 #include "Core/Particle/Particle.h"
 
-CylindersAndPrismsBuilder::CylindersAndPrismsBuilder() {}
-
 MultiLayer* CylindersAndPrismsBuilder::buildSample() const
 {
     MultiLayer* multi_layer = new MultiLayer();

Core/StandardSamples/CylindersAndPrismsBuilder.h

@@ -17,16 +17,13 @@
 
 #include "Core/SampleBuilderEngine/ISampleBuilder.h"
 
-class ISample;
-
 //! Builds sample: mixture of cylinders and prisms without interference (IsGISAXS example #1).
 //! @ingroup standard_samples
 
 class CylindersAndPrismsBuilder : public ISampleBuilder
 {
 public:
-    CylindersAndPrismsBuilder();
-    MultiLayer* buildSample() const;
+     MultiLayer* buildSample() const;
 };
 
 #endif // BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H