From a3558b9a9269955cd2b1eeebd386fbb439340958 Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Mon, 5 Aug 2013 13:12:02 +0200
Subject: [PATCH] Fixes for SampleMaterialVisitor
---
Core/Core.pro | 2 ++
Core/Tools/inc/SampleMaterialVisitor.h | 2 +-
Core/Tools/src/SampleMaterialVisitor.cpp | 12 ++++++++++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Core/Core.pro b/Core/Core.pro
index f38186f60cb..b47a5bae063 100644
--- a/Core/Core.pro
+++ b/Core/Core.pro
@@ -44,6 +44,7 @@ SOURCES += \
Tools/src/ParameterPool.cpp \
Tools/src/ProgramOptions.cpp \
Tools/src/RealParameterWrapper.cpp \
+ Tools/src/SampleMaterialVisitor.cpp \
Tools/src/SamplePrintVisitor.cpp \
Tools/src/StochasticGaussian.cpp \
Tools/src/StochasticSampledParameter.cpp \
@@ -177,6 +178,7 @@ HEADERS += \
Tools/inc/ProgramOptions.h \
Tools/inc/RealParameterWrapper.h \
Tools/inc/SafePointerVector.h \
+ Tools/inc/SampleMaterialVisitor.h \
Tools/inc/SamplePrintVisitor.h \
Tools/inc/StochasticDiracDelta.h \
Tools/inc/StochasticDoubleGate.h \
diff --git a/Core/Tools/inc/SampleMaterialVisitor.h b/Core/Tools/inc/SampleMaterialVisitor.h
index a83dfd6b7db..94860644ab4 100644
--- a/Core/Tools/inc/SampleMaterialVisitor.h
+++ b/Core/Tools/inc/SampleMaterialVisitor.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file SampleMaterialVisitor.h
+//! @file Tools/inc/SampleMaterialVisitor.h
//! @brief Defines class SampleMaterialVisitor.
//!
//! @homepage http://apps.jcns.fz-juelich.de/BornAgain
diff --git a/Core/Tools/src/SampleMaterialVisitor.cpp b/Core/Tools/src/SampleMaterialVisitor.cpp
index 821fe00bd6d..a9fe57d9c1d 100644
--- a/Core/Tools/src/SampleMaterialVisitor.cpp
+++ b/Core/Tools/src/SampleMaterialVisitor.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file SampleMaterialVisitor.cpp
+//! @file Tools/src/SampleMaterialVisitor.cpp
//! @brief Implements class SampleMaterialVisitor.
//!
//! @homepage http://apps.jcns.fz-juelich.de/BornAgain
@@ -15,6 +15,14 @@
#include "SampleMaterialVisitor.h"
+#include "ISample.h"
+#include "FormFactors.h"
+#include "MultiLayer.h"
+#include "ParticleDecoration.h"
+#include "Particle.h"
+#include "InterferenceFunction1DParaCrystal.h"
+#include "InterferenceFunction2DParaCrystal.h"
+
#include <algorithm>
SampleMaterialVisitor::SampleMaterialVisitor()
@@ -46,7 +54,7 @@ void SampleMaterialVisitor::visit(const Layer* sample)
{
assert(sample);
- IMaterial *p_material = sample->getMaterial();
+ const IMaterial *p_material = sample->getMaterial();
addMaterial(p_material);
const IDecoration *p_decoration = sample->getDecoration();
if (p_decoration) {
--
GitLab