Aesthetics

Core/Algorithms/inc/DecoratedLayerDWBASimulation.h

@@ -45,7 +45,6 @@ class DecoratedLayerDWBASimulation : public LayerDWBASimulation
 
  private:
     IInterferenceFunctionStrategy *createAndInitStrategy() const;
-    std::vector<IFormFactor*> createDWBAFormFactors() const;
     void calculateCoherentIntensity(const IInterferenceFunctionStrategy *p_strategy);
     void calculateInCoherentIntensity();
 

Core/Algorithms/inc/DecouplingApproximationStrategy.h

@@ -21,7 +21,7 @@
 
 class DecouplingApproximationStrategy : public IInterferenceFunctionStrategy
 {
- public:
+public:
     DecouplingApproximationStrategy(SimulationParameters sim_params)
         : IInterferenceFunctionStrategy(sim_params) {}
 
@@ -33,7 +33,7 @@ class DecouplingApproximationStrategy : public IInterferenceFunctionStrategy
     virtual double evaluate(
         const cvector_t& k_i, const Bin1DCVector& k_f_bin,
         double alpha_i, double alpha_f) const;
- private:
+private:
     bool checkVectorSizes() const;
 };
 

Core/Algorithms/inc/IInterferenceFunctionStrategy.h

@@ -26,7 +26,7 @@
 
 class IInterferenceFunctionStrategy
 {
- public:
+public:
     IInterferenceFunctionStrategy(SimulationParameters sim_params)
         : m_sim_params(sim_params) {}
     virtual ~IInterferenceFunctionStrategy() {}
@@ -35,7 +35,7 @@ class IInterferenceFunctionStrategy
                       const SafePointerVector<IInterferenceFunction>& ifs);
     virtual double evaluate(const cvector_t& k_i, const Bin1DCVector& k_f_bin,
             double alpha_i, double alpha_f) const=0;
- protected:
+protected:
     //! Returns mean form factor, possibly including their position information
     complex_t meanFormFactor(const cvector_t& k_i, const Bin1DCVector& k_f_bin,
             double alpha_i, double alpha_f, bool use_position=false) const;

Core/Algorithms/src/DecoratedLayerDWBASimulation.cpp

@@ -62,47 +62,6 @@ IInterferenceFunctionStrategy
     return p_strategy;
 }
 
-std::vector<IFormFactor*>
-DecoratedLayerDWBASimulation::createDWBAFormFactors() const
-{
-    msglog(MSG::DEBUG) << "LayerDecoratorDWBASimulation::create...()";
-    std::vector<IFormFactor*> result;
-    const IDecoration *p_decoration = mp_layer->getDecoration();
-    complex_t n_layer = mp_layer->getRefractiveIndex();
-    size_t number_of_particles = p_decoration->getNumberOfParticles();
-    for (size_t particle_index =
-            0; particle_index<number_of_particles; ++particle_index) {
-        Particle *p_particle = p_decoration->getParticleInfo(particle_index)->getParticle()->clone();
-        double depth = p_decoration->getParticleInfo(particle_index)->getDepth();
-        const Geometry::PTransform3D transform =
-            p_decoration->getParticleInfo(particle_index)->getPTransform3D();
-
-        p_particle->setAmbientRefractiveIndex(n_layer);
-        complex_t wavevector_scattering_factor =
-            M_PI/getWaveLength()/getWaveLength();
-
-        IFormFactor *ff_particle = p_particle->createFormFactor();
-        IFormFactor *ff_transformed(0);
-        if(transform) {
-            msglog(MSG::DEBUG) << "LayerDecoratorDWBASimulation::create...() avec!";
-            ff_transformed = new FormFactorDecoratorTransformation(
-                ff_particle, transform);
-        } else {
-            msglog(MSG::DEBUG) << "LayerDecoratorDWBASimulation::create...() sans!";
-            ff_transformed = ff_particle;
-        }
-
-        FormFactorDWBAConstZ dwba_z(ff_transformed, depth);
-        dwba_z.setReflectionTransmissionFunction(*mp_RT_function);
-        FormFactorDecoratorFactor *p_ff =
-            new FormFactorDecoratorFactor(
-                dwba_z.clone(), wavevector_scattering_factor);
-        result.push_back(p_ff);
-        delete p_particle;
-    }
-    return result;
-}
-
 void DecoratedLayerDWBASimulation::calculateCoherentIntensity(
     const IInterferenceFunctionStrategy *p_strategy)
 {

Core/Algorithms/src/MultiLayerDWBASimulation.cpp

@@ -84,6 +84,10 @@ void MultiLayerDWBASimulation::run()
 {
     msglog(MSG::DEBUG) << "MultiLayerDWBASimulation::run() -> Running thread "
                        << m_thread_info.current_thread;
+//    if (mp_polarization_output) {
+//        runMagnetic();
+//        return;
+//    }
     SpecularMatrix specularCalculator;
 
     kvector_t m_ki_real(m_ki.x().real(), m_ki.y().real(), m_ki.z().real());