From a42fd3286712161d799cabc19407944f85ee363d Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Mon, 23 Sep 2013 11:42:18 +0200
Subject: [PATCH] Fixed bugs in: Refactor: pulled dwba decoration of form
factors out of LayerStrategyBuilder and into global function
---
Core/Algorithms/src/DiffuseDWBASimulation.cpp | 1 +
Core/FormFactors/inc/FormFactorTools.h | 4 ++--
Core/FormFactors/src/FormFactorTools.cpp | 6 ++++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Core/Algorithms/src/DiffuseDWBASimulation.cpp b/Core/Algorithms/src/DiffuseDWBASimulation.cpp
index 8268520812f..31866dbf3c9 100644
--- a/Core/Algorithms/src/DiffuseDWBASimulation.cpp
+++ b/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.
diff --git a/Core/FormFactors/inc/FormFactorTools.h b/Core/FormFactors/inc/FormFactorTools.h
index 4445d1a10d6..d38a1fdbb47 100644
--- a/Core/FormFactors/inc/FormFactorTools.h
+++ b/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);
}
diff --git a/Core/FormFactors/src/FormFactorTools.cpp b/Core/FormFactors/src/FormFactorTools.cpp
index aaa94d99f58..427d89c7d24 100644
--- a/Core/FormFactors/src/FormFactorTools.cpp
+++ b/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) {
--
GitLab