Fixed bugs in: Refactor: pulled dwba decoration of form factors out of...

Fixed bugs in: Refactor: pulled dwba decoration of form factors out of LayerStrategyBuilder and into global function

Core/Algorithms/src/DiffuseDWBASimulation.cpp

@@ -16,6 +16,7 @@
 #include "DiffuseDWBASimulation.h"
 #include "FormFactorDWBAConstZ.h"
 #include "MessageService.h"
+#include "FormFactorTools.h"
 
 //! Carry out one simulation thread.
 

Core/FormFactors/inc/FormFactorTools.h

@@ -25,12 +25,12 @@ namespace FormFactorTools {
 //! Decorates the given formfactor with a scalar dwba formfactor and returns
 //! this form factor
 IFormFactor* createDWBAScalarFormFactor(IFormFactor* p_form_factor,
-        const LayerSpecularInfo &specular_info, double depth) const
+        const LayerSpecularInfo &specular_info, double depth=0.0);
 
 //! Decorates the given formfactor with a matrix dwba formfactor and returns
 //! this form factor
 IFormFactor* createDWBAMatrixFormFactor(IFormFactor* p_form_factor,
-        const LayerSpecularInfo &specular_info, double depth) const
+        const LayerSpecularInfo &specular_info, double depth=0.0);
 }
 
 

Core/FormFactors/src/FormFactorTools.cpp

@@ -14,10 +14,12 @@
 // ************************************************************************** //
 
 #include "FormFactorTools.h"
+#include "FormFactorDWBAConstZ.h"
+#include "FormFactorDWBAPolConstZ.h"
 
 IFormFactor* FormFactorTools::createDWBAScalarFormFactor(
         IFormFactor* p_form_factor, const LayerSpecularInfo& specular_info,
-        double depth) const
+        double depth)
 {
     FormFactorDWBAConstZ *p_result =
         new FormFactorDWBAConstZ(p_form_factor, depth);
@@ -27,7 +29,7 @@ IFormFactor* FormFactorTools::createDWBAScalarFormFactor(
 
 IFormFactor* FormFactorTools::createDWBAMatrixFormFactor(
         IFormFactor* p_form_factor, const LayerSpecularInfo& specular_info,
-        double depth) const
+        double depth)
 {
     FormFactorDWBAPol *p_result(0);
     if (depth) {