Merge branch 'develop' of apps.jcns.fz-juelich.de:BornAgain into LoggingSystem

Conflicts:
	Core/Fitting/src/FitSuite.cpp

Core/Algorithms/inc/FTDistributions.h

@@ -34,8 +34,11 @@ protected:
 class IFTDistribution2D : public IParameterized
 {
 public:
-    IFTDistribution2D(double omega_x, double omega_y) : m_omega_x(omega_x), m_omega_y(omega_y),
-        m_gamma(0.0), m_delta(M_PI/2.0) {}
+    IFTDistribution2D(double omega_x, double omega_y)
+        : m_omega_x(omega_x)
+        , m_omega_y(omega_y)
+        , m_gamma(0.0)
+        , m_delta(M_PI/2.0) {}
     virtual ~IFTDistribution2D() {}
 
     virtual IFTDistribution2D *clone() const=0;

Core/Fitting/src/FitSuite.cpp

@@ -14,13 +14,11 @@
 // ************************************************************************** //
 
 #include "FitSuite.h"
-#include "Exceptions.h"
 #include "FitParameterLinked.h"
-#include "ParameterPool.h"
-#include "Simulation.h"
 #include "IMinimizer.h"
 #include "ChiSquaredModule.h"
 #include "MessageSvc.h"
+
 #include <boost/bind.hpp>
 
 FitSuite::FitSuite() : m_minimizer(0), m_is_last_iteration(false)

Core/Geometry/inc/Point3D.h

+// ************************************************************************** //
+//
+//  heinzlibs:   Library collection of the Scientific Computing Group at
+//               Heinz Maier-Leibnitz Zentrum (MLZ) Garching
+//
+//  libheinzgeo: Library for three-dimensional Euclidian geometry
+//
+//! @file        Geometry/inc/Beam.Point3D.h
+//! @brief       Defines class Beam.
+//!
+//! @homepage  http://apps.jcns.fz-juelich.de/BornAgain
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2013
+//! @authors   
+//! @authors   C. Durniak, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
 // -*- C++ -*-
 // $Id: Point3D.h,v 1.5 2010/06/16 16:21:27 garren Exp $
 // ---------------------------------------------------------------------------