correct tiff includes; further manual edits

Core/InputOutput/TiffHandler.cpp

@@ -15,7 +15,6 @@
 
 #ifdef BORNAGAIN_TIFF_SUPPORT
 
-#include <tiffio.hxx>
 #include "Utils.h"
 #include "BornAgainNamespace.h"
 #include "TiffHandler.h"

Core/InputOutput/TiffHandler.h

@@ -20,6 +20,7 @@
 
 #include "OutputData.h"
 #include <tiffio.h>
+#include <tiffio.hxx>
 #include <memory>
 
 //! @class TiffHandler
@@ -34,9 +35,9 @@ public:
 
     void read(std::istream& input_stream);
 
-    const OutputData<double> *getOutputData() const;
+    const OutputData<double>* getOutputData() const;
 
-    void write(const OutputData<double> &data, std::ostream &output_stream);
+    void write(const OutputData<double>& data, std::ostream& output_stream);
 
 private:
     void read_header();
@@ -46,13 +47,12 @@ private:
     void close();
     void create_output_data();
 
-    TIFF *m_tiff;
+    TIFF* m_tiff;
     size_t m_width;
     size_t m_height;
-    std::unique_ptr<OutputData<double> > m_data;
+    std::unique_ptr<OutputData<double>> m_data;
 };
 
 #endif // BORNAGAIN_TIFF_SUPPORT
 
 #endif // TIFFHANDLER_H
-

Core/Tools/NumpyUtils.cpp

@@ -14,13 +14,14 @@
 // ************************************************************************** //
 
 
-#include "NumpyUtils.h"
-#include "Exceptions.h"
-
 #ifdef BORNAGAIN_PYTHON
+
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #define PY_ARRAY_UNIQUE_SYMBOL BORNAGAIN_PYTHONAPI_ARRAY
 #define NO_IMPORT_ARRAY
+
+#include "NumpyUtils.h"
+#include "Exceptions.h"
 #include "numpy/arrayobject.h"
 
 PyObject* Utils::createNumpyArray(const std::vector<double>& data)

Core/Tools/OutputData.cpp

@@ -13,15 +13,14 @@
 //
 // ************************************************************************** //
 
-#include "OutputData.h"
-
 #ifdef BORNAGAIN_PYTHON
+
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #define PY_ARRAY_UNIQUE_SYMBOL BORNAGAIN_PYTHONAPI_ARRAY
 #define NO_IMPORT_ARRAY
-#include "numpy/arrayobject.h"
-
 
+#include "OutputData.h"
+#include "numpy/arrayobject.h"
 
 template<>
 PyObject *OutputData<double>::getArray() const