From f16cead35d0456db1b5cd7bfad7ee65fc2a1f090 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 21 Jul 2015 08:48:27 +0100
Subject: [PATCH 001/223] add ui for the image parameters picker, re #13140
---
.../Tomography/ImageSelectCenterNRegions.ui | 502 ++++++++++++++++++
1 file changed, 502 insertions(+)
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCenterNRegions.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCenterNRegions.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCenterNRegions.ui
new file mode 100644
index 00000000000..9ceb45f9c00
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCenterNRegions.ui
@@ -0,0 +1,502 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>800</width>
+ <height>600</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_5">
+ <property name="margin">
+ <number>3</number>
+ </property>
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QLabel" name="label_8">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Image:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>0/0</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_9">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>none</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton">
+ <property name="text">
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <widget class="QSplitter" name="splitter">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <widget class="QWidget" name="">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
+ </property>
+ <item>
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>2</horstretch>
+ <verstretch>2</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>485</width>
+ <height>537</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>2</horstretch>
+ <verstretch>2</verstretch>
+ </sizepolicy>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>2</horstretch>
+ <verstretch>2</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="QScrollBar" name="horizontalScrollBar">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>260</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Center of rotation</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="margin">
+ <number>3</number>
+ </property>
+ <property name="spacing">
+ <number>4</number>
+ </property>
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Column:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinBox_cor_x">
+ <property name="maximum">
+ <number>999999999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Row:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinBox_cor_y">
+ <property name="maximum">
+ <number>999999999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>108</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_cor">
+ <property name="text">
+ <string>Select</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>260</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Region of interest:</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Top-left</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="spinBox_roi_top_x">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QSpinBox" name="spinBox_roi_top_y">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Bottom-right:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="spinBox_3">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QSpinBox" name="spinBox_4">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>155</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_roi">
+ <property name="text">
+ <string>Select</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>260</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Area for normalization:</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Top-left</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="spinBox_5">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QSpinBox" name="spinBox_6">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>Bottom-right:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="spinBox_7">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QSpinBox" name="spinBox_8">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>98</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_normalization_area">
+ <property name="text">
+ <string>Select</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>68</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
--
GitLab
From 543427e9840b3dc39761e5541c8a8a8c8f637854 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 21 Jul 2015 09:57:28 +0100
Subject: [PATCH 002/223] add more widget names, re #13140
---
.../Tomography/ImageSelectCenterNRegions.ui | 32 +++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCenterNRegions.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCenterNRegions.ui
index 9ceb45f9c00..1f17d128f0b 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCenterNRegions.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCenterNRegions.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
+ <class>ImageSelectCenterNRegions</class>
+ <widget class="QWidget" name="ImageSelectCenterNRegions">
<property name="geometry">
<rect>
<x>0</x>
@@ -42,7 +42,7 @@
</widget>
</item>
<item>
- <widget class="QLineEdit" name="lineEdit">
+ <widget class="QLineEdit" name="lineEdit_img_seq">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Minimum">
<horstretch>0</horstretch>
@@ -74,7 +74,7 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="pushButton">
+ <widget class="QPushButton" name="pushButton_browse_img">
<property name="text">
<string>Browse</string>
</property>
@@ -126,7 +126,7 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <widget class="QLabel" name="label">
+ <widget class="QLabel" name="label_img">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>2</horstretch>
@@ -143,7 +143,7 @@
</widget>
</item>
<item>
- <widget class="QScrollBar" name="horizontalScrollBar">
+ <widget class="QScrollBar" name="horizontalScrollBar_img_stack">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>2</horstretch>
@@ -160,7 +160,7 @@
<widget class="QWidget" name="">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QGroupBox" name="groupBox">
+ <widget class="QGroupBox" name="groupBox_cor">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
@@ -265,7 +265,7 @@
</spacer>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_2">
+ <widget class="QGroupBox" name="groupBox_roi">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
@@ -317,7 +317,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QSpinBox" name="spinBox_3">
+ <widget class="QSpinBox" name="spinBox_roi_bottom_x">
<property name="maximum">
<number>9999</number>
</property>
@@ -327,7 +327,7 @@
</widget>
</item>
<item row="1" column="2">
- <widget class="QSpinBox" name="spinBox_4">
+ <widget class="QSpinBox" name="spinBox_roi_bottom_y">
<property name="maximum">
<number>9999</number>
</property>
@@ -380,7 +380,7 @@
</spacer>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_3">
+ <widget class="QGroupBox" name="groupBox_norm">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
@@ -405,7 +405,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="QSpinBox" name="spinBox_5">
+ <widget class="QSpinBox" name="spinBox_norm_top_x">
<property name="maximum">
<number>9999</number>
</property>
@@ -415,7 +415,7 @@
</widget>
</item>
<item row="0" column="2">
- <widget class="QSpinBox" name="spinBox_6">
+ <widget class="QSpinBox" name="spinBox_norm_top_y">
<property name="maximum">
<number>9999</number>
</property>
@@ -432,7 +432,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QSpinBox" name="spinBox_7">
+ <widget class="QSpinBox" name="spinBox_norm_bottom_x">
<property name="maximum">
<number>9999</number>
</property>
@@ -442,7 +442,7 @@
</widget>
</item>
<item row="1" column="2">
- <widget class="QSpinBox" name="spinBox_8">
+ <widget class="QSpinBox" name="spinBox_norm_bottom_y">
<property name="maximum">
<number>9999</number>
</property>
@@ -467,7 +467,7 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="pushButton_normalization_area">
+ <widget class="QPushButton" name="pushButton_norm_area">
<property name="text">
<string>Select</string>
</property>
--
GitLab
From 6ae5b5a77bb39d412dbb158c2aca54f8f4d111c0 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 21 Jul 2015 09:58:49 +0100
Subject: [PATCH 003/223] rename ui file, re #13140
---
.../{ImageSelectCenterNRegions.ui => ImageSelectCoRAndRegions.ui} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/{ImageSelectCenterNRegions.ui => ImageSelectCoRAndRegions.ui} (100%)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCenterNRegions.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCenterNRegions.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
--
GitLab
From abb2f6ed0954104052fd311208b4e68d76ffa1ae Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 21 Jul 2015 10:05:58 +0100
Subject: [PATCH 004/223] better splitters and update form/class name, re
#13140
---
.../Tomography/ImageSelectCoRAndRegions.ui | 863 +++++++++---------
1 file changed, 428 insertions(+), 435 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
index 1f17d128f0b..a408ff8fb18 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>ImageSelectCenterNRegions</class>
- <widget class="QWidget" name="ImageSelectCenterNRegions">
+ <class>ImageSelectCoRAndRegions</class>
+ <widget class="QWidget" name="ImageSelectCoRAndRegions">
<property name="geometry">
<rect>
<x>0</x>
@@ -20,478 +20,471 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
- <property name="margin">
- <number>3</number>
- </property>
- <property name="spacing">
- <number>3</number>
- </property>
<item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QLabel" name="label_8">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Image:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineEdit_img_seq">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>0/0</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_9">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>none</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_browse_img">
- <property name="text">
- <string>Browse</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="1" column="0">
- <widget class="QSplitter" name="splitter">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <widget class="QSplitter" name="splitter_main_vertical">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Vertical</enum>
</property>
<widget class="QWidget" name="">
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="sizeConstraint">
- <enum>QLayout::SetMinimumSize</enum>
- </property>
- <item>
- <widget class="QScrollArea" name="scrollArea">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>2</horstretch>
- <verstretch>2</verstretch>
- </sizepolicy>
- </property>
- <property name="widgetResizable">
- <bool>true</bool>
- </property>
- <widget class="QWidget" name="scrollAreaWidgetContents">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>485</width>
- <height>537</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>2</horstretch>
- <verstretch>2</verstretch>
- </sizepolicy>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label_img">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>2</horstretch>
- <verstretch>2</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
- <widget class="QScrollBar" name="horizontalScrollBar_img_stack">
+ <widget class="QLabel" name="label_8">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>2</horstretch>
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <property name="text">
+ <string>Image:</string>
</property>
</widget>
</item>
- </layout>
- </widget>
- <widget class="QWidget" name="">
- <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QGroupBox" name="groupBox_cor">
+ <widget class="QLineEdit" name="lineEdit_img_seq">
<property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize">
- <size>
- <width>260</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="title">
- <string>Center of rotation</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_2">
- <property name="margin">
- <number>3</number>
- </property>
- <property name="spacing">
- <number>4</number>
- </property>
- <item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Column:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="spinBox_cor_x">
- <property name="maximum">
- <number>999999999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Row:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="spinBox_cor_y">
- <property name="maximum">
- <number>999999999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="1" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>108</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_cor">
- <property name="text">
- <string>Select</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <property name="text">
+ <string>0/0</string>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::Minimum</enum>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <property name="readOnly">
+ <bool>true</bool>
</property>
- </spacer>
+ </widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_roi">
+ <widget class="QLabel" name="label_9">
<property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize">
- <size>
- <width>260</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="title">
- <string>Region of interest:</string>
+ <property name="text">
+ <string>none</string>
</property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>Top-left</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="spinBox_roi_top_x">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QSpinBox" name="spinBox_roi_top_y">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Bottom-right:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinBox_roi_bottom_x">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QSpinBox" name="spinBox_roi_bottom_y">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>155</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_roi">
- <property name="text">
- <string>Select</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
</widget>
</item>
<item>
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Minimum</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <widget class="QPushButton" name="pushButton_browse_img">
+ <property name="text">
+ <string>Browse</string>
</property>
- </spacer>
+ </widget>
</item>
- <item>
- <widget class="QGroupBox" name="groupBox_norm">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>260</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="title">
- <string>Area for normalization:</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>Top-left</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="spinBox_norm_top_x">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QSpinBox" name="spinBox_norm_top_y">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Bottom-right:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinBox_norm_bottom_x">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QSpinBox" name="spinBox_norm_bottom_y">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_8">
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>98</width>
- <height>20</height>
- </size>
+ </layout>
+ </widget>
+ <widget class="QSplitter" name="splitter_img_horiz">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <widget class="QWidget" name="layoutWidget">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
+ </property>
+ <item>
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>2</horstretch>
+ <verstretch>2</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>494</width>
+ <height>524</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>2</horstretch>
+ <verstretch>2</verstretch>
+ </sizepolicy>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_img">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>2</horstretch>
+ <verstretch>2</verstretch>
+ </sizepolicy>
</property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_norm_area">
<property name="text">
- <string>Select</string>
+ <string/>
</property>
</widget>
</item>
</layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>68</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="QScrollBar" name="horizontalScrollBar_img_stack">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="layoutWidget">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="groupBox_cor">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>260</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Center of rotation</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="margin">
+ <number>3</number>
+ </property>
+ <property name="spacing">
+ <number>4</number>
+ </property>
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Column:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinBox_cor_x">
+ <property name="maximum">
+ <number>999999999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Row:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinBox_cor_y">
+ <property name="maximum">
+ <number>999999999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>108</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_cor">
+ <property name="text">
+ <string>Select</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_roi">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>260</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Region of interest:</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Top-left</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="spinBox_roi_top_x">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QSpinBox" name="spinBox_roi_top_y">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Bottom-right:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="spinBox_roi_bottom_x">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QSpinBox" name="spinBox_roi_bottom_y">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>155</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_roi">
+ <property name="text">
+ <string>Select</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_norm">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>260</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Area for normalization:</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Top-left</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="spinBox_norm_top_x">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QSpinBox" name="spinBox_norm_top_y">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>Bottom-right:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="spinBox_norm_bottom_x">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QSpinBox" name="spinBox_norm_bottom_y">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>98</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_norm_area">
+ <property name="text">
+ <string>Select</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>68</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
</widget>
</widget>
</item>
--
GitLab
From c39f12e5350e1d274c4aae1cfc6dbe44422802fa Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 21 Jul 2015 11:42:39 +0100
Subject: [PATCH 005/223] ui propery updates and add to cmake lists, re #13140
---
.../MantidQt/CustomInterfaces/CMakeLists.txt | 1 +
.../Tomography/ImageSelectCoRAndRegions.ui | 40 +++++++++++++++----
2 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
index 5bcb9945afc..ce3c90c8b33 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -344,6 +344,7 @@ set ( UI_FILES inc/MantidQtCustomInterfaces/DataComparison.ui
inc/MantidQtCustomInterfaces/SANSRunWindow.ui
inc/MantidQtCustomInterfaces/SANSEventSlicing.ui
inc/MantidQtCustomInterfaces/StepScan.ui
+ inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceQtGUI.ui
inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceQtTabSetup.ui
inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceQtTabRun.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
index a408ff8fb18..3a2fb897027 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
@@ -20,12 +20,18 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
+ <property name="margin">
+ <number>3</number>
+ </property>
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item row="0" column="0">
<widget class="QSplitter" name="splitter_main_vertical">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <widget class="QWidget" name="">
+ <widget class="QWidget" name="layoutWidget">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="label_8">
@@ -43,7 +49,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_img_seq">
<property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -82,13 +88,19 @@
</layout>
</widget>
<widget class="QSplitter" name="splitter_img_horiz">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="sizeConstraint">
- <enum>QLayout::SetMinimumSize</enum>
+ <enum>QLayout::SetMaximumSize</enum>
</property>
<item>
<widget class="QScrollArea" name="scrollArea">
@@ -106,8 +118,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>494</width>
- <height>524</height>
+ <width>147</width>
+ <height>529</height>
</rect>
</property>
<property name="sizePolicy">
@@ -149,7 +161,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="layoutWidget">
+ <widget class="QWidget" name="layoutWidget_2">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox_cor">
@@ -187,7 +199,7 @@
<item>
<widget class="QSpinBox" name="spinBox_cor_x">
<property name="maximum">
- <number>999999999</number>
+ <number>9999</number>
</property>
<property name="value">
<number>9999</number>
@@ -204,7 +216,7 @@
<item>
<widget class="QSpinBox" name="spinBox_cor_y">
<property name="maximum">
- <number>999999999</number>
+ <number>9999</number>
</property>
<property name="value">
<number>9999</number>
@@ -274,6 +286,12 @@
<string>Region of interest:</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
+ <property name="margin">
+ <number>3</number>
+ </property>
+ <property name="spacing">
+ <number>2</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
@@ -389,6 +407,12 @@
<string>Area for normalization:</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
+ <property name="margin">
+ <number>3</number>
+ </property>
+ <property name="spacing">
+ <number>2</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
--
GitLab
From 3bc6a5eee0219516b83a794ae1b038426dde06a0 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 22 Jul 2015 16:58:57 +0100
Subject: [PATCH 006/223] ui cosmetic updates, re #13140
---
.../Tomography/TomographyIfaceQtTabRun.ui | 22 ++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceQtTabRun.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceQtTabRun.ui
index ecfc5ff939e..ea670ee8a71 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceQtTabRun.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceQtTabRun.ui
@@ -9,8 +9,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>462</width>
- <height>460</height>
+ <width>671</width>
+ <height>451</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
@@ -74,7 +74,7 @@
<item row="1" column="0">
<widget class="QFrame" name="frame_image">
<property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>2</horstretch>
<verstretch>2</verstretch>
</sizepolicy>
@@ -105,10 +105,16 @@
<rect>
<x>0</x>
<y>0</y>
- <width>151</width>
- <height>180</height>
+ <width>231</width>
+ <height>175</height>
</rect>
</property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<layout class="QGridLayout" name="gridLayout_5">
<property name="margin">
<number>0</number>
@@ -118,6 +124,12 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_image">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string/>
</property>
--
GitLab
From ba2742796ee31cf2611a066393a592a97db56586 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 22 Jul 2015 17:00:35 +0100
Subject: [PATCH 007/223] typo in copy lines, re #13140
---
.../Tomography/ITomographyIfacePresenter.h | 2 +-
.../MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h | 2 +-
.../inc/MantidQtCustomInterfaces/Tomography/TomoPathsConfig.h | 2 +-
.../inc/MantidQtCustomInterfaces/Tomography/TomoRecToolConfig.h | 2 +-
.../Tomography/TomoReconToolsUserSettings.h | 2 +-
.../MantidQtCustomInterfaces/Tomography/TomoToolConfigDialog.h | 2 +-
.../MantidQtCustomInterfaces/Tomography/TomographyIfaceModel.h | 2 +-
.../Tomography/TomographyIfacePresenter.h | 2 +-
.../Tomography/ToolConfigAstraToolbox.h | 2 +-
.../inc/MantidQtCustomInterfaces/Tomography/ToolConfigCustom.h | 2 +-
.../inc/MantidQtCustomInterfaces/Tomography/ToolConfigTomoPy.h | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ITomographyIfacePresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ITomographyIfacePresenter.h
index 77f46747a07..be9585bc25e 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ITomographyIfacePresenter.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ITomographyIfacePresenter.h
@@ -9,7 +9,7 @@ Interface for what the presenter of the tomography GUI needs to
implement. Here the term presenter is used as in the MVP
(Model-View-Presenter) pattern. The (passive) view will use this.
-Copyright © 2014,205 ISIS Rutherford Appleton Laboratory, NScD
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
This file is part of Mantid.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h
index 3802a4b2b8c..0130f027370 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h
@@ -15,7 +15,7 @@ Tomography GUI. Base class / interface for the view of the tomo GUI
specific functionality/dependencies are added in a class derived from
this.
-Copyright © 2014,205 ISIS Rutherford Appleton Laboratory, NScD
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
This file is part of Mantid.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoPathsConfig.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoPathsConfig.h
index 92400342f4a..ee3becb0206 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoPathsConfig.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoPathsConfig.h
@@ -18,7 +18,7 @@ that define where the data for a particular dataset can be found, and
that are normally required to run reconstruction tools but also pre-
and post- processing steps.
-Copyright © 2014,205 ISIS Rutherford Appleton Laboratory, NScD
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
This file is part of Mantid.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoRecToolConfig.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoRecToolConfig.h
index 1ff91bd3933..256518618dc 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoRecToolConfig.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoRecToolConfig.h
@@ -12,7 +12,7 @@ is under development, and as it is not necessarily related to custom
interfaces this class and some derived ones might be moved out of
here.
-Copyright © 2014,205 ISIS Rutherford Appleton Laboratory, NScD
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
This file is part of Mantid.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoReconToolsUserSettings.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoReconToolsUserSettings.h
index 25857af9e1a..a6047a19de1 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoReconToolsUserSettings.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoReconToolsUserSettings.h
@@ -13,7 +13,7 @@ namespace CustomInterfaces {
/**
Settings for a set of tomographic reconstruction tools supported.
-Copyright © 2014,205 ISIS Rutherford Appleton Laboratory, NScD
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
This file is part of Mantid.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialog.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialog.h
index 64cfc7a36ae..5196ca49bef 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialog.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialog.h
@@ -15,7 +15,7 @@ namespace CustomInterfaces {
Third party tool configuration dialog(s) for the tomographic reconstruction
GUI.
-Copyright © 2014,205 ISIS Rutherford Appleton Laboratory, NScD
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
This file is part of Mantid.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceModel.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceModel.h
index a915f0c9ed1..4bd8001060f 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceModel.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceModel.h
@@ -20,7 +20,7 @@ Tomography GUI. Model for the interface (as in the MVP
signals from this model should always be handled through the presenter
and never go directly to the view.
-Copyright © 2014,205 ISIS Rutherford Appleton Laboratory, NScD
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
This file is part of Mantid.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h
index f37b5569d58..ec29c07091b 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h
@@ -23,7 +23,7 @@ Tomography GUI. Presenter for the GUI (as in the MVP
signals from the model should always be handled through this presenter
and never go directly to the view, and viceversa.
-Copyright © 2014,205 ISIS Rutherford Appleton Laboratory, NScD
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
This file is part of Mantid.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h
index 80d2b62a641..d0399fc1ff9 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h
@@ -15,7 +15,7 @@ Configuration of a third party tomographic reconstruction tool
specialized for the Astra Toolbox tomographic reconstruction tool
(C++, CUDA): Astra Toolbox <http://sourceforge.net/p/astra-toolbox/wiki/Home/
-Copyright © 2014,205 ISIS Rutherford Appleton Laboratory, NScD
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
This file is part of Mantid.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigCustom.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigCustom.h
index fe02d914dc2..98c947dc793 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigCustom.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigCustom.h
@@ -18,7 +18,7 @@ custom interfaces might be moved out of here. Tools of other type
might be added, and then this should not be a sublcass of
TomoRecToolConfig but of a more general ToolConfig class.
-Copyright © 2014,205 ISIS Rutherford Appleton Laboratory, NScD
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
This file is part of Mantid.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigTomoPy.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigTomoPy.h
index 56eec90cbd5..e0bd068aa46 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigTomoPy.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigTomoPy.h
@@ -14,7 +14,7 @@ Third party tomographic reconstruction tool configuration class
specialized for TomoPy (Python + C++):
https://www1.aps.anl.gov/Science/Scientific-Software/TomoPy
-Copyright © 2014,205 ISIS Rutherford Appleton Laboratory, NScD
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
This file is part of Mantid.
--
GitLab
From dfdef627066b97b9e37d4d32697771a66263fc42 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 23 Jul 2015 17:56:31 +0100
Subject: [PATCH 008/223] add ImageCoR view-presenter files in cmake list, re
#13140
---
.../MantidQt/CustomInterfaces/CMakeLists.txt | 9 +++
.../Tomography/IImageCoRPresenter.h | 72 +++++++++++++++++
.../Tomography/IImageCoRView.h | 68 ++++++++++++++++
.../Tomography/ImageCoRPresenter.h | 77 +++++++++++++++++++
.../Tomography/ImageCoRViewQtGUI.h | 76 ++++++++++++++++++
.../Tomography/ImageStackPreParams.h | 58 ++++++++++++++
.../Tomography/TomographyIfaceViewQtGUI.h | 5 +-
.../Tomography/TomographyIfaceViewQtGUI.cpp | 18 +++++
8 files changed, 382 insertions(+), 1 deletion(-)
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
index ce3c90c8b33..c4c896b6895 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -84,6 +84,9 @@ set ( SRC_FILES
src/SANSPlotSpecial.cpp
src/SANSRunWindow.cpp
src/StepScan.cpp
+ src/Tomography/ImageCoRPresenter.cpp
+ src/Tomography/ImageCoRViewQtGUI.cpp
+ src/Tomography/ImageStackPreParams.cpp
src/Tomography/SavuConfigDialog.cpp
src/Tomography/TomographyIfaceModel.cpp
src/Tomography/TomographyIfacePresenter.cpp
@@ -191,6 +194,11 @@ set ( INC_FILES
inc/MantidQtCustomInterfaces/SANSPlotSpecial.h
inc/MantidQtCustomInterfaces/SANSRunWindow.h
inc/MantidQtCustomInterfaces/StepScan.h
+ inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
+ inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
+ inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
+ inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
+ inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
inc/MantidQtCustomInterfaces/Tomography/ITomographyIfacePresenter.h
inc/MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h
inc/MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h
@@ -287,6 +295,7 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h
inc/MantidQtCustomInterfaces/SANSEventSlicing.h
inc/MantidQtCustomInterfaces/SANSDiagnostics.h
inc/MantidQtCustomInterfaces/StepScan.h
+ inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
inc/MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h
inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h
inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialog.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
new file mode 100644
index 00000000000..60c2418c458
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
@@ -0,0 +1,72 @@
+#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORPRESENTER_H_
+#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORPRESENTER_H_
+
+namespace MantidQt {
+namespace CustomInterfaces {
+
+/**
+Presenter for the widget that handles the selection of the center of
+rotation, region of interest, region for normalization, etc. from an
+image or stack of images. This is the abstract base class / interface
+for the presenter (in the sense of the MVP pattern). The name
+ImageCoR refers to the Center-of-Rotation, which is the most basic
+parameter that users can select via this widget. This class is
+QtGUI-free as it uses the interface of the view. The model is simply
+the ImageStackPreParams class which holds coordinates selected by the
+user.
+
+Copyright © 2015 ISIS Rutherford Appleton Laboratory, NScD
+Oak Ridge National Laboratory & European Spallation Source
+
+This file is part of Mantid.
+
+Mantid is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Mantid is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+File change history is stored at: <https://github.com/mantidproject/mantid>
+Code Documentation is available at: <http://doxygen.mantidproject.org>
+*/
+class IImageCoRPresenter {
+
+public:
+ IImageCoRPresenter(){};
+ virtual ~IImageCoRPresenter(){};
+
+ /// These are user actions, triggered from the (passive) view, that need
+ /// handling by the presenter
+ enum Notification {
+ Init, ///< interface is initing (set, defaults, etc.)
+ BrowseImgOrStack, ///< User browses for an image file or stack
+ NewImgOrStack, ///< A new image or stack needs to be loaded
+ SelectCoR, ///< Start picking of the center of rotation
+ SelectROI, ///< Start selection of the region of interest
+ SelectNormalization, ///< Start selection of the normalization region
+ FinishedCoR, ///< A CoR has been picked
+ FinishedROI, ///< The ROI is selected
+ FinishedNormalization ///< The normalization regions is selected
+ };
+
+ /**
+ * Notifications sent through the presenter when something changes
+ * in the view. This plays the role of signals emitted by the view
+ * to this presenter.
+ *
+ * @param notif Type of notification to process.
+ */
+ virtual void notify(IImageCoRPresenter::Notification notif) = 0;
+};
+
+} // namespace CustomInterfaces
+} // namespace MantidQt
+
+#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORPRESENTER_H_
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
new file mode 100644
index 00000000000..21e81ddb1b4
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
@@ -0,0 +1,68 @@
+#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORVIEW_H_
+#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORVIEW_H_
+
+#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
+
+namespace MantidQt {
+namespace CustomInterfaces {
+
+/**
+Widget to handle the selection of the center of rotation, region of
+interest, region for normalization, etc. from an image or stack of
+images. This is the abstract base class / interface for the view of
+this widget (in the sense of the MVP pattern). The name ImageCoR
+refers to the Center-of-Rotation, which is the most basic parameter
+that users can select via this widget. This class is Qt-free. Qt
+specific functionality and dependencies are added in a class derived
+from this.
+
+Copyright © 2015 ISIS Rutherford Appleton Laboratory, NScD
+Oak Ridge National Laboratory & European Spallation Source
+
+This file is part of Mantid.
+
+Mantid is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Mantid is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+File change history is stored at: <https://github.com/mantidproject/mantid>
+Code Documentation is available at: <http://doxygen.mantidproject.org>
+*/
+class IImageCoRView {
+
+public:
+ IImageCoRView(){};
+ virtual ~IImageCoRView(){};
+
+ /**
+ * Sets the user selection. This should guarantee that all widgets
+ * are updated (including spin boxes, image, slider through the
+ * image stack, etc.
+ *
+ * @param tools identifiers of the tools that can or could be run.
+ * Order matters
+ *
+ */
+ virtual void initParams(ImageStackPreParams ¶ms) const;
+
+ /**
+ * Provides the current user selection.
+ *
+ * @return ...
+ */
+ virtual ImageStackPreParams userSelection() const;
+};
+
+} // namespace CustomInterfaces
+} // namespace MantidQt
+
+#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORVIEW_H_
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
new file mode 100644
index 00000000000..e14671fcc39
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
@@ -0,0 +1,77 @@
+#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORPRESENTER_H_
+#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORPRESENTER_H_
+
+#include "MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h"
+#include "MantidQtCustomInterfaces/Tomography/IImageCoRView.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
+
+#include <boost/scoped_ptr.hpp>
+
+namespace MantidQt {
+namespace CustomInterfaces {
+
+/**
+Presenter for the image center of rotation (and other parameters)
+selection widget. In principle, in a strict MVP setup, signals from
+the model should always be handled through this presenter and never go
+directly to the view, and viceversa.
+
+Copyright © 2015 ISIS Rutherford Appleton Laboratory, NScD
+Oak Ridge National Laboratory & European Spallation Source
+
+This file is part of Mantid.
+
+Mantid is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Mantid is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+File change history is stored at: <https://github.com/mantidproject/mantid>
+Code Documentation is available at: <http://doxygen.mantidproject.org>
+*/
+class DLLExport ImageCoRPresenter : public IImageCoRPresenter {
+
+public:
+ /// Default constructor - normally used from the concrete view
+ ImageCoRPresenter(IImageCoRView *view);
+ virtual ~ImageCoRPresenter();
+
+ virtual void notify(IImageCoRPresenter::Notification notif);
+
+protected:
+ void initialize();
+
+ /// clean shut down of model, view, etc.
+ void cleanup();
+
+ void processInit();
+ void processBrowseImg();
+ void processNewImg();
+ void processSelectCoR();
+ void processSelectROI();
+ void processSelectNormalization();
+ void processFinishedCoR();
+ void processFinishedROI();
+ void processFinishedNormalization();
+
+private:
+ /// Associated view for this presenter (MVP pattern)
+ IImageCoRView *const m_view;
+
+ /// Associated model for this presenter (MVP pattern). This is just
+ /// a set of coordinates
+ const boost::scoped_ptr<ImageStackPreParams> m_model;
+};
+
+} // namespace CustomInterfaces
+} // namespace MantidQt
+
+#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORPRESENTER_H_
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
new file mode 100644
index 00000000000..1fc7d02f826
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
@@ -0,0 +1,76 @@
+#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTGUI_H_
+#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTGUI_H_
+
+#include "MantidKernel/System.h"
+#include "MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h"
+#include "MantidQtCustomInterfaces/Tomography/IImageCoRView.h"
+
+#include "ui_ImageSelectCoRAndRegions.h"
+
+#include <boost/scoped_ptr.hpp>
+
+// forward declarations for Qt
+class QWidget;
+
+namespace MantidQt {
+namespace CustomInterfaces {
+
+/**
+Qt-based view of the widget to handle the selection of the center of
+rotation, region of interest, region for normalization, etc. from an
+image or stack of images. Provides a concrete view for the graphical
+interface for tomography functionality in Mantid. This view is
+Qt-based and it is probably the only one that will be implemented in a
+foreseeable horizon. The interface of this class is given by
+IImageCoRView so that it fits in the MVP (Model-View-Presenter) design
+of the ImageCoR widget.
+
+Copyright © 2015 ISIS Rutherford Appleton Laboratory, NScD
+Oak Ridge National Laboratory & European Spallation Source
+
+This file is part of Mantid.
+
+Mantid is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Mantid is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+File change history is stored at: <https://github.com/mantidproject/mantid>
+Code Documentation is available at: <http://doxygen.mantidproject.org>
+*/
+class DLLExport ImageCoRViewQtGUI : public QWidget,
+ public IImageCoRView {
+ Q_OBJECT
+
+public:
+ ImageCoRViewQtGUI(QWidget *parent = 0);
+ virtual ~ImageCoRViewQtGUI(){};
+
+ void initParams(ImageStackPreParams ¶ms) const;
+
+ ImageStackPreParams userSelection() const;
+
+protected:
+ void initLayout();
+
+private:
+ Ui::ImageSelectCoRAndRegions m_ui;
+
+ boost::scoped_ptr<ImageStackPreParams> m_params;
+
+ // presenter as in the model-view-presenter
+ boost::scoped_ptr<IImageCoRPresenter> m_presenter;
+};
+
+} // namespace CustomInterfaces
+} // namespace MantidQt
+
+#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTGUI_H_
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
new file mode 100644
index 00000000000..255428bae87
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
@@ -0,0 +1,58 @@
+#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGESTACKPREPARAMS_H_
+#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGESTACKPREPARAMS_H_
+
+#include "MantidKernel/System.h"
+
+namespace MantidQt {
+namespace CustomInterfaces {
+
+/**
+This holds parameters for pre-processing images or stacks of images
+for tomographic reconstruction. These parameters are used in different
+pre-processing steps in the tomographic reconstruction pipeline, and
+also for the reconstruction algorithms (iternative methods, FBP,
+etc.).
+
+The parameters include:
+- center of rotation
+- region of interest (clip from original or raw images)
+- region for normalization (where the beam is not blocked by any sample
+ object throughout the stack of images) other parameters describing
+ the stack of images:
+
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
+Oak Ridge National Laboratory & European Spallation Source
+
+This file is part of Mantid.
+
+Mantid is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Mantid is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+File change history is stored at: <https://github.com/mantidproject/mantid>
+Code Documentation is available at: <http://doxygen.mantidproject.org>
+*/
+class ImageStackPreParams {
+public:
+
+ ImageStackPreParams();
+
+ size_t cor;
+ size_t roi;
+ size_t normalizationRegion;
+ size_t medianFilter;
+};
+
+} // namespace CustomInterfaces
+} // namespace MantidQt
+
+#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGESTACKPREPARAMS_H_
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h
index 010abf23fbe..fe28e3e5a03 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h
@@ -9,6 +9,8 @@
#include "MantidQtCustomInterfaces/Tomography/ITomographyIfacePresenter.h"
#include "MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h"
#include "MantidQtCustomInterfaces/Tomography/TomoToolConfigDialog.h"
+
+#include "ui_ImageSelectCoRAndRegions.h"
#include "ui_TomographyIfaceQtGUI.h"
#include "ui_TomographyIfaceQtTabSetup.h"
#include "ui_TomographyIfaceQtTabRun.h"
@@ -30,7 +32,7 @@ in a foreseeable horizon. The interface of this class is given by
ITomographyIfaceView so that it fits in the MVP (Model-View-Presenter)
design of the tomography GUI.
-Copyright © 2014,205 ISIS Rutherford Appleton Laboratory, NScD
+Copyright © 2014,2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
This file is part of Mantid.
@@ -213,6 +215,7 @@ private:
// but they could be separate dialogs, widgets, etc.
Ui::TomographyIfaceQtTabSetup m_uiTabSetup;
Ui::TomographyIfaceQtTabRun m_uiTabRun;
+ Ui::ImageSelectCoRAndRegions m_uiTabCoR;
/// Tool specific setup dialogs
Ui::TomoToolConfigAstra m_uiAstra;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
index 10149895f1b..5298cf853d2 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
@@ -72,6 +72,24 @@ void TomographyIfaceViewQtGUI::initLayout() {
m_uiTabSetup.setupUi(tab2w);
m_ui.tabMain->addTab(tab2w, QString("Setup"));
+ QWidget *tab3w = new QWidget(m_ui.tabMain);
+ m_uiTabCoR.setupUi(tab3w);
+ m_ui.tabMain->addTab(tab3w, QString("Center && select"));
+ QList<int> sizes;
+ sizes.push_back(700);
+ sizes.push_back(100);
+ m_uiTabCoR.splitter_img_horiz->setSizes(sizes);
+ m_uiTabCoR.horizontalScrollBar_img_stack->setEnabled(false);
+
+ QWidget *tab4w = new QWidget();
+ m_ui.tabMain->addTab(tab4w, QString("Filters"));
+
+ QWidget *tab5w = new QWidget();
+ m_ui.tabMain->addTab(tab5w, QString("Visualize"));
+
+ QWidget *tab6w = new QWidget();
+ m_ui.tabMain->addTab(tab6w, QString("Convert"));
+
readSettings();
// basic UI setup
--
GitLab
From 68517b5533fc98dc57645b3ad7e1b34a1b1d7281 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 24 Jul 2015 08:16:51 +0100
Subject: [PATCH 009/223] add stub implementation files, re #13140
---
.../src/Tomography/ImageCoRPresenter.cpp | 40 +++++++++++++++++++
.../src/Tomography/ImageCoRViewQtGUI.cpp | 30 ++++++++++++++
.../src/Tomography/ImageStackPreParams.cpp | 13 ++++++
3 files changed, 83 insertions(+)
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
new file mode 100644
index 00000000000..80931c7e265
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -0,0 +1,40 @@
+#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
+#include "MantidQtCustomInterfaces/Tomography/IImageCoRView.h"
+
+using namespace MantidQt::CustomInterfaces;
+
+namespace MantidQt {
+namespace CustomInterfaces {
+
+ImageCoRPresenter::ImageCoRPresenter(IImageCoRView *view)
+ : m_view(view), m_model(new ImageStackPreParams()) {
+ if (!m_view) {
+ throw std::runtime_error("Severe inconsistency found. Presenter created "
+ "with an empty/null view (tomography interface). "
+ "Cannot continue.");
+ }
+}
+
+ImageCoRPresenter::~ImageCoRPresenter() { cleanup(); }
+
+void ImageCoRPresenter::processInit() {}
+
+void ImageCoRPresenter::processBrowseImg() {}
+
+void ImageCoRPresenter::processNewImg() {}
+
+void ImageCoRPresenter::processSelectCoR() {}
+
+void ImageCoRPresenter::processSelectROI() {}
+
+void ImageCoRPresenter::processSelectNormalization() {}
+
+void ImageCoRPresenter::processFinishedCoR() {}
+
+void ImageCoRPresenter::processFinishedROI() {}
+
+void ImageCoRPresenter::processFinishedNormalization() {}
+
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
new file mode 100644
index 00000000000..9a7d57ac261
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
@@ -0,0 +1,30 @@
+#include "MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
+
+using namespace MantidQt::CustomInterfaces;
+
+#include <QFileDialog>
+
+namespace MantidQt {
+namespace CustomInterfaces {
+
+ImageCoRViewQtGUI::ImageCoRViewQtGUI(QWidget *parent)
+ : QWidget(parent), IImageCoRView(), m_presenter(NULL) {
+ initLayout();
+}
+
+void ImageCoRViewQtGUI::initLayout() {
+ // setup container ui
+ m_ui.setupUi(this);
+
+ // presenter that knows how to handle a IImageCoRView should take care
+ // of all the logic. Note the view needs to now the concrete presenter here
+ m_presenter.reset(new ImageCoRPresenter(this));
+
+ // it will know what compute resources and tools we have available:
+ // This view doesn't even know the names of compute resources, etc.
+ m_presenter->notify(ImageCoRPresenter::Init);
+}
+
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp
new file mode 100644
index 00000000000..60d8a1e2bd0
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp
@@ -0,0 +1,13 @@
+#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
+
+using namespace MantidQt::CustomInterfaces;
+
+namespace MantidQt {
+namespace CustomInterfaces {
+
+ImageStackPreParams::ImageStackPreParams()
+{
+
+}
+} // namespace CustomInterfaces
+} // namespace MantidQt
--
GitLab
From 270560a760833ad44d4843666bfd07afb68e05db Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 24 Jul 2015 08:45:03 +0100
Subject: [PATCH 010/223] add stub implementation files, re #13140
---
.../MantidQtCustomInterfaces/Tomography/IImageCoRView.h | 6 +++---
.../Tomography/ImageCoRPresenter.h | 2 +-
.../Tomography/ImageCoRViewQtGUI.h | 7 +++----
.../CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp | 4 ++++
.../CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp | 8 ++++++++
5 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
index 21e81ddb1b4..5100784ed5c 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
@@ -52,14 +52,14 @@ public:
* Order matters
*
*/
- virtual void initParams(ImageStackPreParams ¶ms) const;
+ virtual void initParams(ImageStackPreParams ¶ms) = 0;
/**
* Provides the current user selection.
*
- * @return ...
+ * @return parameters as set/edited by the user.
*/
- virtual ImageStackPreParams userSelection() const;
+ virtual ImageStackPreParams userSelection() const = 0;
};
} // namespace CustomInterfaces
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
index e14671fcc39..3aa8a63db93 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
@@ -44,7 +44,7 @@ public:
ImageCoRPresenter(IImageCoRView *view);
virtual ~ImageCoRPresenter();
- virtual void notify(IImageCoRPresenter::Notification notif);
+ void notify(IImageCoRPresenter::Notification notif);
protected:
void initialize();
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
index 1fc7d02f826..cadcc9115ea 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
@@ -46,15 +46,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DLLExport ImageCoRViewQtGUI : public QWidget,
- public IImageCoRView {
+class DLLExport ImageCoRViewQtGUI : public QWidget, public IImageCoRView {
Q_OBJECT
public:
ImageCoRViewQtGUI(QWidget *parent = 0);
virtual ~ImageCoRViewQtGUI(){};
- void initParams(ImageStackPreParams ¶ms) const;
+ void initParams(ImageStackPreParams ¶ms);
ImageStackPreParams userSelection() const;
@@ -64,7 +63,7 @@ protected:
private:
Ui::ImageSelectCoRAndRegions m_ui;
- boost::scoped_ptr<ImageStackPreParams> m_params;
+ ImageStackPreParams m_params;
// presenter as in the model-view-presenter
boost::scoped_ptr<IImageCoRPresenter> m_presenter;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
index 80931c7e265..16b2f0fce0b 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -18,6 +18,10 @@ ImageCoRPresenter::ImageCoRPresenter(IImageCoRView *view)
ImageCoRPresenter::~ImageCoRPresenter() { cleanup(); }
+void ImageCoRPresenter::cleanup() {}
+
+void ImageCoRPresenter::notify(Notification notif) {}
+
void ImageCoRPresenter::processInit() {}
void ImageCoRPresenter::processBrowseImg() {}
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
index 9a7d57ac261..c78e2ad90ec 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
@@ -26,5 +26,13 @@ void ImageCoRViewQtGUI::initLayout() {
m_presenter->notify(ImageCoRPresenter::Init);
}
+void ImageCoRViewQtGUI::initParams(ImageStackPreParams ¶ms) {
+ m_params = params;
+}
+
+ImageStackPreParams ImageCoRViewQtGUI::userSelection() const {
+ return m_params;
+}
+
} // namespace CustomInterfaces
} // namespace MantidQt
--
GitLab
From 0f90f4b41e22640b1bc14dcee13eb8b57dd6bc6d Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 24 Jul 2015 12:25:01 +0100
Subject: [PATCH 011/223] add open file/stack, re #13140
---
.../Tomography/IImageCoRView.h | 5 +++
.../Tomography/ImageCoRViewQtGUI.h | 9 +++++
.../src/Tomography/ImageCoRViewQtGUI.cpp | 40 +++++++++++++++++++
3 files changed, 54 insertions(+)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
index 5100784ed5c..709687c724a 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
@@ -60,6 +60,11 @@ public:
* @return parameters as set/edited by the user.
*/
virtual ImageStackPreParams userSelection() const = 0;
+
+ /**
+ *
+ */
+ virtual void showImgOrStack() = 0;
};
} // namespace CustomInterfaces
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
index cadcc9115ea..e51d0687f85 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
@@ -57,13 +57,22 @@ public:
ImageStackPreParams userSelection() const;
+ void showImgOrStack();
+
protected:
void initLayout();
+ void showImg();
+
+private slots:
+ void browseImgClicked();
private:
+ void setupConnections();
+
Ui::ImageSelectCoRAndRegions m_ui;
ImageStackPreParams m_params;
+ std::string m_imgPath;
// presenter as in the model-view-presenter
boost::scoped_ptr<IImageCoRPresenter> m_presenter;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
index c78e2ad90ec..180746c68cf 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
@@ -1,6 +1,8 @@
#include "MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h"
#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
+#include "MantidQtAPI/AlgorithmInputHistory.h"
+
using namespace MantidQt::CustomInterfaces;
#include <QFileDialog>
@@ -17,6 +19,8 @@ void ImageCoRViewQtGUI::initLayout() {
// setup container ui
m_ui.setupUi(this);
+ setupConnections();
+
// presenter that knows how to handle a IImageCoRView should take care
// of all the logic. Note the view needs to now the concrete presenter here
m_presenter.reset(new ImageCoRPresenter(this));
@@ -26,6 +30,12 @@ void ImageCoRViewQtGUI::initLayout() {
m_presenter->notify(ImageCoRPresenter::Init);
}
+void ImageCoRViewQtGUI::setupConnections() {
+ // 'browse' buttons
+ connect(m_ui.pushButton_browse_img, SIGNAL(released()), this,
+ SLOT(browseImgClicked()));
+}
+
void ImageCoRViewQtGUI::initParams(ImageStackPreParams ¶ms) {
m_params = params;
}
@@ -34,5 +44,35 @@ ImageStackPreParams ImageCoRViewQtGUI::userSelection() const {
return m_params;
}
+void ImageCoRViewQtGUI::showImgOrStack() {}
+void ImageCoRViewQtGUI::showImg() {}
+
+void ImageCoRViewQtGUI::browseImgClicked() {
+ m_presenter->notify(IImageCoRPresenter::BrowseImgOrStack);
+ // get path
+ QString fitsStr = QString("Supported formats: FITS, TIFF and PNG "
+ "(*.fits *.fit *.tiff *.tif *.png);;"
+ "FITS, Flexible Image Transport System images "
+ "(*.fits *.fit);;"
+ "TIFF, Tagged Image File Format "
+ "(*.tif *.tiff);;"
+ "PNG, Portable Network Graphics "
+ "(*.png);;"
+ "Other extensions/all files (*.*)");
+ QString prevPath =
+ MantidQt::API::AlgorithmInputHistory::Instance().getPreviousDirectory();
+ QString path(QFileDialog::getOpenFileName(this, tr("Open image file"),
+ prevPath, fitsStr));
+ if (!path.isEmpty()) {
+ MantidQt::API::AlgorithmInputHistory::Instance().setPreviousDirectory(
+ QFileInfo(path).absoluteDir().path());
+ } else {
+ return;
+ }
+
+ m_imgPath = path.toStdString();
+ m_presenter->notify(IImageCoRPresenter::NewImgOrStack);
+}
+
} // namespace CustomInterfaces
} // namespace MantidQt
--
GitLab
From 3eed10aa2030815ba33480566a878e791b5e9fba Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 6 Aug 2015 17:00:47 +0100
Subject: [PATCH 012/223] ui update, use ImageCoR widget from the main GUI, re
#13140
---
.../Tomography/ImageSelectCoRAndRegions.ui | 8 ++++----
.../Tomography/ImageStackPreParams.h | 9 +++++----
.../Tomography/TomographyIfaceViewQtGUI.h | 6 ++++--
.../src/Tomography/TomographyIfaceViewQtGUI.cpp | 11 +++--------
4 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
index 3a2fb897027..88a5b85db6b 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
@@ -34,7 +34,7 @@
<widget class="QWidget" name="layoutWidget">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
- <widget class="QLabel" name="label_8">
+ <widget class="QLabel" name="label_img_seq">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
@@ -66,7 +66,7 @@
</widget>
</item>
<item>
- <widget class="QLabel" name="label_9">
+ <widget class="QLabel" name="label_img_name">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>1</horstretch>
@@ -118,8 +118,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>147</width>
- <height>529</height>
+ <width>153</width>
+ <height>526</height>
</rect>
</property>
<property name="sizePolicy">
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
index 255428bae87..ca65086c21f 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
@@ -2,6 +2,7 @@
#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGESTACKPREPARAMS_H_
#include "MantidKernel/System.h"
+#include "MantidKernel/V2D.h"
namespace MantidQt {
namespace CustomInterfaces {
@@ -46,10 +47,10 @@ public:
ImageStackPreParams();
- size_t cor;
- size_t roi;
- size_t normalizationRegion;
- size_t medianFilter;
+ Mantid::Kernel::V2D cor;
+ Mantid::Kernel::V2D roi;
+ Mantid::Kernel::V2D normalizationRegion; //< also known as 'air'
+ bool medianFilter;
};
} // namespace CustomInterfaces
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h
index fe28e3e5a03..3f78f8feafe 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h
@@ -178,8 +178,9 @@ private:
void processPathBrowseClick(QLineEdit *le, std::string &data);
// Begin of Savu related functionality. This will grow and will need
- // separation
-
+ // separation. They should find a better place to live.
+ ///@name Savu related methods
+ ///@{
/// to load plugins (savu classification / API)
void loadAvailablePlugins();
@@ -203,6 +204,7 @@ private:
const std::string &name);
std::string pluginParamValString(const Json::Value &jsonVal,
const std::string &name);
+ ///@}
static size_t g_nameSeqNo;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
index 8c88634d3f2..41096af276e 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
@@ -3,6 +3,7 @@
#include "MantidQtAPI/AlgorithmInputHistory.h"
#include "MantidQtAPI/AlgorithmRunner.h"
#include "MantidQtAPI/HelpWindow.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h"
#include "MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h"
#include "MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h"
#include "MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h"
@@ -72,14 +73,8 @@ void TomographyIfaceViewQtGUI::initLayout() {
m_uiTabSetup.setupUi(tab2w);
m_ui.tabMain->addTab(tab2w, QString("Setup"));
- QWidget *tab3w = new QWidget(m_ui.tabMain);
- m_uiTabCoR.setupUi(tab3w);
- m_ui.tabMain->addTab(tab3w, QString("Center && select"));
- QList<int> sizes;
- sizes.push_back(700);
- sizes.push_back(100);
- m_uiTabCoR.splitter_img_horiz->setSizes(sizes);
- m_uiTabCoR.horizontalScrollBar_img_stack->setEnabled(false);
+ ImageCoRViewQtGUI *tab3w = new ImageCoRViewQtGUI(m_ui.tabMain);
+ m_ui.tabMain->addTab(tab3w, QString("Center && regions"));
QWidget *tab4w = new QWidget();
m_ui.tabMain->addTab(tab4w, QString("Filters"));
--
GitLab
From d607d019846bd3cd99cabde7f09b2efb636543a2 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 6 Aug 2015 17:01:30 +0100
Subject: [PATCH 013/223] simple and quick display of image stacks, re #13140
---
.../src/Tomography/ImageCoRPresenter.cpp | 42 ++++-
.../src/Tomography/ImageCoRViewQtGUI.cpp | 172 +++++++++++++++++-
2 files changed, 211 insertions(+), 3 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
index 16b2f0fce0b..b3f0ad1437d 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -20,7 +20,47 @@ ImageCoRPresenter::~ImageCoRPresenter() { cleanup(); }
void ImageCoRPresenter::cleanup() {}
-void ImageCoRPresenter::notify(Notification notif) {}
+void ImageCoRPresenter::notify(Notification notif) {
+
+ switch (notif) {
+
+ case IImageCoRPresenter::Init:
+ processInit();
+ break;
+
+ case IImageCoRPresenter::BrowseImgOrStack:
+ processBrowseImg();
+ break;
+
+ case IImageCoRPresenter::NewImgOrStack:
+ processNewImg();
+ break;
+
+ case IImageCoRPresenter::SelectCoR:
+ processSelectCoR();
+ break;
+
+ case IImageCoRPresenter::SelectROI:
+ processSelectROI();
+ break;
+
+ case IImageCoRPresenter::SelectNormalization:
+ processSelectNormalization();
+ break;
+
+ case IImageCoRPresenter::FinishedCoR:
+ processFinishedCoR();
+ break;
+
+ case IImageCoRPresenter::FinishedROI:
+ processFinishedROI();
+ break;
+
+ case IImageCoRPresenter::FinishedNormalization:
+ processFinishedNormalization();
+ break;
+ }
+}
void ImageCoRPresenter::processInit() {}
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
index 180746c68cf..0baec7c49bf 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
@@ -1,11 +1,17 @@
+#include "MantidAPI/MatrixWorkspace.h"
+#include "MantidAPI/WorkspaceGroup.h"
+#include "MantidQtAPI/AlgorithmInputHistory.h"
+#include "MantidQtAPI/AlgorithmRunner.h"
+
#include "MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h"
#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
-
+using namespace Mantid::API;
using namespace MantidQt::CustomInterfaces;
#include <QFileDialog>
+#include <QMessageBox>
+#include <QPainter>
namespace MantidQt {
namespace CustomInterfaces {
@@ -19,6 +25,12 @@ void ImageCoRViewQtGUI::initLayout() {
// setup container ui
m_ui.setupUi(this);
+ QList<int> sizes;
+ sizes.push_back(700);
+ sizes.push_back(100);
+ m_ui.splitter_img_horiz->setSizes(sizes);
+ m_ui.horizontalScrollBar_img_stack->setEnabled(false);
+
setupConnections();
// presenter that knows how to handle a IImageCoRView should take care
@@ -31,6 +43,7 @@ void ImageCoRViewQtGUI::initLayout() {
}
void ImageCoRViewQtGUI::setupConnections() {
+
// 'browse' buttons
connect(m_ui.pushButton_browse_img, SIGNAL(released()), this,
SLOT(browseImgClicked()));
@@ -45,8 +58,55 @@ ImageStackPreParams ImageCoRViewQtGUI::userSelection() const {
}
void ImageCoRViewQtGUI::showImgOrStack() {}
+
void ImageCoRViewQtGUI::showImg() {}
+WorkspaceGroup_sptr loadFITSImage(const std::string &path) {
+ // get fits file into workspace and retrieve it from the ADS
+ auto alg = Algorithm::fromString("LoadFITS");
+ alg->initialize();
+ alg->setPropertyValue("Filename", path);
+ std::string wsName = "__fits_ws_tomography_gui";
+ alg->setProperty("OutputWorkspace", wsName);
+ // this is way faster when loading into a MatrixWorkspace
+ alg->setProperty("LoadAsRectImg", true);
+ try {
+ alg->execute();
+ } catch (std::exception &e) {
+ throw std::runtime_error(
+ "Failed to load image. Could not load this file as a "
+ "FITS image: " +
+ std::string(e.what()));
+ return WorkspaceGroup_sptr();
+ }
+ if (!alg->isExecuted()) {
+ throw std::runtime_error(
+ "Failed to load image correctly. Note that even though "
+ "the image file has been loaded it seems to contain errors.");
+ }
+ WorkspaceGroup_sptr wsg;
+ MatrixWorkspace_sptr ws;
+ try {
+ wsg = AnalysisDataService::Instance().retrieveWS<WorkspaceGroup>(wsName);
+ ws = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(
+ wsg->getNames()[0]);
+ } catch (std::exception &e) {
+ throw std::runtime_error(
+ "Could not load image contents. An unrecoverable error "
+ "happened when trying to load the image contents. Cannot "
+ "display it. Error details: " +
+ std::string(e.what()));
+ }
+
+ // draw image from workspace
+ if (wsg && ws &&
+ Mantid::API::AnalysisDataService::Instance().doesExist(ws->name())) {
+ return wsg;
+ } else {
+ return WorkspaceGroup_sptr();
+ }
+}
+
void ImageCoRViewQtGUI::browseImgClicked() {
m_presenter->notify(IImageCoRPresenter::BrowseImgOrStack);
// get path
@@ -72,6 +132,114 @@ void ImageCoRViewQtGUI::browseImgClicked() {
m_imgPath = path.toStdString();
m_presenter->notify(IImageCoRPresenter::NewImgOrStack);
+
+ WorkspaceGroup_sptr wsg = loadFITSImage(m_imgPath);
+ if (!wsg)
+ return;
+ MatrixWorkspace_sptr ws =
+ boost::dynamic_pointer_cast<MatrixWorkspace>(wsg->getItem(0));
+ if (!ws)
+ return;
+
+ const size_t MAXDIM = 2048 * 16;
+ size_t width;
+ try {
+ width = boost::lexical_cast<size_t>(ws->run().getLogData("Axis1")->value());
+ // TODO: add a settings option for this (like max mem allocation for
+ // images)?
+ if (width >= MAXDIM)
+ width = MAXDIM;
+ } catch (std::exception &e) {
+ QMessageBox::critical(this, "Cannot load image",
+ "There was a problem while trying to "
+ "find the width of the image: " +
+ QString::fromStdString(e.what()));
+ return;
+ }
+
+ size_t height;
+ try {
+ height =
+ boost::lexical_cast<size_t>(ws->run().getLogData("Axis2")->value());
+ if (height >= MAXDIM)
+ height = MAXDIM;
+ } catch (std::exception &e) {
+ QMessageBox::critical(this, "Cannot load image",
+ "There was a problem while trying to "
+ "find the height of the image: " +
+ QString::fromStdString(e.what()));
+ return;
+ }
+
+ std::string name;
+ try {
+ name = ws->run().getLogData("run_title")->value();
+ } catch (std::exception &e) {
+ QMessageBox::warning(this, "Cannot load image information",
+ "There was a problem while "
+ " trying to find the name of the image: " +
+ QString::fromStdString(e.what()));
+ }
+
+ // images are loaded as 1 histogram == 1 pixel (1 bin per histogram):
+ if (height != ws->getNumberHistograms() || width != ws->blocksize()) {
+ QMessageBox::critical(
+ this, "Image dimensions do not match in the input image workspace",
+ "Could not load the expected "
+ "number of rows and columns.");
+ return;
+ }
+ // find min and max to scale pixel values
+ double min = std::numeric_limits<double>::max(),
+ max = std::numeric_limits<double>::min();
+ for (size_t i = 0; i < ws->getNumberHistograms(); ++i) {
+ for (size_t j = 0; j < ws->blocksize(); ++j) {
+ const double &v = ws->readY(i)[j];
+ if (v < min)
+ min = v;
+ if (v > max)
+ max = v;
+ }
+ }
+ if (min >= max) {
+ QMessageBox::warning(
+ this, "Empty image!",
+ "The image could be loaded but it contains "
+ "effectively no information, all pixels have the same value.");
+ // black picture
+ QPixmap pix(static_cast<int>(width), static_cast<int>(height));
+ pix.fill(QColor(0, 0, 0));
+ m_ui.label_img->setPixmap(pix);
+ m_ui.label_img->show();
+ return;
+ }
+
+ // load / transfer image into a QImage
+ QImage rawImg(QSize(static_cast<int>(width), static_cast<int>(height)),
+ QImage::Format_RGB32);
+ const double max_min = max - min;
+ const double scaleFactor = 255.0 / max_min;
+ for (size_t yi = 0; yi < width; ++yi) {
+ for (size_t xi = 0; xi < width; ++xi) {
+ const double &v = ws->readY(yi)[xi];
+ // color the range min-max in gray scale. To apply different color
+ // maps you'd need to use rawImg.setColorTable() or similar.
+ const int scaled = static_cast<int>(scaleFactor * (v - min));
+ QRgb vRgb = qRgb(scaled, scaled, scaled);
+ rawImg.setPixel(static_cast<int>(xi), static_cast<int>(yi), vRgb);
+ }
+ }
+
+ // paint and show image
+ QPainter painter;
+ QPixmap pix(static_cast<int>(width), static_cast<int>(height));
+ painter.begin(&pix);
+ painter.drawImage(0, 0, rawImg);
+ painter.end();
+ m_ui.label_img->setPixmap(pix);
+ m_ui.label_img->show();
+
+ m_ui.label_img_name->setText(QString::fromStdString(name));
}
} // namespace CustomInterfaces
--
GitLab
From eb7d8835b2c6766112188c10705f8f84d9d5c572 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 19 Aug 2015 15:49:21 +0100
Subject: [PATCH 014/223] add reset buttons, re #13140
---
.../Tomography/ImageSelectCoRAndRegions.ui | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
index 88a5b85db6b..ac40d1568ff 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
@@ -227,6 +227,13 @@
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QPushButton" name="pushButton_2">
+ <property name="text">
+ <string>Reset</string>
+ </property>
+ </widget>
+ </item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
@@ -348,6 +355,13 @@
</item>
<item row="2" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QPushButton" name="pushButton">
+ <property name="text">
+ <string>Reset</string>
+ </property>
+ </widget>
+ </item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
@@ -469,6 +483,13 @@
</item>
<item row="2" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <widget class="QPushButton" name="pushButton_3">
+ <property name="text">
+ <string>Reset</string>
+ </property>
+ </widget>
+ </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
--
GitLab
From 73812d79b02e09777a228b1486c0119dffeabdd3 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 19 Aug 2015 15:49:54 +0100
Subject: [PATCH 015/223] constructors for empty tools settings, re #13140
---
.../Tomography/ToolConfigAstraToolbox.h | 4 ++--
.../Tomography/ToolConfigTomoPy.h | 4 ++--
.../src/Tomography/TomographyIfacePresenter.cpp | 1 -
.../CustomInterfaces/src/Tomography/ToolConfig.cpp | 9 ++++++++-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h
index d0399fc1ff9..8e4b19d2f7c 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h
@@ -38,7 +38,7 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class DLLExport ToolConfigAstraToolbox : public TomoRecToolConfig {
public:
- ToolConfigAstraToolbox() { }
+ ToolConfigAstraToolbox();
ToolConfigAstraToolbox(const std::string &runnable, double centerRot,
double angleMin, double angleMax,
@@ -47,7 +47,7 @@ public:
const std::string &pathOpen,
const std::string &pathSample);
- ~ToolConfigAstraToolbox() { }
+ ~ToolConfigAstraToolbox() {}
protected:
virtual std::string makeCmdLineOptions() const;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigTomoPy.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigTomoPy.h
index e0bd068aa46..b3e9054938a 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigTomoPy.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigTomoPy.h
@@ -37,14 +37,14 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class DLLExport ToolConfigTomoPy : public TomoRecToolConfig {
public:
- ToolConfigTomoPy() { }
+ ToolConfigTomoPy();
ToolConfigTomoPy(const std::string &runnable, const std::string &pathOut,
const std::string &pathDark, const std::string &pathOpen,
const std::string &pathSample, double centerRot,
double angleMin, double angleMax);
- ~ToolConfigTomoPy() { }
+ ~ToolConfigTomoPy() {}
protected:
virtual std::string makeCmdLineOptions() const;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfacePresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfacePresenter.cpp
index 59ae96f3cae..ef2cad5f09b 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfacePresenter.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfacePresenter.cpp
@@ -310,7 +310,6 @@ void TomographyIfacePresenter::processLogMsg() {
std::vector<std::string> msgs = m_view->logMsgs();
for (size_t i = 0; i < msgs.size(); i++) {
m_model->logMsg(msgs[i]);
- break;
}
}
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ToolConfig.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ToolConfig.cpp
index 08391894c2e..feb959472f6 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ToolConfig.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ToolConfig.cpp
@@ -2,12 +2,15 @@
#include "MantidQtCustomInterfaces/Tomography/ToolConfigCustom.h"
#include "MantidQtCustomInterfaces/Tomography/ToolConfigTomoPy.h"
-
#include <boost/lexical_cast.hpp>
namespace MantidQt {
namespace CustomInterfaces {
+ToolConfigTomoPy::ToolConfigTomoPy()
+ : TomoRecToolConfig(""), m_pathOut(""), m_pathDark(""), m_pathOpen(""),
+ m_pathSample(""), m_centerRot(.0), m_angleMin(.0), m_angleMax(180.0) {}
+
ToolConfigTomoPy::ToolConfigTomoPy(const std::string &runnable,
const std::string &pathOut,
const std::string &pathDark,
@@ -28,6 +31,10 @@ std::string ToolConfigTomoPy::makeCmdLineOptions() const {
boost::lexical_cast<std::string>(m_centerRot);
}
+ToolConfigAstraToolbox::ToolConfigAstraToolbox()
+ : TomoRecToolConfig(""), m_centerRot(.0), m_angleMin(.0), m_angleMax(180.0),
+ m_pathOut(""), m_pathDark(""), m_pathOpen(""), m_pathSample("") {}
+
ToolConfigAstraToolbox::ToolConfigAstraToolbox(
const std::string &runnable, double centerRot, double angleMin,
double angleMax, const std::string &pathOut, const std::string &pathDark,
--
GitLab
From d33411304f596097083e80f636902c75a5730f35 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 20 Aug 2015 12:22:27 +0100
Subject: [PATCH 016/223] new methods for stacks and warnings, re #13140
---
.../Tomography/IImageCoRPresenter.h | 3 +-
.../Tomography/IImageCoRView.h | 60 +++++++++-
.../Tomography/ImageCoRPresenter.h | 7 +-
.../Tomography/ImageCoRViewQtGUI.h | 25 +++-
.../src/Tomography/ImageCoRPresenter.cpp | 107 +++++++++++++++++-
.../src/Tomography/ImageCoRViewQtGUI.cpp | 106 ++++++++---------
6 files changed, 243 insertions(+), 65 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
index 60c2418c458..ad6b41242ee 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
@@ -53,7 +53,8 @@ public:
SelectNormalization, ///< Start selection of the normalization region
FinishedCoR, ///< A CoR has been picked
FinishedROI, ///< The ROI is selected
- FinishedNormalization ///< The normalization regions is selected
+ FinishedNormalization,///< The normalization regions is selected
+ ShutDown ///< The widget is being closed/destroyed
};
/**
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
index 709687c724a..da3ebc54afc 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
@@ -1,6 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORVIEW_H_
#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORVIEW_H_
+#include "MantidAPI/WorkspaceGroup_fwd.h"
#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
namespace MantidQt {
@@ -62,9 +63,66 @@ public:
virtual ImageStackPreParams userSelection() const = 0;
/**
+ * Path to a stack of images that the user has requested to
+ * display. The path would be expected to point to a recognized
+ * directory structure (sample/dark/white) or image file (as a
+ * particular case).
*
+ * @return directory of file path as a string
*/
- virtual void showImgOrStack() = 0;
+ virtual std::string stackPath() const = 0;
+
+ /**
+ * Display a special case of stack of images: individual image, from
+ * a path to a recognized directory structure (sample/dark/white) or
+ * image format. Here recognized format means something that is
+ * supported natively by the widgets library, in practice
+ * Qt. Normally you can expect that .tiff and .png images are
+ * supported.
+ *
+ * @param path path to the stack (directory) or individual image file.
+ */
+ virtual void showStack(const std::string &path) = 0;
+
+ /**
+ * Display a stack of images (or individual image as a particular
+ * case), from a workspace group containing matrix workspaces. It
+ * assumes that the workspace contains an image in the form in which
+ * LoadFITS loads FITS images (or spectrum per row, all of them with
+ * the same number of data points (columns)).
+ *
+ * @param ws Workspace group where every workspace is a FITS or
+ * similar image that has been loaded with LoadFITS or similar
+ * algorithm.
+ */
+ virtual void showStack(const Mantid::API::WorkspaceGroup_sptr &ws) = 0;
+
+ /**
+ * Display a warning to the user (for example as a pop-up window).
+ *
+ * @param warn warning title, should be short and would normally be
+ * shown as the title of the window or a big banner.
+ *
+ * @param description longer, free form description of the issue.
+ */
+ virtual void userWarning(const std::string &warn,
+ const std::string &description) = 0;
+
+ /**
+ * Display an error message (for example as a pop-up window).
+ *
+ * @param err Error title, should be short and would normally be
+ * shown as the title of the window or a big banner.
+ *
+ * @param description longer, free form description of the issue.
+ */
+ virtual void userError(const std::string &err,
+ const std::string &description) = 0;
+
+ /**
+ * Save settings (normally when closing this widget).
+ */
+ virtual void saveSettings() const = 0;
};
} // namespace CustomInterfaces
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
index 3aa8a63db93..6fa29d470fb 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
@@ -1,6 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORPRESENTER_H_
#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORPRESENTER_H_
+#include "MantidAPI/WorkspaceGroup_fwd.h"
#include "MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h"
#include "MantidQtCustomInterfaces/Tomography/IImageCoRView.h"
#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
@@ -54,15 +55,19 @@ protected:
void processInit();
void processBrowseImg();
- void processNewImg();
+ void processNewStack();
void processSelectCoR();
void processSelectROI();
void processSelectNormalization();
void processFinishedCoR();
void processFinishedROI();
void processFinishedNormalization();
+ void processShutDown();
private:
+ Mantid::API::WorkspaceGroup_sptr loadFITSStack(const std::string &path);
+ Mantid::API::WorkspaceGroup_sptr loadFITSImage(const std::string &path);
+
/// Associated view for this presenter (MVP pattern)
IImageCoRView *const m_view;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
index e51d0687f85..91287009433 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
@@ -57,7 +57,17 @@ public:
ImageStackPreParams userSelection() const;
- void showImgOrStack();
+ virtual std::string stackPath() const { return m_stackPath; };
+
+ void showStack(const std::string &path);
+
+ void showStack(const Mantid::API::WorkspaceGroup_sptr &ws);
+
+ void userWarning(const std::string &warn, const std::string &description);
+
+ void userError(const std::string &err, const std::string &description);
+
+ void saveSettings() const;
protected:
void initLayout();
@@ -69,10 +79,21 @@ private slots:
private:
void setupConnections();
+ void readSettings();
+
+ // widget closing
+ virtual void closeEvent(QCloseEvent *ev);
+
Ui::ImageSelectCoRAndRegions m_ui;
+ /// persistent settings
+ static const std::string m_settingsGroup;
+
+ /// parameters currently set by the user
ImageStackPreParams m_params;
- std::string m_imgPath;
+
+ /// path to the image stack being visualized
+ std::string m_stackPath;
// presenter as in the model-view-presenter
boost::scoped_ptr<IImageCoRPresenter> m_presenter;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
index b3f0ad1437d..a208583c6cc 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -1,7 +1,13 @@
+#include "MantidAPI/AlgorithmManager.h"
+#include "MantidAPI/AnalysisDataService.h"
+#include "MantidAPI/MatrixWorkspace.h"
+#include "MantidAPI/WorkspaceGroup.h"
#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
#include "MantidQtCustomInterfaces/Tomography/IImageCoRView.h"
+#include <Poco/Path.h>
+
using namespace MantidQt::CustomInterfaces;
namespace MantidQt {
@@ -33,7 +39,7 @@ void ImageCoRPresenter::notify(Notification notif) {
break;
case IImageCoRPresenter::NewImgOrStack:
- processNewImg();
+ processNewStack();
break;
case IImageCoRPresenter::SelectCoR:
@@ -59,6 +65,10 @@ void ImageCoRPresenter::notify(Notification notif) {
case IImageCoRPresenter::FinishedNormalization:
processFinishedNormalization();
break;
+
+ case IImageCoRPresenter::ShutDown:
+ processShutDown();
+ break;
}
}
@@ -66,7 +76,45 @@ void ImageCoRPresenter::processInit() {}
void ImageCoRPresenter::processBrowseImg() {}
-void ImageCoRPresenter::processNewImg() {}
+void ImageCoRPresenter::processNewStack() {
+ const std::string pstr = m_view->stackPath();
+
+ Poco::Path path(pstr);
+
+ const std::string imgPath = "";
+
+ if (imgPath.empty()) {
+ m_view->userWarning("Error trying to find image stack", "imgPath empty");
+ return;
+ }
+
+ // TODO: check the directory contains the expected structure,
+ // Then go and load the files
+ bool isStackDir = true;
+ if (isStackDir) {
+ Mantid::API::WorkspaceGroup_sptr wsg = loadFITSStack(imgPath);
+ if (!wsg)
+ return;
+
+ // TODO: check number of workspaces in wsg
+ size_t imgCount = 0;
+ if (0 == imgCount)
+ return;
+
+ m_view->showStack(wsg);
+
+ // clean-up container group workspace
+ if (wsg)
+ Mantid::API::AnalysisDataService::Instance().remove(wsg->getName());
+
+ } else {
+ m_view->userWarning(
+ "Failed to load stack of images - directory structure issue",
+ "Could not load a stack of images because the selected "
+ "directory does not have to the supported structure (sample/dark/white "
+ "subdirectories).");
+ }
+}
void ImageCoRPresenter::processSelectCoR() {}
@@ -80,5 +128,60 @@ void ImageCoRPresenter::processFinishedROI() {}
void ImageCoRPresenter::processFinishedNormalization() {}
+void ImageCoRPresenter::processShutDown() { m_view->saveSettings(); }
+
+Mantid::API::WorkspaceGroup_sptr
+ImageCoRPresenter::loadFITSStack(const std::string &path) {
+ // TODO: go through directory
+ return loadFITSImage(path);
+}
+
+Mantid::API::WorkspaceGroup_sptr
+ImageCoRPresenter::loadFITSImage(const std::string &path) {
+ // get fits file into workspace and retrieve it from the ADS
+ auto alg = Mantid::API::AlgorithmManager::Instance().create("LoadFITS");
+ alg->initialize();
+ alg->setPropertyValue("Filename", path);
+ std::string wsName = "__fits_ws_tomography_gui";
+ alg->setProperty("OutputWorkspace", wsName);
+ // this is way faster when loading into a MatrixWorkspace
+ alg->setProperty("LoadAsRectImg", true);
+ try {
+ alg->execute();
+ } catch (std::exception &e) {
+ throw std::runtime_error(
+ "Failed to load image. Could not load this file as a "
+ "FITS image: " +
+ std::string(e.what()));
+ return Mantid::API::WorkspaceGroup_sptr();
+ }
+ if (!alg->isExecuted()) {
+ throw std::runtime_error(
+ "Failed to load image correctly. Note that even though "
+ "the image file has been loaded it seems to contain errors.");
+ }
+ Mantid::API::WorkspaceGroup_sptr wsg;
+ Mantid::API::MatrixWorkspace_sptr ws;
+ try {
+ const auto &ads = Mantid::API::AnalysisDataService::Instance();
+ wsg = ads.retrieveWS<Mantid::API::WorkspaceGroup>(wsName);
+ ws = ads.retrieveWS<Mantid::API::MatrixWorkspace>(wsg->getNames()[0]);
+ } catch (std::exception &e) {
+ throw std::runtime_error(
+ "Could not load image contents. An unrecoverable error "
+ "happened when trying to load the image contents. Cannot "
+ "display it. Error details: " +
+ std::string(e.what()));
+ }
+
+ // draw image from workspace
+ if (wsg && ws &&
+ Mantid::API::AnalysisDataService::Instance().doesExist(ws->name())) {
+ return wsg;
+ } else {
+ return Mantid::API::WorkspaceGroup_sptr();
+ }
+}
+
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
index 0baec7c49bf..f7a94c5999a 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
@@ -9,13 +9,19 @@
using namespace Mantid::API;
using namespace MantidQt::CustomInterfaces;
+#include <QCloseEvent>
#include <QFileDialog>
#include <QMessageBox>
#include <QPainter>
+#include <QSettings>
namespace MantidQt {
namespace CustomInterfaces {
+// this would be more like a CustomWidget if it's eventually moved there
+const std::string ImageCoRViewQtGUI::m_settingsGroup =
+ "CustomInterfaces/ImageCoRView";
+
ImageCoRViewQtGUI::ImageCoRViewQtGUI(QWidget *parent)
: QWidget(parent), IImageCoRView(), m_presenter(NULL) {
initLayout();
@@ -57,56 +63,6 @@ ImageStackPreParams ImageCoRViewQtGUI::userSelection() const {
return m_params;
}
-void ImageCoRViewQtGUI::showImgOrStack() {}
-
-void ImageCoRViewQtGUI::showImg() {}
-
-WorkspaceGroup_sptr loadFITSImage(const std::string &path) {
- // get fits file into workspace and retrieve it from the ADS
- auto alg = Algorithm::fromString("LoadFITS");
- alg->initialize();
- alg->setPropertyValue("Filename", path);
- std::string wsName = "__fits_ws_tomography_gui";
- alg->setProperty("OutputWorkspace", wsName);
- // this is way faster when loading into a MatrixWorkspace
- alg->setProperty("LoadAsRectImg", true);
- try {
- alg->execute();
- } catch (std::exception &e) {
- throw std::runtime_error(
- "Failed to load image. Could not load this file as a "
- "FITS image: " +
- std::string(e.what()));
- return WorkspaceGroup_sptr();
- }
- if (!alg->isExecuted()) {
- throw std::runtime_error(
- "Failed to load image correctly. Note that even though "
- "the image file has been loaded it seems to contain errors.");
- }
- WorkspaceGroup_sptr wsg;
- MatrixWorkspace_sptr ws;
- try {
- wsg = AnalysisDataService::Instance().retrieveWS<WorkspaceGroup>(wsName);
- ws = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(
- wsg->getNames()[0]);
- } catch (std::exception &e) {
- throw std::runtime_error(
- "Could not load image contents. An unrecoverable error "
- "happened when trying to load the image contents. Cannot "
- "display it. Error details: " +
- std::string(e.what()));
- }
-
- // draw image from workspace
- if (wsg && ws &&
- Mantid::API::AnalysisDataService::Instance().doesExist(ws->name())) {
- return wsg;
- } else {
- return WorkspaceGroup_sptr();
- }
-}
-
void ImageCoRViewQtGUI::browseImgClicked() {
m_presenter->notify(IImageCoRPresenter::BrowseImgOrStack);
// get path
@@ -121,21 +77,21 @@ void ImageCoRViewQtGUI::browseImgClicked() {
"Other extensions/all files (*.*)");
QString prevPath =
MantidQt::API::AlgorithmInputHistory::Instance().getPreviousDirectory();
- QString path(QFileDialog::getOpenFileName(this, tr("Open image file"),
- prevPath, fitsStr));
+ QString path(QFileDialog::getExistingDirectory(
+ this, tr("Open stack of images"), prevPath, QFileDialog::ShowDirsOnly));
if (!path.isEmpty()) {
- MantidQt::API::AlgorithmInputHistory::Instance().setPreviousDirectory(
- QFileInfo(path).absoluteDir().path());
+ MantidQt::API::AlgorithmInputHistory::Instance().setPreviousDirectory(path);
} else {
return;
}
- m_imgPath = path.toStdString();
+ m_stackPath = path.toStdString();
m_presenter->notify(IImageCoRPresenter::NewImgOrStack);
+}
- WorkspaceGroup_sptr wsg = loadFITSImage(m_imgPath);
- if (!wsg)
- return;
+void ImageCoRViewQtGUI::showStack(const std::string & /*path*/) {}
+
+void ImageCoRViewQtGUI::showStack(const Mantid::API::WorkspaceGroup_sptr &wsg) {
MatrixWorkspace_sptr ws =
boost::dynamic_pointer_cast<MatrixWorkspace>(wsg->getItem(0));
if (!ws)
@@ -242,5 +198,39 @@ void ImageCoRViewQtGUI::browseImgClicked() {
m_ui.label_img_name->setText(QString::fromStdString(name));
}
+void ImageCoRViewQtGUI::readSettings() {
+ QSettings qs;
+ qs.beginGroup(QString::fromStdString(m_settingsGroup));
+ restoreGeometry(qs.value("interface-win-geometry").toByteArray());
+ qs.endGroup();
+}
+
+void ImageCoRViewQtGUI::userWarning(const std::string &err,
+ const std::string &description) {
+ QMessageBox::warning(this, QString::fromStdString(err),
+ QString::fromStdString(description), QMessageBox::Ok,
+ QMessageBox::Ok);
+}
+
+void ImageCoRViewQtGUI::userError(const std::string &err,
+ const std::string &description) {
+ QMessageBox::critical(this, QString::fromStdString(err),
+ QString::fromStdString(description), QMessageBox::Ok,
+ QMessageBox::Ok);
+}
+
+void ImageCoRViewQtGUI::saveSettings() const {
+ QSettings qs;
+ qs.beginGroup(QString::fromStdString(m_settingsGroup));
+
+ qs.setValue("interface-win-geometry", saveGeometry());
+ qs.endGroup();
+}
+
+void ImageCoRViewQtGUI::closeEvent(QCloseEvent *event) {
+ m_presenter->notify(IImageCoRPresenter::ShutDown);
+ event->accept();
+}
+
} // namespace CustomInterfaces
} // namespace MantidQt
--
GitLab
From 481901ec258e147a21b338068fe0a3d1e7df592b Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 20 Aug 2015 12:23:53 +0100
Subject: [PATCH 017/223] rearrange buttons, re #13140
---
.../Tomography/ImageSelectCoRAndRegions.ui | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
index ac40d1568ff..25c82e7a3a9 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
@@ -228,9 +228,9 @@
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
- <widget class="QPushButton" name="pushButton_2">
+ <widget class="QPushButton" name="pushButton_cor">
<property name="text">
- <string>Reset</string>
+ <string>Select</string>
</property>
</widget>
</item>
@@ -248,9 +248,9 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="pushButton_cor">
+ <widget class="QPushButton" name="pushButton_2">
<property name="text">
- <string>Select</string>
+ <string>Reset</string>
</property>
</widget>
</item>
@@ -356,9 +356,9 @@
<item row="2" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
- <widget class="QPushButton" name="pushButton">
+ <widget class="QPushButton" name="pushButton_roi">
<property name="text">
- <string>Reset</string>
+ <string>Select</string>
</property>
</widget>
</item>
@@ -376,9 +376,9 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="pushButton_roi">
+ <widget class="QPushButton" name="pushButton">
<property name="text">
- <string>Select</string>
+ <string>Reset</string>
</property>
</widget>
</item>
--
GitLab
From 0bfa3d30d41ae6063e04acb3ab9037bbb936f477 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 20 Aug 2015 12:57:31 +0100
Subject: [PATCH 018/223] change splitters and layout, re #13140
---
.../Tomography/ImageSelectCoRAndRegions.ui | 902 +++++++++---------
.../src/Tomography/ImageCoRViewQtGUI.cpp | 9 +-
2 files changed, 470 insertions(+), 441 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
index 25c82e7a3a9..583c3bea46a 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
@@ -20,83 +20,104 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
- <property name="margin">
- <number>3</number>
- </property>
- <property name="spacing">
- <number>1</number>
- </property>
<item row="0" column="0">
- <widget class="QSplitter" name="splitter_main_vertical">
+ <widget class="QSplitter" name="splitter_main_horiz">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
- <widget class="QWidget" name="layoutWidget">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QLabel" name="label_img_seq">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Image:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineEdit_img_seq">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>0/0</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_img_name">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>none</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_browse_img">
- <property name="text">
- <string>Browse</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QSplitter" name="splitter_img_horiz">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <widget class="QSplitter" name="splitter_img_vertical">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Vertical</enum>
</property>
+ <widget class="QWidget" name="layoutWidget">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_img_seq">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>28</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Image:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit_img_seq">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>28</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>0/0</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_img_name">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>28</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>none</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_browse_img">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>28</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
<widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="sizeConstraint">
@@ -118,8 +139,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>153</width>
- <height>526</height>
+ <width>454</width>
+ <height>520</height>
</rect>
</property>
<property name="sizePolicy">
@@ -133,8 +154,8 @@
<widget class="QLabel" name="label_img">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>2</horstretch>
- <verstretch>2</verstretch>
+ <horstretch>3</horstretch>
+ <verstretch>3</verstretch>
</sizepolicy>
</property>
<property name="text">
@@ -161,375 +182,378 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="layoutWidget_2">
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QGroupBox" name="groupBox_cor">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>260</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="title">
- <string>Center of rotation</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_2">
- <property name="margin">
- <number>3</number>
- </property>
- <property name="spacing">
- <number>4</number>
- </property>
- <item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Column:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="spinBox_cor_x">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Row:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="spinBox_cor_y">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="1" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QPushButton" name="pushButton_cor">
- <property name="text">
- <string>Select</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>108</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_2">
- <property name="text">
- <string>Reset</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Minimum</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_roi">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>260</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="title">
- <string>Region of interest:</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <property name="margin">
- <number>3</number>
- </property>
- <property name="spacing">
- <number>2</number>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>Top-left</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="spinBox_roi_top_x">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QSpinBox" name="spinBox_roi_top_y">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Bottom-right:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinBox_roi_bottom_x">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QSpinBox" name="spinBox_roi_bottom_y">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QPushButton" name="pushButton_roi">
- <property name="text">
- <string>Select</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>155</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton">
- <property name="text">
- <string>Reset</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Minimum</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ </widget>
+ <widget class="QWidget" name="layoutWidget_2">
+ <layout class="QGridLayout" name="gridLayout_6">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox_cor">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>260</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Center of rotation</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="margin">
+ <number>3</number>
</property>
- </spacer>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_norm">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="spacing">
+ <number>4</number>
</property>
- <property name="maximumSize">
- <size>
- <width>260</width>
- <height>16777215</height>
- </size>
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Column:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinBox_cor_x">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Row:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinBox_cor_y">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QPushButton" name="pushButton_cor">
+ <property name="text">
+ <string>Select</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>108</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_cor_reset">
+ <property name="text">
+ <string>Reset</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="groupBox_roi">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>260</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Region of interest:</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <property name="margin">
+ <number>3</number>
</property>
- <property name="title">
- <string>Area for normalization:</string>
+ <property name="spacing">
+ <number>2</number>
</property>
- <layout class="QGridLayout" name="gridLayout_4">
- <property name="margin">
- <number>3</number>
- </property>
- <property name="spacing">
- <number>2</number>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>Top-left</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="spinBox_norm_top_x">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QSpinBox" name="spinBox_norm_top_y">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Bottom-right:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinBox_norm_bottom_x">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QSpinBox" name="spinBox_norm_bottom_y">
- <property name="maximum">
- <number>9999</number>
- </property>
- <property name="value">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_8">
- <item>
- <widget class="QPushButton" name="pushButton_3">
- <property name="text">
- <string>Reset</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>98</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_norm_area">
- <property name="text">
- <string>Select</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Top-left</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="spinBox_roi_top_x">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QSpinBox" name="spinBox_roi_top_y">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Bottom-right:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="spinBox_roi_bottom_x">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QSpinBox" name="spinBox_roi_bottom_y">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QPushButton" name="pushButton_roi">
+ <property name="text">
+ <string>Select</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>155</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_roi_reset">
+ <property name="text">
+ <string>Reset</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="4" column="0">
+ <widget class="QGroupBox" name="groupBox_norm">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>260</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Area for normalization:</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <property name="margin">
+ <number>3</number>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>68</height>
- </size>
+ <property name="spacing">
+ <number>2</number>
</property>
- </spacer>
- </item>
- </layout>
- </widget>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Top-left</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="spinBox_norm_top_x">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QSpinBox" name="spinBox_norm_top_y">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>Bottom-right:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="spinBox_norm_bottom_x">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QSpinBox" name="spinBox_norm_bottom_y">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="value">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <widget class="QPushButton" name="pushButton_norm_area">
+ <property name="text">
+ <string>Select</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>98</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_norm_reset">
+ <property name="text">
+ <string>Reset</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>68</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</widget>
</widget>
</item>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
index f7a94c5999a..8c1bac9e443 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
@@ -32,9 +32,14 @@ void ImageCoRViewQtGUI::initLayout() {
m_ui.setupUi(this);
QList<int> sizes;
- sizes.push_back(700);
+ sizes.push_back(1000);
sizes.push_back(100);
- m_ui.splitter_img_horiz->setSizes(sizes);
+ m_ui.splitter_main_horiz->setSizes(sizes);
+
+ sizes.clear();
+ sizes.push_back(10);
+ sizes.push_back(1000);
+ m_ui.splitter_img_vertical->setSizes(sizes);
m_ui.horizontalScrollBar_img_stack->setEnabled(false);
setupConnections();
--
GitLab
From fbe3d7f2435da1c08e924cab2f54d5bc29343c3d Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 21 Aug 2015 16:49:53 +0100
Subject: [PATCH 019/223] add phony guess-center-of-rotation widgets,re #13140
---
.../Tomography/ImageSelectCoRAndRegions.ui | 43 ++++++++++++++++++-
1 file changed, 41 insertions(+), 2 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
index 583c3bea46a..44ee36901c0 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
@@ -212,7 +212,7 @@
<property name="spacing">
<number>4</number>
</property>
- <item row="0" column="0">
+ <item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
@@ -250,7 +250,7 @@
</item>
</layout>
</item>
- <item row="1" column="0">
+ <item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="pushButton_cor">
@@ -281,6 +281,45 @@
</item>
</layout>
</item>
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>78</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Auto-find</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="comboBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <item>
+ <property name="text">
+ <string>Method:</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
</item>
--
GitLab
From b73f87453402c95ab7e2e3df8af4007cc1bd37ee Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 21 Aug 2015 18:14:16 +0100
Subject: [PATCH 020/223] rename and add tabs in main tomo tab widget, re
#13140
---
.../Tomography/TomographyIfaceViewQtGUI.cpp | 31 ++++++++++---------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
index 41096af276e..e9c31e50479 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
@@ -66,24 +66,27 @@ void TomographyIfaceViewQtGUI::initLayout() {
// setup container ui
m_ui.setupUi(this);
// add tab contents and set up their ui's
- QWidget *tab1w = new QWidget(m_ui.tabMain);
- m_uiTabRun.setupUi(tab1w);
- m_ui.tabMain->addTab(tab1w, QString("Run"));
- QWidget *tab2w = new QWidget(m_ui.tabMain);
- m_uiTabSetup.setupUi(tab2w);
- m_ui.tabMain->addTab(tab2w, QString("Setup"));
+ QWidget *tabRunW = new QWidget(m_ui.tabMain);
+ m_uiTabRun.setupUi(tabRunW);
+ m_ui.tabMain->addTab(tabRunW, QString("Run"));
+ QWidget *tabSetupW = new QWidget(m_ui.tabMain);
+ m_uiTabSetup.setupUi(tabSetupW);
+ m_ui.tabMain->addTab(tabSetupW, QString("Setup"));
- ImageCoRViewQtGUI *tab3w = new ImageCoRViewQtGUI(m_ui.tabMain);
- m_ui.tabMain->addTab(tab3w, QString("Center && regions"));
+ ImageCoRViewQtGUI *tabCoRW = new ImageCoRViewQtGUI(m_ui.tabMain);
+ m_ui.tabMain->addTab(tabCoRW, QString("Center && ROI"));
- QWidget *tab4w = new QWidget();
- m_ui.tabMain->addTab(tab4w, QString("Filters"));
+ QWidget *tabFiltersW = new QWidget();
+ m_ui.tabMain->addTab(tabFiltersW, QString("Filters"));
- QWidget *tab5w = new QWidget();
- m_ui.tabMain->addTab(tab5w, QString("Visualize"));
+ QWidget *tabVizW = new QWidget();
+ m_ui.tabMain->addTab(tabVizW, QString("Visualize"));
- QWidget *tab6w = new QWidget();
- m_ui.tabMain->addTab(tab6w, QString("Convert"));
+ QWidget *tabConvertW = new QWidget();
+ m_ui.tabMain->addTab(tabConvertW, QString("Convert"));
+
+ QWidget *tabEBandsW = new QWidget();
+ m_ui.tabMain->addTab(tabEBandsW, QString("Energy bands"));
readSettings();
--
GitLab
From d2d7e18409bd46e3deb2d697dc1131481072bb12 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 21 Aug 2015 18:54:23 +0100
Subject: [PATCH 021/223] added class for the stacks dir layout, re #13140
---
.../MantidQt/CustomInterfaces/CMakeLists.txt | 2 +
.../Tomography/StackOfImagesDirs.h | 79 ++++++++++++++++
.../src/Tomography/ImageCoRPresenter.cpp | 58 ++++++------
.../src/Tomography/StackOfImagesDirs.cpp | 90 +++++++++++++++++++
4 files changed, 201 insertions(+), 28 deletions(-)
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
index 0fa84073f93..38d0aa250d1 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -89,6 +89,7 @@ set ( SRC_FILES
src/Tomography/ImageCoRViewQtGUI.cpp
src/Tomography/ImageStackPreParams.cpp
src/Tomography/SavuConfigDialog.cpp
+ src/Tomography/StackOfImagesDirs.cpp
src/Tomography/TomographyIfaceModel.cpp
src/Tomography/TomographyIfacePresenter.cpp
src/Tomography/TomographyIfaceViewQtGUI.cpp
@@ -203,6 +204,7 @@ set ( INC_FILES
inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
inc/MantidQtCustomInterfaces/Tomography/ITomographyIfacePresenter.h
inc/MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h
+ inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
inc/MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h
inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h
inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceModel.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
new file mode 100644
index 00000000000..7efe85f426b
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
@@ -0,0 +1,79 @@
+#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_STACKOFIMAGESDIR_H_
+#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_STACKOFIMAGESDIR_H_
+
+#include "MantidKernel/System.h"
+
+#include <string>
+#include <vector>
+
+namespace MantidQt {
+namespace CustomInterfaces {
+
+/**
+Represents the structure of directories where a stack of images is
+stored on disk: data/flat/dark + processed + pre_filtered, etc.
+
+Copyright © 2015 ISIS Rutherford Appleton Laboratory, NScD
+Oak Ridge National Laboratory & European Spallation Source
+
+This file is part of Mantid.
+
+Mantid is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Mantid is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+File change history is stored at: <https://github.com/mantidproject/mantid>
+Code Documentation is available at: <http://doxygen.mantidproject.org>
+*/
+class DLLExport StackOfImagesDirs {
+public:
+ /// constructor from a path (to a directory)
+ StackOfImagesDirs(const std::string &path);
+
+ bool isValid() const { return m_valid; }
+ // human readable description of the expected structure of directories
+ std::string description() const { return g_descr; }
+
+ // string that describes the status/error message about this directory
+ std::string status() const;
+
+ std::string sampleImagesDir() const { return m_sampleDir; };
+ std::string flatImagesDir() const { return m_flatDir; };
+ std::string darkImagesDir() const { return m_darkDir; };
+
+ std::vector<std::string> sampleFiles() const;
+ std::vector<std::string> flatFiles() const;
+ std::vector<std::string> darkFiles() const;
+
+private:
+ /// tries to find the expected data_/dark_/flat_ directories
+ void findStackDirs(const std::string &path);
+ /// finds images in a directory
+ std::vector<std::string> findImgFiles(const std::string &path) const;
+
+ bool m_valid;
+ std::string m_sampleDir;
+ std::string m_flatDir;
+ std::string m_darkDir;
+
+ static const std::string g_descr;
+ static const std::string g_sampleNamePrefix;
+ static const std::string g_flatNamePrefix;
+ static const std::string g_darkNamePrefix;
+ static const std::string g_processedNamePrefix;
+ static const std::string g_prefilteredNamePrefix;
+};
+
+} // namespace CustomInterfaces
+} // namespace MantidQt
+
+#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_STACKOFIMAGESDIR_H_
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
index a208583c6cc..805c5049a23 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -5,8 +5,7 @@
#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
#include "MantidQtCustomInterfaces/Tomography/IImageCoRView.h"
-
-#include <Poco/Path.h>
+#include "MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h"
using namespace MantidQt::CustomInterfaces;
@@ -79,41 +78,44 @@ void ImageCoRPresenter::processBrowseImg() {}
void ImageCoRPresenter::processNewStack() {
const std::string pstr = m_view->stackPath();
- Poco::Path path(pstr);
-
- const std::string imgPath = "";
+ StackOfImagesDirs soid(pstr);
- if (imgPath.empty()) {
- m_view->userWarning("Error trying to find image stack", "imgPath empty");
+ const std::string soiPath = soid.sampleImagesDir();
+ if (soiPath.empty()) {
+ m_view->userWarning("Error trying to find image stack",
+ "Could not find the sample images directory. The stack "
+ "of images is expected as: \n\n" + soid.description());
return;
}
- // TODO: check the directory contains the expected structure,
- // Then go and load the files
- bool isStackDir = true;
- if (isStackDir) {
- Mantid::API::WorkspaceGroup_sptr wsg = loadFITSStack(imgPath);
- if (!wsg)
- return;
-
- // TODO: check number of workspaces in wsg
- size_t imgCount = 0;
- if (0 == imgCount)
- return;
+ std::vector<std::string> imgs = soid.sampleFiles();
+ if (0 >= imgs.size()) {
+ m_view->userWarning("Error trying to find image/projection files in the stack directories",
+ "Could not find any image file in the samples subdirectory: " + soiPath);
+ return;
+ }
- m_view->showStack(wsg);
+ const std::string imgPath = imgs.front();
- // clean-up container group workspace
- if (wsg)
- Mantid::API::AnalysisDataService::Instance().remove(wsg->getName());
+ Mantid::API::WorkspaceGroup_sptr wsg = loadFITSStack(imgPath);
+ if (!wsg)
+ return;
- } else {
+ size_t imgCount = wsg->size();
+ if (0 == imgCount) {
m_view->userWarning(
- "Failed to load stack of images - directory structure issue",
- "Could not load a stack of images because the selected "
- "directory does not have to the supported structure (sample/dark/white "
- "subdirectories).");
+ "Failed to load any FITS images - directory structure issue",
+ "Even though a directory apprently holding a stack of images was found, "
+ "it was not possible to load any image file correctly from: " +
+ soiPath);
+ return;
}
+
+ m_view->showStack(wsg);
+
+ // clean-up container group workspace
+ if (wsg)
+ Mantid::API::AnalysisDataService::Instance().remove(wsg->getName());
}
void ImageCoRPresenter::processSelectCoR() {}
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
new file mode 100644
index 00000000000..a4a9e2929a9
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
@@ -0,0 +1,90 @@
+#include "MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h"
+
+#include <boost/algorithm/string.hpp>
+
+#include <Poco/DirectoryIterator.h>
+#include <Poco/Path.h>
+
+namespace MantidQt {
+namespace CustomInterfaces {
+
+const std::string StackOfImagesDirs::g_descr =
+ "A directory (folder) that contains subdirectories with names "
+ "starting with:\n- 'Data' (for sample images),\n- 'Flat' (for white "
+ "bean images),\n- 'Dark' (for dark images)\nThe first one is "
+ "mandatory whereas the other two are optional.";
+
+const std::string StackOfImagesDirs::g_sampleNamePrefix = "data";
+const std::string StackOfImagesDirs::g_flatNamePrefix = "flat";
+const std::string StackOfImagesDirs::g_darkNamePrefix = "dark";
+const std::string StackOfImagesDirs::g_processedNamePrefix = "processed";
+const std::string StackOfImagesDirs::g_prefilteredNamePrefix = "pre_filtered";
+
+StackOfImagesDirs::StackOfImagesDirs(const std::string &path) : m_valid(false) {
+ findStackDirs(path);
+}
+
+std::string StackOfImagesDirs::status() const {
+ if (m_valid)
+ return "Stack of images is correct";
+ else
+ return "There are errors in the directories and/or files";
+}
+
+std::vector<std::string> StackOfImagesDirs::sampleFiles() const {
+ return findImgFiles(m_sampleDir);
+}
+std::vector<std::string> StackOfImagesDirs::flatFiles() const {
+ return findImgFiles(m_flatDir);
+}
+std::vector<std::string> StackOfImagesDirs::darkFiles() const {
+ return findImgFiles(m_darkDir);
+}
+
+std::vector<std::string> StackOfImagesDirs::findImgFiles(const std::string &path) const {
+ std::vector<std::string> fnames;
+ Poco::File dir(path);
+ if (!dir.isDirectory() || !dir.exists())
+ return fnames;
+
+ // as an alternative could also use Poco::Glob to find the files
+ Poco::DirectoryIterator it(dir);
+ Poco::DirectoryIterator end;
+ while (it != end) {
+ const std::string name = it.name();
+ // TODO: filter names by extension?
+ if (it->isFile()) {
+ fnames.push_back(it.path().toString());
+ }
+
+ ++it;
+ }
+
+ return fnames;
+}
+
+void StackOfImagesDirs::findStackDirs(const std::string &path) {
+ Poco::File dir(path);
+ if (!dir.isDirectory() || !dir.exists())
+ return;
+
+ Poco::DirectoryIterator end;
+ for (Poco::DirectoryIterator it(dir); it != end; ++it) {
+ if (!it->isDirectory()) {
+ continue;
+ }
+
+ const std::string name = it.name();
+
+ if (boost::iequals(name.substr(0, g_sampleNamePrefix.length()), g_sampleNamePrefix)) {
+ m_sampleDir = it.path().toString();
+ } else if (boost::iequals(name.substr(0, g_flatNamePrefix.length()), g_flatNamePrefix)) {
+ m_flatDir = name;
+ } else if (boost::iequals(name.substr(0, g_darkNamePrefix.length()), g_darkNamePrefix)) {
+ m_darkDir = name;
+ }
+ }
+}
+
+} // namespace CustomInterfaces
+} // namespace MantidQt
--
GitLab
From d0b7a40573391f7cd9c3fa0592fd6f74171c8287 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Fri, 18 Sep 2015 16:12:12 +0100
Subject: [PATCH 022/223] Need to find how rounding of positions work
Refs #13508
---
.../Framework/MDAlgorithms/CMakeLists.txt | 2 +
.../inc/MantidMDAlgorithms/CompactMD.h | 34 +++++++
.../Framework/MDAlgorithms/src/CompactMD.cpp | 97 +++++++++++++++++++
3 files changed, 133 insertions(+)
create mode 100644 Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
create mode 100644 Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
diff --git a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
index 300e71cf835..6d6338b0df2 100644
--- a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
@@ -12,6 +12,7 @@ set ( SRC_FILES
src/CentroidPeaksMD.cpp
src/CentroidPeaksMD2.cpp
src/CloneMDWorkspace.cpp
+ src/CompactMD.cpp
src/CompareMDWorkspaces.cpp
src/ConvToMDBase.cpp
src/ConvToMDEventsWS.cpp
@@ -134,6 +135,7 @@ set ( INC_FILES
inc/MantidMDAlgorithms/CentroidPeaksMD2.h
inc/MantidMDAlgorithms/CloneMDWorkspace.h
inc/MantidMDAlgorithms/CompareMDWorkspaces.h
+ inc/MantidMDAlgorithms/CompactMD.h
inc/MantidMDAlgorithms/ConvToMDBase.h
inc/MantidMDAlgorithms/ConvertCWPDMDToSpectra.h
inc/MantidMDAlgorithms/ConvertCWSDExpToMomentum.h
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
new file mode 100644
index 00000000000..e377a2ab196
--- /dev/null
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
@@ -0,0 +1,34 @@
+#ifndef MANTID_MDALGORITHMS_COMPACTMD_H_
+#define MANTID_MDALGORITHMS_COMPACTMD_H_
+
+#include "MantidAPI/IMDHistoWorkspace.h"
+#include "MantidDataObjects/MDHistoWorkspace.h"
+#include "MantidMDAlgorithms/CutMD.h"
+#include "MantidAPI/Algorithm.h"
+#include "boost/shared_ptr.hpp"
+namespace Mantid {
+namespace MDAlgorithms {
+ class DLLExport CompactMD : public API::DataProcessorAlgorithm{
+public:
+ CompactMD(){};
+ ~CompactMD(){};
+
+ virtual void init();
+ virtual void exec();
+ /// Algorithm's name for identification
+ virtual const std::string name() const;
+ /// Summary of algorithms purpose
+ virtual const std::string summary() const {
+ return "Compacts an MDWorkspace based on the first non-zero intensities";
+ }
+ /// Algorithm's version for identification
+ virtual int version() const{return 1;}
+
+ virtual Mantid::API::IMDHistoWorkspace_sptr
+ compactWorkspace(Mantid::API::IMDHistoWorkspace_sptr workspace,
+ signal_t threshold);
+};
+}
+}
+
+#endif // MANTID_MDALGORITHMS_COMPACTMD_H_
\ No newline at end of file
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
new file mode 100644
index 00000000000..408ee87fbdc
--- /dev/null
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
@@ -0,0 +1,97 @@
+#include "MantidMDAlgorithms/CompactMD.h"
+#include "MantidAPI/IMDIterator.h"
+using namespace Mantid::API;
+using namespace Mantid::Geometry;
+using namespace Mantid::Kernel;
+
+namespace Mantid {
+namespace MDAlgorithms {
+DECLARE_ALGORITHM(CompactMD);
+const std::string CompactMD::name() const { return "CompactMD"; }
+
+
+void CompactMD::init() {
+ // input workspace to compact
+ declareProperty(new WorkspaceProperty<IMDHistoWorkspace>("InputWorkspace", "",
+ Direction::Input),
+ "MDHistoWorkspace to compact");
+ // output workspace that will have been compacted
+ declareProperty(new WorkspaceProperty<IMDWorkspace>(
+ "OutputWorkspace", "", Direction::Output),
+ "Output compacted workspace");
+}
+void CompactMD::exec() {
+ const IMDHistoWorkspace_sptr input_ws = this->getProperty("InputWorkspace");
+ IMDWorkspace_sptr out_ws;
+ auto ws_iter = input_ws->createIterator();
+ auto xbinWidth = input_ws->getXDimension()->getBinWidth();
+ auto ybinWidth = input_ws->getYDimension()->getBinWidth();
+ auto zbinWidth = input_ws->getZDimension()->getBinWidth();
+ size_t first_non_zero_index = 0;
+ size_t signals_read = 0;
+ const double orig_minX = input_ws->getXDimension()->getMinimum();
+ const double orig_minY = input_ws->getYDimension()->getMinimum();
+ const double orig_minZ = input_ws->getZDimension()->getMinimum();
+
+ double minX = input_ws->getXDimension()->getMinimum();
+ double minY = input_ws->getYDimension()->getMinimum();
+ double minZ = input_ws->getZDimension()->getMinimum();
+
+ const double orig_maxX = input_ws->getXDimension()->getMaximum();
+ const double orig_maxY = input_ws->getYDimension()->getMaximum();
+ const double orig_maxZ = input_ws->getZDimension()->getMaximum();
+
+ double maxX = input_ws->getXDimension()->getMaximum();
+ double maxY = input_ws->getYDimension()->getMaximum();
+ double maxZ = input_ws->getZDimension()->getMaximum();
+
+ size_t nBinsZ = input_ws->getZDimension()->getNBins();
+ size_t nBinsY = input_ws->getYDimension()->getNBins();
+ size_t nBinsX = input_ws->getXDimension()->getNBins();
+
+ for (size_t z = 0; z < nBinsZ; z++)
+ {
+ for (size_t y = 0; y < nBinsY; y++)
+ {
+ for (size_t x = 0; x < nBinsX; x++)
+ {
+ if (input_ws->getSignalAt(x,y,z) == 0 ){
+ break;
+ }
+ else{
+
+ if (input_ws->getXDimension()->getX(x) < minX) {minX = orig_minX + xbinWidth*x;}
+ if (input_ws->getXDimension()->getX(x) > maxX) {maxX = orig_maxX + xbinWidth*x;}
+ if (input_ws->getYDimension()->getX(y) < minY) {minY = orig_minY + ybinWidth*y;}
+ if (input_ws->getYDimension()->getX(y) > maxY) {maxY = orig_maxY + ybinWidth*y;}
+ if (input_ws->getZDimension()->getX(z) < minZ) {minZ = orig_minZ + zbinWidth*z;}
+ if (input_ws->getZDimension()->getX(z) > maxZ) {maxZ = orig_maxZ + zbinWidth*z;}
+ }
+ }
+ }
+ }
+ std::cout << "minX : " << minX << " maxX : " << maxX << "\n";
+ std::cout << "minY : " << minY << " maxY : " << maxY << "\n";
+ std::cout << "minZ : " << minZ << " maxZ : " << maxZ << "\n";
+ auto cut_alg = this->createChildAlgorithm("CutMD");
+ cut_alg->setProperty("InputWorkspace", input_ws);
+ cut_alg->setProperty("OutputWorkspace","temp");
+ cut_alg->setProperty("P1Bin",boost::lexical_cast<std::string>(minX)+",0,"+ boost::lexical_cast<std::string>(maxX));
+ cut_alg->setProperty("P2Bin",boost::lexical_cast<std::string>(minY)+",0,"+boost::lexical_cast<std::string>(maxY));
+ cut_alg->setProperty("P3Bin",boost::lexical_cast<std::string>(minZ)+",0,"+boost::lexical_cast<std::string>(maxZ));
+ cut_alg->execute();
+
+ std::cout << "First non-zero: " << first_non_zero_index << "\n";
+ std::cout << "Signals read: " << signals_read << "\n";
+
+ IMDWorkspace_sptr temp = cut_alg->getProperty("OutputWorkspace");
+ out_ws = temp;
+
+ this->setProperty("OutputWorkspace", out_ws);
+}
+
+IMDHistoWorkspace_sptr CompactMD::compactWorkspace(IMDHistoWorkspace_sptr workspace,
+ signal_t threshold){return workspace;}
+
+}
+}
\ No newline at end of file
--
GitLab
From c7cdb057ff301bbf9443b63089db42ba40a7b345 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 21 Sep 2015 11:30:44 +0100
Subject: [PATCH 023/223] renamed ImageCorViewQtGUI -> ImageCoRViewQtWidget, re
#13140
---
.../MantidQt/CustomInterfaces/CMakeLists.txt | 6 +--
...eCoRViewQtGUI.h => ImageCoRViewQtWidget.h} | 14 ++++---
...ViewQtGUI.cpp => ImageCoRViewQtWidget.cpp} | 38 ++++++++++---------
.../Tomography/TomographyIfaceViewQtGUI.cpp | 4 +-
4 files changed, 34 insertions(+), 28 deletions(-)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/{ImageCoRViewQtGUI.h => ImageCoRViewQtWidget.h} (85%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/{ImageCoRViewQtGUI.cpp => ImageCoRViewQtWidget.cpp} (86%)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
index 38d0aa250d1..6e1dc0da0c1 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -86,7 +86,7 @@ set ( SRC_FILES
src/SANSRunWindow.cpp
src/StepScan.cpp
src/Tomography/ImageCoRPresenter.cpp
- src/Tomography/ImageCoRViewQtGUI.cpp
+ src/Tomography/ImageCoRViewQtWidget.cpp
src/Tomography/ImageStackPreParams.cpp
src/Tomography/SavuConfigDialog.cpp
src/Tomography/StackOfImagesDirs.cpp
@@ -200,7 +200,7 @@ set ( INC_FILES
inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
- inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
+ inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
inc/MantidQtCustomInterfaces/Tomography/ITomographyIfacePresenter.h
inc/MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h
@@ -299,7 +299,7 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h
inc/MantidQtCustomInterfaces/SANSEventSlicing.h
inc/MantidQtCustomInterfaces/SANSDiagnostics.h
inc/MantidQtCustomInterfaces/StepScan.h
- inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
+ inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
inc/MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h
inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h
inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialog.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
similarity index 85%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
index 91287009433..e8423ce38f1 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
@@ -1,5 +1,5 @@
-#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTGUI_H_
-#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTGUI_H_
+#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTWIDGET_H_
+#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTWIDGET_H_
#include "MantidKernel/System.h"
#include "MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h"
@@ -46,12 +46,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DLLExport ImageCoRViewQtGUI : public QWidget, public IImageCoRView {
+class DLLExport ImageCoRViewQtWidget : public QWidget, public IImageCoRView {
Q_OBJECT
public:
- ImageCoRViewQtGUI(QWidget *parent = 0);
- virtual ~ImageCoRViewQtGUI(){};
+ ImageCoRViewQtWidget(QWidget *parent = 0);
+ virtual ~ImageCoRViewQtWidget(){};
void initParams(ImageStackPreParams ¶ms);
@@ -59,8 +59,10 @@ public:
virtual std::string stackPath() const { return m_stackPath; };
+ /// show a stack of images given the path to the files
void showStack(const std::string &path);
+ /// show a stack of images that have been loaded into a group of workspaces
void showStack(const Mantid::API::WorkspaceGroup_sptr &ws);
void userWarning(const std::string &warn, const std::string &description);
@@ -102,4 +104,4 @@ private:
} // namespace CustomInterfaces
} // namespace MantidQt
-#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTGUI_H_
+#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTWIDGET_H_
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
similarity index 86%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
index 8c1bac9e443..76ec6009dce 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtGUI.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
@@ -3,7 +3,7 @@
#include "MantidQtAPI/AlgorithmInputHistory.h"
#include "MantidQtAPI/AlgorithmRunner.h"
-#include "MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h"
#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
using namespace Mantid::API;
@@ -19,15 +19,15 @@ namespace MantidQt {
namespace CustomInterfaces {
// this would be more like a CustomWidget if it's eventually moved there
-const std::string ImageCoRViewQtGUI::m_settingsGroup =
+const std::string ImageCoRViewQtWidget::m_settingsGroup =
"CustomInterfaces/ImageCoRView";
-ImageCoRViewQtGUI::ImageCoRViewQtGUI(QWidget *parent)
+ImageCoRViewQtWidget::ImageCoRViewQtWidget(QWidget *parent)
: QWidget(parent), IImageCoRView(), m_presenter(NULL) {
initLayout();
}
-void ImageCoRViewQtGUI::initLayout() {
+void ImageCoRViewQtWidget::initLayout() {
// setup container ui
m_ui.setupUi(this);
@@ -53,22 +53,22 @@ void ImageCoRViewQtGUI::initLayout() {
m_presenter->notify(ImageCoRPresenter::Init);
}
-void ImageCoRViewQtGUI::setupConnections() {
+void ImageCoRViewQtWidget::setupConnections() {
// 'browse' buttons
connect(m_ui.pushButton_browse_img, SIGNAL(released()), this,
SLOT(browseImgClicked()));
}
-void ImageCoRViewQtGUI::initParams(ImageStackPreParams ¶ms) {
+void ImageCoRViewQtWidget::initParams(ImageStackPreParams ¶ms) {
m_params = params;
}
-ImageStackPreParams ImageCoRViewQtGUI::userSelection() const {
+ImageStackPreParams ImageCoRViewQtWidget::userSelection() const {
return m_params;
}
-void ImageCoRViewQtGUI::browseImgClicked() {
+void ImageCoRViewQtWidget::browseImgClicked() {
m_presenter->notify(IImageCoRPresenter::BrowseImgOrStack);
// get path
QString fitsStr = QString("Supported formats: FITS, TIFF and PNG "
@@ -94,9 +94,13 @@ void ImageCoRViewQtGUI::browseImgClicked() {
m_presenter->notify(IImageCoRPresenter::NewImgOrStack);
}
-void ImageCoRViewQtGUI::showStack(const std::string & /*path*/) {}
+void ImageCoRViewQtWidget::showStack(const std::string & /*path*/) {
+ // TODO: a) load as proper stack of images workspace, b) load as workspace
+ // group
+}
-void ImageCoRViewQtGUI::showStack(const Mantid::API::WorkspaceGroup_sptr &wsg) {
+void
+ImageCoRViewQtWidget::showStack(const Mantid::API::WorkspaceGroup_sptr &wsg) {
MatrixWorkspace_sptr ws =
boost::dynamic_pointer_cast<MatrixWorkspace>(wsg->getItem(0));
if (!ws)
@@ -203,28 +207,28 @@ void ImageCoRViewQtGUI::showStack(const Mantid::API::WorkspaceGroup_sptr &wsg) {
m_ui.label_img_name->setText(QString::fromStdString(name));
}
-void ImageCoRViewQtGUI::readSettings() {
+void ImageCoRViewQtWidget::readSettings() {
QSettings qs;
qs.beginGroup(QString::fromStdString(m_settingsGroup));
restoreGeometry(qs.value("interface-win-geometry").toByteArray());
qs.endGroup();
}
-void ImageCoRViewQtGUI::userWarning(const std::string &err,
- const std::string &description) {
+void ImageCoRViewQtWidget::userWarning(const std::string &err,
+ const std::string &description) {
QMessageBox::warning(this, QString::fromStdString(err),
QString::fromStdString(description), QMessageBox::Ok,
QMessageBox::Ok);
}
-void ImageCoRViewQtGUI::userError(const std::string &err,
- const std::string &description) {
+void ImageCoRViewQtWidget::userError(const std::string &err,
+ const std::string &description) {
QMessageBox::critical(this, QString::fromStdString(err),
QString::fromStdString(description), QMessageBox::Ok,
QMessageBox::Ok);
}
-void ImageCoRViewQtGUI::saveSettings() const {
+void ImageCoRViewQtWidget::saveSettings() const {
QSettings qs;
qs.beginGroup(QString::fromStdString(m_settingsGroup));
@@ -232,7 +236,7 @@ void ImageCoRViewQtGUI::saveSettings() const {
qs.endGroup();
}
-void ImageCoRViewQtGUI::closeEvent(QCloseEvent *event) {
+void ImageCoRViewQtWidget::closeEvent(QCloseEvent *event) {
m_presenter->notify(IImageCoRPresenter::ShutDown);
event->accept();
}
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
index e9c31e50479..df5a9052eb3 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
@@ -3,7 +3,7 @@
#include "MantidQtAPI/AlgorithmInputHistory.h"
#include "MantidQtAPI/AlgorithmRunner.h"
#include "MantidQtAPI/HelpWindow.h"
-#include "MantidQtCustomInterfaces/Tomography/ImageCoRViewQtGUI.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h"
#include "MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h"
#include "MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h"
#include "MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h"
@@ -73,7 +73,7 @@ void TomographyIfaceViewQtGUI::initLayout() {
m_uiTabSetup.setupUi(tabSetupW);
m_ui.tabMain->addTab(tabSetupW, QString("Setup"));
- ImageCoRViewQtGUI *tabCoRW = new ImageCoRViewQtGUI(m_ui.tabMain);
+ ImageCoRViewQtWidget *tabCoRW = new ImageCoRViewQtWidget(m_ui.tabMain);
m_ui.tabMain->addTab(tabCoRW, QString("Center && ROI"));
QWidget *tabFiltersW = new QWidget();
--
GitLab
From 6100e855073c7427d63d5b5d26bddfc6cff4544e Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Tue, 22 Sep 2015 15:05:09 +0100
Subject: [PATCH 024/223] CompactMD is now dimensionally independent
Refs #13508
---
.../inc/MantidMDAlgorithms/CompactMD.h | 3 +-
.../Framework/MDAlgorithms/src/CompactMD.cpp | 165 +++++++++++-------
.../src/IntegrateMDHistoWorkspace.cpp | 4 +
3 files changed, 107 insertions(+), 65 deletions(-)
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
index e377a2ab196..a4d3cf6c99c 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
@@ -25,8 +25,7 @@ public:
virtual int version() const{return 1;}
virtual Mantid::API::IMDHistoWorkspace_sptr
- compactWorkspace(Mantid::API::IMDHistoWorkspace_sptr workspace,
- signal_t threshold);
+ compactWorkspace(Mantid::API::IMDHistoWorkspace_sptr workspace);
};
}
}
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
index 408ee87fbdc..e524fb1fbc7 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
@@ -6,92 +6,131 @@ using namespace Mantid::Kernel;
namespace Mantid {
namespace MDAlgorithms {
-DECLARE_ALGORITHM(CompactMD);
-const std::string CompactMD::name() const { return "CompactMD"; }
+DECLARE_ALGORITHM(CompactMD)
+
+const std::string CompactMD::name() const { return "CompactMD"; }
void CompactMD::init() {
- // input workspace to compact
+ // input workspace to compact
declareProperty(new WorkspaceProperty<IMDHistoWorkspace>("InputWorkspace", "",
Direction::Input),
"MDHistoWorkspace to compact");
- // output workspace that will have been compacted
- declareProperty(new WorkspaceProperty<IMDWorkspace>(
- "OutputWorkspace", "", Direction::Output),
+ // output workspace that will have been compacted
+ declareProperty(new WorkspaceProperty<IMDWorkspace>("OutputWorkspace", "",
+ Direction::Output),
"Output compacted workspace");
}
void CompactMD::exec() {
const IMDHistoWorkspace_sptr input_ws = this->getProperty("InputWorkspace");
IMDWorkspace_sptr out_ws;
- auto ws_iter = input_ws->createIterator();
- auto xbinWidth = input_ws->getXDimension()->getBinWidth();
- auto ybinWidth = input_ws->getYDimension()->getBinWidth();
- auto zbinWidth = input_ws->getZDimension()->getBinWidth();
- size_t first_non_zero_index = 0;
- size_t signals_read = 0;
- const double orig_minX = input_ws->getXDimension()->getMinimum();
- const double orig_minY = input_ws->getYDimension()->getMinimum();
- const double orig_minZ = input_ws->getZDimension()->getMinimum();
-
- double minX = input_ws->getXDimension()->getMinimum();
- double minY = input_ws->getYDimension()->getMinimum();
- double minZ = input_ws->getZDimension()->getMinimum();
-
- const double orig_maxX = input_ws->getXDimension()->getMaximum();
- const double orig_maxY = input_ws->getYDimension()->getMaximum();
- const double orig_maxZ = input_ws->getZDimension()->getMaximum();
-
- double maxX = input_ws->getXDimension()->getMaximum();
- double maxY = input_ws->getYDimension()->getMaximum();
- double maxZ = input_ws->getZDimension()->getMaximum();
-
- size_t nBinsZ = input_ws->getZDimension()->getNBins();
- size_t nBinsY = input_ws->getYDimension()->getNBins();
- size_t nBinsX = input_ws->getXDimension()->getNBins();
+ /* auto xbinWidth = input_ws->getXDimension()->getBinWidth();
+ auto ybinWidth = input_ws->getYDimension()->getBinWidth();
+ auto zbinWidth = input_ws->getZDimension()->getBinWidth();
+ size_t first_non_zero_index = 0;
+ size_t signals_read = 0;
+ const double orig_minX = input_ws->getXDimension()->getMinimum();
+ const double orig_minY = input_ws->getYDimension()->getMinimum();
+ const double orig_minZ = input_ws->getZDimension()->getMinimum();
+
+ double minX = input_ws->getXDimension()->getMinimum();
+ double minY = input_ws->getYDimension()->getMinimum();
+ double minZ = input_ws->getZDimension()->getMinimum();
+
+ const double orig_maxX = input_ws->getXDimension()->getMaximum();
+ const double orig_maxY = input_ws->getYDimension()->getMaximum();
+ const double orig_maxZ = input_ws->getZDimension()->getMaximum();
+
+ double maxX = input_ws->getXDimension()->getMaximum();
+ double maxY = input_ws->getYDimension()->getMaximum();
+ double maxZ = input_ws->getZDimension()->getMaximum();
+
+ size_t nBinsZ = input_ws->getZDimension()->getNBins();
+ size_t nBinsY = input_ws->getYDimension()->getNBins();
+ size_t nBinsX = input_ws->getXDimension()->getNBins();
for (size_t z = 0; z < nBinsZ; z++)
- {
- for (size_t y = 0; y < nBinsY; y++)
- {
- for (size_t x = 0; x < nBinsX; x++)
- {
- if (input_ws->getSignalAt(x,y,z) == 0 ){
- break;
- }
- else{
-
- if (input_ws->getXDimension()->getX(x) < minX) {minX = orig_minX + xbinWidth*x;}
- if (input_ws->getXDimension()->getX(x) > maxX) {maxX = orig_maxX + xbinWidth*x;}
- if (input_ws->getYDimension()->getX(y) < minY) {minY = orig_minY + ybinWidth*y;}
- if (input_ws->getYDimension()->getX(y) > maxY) {maxY = orig_maxY + ybinWidth*y;}
- if (input_ws->getZDimension()->getX(z) < minZ) {minZ = orig_minZ + zbinWidth*z;}
- if (input_ws->getZDimension()->getX(z) > maxZ) {maxZ = orig_maxZ + zbinWidth*z;}
- }
- }
- }
+ {
+ for (size_t y = 0; y < nBinsY; y++)
+ {
+ for (size_t x = 0; x < nBinsX; x++)
+ {
+ if (input_ws->getSignalAt(x,y,z) == 0 ){
+ break;
+ }
+ else{
+
+ if (input_ws->getXDimension()->getX(x) < minX) {minX =
+ orig_minX + xbinWidth*x;}
+ if (input_ws->getXDimension()->getX(x) > maxX) {maxX =
+ orig_maxX + xbinWidth*x;}
+ if (input_ws->getYDimension()->getX(y) < minY) {minY =
+ orig_minY + ybinWidth*y;}
+ if (input_ws->getYDimension()->getX(y) > maxY) {maxY =
+ orig_maxY + ybinWidth*y;}
+ if (input_ws->getZDimension()->getX(z) < minZ) {minZ =
+ orig_minZ + zbinWidth*z;}
+ if (input_ws->getZDimension()->getX(z) > maxZ) {maxZ =
+ orig_maxZ + zbinWidth*z;}
+ }
+ }
+ }
+ }
+
+
+ */
+ const size_t nDimensions = input_ws->getNumDims();
+ std::vector<Mantid::coord_t> minVector;
+ std::vector<Mantid::coord_t> maxVector;
+
+ // fill the min/max vectors with values per dimension.
+ for (auto index = 0; index < nDimensions; index++) {
+ minVector.push_back(input_ws->getDimension(index)->getMaximum());
+ maxVector.push_back(input_ws->getDimension(index)->getMinimum());
}
- std::cout << "minX : " << minX << " maxX : " << maxX << "\n";
- std::cout << "minY : " << minY << " maxY : " << maxY << "\n";
- std::cout << "minZ : " << minZ << " maxZ : " << maxZ << "\n";
+ // start our search for the first non-zero signal index.
+ auto ws_iter = input_ws->createIterator();
+ while(ws_iter->next()){
+ if (ws_iter->getSignal() == 0) {
+ continue;
+ } else {
+ auto current_index = ws_iter->getLinearIndex();
+ auto current_center = input_ws->getCenter(current_index);
+ for (auto index = 0; index < input_ws->getNumDims(); index++){
+ if (current_center[index] > maxVector[index]){maxVector[index] = current_center[index];}
+ if (current_center[index] < minVector[index]){minVector[index] = current_center[index];}
+ }
+
+ }
+ }
+ std::cout << "minX : " << minVector[0] << " maxX : " << maxVector[0] << "\n";
+ std::cout << "minY : " << minVector[1] << " maxY : " << maxVector[1] << "\n";
+ std::cout << "minZ : " << minVector[2] << " maxZ : " << maxVector[2] << "\n";
auto cut_alg = this->createChildAlgorithm("CutMD");
cut_alg->setProperty("InputWorkspace", input_ws);
- cut_alg->setProperty("OutputWorkspace","temp");
- cut_alg->setProperty("P1Bin",boost::lexical_cast<std::string>(minX)+",0,"+ boost::lexical_cast<std::string>(maxX));
- cut_alg->setProperty("P2Bin",boost::lexical_cast<std::string>(minY)+",0,"+boost::lexical_cast<std::string>(maxY));
- cut_alg->setProperty("P3Bin",boost::lexical_cast<std::string>(minZ)+",0,"+boost::lexical_cast<std::string>(maxZ));
+ cut_alg->setProperty("OutputWorkspace", "temp");
+ cut_alg->setProperty("P1Bin",
+ boost::lexical_cast<std::string>(minVector[0]-(input_ws->getDimension(0)->getBinWidth()*0.5)) + ",0," +
+ boost::lexical_cast<std::string>(maxVector[0]+(input_ws->getDimension(0)->getBinWidth()*0.5)));
+ cut_alg->setProperty("P2Bin",
+ boost::lexical_cast<std::string>(minVector[1]-(input_ws->getDimension(1)->getBinWidth()*0.5)) + ",0," +
+ boost::lexical_cast<std::string>(maxVector[1]+(input_ws->getDimension(1)->getBinWidth()*0.5)));
+ cut_alg->setProperty("P3Bin",
+ boost::lexical_cast<std::string>(minVector[2]-(input_ws->getDimension(2)->getBinWidth()*0.5)) + ",0," +
+ boost::lexical_cast<std::string>(maxVector[2]+(input_ws->getDimension(2)->getBinWidth()*0.5)));
+ cut_alg->setProperty("P4Bin",boost::lexical_cast<std::string>(minVector[3]-(input_ws->getDimension(3)->getBinWidth()*0.5)) + ",0," +
+ boost::lexical_cast<std::string>(maxVector[3]+(input_ws->getDimension(3)->getBinWidth()*0.5)));
cut_alg->execute();
- std::cout << "First non-zero: " << first_non_zero_index << "\n";
- std::cout << "Signals read: " << signals_read << "\n";
-
IMDWorkspace_sptr temp = cut_alg->getProperty("OutputWorkspace");
out_ws = temp;
this->setProperty("OutputWorkspace", out_ws);
}
-IMDHistoWorkspace_sptr CompactMD::compactWorkspace(IMDHistoWorkspace_sptr workspace,
- signal_t threshold){return workspace;}
-
+IMDHistoWorkspace_sptr
+CompactMD::compactWorkspace(IMDHistoWorkspace_sptr workspace) {
+ return workspace;
+}
}
}
\ No newline at end of file
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/IntegrateMDHistoWorkspace.cpp b/Code/Mantid/Framework/MDAlgorithms/src/IntegrateMDHistoWorkspace.cpp
index d8b7faabba3..e121fe3ee6c 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/IntegrateMDHistoWorkspace.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/IntegrateMDHistoWorkspace.cpp
@@ -120,7 +120,9 @@ createShapedOutput(IMDHistoWorkspace const *const inWS,
// Correct users, input, output and rounded to the nearest whole width.
min = width * std::floor(min/width); // Rounded down
+ std::cout << "ROUNDED MINIMUM FOR DIM "<< i << ": " << min << "\n";
max = width * std::ceil(max/width); // Rounded up
+ std::cout << "ROUNDED MAXIMUM FOR DIM "<< i << ": " << max << "\n";
if(min != binning.front()) {
std::stringstream buffer;
@@ -132,6 +134,8 @@ createShapedOutput(IMDHistoWorkspace const *const inWS,
buffer << "Rounding max from: " << binning.back() << " to the nearest whole width at: " << max;
logger.warning(buffer.str());
}
+ auto buffer = (max-min)/width;
+
const size_t roundedNBins = static_cast<size_t>((max-min)/width+0.5); // round up to a whole number of bins.
outDim->setRange(
roundedNBins,
--
GitLab
From 9362e3633ac6f06072cb8d3eaace21c3c456b6b0 Mon Sep 17 00:00:00 2001
From: Roman Tolchenov <roman.tolchenov@stfc.ac.uk>
Date: Wed, 23 Sep 2015 16:31:53 +0100
Subject: [PATCH 025/223] Re #13743. Setting attributes for composite
functions.
---
.../MantidQtMantidWidgets/FunctionBrowser.h | 2 +
.../MantidWidgets/src/FunctionBrowser.cpp | 41 +++++++++++++------
2 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FunctionBrowser.h b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FunctionBrowser.h
index 5302d5dab2e..5160a047f1c 100644
--- a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FunctionBrowser.h
+++ b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FunctionBrowser.h
@@ -291,6 +291,8 @@ protected slots:
void parameterChanged(QtProperty*);
void parameterButtonClicked(QtProperty*);
void globalChanged(QtProperty*, const QString&, bool);
+ /// Set value of an attribute (as a property) to a function
+ void setAttributeToFunction(Mantid::API::IFunction& fun, QtProperty* prop);
protected:
/// Manager for function group properties
diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/FunctionBrowser.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/FunctionBrowser.cpp
index 81fe73bff6e..762a0a338aa 100644
--- a/Code/Mantid/MantidQt/MantidWidgets/src/FunctionBrowser.cpp
+++ b/Code/Mantid/MantidQt/MantidWidgets/src/FunctionBrowser.cpp
@@ -1347,6 +1347,29 @@ void FunctionBrowser::addFunction()
emit functionStructureChanged();
}
+/**
+ * Set value of an attribute (as a property) to a function.
+ * @param fun :: Function to which attribute is set.
+ * @param prop :: A property with the name and value of the attribute.
+ */
+void FunctionBrowser::setAttributeToFunction(Mantid::API::IFunction& fun, QtProperty* prop)
+{
+ std::string attName = prop->propertyName().toStdString();
+ SetAttributeFromProperty setter(this,prop);
+ Mantid::API::IFunction::Attribute attr = fun.getAttribute(attName);
+ attr.apply(setter);
+ try
+ {
+ fun.setAttribute(attName,attr);
+ }
+ catch(std::exception& expt)
+ {
+ QMessageBox::critical(this,"MantidPlot - Error", "Cannot set attribute " + QString::fromStdString(attName) +
+ " of function " + prop->propertyName() + ":\n\n" + QString::fromStdString(expt.what()));
+ }
+}
+
+
/**
* Return the function
* @param prop :: Function property
@@ -1379,6 +1402,10 @@ Mantid::API::IFunction_sptr FunctionBrowser::getFunction(QtProperty* prop, bool
cf->addFunction(f);
}
}
+ else if (isAttribute(child))
+ {
+ setAttributeToFunction(*fun, child);
+ }
}
}
else
@@ -1389,19 +1416,7 @@ Mantid::API::IFunction_sptr FunctionBrowser::getFunction(QtProperty* prop, bool
{
if (isAttribute(child))
{
- std::string attName = child->propertyName().toStdString();
- SetAttributeFromProperty setter(this,child);
- Mantid::API::IFunction::Attribute attr = fun->getAttribute(attName);
- attr.apply(setter);
- try
- {
- fun->setAttribute(attName,attr);
- }
- catch(std::exception& expt)
- {
- QMessageBox::critical(this,"MantidPlot - Error", "Cannot set attribute " + QString::fromStdString(attName) +
- " of function " + prop->propertyName() + ":\n\n" + QString::fromStdString(expt.what()));
- }
+ setAttributeToFunction(*fun, child);
}
else if (!attributesOnly && isParameter(child))
{
--
GitLab
From 8b49d38a5a536cc23eaef30a8bb10892b95f6ebb Mon Sep 17 00:00:00 2001
From: Jiao Lin <linjiao@ornl.gov>
Date: Wed, 23 Sep 2015 16:50:07 -0400
Subject: [PATCH 026/223] Re #13572. data structure changed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
plot = { name: <name>, type: "histogram" or "point", data: { label1: (N, 3) array, label2: (N, 3) array, …}, axes: { xlabel = …, xunit = …, ylabel = …, yunit = …, …} }
---
.../plugins/algorithms/SavePlot1DAsJson.py | 45 ++++++++++-----
.../algorithms/SavePlot1DAsJsonTest.py | 57 +++++++++++--------
.../source/algorithms/SavePlot1DAsJson-v1.rst | 4 +-
3 files changed, 66 insertions(+), 40 deletions(-)
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
index f52fad8cdc1..2cbd2b90629 100644
--- a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
+++ b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
@@ -80,25 +80,40 @@ class SavePlot1DAsJson(PythonAlgorithm):
# init dictionary
ishist = workspace.isHistogramData()
plottype = "histogram" if ishist else "point"
- serialized = {"type": plottype}
- # helper
- label = lambda axis: "%s (%s)" % (
- axis.getUnit().caption(),
- axis.getUnit().symbol() or 1,
+ serialized = dict(
+ type = plottype,
+ data = dict(),
+ name = wname,
)
# loop over spectra
for i in range(workspace.getNumberHistograms()):
- k = "%s%s" % (wname, i)
- value = dict(
- x=list(workspace.readX(i)),
- y=list(workspace.readY(i)),
- e=list(workspace.readE(i)),
- xlabel=label(workspace.getAxis(0)),
- ylabel=label(workspace.getAxis(1)),
- title="long title of %s" % k,
- )
- serialized[k] = value
+ spectrum_no = workspace.getSpectrum(i).getSpectrumNo()
+ # Why do we need label?
+ # label = "%s_spectrum_%d" % (wname, spectrum_no)
+ # labels.append(label)
+ # or title?
+ # title = "%s - spectrum %d" % (workspace.getTitle(), spectrum_no)
+ arr = [
+ list(workspace.readX(i)),
+ list(workspace.readY(i)),
+ list(workspace.readE(i)),
+ ]
+ serialized['data'][spectrum_no] = arr
continue
+ # axes
+ # .. helper
+ label = lambda axis: axis.getUnit().caption()
+ def unit(axis):
+ s = axis.getUnit().symbol()
+ try: return s.latex()
+ except: return '%s' % s
+ axes = dict(
+ xlabel=label(workspace.getAxis(0)),
+ ylabel=label(workspace.getAxis(1)),
+ xunit = unit(workspace.getAxis(0)),
+ yunit = unit(workspace.getAxis(1)),
+ )
+ serialized['axes'] = axes
return serialized
diff --git a/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py b/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
index 6e8c6100e3f..19a225a7c29 100644
--- a/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
+++ b/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
@@ -14,8 +14,8 @@ class SaveVulcanGSSTest(unittest.TestCase):
def test_save_one_curve(self):
""" Test to Save one curve
"""
- datawsname = "TestOneCurve"
- E, I, err = self._createOneCurve(datawsname)
+ datawsname = "constant energy cut"
+ E, I, err = self._createOneQCurve(datawsname)
# Execute
out_path = "tempout_curve.json"
@@ -27,10 +27,9 @@ class SaveVulcanGSSTest(unittest.TestCase):
self.assertTrue(alg_test.isExecuted())
# Verify ....
d = json.load(open(out_path))
- d0 = d[datawsname+'0'] # plots are numbered
- np.testing.assert_array_equal(d0['x'], E)
- np.testing.assert_array_equal(d0['y'], I)
- np.testing.assert_array_equal(d0['e'], err)
+ self.assertEqual(d['name'], datawsname)
+ self.assertEqual(d['type'], 'point')
+ self._checkData(d, E, I, err)
# Delete the output file
os.remove(out_path)
return
@@ -52,10 +51,7 @@ class SaveVulcanGSSTest(unittest.TestCase):
self.assertTrue(alg_test.isExecuted())
# Verify ....
d = json.load(open(out_path))
- d0 = d[datawsname+'0'] # plots are numbered
- np.testing.assert_array_equal(d0['x'], E)
- np.testing.assert_array_equal(d0['y'], I)
- np.testing.assert_array_equal(d0['e'], err)
+ self._checkData(d, E, I, err)
# test overwrite
alg_test = run_algorithm(
"SavePlot1DAsJson",
@@ -81,13 +77,8 @@ class SaveVulcanGSSTest(unittest.TestCase):
self.assertTrue(alg_test.isExecuted())
# Verify ....
d = json.load(open(out_path))
- d0 = d[datawsname+'0'] # plots are numbered
- np.testing.assert_array_equal(d0['x'], E)
- np.testing.assert_array_equal(d0['y'], I)
- np.testing.assert_array_equal(d0['e'], err)
- d1 = d[datawsname+'1'] #
- np.testing.assert_array_equal(d1['y'], I2)
- np.testing.assert_array_equal(d1['e'], err2)
+ self._checkData(d, E, I, err)
+ self._checkData(d, E, I2, err2, ID="2")
# Delete the output file
os.remove(out_path)
return
@@ -110,30 +101,50 @@ class SaveVulcanGSSTest(unittest.TestCase):
# Verify ....
d = json.load(open(out_path))
plotname = "myplot"
- d0 = d[plotname+'0'] # plots are numbered
- np.testing.assert_array_equal(d0['x'], E)
- np.testing.assert_array_equal(d0['y'], I)
- np.testing.assert_array_equal(d0['e'], err)
+ self._checkData(d, E, I, err)
# Delete the output file
os.remove(out_path)
return
+ def _checkData(self, s, E, I, err, ID="1"):
+ d0 = s["data"][ID]
+ np.testing.assert_array_equal(d0[0], E)
+ np.testing.assert_array_equal(d0[1], I)
+ np.testing.assert_array_equal(d0[2], err)
+ return
+
+
def _createOneCurve(self, datawsname):
""" Create data workspace
"""
- E = np.arange(-50, 50, 1.0)
+ E = np.arange(-50, 50, 10.0)
I = 1000 * np.exp(-E**2/10**2)
err = I ** .5
# create workspace
dataws = api.CreateWorkspace(
DataX = E, DataY = I, DataE = err, NSpec = 1,
- UnitX = "Energy(meV)")
+ UnitX = "Energy")
# Add to data service
AnalysisDataService.addOrReplace(datawsname, dataws)
return E, I, err
+ def _createOneQCurve(self, datawsname):
+ """ Create data workspace
+ """
+ Q = np.arange(0, 13, 1.0)
+ I = 1000 * np.exp(-Q**2/10**2)
+ err = I ** .5
+ # create workspace
+ dataws = api.CreateWorkspace(
+ DataX = Q, DataY = I, DataE = err, NSpec = 1,
+ UnitX = "Momentum")
+ # Add to data service
+ AnalysisDataService.addOrReplace(datawsname, dataws)
+ return Q, I, err
+
+
def _createOneHistogram(self, datawsname):
""" Create data workspace
"""
diff --git a/Code/Mantid/docs/source/algorithms/SavePlot1DAsJson-v1.rst b/Code/Mantid/docs/source/algorithms/SavePlot1DAsJson-v1.rst
index 86cbeeefd4e..85bb7a8d062 100644
--- a/Code/Mantid/docs/source/algorithms/SavePlot1DAsJson-v1.rst
+++ b/Code/Mantid/docs/source/algorithms/SavePlot1DAsJson-v1.rst
@@ -26,12 +26,12 @@ Usage
import os, numpy as np
# prepare input
- E = np.arange(-50, 50, 1.0)
+ E = np.arange(-50, 50, 10.0)
I = 1000 * np.exp(-E**2/10**2)
err = I ** .5
dataws = CreateWorkspace(
DataX = E, DataY = I, DataE = err, NSpec = 1,
- UnitX = "Energy(meV)")
+ UnitX = "Energy")
# output path
out_json = "myplot.json"
# run algorithm
--
GitLab
From 4d9592057ca3d4115b1ec8b31e87f11c909d2b89 Mon Sep 17 00:00:00 2001
From: Jiao Lin <linjiao@ornl.gov>
Date: Wed, 23 Sep 2015 17:01:04 -0400
Subject: [PATCH 027/223] Re #13572. pylint passed
---
.../plugins/algorithms/SavePlot1DAsJson.py | 10 ++++++----
.../python/plugins/algorithms/SavePlot1DAsJsonTest.py | 7 +++----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
index 2cbd2b90629..341dc6ef06b 100644
--- a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
+++ b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
@@ -1,4 +1,4 @@
-#pylint: disable=no-init,unused-variable
+#pylint: disable=no-init,unused-variable,invalid-name,bare-except
from mantid.api import *
from mantid.kernel import *
@@ -81,7 +81,7 @@ class SavePlot1DAsJson(PythonAlgorithm):
ishist = workspace.isHistogramData()
plottype = "histogram" if ishist else "point"
serialized = dict(
- type = plottype,
+ type = plottype,
data = dict(),
name = wname,
)
@@ -105,8 +105,10 @@ class SavePlot1DAsJson(PythonAlgorithm):
label = lambda axis: axis.getUnit().caption()
def unit(axis):
s = axis.getUnit().symbol()
- try: return s.latex()
- except: return '%s' % s
+ try:
+ return s.latex()
+ except:
+ return '%s' % s
axes = dict(
xlabel=label(workspace.getAxis(0)),
ylabel=label(workspace.getAxis(1)),
diff --git a/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py b/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
index 19a225a7c29..9812539d29a 100644
--- a/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
+++ b/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name,too-many-public-methods
+#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments
import unittest
import numpy as np
import mantid.simpleapi as api
@@ -9,7 +9,7 @@ from mantid.api import AnalysisDataService
import os, json
-class SaveVulcanGSSTest(unittest.TestCase):
+class SavePlot1DAsJsonTest(unittest.TestCase):
def test_save_one_curve(self):
""" Test to Save one curve
@@ -100,7 +100,6 @@ class SaveVulcanGSSTest(unittest.TestCase):
self.assertTrue(alg_test.isExecuted())
# Verify ....
d = json.load(open(out_path))
- plotname = "myplot"
self._checkData(d, E, I, err)
# Delete the output file
os.remove(out_path)
@@ -113,7 +112,7 @@ class SaveVulcanGSSTest(unittest.TestCase):
np.testing.assert_array_equal(d0[1], I)
np.testing.assert_array_equal(d0[2], err)
return
-
+
def _createOneCurve(self, datawsname):
""" Create data workspace
--
GitLab
From f9a3b05107e0ddd222aedf485b03f0217a322fa0 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 29 Sep 2015 09:21:30 +0100
Subject: [PATCH 028/223] ui adjustments - sizes etc, re #13140
---
.../Tomography/ImageSelectCoRAndRegions.ui | 91 +++++++++++++++----
1 file changed, 71 insertions(+), 20 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
index 44ee36901c0..4778552fcda 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
@@ -19,22 +19,34 @@
<property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QGridLayout" name="gridLayout_5">
+ <layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0">
<widget class="QSplitter" name="splitter_main_horiz">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>1</horstretch>
+ <verstretch>1</verstretch>
+ </sizepolicy>
+ </property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QSplitter" name="splitter_img_vertical">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="QWidget" name="layoutWidget">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <layout class="QGridLayout" name="gridLayout_5">
<property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
+ <enum>QLayout::SetMinimumSize</enum>
</property>
- <item>
+ <item row="0" column="0">
<widget class="QLabel" name="label_img_seq">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -48,12 +60,18 @@
<height>28</height>
</size>
</property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>28</height>
+ </size>
+ </property>
<property name="text">
<string>Image:</string>
</property>
</widget>
</item>
- <item>
+ <item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_img_seq">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -67,6 +85,12 @@
<height>28</height>
</size>
</property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>28</height>
+ </size>
+ </property>
<property name="text">
<string>0/0</string>
</property>
@@ -78,7 +102,7 @@
</property>
</widget>
</item>
- <item>
+ <item row="0" column="2">
<widget class="QLabel" name="label_img_name">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -92,12 +116,18 @@
<height>28</height>
</size>
</property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>28</height>
+ </size>
+ </property>
<property name="text">
<string>none</string>
</property>
</widget>
</item>
- <item>
+ <item row="0" column="3">
<widget class="QPushButton" name="pushButton_browse_img">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -111,6 +141,12 @@
<height>28</height>
</size>
</property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>28</height>
+ </size>
+ </property>
<property name="text">
<string>Browse</string>
</property>
@@ -119,14 +155,17 @@
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
- <layout class="QVBoxLayout" name="verticalLayout_2">
+ <layout class="QGridLayout" name="gridLayout_7" rowstretch="0,1">
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
- <item>
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>2</horstretch>
<verstretch>2</verstretch>
</sizepolicy>
@@ -139,23 +178,29 @@
<rect>
<x>0</x>
<y>0</y>
- <width>454</width>
- <height>520</height>
+ <width>510</width>
+ <height>402</height>
</rect>
</property>
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>2</horstretch>
<verstretch>2</verstretch>
</sizepolicy>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout" rowstretch="0" columnstretch="0">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="label_img">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>3</horstretch>
- <verstretch>3</verstretch>
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>2</horstretch>
+ <verstretch>2</verstretch>
</sizepolicy>
</property>
<property name="text">
@@ -167,7 +212,7 @@
</widget>
</widget>
</item>
- <item>
+ <item row="1" column="0">
<widget class="QScrollBar" name="horizontalScrollBar_img_stack">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -178,16 +223,22 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
+ <property name="invertedControls">
+ <bool>true</bool>
+ </property>
</widget>
</item>
</layout>
</widget>
</widget>
<widget class="QWidget" name="layoutWidget_2">
- <layout class="QGridLayout" name="gridLayout_6">
+ <layout class="QGridLayout" name="gridLayout_6" columnminimumwidth="0">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
+ <property name="spacing">
+ <number>4</number>
+ </property>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_cor">
<property name="sizePolicy">
@@ -568,7 +619,7 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="pushButton_norm_reset">
+ <widget class="QPushButton" name="pushButton_norm_area_reset">
<property name="text">
<string>Reset</string>
</property>
--
GitLab
From 246591f704435022a692733f59f237119776f825 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 29 Sep 2015 09:22:55 +0100
Subject: [PATCH 029/223] add basic unit tests, re #13140
---
.../MantidQt/CustomInterfaces/CMakeLists.txt | 1 +
.../test/ImageCoRPresenterTest.h | 85 +++++++++++++++++++
.../CustomInterfaces/test/ImageCoRViewMock.h | 42 +++++++++
3 files changed, 128 insertions(+)
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
index df105d9ad1e..bd484595b5f 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -398,6 +398,7 @@ set ( TEST_FILES
ALCPeakFittingModelTest.h
ALCPeakFittingPresenterTest.h
EnggDiffractionPresenterTest.h
+ ImageCoRPresenterTest.h
IO_MuonGroupingTest.h
MuonAnalysisHelperTest.h
ParseKeyValueStringTest.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
new file mode 100644
index 00000000000..26ca526f165
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
@@ -0,0 +1,85 @@
+#ifndef MANTID_CUSTOMINTERFACES_IMAGECORPRESENTERTEST_H
+#define MANTID_CUSTOMINTERFACES_IMAGECORPRESENTERTEST_H
+
+#include "MantidAPI/FrameworkManager.h"
+#include "MantidAPI/MatrixWorkspace.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
+
+#include <cxxtest/TestSuite.h>
+#include "ImageCoRViewMock.h"
+
+using namespace MantidQt::CustomInterfaces;
+using testing::TypedEq;
+using testing::Return;
+
+class ImageCoRPresenterTest : public CxxTest::TestSuite {
+
+public:
+ // This pair of boilerplate methods prevent the suite being created statically
+ // This means the constructor isn't called when running other tests
+ static ImageCoRPresenterTest *createSuite() {
+ return new ImageCoRPresenterTest();
+ }
+
+ static void destroySuite(ImageCoRPresenterTest *suite) { delete suite; }
+
+ ImageCoRPresenterTest() {
+ Mantid::API::FrameworkManager::Instance(); // make sure the framework is
+ // initialized
+ }
+
+ void setUp() {
+ m_view.reset(new testing::NiceMock<MockImageCoRView>());
+ m_presenter.reset(
+ new MantidQt::CustomInterfaces::ImageCoRPresenter(m_view.get()));
+ }
+
+ void tearDown() {
+ TS_ASSERT(testing::Mock::VerifyAndClearExpectations(m_view.get()));
+ }
+
+ void test_initOK() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ // No errors/warnings
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ pres.notify(ImageCoRPresenter::Init);
+ }
+
+ void test_initWithWrongParams() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ // One error, no warnings
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ pres.notify(ImageCoRPresenter::Init);
+ }
+
+ void test_shutDown() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ EXPECT_CALL(mockView, saveSettings()).Times(1);
+ // No errors, no warnings
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ pres.notify(ImageCoRPresenter::ShutDown);
+ }
+
+private:
+ // boost::shared_ptr
+ boost::scoped_ptr<testing::NiceMock<MockImageCoRView>> m_view;
+ boost::scoped_ptr<MantidQt::CustomInterfaces::ImageCoRPresenter>
+ m_presenter;
+
+ // To have one FITS, etc.
+ Mantid::API::MatrixWorkspace_sptr m_ws;
+};
+
+#endif // MANTID_CUSTOMINTERFACES_IMAGECORPRESENTERTEST_H
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
new file mode 100644
index 00000000000..71eacffbbeb
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
@@ -0,0 +1,42 @@
+#ifndef MANTID_CUSTOMINTERFACES_IMAGECORVIEWMOCK_H
+#define MANTID_CUSTOMINTERFACES_IMAGECORVIEWMOCK_H
+
+#include "MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h"
+
+#include <gmock/gmock.h>
+
+class MockImageCoRView : public MantidQt::CustomInterfaces::IImageCoRView {
+public:
+ // void initParams(ImageStackPreParams ¶ms)
+ MOCK_METHOD1(initParams,
+ void(MantidQt::CustomInterfaces::ImageStackPreParams &));
+
+ // ImageStackPreParams userSelection() const;
+ MOCK_CONST_METHOD0(userSelection,
+ MantidQt::CustomInterfaces::ImageStackPreParams());
+
+ // virtual std::string stackPath() const;
+ MOCK_CONST_METHOD0(stackPath, std::string());
+
+ // void showStack(const std::string &path);
+ MOCK_METHOD1(showStack, void(const std::string &));
+
+ // void showStack(const Mantid::API::WorkspaceGroup_sptr &ws);
+ MOCK_METHOD1(showStack, void(const Mantid::API::WorkspaceGroup_sptr &));
+
+ // void userWarning(const std::string &warn, const std::string &description)
+ MOCK_METHOD2(userWarning,
+ void(const std::string &warn, const std::string &description));
+
+ // void userError(const std::string &err, const std::string &description)
+ MOCK_METHOD2(userError,
+ void(const std::string &err, const std::string &description));
+
+ // virtual std::string askImgOrStackPath() = 0;
+ MOCK_METHOD0(askImgOrStackPath, std::string());
+
+ // void saveSettings() const {}
+ MOCK_CONST_METHOD0(saveSettings, void());
+};
+
+#endif // MANTID_CUSTOMINTERFACES_IMAGECORVIEWMOCK_H
--
GitLab
From ab0809858b56c58d58882b9a9b2b95d3b724b45b Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 29 Sep 2015 09:29:06 +0100
Subject: [PATCH 030/223] new notifications, re #13140
---
.../Tomography/IImageCoRPresenter.h | 5 ++-
.../Tomography/IImageCoRView.h | 9 ++++
.../Tomography/ImageCoRPresenter.h | 3 ++
.../Tomography/ImageCoRViewQtWidget.h | 11 ++++-
.../src/Tomography/ImageCoRPresenter.cpp | 26 +++++++++++-
.../src/Tomography/ImageCoRViewQtWidget.cpp | 41 +++++++++++++++++--
6 files changed, 89 insertions(+), 6 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
index ad6b41242ee..c79062b0570 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
@@ -53,7 +53,10 @@ public:
SelectNormalization, ///< Start selection of the normalization region
FinishedCoR, ///< A CoR has been picked
FinishedROI, ///< The ROI is selected
- FinishedNormalization,///< The normalization regions is selected
+ FinishedNormalization,///< The normalization region is selected
+ ResetCoR, ///< Reset CoR to default/none/middle
+ ResetROI, ///< Reset ROI to default/empty
+ ResetNormalization, ///< Reet the normalization region to default/empty
ShutDown ///< The widget is being closed/destroyed
};
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
index da3ebc54afc..c5776c8c3ad 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
@@ -119,6 +119,15 @@ public:
virtual void userError(const std::string &err,
const std::string &description) = 0;
+ /**
+ * Get from the user the path/location of a stack of images (or
+ * single image as a particular case).
+ *
+ * @return location (can be a directory, file, etc.) that needs to
+ * be figured out
+ */
+ virtual std::string askImgOrStackPath() = 0;
+
/**
* Save settings (normally when closing this widget).
*/
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
index 6fa29d470fb..d2d52974020 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
@@ -62,6 +62,9 @@ protected:
void processFinishedCoR();
void processFinishedROI();
void processFinishedNormalization();
+ void processResetCoR();
+ void processResetROI();
+ void processResetNormalization();
void processShutDown();
private:
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
index e8423ce38f1..0cb7dcbe33f 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
@@ -69,6 +69,8 @@ public:
void userError(const std::string &err, const std::string &description);
+ std::string askImgOrStackPath();
+
void saveSettings() const;
protected:
@@ -78,7 +80,14 @@ protected:
private slots:
void browseImgClicked();
-private:
+ void corClicked();
+ void corResetClicked();
+ void roiClicked();
+ void roiResetClicked();
+ void normAreaClicked();
+ void normAreaResetClicked();
+
+ private:
void setupConnections();
void readSettings();
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
index 805c5049a23..f6ab07009b7 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -65,6 +65,18 @@ void ImageCoRPresenter::notify(Notification notif) {
processFinishedNormalization();
break;
+ case IImageCoRPresenter::ResetCoR:
+ processResetCoR();
+ break;
+
+ case IImageCoRPresenter::ResetROI:
+ processResetROI();
+ break;
+
+ case IImageCoRPresenter::ResetNormalization:
+ processResetNormalization();
+ break;
+
case IImageCoRPresenter::ShutDown:
processShutDown();
break;
@@ -73,7 +85,13 @@ void ImageCoRPresenter::notify(Notification notif) {
void ImageCoRPresenter::processInit() {}
-void ImageCoRPresenter::processBrowseImg() {}
+void ImageCoRPresenter::processBrowseImg() {
+ const std::string path = m_view->askImgOrStackPath();
+
+ if (!path.empty()) {
+ processNewStack();
+ }
+}
void ImageCoRPresenter::processNewStack() {
const std::string pstr = m_view->stackPath();
@@ -130,6 +148,12 @@ void ImageCoRPresenter::processFinishedROI() {}
void ImageCoRPresenter::processFinishedNormalization() {}
+void ImageCoRPresenter::processResetCoR() {}
+
+void ImageCoRPresenter::processResetROI() {}
+
+void ImageCoRPresenter::processResetNormalization() {}
+
void ImageCoRPresenter::processShutDown() { m_view->saveSettings(); }
Mantid::API::WorkspaceGroup_sptr
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
index 76ec6009dce..cfaee6589ac 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
@@ -58,6 +58,19 @@ void ImageCoRViewQtWidget::setupConnections() {
// 'browse' buttons
connect(m_ui.pushButton_browse_img, SIGNAL(released()), this,
SLOT(browseImgClicked()));
+
+ connect(m_ui.pushButton_cor, SIGNAL(released()), this, SLOT(corClicked()));
+ connect(m_ui.pushButton_cor_reset, SIGNAL(released()), this,
+ SLOT(corResetClicked()));
+
+ connect(m_ui.pushButton_roi, SIGNAL(released()), this, SLOT(roiClicked()));
+ connect(m_ui.pushButton_roi_reset, SIGNAL(released()), this,
+ SLOT(roiResetClicked()));
+
+ connect(m_ui.pushButton_norm_area, SIGNAL(released()), this,
+ SLOT(normAreaClicked()));
+ connect(m_ui.pushButton_norm_area_reset, SIGNAL(released()), this,
+ SLOT(normAreaResetClicked()));
}
void ImageCoRViewQtWidget::initParams(ImageStackPreParams ¶ms) {
@@ -68,8 +81,32 @@ ImageStackPreParams ImageCoRViewQtWidget::userSelection() const {
return m_params;
}
+void ImageCoRViewQtWidget::corClicked() {
+ m_presenter->notify(IImageCoRPresenter::SelectCoR);
+}
+void ImageCoRViewQtWidget::corResetClicked() {
+ m_presenter->notify(IImageCoRPresenter::ResetCoR);
+}
+
+void ImageCoRViewQtWidget::roiClicked() {
+ m_presenter->notify(IImageCoRPresenter::SelectROI);
+}
+void ImageCoRViewQtWidget::roiResetClicked() {
+ m_presenter->notify(IImageCoRPresenter::ResetROI);
+}
+
+void ImageCoRViewQtWidget::normAreaClicked() {
+ m_presenter->notify(IImageCoRPresenter::SelectROI);
+}
+void ImageCoRViewQtWidget::normAreaResetClicked() {
+ m_presenter->notify(IImageCoRPresenter::ResetROI);
+}
+
void ImageCoRViewQtWidget::browseImgClicked() {
m_presenter->notify(IImageCoRPresenter::BrowseImgOrStack);
+}
+
+std::string ImageCoRViewQtWidget::askImgOrStackPath() {
// get path
QString fitsStr = QString("Supported formats: FITS, TIFF and PNG "
"(*.fits *.fit *.tiff *.tif *.png);;"
@@ -86,12 +123,10 @@ void ImageCoRViewQtWidget::browseImgClicked() {
this, tr("Open stack of images"), prevPath, QFileDialog::ShowDirsOnly));
if (!path.isEmpty()) {
MantidQt::API::AlgorithmInputHistory::Instance().setPreviousDirectory(path);
- } else {
- return;
}
m_stackPath = path.toStdString();
- m_presenter->notify(IImageCoRPresenter::NewImgOrStack);
+ return m_stackPath;
}
void ImageCoRViewQtWidget::showStack(const std::string & /*path*/) {
--
GitLab
From 99f92c19027f7a3e8b33939ce37d06f96a6a93ef Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 29 Sep 2015 12:12:10 +0100
Subject: [PATCH 031/223] reorganize methods that load stacks in workspace
groups, re #13140
---
.../Tomography/ImageCoRPresenter.h | 10 +-
.../Tomography/ImageStackPreParams.h | 8 +-
.../Tomography/StackOfImagesDirs.h | 7 +
.../src/Tomography/ImageCoRPresenter.cpp | 121 ++++++++++++------
.../src/Tomography/ImageCoRViewQtWidget.cpp | 7 +-
.../src/Tomography/StackOfImagesDirs.cpp | 43 ++++++-
6 files changed, 146 insertions(+), 50 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
index d2d52974020..b3442ceada2 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
@@ -5,6 +5,7 @@
#include "MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h"
#include "MantidQtCustomInterfaces/Tomography/IImageCoRView.h"
#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
+#include "MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h"
#include <boost/scoped_ptr.hpp>
@@ -68,8 +69,13 @@ protected:
void processShutDown();
private:
- Mantid::API::WorkspaceGroup_sptr loadFITSStack(const std::string &path);
- Mantid::API::WorkspaceGroup_sptr loadFITSImage(const std::string &path);
+ StackOfImagesDirs checkInputStack(const std::string &path);
+
+ /// loads a list of images from a stack, from their individual paths
+ Mantid::API::WorkspaceGroup_sptr
+ loadFITSStack(const std::vector<std::string> &imgs);
+
+ void loadFITSImage(const std::string &path, const std::string &wsName);
/// Associated view for this presenter (MVP pattern)
IImageCoRView *const m_view;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
index ca65086c21f..164a3a475f7 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
@@ -4,6 +4,8 @@
#include "MantidKernel/System.h"
#include "MantidKernel/V2D.h"
+#include <utility>
+
namespace MantidQt {
namespace CustomInterfaces {
@@ -47,9 +49,11 @@ public:
ImageStackPreParams();
+ typedef std::pair<Mantid::Kernel::V2D, Mantid::Kernel::V2D> Box2D;
+
Mantid::Kernel::V2D cor;
- Mantid::Kernel::V2D roi;
- Mantid::Kernel::V2D normalizationRegion; //< also known as 'air'
+ Box2D roi;
+ Box2D normalizationRegion; //< also known as 'air' region
bool medianFilter;
};
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
index 7efe85f426b..98458140959 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
@@ -39,7 +39,10 @@ public:
/// constructor from a path (to a directory)
StackOfImagesDirs(const std::string &path);
+ /// The current (simple) concept of valid is: there at least a
+ /// sample/data directory with at least one file in it.
bool isValid() const { return m_valid; }
+
// human readable description of the expected structure of directories
std::string description() const { return g_descr; }
@@ -60,7 +63,11 @@ private:
/// finds images in a directory
std::vector<std::string> findImgFiles(const std::string &path) const;
+ /// passes basic validity checks
bool m_valid;
+ /// string with informative messages specially when not valid
+ std::string m_statusDescStr;
+
std::string m_sampleDir;
std::string m_flatDir;
std::string m_darkDir;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
index f6ab07009b7..2830c32040d 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -5,7 +5,6 @@
#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
#include "MantidQtCustomInterfaces/Tomography/IImageCoRView.h"
-#include "MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h"
using namespace MantidQt::CustomInterfaces;
@@ -93,29 +92,50 @@ void ImageCoRPresenter::processBrowseImg() {
}
}
-void ImageCoRPresenter::processNewStack() {
- const std::string pstr = m_view->stackPath();
-
- StackOfImagesDirs soid(pstr);
+/**
+ * Validates the input stack of images (directories and files), and
+ * shows warning/error messages as needed. The outocome of the
+ * validation can be checkec via isValid() on the returned stack of
+ * images object.
+ *
+ * @param path user provided path to the stack of images
+ *
+ * @return a stack of images built from the path passed, not
+ * necessarily correct (check with isValid())
+ */
+StackOfImagesDirs ImageCoRPresenter::checkInputStack(const std::string &path) {
+ StackOfImagesDirs soid(path);
const std::string soiPath = soid.sampleImagesDir();
if (soiPath.empty()) {
m_view->userWarning("Error trying to find image stack",
"Could not find the sample images directory. The stack "
- "of images is expected as: \n\n" + soid.description());
- return;
+ "of images is expected as: \n\n" +
+ soid.description());
+ } else if (!soid.isValid()) {
+ m_view->userWarning("Error while checking/validating the image stack",
+ "The stack of images could not be loaded correctly. " +
+ soid.status());
}
+ return soid;
+}
+
+void ImageCoRPresenter::processNewStack() {
+ const std::string pstr = m_view->stackPath();
+
+ StackOfImagesDirs soid = checkInputStack(pstr);
+
std::vector<std::string> imgs = soid.sampleFiles();
if (0 >= imgs.size()) {
- m_view->userWarning("Error trying to find image/projection files in the stack directories",
- "Could not find any image file in the samples subdirectory: " + soiPath);
+ m_view->userWarning(
+ "Error trying to find image/projection files in the stack directories",
+ "Could not find any image file in the samples subdirectory: " +
+ soid.sampleImagesDir());
return;
}
- const std::string imgPath = imgs.front();
-
- Mantid::API::WorkspaceGroup_sptr wsg = loadFITSStack(imgPath);
+ Mantid::API::WorkspaceGroup_sptr wsg = loadFITSStack(imgs);
if (!wsg)
return;
@@ -123,16 +143,17 @@ void ImageCoRPresenter::processNewStack() {
if (0 == imgCount) {
m_view->userWarning(
"Failed to load any FITS images - directory structure issue",
- "Even though a directory apprently holding a stack of images was found, "
+ "Even though a directory apparently holding a stack of images was "
+ "found, "
"it was not possible to load any image file correctly from: " +
- soiPath);
+ pstr);
return;
}
m_view->showStack(wsg);
- // clean-up container group workspace
- if (wsg)
+ // clean-up container group workspace? Not for now
+ if (false && wsg)
Mantid::API::AnalysisDataService::Instance().remove(wsg->getName());
}
@@ -157,21 +178,51 @@ void ImageCoRPresenter::processResetNormalization() {}
void ImageCoRPresenter::processShutDown() { m_view->saveSettings(); }
Mantid::API::WorkspaceGroup_sptr
-ImageCoRPresenter::loadFITSStack(const std::string &path) {
+ImageCoRPresenter::loadFITSStack(const std::vector<std::string> &imgs) {
// TODO: go through directory
- return loadFITSImage(path);
+ const std::string imgPath = imgs.front();
+
+ const std::string wsName = "__fits_ws_tomography_gui";
+ for (size_t i = 0; i < imgs.size(); ++i) {
+ loadFITSImage(imgPath, wsName);
+ }
+
+ Mantid::API::WorkspaceGroup_sptr wsg;
+ try {
+ const auto &ads = Mantid::API::AnalysisDataService::Instance();
+ wsg = ads.retrieveWS<Mantid::API::WorkspaceGroup>(wsName);
+ } catch (std::exception &e) {
+ throw std::runtime_error(
+ "Could not produce a workspace group for the stack images. Cannot "
+ "display it. Error details: " +
+ std::string(e.what()));
+ }
+
+ if (wsg &&
+ Mantid::API::AnalysisDataService::Instance().doesExist(wsg->name()) &&
+ imgs.size() == wsg->size()) {
+ return wsg;
+ } else {
+ return Mantid::API::WorkspaceGroup_sptr();
+ }
}
-Mantid::API::WorkspaceGroup_sptr
-ImageCoRPresenter::loadFITSImage(const std::string &path) {
+void ImageCoRPresenter::loadFITSImage(const std::string &path,
+ const std::string &wsName) {
// get fits file into workspace and retrieve it from the ADS
auto alg = Mantid::API::AlgorithmManager::Instance().create("LoadFITS");
- alg->initialize();
- alg->setPropertyValue("Filename", path);
- std::string wsName = "__fits_ws_tomography_gui";
- alg->setProperty("OutputWorkspace", wsName);
- // this is way faster when loading into a MatrixWorkspace
- alg->setProperty("LoadAsRectImg", true);
+ try {
+ alg->initialize();
+ alg->setPropertyValue("Filename", path);
+ alg->setProperty("OutputWorkspace", wsName);
+ // this is way faster when loading into a MatrixWorkspace
+ alg->setProperty("LoadAsRectImg", true);
+ } catch (std::exception &e) {
+ throw std::runtime_error("Failed to initialize the mantid algorithm to "
+ "load images. Error description: " +
+ std::string(e.what()));
+ }
+
try {
alg->execute();
} catch (std::exception &e) {
@@ -179,34 +230,28 @@ ImageCoRPresenter::loadFITSImage(const std::string &path) {
"Failed to load image. Could not load this file as a "
"FITS image: " +
std::string(e.what()));
- return Mantid::API::WorkspaceGroup_sptr();
}
+
if (!alg->isExecuted()) {
throw std::runtime_error(
"Failed to load image correctly. Note that even though "
"the image file has been loaded it seems to contain errors.");
}
- Mantid::API::WorkspaceGroup_sptr wsg;
- Mantid::API::MatrixWorkspace_sptr ws;
+
try {
+ Mantid::API::WorkspaceGroup_sptr wsg;
+ Mantid::API::MatrixWorkspace_sptr ws;
const auto &ads = Mantid::API::AnalysisDataService::Instance();
wsg = ads.retrieveWS<Mantid::API::WorkspaceGroup>(wsName);
ws = ads.retrieveWS<Mantid::API::MatrixWorkspace>(wsg->getNames()[0]);
} catch (std::exception &e) {
throw std::runtime_error(
- "Could not load image contents. An unrecoverable error "
+ "Could not load image contents for file '" + path +
+ "'. An unrecoverable error "
"happened when trying to load the image contents. Cannot "
"display it. Error details: " +
std::string(e.what()));
}
-
- // draw image from workspace
- if (wsg && ws &&
- Mantid::API::AnalysisDataService::Instance().doesExist(ws->name())) {
- return wsg;
- } else {
- return Mantid::API::WorkspaceGroup_sptr();
- }
}
} // namespace CustomInterfaces
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
index cfaee6589ac..b130b2401c6 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
@@ -130,8 +130,11 @@ std::string ImageCoRViewQtWidget::askImgOrStackPath() {
}
void ImageCoRViewQtWidget::showStack(const std::string & /*path*/) {
- // TODO: a) load as proper stack of images workspace, b) load as workspace
- // group
+ // TODO:
+ // a) load as proper stack of images workspace - this can only be done when
+ // we have a firt working version of the "lean MD workspace". This method
+ // would then load into one workspace of such type.
+ // b) load as workspace group - this is done in the overloaded method below
}
void
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
index a4a9e2929a9..f92d49b6e22 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
@@ -20,7 +20,8 @@ const std::string StackOfImagesDirs::g_darkNamePrefix = "dark";
const std::string StackOfImagesDirs::g_processedNamePrefix = "processed";
const std::string StackOfImagesDirs::g_prefilteredNamePrefix = "pre_filtered";
-StackOfImagesDirs::StackOfImagesDirs(const std::string &path) : m_valid(false) {
+StackOfImagesDirs::StackOfImagesDirs(const std::string &path)
+ : m_valid(false), m_statusDescStr("Constructed, no checks done yet.") {
findStackDirs(path);
}
@@ -28,7 +29,8 @@ std::string StackOfImagesDirs::status() const {
if (m_valid)
return "Stack of images is correct";
else
- return "There are errors in the directories and/or files";
+ return "There are errors in the directories and/or files. " +
+ m_statusDescStr;
}
std::vector<std::string> StackOfImagesDirs::sampleFiles() const {
@@ -41,7 +43,8 @@ std::vector<std::string> StackOfImagesDirs::darkFiles() const {
return findImgFiles(m_darkDir);
}
-std::vector<std::string> StackOfImagesDirs::findImgFiles(const std::string &path) const {
+std::vector<std::string>
+StackOfImagesDirs::findImgFiles(const std::string &path) const {
std::vector<std::string> fnames;
Poco::File dir(path);
if (!dir.isDirectory() || !dir.exists())
@@ -76,14 +79,42 @@ void StackOfImagesDirs::findStackDirs(const std::string &path) {
const std::string name = it.name();
- if (boost::iequals(name.substr(0, g_sampleNamePrefix.length()), g_sampleNamePrefix)) {
+ // case insensitive comparison against expected pattersn: data_*, flat_*,
+ // dark_*, etc.
+ if (boost::iequals(name.substr(0, g_sampleNamePrefix.length()),
+ g_sampleNamePrefix)) {
m_sampleDir = it.path().toString();
- } else if (boost::iequals(name.substr(0, g_flatNamePrefix.length()), g_flatNamePrefix)) {
+ } else if (boost::iequals(name.substr(0, g_flatNamePrefix.length()),
+ g_flatNamePrefix)) {
m_flatDir = name;
- } else if (boost::iequals(name.substr(0, g_darkNamePrefix.length()), g_darkNamePrefix)) {
+ } else if (boost::iequals(name.substr(0, g_darkNamePrefix.length()),
+ g_darkNamePrefix)) {
m_darkDir = name;
}
}
+
+ if (m_sampleDir.empty()) {
+ m_statusDescStr = "The the sample images directory (" + g_sampleNamePrefix +
+ "...) has not been found.";
+ return;
+ }
+
+ // can be valid only if we get here. There must be at least one entry that is
+ // a file
+ Poco::Path samplesPath(m_sampleDir);
+ for (Poco::DirectoryIterator it(samplesPath); it != end; ++it) {
+ if (it->isFile()) {
+ m_valid = true;
+ break;
+ }
+ }
+
+ if (m_valid) {
+ m_statusDescStr = "all checks passed";
+ } else {
+ m_statusDescStr = "No files were found in the sample images directory (" +
+ g_sampleNamePrefix + "...).";
+ }
}
} // namespace CustomInterfaces
--
GitLab
From 057d6eff46beea9fe226827068f25f2e8ebced6f Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 30 Sep 2015 09:05:32 +0100
Subject: [PATCH 032/223] fix scrolling through the img stack, catch param
changes, re #13140
---
.../Tomography/IImageCoRPresenter.h | 1 +
.../Tomography/IImageCoRView.h | 34 ++-
.../Tomography/ImageCoRPresenter.h | 3 +-
.../Tomography/ImageCoRViewQtWidget.h | 33 ++-
.../src/Tomography/ImageCoRPresenter.cpp | 24 +-
.../src/Tomography/ImageCoRViewQtWidget.cpp | 237 ++++++++++++++++--
.../src/Tomography/StackOfImagesDirs.cpp | 3 +
7 files changed, 305 insertions(+), 30 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
index c79062b0570..e4845f6d2cb 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
@@ -48,6 +48,7 @@ public:
Init, ///< interface is initing (set, defaults, etc.)
BrowseImgOrStack, ///< User browses for an image file or stack
NewImgOrStack, ///< A new image or stack needs to be loaded
+ UpdateImgIndex, ///< Sliding/scrolling through the stack
SelectCoR, ///< Start picking of the center of rotation
SelectROI, ///< Start selection of the region of interest
SelectNormalization, ///< Start selection of the normalization region
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
index c5776c8c3ad..90e455b9b28 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
@@ -53,7 +53,7 @@ public:
* Order matters
*
*/
- virtual void initParams(ImageStackPreParams ¶ms) = 0;
+ virtual void setParams(ImageStackPreParams ¶ms) = 0;
/**
* Provides the current user selection.
@@ -95,7 +95,20 @@ public:
* similar image that has been loaded with LoadFITS or similar
* algorithm.
*/
- virtual void showStack(const Mantid::API::WorkspaceGroup_sptr &ws) = 0;
+ virtual void showStack(Mantid::API::WorkspaceGroup_sptr &ws) = 0;
+
+ /**
+ * Normally one image (projection for tomography stacks) will be
+ * shown on a 2D display. Show there a particular projection from a
+ * stack contained in a workspace group.
+ *
+ * @param wsg workspace holding a stack of images
+ *
+ * @param idx index (in the group) of the image to show
+ *
+ */
+ virtual void showProjection(const Mantid::API::WorkspaceGroup_sptr &wsg,
+ size_t idx) = 0;
/**
* Display a warning to the user (for example as a pop-up window).
@@ -119,6 +132,23 @@ public:
virtual void userError(const std::string &err,
const std::string &description) = 0;
+ /**
+ * The index of the image currently shown (from the current stack if there's
+ * any).
+ *
+ * @return index from 0 to the total number of images in the
+ * stack-1, as used for example when indexing workspaces in
+ * workspacegroups
+ */
+ virtual size_t currentImgIndex() const = 0;
+
+ /**
+ * Display now this image (idx) from the stack.
+ *
+ * @param idx index of the image to display.
+ */
+ virtual void updateImgWithIndex(size_t idx) = 0;
+
/**
* Get from the user the path/location of a stack of images (or
* single image as a particular case).
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
index b3442ceada2..67bb1e1aa60 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
@@ -57,6 +57,7 @@ protected:
void processInit();
void processBrowseImg();
void processNewStack();
+ void processUpdateImgIndex();
void processSelectCoR();
void processSelectROI();
void processSelectNormalization();
@@ -73,7 +74,7 @@ private:
/// loads a list of images from a stack, from their individual paths
Mantid::API::WorkspaceGroup_sptr
- loadFITSStack(const std::vector<std::string> &imgs);
+ loadFITSStack(const std::vector<std::string> &imgs);
void loadFITSImage(const std::string &path, const std::string &wsName);
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
index 0cb7dcbe33f..677d3650bdd 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
@@ -1,6 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTWIDGET_H_
#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTWIDGET_H_
+#include "MantidAPI/WorkspaceGroup_fwd.h"
#include "MantidKernel/System.h"
#include "MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h"
#include "MantidQtCustomInterfaces/Tomography/IImageCoRView.h"
@@ -53,7 +54,7 @@ public:
ImageCoRViewQtWidget(QWidget *parent = 0);
virtual ~ImageCoRViewQtWidget(){};
- void initParams(ImageStackPreParams ¶ms);
+ void setParams(ImageStackPreParams ¶ms);
ImageStackPreParams userSelection() const;
@@ -63,12 +64,18 @@ public:
void showStack(const std::string &path);
/// show a stack of images that have been loaded into a group of workspaces
- void showStack(const Mantid::API::WorkspaceGroup_sptr &ws);
+ void showStack(Mantid::API::WorkspaceGroup_sptr &ws);
+
+ void showProjection(const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx);
void userWarning(const std::string &warn, const std::string &description);
void userError(const std::string &err, const std::string &description);
+ size_t currentImgIndex() const;
+
+ void updateImgWithIndex(size_t idx);
+
std::string askImgOrStackPath();
void saveSettings() const;
@@ -87,7 +94,13 @@ private slots:
void normAreaClicked();
void normAreaResetClicked();
- private:
+ void updateFromImagesSlider(int current);
+
+ void valueUpdatedCoR(int v);
+ void valueUpdatedROI(int v);
+ void valueUpdatedNormArea(int v);
+
+private:
void setupConnections();
void readSettings();
@@ -95,8 +108,22 @@ private slots:
// widget closing
virtual void closeEvent(QCloseEvent *ev);
+ void initParamWidgets(size_t maxWidth, size_t maxHeight);
+
+ void setParamWidgets(ImageStackPreParams ¶ms);
+
+ // shows the image in a widget
+ void showProjectionImage(const Mantid::API::WorkspaceGroup_sptr &wsg,
+ size_t idx);
+
+ void refreshCoR();
+ void refreshROI();
+ void refreshNormArea();
+
Ui::ImageSelectCoRAndRegions m_ui;
+ Mantid::API::WorkspaceGroup_sptr m_stack;
+
/// persistent settings
static const std::string m_settingsGroup;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
index 2830c32040d..0f0539ad4f7 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -40,6 +40,10 @@ void ImageCoRPresenter::notify(Notification notif) {
processNewStack();
break;
+ case IImageCoRPresenter::UpdateImgIndex:
+ processUpdateImgIndex();
+ break;
+
case IImageCoRPresenter::SelectCoR:
processSelectCoR();
break;
@@ -82,7 +86,10 @@ void ImageCoRPresenter::notify(Notification notif) {
}
}
-void ImageCoRPresenter::processInit() {}
+void ImageCoRPresenter::processInit() {
+ ImageStackPreParams p;
+ m_view->setParams(p);
+}
void ImageCoRPresenter::processBrowseImg() {
const std::string path = m_view->askImgOrStackPath();
@@ -157,6 +164,10 @@ void ImageCoRPresenter::processNewStack() {
Mantid::API::AnalysisDataService::Instance().remove(wsg->getName());
}
+void ImageCoRPresenter::processUpdateImgIndex() {
+ m_view->updateImgWithIndex(m_view->currentImgIndex());
+}
+
void ImageCoRPresenter::processSelectCoR() {}
void ImageCoRPresenter::processSelectROI() {}
@@ -180,16 +191,17 @@ void ImageCoRPresenter::processShutDown() { m_view->saveSettings(); }
Mantid::API::WorkspaceGroup_sptr
ImageCoRPresenter::loadFITSStack(const std::vector<std::string> &imgs) {
// TODO: go through directory
- const std::string imgPath = imgs.front();
-
- const std::string wsName = "__fits_ws_tomography_gui";
+ const std::string wsName = "__stack_fits_viewer_tomography_gui";
+ auto &ads = Mantid::API::AnalysisDataService::Instance();
+ if (ads.doesExist(wsName)) {
+ ads.remove(wsName);
+ }
for (size_t i = 0; i < imgs.size(); ++i) {
- loadFITSImage(imgPath, wsName);
+ loadFITSImage(imgs[i], wsName);
}
Mantid::API::WorkspaceGroup_sptr wsg;
try {
- const auto &ads = Mantid::API::AnalysisDataService::Instance();
wsg = ads.retrieveWS<Mantid::API::WorkspaceGroup>(wsName);
} catch (std::exception &e) {
throw std::runtime_error(
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
index b130b2401c6..0d27ed5fbf2 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
@@ -41,9 +41,12 @@ void ImageCoRViewQtWidget::initLayout() {
sizes.push_back(1000);
m_ui.splitter_img_vertical->setSizes(sizes);
m_ui.horizontalScrollBar_img_stack->setEnabled(false);
+ m_ui.lineEdit_img_seq->setText("---");
setupConnections();
+ initParamWidgets(1, 1);
+
// presenter that knows how to handle a IImageCoRView should take care
// of all the logic. Note the view needs to now the concrete presenter here
m_presenter.reset(new ImageCoRPresenter(this));
@@ -71,10 +74,136 @@ void ImageCoRViewQtWidget::setupConnections() {
SLOT(normAreaClicked()));
connect(m_ui.pushButton_norm_area_reset, SIGNAL(released()), this,
SLOT(normAreaResetClicked()));
+
+ // image sequence scroll/slide:
+ connect(m_ui.horizontalScrollBar_img_stack, SIGNAL(valueChanged(int)), this,
+ SLOT(updateFromImagesSlider(int)));
+
+ // parameter (points) widgets
+ connect(m_ui.spinBox_cor_x, SIGNAL(valueChanged(int)), this,
+ SLOT(valueUpdateCoR(int)));
+ connect(m_ui.spinBox_cor_y, SIGNAL(valueChanged(int)), this,
+ SLOT(valueUpdateCoR(int)));
+
+ connect(m_ui.spinBox_roi_top_x, SIGNAL(valueChanged(int)), this,
+ SLOT(valueUpdateROI(int)));
+ connect(m_ui.spinBox_roi_top_y, SIGNAL(valueChanged(int)), this,
+ SLOT(valueUpdateROI(int)));
+ connect(m_ui.spinBox_roi_bottom_x, SIGNAL(valueChanged(int)), this,
+ SLOT(valueUpdateROI(int)));
+ connect(m_ui.spinBox_roi_bottom_y, SIGNAL(valueChanged(int)), this,
+ SLOT(valueUpdateROI(int)));
+
+ connect(m_ui.spinBox_norm_top_x, SIGNAL(valueChanged(int)), this,
+ SLOT(valueUpdateNormArea(int)));
+ connect(m_ui.spinBox_norm_top_y, SIGNAL(valueChanged(int)), this,
+ SLOT(valueUpdateNormArea(int)));
+ connect(m_ui.spinBox_norm_bottom_x, SIGNAL(valueChanged(int)), this,
+ SLOT(valueUpdateNormArea(int)));
+ connect(m_ui.spinBox_norm_bottom_y, SIGNAL(valueChanged(int)), this,
+ SLOT(valueUpdateNormArea(int)));
+}
+
+void ImageCoRViewQtWidget::valueUpdatedCoR(int) {
+ m_params.cor = Mantid::Kernel::V2D(m_ui.spinBox_cor_x->value(),
+ m_ui.spinBox_cor_y->value());
+ refreshCoR();
+}
+
+void ImageCoRViewQtWidget::valueUpdatedROI(int) {
+ m_params.roi =
+ std::make_pair(Mantid::Kernel::V2D(m_ui.spinBox_roi_top_x->value(),
+ m_ui.spinBox_roi_top_y->value()),
+ Mantid::Kernel::V2D(m_ui.spinBox_roi_bottom_x->value(),
+ m_ui.spinBox_roi_bottom_y->value()));
+ refreshROI();
+}
+
+void ImageCoRViewQtWidget::valueUpdatedNormArea(int) {
+ m_params.normalizationRegion =
+ std::make_pair(Mantid::Kernel::V2D(m_ui.spinBox_norm_top_x->value(),
+ m_ui.spinBox_norm_top_y->value()),
+ Mantid::Kernel::V2D(m_ui.spinBox_norm_bottom_x->value(),
+ m_ui.spinBox_norm_bottom_y->value()));
+ refreshNormArea();
+}
+
+void ImageCoRViewQtWidget::refreshCoR() {
+ // TODO: display proper symbol
}
-void ImageCoRViewQtWidget::initParams(ImageStackPreParams ¶ms) {
+void ImageCoRViewQtWidget::refreshROI() {
+ // TODO: display proper symbol
+}
+
+void ImageCoRViewQtWidget::refreshNormArea() {
+ // TODO: display proper symbol
+}
+
+void ImageCoRViewQtWidget::setParams(ImageStackPreParams ¶ms) {
m_params = params;
+ setParamWidgets(m_params);
+}
+
+void ImageCoRViewQtWidget::initParamWidgets(size_t maxWidth, size_t maxHeight) {
+ int width = static_cast<int>(maxWidth);
+ int height = static_cast<int>(maxHeight);
+
+ m_ui.spinBox_cor_x->setMinimum(0);
+ m_ui.spinBox_cor_x->setMaximum(width - 1);
+ m_ui.spinBox_cor_x->setValue(0);
+ m_ui.spinBox_cor_y->setMinimum(0);
+ m_ui.spinBox_cor_y->setMaximum(height - 1);
+ m_ui.spinBox_cor_y->setValue(0);
+
+ m_ui.spinBox_roi_bottom_x->setMinimum(0);
+ m_ui.spinBox_roi_bottom_x->setMaximum(width - 1);
+ m_ui.spinBox_roi_bottom_x->setValue(0);
+ m_ui.spinBox_roi_bottom_y->setMinimum(0);
+ m_ui.spinBox_roi_bottom_y->setMaximum(height - 1);
+ m_ui.spinBox_roi_bottom_y->setValue(0);
+
+ m_ui.spinBox_roi_top_x->setMinimum(0);
+ m_ui.spinBox_roi_top_x->setMaximum(width - 1);
+ m_ui.spinBox_roi_top_x->setValue(0);
+ m_ui.spinBox_roi_top_y->setMinimum(0);
+ m_ui.spinBox_roi_top_y->setMaximum(height - 1);
+ m_ui.spinBox_roi_top_y->setValue(0);
+
+ m_ui.spinBox_norm_bottom_x->setMinimum(0);
+ m_ui.spinBox_norm_bottom_x->setMaximum(width - 1);
+ m_ui.spinBox_norm_bottom_x->setValue(0);
+ m_ui.spinBox_norm_bottom_y->setMinimum(0);
+ m_ui.spinBox_norm_bottom_y->setMaximum(height - 1);
+ m_ui.spinBox_norm_bottom_y->setValue(0);
+
+ m_ui.spinBox_norm_top_x->setMinimum(0);
+ m_ui.spinBox_norm_top_x->setMaximum(width - 1);
+ m_ui.spinBox_norm_top_x->setValue(0);
+ m_ui.spinBox_norm_top_y->setMinimum(0);
+ m_ui.spinBox_norm_top_y->setMaximum(height - 1);
+ m_ui.spinBox_norm_top_y->setValue(0);
+}
+
+void ImageCoRViewQtWidget::setParamWidgets(ImageStackPreParams ¶ms) {
+ m_ui.spinBox_cor_x->setValue(static_cast<int>(params.cor.X()));
+ m_ui.spinBox_cor_y->setValue(static_cast<int>(params.cor.Y()));
+
+ m_ui.spinBox_roi_top_x->setValue(static_cast<int>(params.roi.first.X()));
+ m_ui.spinBox_roi_top_y->setValue(static_cast<int>(params.roi.first.Y()));
+
+ m_ui.spinBox_roi_bottom_x->setValue(static_cast<int>(params.roi.second.X()));
+ m_ui.spinBox_roi_bottom_y->setValue(static_cast<int>(params.roi.second.Y()));
+
+ m_ui.spinBox_norm_top_x->setValue(
+ static_cast<int>(params.normalizationRegion.first.X()));
+ m_ui.spinBox_norm_top_y->setValue(
+ static_cast<int>(params.normalizationRegion.first.Y()));
+
+ m_ui.spinBox_norm_bottom_x->setValue(
+ static_cast<int>(params.normalizationRegion.second.X()));
+ m_ui.spinBox_norm_bottom_y->setValue(
+ static_cast<int>(params.normalizationRegion.second.Y()));
}
ImageStackPreParams ImageCoRViewQtWidget::userSelection() const {
@@ -106,6 +235,24 @@ void ImageCoRViewQtWidget::browseImgClicked() {
m_presenter->notify(IImageCoRPresenter::BrowseImgOrStack);
}
+void ImageCoRViewQtWidget::updateFromImagesSlider(int /* current */) {
+ m_presenter->notify(IImageCoRPresenter::UpdateImgIndex);
+}
+
+size_t ImageCoRViewQtWidget::currentImgIndex() const {
+ return m_ui.horizontalScrollBar_img_stack->value();
+}
+
+void ImageCoRViewQtWidget::updateImgWithIndex(size_t idx) {
+ int max = m_ui.horizontalScrollBar_img_stack->maximum();
+ int current = m_ui.horizontalScrollBar_img_stack->value();
+
+ showProjection(m_stack, idx);
+ m_ui.lineEdit_img_seq->setText(
+ QString::fromStdString(boost::lexical_cast<std::string>(current + 1) +
+ "/" + boost::lexical_cast<std::string>(max + 1)));
+}
+
std::string ImageCoRViewQtWidget::askImgOrStackPath() {
// get path
QString fitsStr = QString("Supported formats: FITS, TIFF and PNG "
@@ -137,13 +284,79 @@ void ImageCoRViewQtWidget::showStack(const std::string & /*path*/) {
// b) load as workspace group - this is done in the overloaded method below
}
-void
-ImageCoRViewQtWidget::showStack(const Mantid::API::WorkspaceGroup_sptr &wsg) {
- MatrixWorkspace_sptr ws =
- boost::dynamic_pointer_cast<MatrixWorkspace>(wsg->getItem(0));
- if (!ws)
+void ImageCoRViewQtWidget::showStack(Mantid::API::WorkspaceGroup_sptr &wsg) {
+ if (0 == wsg->size())
return;
+ m_stack = wsg;
+
+ m_ui.horizontalScrollBar_img_stack->setEnabled(true);
+ m_ui.horizontalScrollBar_img_stack->setMinimum(0);
+ m_ui.horizontalScrollBar_img_stack->setMaximum(
+ static_cast<int>(m_stack->size() - 1));
+
+ showProjection(m_stack, 0);
+
+ size_t width = 0, height = 0;
+ try {
+ MatrixWorkspace_sptr ws =
+ boost::dynamic_pointer_cast<MatrixWorkspace>(wsg->getItem(0));
+ if (!ws)
+ return;
+ width = ws->blocksize();
+ height = ws->getNumberHistograms();
+ } catch (std::exception &e) {
+ QMessageBox::warning(this, "Cannot load image information",
+ "There was a problem while "
+ " trying to find the size of the image: " +
+ QString::fromStdString(e.what()));
+ }
+
+ initParamWidgets(width, height);
+}
+
+void ImageCoRViewQtWidget::showProjection(
+ const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx) {
+
+ showProjectionImage(wsg, idx);
+
+ // give name, set up scroll/slider
+ std::string name;
+ try {
+ MatrixWorkspace_sptr ws =
+ boost::dynamic_pointer_cast<MatrixWorkspace>(wsg->getItem(idx));
+ if (!ws)
+ return;
+ name = ws->run().getLogData("run_title")->value();
+ } catch (std::exception &e) {
+ QMessageBox::warning(this, "Cannot load image information",
+ "There was a problem while "
+ " trying to find the name of the image: " +
+ QString::fromStdString(e.what()));
+ }
+ m_ui.label_img_name->setText(QString::fromStdString(name));
+
+ const size_t numPics = wsg->size();
+ m_ui.lineEdit_img_seq->setText(
+ QString::fromStdString("1/" + boost::lexical_cast<std::string>(numPics)));
+ m_ui.horizontalScrollBar_img_stack->setValue(static_cast<int>(idx));
+}
+
+void ImageCoRViewQtWidget::showProjectionImage(
+ const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx) {
+
+ MatrixWorkspace_sptr ws;
+ try {
+ ws = boost::dynamic_pointer_cast<MatrixWorkspace>(wsg->getItem(idx));
+ if (!ws)
+ return;
+ } catch (std::exception &e) {
+ QMessageBox::warning(
+ this, "Cannot load image",
+ "There was a problem while trying to find the image data: " +
+ QString::fromStdString(e.what()));
+ }
+
const size_t MAXDIM = 2048 * 16;
size_t width;
try {
@@ -174,16 +387,6 @@ ImageCoRViewQtWidget::showStack(const Mantid::API::WorkspaceGroup_sptr &wsg) {
return;
}
- std::string name;
- try {
- name = ws->run().getLogData("run_title")->value();
- } catch (std::exception &e) {
- QMessageBox::warning(this, "Cannot load image information",
- "There was a problem while "
- " trying to find the name of the image: " +
- QString::fromStdString(e.what()));
- }
-
// images are loaded as 1 histogram == 1 pixel (1 bin per histogram):
if (height != ws->getNumberHistograms() || width != ws->blocksize()) {
QMessageBox::critical(
@@ -241,8 +444,6 @@ ImageCoRViewQtWidget::showStack(const Mantid::API::WorkspaceGroup_sptr &wsg) {
painter.end();
m_ui.label_img->setPixmap(pix);
m_ui.label_img->show();
-
- m_ui.label_img_name->setText(QString::fromStdString(name));
}
void ImageCoRViewQtWidget::readSettings() {
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
index f92d49b6e22..b22cf36c98a 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
@@ -63,6 +63,9 @@ StackOfImagesDirs::findImgFiles(const std::string &path) const {
++it;
}
+ // this assumes the usual sorting of images of a stack (directory): a prefix,
+ // and a sequence number (with a fixed number of digits).
+ std::sort(fnames.begin(), fnames.end());
return fnames;
}
--
GitLab
From 803a0e88043e50ec972c3345f404cb5be70ba772 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 30 Sep 2015 09:06:54 +0100
Subject: [PATCH 033/223] extend for new public view methods, add browse-stack
test, re #13140
---
.../test/ImageCoRPresenterTest.h | 29 +++++++++++++++++--
.../CustomInterfaces/test/ImageCoRViewMock.h | 15 ++++++++--
2 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
index 26ca526f165..1613c826cff 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
@@ -42,6 +42,8 @@ public:
testing::NiceMock<MockImageCoRView> mockView;
MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ EXPECT_CALL(mockView, setParams(testing::_)).Times(1);
+
// No errors/warnings
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
@@ -53,6 +55,8 @@ public:
testing::NiceMock<MockImageCoRView> mockView;
MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ EXPECT_CALL(mockView, setParams(testing::_)).Times(1);
+
// One error, no warnings
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
@@ -60,6 +64,28 @@ public:
pres.notify(ImageCoRPresenter::Init);
}
+ void test_browseImgEmptyPath() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ EXPECT_CALL(mockView, askImgOrStackPath()).Times(1).WillOnce(Return(""));
+
+ // No error, no warnings, just ignored
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ // should not get there:
+ EXPECT_CALL(mockView, stackPath()).Times(0);
+ EXPECT_CALL(mockView, showStack(testing::An<const std::string &>()))
+ .Times(0);
+ EXPECT_CALL(mockView,
+ showStack(testing::An<Mantid::API::WorkspaceGroup_sptr &>()))
+ .Times(0);
+ EXPECT_CALL(mockView, updateImgWithIndex(testing::_)).Times(0);
+
+ pres.notify(IImageCoRPresenter::BrowseImgOrStack);
+ }
+
void test_shutDown() {
testing::NiceMock<MockImageCoRView> mockView;
MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
@@ -75,8 +101,7 @@ public:
private:
// boost::shared_ptr
boost::scoped_ptr<testing::NiceMock<MockImageCoRView>> m_view;
- boost::scoped_ptr<MantidQt::CustomInterfaces::ImageCoRPresenter>
- m_presenter;
+ boost::scoped_ptr<MantidQt::CustomInterfaces::ImageCoRPresenter> m_presenter;
// To have one FITS, etc.
Mantid::API::MatrixWorkspace_sptr m_ws;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
index 71eacffbbeb..bf22171c435 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
@@ -8,7 +8,7 @@
class MockImageCoRView : public MantidQt::CustomInterfaces::IImageCoRView {
public:
// void initParams(ImageStackPreParams ¶ms)
- MOCK_METHOD1(initParams,
+ MOCK_METHOD1(setParams,
void(MantidQt::CustomInterfaces::ImageStackPreParams &));
// ImageStackPreParams userSelection() const;
@@ -22,7 +22,10 @@ public:
MOCK_METHOD1(showStack, void(const std::string &));
// void showStack(const Mantid::API::WorkspaceGroup_sptr &ws);
- MOCK_METHOD1(showStack, void(const Mantid::API::WorkspaceGroup_sptr &));
+ MOCK_METHOD1(showStack, void(Mantid::API::WorkspaceGroup_sptr &));
+
+ // void showProjection(const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx);
+ MOCK_METHOD2(showProjection, void(const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx));
// void userWarning(const std::string &warn, const std::string &description)
MOCK_METHOD2(userWarning,
@@ -32,7 +35,13 @@ public:
MOCK_METHOD2(userError,
void(const std::string &err, const std::string &description));
- // virtual std::string askImgOrStackPath() = 0;
+ // size_t currentImgIndex() const;
+ MOCK_CONST_METHOD0(currentImgIndex, size_t());
+
+ // void updateImgWithIndex(size_t idx)
+ MOCK_METHOD1(updateImgWithIndex, void(size_t));
+
+ // std::string askImgOrStackPath() = 0;
MOCK_METHOD0(askImgOrStackPath, std::string());
// void saveSettings() const {}
--
GitLab
From 511a5a3ac4827da3b1740c337f985b775a0bea9a Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 30 Sep 2015 17:56:00 +0100
Subject: [PATCH 034/223] add simple unit test for the stack of images dirs, re
#13140
---
Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt | 1 +
.../CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp | 3 +++
2 files changed, 4 insertions(+)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
index bd484595b5f..b6f0c0e8a52 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -405,6 +405,7 @@ set ( TEST_FILES
ReflGenerateNotebookTest.h
ReflLegacyTransferStrategyTest.h
ReflMainViewPresenterTest.h
+ StackOfImagesDirsTest.h
TomographyIfacePresenterTest.h
UserInputValidatorTest.h
)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
index b22cf36c98a..f4b6fa04a60 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
@@ -70,6 +70,9 @@ StackOfImagesDirs::findImgFiles(const std::string &path) const {
}
void StackOfImagesDirs::findStackDirs(const std::string &path) {
+ if (path.empty())
+ return;
+
Poco::File dir(path);
if (!dir.isDirectory() || !dir.exists())
return;
--
GitLab
From a10364577c8e31071cba21246718c3b59683c5e5 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 30 Sep 2015 17:56:25 +0100
Subject: [PATCH 035/223] add simple unit test for the stack of images dirs, re
#13140
---
.../test/StackOfImagesDirsTest.h | 75 +++++++++++++++++++
1 file changed, 75 insertions(+)
create mode 100644 Code/Mantid/MantidQt/CustomInterfaces/test/StackOfImagesDirsTest.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/StackOfImagesDirsTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/StackOfImagesDirsTest.h
new file mode 100644
index 00000000000..2c3f774d2ea
--- /dev/null
+++ b/Code/Mantid/MantidQt/CustomInterfaces/test/StackOfImagesDirsTest.h
@@ -0,0 +1,75 @@
+#ifndef MANTID_CUSTOMINTERFACES_STACKOFIMAGESDIRSTEST_H
+#define MANTID_CUSTOMINTERFACES_STACKOFIMAGESDIRSTEST_H
+
+#include "MantidAPI/FrameworkManager.h"
+#include "MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h"
+
+#include <boost/scoped_ptr.hpp>
+
+#include <cxxtest/TestSuite.h>
+
+using namespace MantidQt::CustomInterfaces;
+
+class StackOfImagesDirsTest : public CxxTest::TestSuite {
+
+public:
+ // This pair of boilerplate methods prevent the suite being created statically
+ // This means the constructor isn't called when running other tests
+ static StackOfImagesDirsTest *createSuite() {
+ return new StackOfImagesDirsTest();
+ }
+
+ static void destroySuite(StackOfImagesDirsTest *suite) { delete suite; }
+
+ StackOfImagesDirsTest() {
+ Mantid::API::FrameworkManager::Instance(); // make sure the framework is
+ // initialized
+ }
+
+ void setUp() {
+ // just to test more dynamic allocation
+ m_soid.reset(new StackOfImagesDirs(""));
+ }
+
+ void tearDown() {}
+
+ void test_fail() {
+ StackOfImagesDirs obj("");
+
+ TSM_ASSERT("Fail",
+ obj.isValid());
+ }
+
+ void test_construct() {
+ StackOfImagesDirs obj("");
+
+ TSM_ASSERT("A stack just constructed with an empty path string should not be valid",
+ !obj.isValid());
+ }
+
+ void test_description() {
+ StackOfImagesDirs obj("");
+
+ TS_ASSERT_THROWS_NOTHING(obj.description());
+ TSM_ASSERT("A description string should be produced", "" != obj.description());
+ }
+
+ void test_status() {
+ StackOfImagesDirs obj("");
+
+ TS_ASSERT_THROWS_NOTHING(obj.description());
+ TSM_ASSERT("A status string should be produced", "" != obj.status());
+ }
+
+ void test_sampleFiles() {
+ StackOfImagesDirs obj("");
+
+ TS_ASSERT_THROWS_NOTHING(obj.description());
+ TSM_ASSERT("There should not be any sample files in an empty stack", 0 == obj.sampleImagesDir().size());
+ }
+
+private:
+ boost::scoped_ptr<StackOfImagesDirs> m_soid;
+};
+
+#endif /* MANTID_CUSTOMINTERFACES_STACKOFIMAGESDIRSTEST_H */
--
GitLab
From a7c12969a4a3173494adc9e09ac98e2b39027bc2 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 2 Oct 2015 09:51:04 +0100
Subject: [PATCH 036/223] better handling of updates, cache current image, re
#13140
---
.../Tomography/IImageCoRView.h | 18 ++
.../Tomography/ImageCoRViewQtWidget.h | 14 ++
.../src/Tomography/ImageCoRPresenter.cpp | 13 +-
.../src/Tomography/ImageCoRViewQtWidget.cpp | 205 ++++++++++++++----
4 files changed, 207 insertions(+), 43 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
index 90e455b9b28..4590201f45a 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
@@ -162,6 +162,24 @@ public:
* Save settings (normally when closing this widget).
*/
virtual void saveSettings() const = 0;
+
+ /**
+ * Forget the current center-of-rotation selection and set to
+ * default.
+ */
+ virtual void resetCoR() = 0;
+
+ /**
+ * Forget the current region-of-interest selection and set to
+ * default (all).
+ */
+ virtual void resetROI() = 0;
+
+ /**
+ * Forget the current selection of region-for-normalization and set
+ * to default (none).
+ */
+ virtual void resetNormArea() = 0;
};
} // namespace CustomInterfaces
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
index 677d3650bdd..d7b12a2aec6 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
@@ -12,6 +12,7 @@
// forward declarations for Qt
class QWidget;
+class QPixmap;
namespace MantidQt {
namespace CustomInterfaces {
@@ -80,10 +81,18 @@ public:
void saveSettings() const;
+ void resetCoR();
+ void resetROI();
+ void resetNormArea();
+
protected:
void initLayout();
void showImg();
+ void grabCoRFromWidgets();
+ void grabROIFromWidgets();
+ void grabNormAreaFromWidgets();
+
private slots:
void browseImgClicked();
@@ -116,6 +125,7 @@ private:
void showProjectionImage(const Mantid::API::WorkspaceGroup_sptr &wsg,
size_t idx);
+ void refreshROIetAl();
void refreshCoR();
void refreshROI();
void refreshNormArea();
@@ -124,6 +134,10 @@ private:
Mantid::API::WorkspaceGroup_sptr m_stack;
+ /// this holds the base image on top of which rectangles and other
+ /// objects are drawn
+ boost::scoped_ptr<QPixmap> m_basePixmap;
+
/// persistent settings
static const std::string m_settingsGroup;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
index 0f0539ad4f7..b19e3248de3 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -180,17 +180,22 @@ void ImageCoRPresenter::processFinishedROI() {}
void ImageCoRPresenter::processFinishedNormalization() {}
-void ImageCoRPresenter::processResetCoR() {}
+void ImageCoRPresenter::processResetCoR() {
+ m_view->resetCoR();
+}
-void ImageCoRPresenter::processResetROI() {}
+void ImageCoRPresenter::processResetROI() {
+ m_view->resetROI();
+}
-void ImageCoRPresenter::processResetNormalization() {}
+void ImageCoRPresenter::processResetNormalization() {
+ m_view->resetNormArea();
+}
void ImageCoRPresenter::processShutDown() { m_view->saveSettings(); }
Mantid::API::WorkspaceGroup_sptr
ImageCoRPresenter::loadFITSStack(const std::vector<std::string> &imgs) {
- // TODO: go through directory
const std::string wsName = "__stack_fits_viewer_tomography_gui";
auto &ads = Mantid::API::AnalysisDataService::Instance();
if (ads.doesExist(wsName)) {
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
index 0d27ed5fbf2..98f7285fc14 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
@@ -46,6 +46,9 @@ void ImageCoRViewQtWidget::initLayout() {
setupConnections();
initParamWidgets(1, 1);
+ grabCoRFromWidgets();
+ grabROIFromWidgets();
+ grabNormAreaFromWidgets();
// presenter that knows how to handle a IImageCoRView should take care
// of all the logic. Note the view needs to now the concrete presenter here
@@ -81,63 +84,161 @@ void ImageCoRViewQtWidget::setupConnections() {
// parameter (points) widgets
connect(m_ui.spinBox_cor_x, SIGNAL(valueChanged(int)), this,
- SLOT(valueUpdateCoR(int)));
+ SLOT(valueUpdatedCoR(int)));
connect(m_ui.spinBox_cor_y, SIGNAL(valueChanged(int)), this,
- SLOT(valueUpdateCoR(int)));
+ SLOT(valueUpdatedCoR(int)));
connect(m_ui.spinBox_roi_top_x, SIGNAL(valueChanged(int)), this,
- SLOT(valueUpdateROI(int)));
+ SLOT(valueUpdatedROI(int)));
connect(m_ui.spinBox_roi_top_y, SIGNAL(valueChanged(int)), this,
- SLOT(valueUpdateROI(int)));
+ SLOT(valueUpdatedROI(int)));
connect(m_ui.spinBox_roi_bottom_x, SIGNAL(valueChanged(int)), this,
- SLOT(valueUpdateROI(int)));
+ SLOT(valueUpdatedROI(int)));
connect(m_ui.spinBox_roi_bottom_y, SIGNAL(valueChanged(int)), this,
- SLOT(valueUpdateROI(int)));
+ SLOT(valueUpdatedROI(int)));
connect(m_ui.spinBox_norm_top_x, SIGNAL(valueChanged(int)), this,
- SLOT(valueUpdateNormArea(int)));
+ SLOT(valueUpdatedNormArea(int)));
connect(m_ui.spinBox_norm_top_y, SIGNAL(valueChanged(int)), this,
- SLOT(valueUpdateNormArea(int)));
+ SLOT(valueUpdatedNormArea(int)));
connect(m_ui.spinBox_norm_bottom_x, SIGNAL(valueChanged(int)), this,
- SLOT(valueUpdateNormArea(int)));
+ SLOT(valueUpdatedNormArea(int)));
connect(m_ui.spinBox_norm_bottom_y, SIGNAL(valueChanged(int)), this,
- SLOT(valueUpdateNormArea(int)));
+ SLOT(valueUpdatedNormArea(int)));
}
void ImageCoRViewQtWidget::valueUpdatedCoR(int) {
+ grabCoRFromWidgets();
+ refreshROIetAl();
+}
+
+void ImageCoRViewQtWidget::valueUpdatedROI(int) {
+ grabCoRFromWidgets();
+ refreshROIetAl();
+}
+
+void ImageCoRViewQtWidget::valueUpdatedNormArea(int) {
+ grabNormAreaFromWidgets();
+ refreshROIetAl();
+}
+
+void ImageCoRViewQtWidget::grabCoRFromWidgets() {
m_params.cor = Mantid::Kernel::V2D(m_ui.spinBox_cor_x->value(),
m_ui.spinBox_cor_y->value());
- refreshCoR();
}
-void ImageCoRViewQtWidget::valueUpdatedROI(int) {
+void ImageCoRViewQtWidget::grabROIFromWidgets() {
m_params.roi =
std::make_pair(Mantid::Kernel::V2D(m_ui.spinBox_roi_top_x->value(),
m_ui.spinBox_roi_top_y->value()),
Mantid::Kernel::V2D(m_ui.spinBox_roi_bottom_x->value(),
m_ui.spinBox_roi_bottom_y->value()));
- refreshROI();
}
-void ImageCoRViewQtWidget::valueUpdatedNormArea(int) {
+void ImageCoRViewQtWidget::grabNormAreaFromWidgets() {
m_params.normalizationRegion =
std::make_pair(Mantid::Kernel::V2D(m_ui.spinBox_norm_top_x->value(),
m_ui.spinBox_norm_top_y->value()),
Mantid::Kernel::V2D(m_ui.spinBox_norm_bottom_x->value(),
m_ui.spinBox_norm_bottom_y->value()));
- refreshNormArea();
}
void ImageCoRViewQtWidget::refreshCoR() {
- // TODO: display proper symbol
+ const QPixmap *pp = m_ui.label_img->pixmap();
+ if (!pp)
+ return;
+
+ grabCoRFromWidgets();
+ // TODO: display nicer symbol?
+
+ QPixmap toDisplay(*m_basePixmap.get());
+ QPainter painter(&toDisplay);
+ QPen pen(Qt::red);
+ painter.setPen(pen);
+ painter.drawLine(m_params.cor.X() - 5, m_params.cor.Y(), m_params.cor.X() + 5,
+ m_params.cor.Y());
+ painter.drawLine(m_params.cor.X(), m_params.cor.Y() - 5, m_params.cor.X(),
+ m_params.cor.Y() + 5);
+ m_ui.label_img->setPixmap(toDisplay);
+}
+
+void ImageCoRViewQtWidget::refreshROIetAl() {
+
+ const QPixmap *pp = m_ui.label_img->pixmap();
+ if (!pp)
+ return;
+
+ grabCoRFromWidgets();
+ grabROIFromWidgets();
+ grabNormAreaFromWidgets();
+
+ QPixmap toDisplay(*m_basePixmap.get());
+ QPainter painter(&toDisplay);
+
+ QPen penCoR(Qt::red);
+ painter.setPen(penCoR);
+ painter.drawLine(m_params.cor.X() - 5, m_params.cor.Y(), m_params.cor.X() + 5,
+ m_params.cor.Y());
+ painter.drawLine(m_params.cor.X(), m_params.cor.Y() - 5, m_params.cor.X(),
+ m_params.cor.Y() + 5);
+
+ QPen penROI(Qt::green);
+ painter.setPen(penROI);
+ painter.drawRect(m_params.roi.first.X(), m_params.roi.first.Y(),
+ m_params.roi.second.X() - m_params.roi.first.X(),
+ m_params.roi.second.Y() - m_params.roi.first.Y());
+
+ QPen penNA(Qt::yellow);
+ painter.setPen(penNA);
+ painter.drawRect(m_params.normalizationRegion.first.X(),
+ m_params.normalizationRegion.first.Y(),
+ m_params.normalizationRegion.second.X() -
+ m_params.normalizationRegion.first.X(),
+ m_params.normalizationRegion.second.Y() -
+ m_params.normalizationRegion.first.Y());
+
+ m_ui.label_img->setPixmap(toDisplay);
}
void ImageCoRViewQtWidget::refreshROI() {
+ const QPixmap *pp = m_ui.label_img->pixmap();
+ if (!pp)
+ return;
+
+ grabROIFromWidgets();
// TODO: display proper symbol
+
+ // QPixmap const *pm = m_ui.label_img->pixmap();
+ QPixmap toDisplay(*m_basePixmap.get());
+ QPainter painter(&toDisplay);
+ QPen pen(Qt::green);
+ painter.setPen(pen);
+ painter.drawRect(m_params.roi.first.X(), m_params.roi.first.Y(),
+ m_params.roi.second.X() - m_params.roi.first.X(),
+ m_params.roi.second.Y() - m_params.roi.first.Y());
+ m_ui.label_img->setPixmap(toDisplay);
}
void ImageCoRViewQtWidget::refreshNormArea() {
// TODO: display proper symbol
+ const QPixmap *pp = m_ui.label_img->pixmap();
+ if (!pp)
+ return;
+
+ grabNormAreaFromWidgets();
+
+ // QPixmap const *pm = m_ui.label_img->pixmap();
+ QPixmap toDisplay(*m_basePixmap.get());
+ QPainter painter(&toDisplay);
+ QPen pen(Qt::yellow);
+ painter.setPen(pen);
+ painter.drawRect(m_params.normalizationRegion.first.X(),
+ m_params.normalizationRegion.first.Y(),
+ m_params.normalizationRegion.second.X() -
+ m_params.normalizationRegion.first.X(),
+ m_params.normalizationRegion.second.Y() -
+ m_params.normalizationRegion.first.Y());
+ m_ui.label_img->setPixmap(toDisplay);
}
void ImageCoRViewQtWidget::setParams(ImageStackPreParams ¶ms) {
@@ -151,38 +252,33 @@ void ImageCoRViewQtWidget::initParamWidgets(size_t maxWidth, size_t maxHeight) {
m_ui.spinBox_cor_x->setMinimum(0);
m_ui.spinBox_cor_x->setMaximum(width - 1);
- m_ui.spinBox_cor_x->setValue(0);
m_ui.spinBox_cor_y->setMinimum(0);
m_ui.spinBox_cor_y->setMaximum(height - 1);
- m_ui.spinBox_cor_y->setValue(0);
+ resetCoR();
+
+ m_ui.spinBox_roi_top_x->setMinimum(0);
+ m_ui.spinBox_roi_top_x->setMaximum(width - 1);
+ m_ui.spinBox_roi_top_y->setMinimum(0);
+ m_ui.spinBox_roi_top_y->setMaximum(height - 1);
m_ui.spinBox_roi_bottom_x->setMinimum(0);
m_ui.spinBox_roi_bottom_x->setMaximum(width - 1);
- m_ui.spinBox_roi_bottom_x->setValue(0);
m_ui.spinBox_roi_bottom_y->setMinimum(0);
m_ui.spinBox_roi_bottom_y->setMaximum(height - 1);
- m_ui.spinBox_roi_bottom_y->setValue(0);
- m_ui.spinBox_roi_top_x->setMinimum(0);
- m_ui.spinBox_roi_top_x->setMaximum(width - 1);
- m_ui.spinBox_roi_top_x->setValue(0);
- m_ui.spinBox_roi_top_y->setMinimum(0);
- m_ui.spinBox_roi_top_y->setMaximum(height - 1);
- m_ui.spinBox_roi_top_y->setValue(0);
+ resetROI();
+
+ m_ui.spinBox_norm_top_x->setMinimum(0);
+ m_ui.spinBox_norm_top_x->setMaximum(width - 1);
+ m_ui.spinBox_norm_top_y->setMinimum(0);
+ m_ui.spinBox_norm_top_y->setMaximum(height - 1);
m_ui.spinBox_norm_bottom_x->setMinimum(0);
m_ui.spinBox_norm_bottom_x->setMaximum(width - 1);
- m_ui.spinBox_norm_bottom_x->setValue(0);
m_ui.spinBox_norm_bottom_y->setMinimum(0);
m_ui.spinBox_norm_bottom_y->setMaximum(height - 1);
- m_ui.spinBox_norm_bottom_y->setValue(0);
- m_ui.spinBox_norm_top_x->setMinimum(0);
- m_ui.spinBox_norm_top_x->setMaximum(width - 1);
- m_ui.spinBox_norm_top_x->setValue(0);
- m_ui.spinBox_norm_top_y->setMinimum(0);
- m_ui.spinBox_norm_top_y->setMaximum(height - 1);
- m_ui.spinBox_norm_top_y->setValue(0);
+ resetNormArea();
}
void ImageCoRViewQtWidget::setParamWidgets(ImageStackPreParams ¶ms) {
@@ -239,6 +335,29 @@ void ImageCoRViewQtWidget::updateFromImagesSlider(int /* current */) {
m_presenter->notify(IImageCoRPresenter::UpdateImgIndex);
}
+void ImageCoRViewQtWidget::resetCoR() {
+ int midx =
+ (m_ui.spinBox_cor_x->minimum() + m_ui.spinBox_cor_x->maximum()) / 2;
+ m_ui.spinBox_cor_x->setValue(midx);
+ int midy =
+ (m_ui.spinBox_cor_y->minimum() + m_ui.spinBox_cor_y->maximum()) / 2;
+ m_ui.spinBox_cor_y->setValue(midy);
+}
+
+void ImageCoRViewQtWidget::resetROI() {
+ m_ui.spinBox_roi_top_x->setValue(0);
+ m_ui.spinBox_roi_top_y->setValue(0);
+ m_ui.spinBox_roi_bottom_x->setValue(m_ui.spinBox_roi_bottom_x->maximum());
+ m_ui.spinBox_roi_bottom_y->setValue(m_ui.spinBox_roi_bottom_y->maximum());
+}
+
+void ImageCoRViewQtWidget::resetNormArea() {
+ m_ui.spinBox_norm_top_x->setValue(0);
+ m_ui.spinBox_norm_top_y->setValue(0);
+ m_ui.spinBox_norm_bottom_x->setValue(0);
+ m_ui.spinBox_norm_bottom_y->setValue(0);
+}
+
size_t ImageCoRViewQtWidget::currentImgIndex() const {
return m_ui.horizontalScrollBar_img_stack->value();
}
@@ -417,6 +536,7 @@ void ImageCoRViewQtWidget::showProjectionImage(
pix.fill(QColor(0, 0, 0));
m_ui.label_img->setPixmap(pix);
m_ui.label_img->show();
+ m_basePixmap.reset(new QPixmap(pix));
return;
}
@@ -437,13 +557,20 @@ void ImageCoRViewQtWidget::showProjectionImage(
}
// paint and show image
- QPainter painter;
- QPixmap pix(static_cast<int>(width), static_cast<int>(height));
- painter.begin(&pix);
- painter.drawImage(0, 0, rawImg);
- painter.end();
+ // direct from image
+ QPixmap pix = QPixmap::fromImage(rawImg);
m_ui.label_img->setPixmap(pix);
m_ui.label_img->show();
+ m_basePixmap.reset(new QPixmap(pix));
+ // Alternative, drawing with a painter:
+ // QPixmap pix(static_cast<int>(width), static_cast<int>(height));
+ // QPainter painter;
+ // painter.begin(&pix);
+ // painter.drawImage(0, 0, rawImg);
+ // painter.end();
+ // m_ui.label_img->setPixmap(pix);
+ // m_ui.label_img->show();
+ // m_basePixmap.reset(new QPixmap(pix));
}
void ImageCoRViewQtWidget::readSettings() {
--
GitLab
From 2a4902a7c74c492f59bc7484d8a2e0fdf6599d30 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 2 Oct 2015 09:51:22 +0100
Subject: [PATCH 037/223] extend tests, re #13140
---
.../test/ImageCoRPresenterTest.h | 1 +
.../CustomInterfaces/test/ImageCoRViewMock.h | 9 +++
.../test/StackOfImagesDirsTest.h | 56 +++++++++++++++----
3 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
index 1613c826cff..7e04ed47ef6 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
@@ -6,6 +6,7 @@
#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
#include <cxxtest/TestSuite.h>
+
#include "ImageCoRViewMock.h"
using namespace MantidQt::CustomInterfaces;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
index bf22171c435..17e886ce5bb 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
@@ -46,6 +46,15 @@ public:
// void saveSettings() const {}
MOCK_CONST_METHOD0(saveSettings, void());
+
+ // void resetCoR()
+ MOCK_METHOD0(resetCoR, void());
+
+ // void resetROI()
+ MOCK_METHOD0(resetROI, void());
+
+ // void resetNormArea()
+ MOCK_METHOD0(resetNormArea, void());
};
#endif // MANTID_CUSTOMINTERFACES_IMAGECORVIEWMOCK_H
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/StackOfImagesDirsTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/StackOfImagesDirsTest.h
index 2c3f774d2ea..641dd70eb5d 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/test/StackOfImagesDirsTest.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/test/StackOfImagesDirsTest.h
@@ -33,17 +33,11 @@ public:
void tearDown() {}
- void test_fail() {
- StackOfImagesDirs obj("");
-
- TSM_ASSERT("Fail",
- obj.isValid());
- }
-
void test_construct() {
StackOfImagesDirs obj("");
- TSM_ASSERT("A stack just constructed with an empty path string should not be valid",
+ TSM_ASSERT("A stack just constructed with an empty path string should not "
+ "be valid",
!obj.isValid());
}
@@ -51,7 +45,8 @@ public:
StackOfImagesDirs obj("");
TS_ASSERT_THROWS_NOTHING(obj.description());
- TSM_ASSERT("A description string should be produced", "" != obj.description());
+ TSM_ASSERT("A description string should be produced",
+ "" != obj.description());
}
void test_status() {
@@ -61,11 +56,52 @@ public:
TSM_ASSERT("A status string should be produced", "" != obj.status());
}
+ void test_sampleImagesDir() {
+ StackOfImagesDirs obj("");
+
+ TS_ASSERT_THROWS_NOTHING(obj.description());
+ TSM_ASSERT("The sample images directory of an empty stack should be empty",
+ "" == obj.sampleImagesDir());
+ }
+
+ void test_flatImagesDir() {
+ StackOfImagesDirs obj("");
+
+ TS_ASSERT_THROWS_NOTHING(obj.description());
+ TSM_ASSERT("The flat images directory of an empty stack should be empty",
+ "" == obj.flatImagesDir());
+ }
+
+ void test_darkImagesDir() {
+ StackOfImagesDirs obj("");
+
+ TS_ASSERT_THROWS_NOTHING(obj.description());
+ TSM_ASSERT("The dark images directory of an empty stack should be empty",
+ "" == obj.flatImagesDir());
+ }
+
void test_sampleFiles() {
StackOfImagesDirs obj("");
TS_ASSERT_THROWS_NOTHING(obj.description());
- TSM_ASSERT("There should not be any sample files in an empty stack", 0 == obj.sampleImagesDir().size());
+ TSM_ASSERT("There should not be any sample files in an empty stack",
+ 0 == obj.sampleImagesDir().size());
+ }
+
+ void test_flatFiles() {
+ StackOfImagesDirs obj("");
+
+ TS_ASSERT_THROWS_NOTHING(obj.description());
+ TSM_ASSERT("There should not be any flat image files in an empty stack",
+ 0 == obj.flatImagesDir().size());
+ }
+
+ void test_darkFiles() {
+ StackOfImagesDirs obj("");
+
+ TS_ASSERT_THROWS_NOTHING(obj.description());
+ TSM_ASSERT("There should not be any dark image files in an empty stack",
+ 0 == obj.darkImagesDir().size());
}
private:
--
GitLab
From 1280ce2b65cc602e2b2c031028793ed607de3ebf Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Fri, 2 Oct 2015 09:55:14 +0100
Subject: [PATCH 038/223] CompactMD seems to be behaving well for usage
examples
Refs #13508
---
.../Framework/MDAlgorithms/src/CompactMD.cpp | 119 +++++++-----------
1 file changed, 43 insertions(+), 76 deletions(-)
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
index e524fb1fbc7..a7bc29cefa3 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
@@ -4,6 +4,28 @@ using namespace Mantid::API;
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
+namespace {
+std::vector<std::string>
+createPBinStringVector(std::vector<Mantid::coord_t> minVector,
+ std::vector<Mantid::coord_t> maxVector,
+ IMDHistoWorkspace_sptr inputWs) {
+ size_t numDims = inputWs->getNumDims();
+ std::vector<std::string> pBinStrVector;
+ for (size_t iter = 0; iter < numDims; iter++) {
+ // creating pbin string using Min and Max Centre positions
+ auto pBinStr = boost::lexical_cast<std::string>(
+ minVector[iter] -
+ (inputWs->getDimension(iter)->getBinWidth() * 0.5)) +
+ ",0," +
+ boost::lexical_cast<std::string>(
+ maxVector[iter] +
+ (inputWs->getDimension(iter)->getBinWidth() * 0.5));
+ pBinStrVector.push_back(pBinStr);
+ }
+ return pBinStrVector;
+}
+}
+
namespace Mantid {
namespace MDAlgorithms {
@@ -24,61 +46,7 @@ void CompactMD::init() {
void CompactMD::exec() {
const IMDHistoWorkspace_sptr input_ws = this->getProperty("InputWorkspace");
IMDWorkspace_sptr out_ws;
- /* auto xbinWidth = input_ws->getXDimension()->getBinWidth();
- auto ybinWidth = input_ws->getYDimension()->getBinWidth();
- auto zbinWidth = input_ws->getZDimension()->getBinWidth();
- size_t first_non_zero_index = 0;
- size_t signals_read = 0;
- const double orig_minX = input_ws->getXDimension()->getMinimum();
- const double orig_minY = input_ws->getYDimension()->getMinimum();
- const double orig_minZ = input_ws->getZDimension()->getMinimum();
-
- double minX = input_ws->getXDimension()->getMinimum();
- double minY = input_ws->getYDimension()->getMinimum();
- double minZ = input_ws->getZDimension()->getMinimum();
-
- const double orig_maxX = input_ws->getXDimension()->getMaximum();
- const double orig_maxY = input_ws->getYDimension()->getMaximum();
- const double orig_maxZ = input_ws->getZDimension()->getMaximum();
-
- double maxX = input_ws->getXDimension()->getMaximum();
- double maxY = input_ws->getYDimension()->getMaximum();
- double maxZ = input_ws->getZDimension()->getMaximum();
-
- size_t nBinsZ = input_ws->getZDimension()->getNBins();
- size_t nBinsY = input_ws->getYDimension()->getNBins();
- size_t nBinsX = input_ws->getXDimension()->getNBins();
- for (size_t z = 0; z < nBinsZ; z++)
- {
- for (size_t y = 0; y < nBinsY; y++)
- {
- for (size_t x = 0; x < nBinsX; x++)
- {
- if (input_ws->getSignalAt(x,y,z) == 0 ){
- break;
- }
- else{
-
- if (input_ws->getXDimension()->getX(x) < minX) {minX =
- orig_minX + xbinWidth*x;}
- if (input_ws->getXDimension()->getX(x) > maxX) {maxX =
- orig_maxX + xbinWidth*x;}
- if (input_ws->getYDimension()->getX(y) < minY) {minY =
- orig_minY + ybinWidth*y;}
- if (input_ws->getYDimension()->getX(y) > maxY) {maxY =
- orig_maxY + ybinWidth*y;}
- if (input_ws->getZDimension()->getX(z) < minZ) {minZ =
- orig_minZ + zbinWidth*z;}
- if (input_ws->getZDimension()->getX(z) > maxZ) {maxZ =
- orig_maxZ + zbinWidth*z;}
- }
- }
- }
- }
-
-
- */
const size_t nDimensions = input_ws->getNumDims();
std::vector<Mantid::coord_t> minVector;
std::vector<Mantid::coord_t> maxVector;
@@ -89,37 +57,36 @@ void CompactMD::exec() {
maxVector.push_back(input_ws->getDimension(index)->getMinimum());
}
// start our search for the first non-zero signal index.
- auto ws_iter = input_ws->createIterator();
- while(ws_iter->next()){
- if (ws_iter->getSignal() == 0) {
- continue;
- } else {
- auto current_index = ws_iter->getLinearIndex();
- auto current_center = input_ws->getCenter(current_index);
- for (auto index = 0; index < input_ws->getNumDims(); index++){
- if (current_center[index] > maxVector[index]){maxVector[index] = current_center[index];}
- if (current_center[index] < minVector[index]){minVector[index] = current_center[index];}
+ auto ws_iter = input_ws->createIterator();
+ while (ws_iter->next()) {
+ if (ws_iter->getSignal() == 0) {
+ continue;
+ } else {
+ auto current_index = ws_iter->getLinearIndex();
+ auto current_center = input_ws->getCenter(current_index);
+ for (auto index = 0; index < input_ws->getNumDims(); index++) {
+ if (current_center[index] > maxVector[index]) {
+ maxVector[index] = current_center[index];
+ }
+ if (current_center[index] < minVector[index]) {
+ minVector[index] = current_center[index];
}
-
}
}
+ }
std::cout << "minX : " << minVector[0] << " maxX : " << maxVector[0] << "\n";
std::cout << "minY : " << minVector[1] << " maxY : " << maxVector[1] << "\n";
std::cout << "minZ : " << minVector[2] << " maxZ : " << maxVector[2] << "\n";
+
+ auto pBinStrings = createPBinStringVector(minVector, maxVector, input_ws);
+
auto cut_alg = this->createChildAlgorithm("CutMD");
cut_alg->setProperty("InputWorkspace", input_ws);
cut_alg->setProperty("OutputWorkspace", "temp");
- cut_alg->setProperty("P1Bin",
- boost::lexical_cast<std::string>(minVector[0]-(input_ws->getDimension(0)->getBinWidth()*0.5)) + ",0," +
- boost::lexical_cast<std::string>(maxVector[0]+(input_ws->getDimension(0)->getBinWidth()*0.5)));
- cut_alg->setProperty("P2Bin",
- boost::lexical_cast<std::string>(minVector[1]-(input_ws->getDimension(1)->getBinWidth()*0.5)) + ",0," +
- boost::lexical_cast<std::string>(maxVector[1]+(input_ws->getDimension(1)->getBinWidth()*0.5)));
- cut_alg->setProperty("P3Bin",
- boost::lexical_cast<std::string>(minVector[2]-(input_ws->getDimension(2)->getBinWidth()*0.5)) + ",0," +
- boost::lexical_cast<std::string>(maxVector[2]+(input_ws->getDimension(2)->getBinWidth()*0.5)));
- cut_alg->setProperty("P4Bin",boost::lexical_cast<std::string>(minVector[3]-(input_ws->getDimension(3)->getBinWidth()*0.5)) + ",0," +
- boost::lexical_cast<std::string>(maxVector[3]+(input_ws->getDimension(3)->getBinWidth()*0.5)));
+ for (size_t iter = 0; iter < input_ws->getNumDims(); iter++){
+ std::string propertyString = "P" + boost::lexical_cast<std::string>(iter+1) + "Bin";
+ cut_alg->setProperty(propertyString, pBinStrings[iter]);
+ }
cut_alg->execute();
IMDWorkspace_sptr temp = cut_alg->getProperty("OutputWorkspace");
--
GitLab
From d9a3bf2b02d9807d1cc6d8a5b651e72cb17d5be1 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Fri, 2 Oct 2015 11:22:24 +0100
Subject: [PATCH 039/223] Refactored finding min, max extents
Refs #13508
---
.../inc/MantidMDAlgorithms/CompactMD.h | 44 ++++++++--
.../Framework/MDAlgorithms/src/CompactMD.cpp | 86 +++++++++++--------
2 files changed, 85 insertions(+), 45 deletions(-)
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
index a4d3cf6c99c..1306c02958d 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
@@ -1,6 +1,34 @@
#ifndef MANTID_MDALGORITHMS_COMPACTMD_H_
#define MANTID_MDALGORITHMS_COMPACTMD_H_
+/** An algorithm used to crop an MDHistoWorkspace based on the first
+ non-zero signals found in each dimension.
+
+ @author Matt King
+ @date 02-10-2015
+
+ Copyright © 2015 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
+ National Laboratory & European Spallation Source
+
+ This file is part of Mantid.
+
+ Mantid is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ Mantid is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ File change history is stored at: <https://github.com/mantidproject/mantid>
+ Code Documentation is available at: <http://doxygen.mantidproject.org>
+*/
+
#include "MantidAPI/IMDHistoWorkspace.h"
#include "MantidDataObjects/MDHistoWorkspace.h"
#include "MantidMDAlgorithms/CutMD.h"
@@ -8,7 +36,7 @@
#include "boost/shared_ptr.hpp"
namespace Mantid {
namespace MDAlgorithms {
- class DLLExport CompactMD : public API::DataProcessorAlgorithm{
+class DLLExport CompactMD : public API::DataProcessorAlgorithm {
public:
CompactMD(){};
~CompactMD(){};
@@ -16,16 +44,18 @@ public:
virtual void init();
virtual void exec();
/// Algorithm's name for identification
- virtual const std::string name() const;
+ const std::string CompactMD::name() const { return "CompactMD"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
- return "Compacts an MDWorkspace based on the first non-zero intensities";
+ const std::string summary() const {
+ return "Crops an MDHistoWorkspace based on the first non-zero signals "
+ "giving a more focussed area of interest.";
}
/// Algorithm's version for identification
- virtual int version() const{return 1;}
+ int version() const { return 1; }
- virtual Mantid::API::IMDHistoWorkspace_sptr
- compactWorkspace(Mantid::API::IMDHistoWorkspace_sptr workspace);
+ void findFirstNonZeroMinMaxExtents(Mantid::API::IMDHistoWorkspace_sptr inputWs,
+ std::vector<Mantid::coord_t> &minVec,
+ std::vector<Mantid::coord_t> &maxVec);
};
}
}
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
index a7bc29cefa3..c5b55d62f11 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
@@ -5,10 +5,14 @@ using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
namespace {
+// helper method to create a string from min and max extents (with non-zero
+// signals)
+// ready to be used as the PBins for IntegrateMDHistoWorkspace algorithm in
+// exec.
std::vector<std::string>
createPBinStringVector(std::vector<Mantid::coord_t> minVector,
- std::vector<Mantid::coord_t> maxVector,
- IMDHistoWorkspace_sptr inputWs) {
+ std::vector<Mantid::coord_t> maxVector,
+ IMDHistoWorkspace_sptr inputWs) {
size_t numDims = inputWs->getNumDims();
std::vector<std::string> pBinStrVector;
for (size_t iter = 0; iter < numDims; iter++) {
@@ -31,7 +35,32 @@ namespace MDAlgorithms {
DECLARE_ALGORITHM(CompactMD)
-const std::string CompactMD::name() const { return "CompactMD"; }
+void CompactMD::findFirstNonZeroMinMaxExtents(
+ IMDHistoWorkspace_sptr inputWs, std::vector<Mantid::coord_t> &minVec,
+ std::vector<Mantid::coord_t> &maxVec) {
+ auto ws_iter = inputWs->createIterator();
+ while (ws_iter->next()) {
+ if (ws_iter->getSignal() == 0) {
+ // if signal is 0 then go to next index
+ continue;
+ } else {
+ // we have found a non-zero signal we need to compare
+ // the position of the bin with our Min and Max values
+ auto current_index = ws_iter->getLinearIndex();
+ auto current_center = inputWs->getCenter(current_index);
+ for (size_t index = 0; index < inputWs->getNumDims(); index++) {
+ if (current_center[index] > maxVec[index]) {
+ // set new maximum
+ maxVec[index] = current_center[index];
+ }
+ if (current_center[index] < minVec[index]) {
+ // set new minimum
+ minVec[index] = current_center[index];
+ }
+ }
+ }
+ }
+}
void CompactMD::init() {
// input workspace to compact
@@ -39,8 +68,8 @@ void CompactMD::init() {
Direction::Input),
"MDHistoWorkspace to compact");
// output workspace that will have been compacted
- declareProperty(new WorkspaceProperty<IMDWorkspace>("OutputWorkspace", "",
- Direction::Output),
+ declareProperty(new WorkspaceProperty<IMDHistoWorkspace>(
+ "OutputWorkspace", "", Direction::Output),
"Output compacted workspace");
}
void CompactMD::exec() {
@@ -52,52 +81,33 @@ void CompactMD::exec() {
std::vector<Mantid::coord_t> maxVector;
// fill the min/max vectors with values per dimension.
- for (auto index = 0; index < nDimensions; index++) {
+ for (size_t index = 0; index < nDimensions; index++) {
minVector.push_back(input_ws->getDimension(index)->getMaximum());
maxVector.push_back(input_ws->getDimension(index)->getMinimum());
}
// start our search for the first non-zero signal index.
- auto ws_iter = input_ws->createIterator();
- while (ws_iter->next()) {
- if (ws_iter->getSignal() == 0) {
- continue;
- } else {
- auto current_index = ws_iter->getLinearIndex();
- auto current_center = input_ws->getCenter(current_index);
- for (auto index = 0; index < input_ws->getNumDims(); index++) {
- if (current_center[index] > maxVector[index]) {
- maxVector[index] = current_center[index];
- }
- if (current_center[index] < minVector[index]) {
- minVector[index] = current_center[index];
- }
- }
- }
- }
- std::cout << "minX : " << minVector[0] << " maxX : " << maxVector[0] << "\n";
- std::cout << "minY : " << minVector[1] << " maxY : " << maxVector[1] << "\n";
- std::cout << "minZ : " << minVector[2] << " maxZ : " << maxVector[2] << "\n";
+ findFirstNonZeroMinMaxExtents(input_ws, minVector, maxVector);
auto pBinStrings = createPBinStringVector(minVector, maxVector, input_ws);
-
- auto cut_alg = this->createChildAlgorithm("CutMD");
+
+ // creating IntegrateMDHistoWorkspace algorithm to crop our workspace.
+ auto cut_alg = this->createChildAlgorithm("IntegrateMDHistoWorkspace");
cut_alg->setProperty("InputWorkspace", input_ws);
cut_alg->setProperty("OutputWorkspace", "temp");
- for (size_t iter = 0; iter < input_ws->getNumDims(); iter++){
- std::string propertyString = "P" + boost::lexical_cast<std::string>(iter+1) + "Bin";
- cut_alg->setProperty(propertyString, pBinStrings[iter]);
+ // setting property PxBin depending on the number of dimensions the
+ // input workspace has.
+ for (size_t iter = 0; iter < input_ws->getNumDims(); iter++) {
+ std::string propertyString =
+ "P" + boost::lexical_cast<std::string>(iter + 1) + "Bin";
+ cut_alg->setProperty(propertyString, pBinStrings[iter]);
}
cut_alg->execute();
- IMDWorkspace_sptr temp = cut_alg->getProperty("OutputWorkspace");
+ // retrieve the output workspace from IntegrateMDHistoWorkspace
+ IMDHistoWorkspace_sptr temp = cut_alg->getProperty("OutputWorkspace");
out_ws = temp;
-
+ // set output workspace of CompactMD to output of IntegrateMDHistoWorkspace
this->setProperty("OutputWorkspace", out_ws);
}
-
-IMDHistoWorkspace_sptr
-CompactMD::compactWorkspace(IMDHistoWorkspace_sptr workspace) {
- return workspace;
-}
}
}
\ No newline at end of file
--
GitLab
From 208d6eaf30a5e384039959c269fc92ef2af594b6 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Fri, 2 Oct 2015 11:27:54 +0100
Subject: [PATCH 040/223] fixed rhel7 error in CompactMD.h
Refs
Refs #13508
---
.../Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
index 1306c02958d..5e0e0e3b35d 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
@@ -44,7 +44,7 @@ public:
virtual void init();
virtual void exec();
/// Algorithm's name for identification
- const std::string CompactMD::name() const { return "CompactMD"; }
+ const std::string name() const { return "CompactMD"; }
/// Summary of algorithms purpose
const std::string summary() const {
return "Crops an MDHistoWorkspace based on the first non-zero signals "
--
GitLab
From eefa18cfcdfb5cc995f7dfba9d9524636ed7cc82 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Fri, 2 Oct 2015 13:32:21 +0100
Subject: [PATCH 041/223] added category for algorithm
Refs #13508
---
.../Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
index 5e0e0e3b35d..2d515164a0e 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
@@ -50,6 +50,9 @@ public:
return "Crops an MDHistoWorkspace based on the first non-zero signals "
"giving a more focussed area of interest.";
}
+ const std::string category() const{
+ return "MDAlgorithms";
+ }
/// Algorithm's version for identification
int version() const { return 1; }
--
GitLab
From 22950f8f2c011106c9fe27ab191fbc8a62ba68d6 Mon Sep 17 00:00:00 2001
From: Jiao Lin <linjiao@ornl.gov>
Date: Fri, 2 Oct 2015 11:04:19 -0400
Subject: [PATCH 042/223] Re #13572. data struct changed slightly: use name as
the key
---
.../plugins/algorithms/SavePlot1DAsJson.py | 7 +++----
.../plugins/algorithms/SavePlot1DAsJsonTest.py | 12 ++++++------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
index 341dc6ef06b..1ae6b0dca96 100644
--- a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
+++ b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
@@ -76,20 +76,19 @@ class SavePlot1DAsJson(PythonAlgorithm):
return
def _serialize(self, workspace, plotname):
- wname = plotname or workspace.getName()
+ pname = plotname or workspace.getName()
# init dictionary
ishist = workspace.isHistogramData()
plottype = "histogram" if ishist else "point"
serialized = dict(
type = plottype,
data = dict(),
- name = wname,
)
# loop over spectra
for i in range(workspace.getNumberHistograms()):
spectrum_no = workspace.getSpectrum(i).getSpectrumNo()
# Why do we need label?
- # label = "%s_spectrum_%d" % (wname, spectrum_no)
+ # label = "%s_spectrum_%d" % (pname, spectrum_no)
# labels.append(label)
# or title?
# title = "%s - spectrum %d" % (workspace.getTitle(), spectrum_no)
@@ -116,7 +115,7 @@ class SavePlot1DAsJson(PythonAlgorithm):
yunit = unit(workspace.getAxis(1)),
)
serialized['axes'] = axes
- return serialized
+ return {pname: serialized}
# Register algorithm with Mantid
diff --git a/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py b/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
index 9812539d29a..62f8c938fa1 100644
--- a/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
+++ b/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
@@ -26,8 +26,7 @@ class SavePlot1DAsJsonTest(unittest.TestCase):
# executed?
self.assertTrue(alg_test.isExecuted())
# Verify ....
- d = json.load(open(out_path))
- self.assertEqual(d['name'], datawsname)
+ d = json.load(open(out_path))[datawsname]
self.assertEqual(d['type'], 'point')
self._checkData(d, E, I, err)
# Delete the output file
@@ -50,7 +49,7 @@ class SavePlot1DAsJsonTest(unittest.TestCase):
# Executed?
self.assertTrue(alg_test.isExecuted())
# Verify ....
- d = json.load(open(out_path))
+ d = json.load(open(out_path))[datawsname]
self._checkData(d, E, I, err)
# test overwrite
alg_test = run_algorithm(
@@ -76,7 +75,7 @@ class SavePlot1DAsJsonTest(unittest.TestCase):
# executed?
self.assertTrue(alg_test.isExecuted())
# Verify ....
- d = json.load(open(out_path))
+ d = json.load(open(out_path))[datawsname]
self._checkData(d, E, I, err)
self._checkData(d, E, I2, err2, ID="2")
# Delete the output file
@@ -88,6 +87,7 @@ class SavePlot1DAsJsonTest(unittest.TestCase):
""" Test to Save one curve with a name specified by client
"""
datawsname = "TestOneCurve"
+ plotname = "myplot"
E, I, err = self._createOneCurve(datawsname)
# Execute
out_path = "tempout_curve_withname.json"
@@ -95,11 +95,11 @@ class SavePlot1DAsJsonTest(unittest.TestCase):
"SavePlot1DAsJson",
InputWorkspace = datawsname,
JsonFilename = out_path,
- PlotName = "myplot")
+ PlotName = plotname)
# executed?
self.assertTrue(alg_test.isExecuted())
# Verify ....
- d = json.load(open(out_path))
+ d = json.load(open(out_path))[plotname]
self._checkData(d, E, I, err)
# Delete the output file
os.remove(out_path)
--
GitLab
From 93a22c7ed989eaf76192af9f8559a53df93cb246 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Fri, 2 Oct 2015 16:16:20 +0100
Subject: [PATCH 043/223] creating unit tests for CompactMD algorithm
Refs #13508
---
.../inc/MantidMDAlgorithms/CompactMD.h | 2 +-
.../MDAlgorithms/test/CompactMDTest.h | 29 +++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
index 2d515164a0e..b5fc04579b1 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
@@ -36,7 +36,7 @@
#include "boost/shared_ptr.hpp"
namespace Mantid {
namespace MDAlgorithms {
-class DLLExport CompactMD : public API::DataProcessorAlgorithm {
+class DLLExport CompactMD : public API::Algorithm {
public:
CompactMD(){};
~CompactMD(){};
diff --git a/Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h b/Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h
new file mode 100644
index 00000000000..d16ef9111df
--- /dev/null
+++ b/Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -0,0 +1,29 @@
+#ifndef MANTID_MDALGORITHMS_COMPACTMD_H_
+#define MANTID_MDALGORITHMS_COMPACTMD_H_
+#include <cxxtest/TestSuite.h>
+#include "MantidMDAlgorithms/CompactMD.h"
+#include "MantidDataObjects/MDHistoWorkspace.h"
+#include "MantidTestHelpers/MDEventsTestHelper.h"
+
+using Mantid::MDAlgorithms::CompactMD;
+using namespace Mantid::API;
+
+class CompactMDTest : public CxxTest::TestSuite
+{
+public:
+ // This pair of boilerplate methods prevent the suite being created statically
+ // This means the constructor isn't called when running other tests
+ static CompactMDTest *createSuite(){return new CompactMDTest();}
+ static void destroySuite(CompactMDTest *suite) {delete suite;}
+
+ void test_Init()
+ {
+ CompactMD alg;
+ TSM_ASSERT_THROWS_NOTHING(alg.initialize() );
+ TS_ASSERT( alg);
+ }
+};
+
+
+#endif // !MANTID_MDALGORITHMS_COMPACTMD_H_
+
--
GitLab
From 3856aa0e83031abb128d792d0c2204d2b83b4446 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 6 Oct 2015 11:10:54 +0100
Subject: [PATCH 044/223] add some tool tip messages for push buttons, re
#13140
---
.../Tomography/ImageSelectCoRAndRegions.ui | 29 ++++++++++++++-----
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
index 4778552fcda..c71dbfed6a8 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
@@ -74,20 +74,20 @@
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_img_seq">
<property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
- <width>0</width>
+ <width>100</width>
<height>28</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>16777215</width>
+ <width>100</width>
<height>28</height>
</size>
</property>
@@ -305,6 +305,9 @@
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="pushButton_cor">
+ <property name="toolTip">
+ <string>After pushing this button, click on the image to select</string>
+ </property>
<property name="text">
<string>Select</string>
</property>
@@ -417,7 +420,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
- <string>Top-left</string>
+ <string>Corner 1</string>
</property>
</widget>
</item>
@@ -444,7 +447,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
- <string>Bottom-right:</string>
+ <string>Corner 2</string>
</property>
</widget>
</item>
@@ -472,6 +475,9 @@
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QPushButton" name="pushButton_roi">
+ <property name="toolTip">
+ <string>After pushing this button, click and drag on the image to select</string>
+ </property>
<property name="text">
<string>Select</string>
</property>
@@ -492,6 +498,9 @@
</item>
<item>
<widget class="QPushButton" name="pushButton_roi_reset">
+ <property name="toolTip">
+ <string>Reset to the whole field of view</string>
+ </property>
<property name="text">
<string>Reset</string>
</property>
@@ -545,7 +554,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
- <string>Top-left</string>
+ <string>Corner 1</string>
</property>
</widget>
</item>
@@ -572,7 +581,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
- <string>Bottom-right:</string>
+ <string>Corner 2</string>
</property>
</widget>
</item>
@@ -600,6 +609,9 @@
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QPushButton" name="pushButton_norm_area">
+ <property name="toolTip">
+ <string>After pushing this button, click and drag on the image to select</string>
+ </property>
<property name="text">
<string>Select</string>
</property>
@@ -620,6 +632,9 @@
</item>
<item>
<widget class="QPushButton" name="pushButton_norm_area_reset">
+ <property name="toolTip">
+ <string>Reset to empty/none</string>
+ </property>
<property name="text">
<string>Reset</string>
</property>
--
GitLab
From ab33837b55ed7f89dddebb6b46bde9a93f98ce80 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 6 Oct 2015 12:14:36 +0100
Subject: [PATCH 045/223] casts and prepare event filter, re #13140
---
.../Tomography/IImageCoRView.h | 44 +++++++--
.../Tomography/ImageCoRPresenter.h | 3 +
.../Tomography/ImageCoRViewQtWidget.h | 12 ++-
.../src/Tomography/ImageCoRPresenter.cpp | 31 +++---
.../src/Tomography/ImageCoRViewQtWidget.cpp | 96 +++++++++++++------
.../test/ImageCoRPresenterTest.h | 5 +-
.../CustomInterfaces/test/ImageCoRViewMock.h | 11 ++-
7 files changed, 139 insertions(+), 63 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
index 4590201f45a..d0094440c0b 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
@@ -44,6 +44,16 @@ public:
IImageCoRView(){};
virtual ~IImageCoRView(){};
+ // Selection states
+ enum SelectionState {
+ SelectNone, ///< Init, or after any reset
+ SelectCoR,
+ SelectROIFirst,
+ SelectROISecond,
+ SelectNormAreaFirst,
+ SelectNormAreaSecond
+ };
+
/**
* Sets the user selection. This should guarantee that all widgets
* are updated (including spin boxes, image, slider through the
@@ -63,14 +73,11 @@ public:
virtual ImageStackPreParams userSelection() const = 0;
/**
- * Path to a stack of images that the user has requested to
- * display. The path would be expected to point to a recognized
- * directory structure (sample/dark/white) or image file (as a
- * particular case).
+ * Update to a new state (for example select CoR).
*
- * @return directory of file path as a string
+ * @param new state we're transitioning into.
*/
- virtual std::string stackPath() const = 0;
+ virtual void changeSelectionState(const SelectionState state) = 0;
/**
* Display a special case of stack of images: individual image, from
@@ -94,8 +101,22 @@ public:
* @param ws Workspace group where every workspace is a FITS or
* similar image that has been loaded with LoadFITS or similar
* algorithm.
+ *
+ * @param the (valid) path for this stack, from which it the
+ * workspace group was loaded, in whatever directory layout is being
+ * used (unknown to this view).
+ */
+ virtual void showStack(Mantid::API::WorkspaceGroup_sptr &ws,
+ const std::string &m_stackPath) = 0;
+
+ /**
+ * Get the stack of images currently being displayed (it has been
+ * shown using showStack()), as a workspace group.
+ *
+ * @return workspace group containing the individual images, which
+ * can be empty if no stack has been loaded.
*/
- virtual void showStack(Mantid::API::WorkspaceGroup_sptr &ws) = 0;
+ virtual const Mantid::API::WorkspaceGroup_sptr stack() const = 0;
/**
* Normally one image (projection for tomography stacks) will be
@@ -150,11 +171,14 @@ public:
virtual void updateImgWithIndex(size_t idx) = 0;
/**
- * Get from the user the path/location of a stack of images (or
- * single image as a particular case).
+ * Get the path/location of a stack of images (or single image as a
+ * particular case) that the user is requesting to display. The
+ * path would be expected to point to a recognized directory
+ * structure (sample/dark/white) or image file (as a particular
+ * case).
*
* @return location (can be a directory, file, etc.) that needs to
- * be figured out
+ * be figured out elsewhere.
*/
virtual std::string askImgOrStackPath() = 0;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
index 67bb1e1aa60..b0031c5f840 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
@@ -78,6 +78,9 @@ private:
void loadFITSImage(const std::string &path, const std::string &wsName);
+ /// path to the image stack being visualized
+ std::string m_stackPath;
+
/// Associated view for this presenter (MVP pattern)
IImageCoRView *const m_view;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
index d7b12a2aec6..501924775b0 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
@@ -59,13 +59,15 @@ public:
ImageStackPreParams userSelection() const;
- virtual std::string stackPath() const { return m_stackPath; };
+ void changeSelectionState(const SelectionState state);
/// show a stack of images given the path to the files
void showStack(const std::string &path);
/// show a stack of images that have been loaded into a group of workspaces
- void showStack(Mantid::API::WorkspaceGroup_sptr &ws);
+ void showStack(Mantid::API::WorkspaceGroup_sptr &ws, const std::string &path);
+
+ const Mantid::API::WorkspaceGroup_sptr stack() const { return m_stack; }
void showProjection(const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx);
@@ -130,6 +132,8 @@ private:
void refreshROI();
void refreshNormArea();
+ bool eventFilter(QObject *obj, QEvent *event);
+
Ui::ImageSelectCoRAndRegions m_ui;
Mantid::API::WorkspaceGroup_sptr m_stack;
@@ -144,8 +148,8 @@ private:
/// parameters currently set by the user
ImageStackPreParams m_params;
- /// path to the image stack being visualized
- std::string m_stackPath;
+ /// are we picking the CoR, or the first point of the ROI, etc.
+ SelectionState m_selectionState;
// presenter as in the model-view-presenter
boost::scoped_ptr<IImageCoRPresenter> m_presenter;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
index b19e3248de3..e65df38784c 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -94,9 +94,11 @@ void ImageCoRPresenter::processInit() {
void ImageCoRPresenter::processBrowseImg() {
const std::string path = m_view->askImgOrStackPath();
- if (!path.empty()) {
- processNewStack();
- }
+ if (path.empty())
+ return;
+
+ m_stackPath = path;
+ processNewStack();
}
/**
@@ -129,9 +131,7 @@ StackOfImagesDirs ImageCoRPresenter::checkInputStack(const std::string &path) {
}
void ImageCoRPresenter::processNewStack() {
- const std::string pstr = m_view->stackPath();
-
- StackOfImagesDirs soid = checkInputStack(pstr);
+ StackOfImagesDirs soid = checkInputStack(m_stackPath);
std::vector<std::string> imgs = soid.sampleFiles();
if (0 >= imgs.size()) {
@@ -153,11 +153,11 @@ void ImageCoRPresenter::processNewStack() {
"Even though a directory apparently holding a stack of images was "
"found, "
"it was not possible to load any image file correctly from: " +
- pstr);
+ m_stackPath);
return;
}
- m_view->showStack(wsg);
+ m_view->showStack(wsg, m_stackPath);
// clean-up container group workspace? Not for now
if (false && wsg)
@@ -168,11 +168,17 @@ void ImageCoRPresenter::processUpdateImgIndex() {
m_view->updateImgWithIndex(m_view->currentImgIndex());
}
-void ImageCoRPresenter::processSelectCoR() {}
+void ImageCoRPresenter::processSelectCoR() {
+ m_view->changeSelectionState(IImageCoRView::SelectCoR);
+}
-void ImageCoRPresenter::processSelectROI() {}
+void ImageCoRPresenter::processSelectROI() {
+ m_view->changeSelectionState(IImageCoRView::SelectROIFirst);
+}
-void ImageCoRPresenter::processSelectNormalization() {}
+void ImageCoRPresenter::processSelectNormalization() {
+ m_view->changeSelectionState(IImageCoRView::SelectNormAreaFirst);
+}
void ImageCoRPresenter::processFinishedCoR() {}
@@ -182,14 +188,17 @@ void ImageCoRPresenter::processFinishedNormalization() {}
void ImageCoRPresenter::processResetCoR() {
m_view->resetCoR();
+ m_view->changeSelectionState(IImageCoRView::SelectNone);
}
void ImageCoRPresenter::processResetROI() {
m_view->resetROI();
+ m_view->changeSelectionState(IImageCoRView::SelectNone);
}
void ImageCoRPresenter::processResetNormalization() {
m_view->resetNormArea();
+ m_view->changeSelectionState(IImageCoRView::SelectNone);
}
void ImageCoRPresenter::processShutDown() { m_view->saveSettings(); }
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
index 98f7285fc14..109349cbfeb 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
@@ -23,8 +23,14 @@ const std::string ImageCoRViewQtWidget::m_settingsGroup =
"CustomInterfaces/ImageCoRView";
ImageCoRViewQtWidget::ImageCoRViewQtWidget(QWidget *parent)
- : QWidget(parent), IImageCoRView(), m_presenter(NULL) {
+ : QWidget(parent), IImageCoRView(), m_selectionState(SelectNone),
+ m_presenter(NULL) {
initLayout();
+
+ // using an event filter. might be worth refactoring into a specific
+ // QLabel + selection of ROI+NormArea+CoR class
+ // not using Qwt Pickers to avoid Qwt version issues..
+ m_ui.label_img->installEventFilter(this);
}
void ImageCoRViewQtWidget::initLayout() {
@@ -107,6 +113,17 @@ void ImageCoRViewQtWidget::setupConnections() {
SLOT(valueUpdatedNormArea(int)));
}
+bool ImageCoRViewQtWidget::eventFilter(QObject *obj, QEvent *event) {
+ if (m_ui.label_img == obj) {
+ if (event->type() == QEvent::MouseButtonPress) {
+ } else if (event->type() == QEvent::MouseButtonRelease) {
+ } else if (event->type() == QEvent::MouseMove) {
+ }
+ }
+ // pass on the event up to the parent class
+ return false;
+}
+
void ImageCoRViewQtWidget::valueUpdatedCoR(int) {
grabCoRFromWidgets();
refreshROIetAl();
@@ -155,10 +172,14 @@ void ImageCoRViewQtWidget::refreshCoR() {
QPainter painter(&toDisplay);
QPen pen(Qt::red);
painter.setPen(pen);
- painter.drawLine(m_params.cor.X() - 5, m_params.cor.Y(), m_params.cor.X() + 5,
- m_params.cor.Y());
- painter.drawLine(m_params.cor.X(), m_params.cor.Y() - 5, m_params.cor.X(),
- m_params.cor.Y() + 5);
+ painter.drawLine(static_cast<int>(m_params.cor.X() - 5),
+ static_cast<int>(m_params.cor.Y()),
+ static_cast<int>(m_params.cor.X() + 5),
+ static_cast<int>(m_params.cor.Y()));
+ painter.drawLine(static_cast<int>(m_params.cor.X()),
+ static_cast<int>(m_params.cor.Y() - 5),
+ static_cast<int>(m_params.cor.X()),
+ static_cast<int>(m_params.cor.Y() + 5));
m_ui.label_img->setPixmap(toDisplay);
}
@@ -177,25 +198,31 @@ void ImageCoRViewQtWidget::refreshROIetAl() {
QPen penCoR(Qt::red);
painter.setPen(penCoR);
- painter.drawLine(m_params.cor.X() - 5, m_params.cor.Y(), m_params.cor.X() + 5,
- m_params.cor.Y());
- painter.drawLine(m_params.cor.X(), m_params.cor.Y() - 5, m_params.cor.X(),
- m_params.cor.Y() + 5);
+ painter.drawLine(static_cast<int>(m_params.cor.X() - 5),
+ static_cast<int>(m_params.cor.Y()),
+ static_cast<int>(m_params.cor.X() + 5),
+ static_cast<int>(m_params.cor.Y()));
+ painter.drawLine(static_cast<int>(m_params.cor.X()),
+ static_cast<int>(m_params.cor.Y() - 5),
+ static_cast<int>(m_params.cor.X()),
+ static_cast<int>(m_params.cor.Y() + 5));
QPen penROI(Qt::green);
painter.setPen(penROI);
- painter.drawRect(m_params.roi.first.X(), m_params.roi.first.Y(),
- m_params.roi.second.X() - m_params.roi.first.X(),
- m_params.roi.second.Y() - m_params.roi.first.Y());
+ painter.drawRect(
+ static_cast<int>(m_params.roi.first.X()),
+ static_cast<int>(m_params.roi.first.Y()),
+ static_cast<int>(m_params.roi.second.X() - m_params.roi.first.X()),
+ static_cast<int>(m_params.roi.second.Y() - m_params.roi.first.Y()));
QPen penNA(Qt::yellow);
painter.setPen(penNA);
- painter.drawRect(m_params.normalizationRegion.first.X(),
- m_params.normalizationRegion.first.Y(),
- m_params.normalizationRegion.second.X() -
- m_params.normalizationRegion.first.X(),
- m_params.normalizationRegion.second.Y() -
- m_params.normalizationRegion.first.Y());
+ painter.drawRect(static_cast<int>(m_params.normalizationRegion.first.X()),
+ static_cast<int>(m_params.normalizationRegion.first.Y()),
+ static_cast<int>(m_params.normalizationRegion.second.X() -
+ m_params.normalizationRegion.first.X()),
+ static_cast<int>(m_params.normalizationRegion.second.Y() -
+ m_params.normalizationRegion.first.Y()));
m_ui.label_img->setPixmap(toDisplay);
}
@@ -213,9 +240,11 @@ void ImageCoRViewQtWidget::refreshROI() {
QPainter painter(&toDisplay);
QPen pen(Qt::green);
painter.setPen(pen);
- painter.drawRect(m_params.roi.first.X(), m_params.roi.first.Y(),
- m_params.roi.second.X() - m_params.roi.first.X(),
- m_params.roi.second.Y() - m_params.roi.first.Y());
+ painter.drawRect(
+ static_cast<int>(m_params.roi.first.X()),
+ static_cast<int>(m_params.roi.first.Y()),
+ static_cast<int>(m_params.roi.second.X() - m_params.roi.first.X()),
+ static_cast<int>(m_params.roi.second.Y() - m_params.roi.first.Y()));
m_ui.label_img->setPixmap(toDisplay);
}
@@ -232,12 +261,12 @@ void ImageCoRViewQtWidget::refreshNormArea() {
QPainter painter(&toDisplay);
QPen pen(Qt::yellow);
painter.setPen(pen);
- painter.drawRect(m_params.normalizationRegion.first.X(),
- m_params.normalizationRegion.first.Y(),
- m_params.normalizationRegion.second.X() -
- m_params.normalizationRegion.first.X(),
- m_params.normalizationRegion.second.Y() -
- m_params.normalizationRegion.first.Y());
+ painter.drawRect(static_cast<int>(m_params.normalizationRegion.first.X()),
+ static_cast<int>(m_params.normalizationRegion.first.Y()),
+ static_cast<int>(m_params.normalizationRegion.second.X() -
+ m_params.normalizationRegion.first.X()),
+ static_cast<int>(m_params.normalizationRegion.second.Y() -
+ m_params.normalizationRegion.first.Y()));
m_ui.label_img->setPixmap(toDisplay);
}
@@ -306,6 +335,11 @@ ImageStackPreParams ImageCoRViewQtWidget::userSelection() const {
return m_params;
}
+void ImageCoRViewQtWidget::changeSelectionState(
+ const IImageCoRView::SelectionState state) {
+ m_selectionState = state;
+}
+
void ImageCoRViewQtWidget::corClicked() {
m_presenter->notify(IImageCoRPresenter::SelectCoR);
}
@@ -324,7 +358,7 @@ void ImageCoRViewQtWidget::normAreaClicked() {
m_presenter->notify(IImageCoRPresenter::SelectROI);
}
void ImageCoRViewQtWidget::normAreaResetClicked() {
- m_presenter->notify(IImageCoRPresenter::ResetROI);
+ m_presenter->notify(IImageCoRPresenter::ResetNormalization);
}
void ImageCoRViewQtWidget::browseImgClicked() {
@@ -391,8 +425,7 @@ std::string ImageCoRViewQtWidget::askImgOrStackPath() {
MantidQt::API::AlgorithmInputHistory::Instance().setPreviousDirectory(path);
}
- m_stackPath = path.toStdString();
- return m_stackPath;
+ return path.toStdString();
}
void ImageCoRViewQtWidget::showStack(const std::string & /*path*/) {
@@ -403,7 +436,8 @@ void ImageCoRViewQtWidget::showStack(const std::string & /*path*/) {
// b) load as workspace group - this is done in the overloaded method below
}
-void ImageCoRViewQtWidget::showStack(Mantid::API::WorkspaceGroup_sptr &wsg) {
+void ImageCoRViewQtWidget::showStack(Mantid::API::WorkspaceGroup_sptr &wsg,
+ const std::string &stackPath) {
if (0 == wsg->size())
return;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
index 7e04ed47ef6..41fdb967e99 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
@@ -76,12 +76,11 @@ public:
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
// should not get there:
- EXPECT_CALL(mockView, stackPath()).Times(0);
EXPECT_CALL(mockView, showStack(testing::An<const std::string &>()))
.Times(0);
EXPECT_CALL(mockView,
- showStack(testing::An<Mantid::API::WorkspaceGroup_sptr &>()))
- .Times(0);
+ showStack(testing::An<Mantid::API::WorkspaceGroup_sptr &>(),
+ testing::An<const std::string &>())).Times(0);
EXPECT_CALL(mockView, updateImgWithIndex(testing::_)).Times(0);
pres.notify(IImageCoRPresenter::BrowseImgOrStack);
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
index 17e886ce5bb..297bc1b4918 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
@@ -15,14 +15,17 @@ public:
MOCK_CONST_METHOD0(userSelection,
MantidQt::CustomInterfaces::ImageStackPreParams());
- // virtual std::string stackPath() const;
- MOCK_CONST_METHOD0(stackPath, std::string());
+ // void changeSelectionState(const SelectionState state);
+ MOCK_METHOD1(changeSelectionState, void(IImageCoRView::SelectionState));
// void showStack(const std::string &path);
MOCK_METHOD1(showStack, void(const std::string &));
// void showStack(const Mantid::API::WorkspaceGroup_sptr &ws);
- MOCK_METHOD1(showStack, void(Mantid::API::WorkspaceGroup_sptr &));
+ MOCK_METHOD2(showStack, void(Mantid::API::WorkspaceGroup_sptr &, const std::string &));
+
+ // const Mantid::API::WorkspaceGroup_sptr stack() const;
+ MOCK_CONST_METHOD0(stack, const Mantid::API::WorkspaceGroup_sptr());
// void showProjection(const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx);
MOCK_METHOD2(showProjection, void(const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx));
@@ -41,7 +44,7 @@ public:
// void updateImgWithIndex(size_t idx)
MOCK_METHOD1(updateImgWithIndex, void(size_t));
- // std::string askImgOrStackPath() = 0;
+ // std::string askImgOrStackPath();
MOCK_METHOD0(askImgOrStackPath, std::string());
// void saveSettings() const {}
--
GitLab
From 9333b9b63f90333438f294369a5cc7ae71ec3188 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Tue, 6 Oct 2015 15:49:46 +0100
Subject: [PATCH 046/223] Starting Unit tests for CompactMD
Refs #13508
---
.../Framework/MDAlgorithms/CMakeLists.txt | 1 +
.../MDAlgorithms/test/CompactMDTest.h | 137 +++++++++++++++---
2 files changed, 121 insertions(+), 17 deletions(-)
diff --git a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
index 8b647880665..dba10366d5e 100644
--- a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
@@ -257,6 +257,7 @@ set ( TEST_FILES
CentroidPeaksMDTest.h
CloneMDWorkspaceTest.h
CompareMDWorkspacesTest.h
+ CompactMDTest.h
ConvertCWPDMDToSpectraTest.h
ConvertCWSDExpToMomentumTest.h
ConvertEventsToMDTest.h
diff --git a/Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h b/Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h
index d16ef9111df..6815991a90b 100644
--- a/Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h
+++ b/Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -1,6 +1,7 @@
-#ifndef MANTID_MDALGORITHMS_COMPACTMD_H_
-#define MANTID_MDALGORITHMS_COMPACTMD_H_
+#ifndef MANTID_MDALGORITHMS_COMPACTMDTEST_H_
+#define MANTID_MDALGORITHMS_COMPACTMDTEST_H_
#include <cxxtest/TestSuite.h>
+
#include "MantidMDAlgorithms/CompactMD.h"
#include "MantidDataObjects/MDHistoWorkspace.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
@@ -8,22 +9,124 @@
using Mantid::MDAlgorithms::CompactMD;
using namespace Mantid::API;
-class CompactMDTest : public CxxTest::TestSuite
-{
-public:
- // This pair of boilerplate methods prevent the suite being created statically
- // This means the constructor isn't called when running other tests
- static CompactMDTest *createSuite(){return new CompactMDTest();}
- static void destroySuite(CompactMDTest *suite) {delete suite;}
+namespace {
- void test_Init()
- {
- CompactMD alg;
- TSM_ASSERT_THROWS_NOTHING(alg.initialize() );
- TS_ASSERT( alg);
- }
-};
+// This helper sets the signal values to the linear index to have some
+// variety
+void resetSignalsToLinearIndexValue(IMDHistoWorkspace_sptr ws) {
+ auto numberOfIndices = static_cast<size_t>(ws->getNPoints());
+ for (size_t i = 0; i < numberOfIndices; ++i) {
+ auto &signal = ws->signalAt(i);
+ signal = static_cast<Mantid::signal_t>(i);
+ }
+}
+}
+//==================
+// Functional Tests
+//==================
+class CompactMDTest : public CxxTest::TestSuite {
+public:
+ // This pair of boilerplate methods prevent the suite being created statically
+ // This means the constructor isn't called when running other tests
+ static CompactMDTest *createSuite() { return new CompactMDTest(); }
+ static void destroySuite(CompactMDTest *suite) { delete suite; }
-#endif // !MANTID_MDALGORITHMS_COMPACTMD_H_
+ void test_Init() {
+ CompactMD alg;
+ TSM_ASSERT_THROWS_NOTHING("Instance of CompactMD threw: ",
+ alg.initialize());
+ TSM_ASSERT("Instance of CompactMD was not initialised: ",
+ alg.isInitialized());
+ }
+ void
+ test_that_all_non_zero_signals_are_kept_with_data_concentrated_in_the_centre() {
+ /*
+ *testing the effectiveness of CompactMD when the data looks like this:
+ *------------------
+ * Input structure:
+ *------------------
+ * -------------
+ * | | | |
+ * -------------
+ * | |///| |
+ * -------------
+ * | | | |
+ * -------------
+ * -3-2-1 0 1 2 3
+ *---------------------------
+ * Expected output structure:
+ *----------------------------
+ * should trim until the first non-zero value.
+ * -------
+ * |/////|
+ * -------
+ * -1 0 1
+ */
+ using namespace Mantid::DataObjects;
+ const size_t numDims = 1;
+ const double signal = 0.0;
+ const double errorSquared = 1.3;
+ size_t numBins[static_cast<int>(numDims)] = {3};
+ Mantid::coord_t min[static_cast<int>(numDims)] = {-3};
+ Mantid::coord_t max[static_cast<int>(numDims)] = {3};
+ const std::string name("test");
+ auto inWS = MDEventsTestHelper::makeFakeMDHistoWorkspaceGeneral(
+ numDims, signal, errorSquared, numBins, min, max, name);
+ inWS->setSignalAt(1, 1.0); // set middle bin signal to one
+ CompactMD alg;
+ alg.setChild(true);
+ alg.setRethrows(true);
+ alg.initialize();
+ alg.setProperty("InputWorkspace", inWS);
+ alg.setProperty("OutputWorkspace", "out");
+ alg.execute();
+ // output workspace should be cropped so extents ~ [-1,1]
+ IMDHistoWorkspace_sptr outputWorkspace = alg.getProperty("OutputWorkspace");
+ TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
+ outputWorkspace->getSignalAt(0), 1);
+ TSM_ASSERT_EQUALS("Minimum should be cropped to -1: ",
+ outputWorkspace->getDimension(0)->getMinimum(), -1.0);
+ TSM_ASSERT_EQUALS("Maximum should be cropped to 1: ",
+ outputWorkspace->getDimension(0)->getMaximum(), 1.0);
+ TSM_ASSERT_EQUALS("Number of Bins should be 1 : ",
+ outputWorkspace->getDimension(0)->getNBins(), 1.0);
+ TSM_ASSERT_EQUALS("Bin width should be consistent: ",
+ outputWorkspace->getDimension(0)->getBinWidth(),
+ inWS->getDimension(0)->getBinWidth());
+ }
+ void test__all_non_zero_signals_are_kept_with_data_in_each_corner(){
+ /*
+ *testing the effectiveness of CompactMD when the data looks like this:
+ *------------------
+ * Input structure:
+ *------------------
+ * -------------
+ * |///| |///|
+ * -------------
+ * | | | |
+ * -------------
+ * |///| |///|
+ * -------------
+ * -3-2-1 0 1 2 3
+ *---------------------------
+ * Expected output structure:
+ *----------------------------
+ * should not trim the workspace at all.
+ * -------------
+ * |///| |///|
+ * -------------
+ * | | | |
+ * -------------
+ * |///| |///|
+ * -------------
+ * -3-2-1 0 1 2 3
+ */
+ }
+};
+//===================
+// Performance Tests
+//===================
+//TODO:
+#endif // !MANTID_MDALGORITHMS_COMPACTMDTEST_H_
--
GitLab
From 4ba0ecd416a4bacf62cf8288695cb5decad467e7 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 6 Oct 2015 16:57:40 +0100
Subject: [PATCH 047/223] process events in the image stack event filter, re
#13140
---
.../Tomography/IImageCoRView.h | 14 +-
.../Tomography/ImageCoRViewQtWidget.h | 26 ++-
.../src/Tomography/ImageCoRPresenter.cpp | 14 +-
.../src/Tomography/ImageCoRViewQtWidget.cpp | 204 +++++++++++++++---
.../Tomography/TomographyIfaceViewQtGUI.cpp | 2 +-
5 files changed, 222 insertions(+), 38 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
index d0094440c0b..81f64bdb6b8 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
@@ -72,12 +72,21 @@ public:
*/
virtual ImageStackPreParams userSelection() const = 0;
+ /**
+ * The current selection state. For example: nothin/initialized,
+ * selecting CoR, selecting second corner of the normalization area,
+ * selecting first corner of the ROI.
+ *
+ * @return current state
+ */
+ virtual SelectionState selectionState() const = 0;
+
/**
* Update to a new state (for example select CoR).
*
* @param new state we're transitioning into.
*/
- virtual void changeSelectionState(const SelectionState state) = 0;
+ virtual void changeSelectionState(const SelectionState& state) = 0;
/**
* Display a special case of stack of images: individual image, from
@@ -106,8 +115,7 @@ public:
* workspace group was loaded, in whatever directory layout is being
* used (unknown to this view).
*/
- virtual void showStack(Mantid::API::WorkspaceGroup_sptr &ws,
- const std::string &m_stackPath) = 0;
+ virtual void showStack(Mantid::API::WorkspaceGroup_sptr &ws) = 0;
/**
* Get the stack of images currently being displayed (it has been
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
index 501924775b0..037de649329 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
@@ -59,13 +59,15 @@ public:
ImageStackPreParams userSelection() const;
- void changeSelectionState(const SelectionState state);
+ SelectionState selectionState() const { return m_selectionState; }
+
+ void changeSelectionState(const SelectionState& state);
/// show a stack of images given the path to the files
void showStack(const std::string &path);
/// show a stack of images that have been loaded into a group of workspaces
- void showStack(Mantid::API::WorkspaceGroup_sptr &ws, const std::string &path);
+ void showStack(Mantid::API::WorkspaceGroup_sptr &ws);
const Mantid::API::WorkspaceGroup_sptr stack() const { return m_stack; }
@@ -95,6 +97,20 @@ protected:
void grabROIFromWidgets();
void grabNormAreaFromWidgets();
+ void grabCoRFromMousePoint(int x, int y);
+ void grabROICorner1FromMousePoint(int x, int y);
+ void grabROICorner2FromMousePoint(int x, int y);
+ void grabNormAreaCorner1FromMousePoint(int x, int y);
+ void grabNormAreaCorner2FromMousePoint(int x, int y);
+
+ void mouseUpdateCoR(int x, int y);
+ void mouseUpdateROICorners12(int x, int y);
+ void mouseUpdateROICorner2(int x, int y);
+ void mouseFinishROI(int x, int y);
+ void mouseUpdateNormAreaCorners12(int x, int y);
+ void mouseUpdateNormAreaCorner2(int x, int y);
+ void mouseFinishNormArea(int x, int y);
+
private slots:
void browseImgClicked();
@@ -119,6 +135,9 @@ private:
// widget closing
virtual void closeEvent(QCloseEvent *ev);
+ /// enable/disable the groups with spin boxes for the center and corners
+ void enableParamWidgets(bool enable);
+ /// initialize values to defaults and set max/min for the spin boxes
void initParamWidgets(size_t maxWidth, size_t maxHeight);
void setParamWidgets(ImageStackPreParams ¶ms);
@@ -148,6 +167,9 @@ private:
/// parameters currently set by the user
ImageStackPreParams m_params;
+ /// max image size for the current stack
+ int m_imgWidth, m_imgHeight;
+
/// are we picking the CoR, or the first point of the ROI, etc.
SelectionState m_selectionState;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
index e65df38784c..e37b4f4c497 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -157,7 +157,7 @@ void ImageCoRPresenter::processNewStack() {
return;
}
- m_view->showStack(wsg, m_stackPath);
+ m_view->showStack(wsg);
// clean-up container group workspace? Not for now
if (false && wsg)
@@ -180,11 +180,17 @@ void ImageCoRPresenter::processSelectNormalization() {
m_view->changeSelectionState(IImageCoRView::SelectNormAreaFirst);
}
-void ImageCoRPresenter::processFinishedCoR() {}
+void ImageCoRPresenter::processFinishedCoR() {
+ m_view->changeSelectionState(IImageCoRView::SelectNone);
+}
-void ImageCoRPresenter::processFinishedROI() {}
+void ImageCoRPresenter::processFinishedROI() {
+ m_view->changeSelectionState(IImageCoRView::SelectNone);
+}
-void ImageCoRPresenter::processFinishedNormalization() {}
+void ImageCoRPresenter::processFinishedNormalization() {
+ m_view->changeSelectionState(IImageCoRView::SelectNone);
+}
void ImageCoRPresenter::processResetCoR() {
m_view->resetCoR();
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
index 109349cbfeb..3321938acd3 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
@@ -23,8 +23,8 @@ const std::string ImageCoRViewQtWidget::m_settingsGroup =
"CustomInterfaces/ImageCoRView";
ImageCoRViewQtWidget::ImageCoRViewQtWidget(QWidget *parent)
- : QWidget(parent), IImageCoRView(), m_selectionState(SelectNone),
- m_presenter(NULL) {
+ : QWidget(parent), IImageCoRView(), m_imgWidth(0), m_imgHeight(0),
+ m_selectionState(SelectNone), m_presenter(NULL) {
initLayout();
// using an event filter. might be worth refactoring into a specific
@@ -49,6 +49,8 @@ void ImageCoRViewQtWidget::initLayout() {
m_ui.horizontalScrollBar_img_stack->setEnabled(false);
m_ui.lineEdit_img_seq->setText("---");
+ enableParamWidgets(false);
+
setupConnections();
initParamWidgets(1, 1);
@@ -114,10 +116,43 @@ void ImageCoRViewQtWidget::setupConnections() {
}
bool ImageCoRViewQtWidget::eventFilter(QObject *obj, QEvent *event) {
+ // quick ignore
+ if (IImageCoRView::SelectNone == m_selectionState)
+ return false;
+
if (m_ui.label_img == obj) {
- if (event->type() == QEvent::MouseButtonPress) {
- } else if (event->type() == QEvent::MouseButtonRelease) {
- } else if (event->type() == QEvent::MouseMove) {
+
+ QPoint p = m_ui.label_img->mapFromGlobal(QCursor::pos());
+ int x = p.x();
+ int y = p.y();
+ // ignore potential clicks outside of the image
+ if (x >= m_imgWidth || y >= m_imgHeight || x < 0 || y < 0)
+ return false;
+
+ auto type = event->type();
+ if (type == QEvent::MouseButtonPress) {
+
+ if (IImageCoRView::SelectCoR == m_selectionState) {
+ mouseUpdateCoR(x, y);
+ } else if (IImageCoRView::SelectROIFirst == m_selectionState) {
+ mouseUpdateROICorners12(x, y);
+ } else if (IImageCoRView::SelectNormAreaFirst == m_selectionState) {
+ mouseUpdateNormAreaCorners12(x, y);
+ }
+ } else if (type == QEvent::MouseMove) {
+
+ if (IImageCoRView::SelectROISecond == m_selectionState) {
+ mouseUpdateROICorner2(x, y);
+ } else if (IImageCoRView::SelectNormAreaSecond == m_selectionState) {
+ mouseUpdateNormAreaCorner2(x, y);
+ }
+ } else if (type == QEvent::MouseButtonRelease) {
+
+ if (IImageCoRView::SelectROISecond == m_selectionState) {
+ mouseFinishROI(x, y);
+ } else if (IImageCoRView::SelectNormAreaSecond == m_selectionState) {
+ mouseFinishNormArea(x, y);
+ }
}
}
// pass on the event up to the parent class
@@ -130,7 +165,7 @@ void ImageCoRViewQtWidget::valueUpdatedCoR(int) {
}
void ImageCoRViewQtWidget::valueUpdatedROI(int) {
- grabCoRFromWidgets();
+ grabROIFromWidgets();
refreshROIetAl();
}
@@ -160,6 +195,111 @@ void ImageCoRViewQtWidget::grabNormAreaFromWidgets() {
m_ui.spinBox_norm_bottom_y->value()));
}
+void ImageCoRViewQtWidget::grabCoRFromMousePoint(int x, int y) {
+ m_params.cor = Mantid::Kernel::V2D(x, y);
+ m_ui.spinBox_cor_x->setValue(x);
+ m_ui.spinBox_cor_y->setValue(y);
+}
+
+void ImageCoRViewQtWidget::grabROICorner1FromMousePoint(int x, int y) {
+ m_params.roi.first = Mantid::Kernel::V2D(x, y);
+ m_ui.spinBox_roi_top_x->setValue(x);
+ m_ui.spinBox_roi_top_y->setValue(y);
+}
+
+void ImageCoRViewQtWidget::grabROICorner2FromMousePoint(int x, int y) {
+ m_params.roi.second = Mantid::Kernel::V2D(x, y);
+ m_ui.spinBox_roi_bottom_x->setValue(x);
+ m_ui.spinBox_roi_bottom_y->setValue(y);
+}
+
+void ImageCoRViewQtWidget::grabNormAreaCorner1FromMousePoint(int x, int y) {
+ m_params.normalizationRegion.first = Mantid::Kernel::V2D(x, y);
+ m_ui.spinBox_norm_top_x->setValue(x);
+ m_ui.spinBox_norm_top_y->setValue(y);
+}
+
+void ImageCoRViewQtWidget::grabNormAreaCorner2FromMousePoint(int x, int y) {
+ m_params.normalizationRegion.second = Mantid::Kernel::V2D(x, y);
+ m_ui.spinBox_norm_bottom_x->setValue(x);
+ m_ui.spinBox_norm_bottom_y->setValue(y);
+}
+
+/**
+ * This is an update and implicity a finish, as there's only one
+ * update for the CoR (single point-click). The coordinates count as
+ * usual in Qt widgets. Top-left is (0,0).
+ *
+ * @param x position on x axis (local to the image)
+ * @param x position on y axis (local to the image)
+ */
+void ImageCoRViewQtWidget::mouseUpdateCoR(int x, int y) {
+ grabCoRFromMousePoint(x, y);
+ refreshROIetAl();
+
+ m_presenter->notify(IImageCoRPresenter::FinishedCoR);
+}
+
+/**
+ * Start of ROI selection (or first click after pushing "select
+ * ROI". The rectangle starts as a point from the mouse click.
+ *
+ * @param x position on x axis (local to the image)
+ * @param y position on y axis (local to the image)
+ */
+void ImageCoRViewQtWidget::mouseUpdateROICorners12(int x, int y) {
+ grabROICorner1FromMousePoint(x, y);
+ grabROICorner2FromMousePoint(x, y);
+ refreshROIetAl();
+ m_selectionState = IImageCoRView::SelectROISecond;
+}
+
+/**
+ * Change the rectangle while pressing the mouse button. The first
+ * corner stays at the first click, now only the second corner changes
+ * to the new mouse position. On release of the mouse button we'll get
+ * to mouseFinishROICorner2() and end the selection of the ROI.
+ *
+ * @param x position on x axis (local to the image)
+ * @param y position on y axis (local to the image)
+ */
+void ImageCoRViewQtWidget::mouseUpdateROICorner2(int x, int y) {
+ grabROICorner2FromMousePoint(x, y);
+ refreshROIetAl();
+}
+
+/**
+ * End of ROI selection (or mouse button release after clicking once
+ * and move, all after pushing "select ROI". The second corner of the
+ * rectangle is set at the current position.
+ *
+ * @param x position on x axis (local to the image)
+ * @param y position on y axis (local to the image)
+ */
+void ImageCoRViewQtWidget::mouseFinishROI(int x, int y) {
+ grabROICorner2FromMousePoint(x, y);
+ refreshROIetAl();
+ m_presenter->notify(IImageCoRPresenter::FinishedROI);
+}
+
+void ImageCoRViewQtWidget::mouseUpdateNormAreaCorners12(int x, int y) {
+ grabNormAreaCorner1FromMousePoint(x, y);
+ grabNormAreaCorner2FromMousePoint(x, y);
+ refreshROIetAl();
+ m_selectionState = IImageCoRView::SelectNormAreaSecond;
+}
+
+void ImageCoRViewQtWidget::mouseUpdateNormAreaCorner2(int x, int y) {
+ grabNormAreaCorner2FromMousePoint(x, y);
+ refreshROIetAl();
+}
+
+void ImageCoRViewQtWidget::mouseFinishNormArea(int x, int y) {
+ grabNormAreaCorner2FromMousePoint(x, y);
+ refreshROIetAl();
+ m_presenter->notify(IImageCoRPresenter::FinishedNormalization);
+}
+
void ImageCoRViewQtWidget::refreshCoR() {
const QPixmap *pp = m_ui.label_img->pixmap();
if (!pp)
@@ -189,10 +329,6 @@ void ImageCoRViewQtWidget::refreshROIetAl() {
if (!pp)
return;
- grabCoRFromWidgets();
- grabROIFromWidgets();
- grabNormAreaFromWidgets();
-
QPixmap toDisplay(*m_basePixmap.get());
QPainter painter(&toDisplay);
@@ -275,37 +411,43 @@ void ImageCoRViewQtWidget::setParams(ImageStackPreParams ¶ms) {
setParamWidgets(m_params);
}
+void ImageCoRViewQtWidget::enableParamWidgets(bool enable) {
+ m_ui.groupBox_cor->setEnabled(enable);
+ m_ui.groupBox_roi->setEnabled(enable);
+ m_ui.groupBox_norm->setEnabled(enable);
+}
+
void ImageCoRViewQtWidget::initParamWidgets(size_t maxWidth, size_t maxHeight) {
- int width = static_cast<int>(maxWidth);
- int height = static_cast<int>(maxHeight);
+ m_imgWidth = static_cast<int>(maxWidth);
+ m_imgHeight = static_cast<int>(maxHeight);
m_ui.spinBox_cor_x->setMinimum(0);
- m_ui.spinBox_cor_x->setMaximum(width - 1);
+ m_ui.spinBox_cor_x->setMaximum(m_imgWidth - 1);
m_ui.spinBox_cor_y->setMinimum(0);
- m_ui.spinBox_cor_y->setMaximum(height - 1);
+ m_ui.spinBox_cor_y->setMaximum(m_imgHeight - 1);
resetCoR();
m_ui.spinBox_roi_top_x->setMinimum(0);
- m_ui.spinBox_roi_top_x->setMaximum(width - 1);
+ m_ui.spinBox_roi_top_x->setMaximum(m_imgWidth - 1);
m_ui.spinBox_roi_top_y->setMinimum(0);
- m_ui.spinBox_roi_top_y->setMaximum(height - 1);
+ m_ui.spinBox_roi_top_y->setMaximum(m_imgHeight - 1);
m_ui.spinBox_roi_bottom_x->setMinimum(0);
- m_ui.spinBox_roi_bottom_x->setMaximum(width - 1);
+ m_ui.spinBox_roi_bottom_x->setMaximum(m_imgWidth - 1);
m_ui.spinBox_roi_bottom_y->setMinimum(0);
- m_ui.spinBox_roi_bottom_y->setMaximum(height - 1);
+ m_ui.spinBox_roi_bottom_y->setMaximum(m_imgHeight - 1);
resetROI();
m_ui.spinBox_norm_top_x->setMinimum(0);
- m_ui.spinBox_norm_top_x->setMaximum(width - 1);
+ m_ui.spinBox_norm_top_x->setMaximum(m_imgWidth - 1);
m_ui.spinBox_norm_top_y->setMinimum(0);
- m_ui.spinBox_norm_top_y->setMaximum(height - 1);
+ m_ui.spinBox_norm_top_y->setMaximum(m_imgHeight - 1);
m_ui.spinBox_norm_bottom_x->setMinimum(0);
- m_ui.spinBox_norm_bottom_x->setMaximum(width - 1);
+ m_ui.spinBox_norm_bottom_x->setMaximum(m_imgWidth - 1);
m_ui.spinBox_norm_bottom_y->setMinimum(0);
- m_ui.spinBox_norm_bottom_y->setMaximum(height - 1);
+ m_ui.spinBox_norm_bottom_y->setMaximum(m_imgHeight - 1);
resetNormArea();
}
@@ -336,7 +478,7 @@ ImageStackPreParams ImageCoRViewQtWidget::userSelection() const {
}
void ImageCoRViewQtWidget::changeSelectionState(
- const IImageCoRView::SelectionState state) {
+ const IImageCoRView::SelectionState &state) {
m_selectionState = state;
}
@@ -345,6 +487,7 @@ void ImageCoRViewQtWidget::corClicked() {
}
void ImageCoRViewQtWidget::corResetClicked() {
m_presenter->notify(IImageCoRPresenter::ResetCoR);
+ refreshROIetAl();
}
void ImageCoRViewQtWidget::roiClicked() {
@@ -352,13 +495,15 @@ void ImageCoRViewQtWidget::roiClicked() {
}
void ImageCoRViewQtWidget::roiResetClicked() {
m_presenter->notify(IImageCoRPresenter::ResetROI);
+ refreshROIetAl();
}
void ImageCoRViewQtWidget::normAreaClicked() {
- m_presenter->notify(IImageCoRPresenter::SelectROI);
+ m_presenter->notify(IImageCoRPresenter::SelectNormalization);
}
void ImageCoRViewQtWidget::normAreaResetClicked() {
m_presenter->notify(IImageCoRPresenter::ResetNormalization);
+ refreshROIetAl();
}
void ImageCoRViewQtWidget::browseImgClicked() {
@@ -434,10 +579,11 @@ void ImageCoRViewQtWidget::showStack(const std::string & /*path*/) {
// we have a firt working version of the "lean MD workspace". This method
// would then load into one workspace of such type.
// b) load as workspace group - this is done in the overloaded method below
+
+ // enableParamWidgets(true);
}
-void ImageCoRViewQtWidget::showStack(Mantid::API::WorkspaceGroup_sptr &wsg,
- const std::string &stackPath) {
+void ImageCoRViewQtWidget::showStack(Mantid::API::WorkspaceGroup_sptr &wsg) {
if (0 == wsg->size())
return;
@@ -448,8 +594,6 @@ void ImageCoRViewQtWidget::showStack(Mantid::API::WorkspaceGroup_sptr &wsg,
m_ui.horizontalScrollBar_img_stack->setMaximum(
static_cast<int>(m_stack->size() - 1));
- showProjection(m_stack, 0);
-
size_t width = 0, height = 0;
try {
MatrixWorkspace_sptr ws =
@@ -465,13 +609,17 @@ void ImageCoRViewQtWidget::showStack(Mantid::API::WorkspaceGroup_sptr &wsg,
QString::fromStdString(e.what()));
}
+ showProjection(m_stack, 0);
initParamWidgets(width, height);
+ refreshROIetAl();
+ enableParamWidgets(true);
}
void ImageCoRViewQtWidget::showProjection(
const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx) {
showProjectionImage(wsg, idx);
+ refreshROIetAl();
// give name, set up scroll/slider
std::string name;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
index df5a9052eb3..5af8380adb7 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
@@ -74,7 +74,7 @@ void TomographyIfaceViewQtGUI::initLayout() {
m_ui.tabMain->addTab(tabSetupW, QString("Setup"));
ImageCoRViewQtWidget *tabCoRW = new ImageCoRViewQtWidget(m_ui.tabMain);
- m_ui.tabMain->addTab(tabCoRW, QString("Center && ROI"));
+ m_ui.tabMain->addTab(tabCoRW, QString("ROI etc."));
QWidget *tabFiltersW = new QWidget();
m_ui.tabMain->addTab(tabFiltersW, QString("Filters"));
--
GitLab
From 98b12962254882e48a58f3e481e160bc9cd0392e Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Wed, 7 Oct 2015 08:41:56 +0100
Subject: [PATCH 048/223] clang formatting for test and source files
Refs #13508
---
.../MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h | 9 ++++-----
Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
index b5fc04579b1..c89da905aa9 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
@@ -2,7 +2,7 @@
#define MANTID_MDALGORITHMS_COMPACTMD_H_
/** An algorithm used to crop an MDHistoWorkspace based on the first
- non-zero signals found in each dimension.
+ non-zero signals found in each dimension.
@author Matt King
@date 02-10-2015
@@ -50,13 +50,12 @@ public:
return "Crops an MDHistoWorkspace based on the first non-zero signals "
"giving a more focussed area of interest.";
}
- const std::string category() const{
- return "MDAlgorithms";
- }
+ const std::string category() const { return "MDAlgorithms"; }
/// Algorithm's version for identification
int version() const { return 1; }
- void findFirstNonZeroMinMaxExtents(Mantid::API::IMDHistoWorkspace_sptr inputWs,
+ void
+ findFirstNonZeroMinMaxExtents(Mantid::API::IMDHistoWorkspace_sptr inputWs,
std::vector<Mantid::coord_t> &minVec,
std::vector<Mantid::coord_t> &maxVec);
};
diff --git a/Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h b/Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h
index 6815991a90b..e897ac2268a 100644
--- a/Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h
+++ b/Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -96,7 +96,7 @@ public:
outputWorkspace->getDimension(0)->getBinWidth(),
inWS->getDimension(0)->getBinWidth());
}
- void test__all_non_zero_signals_are_kept_with_data_in_each_corner(){
+ void test__all_non_zero_signals_are_kept_with_data_in_each_corner() {
/*
*testing the effectiveness of CompactMD when the data looks like this:
*------------------
@@ -128,5 +128,5 @@ public:
//===================
// Performance Tests
//===================
-//TODO:
+// TODO:
#endif // !MANTID_MDALGORITHMS_COMPACTMDTEST_H_
--
GitLab
From 656f5233495bfaf14de5985c9f616167e94ff769 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Wed, 7 Oct 2015 08:58:45 +0100
Subject: [PATCH 049/223] changing directory structure for old code
Refs #13508
---
.../MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h | 0
.../Mantid/Framework => Framework}/MDAlgorithms/src/CompactMD.cpp | 0
.../Framework => Framework}/MDAlgorithms/test/CompactMDTest.h | 0
3 files changed, 0 insertions(+), 0 deletions(-)
rename {Code/Mantid/Framework => Framework}/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h (100%)
rename {Code/Mantid/Framework => Framework}/MDAlgorithms/src/CompactMD.cpp (100%)
rename {Code/Mantid/Framework => Framework}/MDAlgorithms/test/CompactMDTest.h (100%)
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
similarity index 100%
rename from Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
rename to Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp b/Framework/MDAlgorithms/src/CompactMD.cpp
similarity index 100%
rename from Code/Mantid/Framework/MDAlgorithms/src/CompactMD.cpp
rename to Framework/MDAlgorithms/src/CompactMD.cpp
diff --git a/Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h b/Framework/MDAlgorithms/test/CompactMDTest.h
similarity index 100%
rename from Code/Mantid/Framework/MDAlgorithms/test/CompactMDTest.h
rename to Framework/MDAlgorithms/test/CompactMDTest.h
--
GitLab
From 5c104cedf0f397e4c0326524f42a80f375ca87eb Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 7 Oct 2015 09:00:49 +0100
Subject: [PATCH 050/223] basic doc for the ROI tab, re #13140
---
.../interfaces/Tomographic_Reconstruction.rst | 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/Code/Mantid/docs/source/interfaces/Tomographic_Reconstruction.rst b/Code/Mantid/docs/source/interfaces/Tomographic_Reconstruction.rst
index d31f16f6ad9..10218297b01 100644
--- a/Code/Mantid/docs/source/interfaces/Tomographic_Reconstruction.rst
+++ b/Code/Mantid/docs/source/interfaces/Tomographic_Reconstruction.rst
@@ -140,6 +140,43 @@ To be able to run jobs on a remote compute resource (cluster, supercomputer, etc
You can monitor the status of the jobs currently running (and recently
run) on remote compute resources in the same tab.
+Setting common parameters for the reconstruction jobs
+-----------------------------------------------------
+
+Several parameters can be set in the "ROI etc." section or tab. These
+parameters will be used for all the reconstruction jobs, regardless of
+the tool and/or reconstruction method used.
+
+* Region of interest (ROI) for the analysis
+* Area for normalization (open beam, not blocked by sample)
+* Center of rotation, for tomographic reconstruction
+
+At any stage during the process of selecting the regions it is also
+possible to see how the selections fit different images by sliding
+through the images of the stack (using the slider or scroll bar).
+
+The center of rotation can be selected interactively by clicking on
+the select button and then clicking on an image pixel. To select the
+regions of interest or the area of normalization, just click on the
+respective "select" button and then click and drag with the mouse to
+select a rectangle. The precise coordinates of the center and regions
+can be set via the boxes of the right panel as well.
+
+Once you have selected or set one of the regions, or the center, they
+can be selected again by pushing the respective "Select" buttons
+and/or editing their coordinates manually.
+
+The default values, set in principle when a new stack of images is
+loaded, is as follows. The region of intererest is set to cover all
+the images. The regions of normalization is not set (empty), and the
+center of rotation is set to the center of the image. The option to
+find the center of rotation automatically is disabled at present.
+
+If when selection a region the mouse is moved outside of the images,
+it is possible to continue the selection of the region (second corner)
+by clicking again inside the image. Alternatively, any selection can
+be reset at any point by using the "reset" buttons.
+
Running jobs locally
--------------------
--
GitLab
From 99c8ee4b2c623523e41487c5a7cbbfeb4177d3a8 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 7 Oct 2015 09:57:52 +0100
Subject: [PATCH 051/223] extent tests on the ROI presenter, re #13140
---
.../src/Tomography/ImageCoRPresenter.cpp | 11 +-
.../src/Tomography/ImageCoRViewQtWidget.cpp | 3 +-
.../test/ImageCoRPresenterTest.h | 216 +++++++++++++++++-
.../CustomInterfaces/test/ImageCoRViewMock.h | 7 +-
4 files changed, 230 insertions(+), 7 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
index e37b4f4c497..de9d6a63c82 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -131,7 +131,16 @@ StackOfImagesDirs ImageCoRPresenter::checkInputStack(const std::string &path) {
}
void ImageCoRPresenter::processNewStack() {
- StackOfImagesDirs soid = checkInputStack(m_stackPath);
+ StackOfImagesDirs soid("");
+ try {
+ soid = checkInputStack(m_stackPath);
+ } catch (std::runtime_error &e) {
+ m_view->userWarning("Error trying to open directories/files",
+ "The path selected via the dialog cannot be openend or "
+ "there was a problem while trying to access it. This "
+ "is an unexpected inconsistency. Error details: " +
+ std::string(e.what()));
+ }
std::vector<std::string> imgs = soid.sampleFiles();
if (0 >= imgs.size()) {
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
index 3321938acd3..2dddb66e51f 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
@@ -306,7 +306,6 @@ void ImageCoRViewQtWidget::refreshCoR() {
return;
grabCoRFromWidgets();
- // TODO: display nicer symbol?
QPixmap toDisplay(*m_basePixmap.get());
QPainter painter(&toDisplay);
@@ -332,6 +331,8 @@ void ImageCoRViewQtWidget::refreshROIetAl() {
QPixmap toDisplay(*m_basePixmap.get());
QPainter painter(&toDisplay);
+ // TODO: display settings / nicer symbol?
+
QPen penCoR(Qt::red);
painter.setPen(penCoR);
painter.drawLine(static_cast<int>(m_params.cor.X() - 5),
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
index 41fdb967e99..61c9f67547e 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
@@ -7,6 +7,8 @@
#include <cxxtest/TestSuite.h>
+#include <Poco/File.h>
+
#include "ImageCoRViewMock.h"
using namespace MantidQt::CustomInterfaces;
@@ -65,7 +67,7 @@ public:
pres.notify(ImageCoRPresenter::Init);
}
- void test_browseImgEmptyPath() {
+ void test_browseImg_EmptyPath() {
testing::NiceMock<MockImageCoRView> mockView;
MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
@@ -79,13 +81,221 @@ public:
EXPECT_CALL(mockView, showStack(testing::An<const std::string &>()))
.Times(0);
EXPECT_CALL(mockView,
- showStack(testing::An<Mantid::API::WorkspaceGroup_sptr &>(),
- testing::An<const std::string &>())).Times(0);
+ showStack(testing::An<Mantid::API::WorkspaceGroup_sptr &>()))
+ .Times(0);
+ EXPECT_CALL(mockView, updateImgWithIndex(testing::_)).Times(0);
+
+ pres.notify(IImageCoRPresenter::BrowseImgOrStack);
+ }
+
+ void test_newImg_EmptyPath() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ EXPECT_CALL(mockView, askImgOrStackPath()).Times(1).WillOnce(Return(""));
+
+ // No error, no warnings, just ignored
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ // should not get there because there's no stack/img - it's just ignored:
+ EXPECT_CALL(mockView, showStack(testing::An<const std::string &>()))
+ .Times(0);
+ EXPECT_CALL(mockView,
+ showStack(testing::An<Mantid::API::WorkspaceGroup_sptr &>()))
+ .Times(0);
+ EXPECT_CALL(mockView, updateImgWithIndex(testing::_)).Times(0);
+
+ pres.notify(IImageCoRPresenter::BrowseImgOrStack);
+ }
+
+ void test_newImg_WrongPath() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ EXPECT_CALL(mockView, askImgOrStackPath())
+ .Times(1)
+ .WillOnce(Return("dont_look_for_me_i_dont_exist"));
+
+ // A warning
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(1);
+
+ // should not get there because there's no stack/img
+ EXPECT_CALL(mockView, showStack(testing::An<const std::string &>()))
+ .Times(0);
+ EXPECT_CALL(mockView,
+ showStack(testing::An<Mantid::API::WorkspaceGroup_sptr &>()))
+ .Times(0);
EXPECT_CALL(mockView, updateImgWithIndex(testing::_)).Times(0);
+ // this exception is currently handled, and a warning given
+ //TSM_ASSERT_THROWS("There should be an exception if there is an unexpected "
+ // "error with the images path",
+ // pres.notify(IImageCoRPresenter::BrowseImgOrStack),
+ // Poco::FileNotFoundException);
pres.notify(IImageCoRPresenter::BrowseImgOrStack);
}
+ void test_updateImgIndex() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ int idx = 0;
+ EXPECT_CALL(mockView, currentImgIndex()).Times(1).WillOnce(Return(idx));
+
+ EXPECT_CALL(mockView, updateImgWithIndex(idx)).Times(1);
+
+ // No errors, no warnings
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ pres.notify(IImageCoRPresenter::UpdateImgIndex);
+ }
+
+ void test_selectCoR() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectCoR))
+ .Times(1);
+
+ // No errors, no warnings
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ pres.notify(IImageCoRPresenter::SelectCoR);
+ }
+
+ void test_resetCoR() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ EXPECT_CALL(mockView, resetCoR()).Times(1);
+ EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectNone))
+ .Times(1);
+
+ // just a few calls that should not happen
+ EXPECT_CALL(mockView, resetROI()).Times(0);
+ EXPECT_CALL(mockView, showStack(testing::An<const std::string &>()))
+ .Times(0);
+ EXPECT_CALL(mockView,
+ showStack(testing::An<Mantid::API::WorkspaceGroup_sptr &>()))
+ .Times(0);
+ EXPECT_CALL(mockView, updateImgWithIndex(testing::_)).Times(0);
+
+ // No errors, no warnings
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ pres.notify(IImageCoRPresenter::ResetCoR);
+ }
+
+ void test_selectROI() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectROIFirst))
+ .Times(1);
+
+ // No errors, no warnings
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ pres.notify(IImageCoRPresenter::SelectROI);
+ }
+
+ void test_finishROI() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectNone))
+ .Times(1);
+
+ // No errors, no warnings
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ pres.notify(IImageCoRPresenter::FinishedROI);
+ }
+
+ void test_resetROI() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ EXPECT_CALL(mockView, resetROI()).Times(1);
+ EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectNone))
+ .Times(1);
+
+ // just a few calls that should not happen
+ EXPECT_CALL(mockView, resetCoR()).Times(0);
+ EXPECT_CALL(mockView, showStack(testing::An<const std::string &>()))
+ .Times(0);
+ EXPECT_CALL(mockView,
+ showStack(testing::An<Mantid::API::WorkspaceGroup_sptr &>()))
+ .Times(0);
+ EXPECT_CALL(mockView, updateImgWithIndex(testing::_)).Times(0);
+
+ // No errors, no warnings
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ pres.notify(IImageCoRPresenter::ResetROI);
+ }
+
+ void test_selectNormalization() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ EXPECT_CALL(mockView, changeSelectionState(
+ IImageCoRView::SelectNormAreaFirst)).Times(1);
+
+ // No errors, no warnings
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ pres.notify(IImageCoRPresenter::SelectNormalization);
+ }
+
+ void test_finishNormalization() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectNone))
+ .Times(1);
+
+ // No errors, no warnings
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ pres.notify(IImageCoRPresenter::FinishedNormalization);
+ }
+
+ void test_resetNormalization() {
+ testing::NiceMock<MockImageCoRView> mockView;
+ MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+
+ EXPECT_CALL(mockView, resetNormArea()).Times(1);
+ EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectNone))
+ .Times(1);
+
+ // just a few calls that should not happen
+ EXPECT_CALL(mockView, resetCoR()).Times(0);
+ EXPECT_CALL(mockView, resetROI()).Times(0);
+ EXPECT_CALL(mockView, showStack(testing::An<const std::string &>()))
+ .Times(0);
+ EXPECT_CALL(mockView,
+ showStack(testing::An<Mantid::API::WorkspaceGroup_sptr &>()))
+ .Times(0);
+ EXPECT_CALL(mockView, updateImgWithIndex(testing::_)).Times(0);
+
+ // No errors, no warnings
+ EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+
+ pres.notify(IImageCoRPresenter::ResetNormalization);
+ }
+
void test_shutDown() {
testing::NiceMock<MockImageCoRView> mockView;
MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
index 297bc1b4918..a81929e18c4 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
@@ -15,14 +15,17 @@ public:
MOCK_CONST_METHOD0(userSelection,
MantidQt::CustomInterfaces::ImageStackPreParams());
+ // SelectionState selectionState() const;
+ MOCK_CONST_METHOD0(selectionState, SelectionState());
+
// void changeSelectionState(const SelectionState state);
- MOCK_METHOD1(changeSelectionState, void(IImageCoRView::SelectionState));
+ MOCK_METHOD1(changeSelectionState, void(const IImageCoRView::SelectionState&));
// void showStack(const std::string &path);
MOCK_METHOD1(showStack, void(const std::string &));
// void showStack(const Mantid::API::WorkspaceGroup_sptr &ws);
- MOCK_METHOD2(showStack, void(Mantid::API::WorkspaceGroup_sptr &, const std::string &));
+ MOCK_METHOD1(showStack, void(Mantid::API::WorkspaceGroup_sptr &));
// const Mantid::API::WorkspaceGroup_sptr stack() const;
MOCK_CONST_METHOD0(stack, const Mantid::API::WorkspaceGroup_sptr());
--
GitLab
From 1f7af858cdecb9c5c2db0e295467b7a726b948c7 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 7 Oct 2015 12:20:08 +0100
Subject: [PATCH 052/223] doxygen tags and more code documentation, re #13140
---
.../Tomography/IImageCoRView.h | 10 ++-----
.../Tomography/ImageCoRViewQtWidget.h | 2 ++
.../src/Tomography/ImageCoRViewQtWidget.cpp | 29 ++++++++++++++++++-
3 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
index 81f64bdb6b8..68c11500165 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
@@ -59,8 +59,8 @@ public:
* are updated (including spin boxes, image, slider through the
* image stack, etc.
*
- * @param tools identifiers of the tools that can or could be run.
- * Order matters
+ * @param params all user-modifyable parameters (coordinates for the
+ * CoR, ROI and area for normalization).
*
*/
virtual void setParams(ImageStackPreParams ¶ms) = 0;
@@ -84,7 +84,7 @@ public:
/**
* Update to a new state (for example select CoR).
*
- * @param new state we're transitioning into.
+ * @param state new state we're transitioning into.
*/
virtual void changeSelectionState(const SelectionState& state) = 0;
@@ -110,10 +110,6 @@ public:
* @param ws Workspace group where every workspace is a FITS or
* similar image that has been loaded with LoadFITS or similar
* algorithm.
- *
- * @param the (valid) path for this stack, from which it the
- * workspace group was loaded, in whatever directory layout is being
- * used (unknown to this view).
*/
virtual void showStack(Mantid::API::WorkspaceGroup_sptr &ws) = 0;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
index 037de649329..bfc33db8f93 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
@@ -140,12 +140,14 @@ private:
/// initialize values to defaults and set max/min for the spin boxes
void initParamWidgets(size_t maxWidth, size_t maxHeight);
+ /// Set coordinates in the widgets from a params object
void setParamWidgets(ImageStackPreParams ¶ms);
// shows the image in a widget
void showProjectionImage(const Mantid::API::WorkspaceGroup_sptr &wsg,
size_t idx);
+ /// repaint the image with new positions of points and rectangles
void refreshROIetAl();
void refreshCoR();
void refreshROI();
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
index 2dddb66e51f..9d28caed00b 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
@@ -115,6 +115,21 @@ void ImageCoRViewQtWidget::setupConnections() {
SLOT(valueUpdatedNormArea(int)));
}
+/**
+ * Qt events filter for the mouse click and click&drag events that are
+ * used to select points and rectangles. Part of the logic of the
+ * selection is handled here. The test on the presenter can only test
+ * the begin and end of the selection. For full testability (including
+ * the mouse interaction), this method should be implemented fully in
+ * terms of notifications to the presenter. This would require a bunch
+ * of new notifications in IImageCoRPresenter, and making at least all
+ * the mouseUpdateCoR, mouseUpdateROICorners12, mouseXXX methods
+ * public in this view interface. This can be considered at a later
+ * stage.
+ *
+ * @param obj object concerned by the event
+ * @param event event received (mouse click, release, move, etc.)
+ **/
bool ImageCoRViewQtWidget::eventFilter(QObject *obj, QEvent *event) {
// quick ignore
if (IImageCoRView::SelectNone == m_selectionState)
@@ -174,6 +189,10 @@ void ImageCoRViewQtWidget::valueUpdatedNormArea(int) {
refreshROIetAl();
}
+/**
+ * Parameter values from spin box widgets => coordinate parameters
+ * data member
+ */
void ImageCoRViewQtWidget::grabCoRFromWidgets() {
m_params.cor = Mantid::Kernel::V2D(m_ui.spinBox_cor_x->value(),
m_ui.spinBox_cor_y->value());
@@ -195,6 +214,14 @@ void ImageCoRViewQtWidget::grabNormAreaFromWidgets() {
m_ui.spinBox_norm_bottom_y->value()));
}
+/**
+ * Parameter values from mouse position (at a relevant event like
+ * first click, or last release) => spin box widgets, AND coordinate
+ * parameters data member. This grabs the Center of Rotation (CoR)
+ *
+ * @param x position on x axis (local to the image)
+ * @param y position on y axis (local to the image)
+ */
void ImageCoRViewQtWidget::grabCoRFromMousePoint(int x, int y) {
m_params.cor = Mantid::Kernel::V2D(x, y);
m_ui.spinBox_cor_x->setValue(x);
@@ -231,7 +258,7 @@ void ImageCoRViewQtWidget::grabNormAreaCorner2FromMousePoint(int x, int y) {
* usual in Qt widgets. Top-left is (0,0).
*
* @param x position on x axis (local to the image)
- * @param x position on y axis (local to the image)
+ * @param y position on y axis (local to the image)
*/
void ImageCoRViewQtWidget::mouseUpdateCoR(int x, int y) {
grabCoRFromMousePoint(x, y);
--
GitLab
From b5ef2719535c46f47d9da7bac289a937726f5343 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 7 Oct 2015 12:46:10 +0100
Subject: [PATCH 053/223] sort out merge, moving files after repo
reorganization, re #13140
---
.../inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h | 0
.../inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h | 0
.../inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h | 0
.../MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h | 0
.../Tomography/ImageSelectCoRAndRegions.ui | 0
.../inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h | 0
.../inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h | 0
.../CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp | 0
.../CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp | 0
.../CustomInterfaces/src/Tomography/ImageStackPreParams.cpp | 0
.../CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp | 0
.../CustomInterfaces/test/ImageCoRPresenterTest.h | 0
.../CustomInterfaces/test/StackOfImagesDirsTest.h | 0
13 files changed, 0 insertions(+), 0 deletions(-)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h (100%)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h (100%)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h (100%)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h (100%)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui (100%)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h (100%)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h (100%)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp (100%)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp (100%)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp (100%)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp (100%)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/test/ImageCoRPresenterTest.h (100%)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/test/StackOfImagesDirsTest.h (100%)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
rename to MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
rename to MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
rename to MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
rename to MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
rename to MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageSelectCoRAndRegions.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
rename to MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
rename to MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
rename to MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp b/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
rename to MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp b/MantidQt/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp
rename to MantidQt/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp b/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
rename to MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h b/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
rename to MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/StackOfImagesDirsTest.h b/MantidQt/CustomInterfaces/test/StackOfImagesDirsTest.h
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/test/StackOfImagesDirsTest.h
rename to MantidQt/CustomInterfaces/test/StackOfImagesDirsTest.h
--
GitLab
From 7a7607fb7097fbd92d9a947528f074d06143688a Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 7 Oct 2015 15:41:31 +0100
Subject: [PATCH 054/223] add file lost after merge, reorganize methods, re
#13140
---
.../Tomography/ImageCoRViewQtWidget.h | 21 +-
.../src/Tomography/ImageCoRPresenter.cpp | 12 +-
.../src/Tomography/ImageCoRViewQtWidget.cpp | 747 +++++++++---------
.../src/Tomography/StackOfImagesDirs.cpp | 52 +-
.../test/ImageCoRPresenterTest.h | 14 +-
.../CustomInterfaces/test/ImageCoRViewMock.h | 0
6 files changed, 431 insertions(+), 415 deletions(-)
rename {Code/Mantid/MantidQt => MantidQt}/CustomInterfaces/test/ImageCoRViewMock.h (100%)
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
index bfc33db8f93..1d0e619bb8a 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
@@ -93,16 +93,7 @@ protected:
void initLayout();
void showImg();
- void grabCoRFromWidgets();
- void grabROIFromWidgets();
- void grabNormAreaFromWidgets();
-
- void grabCoRFromMousePoint(int x, int y);
- void grabROICorner1FromMousePoint(int x, int y);
- void grabROICorner2FromMousePoint(int x, int y);
- void grabNormAreaCorner1FromMousePoint(int x, int y);
- void grabNormAreaCorner2FromMousePoint(int x, int y);
-
+ /// update coordinates from mouse event
void mouseUpdateCoR(int x, int y);
void mouseUpdateROICorners12(int x, int y);
void mouseUpdateROICorner2(int x, int y);
@@ -128,6 +119,16 @@ private slots:
void valueUpdatedNormArea(int v);
private:
+ void grabCoRFromWidgets();
+ void grabROIFromWidgets();
+ void grabNormAreaFromWidgets();
+
+ void grabCoRFromMousePoint(int x, int y);
+ void grabROICorner1FromMousePoint(int x, int y);
+ void grabROICorner2FromMousePoint(int x, int y);
+ void grabNormAreaCorner1FromMousePoint(int x, int y);
+ void grabNormAreaCorner2FromMousePoint(int x, int y);
+
void setupConnections();
void readSettings();
diff --git a/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
index de9d6a63c82..aaabbf133d7 100644
--- a/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
@@ -117,12 +117,12 @@ StackOfImagesDirs ImageCoRPresenter::checkInputStack(const std::string &path) {
const std::string soiPath = soid.sampleImagesDir();
if (soiPath.empty()) {
- m_view->userWarning("Error trying to find image stack",
+ m_view->userWarning("Error trying to find a stack of images",
"Could not find the sample images directory. The stack "
"of images is expected as: \n\n" +
soid.description());
} else if (!soid.isValid()) {
- m_view->userWarning("Error while checking/validating the image stack",
+ m_view->userWarning("Error while checking/validating the stack of images",
"The stack of images could not be loaded correctly. " +
soid.status());
}
@@ -131,10 +131,13 @@ StackOfImagesDirs ImageCoRPresenter::checkInputStack(const std::string &path) {
}
void ImageCoRPresenter::processNewStack() {
+
StackOfImagesDirs soid("");
try {
soid = checkInputStack(m_stackPath);
- } catch (std::runtime_error &e) {
+ } catch (std::exception &e) {
+ // Poco::FileNotFoundException: this should never happen, unless
+ // the open dir dialog misbehaves unexpectedly, or in tests
m_view->userWarning("Error trying to open directories/files",
"The path selected via the dialog cannot be openend or "
"there was a problem while trying to access it. This "
@@ -142,6 +145,9 @@ void ImageCoRPresenter::processNewStack() {
std::string(e.what()));
}
+ if (!soid.isValid())
+ return;
+
std::vector<std::string> imgs = soid.sampleFiles();
if (0 >= imgs.size()) {
m_view->userWarning(
diff --git a/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp b/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
index 9d28caed00b..233d91c10b5 100644
--- a/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
+++ b/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
@@ -33,6 +33,157 @@ ImageCoRViewQtWidget::ImageCoRViewQtWidget(QWidget *parent)
m_ui.label_img->installEventFilter(this);
}
+void ImageCoRViewQtWidget::setParams(ImageStackPreParams ¶ms) {
+ m_params = params;
+ setParamWidgets(m_params);
+}
+
+ImageStackPreParams ImageCoRViewQtWidget::userSelection() const {
+ return m_params;
+}
+
+void ImageCoRViewQtWidget::changeSelectionState(
+ const IImageCoRView::SelectionState &state) {
+ m_selectionState = state;
+}
+
+void ImageCoRViewQtWidget::showStack(const std::string & /*path*/) {
+ // TODO:
+ // a) load as proper stack of images workspace - this can only be done when
+ // we have a firt working version of the "lean MD workspace". This method
+ // would then load into one workspace of such type.
+ // b) load as workspace group - this is done in the overloaded method below
+
+ // enableParamWidgets(true);
+}
+
+void ImageCoRViewQtWidget::showStack(Mantid::API::WorkspaceGroup_sptr &wsg) {
+ if (0 == wsg->size())
+ return;
+
+ m_stack = wsg;
+
+ m_ui.horizontalScrollBar_img_stack->setEnabled(true);
+ m_ui.horizontalScrollBar_img_stack->setMinimum(0);
+ m_ui.horizontalScrollBar_img_stack->setMaximum(
+ static_cast<int>(m_stack->size() - 1));
+
+ size_t width = 0, height = 0;
+ try {
+ MatrixWorkspace_sptr ws =
+ boost::dynamic_pointer_cast<MatrixWorkspace>(wsg->getItem(0));
+ if (!ws)
+ return;
+ width = ws->blocksize();
+ height = ws->getNumberHistograms();
+ } catch (std::exception &e) {
+ QMessageBox::warning(this, "Cannot load image information",
+ "There was a problem while "
+ " trying to find the size of the image: " +
+ QString::fromStdString(e.what()));
+ }
+
+ showProjection(m_stack, 0);
+ initParamWidgets(width, height);
+ refreshROIetAl();
+ enableParamWidgets(true);
+}
+
+void ImageCoRViewQtWidget::showProjection(
+ const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx) {
+
+ showProjectionImage(wsg, idx);
+ refreshROIetAl();
+
+ // give name, set up scroll/slider
+ std::string name;
+ try {
+ MatrixWorkspace_sptr ws =
+ boost::dynamic_pointer_cast<MatrixWorkspace>(wsg->getItem(idx));
+ if (!ws)
+ return;
+ name = ws->run().getLogData("run_title")->value();
+ } catch (std::exception &e) {
+ QMessageBox::warning(this, "Cannot load image information",
+ "There was a problem while "
+ " trying to find the name of the image: " +
+ QString::fromStdString(e.what()));
+ }
+ m_ui.label_img_name->setText(QString::fromStdString(name));
+
+ const size_t numPics = wsg->size();
+ m_ui.lineEdit_img_seq->setText(
+ QString::fromStdString("1/" + boost::lexical_cast<std::string>(numPics)));
+ m_ui.horizontalScrollBar_img_stack->setValue(static_cast<int>(idx));
+}
+
+void ImageCoRViewQtWidget::userWarning(const std::string &err,
+ const std::string &description) {
+ QMessageBox::warning(this, QString::fromStdString(err),
+ QString::fromStdString(description), QMessageBox::Ok,
+ QMessageBox::Ok);
+}
+
+void ImageCoRViewQtWidget::userError(const std::string &err,
+ const std::string &description) {
+ QMessageBox::critical(this, QString::fromStdString(err),
+ QString::fromStdString(description), QMessageBox::Ok,
+ QMessageBox::Ok);
+}
+
+std::string ImageCoRViewQtWidget::askImgOrStackPath() {
+ // get path
+ QString fitsStr = QString("Supported formats: FITS, TIFF and PNG "
+ "(*.fits *.fit *.tiff *.tif *.png);;"
+ "FITS, Flexible Image Transport System images "
+ "(*.fits *.fit);;"
+ "TIFF, Tagged Image File Format "
+ "(*.tif *.tiff);;"
+ "PNG, Portable Network Graphics "
+ "(*.png);;"
+ "Other extensions/all files (*.*)");
+ QString prevPath =
+ MantidQt::API::AlgorithmInputHistory::Instance().getPreviousDirectory();
+ QString path(QFileDialog::getExistingDirectory(
+ this, tr("Open stack of images"), prevPath, QFileDialog::ShowDirsOnly));
+ if (!path.isEmpty()) {
+ MantidQt::API::AlgorithmInputHistory::Instance().setPreviousDirectory(path);
+ }
+
+ return path.toStdString();
+}
+
+void ImageCoRViewQtWidget::saveSettings() const {
+ QSettings qs;
+ qs.beginGroup(QString::fromStdString(m_settingsGroup));
+
+ qs.setValue("interface-win-geometry", saveGeometry());
+ qs.endGroup();
+}
+
+void ImageCoRViewQtWidget::resetCoR() {
+ int midx =
+ (m_ui.spinBox_cor_x->minimum() + m_ui.spinBox_cor_x->maximum()) / 2;
+ m_ui.spinBox_cor_x->setValue(midx);
+ int midy =
+ (m_ui.spinBox_cor_y->minimum() + m_ui.spinBox_cor_y->maximum()) / 2;
+ m_ui.spinBox_cor_y->setValue(midy);
+}
+
+void ImageCoRViewQtWidget::resetROI() {
+ m_ui.spinBox_roi_top_x->setValue(0);
+ m_ui.spinBox_roi_top_y->setValue(0);
+ m_ui.spinBox_roi_bottom_x->setValue(m_ui.spinBox_roi_bottom_x->maximum());
+ m_ui.spinBox_roi_bottom_y->setValue(m_ui.spinBox_roi_bottom_y->maximum());
+}
+
+void ImageCoRViewQtWidget::resetNormArea() {
+ m_ui.spinBox_norm_top_x->setValue(0);
+ m_ui.spinBox_norm_top_y->setValue(0);
+ m_ui.spinBox_norm_bottom_x->setValue(0);
+ m_ui.spinBox_norm_bottom_y->setValue(0);
+}
+
void ImageCoRViewQtWidget::initLayout() {
// setup container ui
m_ui.setupUi(this);
@@ -115,65 +266,6 @@ void ImageCoRViewQtWidget::setupConnections() {
SLOT(valueUpdatedNormArea(int)));
}
-/**
- * Qt events filter for the mouse click and click&drag events that are
- * used to select points and rectangles. Part of the logic of the
- * selection is handled here. The test on the presenter can only test
- * the begin and end of the selection. For full testability (including
- * the mouse interaction), this method should be implemented fully in
- * terms of notifications to the presenter. This would require a bunch
- * of new notifications in IImageCoRPresenter, and making at least all
- * the mouseUpdateCoR, mouseUpdateROICorners12, mouseXXX methods
- * public in this view interface. This can be considered at a later
- * stage.
- *
- * @param obj object concerned by the event
- * @param event event received (mouse click, release, move, etc.)
- **/
-bool ImageCoRViewQtWidget::eventFilter(QObject *obj, QEvent *event) {
- // quick ignore
- if (IImageCoRView::SelectNone == m_selectionState)
- return false;
-
- if (m_ui.label_img == obj) {
-
- QPoint p = m_ui.label_img->mapFromGlobal(QCursor::pos());
- int x = p.x();
- int y = p.y();
- // ignore potential clicks outside of the image
- if (x >= m_imgWidth || y >= m_imgHeight || x < 0 || y < 0)
- return false;
-
- auto type = event->type();
- if (type == QEvent::MouseButtonPress) {
-
- if (IImageCoRView::SelectCoR == m_selectionState) {
- mouseUpdateCoR(x, y);
- } else if (IImageCoRView::SelectROIFirst == m_selectionState) {
- mouseUpdateROICorners12(x, y);
- } else if (IImageCoRView::SelectNormAreaFirst == m_selectionState) {
- mouseUpdateNormAreaCorners12(x, y);
- }
- } else if (type == QEvent::MouseMove) {
-
- if (IImageCoRView::SelectROISecond == m_selectionState) {
- mouseUpdateROICorner2(x, y);
- } else if (IImageCoRView::SelectNormAreaSecond == m_selectionState) {
- mouseUpdateNormAreaCorner2(x, y);
- }
- } else if (type == QEvent::MouseButtonRelease) {
-
- if (IImageCoRView::SelectROISecond == m_selectionState) {
- mouseFinishROI(x, y);
- } else if (IImageCoRView::SelectNormAreaSecond == m_selectionState) {
- mouseFinishNormArea(x, y);
- }
- }
- }
- // pass on the event up to the parent class
- return false;
-}
-
void ImageCoRViewQtWidget::valueUpdatedCoR(int) {
grabCoRFromWidgets();
refreshROIetAl();
@@ -215,140 +307,11 @@ void ImageCoRViewQtWidget::grabNormAreaFromWidgets() {
}
/**
- * Parameter values from mouse position (at a relevant event like
- * first click, or last release) => spin box widgets, AND coordinate
- * parameters data member. This grabs the Center of Rotation (CoR)
- *
- * @param x position on x axis (local to the image)
- * @param y position on y axis (local to the image)
+ * Updates the image view with the current image index and selection
+ * of parameters (ROI, normalization area, CoR). This needs to be used
+ * for every event that modifies the current image and/or selection of
+ * parameters.
*/
-void ImageCoRViewQtWidget::grabCoRFromMousePoint(int x, int y) {
- m_params.cor = Mantid::Kernel::V2D(x, y);
- m_ui.spinBox_cor_x->setValue(x);
- m_ui.spinBox_cor_y->setValue(y);
-}
-
-void ImageCoRViewQtWidget::grabROICorner1FromMousePoint(int x, int y) {
- m_params.roi.first = Mantid::Kernel::V2D(x, y);
- m_ui.spinBox_roi_top_x->setValue(x);
- m_ui.spinBox_roi_top_y->setValue(y);
-}
-
-void ImageCoRViewQtWidget::grabROICorner2FromMousePoint(int x, int y) {
- m_params.roi.second = Mantid::Kernel::V2D(x, y);
- m_ui.spinBox_roi_bottom_x->setValue(x);
- m_ui.spinBox_roi_bottom_y->setValue(y);
-}
-
-void ImageCoRViewQtWidget::grabNormAreaCorner1FromMousePoint(int x, int y) {
- m_params.normalizationRegion.first = Mantid::Kernel::V2D(x, y);
- m_ui.spinBox_norm_top_x->setValue(x);
- m_ui.spinBox_norm_top_y->setValue(y);
-}
-
-void ImageCoRViewQtWidget::grabNormAreaCorner2FromMousePoint(int x, int y) {
- m_params.normalizationRegion.second = Mantid::Kernel::V2D(x, y);
- m_ui.spinBox_norm_bottom_x->setValue(x);
- m_ui.spinBox_norm_bottom_y->setValue(y);
-}
-
-/**
- * This is an update and implicity a finish, as there's only one
- * update for the CoR (single point-click). The coordinates count as
- * usual in Qt widgets. Top-left is (0,0).
- *
- * @param x position on x axis (local to the image)
- * @param y position on y axis (local to the image)
- */
-void ImageCoRViewQtWidget::mouseUpdateCoR(int x, int y) {
- grabCoRFromMousePoint(x, y);
- refreshROIetAl();
-
- m_presenter->notify(IImageCoRPresenter::FinishedCoR);
-}
-
-/**
- * Start of ROI selection (or first click after pushing "select
- * ROI". The rectangle starts as a point from the mouse click.
- *
- * @param x position on x axis (local to the image)
- * @param y position on y axis (local to the image)
- */
-void ImageCoRViewQtWidget::mouseUpdateROICorners12(int x, int y) {
- grabROICorner1FromMousePoint(x, y);
- grabROICorner2FromMousePoint(x, y);
- refreshROIetAl();
- m_selectionState = IImageCoRView::SelectROISecond;
-}
-
-/**
- * Change the rectangle while pressing the mouse button. The first
- * corner stays at the first click, now only the second corner changes
- * to the new mouse position. On release of the mouse button we'll get
- * to mouseFinishROICorner2() and end the selection of the ROI.
- *
- * @param x position on x axis (local to the image)
- * @param y position on y axis (local to the image)
- */
-void ImageCoRViewQtWidget::mouseUpdateROICorner2(int x, int y) {
- grabROICorner2FromMousePoint(x, y);
- refreshROIetAl();
-}
-
-/**
- * End of ROI selection (or mouse button release after clicking once
- * and move, all after pushing "select ROI". The second corner of the
- * rectangle is set at the current position.
- *
- * @param x position on x axis (local to the image)
- * @param y position on y axis (local to the image)
- */
-void ImageCoRViewQtWidget::mouseFinishROI(int x, int y) {
- grabROICorner2FromMousePoint(x, y);
- refreshROIetAl();
- m_presenter->notify(IImageCoRPresenter::FinishedROI);
-}
-
-void ImageCoRViewQtWidget::mouseUpdateNormAreaCorners12(int x, int y) {
- grabNormAreaCorner1FromMousePoint(x, y);
- grabNormAreaCorner2FromMousePoint(x, y);
- refreshROIetAl();
- m_selectionState = IImageCoRView::SelectNormAreaSecond;
-}
-
-void ImageCoRViewQtWidget::mouseUpdateNormAreaCorner2(int x, int y) {
- grabNormAreaCorner2FromMousePoint(x, y);
- refreshROIetAl();
-}
-
-void ImageCoRViewQtWidget::mouseFinishNormArea(int x, int y) {
- grabNormAreaCorner2FromMousePoint(x, y);
- refreshROIetAl();
- m_presenter->notify(IImageCoRPresenter::FinishedNormalization);
-}
-
-void ImageCoRViewQtWidget::refreshCoR() {
- const QPixmap *pp = m_ui.label_img->pixmap();
- if (!pp)
- return;
-
- grabCoRFromWidgets();
-
- QPixmap toDisplay(*m_basePixmap.get());
- QPainter painter(&toDisplay);
- QPen pen(Qt::red);
- painter.setPen(pen);
- painter.drawLine(static_cast<int>(m_params.cor.X() - 5),
- static_cast<int>(m_params.cor.Y()),
- static_cast<int>(m_params.cor.X() + 5),
- static_cast<int>(m_params.cor.Y()));
- painter.drawLine(static_cast<int>(m_params.cor.X()),
- static_cast<int>(m_params.cor.Y() - 5),
- static_cast<int>(m_params.cor.X()),
- static_cast<int>(m_params.cor.Y() + 5));
- m_ui.label_img->setPixmap(toDisplay);
-}
-
void ImageCoRViewQtWidget::refreshROIetAl() {
const QPixmap *pp = m_ui.label_img->pixmap();
@@ -391,6 +354,28 @@ void ImageCoRViewQtWidget::refreshROIetAl() {
m_ui.label_img->setPixmap(toDisplay);
}
+void ImageCoRViewQtWidget::refreshCoR() {
+ const QPixmap *pp = m_ui.label_img->pixmap();
+ if (!pp)
+ return;
+
+ grabCoRFromWidgets();
+
+ QPixmap toDisplay(*m_basePixmap.get());
+ QPainter painter(&toDisplay);
+ QPen pen(Qt::red);
+ painter.setPen(pen);
+ painter.drawLine(static_cast<int>(m_params.cor.X() - 5),
+ static_cast<int>(m_params.cor.Y()),
+ static_cast<int>(m_params.cor.X() + 5),
+ static_cast<int>(m_params.cor.Y()));
+ painter.drawLine(static_cast<int>(m_params.cor.X()),
+ static_cast<int>(m_params.cor.Y() - 5),
+ static_cast<int>(m_params.cor.X()),
+ static_cast<int>(m_params.cor.Y() + 5));
+ m_ui.label_img->setPixmap(toDisplay);
+}
+
void ImageCoRViewQtWidget::refreshROI() {
const QPixmap *pp = m_ui.label_img->pixmap();
if (!pp)
@@ -434,11 +419,6 @@ void ImageCoRViewQtWidget::refreshNormArea() {
m_ui.label_img->setPixmap(toDisplay);
}
-void ImageCoRViewQtWidget::setParams(ImageStackPreParams ¶ms) {
- m_params = params;
- setParamWidgets(m_params);
-}
-
void ImageCoRViewQtWidget::enableParamWidgets(bool enable) {
m_ui.groupBox_cor->setEnabled(enable);
m_ui.groupBox_roi->setEnabled(enable);
@@ -501,174 +481,53 @@ void ImageCoRViewQtWidget::setParamWidgets(ImageStackPreParams ¶ms) {
static_cast<int>(params.normalizationRegion.second.Y()));
}
-ImageStackPreParams ImageCoRViewQtWidget::userSelection() const {
- return m_params;
-}
-
-void ImageCoRViewQtWidget::changeSelectionState(
- const IImageCoRView::SelectionState &state) {
- m_selectionState = state;
-}
-
void ImageCoRViewQtWidget::corClicked() {
m_presenter->notify(IImageCoRPresenter::SelectCoR);
}
-void ImageCoRViewQtWidget::corResetClicked() {
- m_presenter->notify(IImageCoRPresenter::ResetCoR);
- refreshROIetAl();
-}
-void ImageCoRViewQtWidget::roiClicked() {
- m_presenter->notify(IImageCoRPresenter::SelectROI);
-}
-void ImageCoRViewQtWidget::roiResetClicked() {
- m_presenter->notify(IImageCoRPresenter::ResetROI);
- refreshROIetAl();
-}
-
-void ImageCoRViewQtWidget::normAreaClicked() {
- m_presenter->notify(IImageCoRPresenter::SelectNormalization);
-}
-void ImageCoRViewQtWidget::normAreaResetClicked() {
- m_presenter->notify(IImageCoRPresenter::ResetNormalization);
- refreshROIetAl();
-}
-
-void ImageCoRViewQtWidget::browseImgClicked() {
- m_presenter->notify(IImageCoRPresenter::BrowseImgOrStack);
-}
-
-void ImageCoRViewQtWidget::updateFromImagesSlider(int /* current */) {
- m_presenter->notify(IImageCoRPresenter::UpdateImgIndex);
-}
-
-void ImageCoRViewQtWidget::resetCoR() {
- int midx =
- (m_ui.spinBox_cor_x->minimum() + m_ui.spinBox_cor_x->maximum()) / 2;
- m_ui.spinBox_cor_x->setValue(midx);
- int midy =
- (m_ui.spinBox_cor_y->minimum() + m_ui.spinBox_cor_y->maximum()) / 2;
- m_ui.spinBox_cor_y->setValue(midy);
-}
-
-void ImageCoRViewQtWidget::resetROI() {
- m_ui.spinBox_roi_top_x->setValue(0);
- m_ui.spinBox_roi_top_y->setValue(0);
- m_ui.spinBox_roi_bottom_x->setValue(m_ui.spinBox_roi_bottom_x->maximum());
- m_ui.spinBox_roi_bottom_y->setValue(m_ui.spinBox_roi_bottom_y->maximum());
-}
-
-void ImageCoRViewQtWidget::resetNormArea() {
- m_ui.spinBox_norm_top_x->setValue(0);
- m_ui.spinBox_norm_top_y->setValue(0);
- m_ui.spinBox_norm_bottom_x->setValue(0);
- m_ui.spinBox_norm_bottom_y->setValue(0);
-}
-
-size_t ImageCoRViewQtWidget::currentImgIndex() const {
- return m_ui.horizontalScrollBar_img_stack->value();
-}
-
-void ImageCoRViewQtWidget::updateImgWithIndex(size_t idx) {
- int max = m_ui.horizontalScrollBar_img_stack->maximum();
- int current = m_ui.horizontalScrollBar_img_stack->value();
-
- showProjection(m_stack, idx);
- m_ui.lineEdit_img_seq->setText(
- QString::fromStdString(boost::lexical_cast<std::string>(current + 1) +
- "/" + boost::lexical_cast<std::string>(max + 1)));
-}
-
-std::string ImageCoRViewQtWidget::askImgOrStackPath() {
- // get path
- QString fitsStr = QString("Supported formats: FITS, TIFF and PNG "
- "(*.fits *.fit *.tiff *.tif *.png);;"
- "FITS, Flexible Image Transport System images "
- "(*.fits *.fit);;"
- "TIFF, Tagged Image File Format "
- "(*.tif *.tiff);;"
- "PNG, Portable Network Graphics "
- "(*.png);;"
- "Other extensions/all files (*.*)");
- QString prevPath =
- MantidQt::API::AlgorithmInputHistory::Instance().getPreviousDirectory();
- QString path(QFileDialog::getExistingDirectory(
- this, tr("Open stack of images"), prevPath, QFileDialog::ShowDirsOnly));
- if (!path.isEmpty()) {
- MantidQt::API::AlgorithmInputHistory::Instance().setPreviousDirectory(path);
- }
-
- return path.toStdString();
-}
-
-void ImageCoRViewQtWidget::showStack(const std::string & /*path*/) {
- // TODO:
- // a) load as proper stack of images workspace - this can only be done when
- // we have a firt working version of the "lean MD workspace". This method
- // would then load into one workspace of such type.
- // b) load as workspace group - this is done in the overloaded method below
-
- // enableParamWidgets(true);
-}
-
-void ImageCoRViewQtWidget::showStack(Mantid::API::WorkspaceGroup_sptr &wsg) {
- if (0 == wsg->size())
- return;
-
- m_stack = wsg;
-
- m_ui.horizontalScrollBar_img_stack->setEnabled(true);
- m_ui.horizontalScrollBar_img_stack->setMinimum(0);
- m_ui.horizontalScrollBar_img_stack->setMaximum(
- static_cast<int>(m_stack->size() - 1));
+void ImageCoRViewQtWidget::corResetClicked() {
+ m_presenter->notify(IImageCoRPresenter::ResetCoR);
+ refreshROIetAl();
+}
- size_t width = 0, height = 0;
- try {
- MatrixWorkspace_sptr ws =
- boost::dynamic_pointer_cast<MatrixWorkspace>(wsg->getItem(0));
- if (!ws)
- return;
- width = ws->blocksize();
- height = ws->getNumberHistograms();
- } catch (std::exception &e) {
- QMessageBox::warning(this, "Cannot load image information",
- "There was a problem while "
- " trying to find the size of the image: " +
- QString::fromStdString(e.what()));
- }
+void ImageCoRViewQtWidget::roiClicked() {
+ m_presenter->notify(IImageCoRPresenter::SelectROI);
+}
- showProjection(m_stack, 0);
- initParamWidgets(width, height);
+void ImageCoRViewQtWidget::roiResetClicked() {
+ m_presenter->notify(IImageCoRPresenter::ResetROI);
refreshROIetAl();
- enableParamWidgets(true);
}
-void ImageCoRViewQtWidget::showProjection(
- const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx) {
+void ImageCoRViewQtWidget::normAreaClicked() {
+ m_presenter->notify(IImageCoRPresenter::SelectNormalization);
+}
- showProjectionImage(wsg, idx);
+void ImageCoRViewQtWidget::normAreaResetClicked() {
+ m_presenter->notify(IImageCoRPresenter::ResetNormalization);
refreshROIetAl();
+}
- // give name, set up scroll/slider
- std::string name;
- try {
- MatrixWorkspace_sptr ws =
- boost::dynamic_pointer_cast<MatrixWorkspace>(wsg->getItem(idx));
- if (!ws)
- return;
- name = ws->run().getLogData("run_title")->value();
- } catch (std::exception &e) {
- QMessageBox::warning(this, "Cannot load image information",
- "There was a problem while "
- " trying to find the name of the image: " +
- QString::fromStdString(e.what()));
- }
- m_ui.label_img_name->setText(QString::fromStdString(name));
+void ImageCoRViewQtWidget::browseImgClicked() {
+ m_presenter->notify(IImageCoRPresenter::BrowseImgOrStack);
+}
- const size_t numPics = wsg->size();
+void ImageCoRViewQtWidget::updateFromImagesSlider(int /* current */) {
+ m_presenter->notify(IImageCoRPresenter::UpdateImgIndex);
+}
+
+size_t ImageCoRViewQtWidget::currentImgIndex() const {
+ return m_ui.horizontalScrollBar_img_stack->value();
+}
+
+void ImageCoRViewQtWidget::updateImgWithIndex(size_t idx) {
+ int max = m_ui.horizontalScrollBar_img_stack->maximum();
+ int current = m_ui.horizontalScrollBar_img_stack->value();
+
+ showProjection(m_stack, idx);
m_ui.lineEdit_img_seq->setText(
- QString::fromStdString("1/" + boost::lexical_cast<std::string>(numPics)));
- m_ui.horizontalScrollBar_img_stack->setValue(static_cast<int>(idx));
+ QString::fromStdString(boost::lexical_cast<std::string>(current + 1) +
+ "/" + boost::lexical_cast<std::string>(max + 1)));
}
void ImageCoRViewQtWidget::showProjectionImage(
@@ -783,32 +642,182 @@ void ImageCoRViewQtWidget::showProjectionImage(
// m_basePixmap.reset(new QPixmap(pix));
}
-void ImageCoRViewQtWidget::readSettings() {
- QSettings qs;
- qs.beginGroup(QString::fromStdString(m_settingsGroup));
- restoreGeometry(qs.value("interface-win-geometry").toByteArray());
- qs.endGroup();
+/**
+ * Qt events filter for the mouse click and click&drag events that are
+ * used to select points and rectangles. Part of the logic of the
+ * selection is handled here. The test on the presenter can only test
+ * the begin and end of the selection. For full testability (including
+ * the mouse interaction), this method should be implemented fully in
+ * terms of notifications to the presenter. This would require a bunch
+ * of new notifications in IImageCoRPresenter, and making at least all
+ * the mouseUpdateCoR, mouseUpdateROICorners12, mouseXXX methods
+ * public in this view interface. This can be considered at a later
+ * stage.
+ *
+ * @param obj object concerned by the event
+ * @param event event received (mouse click, release, move, etc.)
+ **/
+bool ImageCoRViewQtWidget::eventFilter(QObject *obj, QEvent *event) {
+ // quick ignore
+ if (IImageCoRView::SelectNone == m_selectionState)
+ return false;
+
+ if (m_ui.label_img == obj) {
+
+ QPoint p = m_ui.label_img->mapFromGlobal(QCursor::pos());
+ int x = p.x();
+ int y = p.y();
+ // ignore potential clicks outside of the image
+ if (x >= m_imgWidth || y >= m_imgHeight || x < 0 || y < 0)
+ return false;
+
+ auto type = event->type();
+ if (type == QEvent::MouseButtonPress) {
+
+ if (IImageCoRView::SelectCoR == m_selectionState) {
+ mouseUpdateCoR(x, y);
+ } else if (IImageCoRView::SelectROIFirst == m_selectionState) {
+ mouseUpdateROICorners12(x, y);
+ } else if (IImageCoRView::SelectNormAreaFirst == m_selectionState) {
+ mouseUpdateNormAreaCorners12(x, y);
+ }
+ } else if (type == QEvent::MouseMove) {
+
+ if (IImageCoRView::SelectROISecond == m_selectionState) {
+ mouseUpdateROICorner2(x, y);
+ } else if (IImageCoRView::SelectNormAreaSecond == m_selectionState) {
+ mouseUpdateNormAreaCorner2(x, y);
+ }
+ } else if (type == QEvent::MouseButtonRelease) {
+
+ if (IImageCoRView::SelectROISecond == m_selectionState) {
+ mouseFinishROI(x, y);
+ } else if (IImageCoRView::SelectNormAreaSecond == m_selectionState) {
+ mouseFinishNormArea(x, y);
+ }
+ }
+ }
+ // pass on the event up to the parent class
+ return false;
}
-void ImageCoRViewQtWidget::userWarning(const std::string &err,
- const std::string &description) {
- QMessageBox::warning(this, QString::fromStdString(err),
- QString::fromStdString(description), QMessageBox::Ok,
- QMessageBox::Ok);
+/**
+ * Parameter values from mouse position (at a relevant event like
+ * first click, or last release) => spin box widgets, AND coordinate
+ * parameters data member. This grabs the Center of Rotation (CoR)
+ *
+ * @param x position on x axis (local to the image)
+ * @param y position on y axis (local to the image)
+ */
+void ImageCoRViewQtWidget::grabCoRFromMousePoint(int x, int y) {
+ m_params.cor = Mantid::Kernel::V2D(x, y);
+ m_ui.spinBox_cor_x->setValue(x);
+ m_ui.spinBox_cor_y->setValue(y);
}
-void ImageCoRViewQtWidget::userError(const std::string &err,
- const std::string &description) {
- QMessageBox::critical(this, QString::fromStdString(err),
- QString::fromStdString(description), QMessageBox::Ok,
- QMessageBox::Ok);
+void ImageCoRViewQtWidget::grabROICorner1FromMousePoint(int x, int y) {
+ m_params.roi.first = Mantid::Kernel::V2D(x, y);
+ m_ui.spinBox_roi_top_x->setValue(x);
+ m_ui.spinBox_roi_top_y->setValue(y);
}
-void ImageCoRViewQtWidget::saveSettings() const {
+void ImageCoRViewQtWidget::grabROICorner2FromMousePoint(int x, int y) {
+ m_params.roi.second = Mantid::Kernel::V2D(x, y);
+ m_ui.spinBox_roi_bottom_x->setValue(x);
+ m_ui.spinBox_roi_bottom_y->setValue(y);
+}
+
+void ImageCoRViewQtWidget::grabNormAreaCorner1FromMousePoint(int x, int y) {
+ m_params.normalizationRegion.first = Mantid::Kernel::V2D(x, y);
+ m_ui.spinBox_norm_top_x->setValue(x);
+ m_ui.spinBox_norm_top_y->setValue(y);
+}
+
+void ImageCoRViewQtWidget::grabNormAreaCorner2FromMousePoint(int x, int y) {
+ m_params.normalizationRegion.second = Mantid::Kernel::V2D(x, y);
+ m_ui.spinBox_norm_bottom_x->setValue(x);
+ m_ui.spinBox_norm_bottom_y->setValue(y);
+}
+
+/**
+ * This is an update and implicity a finish, as there's only one
+ * update for the CoR (single point-click). The coordinates count as
+ * usual in Qt widgets. Top-left is (0,0).
+ *
+ * @param x position on x axis (local to the image)
+ * @param y position on y axis (local to the image)
+ */
+void ImageCoRViewQtWidget::mouseUpdateCoR(int x, int y) {
+ grabCoRFromMousePoint(x, y);
+ refreshROIetAl();
+
+ m_presenter->notify(IImageCoRPresenter::FinishedCoR);
+}
+
+/**
+ * Start of ROI selection (or first click after pushing "select
+ * ROI". The rectangle starts as a point from the mouse click.
+ *
+ * @param x position on x axis (local to the image)
+ * @param y position on y axis (local to the image)
+ */
+void ImageCoRViewQtWidget::mouseUpdateROICorners12(int x, int y) {
+ grabROICorner1FromMousePoint(x, y);
+ grabROICorner2FromMousePoint(x, y);
+ refreshROIetAl();
+ m_selectionState = IImageCoRView::SelectROISecond;
+}
+
+/**
+ * Change the rectangle while pressing the mouse button. The first
+ * corner stays at the first click, now only the second corner changes
+ * to the new mouse position. On release of the mouse button we'll get
+ * to mouseFinishROICorner2() and end the selection of the ROI.
+ *
+ * @param x position on x axis (local to the image)
+ * @param y position on y axis (local to the image)
+ */
+void ImageCoRViewQtWidget::mouseUpdateROICorner2(int x, int y) {
+ grabROICorner2FromMousePoint(x, y);
+ refreshROIetAl();
+}
+
+/**
+ * End of ROI selection (or mouse button release after clicking once
+ * and move, all after pushing "select ROI". The second corner of the
+ * rectangle is set at the current position.
+ *
+ * @param x position on x axis (local to the image)
+ * @param y position on y axis (local to the image)
+ */
+void ImageCoRViewQtWidget::mouseFinishROI(int x, int y) {
+ grabROICorner2FromMousePoint(x, y);
+ refreshROIetAl();
+ m_presenter->notify(IImageCoRPresenter::FinishedROI);
+}
+
+void ImageCoRViewQtWidget::mouseUpdateNormAreaCorners12(int x, int y) {
+ grabNormAreaCorner1FromMousePoint(x, y);
+ grabNormAreaCorner2FromMousePoint(x, y);
+ refreshROIetAl();
+ m_selectionState = IImageCoRView::SelectNormAreaSecond;
+}
+
+void ImageCoRViewQtWidget::mouseUpdateNormAreaCorner2(int x, int y) {
+ grabNormAreaCorner2FromMousePoint(x, y);
+ refreshROIetAl();
+}
+
+void ImageCoRViewQtWidget::mouseFinishNormArea(int x, int y) {
+ grabNormAreaCorner2FromMousePoint(x, y);
+ refreshROIetAl();
+ m_presenter->notify(IImageCoRPresenter::FinishedNormalization);
+}
+
+void ImageCoRViewQtWidget::readSettings() {
QSettings qs;
qs.beginGroup(QString::fromStdString(m_settingsGroup));
-
- qs.setValue("interface-win-geometry", saveGeometry());
+ restoreGeometry(qs.value("interface-win-geometry").toByteArray());
qs.endGroup();
}
diff --git a/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp b/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
index f4b6fa04a60..da61efebe8f 100644
--- a/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
+++ b/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
@@ -43,32 +43,6 @@ std::vector<std::string> StackOfImagesDirs::darkFiles() const {
return findImgFiles(m_darkDir);
}
-std::vector<std::string>
-StackOfImagesDirs::findImgFiles(const std::string &path) const {
- std::vector<std::string> fnames;
- Poco::File dir(path);
- if (!dir.isDirectory() || !dir.exists())
- return fnames;
-
- // as an alternative could also use Poco::Glob to find the files
- Poco::DirectoryIterator it(dir);
- Poco::DirectoryIterator end;
- while (it != end) {
- const std::string name = it.name();
- // TODO: filter names by extension?
- if (it->isFile()) {
- fnames.push_back(it.path().toString());
- }
-
- ++it;
- }
-
- // this assumes the usual sorting of images of a stack (directory): a prefix,
- // and a sequence number (with a fixed number of digits).
- std::sort(fnames.begin(), fnames.end());
- return fnames;
-}
-
void StackOfImagesDirs::findStackDirs(const std::string &path) {
if (path.empty())
return;
@@ -123,5 +97,31 @@ void StackOfImagesDirs::findStackDirs(const std::string &path) {
}
}
+std::vector<std::string>
+StackOfImagesDirs::findImgFiles(const std::string &path) const {
+ std::vector<std::string> fnames;
+ Poco::File dir(path);
+ if (!dir.isDirectory() || !dir.exists())
+ return fnames;
+
+ // as an alternative could also use Poco::Glob to find the files
+ Poco::DirectoryIterator it(dir);
+ Poco::DirectoryIterator end;
+ while (it != end) {
+ // TODO: filter names by extension?
+ // const std::string name = it.name();
+ if (it->isFile()) {
+ fnames.push_back(it.path().toString());
+ }
+
+ ++it;
+ }
+
+ // this assumes the usual sorting of images of a stack (directory): a prefix,
+ // and a sequence number (with a fixed number of digits).
+ std::sort(fnames.begin(), fnames.end());
+ return fnames;
+}
+
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h b/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
index 61c9f67547e..89d75cfb0db 100644
--- a/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
+++ b/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
@@ -67,7 +67,7 @@ public:
pres.notify(ImageCoRPresenter::Init);
}
- void test_browseImg_EmptyPath() {
+ void xxtest_browseImg_EmptyPath() {
testing::NiceMock<MockImageCoRView> mockView;
MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
@@ -88,15 +88,15 @@ public:
pres.notify(IImageCoRPresenter::BrowseImgOrStack);
}
- void test_newImg_EmptyPath() {
+ void xxtest_newImg_EmptyPath() {
testing::NiceMock<MockImageCoRView> mockView;
MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
- EXPECT_CALL(mockView, askImgOrStackPath()).Times(1).WillOnce(Return(""));
+ EXPECT_CALL(mockView, askImgOrStackPath()).Times(0);
- // No error, no warnings, just ignored
+ // No error, one warning pop-up because a stack is not found
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
- EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
+ EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(1);
// should not get there because there's no stack/img - it's just ignored:
EXPECT_CALL(mockView, showStack(testing::An<const std::string &>()))
@@ -106,10 +106,10 @@ public:
.Times(0);
EXPECT_CALL(mockView, updateImgWithIndex(testing::_)).Times(0);
- pres.notify(IImageCoRPresenter::BrowseImgOrStack);
+ pres.notify(IImageCoRPresenter::NewImgOrStack);
}
- void test_newImg_WrongPath() {
+ void test_browseImg_WrongPath() {
testing::NiceMock<MockImageCoRView> mockView;
MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h b/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
rename to MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
--
GitLab
From 082d1c758a805cfc68c34cffed8dd5ef06320b06 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 7 Oct 2015 15:53:51 +0100
Subject: [PATCH 055/223] rename ImageCoR to ImageROI, re #13140
---
MantidQt/CustomInterfaces/CMakeLists.txt | 16 +-
...ageCoRPresenter.h => IImageROIPresenter.h} | 16 +-
.../{IImageCoRView.h => IImageROIView.h} | 14 +-
...mageCoRPresenter.h => ImageROIPresenter.h} | 20 +-
...RViewQtWidget.h => ImageROIViewQtWidget.h} | 22 +--
...CoRPresenter.cpp => ImageROIPresenter.cpp} | 92 ++++-----
...wQtWidget.cpp => ImageROIViewQtWidget.cpp} | 174 +++++++++---------
...resenterTest.h => ImageROIPresenterTest.h} | 136 +++++++-------
8 files changed, 245 insertions(+), 245 deletions(-)
rename MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/{IImageCoRPresenter.h => IImageROIPresenter.h} (87%)
rename MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/{IImageCoRView.h => IImageROIView.h} (95%)
rename MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/{ImageCoRPresenter.h => ImageROIPresenter.h} (83%)
rename MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/{ImageCoRViewQtWidget.h => ImageROIViewQtWidget.h} (89%)
rename MantidQt/CustomInterfaces/src/Tomography/{ImageCoRPresenter.cpp => ImageROIPresenter.cpp} (74%)
rename MantidQt/CustomInterfaces/src/Tomography/{ImageCoRViewQtWidget.cpp => ImageROIViewQtWidget.cpp} (83%)
rename MantidQt/CustomInterfaces/test/{ImageCoRPresenterTest.h => ImageROIPresenterTest.h} (66%)
diff --git a/MantidQt/CustomInterfaces/CMakeLists.txt b/MantidQt/CustomInterfaces/CMakeLists.txt
index b6f0c0e8a52..be571e64c99 100644
--- a/MantidQt/CustomInterfaces/CMakeLists.txt
+++ b/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -90,8 +90,8 @@ set ( SRC_FILES
src/SANSPlotSpecial.cpp
src/SANSRunWindow.cpp
src/StepScan.cpp
- src/Tomography/ImageCoRPresenter.cpp
- src/Tomography/ImageCoRViewQtWidget.cpp
+ src/Tomography/ImageROIPresenter.cpp
+ src/Tomography/ImageROIViewQtWidget.cpp
src/Tomography/ImageStackPreParams.cpp
src/Tomography/SavuConfigDialog.cpp
src/Tomography/StackOfImagesDirs.cpp
@@ -209,10 +209,10 @@ set ( INC_FILES
inc/MantidQtCustomInterfaces/SANSPlotSpecial.h
inc/MantidQtCustomInterfaces/SANSRunWindow.h
inc/MantidQtCustomInterfaces/StepScan.h
- inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
- inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
- inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
- inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
+ inc/MantidQtCustomInterfaces/Tomography/IImageROIPresenter.h
+ inc/MantidQtCustomInterfaces/Tomography/IImageROIView.h
+ inc/MantidQtCustomInterfaces/Tomography/ImageROIPresenter.h
+ inc/MantidQtCustomInterfaces/Tomography/ImageROIViewQtWidget.h
inc/MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h
inc/MantidQtCustomInterfaces/Tomography/ITomographyIfacePresenter.h
inc/MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h
@@ -318,7 +318,7 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h
inc/MantidQtCustomInterfaces/SANSEventSlicing.h
inc/MantidQtCustomInterfaces/SANSDiagnostics.h
inc/MantidQtCustomInterfaces/StepScan.h
- inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
+ inc/MantidQtCustomInterfaces/Tomography/ImageROIViewQtWidget.h
inc/MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h
inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h
inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialog.h
@@ -398,7 +398,7 @@ set ( TEST_FILES
ALCPeakFittingModelTest.h
ALCPeakFittingPresenterTest.h
EnggDiffractionPresenterTest.h
- ImageCoRPresenterTest.h
+ ImageROIPresenterTest.h
IO_MuonGroupingTest.h
MuonAnalysisHelperTest.h
ParseKeyValueStringTest.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageROIPresenter.h
similarity index 87%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
rename to MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageROIPresenter.h
index e4845f6d2cb..581accf1509 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageROIPresenter.h
@@ -1,5 +1,5 @@
-#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORPRESENTER_H_
-#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORPRESENTER_H_
+#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGEROIPRESENTER_H_
+#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGEROIPRESENTER_H_
namespace MantidQt {
namespace CustomInterfaces {
@@ -9,7 +9,7 @@ Presenter for the widget that handles the selection of the center of
rotation, region of interest, region for normalization, etc. from an
image or stack of images. This is the abstract base class / interface
for the presenter (in the sense of the MVP pattern). The name
-ImageCoR refers to the Center-of-Rotation, which is the most basic
+ImageROI refers to the Center-of-Rotation, which is the most basic
parameter that users can select via this widget. This class is
QtGUI-free as it uses the interface of the view. The model is simply
the ImageStackPreParams class which holds coordinates selected by the
@@ -36,11 +36,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class IImageCoRPresenter {
+class IImageROIPresenter {
public:
- IImageCoRPresenter(){};
- virtual ~IImageCoRPresenter(){};
+ IImageROIPresenter(){};
+ virtual ~IImageROIPresenter(){};
/// These are user actions, triggered from the (passive) view, that need
/// handling by the presenter
@@ -68,10 +68,10 @@ public:
*
* @param notif Type of notification to process.
*/
- virtual void notify(IImageCoRPresenter::Notification notif) = 0;
+ virtual void notify(IImageROIPresenter::Notification notif) = 0;
};
} // namespace CustomInterfaces
} // namespace MantidQt
-#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORPRESENTER_H_
+#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGEROIPRESENTER_H_
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageROIView.h
similarity index 95%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
rename to MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageROIView.h
index 68c11500165..592dc79a3a1 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageCoRView.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/IImageROIView.h
@@ -1,5 +1,5 @@
-#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORVIEW_H_
-#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORVIEW_H_
+#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGEROIVIEW_H_
+#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGEROIVIEW_H_
#include "MantidAPI/WorkspaceGroup_fwd.h"
#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
@@ -11,7 +11,7 @@ namespace CustomInterfaces {
Widget to handle the selection of the center of rotation, region of
interest, region for normalization, etc. from an image or stack of
images. This is the abstract base class / interface for the view of
-this widget (in the sense of the MVP pattern). The name ImageCoR
+this widget (in the sense of the MVP pattern). The name ImageROI
refers to the Center-of-Rotation, which is the most basic parameter
that users can select via this widget. This class is Qt-free. Qt
specific functionality and dependencies are added in a class derived
@@ -38,11 +38,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class IImageCoRView {
+class IImageROIView {
public:
- IImageCoRView(){};
- virtual ~IImageCoRView(){};
+ IImageROIView(){};
+ virtual ~IImageROIView(){};
// Selection states
enum SelectionState {
@@ -213,4 +213,4 @@ public:
} // namespace CustomInterfaces
} // namespace MantidQt
-#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGECORVIEW_H_
+#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IIMAGEROIVIEW_H_
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageROIPresenter.h
similarity index 83%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
rename to MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageROIPresenter.h
index b0031c5f840..7aaeac9147e 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageROIPresenter.h
@@ -1,9 +1,9 @@
-#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORPRESENTER_H_
-#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORPRESENTER_H_
+#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGEROIPRESENTER_H_
+#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGEROIPRESENTER_H_
#include "MantidAPI/WorkspaceGroup_fwd.h"
-#include "MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h"
-#include "MantidQtCustomInterfaces/Tomography/IImageCoRView.h"
+#include "MantidQtCustomInterfaces/Tomography/IImageROIPresenter.h"
+#include "MantidQtCustomInterfaces/Tomography/IImageROIView.h"
#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
#include "MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h"
@@ -39,14 +39,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DLLExport ImageCoRPresenter : public IImageCoRPresenter {
+class DLLExport ImageROIPresenter : public IImageROIPresenter {
public:
/// Default constructor - normally used from the concrete view
- ImageCoRPresenter(IImageCoRView *view);
- virtual ~ImageCoRPresenter();
+ ImageROIPresenter(IImageROIView *view);
+ virtual ~ImageROIPresenter();
- void notify(IImageCoRPresenter::Notification notif);
+ void notify(IImageROIPresenter::Notification notif);
protected:
void initialize();
@@ -82,7 +82,7 @@ private:
std::string m_stackPath;
/// Associated view for this presenter (MVP pattern)
- IImageCoRView *const m_view;
+ IImageROIView *const m_view;
/// Associated model for this presenter (MVP pattern). This is just
/// a set of coordinates
@@ -92,4 +92,4 @@ private:
} // namespace CustomInterfaces
} // namespace MantidQt
-#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORPRESENTER_H_
+#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGEROIPRESENTER_H_
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageROIViewQtWidget.h
similarity index 89%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
rename to MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageROIViewQtWidget.h
index 1d0e619bb8a..739374aed28 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ImageROIViewQtWidget.h
@@ -1,10 +1,10 @@
-#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTWIDGET_H_
-#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTWIDGET_H_
+#ifndef MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGEROIVIEWQTWIDGET_H_
+#define MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGEROIVIEWQTWIDGET_H_
#include "MantidAPI/WorkspaceGroup_fwd.h"
#include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/Tomography/IImageCoRPresenter.h"
-#include "MantidQtCustomInterfaces/Tomography/IImageCoRView.h"
+#include "MantidQtCustomInterfaces/Tomography/IImageROIPresenter.h"
+#include "MantidQtCustomInterfaces/Tomography/IImageROIView.h"
#include "ui_ImageSelectCoRAndRegions.h"
@@ -24,8 +24,8 @@ image or stack of images. Provides a concrete view for the graphical
interface for tomography functionality in Mantid. This view is
Qt-based and it is probably the only one that will be implemented in a
foreseeable horizon. The interface of this class is given by
-IImageCoRView so that it fits in the MVP (Model-View-Presenter) design
-of the ImageCoR widget.
+IImageROIView so that it fits in the MVP (Model-View-Presenter) design
+of the ImageROI widget.
Copyright © 2015 ISIS Rutherford Appleton Laboratory, NScD
Oak Ridge National Laboratory & European Spallation Source
@@ -48,12 +48,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DLLExport ImageCoRViewQtWidget : public QWidget, public IImageCoRView {
+class DLLExport ImageROIViewQtWidget : public QWidget, public IImageROIView {
Q_OBJECT
public:
- ImageCoRViewQtWidget(QWidget *parent = 0);
- virtual ~ImageCoRViewQtWidget(){};
+ ImageROIViewQtWidget(QWidget *parent = 0);
+ virtual ~ImageROIViewQtWidget(){};
void setParams(ImageStackPreParams ¶ms);
@@ -177,10 +177,10 @@ private:
SelectionState m_selectionState;
// presenter as in the model-view-presenter
- boost::scoped_ptr<IImageCoRPresenter> m_presenter;
+ boost::scoped_ptr<IImageROIPresenter> m_presenter;
};
} // namespace CustomInterfaces
} // namespace MantidQt
-#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGECORVIEWQTWIDGET_H_
+#endif // MANTIDQTCUSTOMINTERFACES_TOMOGRAPHY_IMAGEROIVIEWQTWIDGET_H_
diff --git a/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp b/MantidQt/CustomInterfaces/src/Tomography/ImageROIPresenter.cpp
similarity index 74%
rename from MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
rename to MantidQt/CustomInterfaces/src/Tomography/ImageROIPresenter.cpp
index aaabbf133d7..5f411515c23 100644
--- a/MantidQt/CustomInterfaces/src/Tomography/ImageCoRPresenter.cpp
+++ b/MantidQt/CustomInterfaces/src/Tomography/ImageROIPresenter.cpp
@@ -3,15 +3,15 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/WorkspaceGroup.h"
#include "MantidQtCustomInterfaces/Tomography/ImageStackPreParams.h"
-#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
-#include "MantidQtCustomInterfaces/Tomography/IImageCoRView.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageROIPresenter.h"
+#include "MantidQtCustomInterfaces/Tomography/IImageROIView.h"
using namespace MantidQt::CustomInterfaces;
namespace MantidQt {
namespace CustomInterfaces {
-ImageCoRPresenter::ImageCoRPresenter(IImageCoRView *view)
+ImageROIPresenter::ImageROIPresenter(IImageROIView *view)
: m_view(view), m_model(new ImageStackPreParams()) {
if (!m_view) {
throw std::runtime_error("Severe inconsistency found. Presenter created "
@@ -20,78 +20,78 @@ ImageCoRPresenter::ImageCoRPresenter(IImageCoRView *view)
}
}
-ImageCoRPresenter::~ImageCoRPresenter() { cleanup(); }
+ImageROIPresenter::~ImageROIPresenter() { cleanup(); }
-void ImageCoRPresenter::cleanup() {}
+void ImageROIPresenter::cleanup() {}
-void ImageCoRPresenter::notify(Notification notif) {
+void ImageROIPresenter::notify(Notification notif) {
switch (notif) {
- case IImageCoRPresenter::Init:
+ case IImageROIPresenter::Init:
processInit();
break;
- case IImageCoRPresenter::BrowseImgOrStack:
+ case IImageROIPresenter::BrowseImgOrStack:
processBrowseImg();
break;
- case IImageCoRPresenter::NewImgOrStack:
+ case IImageROIPresenter::NewImgOrStack:
processNewStack();
break;
- case IImageCoRPresenter::UpdateImgIndex:
+ case IImageROIPresenter::UpdateImgIndex:
processUpdateImgIndex();
break;
- case IImageCoRPresenter::SelectCoR:
+ case IImageROIPresenter::SelectCoR:
processSelectCoR();
break;
- case IImageCoRPresenter::SelectROI:
+ case IImageROIPresenter::SelectROI:
processSelectROI();
break;
- case IImageCoRPresenter::SelectNormalization:
+ case IImageROIPresenter::SelectNormalization:
processSelectNormalization();
break;
- case IImageCoRPresenter::FinishedCoR:
+ case IImageROIPresenter::FinishedCoR:
processFinishedCoR();
break;
- case IImageCoRPresenter::FinishedROI:
+ case IImageROIPresenter::FinishedROI:
processFinishedROI();
break;
- case IImageCoRPresenter::FinishedNormalization:
+ case IImageROIPresenter::FinishedNormalization:
processFinishedNormalization();
break;
- case IImageCoRPresenter::ResetCoR:
+ case IImageROIPresenter::ResetCoR:
processResetCoR();
break;
- case IImageCoRPresenter::ResetROI:
+ case IImageROIPresenter::ResetROI:
processResetROI();
break;
- case IImageCoRPresenter::ResetNormalization:
+ case IImageROIPresenter::ResetNormalization:
processResetNormalization();
break;
- case IImageCoRPresenter::ShutDown:
+ case IImageROIPresenter::ShutDown:
processShutDown();
break;
}
}
-void ImageCoRPresenter::processInit() {
+void ImageROIPresenter::processInit() {
ImageStackPreParams p;
m_view->setParams(p);
}
-void ImageCoRPresenter::processBrowseImg() {
+void ImageROIPresenter::processBrowseImg() {
const std::string path = m_view->askImgOrStackPath();
if (path.empty())
@@ -112,7 +112,7 @@ void ImageCoRPresenter::processBrowseImg() {
* @return a stack of images built from the path passed, not
* necessarily correct (check with isValid())
*/
-StackOfImagesDirs ImageCoRPresenter::checkInputStack(const std::string &path) {
+StackOfImagesDirs ImageROIPresenter::checkInputStack(const std::string &path) {
StackOfImagesDirs soid(path);
const std::string soiPath = soid.sampleImagesDir();
@@ -130,7 +130,7 @@ StackOfImagesDirs ImageCoRPresenter::checkInputStack(const std::string &path) {
return soid;
}
-void ImageCoRPresenter::processNewStack() {
+void ImageROIPresenter::processNewStack() {
StackOfImagesDirs soid("");
try {
@@ -179,53 +179,53 @@ void ImageCoRPresenter::processNewStack() {
Mantid::API::AnalysisDataService::Instance().remove(wsg->getName());
}
-void ImageCoRPresenter::processUpdateImgIndex() {
+void ImageROIPresenter::processUpdateImgIndex() {
m_view->updateImgWithIndex(m_view->currentImgIndex());
}
-void ImageCoRPresenter::processSelectCoR() {
- m_view->changeSelectionState(IImageCoRView::SelectCoR);
+void ImageROIPresenter::processSelectCoR() {
+ m_view->changeSelectionState(IImageROIView::SelectCoR);
}
-void ImageCoRPresenter::processSelectROI() {
- m_view->changeSelectionState(IImageCoRView::SelectROIFirst);
+void ImageROIPresenter::processSelectROI() {
+ m_view->changeSelectionState(IImageROIView::SelectROIFirst);
}
-void ImageCoRPresenter::processSelectNormalization() {
- m_view->changeSelectionState(IImageCoRView::SelectNormAreaFirst);
+void ImageROIPresenter::processSelectNormalization() {
+ m_view->changeSelectionState(IImageROIView::SelectNormAreaFirst);
}
-void ImageCoRPresenter::processFinishedCoR() {
- m_view->changeSelectionState(IImageCoRView::SelectNone);
+void ImageROIPresenter::processFinishedCoR() {
+ m_view->changeSelectionState(IImageROIView::SelectNone);
}
-void ImageCoRPresenter::processFinishedROI() {
- m_view->changeSelectionState(IImageCoRView::SelectNone);
+void ImageROIPresenter::processFinishedROI() {
+ m_view->changeSelectionState(IImageROIView::SelectNone);
}
-void ImageCoRPresenter::processFinishedNormalization() {
- m_view->changeSelectionState(IImageCoRView::SelectNone);
+void ImageROIPresenter::processFinishedNormalization() {
+ m_view->changeSelectionState(IImageROIView::SelectNone);
}
-void ImageCoRPresenter::processResetCoR() {
+void ImageROIPresenter::processResetCoR() {
m_view->resetCoR();
- m_view->changeSelectionState(IImageCoRView::SelectNone);
+ m_view->changeSelectionState(IImageROIView::SelectNone);
}
-void ImageCoRPresenter::processResetROI() {
+void ImageROIPresenter::processResetROI() {
m_view->resetROI();
- m_view->changeSelectionState(IImageCoRView::SelectNone);
+ m_view->changeSelectionState(IImageROIView::SelectNone);
}
-void ImageCoRPresenter::processResetNormalization() {
+void ImageROIPresenter::processResetNormalization() {
m_view->resetNormArea();
- m_view->changeSelectionState(IImageCoRView::SelectNone);
+ m_view->changeSelectionState(IImageROIView::SelectNone);
}
-void ImageCoRPresenter::processShutDown() { m_view->saveSettings(); }
+void ImageROIPresenter::processShutDown() { m_view->saveSettings(); }
Mantid::API::WorkspaceGroup_sptr
-ImageCoRPresenter::loadFITSStack(const std::vector<std::string> &imgs) {
+ImageROIPresenter::loadFITSStack(const std::vector<std::string> &imgs) {
const std::string wsName = "__stack_fits_viewer_tomography_gui";
auto &ads = Mantid::API::AnalysisDataService::Instance();
if (ads.doesExist(wsName)) {
@@ -254,7 +254,7 @@ ImageCoRPresenter::loadFITSStack(const std::vector<std::string> &imgs) {
}
}
-void ImageCoRPresenter::loadFITSImage(const std::string &path,
+void ImageROIPresenter::loadFITSImage(const std::string &path,
const std::string &wsName) {
// get fits file into workspace and retrieve it from the ADS
auto alg = Mantid::API::AlgorithmManager::Instance().create("LoadFITS");
diff --git a/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp b/MantidQt/CustomInterfaces/src/Tomography/ImageROIViewQtWidget.cpp
similarity index 83%
rename from MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
rename to MantidQt/CustomInterfaces/src/Tomography/ImageROIViewQtWidget.cpp
index 233d91c10b5..51d23189b5c 100644
--- a/MantidQt/CustomInterfaces/src/Tomography/ImageCoRViewQtWidget.cpp
+++ b/MantidQt/CustomInterfaces/src/Tomography/ImageROIViewQtWidget.cpp
@@ -3,8 +3,8 @@
#include "MantidQtAPI/AlgorithmInputHistory.h"
#include "MantidQtAPI/AlgorithmRunner.h"
-#include "MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h"
-#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageROIViewQtWidget.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageROIPresenter.h"
using namespace Mantid::API;
using namespace MantidQt::CustomInterfaces;
@@ -19,11 +19,11 @@ namespace MantidQt {
namespace CustomInterfaces {
// this would be more like a CustomWidget if it's eventually moved there
-const std::string ImageCoRViewQtWidget::m_settingsGroup =
- "CustomInterfaces/ImageCoRView";
+const std::string ImageROIViewQtWidget::m_settingsGroup =
+ "CustomInterfaces/ImageROIView";
-ImageCoRViewQtWidget::ImageCoRViewQtWidget(QWidget *parent)
- : QWidget(parent), IImageCoRView(), m_imgWidth(0), m_imgHeight(0),
+ImageROIViewQtWidget::ImageROIViewQtWidget(QWidget *parent)
+ : QWidget(parent), IImageROIView(), m_imgWidth(0), m_imgHeight(0),
m_selectionState(SelectNone), m_presenter(NULL) {
initLayout();
@@ -33,21 +33,21 @@ ImageCoRViewQtWidget::ImageCoRViewQtWidget(QWidget *parent)
m_ui.label_img->installEventFilter(this);
}
-void ImageCoRViewQtWidget::setParams(ImageStackPreParams ¶ms) {
+void ImageROIViewQtWidget::setParams(ImageStackPreParams ¶ms) {
m_params = params;
setParamWidgets(m_params);
}
-ImageStackPreParams ImageCoRViewQtWidget::userSelection() const {
+ImageStackPreParams ImageROIViewQtWidget::userSelection() const {
return m_params;
}
-void ImageCoRViewQtWidget::changeSelectionState(
- const IImageCoRView::SelectionState &state) {
+void ImageROIViewQtWidget::changeSelectionState(
+ const IImageROIView::SelectionState &state) {
m_selectionState = state;
}
-void ImageCoRViewQtWidget::showStack(const std::string & /*path*/) {
+void ImageROIViewQtWidget::showStack(const std::string & /*path*/) {
// TODO:
// a) load as proper stack of images workspace - this can only be done when
// we have a firt working version of the "lean MD workspace". This method
@@ -57,7 +57,7 @@ void ImageCoRViewQtWidget::showStack(const std::string & /*path*/) {
// enableParamWidgets(true);
}
-void ImageCoRViewQtWidget::showStack(Mantid::API::WorkspaceGroup_sptr &wsg) {
+void ImageROIViewQtWidget::showStack(Mantid::API::WorkspaceGroup_sptr &wsg) {
if (0 == wsg->size())
return;
@@ -89,7 +89,7 @@ void ImageCoRViewQtWidget::showStack(Mantid::API::WorkspaceGroup_sptr &wsg) {
enableParamWidgets(true);
}
-void ImageCoRViewQtWidget::showProjection(
+void ImageROIViewQtWidget::showProjection(
const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx) {
showProjectionImage(wsg, idx);
@@ -117,21 +117,21 @@ void ImageCoRViewQtWidget::showProjection(
m_ui.horizontalScrollBar_img_stack->setValue(static_cast<int>(idx));
}
-void ImageCoRViewQtWidget::userWarning(const std::string &err,
+void ImageROIViewQtWidget::userWarning(const std::string &err,
const std::string &description) {
QMessageBox::warning(this, QString::fromStdString(err),
QString::fromStdString(description), QMessageBox::Ok,
QMessageBox::Ok);
}
-void ImageCoRViewQtWidget::userError(const std::string &err,
+void ImageROIViewQtWidget::userError(const std::string &err,
const std::string &description) {
QMessageBox::critical(this, QString::fromStdString(err),
QString::fromStdString(description), QMessageBox::Ok,
QMessageBox::Ok);
}
-std::string ImageCoRViewQtWidget::askImgOrStackPath() {
+std::string ImageROIViewQtWidget::askImgOrStackPath() {
// get path
QString fitsStr = QString("Supported formats: FITS, TIFF and PNG "
"(*.fits *.fit *.tiff *.tif *.png);;"
@@ -153,7 +153,7 @@ std::string ImageCoRViewQtWidget::askImgOrStackPath() {
return path.toStdString();
}
-void ImageCoRViewQtWidget::saveSettings() const {
+void ImageROIViewQtWidget::saveSettings() const {
QSettings qs;
qs.beginGroup(QString::fromStdString(m_settingsGroup));
@@ -161,7 +161,7 @@ void ImageCoRViewQtWidget::saveSettings() const {
qs.endGroup();
}
-void ImageCoRViewQtWidget::resetCoR() {
+void ImageROIViewQtWidget::resetCoR() {
int midx =
(m_ui.spinBox_cor_x->minimum() + m_ui.spinBox_cor_x->maximum()) / 2;
m_ui.spinBox_cor_x->setValue(midx);
@@ -170,21 +170,21 @@ void ImageCoRViewQtWidget::resetCoR() {
m_ui.spinBox_cor_y->setValue(midy);
}
-void ImageCoRViewQtWidget::resetROI() {
+void ImageROIViewQtWidget::resetROI() {
m_ui.spinBox_roi_top_x->setValue(0);
m_ui.spinBox_roi_top_y->setValue(0);
m_ui.spinBox_roi_bottom_x->setValue(m_ui.spinBox_roi_bottom_x->maximum());
m_ui.spinBox_roi_bottom_y->setValue(m_ui.spinBox_roi_bottom_y->maximum());
}
-void ImageCoRViewQtWidget::resetNormArea() {
+void ImageROIViewQtWidget::resetNormArea() {
m_ui.spinBox_norm_top_x->setValue(0);
m_ui.spinBox_norm_top_y->setValue(0);
m_ui.spinBox_norm_bottom_x->setValue(0);
m_ui.spinBox_norm_bottom_y->setValue(0);
}
-void ImageCoRViewQtWidget::initLayout() {
+void ImageROIViewQtWidget::initLayout() {
// setup container ui
m_ui.setupUi(this);
@@ -209,16 +209,16 @@ void ImageCoRViewQtWidget::initLayout() {
grabROIFromWidgets();
grabNormAreaFromWidgets();
- // presenter that knows how to handle a IImageCoRView should take care
+ // presenter that knows how to handle a IImageROIView should take care
// of all the logic. Note the view needs to now the concrete presenter here
- m_presenter.reset(new ImageCoRPresenter(this));
+ m_presenter.reset(new ImageROIPresenter(this));
// it will know what compute resources and tools we have available:
// This view doesn't even know the names of compute resources, etc.
- m_presenter->notify(ImageCoRPresenter::Init);
+ m_presenter->notify(ImageROIPresenter::Init);
}
-void ImageCoRViewQtWidget::setupConnections() {
+void ImageROIViewQtWidget::setupConnections() {
// 'browse' buttons
connect(m_ui.pushButton_browse_img, SIGNAL(released()), this,
@@ -266,17 +266,17 @@ void ImageCoRViewQtWidget::setupConnections() {
SLOT(valueUpdatedNormArea(int)));
}
-void ImageCoRViewQtWidget::valueUpdatedCoR(int) {
+void ImageROIViewQtWidget::valueUpdatedCoR(int) {
grabCoRFromWidgets();
refreshROIetAl();
}
-void ImageCoRViewQtWidget::valueUpdatedROI(int) {
+void ImageROIViewQtWidget::valueUpdatedROI(int) {
grabROIFromWidgets();
refreshROIetAl();
}
-void ImageCoRViewQtWidget::valueUpdatedNormArea(int) {
+void ImageROIViewQtWidget::valueUpdatedNormArea(int) {
grabNormAreaFromWidgets();
refreshROIetAl();
}
@@ -285,12 +285,12 @@ void ImageCoRViewQtWidget::valueUpdatedNormArea(int) {
* Parameter values from spin box widgets => coordinate parameters
* data member
*/
-void ImageCoRViewQtWidget::grabCoRFromWidgets() {
+void ImageROIViewQtWidget::grabCoRFromWidgets() {
m_params.cor = Mantid::Kernel::V2D(m_ui.spinBox_cor_x->value(),
m_ui.spinBox_cor_y->value());
}
-void ImageCoRViewQtWidget::grabROIFromWidgets() {
+void ImageROIViewQtWidget::grabROIFromWidgets() {
m_params.roi =
std::make_pair(Mantid::Kernel::V2D(m_ui.spinBox_roi_top_x->value(),
m_ui.spinBox_roi_top_y->value()),
@@ -298,7 +298,7 @@ void ImageCoRViewQtWidget::grabROIFromWidgets() {
m_ui.spinBox_roi_bottom_y->value()));
}
-void ImageCoRViewQtWidget::grabNormAreaFromWidgets() {
+void ImageROIViewQtWidget::grabNormAreaFromWidgets() {
m_params.normalizationRegion =
std::make_pair(Mantid::Kernel::V2D(m_ui.spinBox_norm_top_x->value(),
m_ui.spinBox_norm_top_y->value()),
@@ -312,7 +312,7 @@ void ImageCoRViewQtWidget::grabNormAreaFromWidgets() {
* for every event that modifies the current image and/or selection of
* parameters.
*/
-void ImageCoRViewQtWidget::refreshROIetAl() {
+void ImageROIViewQtWidget::refreshROIetAl() {
const QPixmap *pp = m_ui.label_img->pixmap();
if (!pp)
@@ -354,7 +354,7 @@ void ImageCoRViewQtWidget::refreshROIetAl() {
m_ui.label_img->setPixmap(toDisplay);
}
-void ImageCoRViewQtWidget::refreshCoR() {
+void ImageROIViewQtWidget::refreshCoR() {
const QPixmap *pp = m_ui.label_img->pixmap();
if (!pp)
return;
@@ -376,7 +376,7 @@ void ImageCoRViewQtWidget::refreshCoR() {
m_ui.label_img->setPixmap(toDisplay);
}
-void ImageCoRViewQtWidget::refreshROI() {
+void ImageROIViewQtWidget::refreshROI() {
const QPixmap *pp = m_ui.label_img->pixmap();
if (!pp)
return;
@@ -397,7 +397,7 @@ void ImageCoRViewQtWidget::refreshROI() {
m_ui.label_img->setPixmap(toDisplay);
}
-void ImageCoRViewQtWidget::refreshNormArea() {
+void ImageROIViewQtWidget::refreshNormArea() {
// TODO: display proper symbol
const QPixmap *pp = m_ui.label_img->pixmap();
if (!pp)
@@ -419,13 +419,13 @@ void ImageCoRViewQtWidget::refreshNormArea() {
m_ui.label_img->setPixmap(toDisplay);
}
-void ImageCoRViewQtWidget::enableParamWidgets(bool enable) {
+void ImageROIViewQtWidget::enableParamWidgets(bool enable) {
m_ui.groupBox_cor->setEnabled(enable);
m_ui.groupBox_roi->setEnabled(enable);
m_ui.groupBox_norm->setEnabled(enable);
}
-void ImageCoRViewQtWidget::initParamWidgets(size_t maxWidth, size_t maxHeight) {
+void ImageROIViewQtWidget::initParamWidgets(size_t maxWidth, size_t maxHeight) {
m_imgWidth = static_cast<int>(maxWidth);
m_imgHeight = static_cast<int>(maxHeight);
@@ -460,7 +460,7 @@ void ImageCoRViewQtWidget::initParamWidgets(size_t maxWidth, size_t maxHeight) {
resetNormArea();
}
-void ImageCoRViewQtWidget::setParamWidgets(ImageStackPreParams ¶ms) {
+void ImageROIViewQtWidget::setParamWidgets(ImageStackPreParams ¶ms) {
m_ui.spinBox_cor_x->setValue(static_cast<int>(params.cor.X()));
m_ui.spinBox_cor_y->setValue(static_cast<int>(params.cor.Y()));
@@ -481,46 +481,46 @@ void ImageCoRViewQtWidget::setParamWidgets(ImageStackPreParams ¶ms) {
static_cast<int>(params.normalizationRegion.second.Y()));
}
-void ImageCoRViewQtWidget::corClicked() {
- m_presenter->notify(IImageCoRPresenter::SelectCoR);
+void ImageROIViewQtWidget::corClicked() {
+ m_presenter->notify(IImageROIPresenter::SelectCoR);
}
-void ImageCoRViewQtWidget::corResetClicked() {
- m_presenter->notify(IImageCoRPresenter::ResetCoR);
+void ImageROIViewQtWidget::corResetClicked() {
+ m_presenter->notify(IImageROIPresenter::ResetCoR);
refreshROIetAl();
}
-void ImageCoRViewQtWidget::roiClicked() {
- m_presenter->notify(IImageCoRPresenter::SelectROI);
+void ImageROIViewQtWidget::roiClicked() {
+ m_presenter->notify(IImageROIPresenter::SelectROI);
}
-void ImageCoRViewQtWidget::roiResetClicked() {
- m_presenter->notify(IImageCoRPresenter::ResetROI);
+void ImageROIViewQtWidget::roiResetClicked() {
+ m_presenter->notify(IImageROIPresenter::ResetROI);
refreshROIetAl();
}
-void ImageCoRViewQtWidget::normAreaClicked() {
- m_presenter->notify(IImageCoRPresenter::SelectNormalization);
+void ImageROIViewQtWidget::normAreaClicked() {
+ m_presenter->notify(IImageROIPresenter::SelectNormalization);
}
-void ImageCoRViewQtWidget::normAreaResetClicked() {
- m_presenter->notify(IImageCoRPresenter::ResetNormalization);
+void ImageROIViewQtWidget::normAreaResetClicked() {
+ m_presenter->notify(IImageROIPresenter::ResetNormalization);
refreshROIetAl();
}
-void ImageCoRViewQtWidget::browseImgClicked() {
- m_presenter->notify(IImageCoRPresenter::BrowseImgOrStack);
+void ImageROIViewQtWidget::browseImgClicked() {
+ m_presenter->notify(IImageROIPresenter::BrowseImgOrStack);
}
-void ImageCoRViewQtWidget::updateFromImagesSlider(int /* current */) {
- m_presenter->notify(IImageCoRPresenter::UpdateImgIndex);
+void ImageROIViewQtWidget::updateFromImagesSlider(int /* current */) {
+ m_presenter->notify(IImageROIPresenter::UpdateImgIndex);
}
-size_t ImageCoRViewQtWidget::currentImgIndex() const {
+size_t ImageROIViewQtWidget::currentImgIndex() const {
return m_ui.horizontalScrollBar_img_stack->value();
}
-void ImageCoRViewQtWidget::updateImgWithIndex(size_t idx) {
+void ImageROIViewQtWidget::updateImgWithIndex(size_t idx) {
int max = m_ui.horizontalScrollBar_img_stack->maximum();
int current = m_ui.horizontalScrollBar_img_stack->value();
@@ -530,7 +530,7 @@ void ImageCoRViewQtWidget::updateImgWithIndex(size_t idx) {
"/" + boost::lexical_cast<std::string>(max + 1)));
}
-void ImageCoRViewQtWidget::showProjectionImage(
+void ImageROIViewQtWidget::showProjectionImage(
const Mantid::API::WorkspaceGroup_sptr &wsg, size_t idx) {
MatrixWorkspace_sptr ws;
@@ -649,7 +649,7 @@ void ImageCoRViewQtWidget::showProjectionImage(
* the begin and end of the selection. For full testability (including
* the mouse interaction), this method should be implemented fully in
* terms of notifications to the presenter. This would require a bunch
- * of new notifications in IImageCoRPresenter, and making at least all
+ * of new notifications in IImageROIPresenter, and making at least all
* the mouseUpdateCoR, mouseUpdateROICorners12, mouseXXX methods
* public in this view interface. This can be considered at a later
* stage.
@@ -657,9 +657,9 @@ void ImageCoRViewQtWidget::showProjectionImage(
* @param obj object concerned by the event
* @param event event received (mouse click, release, move, etc.)
**/
-bool ImageCoRViewQtWidget::eventFilter(QObject *obj, QEvent *event) {
+bool ImageROIViewQtWidget::eventFilter(QObject *obj, QEvent *event) {
// quick ignore
- if (IImageCoRView::SelectNone == m_selectionState)
+ if (IImageROIView::SelectNone == m_selectionState)
return false;
if (m_ui.label_img == obj) {
@@ -674,25 +674,25 @@ bool ImageCoRViewQtWidget::eventFilter(QObject *obj, QEvent *event) {
auto type = event->type();
if (type == QEvent::MouseButtonPress) {
- if (IImageCoRView::SelectCoR == m_selectionState) {
+ if (IImageROIView::SelectCoR == m_selectionState) {
mouseUpdateCoR(x, y);
- } else if (IImageCoRView::SelectROIFirst == m_selectionState) {
+ } else if (IImageROIView::SelectROIFirst == m_selectionState) {
mouseUpdateROICorners12(x, y);
- } else if (IImageCoRView::SelectNormAreaFirst == m_selectionState) {
+ } else if (IImageROIView::SelectNormAreaFirst == m_selectionState) {
mouseUpdateNormAreaCorners12(x, y);
}
} else if (type == QEvent::MouseMove) {
- if (IImageCoRView::SelectROISecond == m_selectionState) {
+ if (IImageROIView::SelectROISecond == m_selectionState) {
mouseUpdateROICorner2(x, y);
- } else if (IImageCoRView::SelectNormAreaSecond == m_selectionState) {
+ } else if (IImageROIView::SelectNormAreaSecond == m_selectionState) {
mouseUpdateNormAreaCorner2(x, y);
}
} else if (type == QEvent::MouseButtonRelease) {
- if (IImageCoRView::SelectROISecond == m_selectionState) {
+ if (IImageROIView::SelectROISecond == m_selectionState) {
mouseFinishROI(x, y);
- } else if (IImageCoRView::SelectNormAreaSecond == m_selectionState) {
+ } else if (IImageROIView::SelectNormAreaSecond == m_selectionState) {
mouseFinishNormArea(x, y);
}
}
@@ -709,31 +709,31 @@ bool ImageCoRViewQtWidget::eventFilter(QObject *obj, QEvent *event) {
* @param x position on x axis (local to the image)
* @param y position on y axis (local to the image)
*/
-void ImageCoRViewQtWidget::grabCoRFromMousePoint(int x, int y) {
+void ImageROIViewQtWidget::grabCoRFromMousePoint(int x, int y) {
m_params.cor = Mantid::Kernel::V2D(x, y);
m_ui.spinBox_cor_x->setValue(x);
m_ui.spinBox_cor_y->setValue(y);
}
-void ImageCoRViewQtWidget::grabROICorner1FromMousePoint(int x, int y) {
+void ImageROIViewQtWidget::grabROICorner1FromMousePoint(int x, int y) {
m_params.roi.first = Mantid::Kernel::V2D(x, y);
m_ui.spinBox_roi_top_x->setValue(x);
m_ui.spinBox_roi_top_y->setValue(y);
}
-void ImageCoRViewQtWidget::grabROICorner2FromMousePoint(int x, int y) {
+void ImageROIViewQtWidget::grabROICorner2FromMousePoint(int x, int y) {
m_params.roi.second = Mantid::Kernel::V2D(x, y);
m_ui.spinBox_roi_bottom_x->setValue(x);
m_ui.spinBox_roi_bottom_y->setValue(y);
}
-void ImageCoRViewQtWidget::grabNormAreaCorner1FromMousePoint(int x, int y) {
+void ImageROIViewQtWidget::grabNormAreaCorner1FromMousePoint(int x, int y) {
m_params.normalizationRegion.first = Mantid::Kernel::V2D(x, y);
m_ui.spinBox_norm_top_x->setValue(x);
m_ui.spinBox_norm_top_y->setValue(y);
}
-void ImageCoRViewQtWidget::grabNormAreaCorner2FromMousePoint(int x, int y) {
+void ImageROIViewQtWidget::grabNormAreaCorner2FromMousePoint(int x, int y) {
m_params.normalizationRegion.second = Mantid::Kernel::V2D(x, y);
m_ui.spinBox_norm_bottom_x->setValue(x);
m_ui.spinBox_norm_bottom_y->setValue(y);
@@ -747,11 +747,11 @@ void ImageCoRViewQtWidget::grabNormAreaCorner2FromMousePoint(int x, int y) {
* @param x position on x axis (local to the image)
* @param y position on y axis (local to the image)
*/
-void ImageCoRViewQtWidget::mouseUpdateCoR(int x, int y) {
+void ImageROIViewQtWidget::mouseUpdateCoR(int x, int y) {
grabCoRFromMousePoint(x, y);
refreshROIetAl();
- m_presenter->notify(IImageCoRPresenter::FinishedCoR);
+ m_presenter->notify(IImageROIPresenter::FinishedCoR);
}
/**
@@ -761,11 +761,11 @@ void ImageCoRViewQtWidget::mouseUpdateCoR(int x, int y) {
* @param x position on x axis (local to the image)
* @param y position on y axis (local to the image)
*/
-void ImageCoRViewQtWidget::mouseUpdateROICorners12(int x, int y) {
+void ImageROIViewQtWidget::mouseUpdateROICorners12(int x, int y) {
grabROICorner1FromMousePoint(x, y);
grabROICorner2FromMousePoint(x, y);
refreshROIetAl();
- m_selectionState = IImageCoRView::SelectROISecond;
+ m_selectionState = IImageROIView::SelectROISecond;
}
/**
@@ -777,7 +777,7 @@ void ImageCoRViewQtWidget::mouseUpdateROICorners12(int x, int y) {
* @param x position on x axis (local to the image)
* @param y position on y axis (local to the image)
*/
-void ImageCoRViewQtWidget::mouseUpdateROICorner2(int x, int y) {
+void ImageROIViewQtWidget::mouseUpdateROICorner2(int x, int y) {
grabROICorner2FromMousePoint(x, y);
refreshROIetAl();
}
@@ -790,39 +790,39 @@ void ImageCoRViewQtWidget::mouseUpdateROICorner2(int x, int y) {
* @param x position on x axis (local to the image)
* @param y position on y axis (local to the image)
*/
-void ImageCoRViewQtWidget::mouseFinishROI(int x, int y) {
+void ImageROIViewQtWidget::mouseFinishROI(int x, int y) {
grabROICorner2FromMousePoint(x, y);
refreshROIetAl();
- m_presenter->notify(IImageCoRPresenter::FinishedROI);
+ m_presenter->notify(IImageROIPresenter::FinishedROI);
}
-void ImageCoRViewQtWidget::mouseUpdateNormAreaCorners12(int x, int y) {
+void ImageROIViewQtWidget::mouseUpdateNormAreaCorners12(int x, int y) {
grabNormAreaCorner1FromMousePoint(x, y);
grabNormAreaCorner2FromMousePoint(x, y);
refreshROIetAl();
- m_selectionState = IImageCoRView::SelectNormAreaSecond;
+ m_selectionState = IImageROIView::SelectNormAreaSecond;
}
-void ImageCoRViewQtWidget::mouseUpdateNormAreaCorner2(int x, int y) {
+void ImageROIViewQtWidget::mouseUpdateNormAreaCorner2(int x, int y) {
grabNormAreaCorner2FromMousePoint(x, y);
refreshROIetAl();
}
-void ImageCoRViewQtWidget::mouseFinishNormArea(int x, int y) {
+void ImageROIViewQtWidget::mouseFinishNormArea(int x, int y) {
grabNormAreaCorner2FromMousePoint(x, y);
refreshROIetAl();
- m_presenter->notify(IImageCoRPresenter::FinishedNormalization);
+ m_presenter->notify(IImageROIPresenter::FinishedNormalization);
}
-void ImageCoRViewQtWidget::readSettings() {
+void ImageROIViewQtWidget::readSettings() {
QSettings qs;
qs.beginGroup(QString::fromStdString(m_settingsGroup));
restoreGeometry(qs.value("interface-win-geometry").toByteArray());
qs.endGroup();
}
-void ImageCoRViewQtWidget::closeEvent(QCloseEvent *event) {
- m_presenter->notify(IImageCoRPresenter::ShutDown);
+void ImageROIViewQtWidget::closeEvent(QCloseEvent *event) {
+ m_presenter->notify(IImageROIPresenter::ShutDown);
event->accept();
}
diff --git a/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h b/MantidQt/CustomInterfaces/test/ImageROIPresenterTest.h
similarity index 66%
rename from MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
rename to MantidQt/CustomInterfaces/test/ImageROIPresenterTest.h
index 89d75cfb0db..56cb937e2c3 100644
--- a/MantidQt/CustomInterfaces/test/ImageCoRPresenterTest.h
+++ b/MantidQt/CustomInterfaces/test/ImageROIPresenterTest.h
@@ -1,40 +1,40 @@
-#ifndef MANTID_CUSTOMINTERFACES_IMAGECORPRESENTERTEST_H
-#define MANTID_CUSTOMINTERFACES_IMAGECORPRESENTERTEST_H
+#ifndef MANTID_CUSTOMINTERFACES_IMAGEROIPRESENTERTEST_H
+#define MANTID_CUSTOMINTERFACES_IMAGEROIPRESENTERTEST_H
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidQtCustomInterfaces/Tomography/ImageCoRPresenter.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageROIPresenter.h"
#include <cxxtest/TestSuite.h>
#include <Poco/File.h>
-#include "ImageCoRViewMock.h"
+#include "ImageROIViewMock.h"
using namespace MantidQt::CustomInterfaces;
using testing::TypedEq;
using testing::Return;
-class ImageCoRPresenterTest : public CxxTest::TestSuite {
+class ImageROIPresenterTest : public CxxTest::TestSuite {
public:
// This pair of boilerplate methods prevent the suite being created statically
// This means the constructor isn't called when running other tests
- static ImageCoRPresenterTest *createSuite() {
- return new ImageCoRPresenterTest();
+ static ImageROIPresenterTest *createSuite() {
+ return new ImageROIPresenterTest();
}
- static void destroySuite(ImageCoRPresenterTest *suite) { delete suite; }
+ static void destroySuite(ImageROIPresenterTest *suite) { delete suite; }
- ImageCoRPresenterTest() {
+ ImageROIPresenterTest() {
Mantid::API::FrameworkManager::Instance(); // make sure the framework is
// initialized
}
void setUp() {
- m_view.reset(new testing::NiceMock<MockImageCoRView>());
+ m_view.reset(new testing::NiceMock<MockImageROIView>());
m_presenter.reset(
- new MantidQt::CustomInterfaces::ImageCoRPresenter(m_view.get()));
+ new MantidQt::CustomInterfaces::ImageROIPresenter(m_view.get()));
}
void tearDown() {
@@ -42,8 +42,8 @@ public:
}
void test_initOK() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
EXPECT_CALL(mockView, setParams(testing::_)).Times(1);
@@ -51,12 +51,12 @@ public:
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
- pres.notify(ImageCoRPresenter::Init);
+ pres.notify(ImageROIPresenter::Init);
}
void test_initWithWrongParams() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
EXPECT_CALL(mockView, setParams(testing::_)).Times(1);
@@ -64,12 +64,12 @@ public:
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
- pres.notify(ImageCoRPresenter::Init);
+ pres.notify(ImageROIPresenter::Init);
}
void xxtest_browseImg_EmptyPath() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
EXPECT_CALL(mockView, askImgOrStackPath()).Times(1).WillOnce(Return(""));
@@ -85,12 +85,12 @@ public:
.Times(0);
EXPECT_CALL(mockView, updateImgWithIndex(testing::_)).Times(0);
- pres.notify(IImageCoRPresenter::BrowseImgOrStack);
+ pres.notify(IImageROIPresenter::BrowseImgOrStack);
}
void xxtest_newImg_EmptyPath() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
EXPECT_CALL(mockView, askImgOrStackPath()).Times(0);
@@ -106,12 +106,12 @@ public:
.Times(0);
EXPECT_CALL(mockView, updateImgWithIndex(testing::_)).Times(0);
- pres.notify(IImageCoRPresenter::NewImgOrStack);
+ pres.notify(IImageROIPresenter::NewImgOrStack);
}
void test_browseImg_WrongPath() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
EXPECT_CALL(mockView, askImgOrStackPath())
.Times(1)
@@ -132,14 +132,14 @@ public:
// this exception is currently handled, and a warning given
//TSM_ASSERT_THROWS("There should be an exception if there is an unexpected "
// "error with the images path",
- // pres.notify(IImageCoRPresenter::BrowseImgOrStack),
+ // pres.notify(IImageROIPresenter::BrowseImgOrStack),
// Poco::FileNotFoundException);
- pres.notify(IImageCoRPresenter::BrowseImgOrStack);
+ pres.notify(IImageROIPresenter::BrowseImgOrStack);
}
void test_updateImgIndex() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
int idx = 0;
EXPECT_CALL(mockView, currentImgIndex()).Times(1).WillOnce(Return(idx));
@@ -150,29 +150,29 @@ public:
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
- pres.notify(IImageCoRPresenter::UpdateImgIndex);
+ pres.notify(IImageROIPresenter::UpdateImgIndex);
}
void test_selectCoR() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
- EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectCoR))
+ EXPECT_CALL(mockView, changeSelectionState(IImageROIView::SelectCoR))
.Times(1);
// No errors, no warnings
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
- pres.notify(IImageCoRPresenter::SelectCoR);
+ pres.notify(IImageROIPresenter::SelectCoR);
}
void test_resetCoR() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
EXPECT_CALL(mockView, resetCoR()).Times(1);
- EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectNone))
+ EXPECT_CALL(mockView, changeSelectionState(IImageROIView::SelectNone))
.Times(1);
// just a few calls that should not happen
@@ -188,43 +188,43 @@ public:
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
- pres.notify(IImageCoRPresenter::ResetCoR);
+ pres.notify(IImageROIPresenter::ResetCoR);
}
void test_selectROI() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
- EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectROIFirst))
+ EXPECT_CALL(mockView, changeSelectionState(IImageROIView::SelectROIFirst))
.Times(1);
// No errors, no warnings
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
- pres.notify(IImageCoRPresenter::SelectROI);
+ pres.notify(IImageROIPresenter::SelectROI);
}
void test_finishROI() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
- EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectNone))
+ EXPECT_CALL(mockView, changeSelectionState(IImageROIView::SelectNone))
.Times(1);
// No errors, no warnings
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
- pres.notify(IImageCoRPresenter::FinishedROI);
+ pres.notify(IImageROIPresenter::FinishedROI);
}
void test_resetROI() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
EXPECT_CALL(mockView, resetROI()).Times(1);
- EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectNone))
+ EXPECT_CALL(mockView, changeSelectionState(IImageROIView::SelectNone))
.Times(1);
// just a few calls that should not happen
@@ -240,43 +240,43 @@ public:
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
- pres.notify(IImageCoRPresenter::ResetROI);
+ pres.notify(IImageROIPresenter::ResetROI);
}
void test_selectNormalization() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
EXPECT_CALL(mockView, changeSelectionState(
- IImageCoRView::SelectNormAreaFirst)).Times(1);
+ IImageROIView::SelectNormAreaFirst)).Times(1);
// No errors, no warnings
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
- pres.notify(IImageCoRPresenter::SelectNormalization);
+ pres.notify(IImageROIPresenter::SelectNormalization);
}
void test_finishNormalization() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
- EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectNone))
+ EXPECT_CALL(mockView, changeSelectionState(IImageROIView::SelectNone))
.Times(1);
// No errors, no warnings
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
- pres.notify(IImageCoRPresenter::FinishedNormalization);
+ pres.notify(IImageROIPresenter::FinishedNormalization);
}
void test_resetNormalization() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
EXPECT_CALL(mockView, resetNormArea()).Times(1);
- EXPECT_CALL(mockView, changeSelectionState(IImageCoRView::SelectNone))
+ EXPECT_CALL(mockView, changeSelectionState(IImageROIView::SelectNone))
.Times(1);
// just a few calls that should not happen
@@ -293,28 +293,28 @@ public:
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
- pres.notify(IImageCoRPresenter::ResetNormalization);
+ pres.notify(IImageROIPresenter::ResetNormalization);
}
void test_shutDown() {
- testing::NiceMock<MockImageCoRView> mockView;
- MantidQt::CustomInterfaces::ImageCoRPresenter pres(&mockView);
+ testing::NiceMock<MockImageROIView> mockView;
+ MantidQt::CustomInterfaces::ImageROIPresenter pres(&mockView);
EXPECT_CALL(mockView, saveSettings()).Times(1);
// No errors, no warnings
EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
- pres.notify(ImageCoRPresenter::ShutDown);
+ pres.notify(ImageROIPresenter::ShutDown);
}
private:
// boost::shared_ptr
- boost::scoped_ptr<testing::NiceMock<MockImageCoRView>> m_view;
- boost::scoped_ptr<MantidQt::CustomInterfaces::ImageCoRPresenter> m_presenter;
+ boost::scoped_ptr<testing::NiceMock<MockImageROIView>> m_view;
+ boost::scoped_ptr<MantidQt::CustomInterfaces::ImageROIPresenter> m_presenter;
// To have one FITS, etc.
Mantid::API::MatrixWorkspace_sptr m_ws;
};
-#endif // MANTID_CUSTOMINTERFACES_IMAGECORPRESENTERTEST_H
+#endif // MANTID_CUSTOMINTERFACES_IMAGEROIPRESENTERTEST_H
--
GitLab
From 257013b6dcc791cb049ebde1efa763fbd5fe0c3e Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 7 Oct 2015 15:58:04 +0100
Subject: [PATCH 056/223] fix include and mock file name, re #13140
---
.../src/Tomography/TomographyIfaceViewQtGUI.cpp | 6 +++---
.../test/{ImageCoRViewMock.h => ImageROIViewMock.h} | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
rename MantidQt/CustomInterfaces/test/{ImageCoRViewMock.h => ImageROIViewMock.h} (87%)
diff --git a/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp b/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
index 5af8380adb7..48fef5a2351 100644
--- a/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
+++ b/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
@@ -3,7 +3,7 @@
#include "MantidQtAPI/AlgorithmInputHistory.h"
#include "MantidQtAPI/AlgorithmRunner.h"
#include "MantidQtAPI/HelpWindow.h"
-#include "MantidQtCustomInterfaces/Tomography/ImageCoRViewQtWidget.h"
+#include "MantidQtCustomInterfaces/Tomography/ImageROIViewQtWidget.h"
#include "MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h"
#include "MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h"
#include "MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h"
@@ -73,8 +73,8 @@ void TomographyIfaceViewQtGUI::initLayout() {
m_uiTabSetup.setupUi(tabSetupW);
m_ui.tabMain->addTab(tabSetupW, QString("Setup"));
- ImageCoRViewQtWidget *tabCoRW = new ImageCoRViewQtWidget(m_ui.tabMain);
- m_ui.tabMain->addTab(tabCoRW, QString("ROI etc."));
+ ImageROIViewQtWidget *tabROIW = new ImageROIViewQtWidget(m_ui.tabMain);
+ m_ui.tabMain->addTab(tabROIW, QString("ROI etc."));
QWidget *tabFiltersW = new QWidget();
m_ui.tabMain->addTab(tabFiltersW, QString("Filters"));
diff --git a/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h b/MantidQt/CustomInterfaces/test/ImageROIViewMock.h
similarity index 87%
rename from MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
rename to MantidQt/CustomInterfaces/test/ImageROIViewMock.h
index a81929e18c4..6ba7ebca13e 100644
--- a/MantidQt/CustomInterfaces/test/ImageCoRViewMock.h
+++ b/MantidQt/CustomInterfaces/test/ImageROIViewMock.h
@@ -1,11 +1,11 @@
-#ifndef MANTID_CUSTOMINTERFACES_IMAGECORVIEWMOCK_H
-#define MANTID_CUSTOMINTERFACES_IMAGECORVIEWMOCK_H
+#ifndef MANTID_CUSTOMINTERFACES_IMAGEROIVIEWMOCK_H
+#define MANTID_CUSTOMINTERFACES_IMAGEROIVIEWMOCK_H
#include "MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h"
#include <gmock/gmock.h>
-class MockImageCoRView : public MantidQt::CustomInterfaces::IImageCoRView {
+class MockImageROIView : public MantidQt::CustomInterfaces::IImageROIView {
public:
// void initParams(ImageStackPreParams ¶ms)
MOCK_METHOD1(setParams,
@@ -19,7 +19,7 @@ public:
MOCK_CONST_METHOD0(selectionState, SelectionState());
// void changeSelectionState(const SelectionState state);
- MOCK_METHOD1(changeSelectionState, void(const IImageCoRView::SelectionState&));
+ MOCK_METHOD1(changeSelectionState, void(const IImageROIView::SelectionState&));
// void showStack(const std::string &path);
MOCK_METHOD1(showStack, void(const std::string &));
@@ -63,4 +63,4 @@ public:
MOCK_METHOD0(resetNormArea, void());
};
-#endif // MANTID_CUSTOMINTERFACES_IMAGECORVIEWMOCK_H
+#endif // MANTID_CUSTOMINTERFACES_IMAGEROIVIEWMOCK_H
--
GitLab
From 4fceb6828b895c292658281b56bd62a2c0c5107c Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Wed, 7 Oct 2015 16:28:20 +0100
Subject: [PATCH 057/223] added another test case for CompactMD
Refs #13508
---
Framework/MDAlgorithms/test/CompactMDTest.h | 106 ++++++++++++--------
1 file changed, 66 insertions(+), 40 deletions(-)
diff --git a/Framework/MDAlgorithms/test/CompactMDTest.h b/Framework/MDAlgorithms/test/CompactMDTest.h
index e897ac2268a..21e00d686ed 100644
--- a/Framework/MDAlgorithms/test/CompactMDTest.h
+++ b/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -9,19 +9,6 @@
using Mantid::MDAlgorithms::CompactMD;
using namespace Mantid::API;
-namespace {
-
-// This helper sets the signal values to the linear index to have some
-// variety
-void resetSignalsToLinearIndexValue(IMDHistoWorkspace_sptr ws) {
- auto numberOfIndices = static_cast<size_t>(ws->getNPoints());
- for (size_t i = 0; i < numberOfIndices; ++i) {
- auto &signal = ws->signalAt(i);
- signal = static_cast<Mantid::signal_t>(i);
- }
-}
-}
-
//==================
// Functional Tests
//==================
@@ -40,27 +27,23 @@ public:
alg.isInitialized());
}
void
- test_that_all_non_zero_signals_are_kept_with_data_concentrated_in_the_centre() {
+ test_all_non_zero_signals_are_kept_with_data_concentrated_in_the_centre() {
/*
*testing the effectiveness of CompactMD when the data looks like this:
*------------------
* Input structure:
*------------------
* -------------
- * | | | |
- * -------------
* | |///| |
* -------------
- * | | | |
- * -------------
* -3-2-1 0 1 2 3
*---------------------------
* Expected output structure:
*----------------------------
* should trim until the first non-zero value.
- * -------
- * |/////|
- * -------
+ * -----
+ * |///|
+ * -----
* -1 0 1
*/
@@ -96,33 +79,76 @@ public:
outputWorkspace->getDimension(0)->getBinWidth(),
inWS->getDimension(0)->getBinWidth());
}
- void test__all_non_zero_signals_are_kept_with_data_in_each_corner() {
+ void test_all_non_zero_signals_are_kept_with_data_in_each_corner() {
/*
*testing the effectiveness of CompactMD when the data looks like this:
- *------------------
- * Input structure:
- *------------------
- * -------------
- * |///| |///|
- * -------------
- * | | | |
- * -------------
- * |///| |///|
- * -------------
+ *-----------------------------------
+ * Input structure: 2D HistoWorkspace
+ *-----------------------------------
+ * ------------- -3
+ * |/a/| |/b/| -2
+ * ------------- -1
+ * | | | | 0
+ * ------------- 1
+ * |/c/| |/d/| 2
+ * ------------- 3
* -3-2-1 0 1 2 3
- *---------------------------
+ *----------------------------
* Expected output structure:
*----------------------------
* should not trim the workspace at all.
- * -------------
- * |///| |///|
- * -------------
- * | | | |
- * -------------
- * |///| |///|
- * -------------
+ * ------------- -3
+ * |/a/| |/b/| -2
+ * ------------- -1
+ * | | | | 0
+ * ------------- 1
+ * |/c/| |/d/| 2
+ * ------------- 3
* -3-2-1 0 1 2 3
*/
+ using namespace Mantid::DataObjects;
+ const size_t numDims = 2;
+ const double signal = 0.0;
+ const double errorSquared = 1.2;
+ size_t numBins[static_cast<int>(numDims)]={3,3};
+ Mantid::coord_t min[static_cast<int>(numDims)]={-3,-3};
+ Mantid::coord_t max[static_cast<int>(numDims)]={3, 3};
+ const std::string name("test");
+ auto inWS = MDEventsTestHelper::makeFakeMDHistoWorkspaceGeneral(numDims, signal, errorSquared, numBins, min, max, name);
+ inWS->setSignalAt(0, 1.0); //cell a
+ inWS->setSignalAt(2, 1.0); //cell b
+ inWS->setSignalAt(6, 1.0); //cell c
+ inWS->setSignalAt(8, 1.0); //cell d
+
+ CompactMD alg;
+ alg.setChild(true);
+ alg.setRethrows(true);
+ alg.initialize();
+ alg.setProperty("InputWorkspace", inWS);
+ alg.setProperty("OutputWorkspace", "out");
+ alg.execute();
+ IMDHistoWorkspace_sptr outputWorkspace = alg.getProperty("OutputWorkspace");
+ TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
+ outputWorkspace->getSignalAt(0), 1);
+ TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
+ outputWorkspace->getSignalAt(2), 1);
+ TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
+ outputWorkspace->getSignalAt(6), 1);
+ TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
+ outputWorkspace->getSignalAt(8), 1);
+ TSM_ASSERT_EQUALS("Minimum should be cropped to -1: ",
+ outputWorkspace->getDimension(0)->getMinimum(), inWS->getDimension(0)->getMinimum());
+ TSM_ASSERT_EQUALS("Maximum should be cropped to 1: ",
+ outputWorkspace->getDimension(0)->getMaximum(),inWS->getDimension(0)->getMaximum());
+ TSM_ASSERT_EQUALS("Number of Bins should be 1 : ",
+ outputWorkspace->getDimension(0)->getNBins(), inWS->getDimension(0)->getNBins());
+ TSM_ASSERT_EQUALS("Bin width should be consistent: ",
+ outputWorkspace->getDimension(0)->getBinWidth(),
+ inWS->getDimension(0)->getBinWidth());
+ }
+
+ void test_all_non_zero_signals_are_kept_when_data_is_concentrated_in_one_half_of_the_workspace(){
+
}
};
//===================
--
GitLab
From b180ce994e47fe0224f8d7e79a17889b10f4e7c6 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 7 Oct 2015 16:41:06 +0100
Subject: [PATCH 058/223] fix for msvc linker, re #13140
---
.../inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h | 2 +-
MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
index 98458140959..3ef122016ea 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/StackOfImagesDirs.h
@@ -44,7 +44,7 @@ public:
bool isValid() const { return m_valid; }
// human readable description of the expected structure of directories
- std::string description() const { return g_descr; }
+ std::string description() const;
// string that describes the status/error message about this directory
std::string status() const;
diff --git a/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp b/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
index da61efebe8f..d8be84c4a5d 100644
--- a/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
+++ b/MantidQt/CustomInterfaces/src/Tomography/StackOfImagesDirs.cpp
@@ -25,6 +25,8 @@ StackOfImagesDirs::StackOfImagesDirs(const std::string &path)
findStackDirs(path);
}
+std::string StackOfImagesDirs::description() const { return g_descr; }
+
std::string StackOfImagesDirs::status() const {
if (m_valid)
return "Stack of images is correct";
--
GitLab
From 3294d44cc9483a77668242449c03ee14ce397f6d Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Wed, 7 Oct 2015 16:54:15 +0100
Subject: [PATCH 059/223] Clang format test header for CompactMD
Refs #13508
---
Framework/MDAlgorithms/test/CompactMDTest.h | 71 +++++++++++----------
1 file changed, 38 insertions(+), 33 deletions(-)
diff --git a/Framework/MDAlgorithms/test/CompactMDTest.h b/Framework/MDAlgorithms/test/CompactMDTest.h
index 21e00d686ed..7134f5dc971 100644
--- a/Framework/MDAlgorithms/test/CompactMDTest.h
+++ b/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -106,48 +106,53 @@ public:
* ------------- 3
* -3-2-1 0 1 2 3
*/
- using namespace Mantid::DataObjects;
- const size_t numDims = 2;
- const double signal = 0.0;
- const double errorSquared = 1.2;
- size_t numBins[static_cast<int>(numDims)]={3,3};
- Mantid::coord_t min[static_cast<int>(numDims)]={-3,-3};
- Mantid::coord_t max[static_cast<int>(numDims)]={3, 3};
- const std::string name("test");
- auto inWS = MDEventsTestHelper::makeFakeMDHistoWorkspaceGeneral(numDims, signal, errorSquared, numBins, min, max, name);
- inWS->setSignalAt(0, 1.0); //cell a
- inWS->setSignalAt(2, 1.0); //cell b
- inWS->setSignalAt(6, 1.0); //cell c
- inWS->setSignalAt(8, 1.0); //cell d
+ using namespace Mantid::DataObjects;
+ const size_t numDims = 2;
+ const double signal = 0.0;
+ const double errorSquared = 1.2;
+ size_t numBins[static_cast<int>(numDims)] = {3, 3};
+ Mantid::coord_t min[static_cast<int>(numDims)] = {-3, -3};
+ Mantid::coord_t max[static_cast<int>(numDims)] = {3, 3};
+ const std::string name("test");
+ auto inWS = MDEventsTestHelper::makeFakeMDHistoWorkspaceGeneral(
+ numDims, signal, errorSquared, numBins, min, max, name);
+ inWS->setSignalAt(0, 1.0); // cell a
+ inWS->setSignalAt(2, 1.0); // cell b
+ inWS->setSignalAt(6, 1.0); // cell c
+ inWS->setSignalAt(8, 1.0); // cell d
- CompactMD alg;
- alg.setChild(true);
- alg.setRethrows(true);
- alg.initialize();
- alg.setProperty("InputWorkspace", inWS);
- alg.setProperty("OutputWorkspace", "out");
- alg.execute();
- IMDHistoWorkspace_sptr outputWorkspace = alg.getProperty("OutputWorkspace");
- TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
+ CompactMD alg;
+ alg.setChild(true);
+ alg.setRethrows(true);
+ alg.initialize();
+ alg.setProperty("InputWorkspace", inWS);
+ alg.setProperty("OutputWorkspace", "out");
+ alg.execute();
+ IMDHistoWorkspace_sptr outputWorkspace = alg.getProperty("OutputWorkspace");
+ TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
outputWorkspace->getSignalAt(0), 1);
- TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
+ TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
outputWorkspace->getSignalAt(2), 1);
- TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
+ TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
outputWorkspace->getSignalAt(6), 1);
- TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
+ TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
outputWorkspace->getSignalAt(8), 1);
- TSM_ASSERT_EQUALS("Minimum should be cropped to -1: ",
- outputWorkspace->getDimension(0)->getMinimum(), inWS->getDimension(0)->getMinimum());
- TSM_ASSERT_EQUALS("Maximum should be cropped to 1: ",
- outputWorkspace->getDimension(0)->getMaximum(),inWS->getDimension(0)->getMaximum());
- TSM_ASSERT_EQUALS("Number of Bins should be 1 : ",
- outputWorkspace->getDimension(0)->getNBins(), inWS->getDimension(0)->getNBins());
- TSM_ASSERT_EQUALS("Bin width should be consistent: ",
+ TSM_ASSERT_EQUALS("Minimum should be cropped to -1: ",
+ outputWorkspace->getDimension(0)->getMinimum(),
+ inWS->getDimension(0)->getMinimum());
+ TSM_ASSERT_EQUALS("Maximum should be cropped to 1: ",
+ outputWorkspace->getDimension(0)->getMaximum(),
+ inWS->getDimension(0)->getMaximum());
+ TSM_ASSERT_EQUALS("Number of Bins should be 1 : ",
+ outputWorkspace->getDimension(0)->getNBins(),
+ inWS->getDimension(0)->getNBins());
+ TSM_ASSERT_EQUALS("Bin width should be consistent: ",
outputWorkspace->getDimension(0)->getBinWidth(),
inWS->getDimension(0)->getBinWidth());
}
- void test_all_non_zero_signals_are_kept_when_data_is_concentrated_in_one_half_of_the_workspace(){
+ void
+ test_all_non_zero_signals_are_kept_when_data_is_concentrated_in_one_half_of_the_workspace() {
}
};
--
GitLab
From 3c702198075524d2af546b8a7207be28128752ae Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Thu, 8 Oct 2015 09:12:12 +0100
Subject: [PATCH 060/223] move minmisers to a sub directory
re #13347
---
Framework/CurveFitting/CMakeLists.txt | 56 +-
.../{ => FuncMinimizers}/BFGS_Minimizer.h | 2 +-
.../{ => FuncMinimizers}/DampingMinimizer.h | 0
.../{ => FuncMinimizers}/DerivMinimizer.h | 0
.../{ => FuncMinimizers}/FABADAMinimizer.h | 0
.../FRConjugateGradientMinimizer.h | 2 +-
.../LevenbergMarquardtMDMinimizer.h | 0
.../LevenbergMarquardtMinimizer.h | 0
.../PRConjugateGradientMinimizer.h | 2 +-
.../{ => FuncMinimizers}/SimplexMinimizer.h | 0
.../SteepestDescentMinimizer.h | 2 +-
.../CurveFitting/src/FitPowderDiffPeaks.cpp | 2 +-
.../{ => FuncMinimizers}/BFGS_Minimizer.cpp | 2 +-
.../src/FuncMinimizers/DampingMinimizer.cpp | 125 ++++
.../src/FuncMinimizers/DerivMinimizer.cpp | 177 +++++
.../src/FuncMinimizers/FABADAMinimizer.cpp | 645 ++++++++++++++++++
.../FRConjugateGradientMinimizer.cpp | 2 +-
.../LevenbergMarquardtMDMinimizer.cpp | 291 ++++++++
.../LevenbergMarquardtMinimizer.cpp | 145 ++++
.../PRConjugateGradientMinimizer.cpp | 2 +-
.../src/FuncMinimizers/SimplexMinimizer.cpp | 121 ++++
.../SteepestDescentMinimizer.cpp | 2 +-
Framework/CurveFitting/test/BSplineTest.h | 2 +-
.../CurveFitting/test/CompositeFunctionTest.h | 6 +-
.../test/{ => FuncMinimizers}/BFGSTest.h | 2 +-
.../DampingMinimizerTest.h | 2 +-
.../FABADAMinimizerTest.h | 2 +-
.../FRConjugateGradientTest.h | 2 +-
.../LevenbergMarquardtMDTest.h | 2 +-
.../LevenbergMarquardtTest.h | 2 +-
.../PRConjugateGradientTest.h | 2 +-
.../test/{ => FuncMinimizers}/SimplexTest.h | 2 +-
Framework/CurveFitting/test/GaussianTest.h | 2 +-
.../CurveFitting/test/LeastSquaresTest.h | 6 +-
.../test/MultiDomainFunctionTest.h | 2 +-
35 files changed, 1558 insertions(+), 54 deletions(-)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => FuncMinimizers}/BFGS_Minimizer.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => FuncMinimizers}/DampingMinimizer.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => FuncMinimizers}/DerivMinimizer.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => FuncMinimizers}/FABADAMinimizer.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => FuncMinimizers}/FRConjugateGradientMinimizer.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => FuncMinimizers}/LevenbergMarquardtMDMinimizer.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => FuncMinimizers}/LevenbergMarquardtMinimizer.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => FuncMinimizers}/PRConjugateGradientMinimizer.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => FuncMinimizers}/SimplexMinimizer.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => FuncMinimizers}/SteepestDescentMinimizer.h (97%)
rename Framework/CurveFitting/src/{ => FuncMinimizers}/BFGS_Minimizer.cpp (92%)
create mode 100644 Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
create mode 100644 Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
create mode 100644 Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
rename Framework/CurveFitting/src/{ => FuncMinimizers}/FRConjugateGradientMinimizer.cpp (91%)
create mode 100644 Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
create mode 100644 Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
rename Framework/CurveFitting/src/{ => FuncMinimizers}/PRConjugateGradientMinimizer.cpp (91%)
create mode 100644 Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
rename Framework/CurveFitting/src/{ => FuncMinimizers}/SteepestDescentMinimizer.cpp (91%)
rename Framework/CurveFitting/test/{ => FuncMinimizers}/BFGSTest.h (96%)
rename Framework/CurveFitting/test/{ => FuncMinimizers}/DampingMinimizerTest.h (99%)
rename Framework/CurveFitting/test/{ => FuncMinimizers}/FABADAMinimizerTest.h (99%)
rename Framework/CurveFitting/test/{ => FuncMinimizers}/FRConjugateGradientTest.h (96%)
rename Framework/CurveFitting/test/{ => FuncMinimizers}/LevenbergMarquardtMDTest.h (99%)
rename Framework/CurveFitting/test/{ => FuncMinimizers}/LevenbergMarquardtTest.h (99%)
rename Framework/CurveFitting/test/{ => FuncMinimizers}/PRConjugateGradientTest.h (96%)
rename Framework/CurveFitting/test/{ => FuncMinimizers}/SimplexTest.h (96%)
diff --git a/Framework/CurveFitting/CMakeLists.txt b/Framework/CurveFitting/CMakeLists.txt
index c7be58f1e72..767ef45f733 100644
--- a/Framework/CurveFitting/CMakeLists.txt
+++ b/Framework/CurveFitting/CMakeLists.txt
@@ -5,7 +5,7 @@ set ( SRC_FILES
#src/RefinePowderInstrumentParameters.cpp
src/Abragam.cpp
src/AugmentedLagrangianOptimizer.cpp
- src/BFGS_Minimizer.cpp
+ src/FuncMinimizers/BFGS_Minimizer.cpp
src/BSpline.cpp
src/BackToBackExponential.cpp
src/BackgroundFunction.cpp
@@ -28,9 +28,9 @@ set ( SRC_FILES
src/CostFuncRwp.cpp
src/CostFuncUnweightedLeastSquares.cpp
src/CubicSpline.cpp
- src/DampingMinimizer.cpp
+ src/FuncMinimizers/DampingMinimizer.cpp
src/DeltaFunction.cpp
- src/DerivMinimizer.cpp
+ src/FuncMinimizers/DerivMinimizer.cpp
src/DiffRotDiscreteCircle.cpp
src/DiffSphere.cpp
src/DynamicKuboToyabe.cpp
@@ -40,8 +40,8 @@ set ( SRC_FILES
src/ExpDecay.cpp
src/ExpDecayMuon.cpp
src/ExpDecayOsc.cpp
- src/FABADAMinimizer.cpp
- src/FRConjugateGradientMinimizer.cpp
+ src/FuncMinimizers/FABADAMinimizer.cpp
+ src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
src/Fit.cpp
src/Fit1D.cpp
src/FitMW.cpp
@@ -63,8 +63,8 @@ set ( SRC_FILES
src/LatticeFunction.cpp
src/LeBailFit.cpp
src/LeBailFunction.cpp
- src/LevenbergMarquardtMDMinimizer.cpp
- src/LevenbergMarquardtMinimizer.cpp
+ src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
+ src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
src/LinearBackground.cpp
src/LogNormal.cpp
src/Lorentzian.cpp
@@ -74,7 +74,7 @@ set ( SRC_FILES
src/MuonFInteraction.cpp
src/NeutronBk2BkExpConvPVoigt.cpp
src/NormaliseByPeakArea.cpp
- src/PRConjugateGradientMinimizer.cpp
+ src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
src/ParDomain.cpp
src/ParameterEstimator.cpp
src/PawleyFit.cpp
@@ -94,7 +94,7 @@ set ( SRC_FILES
src/SeqDomain.cpp
src/SeqDomainSpectrumCreator.cpp
src/SimpleChebfun.cpp
- src/SimplexMinimizer.cpp
+ src/FuncMinimizers/SimplexMinimizer.cpp
src/SpecialFunctionHelper.cpp
src/SplineBackground.cpp
src/SplineInterpolation.cpp
@@ -102,7 +102,7 @@ set ( SRC_FILES
src/StaticKuboToyabe.cpp
src/StaticKuboToyabeTimesExpDecay.cpp
src/StaticKuboToyabeTimesGausDecay.cpp
- src/SteepestDescentMinimizer.cpp
+ src/FuncMinimizers/SteepestDescentMinimizer.cpp
src/StretchExp.cpp
src/StretchExpMuon.cpp
src/TabulatedFunction.cpp
@@ -126,7 +126,7 @@ set ( INC_FILES
#inc/MantidCurveFitting/RefinePowderInstrumentParameters.h
inc/MantidCurveFitting/Abragam.h
inc/MantidCurveFitting/AugmentedLagrangianOptimizer.h
- inc/MantidCurveFitting/BFGS_Minimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
inc/MantidCurveFitting/BSpline.h
inc/MantidCurveFitting/BackToBackExponential.h
inc/MantidCurveFitting/BackgroundFunction.h
@@ -149,9 +149,9 @@ set ( INC_FILES
inc/MantidCurveFitting/CostFuncRwp.h
inc/MantidCurveFitting/CostFuncUnweightedLeastSquares.h
inc/MantidCurveFitting/CubicSpline.h
- inc/MantidCurveFitting/DampingMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
inc/MantidCurveFitting/DeltaFunction.h
- inc/MantidCurveFitting/DerivMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
inc/MantidCurveFitting/DiffRotDiscreteCircle.h
inc/MantidCurveFitting/DiffSphere.h
inc/MantidCurveFitting/DllConfig.h
@@ -162,8 +162,8 @@ set ( INC_FILES
inc/MantidCurveFitting/ExpDecay.h
inc/MantidCurveFitting/ExpDecayMuon.h
inc/MantidCurveFitting/ExpDecayOsc.h
- inc/MantidCurveFitting/FABADAMinimizer.h
- inc/MantidCurveFitting/FRConjugateGradientMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
inc/MantidCurveFitting/Fit.h
inc/MantidCurveFitting/Fit1D.h
inc/MantidCurveFitting/FitMW.h
@@ -188,8 +188,8 @@ set ( INC_FILES
inc/MantidCurveFitting/LatticeFunction.h
inc/MantidCurveFitting/LeBailFit.h
inc/MantidCurveFitting/LeBailFunction.h
- inc/MantidCurveFitting/LevenbergMarquardtMDMinimizer.h
- inc/MantidCurveFitting/LevenbergMarquardtMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
inc/MantidCurveFitting/LinearBackground.h
inc/MantidCurveFitting/LogNormal.h
inc/MantidCurveFitting/Lorentzian.h
@@ -199,7 +199,7 @@ set ( INC_FILES
inc/MantidCurveFitting/MuonFInteraction.h
inc/MantidCurveFitting/NeutronBk2BkExpConvPVoigt.h
inc/MantidCurveFitting/NormaliseByPeakArea.h
- inc/MantidCurveFitting/PRConjugateGradientMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
inc/MantidCurveFitting/ParDomain.h
inc/MantidCurveFitting/ParameterEstimator.h
inc/MantidCurveFitting/PawleyFit.h
@@ -219,7 +219,7 @@ set ( INC_FILES
inc/MantidCurveFitting/SeqDomain.h
inc/MantidCurveFitting/SeqDomainSpectrumCreator.h
inc/MantidCurveFitting/SimpleChebfun.h
- inc/MantidCurveFitting/SimplexMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
inc/MantidCurveFitting/SpecialFunctionSupport.h
inc/MantidCurveFitting/SplineBackground.h
inc/MantidCurveFitting/SplineInterpolation.h
@@ -227,7 +227,7 @@ set ( INC_FILES
inc/MantidCurveFitting/StaticKuboToyabe.h
inc/MantidCurveFitting/StaticKuboToyabeTimesExpDecay.h
inc/MantidCurveFitting/StaticKuboToyabeTimesGausDecay.h
- inc/MantidCurveFitting/SteepestDescentMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
inc/MantidCurveFitting/StretchExp.h
inc/MantidCurveFitting/StretchExpMuon.h
inc/MantidCurveFitting/TabulatedFunction.h
@@ -248,7 +248,7 @@ set ( TEST_FILES
#SCDPanelErrorsTest.h
AbragamTest.h
AugmentedLagrangianOptimizerTest.h
- BFGSTest.h
+ FuncMinimizers/BFGSTest.h
BSplineTest.h
BackToBackExponentialTest.h
BivariateNormalTest.h
@@ -268,7 +268,7 @@ set ( TEST_FILES
ConvolveWorkspacesTest.h
CostFuncUnweightedLeastSquaresTest.h
CubicSplineTest.h
- DampingMinimizerTest.h
+ FuncMinimizers/DampingMinimizerTest.h
DeltaFunctionTest.h
DiffRotDiscreteCircleTest.h
DiffSphereTest.h
@@ -279,8 +279,8 @@ set ( TEST_FILES
ExpDecayMuonTest.h
ExpDecayOscTest.h
ExpDecayTest.h
- FABADAMinimizerTest.h
- FRConjugateGradientTest.h
+ FuncMinimizers/FABADAMinimizerTest.h
+ FuncMinimizers/FRConjugateGradientTest.h
FitMWTest.h
FitPowderDiffPeaksTest.h
FitTest.h
@@ -304,8 +304,8 @@ set ( TEST_FILES
LeBailFitTest.h
LeBailFunctionTest.h
LeastSquaresTest.h
- LevenbergMarquardtMDTest.h
- LevenbergMarquardtTest.h
+ FuncMinimizers/LevenbergMarquardtMDTest.h
+ FuncMinimizers/LevenbergMarquardtTest.h
LinearBackgroundTest.h
LogNormalTest.h
Lorentzian1DTest.h
@@ -315,7 +315,7 @@ set ( TEST_FILES
MuonFInteractionTest.h
NeutronBk2BkExpConvPVoigtTest.h
NormaliseByPeakAreaTest.h
- PRConjugateGradientTest.h
+ FuncMinimizers/PRConjugateGradientTest.h
ParameterEstimatorTest.h
PawleyFitTest.h
PawleyFunctionTest.h
@@ -333,7 +333,7 @@ set ( TEST_FILES
ResolutionTest.h
SeqDomainSpectrumCreatorTest.h
SimpleChebfunTest.h
- SimplexTest.h
+ FuncMinimizers/SimplexTest.h
SpecialFunctionSupportTest.h
SplineBackgroundTest.h
SplineInterpolationTest.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/BFGS_Minimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/BFGS_Minimizer.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
index dbafd43e1a5..29c4efa07b5 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/BFGS_Minimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
@@ -5,7 +5,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/DllConfig.h"
-#include "MantidCurveFitting/DerivMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/DerivMinimizer.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/DampingMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/DampingMinimizer.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/DerivMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/DerivMinimizer.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FABADAMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/FABADAMinimizer.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FRConjugateGradientMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/FRConjugateGradientMinimizer.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
index cbe9ac8d9d7..0444ff7d159 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FRConjugateGradientMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
@@ -5,7 +5,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/DllConfig.h"
-#include "MantidCurveFitting/DerivMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/DerivMinimizer.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LevenbergMarquardtMDMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/LevenbergMarquardtMDMinimizer.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LevenbergMarquardtMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/LevenbergMarquardtMinimizer.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/PRConjugateGradientMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/PRConjugateGradientMinimizer.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
index 80d5feaf207..62e9fa704f4 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/PRConjugateGradientMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
@@ -5,7 +5,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/DllConfig.h"
-#include "MantidCurveFitting/DerivMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/DerivMinimizer.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SimplexMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/SimplexMinimizer.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SteepestDescentMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/SteepestDescentMinimizer.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
index 7e319e65c84..bd0a8073218 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SteepestDescentMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
@@ -5,7 +5,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/DllConfig.h"
-#include "MantidCurveFitting/DerivMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/DerivMinimizer.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
index b5ad39301dd..10503a0e595 100644
--- a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
+++ b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
@@ -24,7 +24,7 @@
#include "MantidCurveFitting/Gaussian.h"
#include "MantidCurveFitting/BackToBackExponential.h"
#include "MantidCurveFitting/ThermalNeutronBk2BkExpConvPVoigt.h"
-#include "MantidCurveFitting/DampingMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/DampingMinimizer.h"
#include "MantidCurveFitting/CostFuncFitting.h"
#include <boost/algorithm/string.hpp>
diff --git a/Framework/CurveFitting/src/BFGS_Minimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp
similarity index 92%
rename from Framework/CurveFitting/src/BFGS_Minimizer.cpp
rename to Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp
index 8feb486fce8..42b3d6d1622 100644
--- a/Framework/CurveFitting/src/BFGS_Minimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/BFGS_Minimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h"
#include "MantidAPI/CostFunctionFactory.h"
#include "MantidAPI/FuncMinimizerFactory.h"
diff --git a/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
new file mode 100644
index 00000000000..e666a42209a
--- /dev/null
+++ b/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
@@ -0,0 +1,125 @@
+//----------------------------------------------------------------------
+// Includes
+//----------------------------------------------------------------------
+#include "MantidCurveFitting/FuncMinimizers/DampingMinimizer.h"
+#include "MantidCurveFitting/CostFuncLeastSquares.h"
+
+#include "MantidAPI/CostFunctionFactory.h"
+#include "MantidAPI/FuncMinimizerFactory.h"
+#include "MantidAPI/IFunction.h"
+
+#include "MantidKernel/Logger.h"
+
+#include <boost/lexical_cast.hpp>
+#include <gsl/gsl_blas.h>
+#include <iostream>
+#include <cmath>
+
+namespace Mantid {
+namespace CurveFitting {
+namespace {
+/// static logger
+Kernel::Logger g_log("DampingMinimizer");
+}
+
+DECLARE_FUNCMINIMIZER(DampingMinimizer, Damping)
+
+/// Constructor
+DampingMinimizer::DampingMinimizer(double relTol)
+ : IFuncMinimizer(), m_relTol(relTol) {
+ declareProperty("Damping", 0.0, "The damping parameter.");
+}
+
+/// Initialize minimizer, i.e. pass a function to minimize.
+void DampingMinimizer::initialize(API::ICostFunction_sptr function, size_t) {
+ m_leastSquares = boost::dynamic_pointer_cast<CostFuncLeastSquares>(function);
+ if (!m_leastSquares) {
+ throw std::invalid_argument("Damping minimizer works only with least "
+ "squares. Different function was given.");
+ }
+}
+
+/// Do one iteration.
+bool DampingMinimizer::iterate(size_t) {
+ const bool debug = false;
+
+ const double damping = getProperty("Damping");
+
+ if (!m_leastSquares) {
+ throw std::runtime_error("Cost function isn't set up.");
+ }
+ size_t n = m_leastSquares->nParams();
+
+ if (n == 0) {
+ m_errorString = "No parameters to fit";
+ return false;
+ }
+
+ // calculate the first and second derivatives of the cost function.
+ m_leastSquares->valDerivHessian();
+
+ // copy the hessian
+ GSLMatrix H(m_leastSquares->getHessian());
+ GSLVector dd(m_leastSquares->getDeriv());
+
+ for (size_t i = 0; i < n; ++i) {
+ double tmp = H.get(i, i) + damping;
+ H.set(i, i, tmp);
+ }
+
+ if (debug) {
+ std::cerr << "H:\n" << H;
+ std::cerr << "-----------------------------\n";
+ for (size_t j = 0; j < n; ++j) {
+ std::cerr << dd.get(j) << ' ';
+ }
+ std::cerr << std::endl;
+ }
+
+ /// Parameter corrections
+ GSLVector dx(n);
+ // To find dx solve the system of linear equations H * dx == -m_der
+ dd *= -1.0;
+ H.solve(dd, dx);
+
+ if (debug) {
+ for (size_t j = 0; j < n; ++j) {
+ std::cerr << dx.get(j) << ' ';
+ }
+ std::cerr << std::endl
+ << std::endl;
+ }
+
+ // Update the parameters of the cost function.
+ for (size_t i = 0; i < n; ++i) {
+ double d = m_leastSquares->getParameter(i) + dx.get(i);
+ m_leastSquares->setParameter(i, d);
+ if (debug) {
+ std::cerr << "P" << i << ' ' << d << std::endl;
+ }
+ }
+ m_leastSquares->getFittingFunction()->applyTies();
+
+ // --- prepare for the next iteration --- //
+
+ // Try the stop condition
+ GSLVector p(n);
+ m_leastSquares->getParameters(p);
+ double dx_norm = gsl_blas_dnrm2(dx.gsl());
+ if (dx_norm < m_relTol) {
+ return false;
+ }
+
+ return true;
+}
+
+/// Return current value of the cost function
+double DampingMinimizer::costFunctionVal() {
+ if (!m_leastSquares) {
+ throw std::runtime_error("Cost function isn't set up.");
+ }
+ return m_leastSquares->val();
+}
+
+} // namespace CurveFitting
+} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
new file mode 100644
index 00000000000..aad022b04ae
--- /dev/null
+++ b/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
@@ -0,0 +1,177 @@
+//----------------------------------------------------------------------
+// Includes
+//----------------------------------------------------------------------
+#include "MantidCurveFitting/FuncMinimizers/DerivMinimizer.h"
+#include "MantidCurveFitting/CostFuncFitting.h"
+
+namespace Mantid {
+namespace CurveFitting {
+
+/** Used by the GSL to calculate the cost function.
+ * @param x :: Vector with parameters
+ * @param params :: Pointer to a DerivMinimizer
+ */
+double DerivMinimizer::fun(const gsl_vector *x, void *params) {
+ DerivMinimizer &minimizer = *static_cast<DerivMinimizer *>(params);
+ size_t n = minimizer.m_costFunction->nParams();
+ for (size_t i = 0; i < n; ++i) {
+ minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
+ }
+ boost::shared_ptr<CostFuncFitting> fitting =
+ boost::dynamic_pointer_cast<CostFuncFitting>(minimizer.m_costFunction);
+ if (fitting) {
+ fitting->getFittingFunction()->applyTies();
+ }
+ return minimizer.m_costFunction->val();
+}
+
+/** Used by the GSL to calculate the derivatives.
+ * @param x :: Vector with parameters
+ * @param params :: Pointer to a DerivMinimizer
+ * @param g :: Buffer for the derivatives
+ */
+void DerivMinimizer::dfun(const gsl_vector *x, void *params, gsl_vector *g) {
+ DerivMinimizer &minimizer = *static_cast<DerivMinimizer *>(params);
+ size_t n = minimizer.m_costFunction->nParams();
+ for (size_t i = 0; i < n; ++i) {
+ minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
+ }
+ boost::shared_ptr<CostFuncFitting> fitting =
+ boost::dynamic_pointer_cast<CostFuncFitting>(minimizer.m_costFunction);
+ if (fitting) {
+ fitting->getFittingFunction()->applyTies();
+ }
+ std::vector<double> der(n);
+ minimizer.m_costFunction->deriv(der);
+ for (size_t i = 0; i < n; ++i) {
+ gsl_vector_set(g, i, der[i]);
+ }
+}
+
+/** Used by the GSL to calculate the cost function and the derivatives.
+ * @param x :: Vector with parameters
+ * @param params :: Pointer to a DerivMinimizer
+ * @param f :: Buffer for the fanction value
+ * @param g :: Buffer for the derivatives
+ */
+void DerivMinimizer::fundfun(const gsl_vector *x, void *params, double *f,
+ gsl_vector *g) {
+ DerivMinimizer &minimizer = *static_cast<DerivMinimizer *>(params);
+ size_t n = minimizer.m_costFunction->nParams();
+ for (size_t i = 0; i < n; ++i) {
+ minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
+ }
+ boost::shared_ptr<CostFuncFitting> fitting =
+ boost::dynamic_pointer_cast<CostFuncFitting>(minimizer.m_costFunction);
+ if (fitting) {
+ fitting->getFittingFunction()->applyTies();
+ }
+ std::vector<double> der(n);
+ *f = minimizer.m_costFunction->valAndDeriv(der);
+ for (size_t i = 0; i < n; ++i) {
+ gsl_vector_set(g, i, der[i]);
+ }
+}
+
+/// Constructor
+DerivMinimizer::DerivMinimizer()
+ : m_gslSolver(NULL), m_x(NULL), m_stopGradient(1e-3), m_stepSize(0.1),
+ m_tolerance(0.0001) {
+ initGSLMMin();
+}
+
+/**
+ * Constructor.
+ * @param stepSize :: Initial step size.
+ * @param tolerance :: Tolerance.
+ */
+DerivMinimizer::DerivMinimizer(const double stepSize, const double tolerance)
+ : m_gslSolver(NULL), m_x(NULL), m_stopGradient(1e-3), m_stepSize(stepSize),
+ m_tolerance(tolerance) {
+ initGSLMMin();
+}
+
+void DerivMinimizer::initGSLMMin() {
+ m_gslMultiminContainer.f = NULL;
+ m_gslMultiminContainer.df = NULL;
+ m_gslMultiminContainer.fdf = NULL;
+ m_gslMultiminContainer.n = 0;
+ m_gslMultiminContainer.params = NULL;
+}
+
+/**
+ * Destructor.
+ */
+DerivMinimizer::~DerivMinimizer() {
+ if (m_gslSolver != NULL) {
+ gsl_multimin_fdfminimizer_free(m_gslSolver);
+ gsl_vector_free(m_x);
+ }
+}
+
+/**
+ * Initialize the minimizer.
+ * @param function :: A cost function to minimize.
+ * @param maxIterations :: Maximum number of iterations.
+ */
+void DerivMinimizer::initialize(API::ICostFunction_sptr function,
+ size_t maxIterations) {
+ UNUSED_ARG(maxIterations);
+ m_costFunction = function;
+ m_gslMultiminContainer.n = m_costFunction->nParams();
+ m_gslMultiminContainer.f = &fun;
+ m_gslMultiminContainer.df = &dfun;
+ m_gslMultiminContainer.fdf = &fundfun;
+ m_gslMultiminContainer.params = this;
+
+ m_gslSolver = gsl_multimin_fdfminimizer_alloc(getGSLMinimizerType(),
+ m_gslMultiminContainer.n);
+
+ size_t nParams = m_costFunction->nParams();
+ // Starting point
+ m_x = gsl_vector_alloc(nParams);
+ for (size_t i = 0; i < nParams; ++i) {
+ gsl_vector_set(m_x, i, m_costFunction->getParameter(i));
+ }
+
+ gsl_multimin_fdfminimizer_set(m_gslSolver, &m_gslMultiminContainer, m_x,
+ m_stepSize, m_tolerance);
+}
+
+/**
+ * Perform one iteration.
+ * @return :: true to continue, false to stop.
+ */
+bool DerivMinimizer::iterate(size_t) {
+ if (m_gslSolver == NULL) {
+ throw std::runtime_error("Minimizer " + this->name() +
+ " was not initialized.");
+ }
+ int status = gsl_multimin_fdfminimizer_iterate(m_gslSolver);
+ if (status) {
+ m_errorString = gsl_strerror(status);
+ return false;
+ }
+ status = gsl_multimin_test_gradient(m_gslSolver->gradient, m_stopGradient);
+ if (status != GSL_CONTINUE) {
+ m_errorString = gsl_strerror(status);
+ return false;
+ }
+ return true;
+}
+
+/**
+ * Set maximum value of the gradient at which iterations can stop
+ * @param value :: New value for the gradient, must be positive.
+ */
+void DerivMinimizer::setStopGradient(const double value) {
+ if (value <= 0) {
+ throw std::invalid_argument("Gradient norm must be a positive number");
+ }
+ m_stopGradient = value;
+}
+
+double DerivMinimizer::costFunctionVal() { return m_gslSolver->f; }
+
+} // namespace CurveFitting
+} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
new file mode 100644
index 00000000000..6020760e963
--- /dev/null
+++ b/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
@@ -0,0 +1,645 @@
+#include "MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h"
+#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/BoundaryConstraint.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include "MantidAPI/CostFunctionFactory.h"
+#include "MantidAPI/FuncMinimizerFactory.h"
+#include "MantidAPI/IFunction.h"
+#include "MantidAPI/WorkspaceFactory.h"
+#include "MantidAPI/MatrixWorkspace.h"
+#include "MantidAPI/WorkspaceProperty.h"
+#include "MantidAPI/AnalysisDataService.h"
+#include "MantidAPI/ITableWorkspace.h"
+#include "MantidAPI/TableRow.h"
+#include "MantidKernel/MersenneTwister.h"
+#include "MantidKernel/PseudoRandomNumberGenerator.h"
+
+#include "MantidKernel/Logger.h"
+
+#include <boost/random/normal_distribution.hpp>
+#include <boost/random/uniform_real.hpp>
+#include <boost/random/mersenne_twister.hpp>
+#include <boost/version.hpp>
+#include <boost/math/special_functions/fpclassify.hpp>
+
+#include <iostream>
+#include <ctime>
+
+namespace Mantid {
+namespace CurveFitting {
+
+namespace {
+// static logger object
+Kernel::Logger g_log("FABADAMinimizer");
+// absolute maximum number of iterations when fit must converge
+const size_t convergenceMaxIterations = 50000;
+// number of iterations when convergence isn't expected
+const size_t lowerIterationLimit = 350;
+// very large number
+const double largeNumber = 1e100;
+// jump checking rate
+const size_t jumpCheckingRate = 200;
+// low jump limit
+const double lowJumpLimit = 1e-25;
+}
+
+DECLARE_FUNCMINIMIZER(FABADAMinimizer, FABADA)
+
+//----------------------------------------------------------------------------------------------
+/// Constructor
+FABADAMinimizer::FABADAMinimizer()
+ : m_counter(0), m_numberIterations(0), m_changes(), m_jump(),
+ m_parameters(), m_chain(), m_chi2(0.), m_converged(false),
+ m_conv_point(0), m_par_converged(), m_lower(), m_upper(), m_bound(),
+ m_criteria(), m_max_iter(0) {
+ declareProperty("ChainLength", static_cast<size_t>(10000),
+ "Length of the converged chain.");
+ declareProperty("StepsBetweenValues", static_cast<size_t>(10),
+ "Steps realized between keeping each result.");
+ declareProperty(
+ "ConvergenceCriteria", 0.01,
+ "Variance in Cost Function for considering convergence reached.");
+ declareProperty("JumpAcceptanceRate", 0.6666666,
+ "Desired jumping acceptance rate");
+ declareProperty(
+ new API::WorkspaceProperty<>("PDF", "PDF", Kernel::Direction::Output),
+ "The name to give the output workspace");
+ declareProperty(
+ new API::WorkspaceProperty<>("Chains", "", Kernel::Direction::Output),
+ "The name to give the output workspace");
+ declareProperty(new API::WorkspaceProperty<>("ConvergedChain", "",
+ Kernel::Direction::Output,
+ API::PropertyMode::Optional),
+ "The name to give the output workspace");
+ declareProperty(new API::WorkspaceProperty<API::ITableWorkspace>(
+ "CostFunctionTable", "", Kernel::Direction::Output),
+ "The name to give the output workspace");
+ declareProperty(new API::WorkspaceProperty<API::ITableWorkspace>(
+ "Parameters", "", Kernel::Direction::Output),
+ "The name to give the output workspace");
+}
+
+//----------------------------------------------------------------------------------------------
+
+/// Destructor
+FABADAMinimizer::~FABADAMinimizer() {}
+
+/// Initialize minimizer. Set initial values for all private members.
+void FABADAMinimizer::initialize(API::ICostFunction_sptr function,
+ size_t maxIterations) {
+
+ m_leastSquares = boost::dynamic_pointer_cast<CostFuncLeastSquares>(function);
+ if (!m_leastSquares) {
+ throw std::invalid_argument(
+ "FABADA works only with least squares. Different function was given.");
+ }
+
+ m_counter = 0;
+ m_leastSquares->getParameters(m_parameters);
+ API::IFunction_sptr fun = m_leastSquares->getFittingFunction();
+
+ if (fun->nParams() == 0) {
+ throw std::invalid_argument("Function has 0 fitting parameters.");
+ }
+
+ size_t n = getProperty("ChainLength");
+ m_numberIterations = n / fun->nParams();
+
+ if (m_numberIterations > maxIterations) {
+ g_log.warning()
+ << "MaxIterations property reduces the required number of iterations ("
+ << m_numberIterations << ")." << std::endl;
+ m_numberIterations = maxIterations;
+ }
+
+ for (size_t i = 0; i < m_leastSquares->nParams(); ++i) {
+ double p = m_parameters.get(i);
+ m_bound.push_back(false);
+ API::IConstraint *iconstr = fun->getConstraint(i);
+ if (iconstr) {
+ BoundaryConstraint *bcon = dynamic_cast<BoundaryConstraint *>(iconstr);
+ if (bcon) {
+ m_bound[i] = true;
+ if (bcon->hasLower()) {
+ m_lower.push_back(bcon->lower());
+ } else {
+ m_lower.push_back(-largeNumber);
+ }
+ if (bcon->hasUpper()) {
+ m_upper.push_back(bcon->upper());
+ } else {
+ m_upper.push_back(largeNumber);
+ }
+ if (p < m_lower[i]) {
+ p = m_lower[i];
+ m_parameters.set(i, p);
+ }
+ if (p > m_upper[i]) {
+ p = m_upper[i];
+ m_parameters.set(i, p);
+ }
+ }
+ } else {
+ m_lower.push_back(-largeNumber);
+ m_upper.push_back(largeNumber);
+ }
+ std::vector<double> v;
+ v.push_back(p);
+ m_chain.push_back(v);
+ m_max_iter = maxIterations;
+ m_changes.push_back(0);
+ m_par_converged.push_back(false);
+ m_criteria.push_back(getProperty("ConvergenceCriteria"));
+ if (p != 0.0) {
+ m_jump.push_back(std::abs(p / 10));
+ } else {
+ m_jump.push_back(0.01);
+ }
+ }
+ m_chi2 = m_leastSquares->val();
+ std::vector<double> v;
+ v.push_back(m_chi2);
+ m_chain.push_back(v);
+ m_converged = false;
+ m_max_iter = maxIterations;
+}
+
+/// Do one iteration. Returns true if iterations to be continued, false if they
+/// must stop.
+bool FABADAMinimizer::iterate(size_t) {
+
+ if (!m_leastSquares) {
+ throw std::runtime_error("Cost function isn't set up.");
+ }
+
+ size_t nParams = m_leastSquares->nParams();
+ size_t m = nParams;
+
+ // Just for the last iteration. For doing exactly the indicated number of
+ // iterations.
+ if (m_converged && m_counter == m_numberIterations) {
+ size_t t = getProperty("ChainLength");
+ m = t % nParams;
+ }
+
+ // Do one iteration of FABADA's algorithm for each parameter.
+ for (size_t i = 0; i < m; i++) {
+ GSLVector new_parameters = m_parameters;
+
+ // Calculate the step, depending on convergence reached or not
+ double step;
+ if (m_converged || m_bound[i]) {
+ boost::mt19937 mt;
+ mt.seed(123 * (int(m_counter) +
+ 45 * int(i))); // Numeros inventados para la seed
+ boost::normal_distribution<double> distr(0.0, std::abs(m_jump[i]));
+ boost::variate_generator<boost::mt19937,
+ boost::normal_distribution<double>> gen(mt,
+ distr);
+ step = gen();
+ } else {
+ step = m_jump[i];
+ }
+
+ // Calculate the new value of the parameter
+ double new_value = m_parameters.get(i) + step;
+
+ // Comproves if it is inside the boundary constrinctions. If not, changes
+ // it.
+ if (m_bound[i]) {
+ while (new_value < m_lower[i]) {
+ if (std::abs(step) > m_upper[i] - m_lower[i]) {
+ new_value = m_parameters.get(i) + step / 10.0;
+ step = step / 10;
+ m_jump[i] = m_jump[i] / 10;
+ } else {
+ new_value =
+ m_lower[i] + std::abs(step) - (m_parameters.get(i) - m_lower[i]);
+ }
+ }
+ while (new_value > m_upper[i]) {
+ if (std::abs(step) > m_upper[i] - m_lower[i]) {
+ new_value = m_parameters.get(i) + step / 10.0;
+ step = step / 10;
+ m_jump[i] = m_jump[i] / 10;
+ } else {
+ new_value =
+ m_upper[i] - (std::abs(step) + m_parameters.get(i) - m_upper[i]);
+ }
+ }
+ }
+
+ // Set the new value in order to calculate the new Chi square value
+ if (boost::math::isnan(new_value)) {
+ throw std::runtime_error("Parameter value is NaN.");
+ }
+ new_parameters.set(i, new_value);
+ m_leastSquares->setParameter(i, new_value);
+ double chi2_new = m_leastSquares->val();
+
+ // If new Chi square value is lower, jumping directly to new parameter
+ if (chi2_new < m_chi2) {
+ for (size_t j = 0; j < nParams; j++) {
+ m_chain[j].push_back(new_parameters.get(j));
+ }
+ m_chain[nParams].push_back(chi2_new);
+ m_parameters = new_parameters;
+ m_chi2 = chi2_new;
+ m_changes[i] += 1;
+
+ }
+
+ // If new Chi square value is higher, it depends on the probability
+ else {
+ // Calculate probability of change
+ double prob = exp((m_chi2 / 2.0) - (chi2_new / 2.0));
+
+ // Decide if changing or not
+ boost::mt19937 mt;
+ mt.seed(int(time_t()) + 48 * (int(m_counter) + 76 * int(i)));
+ boost::uniform_real<> distr(0.0, 1.0);
+ double p = distr(mt);
+ if (p <= prob) {
+ for (size_t j = 0; j < nParams; j++) {
+ m_chain[j].push_back(new_parameters.get(j));
+ }
+ m_chain[nParams].push_back(chi2_new);
+ m_parameters = new_parameters;
+ m_chi2 = chi2_new;
+ m_changes[i] += 1;
+ } else {
+ for (size_t j = 0; j < nParams; j++) {
+ m_chain[j].push_back(m_parameters.get(j));
+ }
+ m_chain[nParams].push_back(m_chi2);
+ m_leastSquares->setParameter(i, new_value - m_jump[i]);
+ m_jump[i] = -m_jump[i];
+ }
+ }
+
+ const double jumpAR = getProperty("JumpAcceptanceRate");
+
+ // Update the jump once each jumpCheckingRate iterations
+ if (m_counter % jumpCheckingRate == 150) // JUMP CHECKING RATE IS 200, BUT
+ // IS NOT CHECKED AT FIRST STEP, IT
+ // IS AT 150
+ {
+ double jnew;
+ if (m_changes[i] == 0.0) {
+ jnew = m_jump[i] /
+ 10.0; // JUST FOR THE CASE THERE HAS NOT BEEN ANY CHANGE.
+ } else {
+ double f = m_changes[i] / double(m_counter);
+ jnew = m_jump[i] * f / jumpAR;
+ }
+
+ m_jump[i] = jnew;
+
+ // Check if the new jump is too small. It means that it has been a wrong
+ // convergence.
+ if (std::abs(m_jump[i]) < lowJumpLimit) {
+ API::IFunction_sptr fun = m_leastSquares->getFittingFunction();
+ g_log.warning()
+ << "Wrong convergence for parameter " + fun->parameterName(i) +
+ ". Try to set a proper initial value for this parameter"
+ << std::endl;
+ }
+ }
+
+ // Check if the Chi square value has converged for parameter i.
+ const size_t startingPoint =
+ 350; // The iteration since it starts to check if convergence is reached
+ if (!m_par_converged[i] && m_counter > startingPoint) {
+ if (chi2_new != m_chi2) {
+ double chi2_quotient = std::abs(chi2_new - m_chi2) / m_chi2;
+ if (chi2_quotient < m_criteria[i]) {
+ m_par_converged[i] = true;
+ }
+ }
+ }
+ } // for i
+
+ // Update the counter, after finishing the iteration for each parameter
+ m_counter += 1;
+
+ // Check if Chi square has converged for all the parameters.
+ if (m_counter > lowerIterationLimit && !m_converged) {
+ size_t t = 0;
+ for (size_t i = 0; i < nParams; i++) {
+ if (m_par_converged[i]) {
+ t += 1;
+ }
+ }
+ // If all parameters have converged:
+ // It set up both the counter and the changes' vector to 0, in order to
+ // consider only the data of the converged part of the chain, when updating
+ // the jump.
+ if (t == nParams) {
+ m_converged = true;
+ m_conv_point = m_counter * nParams + 1;
+ m_counter = 0;
+ for (size_t i = 0; i < nParams; ++i) {
+ m_changes[i] = 0;
+ }
+ }
+ }
+
+ if (!m_converged) {
+ // If there is not convergence continue the iterations.
+ if (m_counter <= convergenceMaxIterations &&
+ m_counter < m_numberIterations - 1) {
+ return true;
+ }
+ // If there is not convergence, but it has been made
+ // convergenceMaxIterations iterations, stop and throw the error.
+ else {
+ API::IFunction_sptr fun = m_leastSquares->getFittingFunction();
+ std::string failed = "";
+ for (size_t i = 0; i < nParams; ++i) {
+ if (!m_par_converged[i]) {
+ failed = failed + fun->parameterName(i) + ", ";
+ }
+ }
+ failed.replace(failed.end() - 2, failed.end(), ".");
+ throw std::runtime_error(
+ "Convegence NOT reached after " +
+ boost::lexical_cast<std::string>(m_max_iter) +
+ " iterations.\n Try to set better initial values for parameters: " +
+ failed);
+ }
+ } else {
+ // If convergence has been reached, continue untill complete the chain
+ // length.
+ if (m_counter <= m_numberIterations) {
+ return true;
+ }
+ // If convergence has been reached, but the maximum of iterations have been
+ // reached before finishing the chain, stop and throw the error.
+ if (m_counter >= m_max_iter) {
+ throw std::length_error("Convegence reached but Max Iterations parameter "
+ "insufficient for creating the whole chain.\n "
+ "Increase Max Iterations");
+ }
+ // nothing else to do, stop interations
+ return false;
+ }
+ // can we even get here?
+ return true;
+}
+
+double FABADAMinimizer::costFunctionVal() { return m_chi2; }
+
+/// When the all the iterations have been done, calculate and show all the
+/// results.
+void FABADAMinimizer::finalize() {
+ // Creating the reduced chain (considering only one each "Steps between
+ // values" values)
+ size_t cl = getProperty("ChainLength");
+ size_t n_steps = getProperty("StepsBetweenValues");
+ size_t conv_length = size_t(double(cl) / double(n_steps));
+ std::vector<std::vector<double>> red_conv_chain;
+ size_t nParams = m_leastSquares->nParams();
+ for (size_t e = 0; e <= nParams; ++e) {
+ std::vector<double> v;
+ v.push_back(m_chain[e][m_conv_point]);
+ red_conv_chain.push_back(v);
+ }
+
+ // Calculate the red_conv_chain for the cost fuction.
+ auto first = m_chain[nParams].begin() + m_conv_point;
+ auto last = m_chain[nParams].end();
+ std::vector<double> conv_chain(first, last);
+ for (size_t k = 1; k < conv_length; ++k) {
+ red_conv_chain[nParams].push_back(conv_chain[n_steps * k]);
+ }
+
+ // Calculate the position of the minimum Chi square value
+ auto pos_min = std::min_element(red_conv_chain[nParams].begin(),
+ red_conv_chain[nParams].end());
+ m_chi2 = *pos_min;
+
+ std::vector<double> par_def(nParams);
+ std::vector<double> error_left(nParams);
+ std::vector<double> error_rigth(nParams);
+ API::IFunction_sptr fun = m_leastSquares->getFittingFunction();
+
+ // Do one iteration for each parameter.
+ for (size_t j = 0; j < nParams; ++j) {
+ // Calculate the parameter value and the errors
+ auto first = m_chain[j].begin() + m_conv_point;
+ auto last = m_chain[j].end();
+ std::vector<double> conv_chain(first, last);
+ auto &rc_chain_j = red_conv_chain[j];
+ for (size_t k = 0; k < conv_length; ++k) {
+ rc_chain_j.push_back(conv_chain[n_steps * k]);
+ }
+ par_def[j] = rc_chain_j[pos_min - red_conv_chain[nParams].begin()];
+ std::sort(rc_chain_j.begin(), rc_chain_j.end());
+ auto pos_par = std::find(rc_chain_j.begin(), rc_chain_j.end(), par_def[j]);
+ auto pos_left = rc_chain_j.begin();
+ auto pos_right = rc_chain_j.end() - 1;
+ size_t sigma = static_cast<size_t>(0.34 * double(conv_length));
+ if (pos_par == rc_chain_j.end()) {
+ error_left[j] = *(pos_right - sigma);
+ error_rigth[j] = *pos_right;
+ } else {
+
+ if (sigma < static_cast<size_t>(std::distance(pos_left, pos_par))) {
+ pos_left = pos_par - sigma;
+ }
+ // make sure the iterator is valid in any case
+ if (sigma < static_cast<size_t>(std::distance(pos_par, pos_right))) {
+ pos_right = pos_par + sigma;
+ }
+ error_left[j] = *pos_left - *pos_par;
+ error_rigth[j] = *pos_right - *pos_par;
+ }
+ }
+
+ const bool outputParametersTable = !getPropertyValue("Parameters").empty();
+
+ if (outputParametersTable) {
+
+ // Create the workspace for the parameters' value and errors.
+ API::ITableWorkspace_sptr wsPdfE =
+ API::WorkspaceFactory::Instance().createTable("TableWorkspace");
+ wsPdfE->addColumn("str", "Name");
+ wsPdfE->addColumn("double", "Value");
+ wsPdfE->addColumn("double", "Left's error");
+ wsPdfE->addColumn("double", "Rigth's error");
+
+ for (size_t j = 0; j < nParams; ++j) {
+ API::TableRow row = wsPdfE->appendRow();
+ row << fun->parameterName(j) << par_def[j] << error_left[j]
+ << error_rigth[j];
+ }
+ // Set and name the Parameter Errors workspace.
+ setProperty("Parameters", wsPdfE);
+ }
+
+ // Set the best parameter values
+ for (size_t j = 0; j < nParams; ++j) {
+ m_leastSquares->setParameter(j, par_def[j]);
+ }
+
+ double mostPchi2;
+
+ // Create the workspace for the Probability Density Functions
+ size_t pdf_length = 20; // histogram length for the PDF output workspace
+ API::MatrixWorkspace_sptr ws = API::WorkspaceFactory::Instance().create(
+ "Workspace2D", nParams + 1, pdf_length + 1, pdf_length);
+
+ // Calculate the cost function Probability Density Function
+ std::sort(red_conv_chain[nParams].begin(), red_conv_chain[nParams].end());
+ std::vector<double> pdf_y(pdf_length, 0);
+ double start = red_conv_chain[nParams][0];
+ double bin =
+ (red_conv_chain[nParams][conv_length - 1] - start) / double(pdf_length);
+ size_t step = 0;
+ MantidVec &X = ws->dataX(nParams);
+ MantidVec &Y = ws->dataY(nParams);
+ X[0] = start;
+ for (size_t i = 1; i < pdf_length + 1; i++) {
+ double bin_end = start + double(i) * bin;
+ X[i] = bin_end;
+ while (step < conv_length && red_conv_chain[nParams][step] <= bin_end) {
+ pdf_y[i - 1] += 1;
+ ++step;
+ }
+ Y[i - 1] = pdf_y[i - 1] / (double(conv_length) * bin);
+ }
+
+ std::vector<double>::iterator pos_MPchi2 =
+ std::max_element(pdf_y.begin(), pdf_y.end());
+
+ if (pos_MPchi2 - pdf_y.begin() == 0) {
+ // mostPchi2 = X[pos_MPchi2-pdf_y.begin()];
+ mostPchi2 = *pos_min;
+ } else {
+ mostPchi2 = X[pos_MPchi2 - pdf_y.begin()] + (bin / 2.0);
+ }
+
+ // Do one iteration for each parameter.
+ for (size_t j = 0; j < nParams; ++j) {
+ // Calculate the Probability Density Function
+ std::vector<double> pdf_y(pdf_length, 0);
+ double start = red_conv_chain[j][0];
+ double bin =
+ (red_conv_chain[j][conv_length - 1] - start) / double(pdf_length);
+ size_t step = 0;
+ MantidVec &X = ws->dataX(j);
+ MantidVec &Y = ws->dataY(j);
+ X[0] = start;
+ for (size_t i = 1; i < pdf_length + 1; i++) {
+ double bin_end = start + double(i) * bin;
+ X[i] = bin_end;
+ while (step < conv_length && red_conv_chain[j][step] <= bin_end) {
+ pdf_y[i - 1] += 1;
+ ++step;
+ }
+ Y[i - 1] = pdf_y[i - 1] / (double(conv_length) * bin);
+ }
+
+ // Calculate the most probable value, from the PDF.
+ std::vector<double>::iterator pos_MP =
+ std::max_element(pdf_y.begin(), pdf_y.end());
+ double mostP = X[pos_MP - pdf_y.begin()] + (bin / 2.0);
+ m_leastSquares->setParameter(j, mostP);
+ }
+
+ // Set and name the PDF workspace.
+ setProperty("PDF", ws);
+
+ const bool outputChains = !getPropertyValue("Chains").empty();
+
+ if (outputChains) {
+
+ // Create the workspace for the complete parameters' chain (the last
+ // histogram is for the Chi square).
+ size_t chain_length = m_chain[0].size();
+ API::MatrixWorkspace_sptr wsC = API::WorkspaceFactory::Instance().create(
+ "Workspace2D", nParams + 1, chain_length, chain_length);
+
+ // Do one iteration for each parameter plus one for Chi square.
+ for (size_t j = 0; j < nParams + 1; ++j) {
+ MantidVec &X = wsC->dataX(j);
+ MantidVec &Y = wsC->dataY(j);
+ for (size_t k = 0; k < chain_length; ++k) {
+ X[k] = double(k);
+ Y[k] = m_chain[j][k];
+ }
+ }
+
+ // Set and name the workspace for the complete chain
+ setProperty("Chains", wsC);
+ }
+
+ // Read if necessary to show the workspace for the converged part of the
+ // chain.
+ const bool outputConvergedChains =
+ !getPropertyValue("ConvergedChain").empty();
+
+ if (outputConvergedChains) {
+ // Create the workspace for the converged part of the chain.
+ API::MatrixWorkspace_sptr wsConv = API::WorkspaceFactory::Instance().create(
+ "Workspace2D", nParams + 1, conv_length, conv_length);
+
+ // Do one iteration for each parameter plus one for Chi square.
+ for (size_t j = 0; j < nParams + 1; ++j) {
+ std::vector<double>::const_iterator first =
+ m_chain[j].begin() + m_conv_point;
+ std::vector<double>::const_iterator last = m_chain[j].end();
+ std::vector<double> conv_chain(first, last);
+ MantidVec &X = wsConv->dataX(j);
+ MantidVec &Y = wsConv->dataY(j);
+ for (size_t k = 0; k < conv_length; ++k) {
+ X[k] = double(k);
+ Y[k] = conv_chain[n_steps * k];
+ }
+ }
+
+ // Set and name the workspace for the converged part of the chain.
+ setProperty("ConvergedChain", wsConv);
+ }
+
+ // Read if necessary to show the workspace for the Chi square values.
+ const bool outputCostFunctionTable =
+ !getPropertyValue("CostFunctionTable").empty();
+
+ if (outputCostFunctionTable) {
+
+ // Create the workspace for the Chi square values.
+ API::ITableWorkspace_sptr wsChi2 =
+ API::WorkspaceFactory::Instance().createTable("TableWorkspace");
+ wsChi2->addColumn("double", "Chi2min");
+ wsChi2->addColumn("double", "Chi2MP");
+ wsChi2->addColumn("double", "Chi2min_red");
+ wsChi2->addColumn("double", "Chi2MP_red");
+
+ // Obtain the quantity of the initial data.
+ API::FunctionDomain_sptr domain = m_leastSquares->getDomain();
+ size_t data_number = domain->size();
+
+ // Calculate the value for the reduced Chi square.
+ double Chi2min_red =
+ m_chi2 / (double(data_number - nParams)); // For de minimum value.
+ double mostPchi2_red = mostPchi2 / (double(data_number - nParams));
+
+ // Add the information to the workspace and name it.
+ API::TableRow row = wsChi2->appendRow();
+ row << m_chi2 << mostPchi2 << Chi2min_red << mostPchi2_red;
+ setProperty("CostFunctionTable", wsChi2);
+ }
+
+ // Set the best parameter values
+ for (size_t j = 0; j < nParams; ++j) {
+ m_leastSquares->setParameter(j, par_def[j]);
+ }
+}
+
+} // namespace CurveFitting
+} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FRConjugateGradientMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
similarity index 91%
rename from Framework/CurveFitting/src/FRConjugateGradientMinimizer.cpp
rename to Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
index a06a974c52f..99fe0c35f12 100644
--- a/Framework/CurveFitting/src/FRConjugateGradientMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/FRConjugateGradientMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h"
#include "MantidAPI/CostFunctionFactory.h"
#include "MantidAPI/FuncMinimizerFactory.h"
diff --git a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
new file mode 100644
index 00000000000..7bfd0c587cb
--- /dev/null
+++ b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
@@ -0,0 +1,291 @@
+//----------------------------------------------------------------------
+// Includes
+//----------------------------------------------------------------------
+#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
+#include "MantidCurveFitting/CostFuncLeastSquares.h"
+
+#include "MantidAPI/CostFunctionFactory.h"
+#include "MantidAPI/FuncMinimizerFactory.h"
+#include "MantidAPI/IFunction.h"
+
+#include "MantidKernel/Logger.h"
+
+#include <boost/lexical_cast.hpp>
+#include <gsl/gsl_blas.h>
+#include <iostream>
+#include <cmath>
+
+namespace Mantid {
+namespace CurveFitting {
+namespace {
+/// static logger object
+Kernel::Logger g_log("LevenbergMarquardMD");
+}
+
+// clang-format off
+DECLARE_FUNCMINIMIZER(LevenbergMarquardtMDMinimizer, Levenberg-MarquardtMD)
+// clang-format on
+
+/// Constructor
+LevenbergMarquardtMDMinimizer::LevenbergMarquardtMDMinimizer()
+ : IFuncMinimizer(), m_tau(1e-6), m_mu(1e-6), m_nu(2.0), m_rho(1.0),
+ m_F(0.0) {
+ declareProperty("MuMax", 1e6,
+ "Maximum value of mu - a stopping parameter in failure.");
+ declareProperty("AbsError", 0.0001, "Absolute error allowed for parameters - "
+ "a stopping parameter in success.");
+ declareProperty("Debug", false, "Turn on the debug output.");
+}
+
+/// Initialize minimizer, i.e. pass a function to minimize.
+void LevenbergMarquardtMDMinimizer::initialize(API::ICostFunction_sptr function,
+ size_t) {
+ m_leastSquares = boost::dynamic_pointer_cast<CostFuncLeastSquares>(function);
+ if (!m_leastSquares) {
+ throw std::invalid_argument("Levenberg-Marquardt minimizer works only with "
+ "least squares. Different function was given.");
+ }
+ m_mu = 0;
+ m_nu = 2.0;
+ m_rho = 1.0;
+}
+
+/// Do one iteration.
+bool LevenbergMarquardtMDMinimizer::iterate(size_t) {
+ const bool debug = getProperty("Debug");
+ const double muMax = getProperty("MuMax");
+ const double absError = getProperty("AbsError");
+
+ if (!m_leastSquares) {
+ throw std::runtime_error("Cost function isn't set up.");
+ }
+ size_t n = m_leastSquares->nParams();
+
+ if (n == 0) {
+ m_errorString = "No parameters to fit.";
+ g_log.information(m_errorString);
+ return false;
+ }
+
+ if (m_mu > muMax) {
+ // m_errorString = "Failed to converge, maximum mu reached";
+ // g_log.warning() << m_errorString << std::endl;
+ return false;
+ }
+
+ // calculate the first and second derivatives of the cost function.
+ if (m_mu == 0.0 || m_rho > 0) {
+ // calculate everything first time or
+ // if last iteration was good
+ m_F = m_leastSquares->valDerivHessian();
+ }
+ // else if m_rho < 0 last iteration was bad: reuse m_der and m_hessian
+
+ // Calculate damping to hessian
+ if (m_mu == 0) // first iteration or accidental zero
+ {
+ m_mu = m_tau;
+ m_nu = 2.0;
+ }
+
+ if (debug) {
+ g_log.warning()
+ << "==========================================================="
+ << std::endl;
+ g_log.warning() << "mu=" << m_mu << std::endl
+ << std::endl;
+ }
+
+ if (m_D.empty()) {
+ m_D.resize(n);
+ }
+
+ // copy the hessian
+ GSLMatrix H(m_leastSquares->getHessian());
+ GSLVector dd(m_leastSquares->getDeriv());
+
+ // scaling factors
+ std::vector<double> sf(n);
+
+ for (size_t i = 0; i < n; ++i) {
+ double d = fabs(dd.get(i));
+ if (m_D[i] > d)
+ d = m_D[i];
+ m_D[i] = d;
+ double tmp = H.get(i, i) + m_mu * d;
+ H.set(i, i, tmp);
+ sf[i] = sqrt(tmp);
+ if (tmp == 0.0) {
+ m_errorString = "Singular matrix.";
+ g_log.information(m_errorString);
+ return false;
+ }
+ }
+
+ // apply scaling
+ for (size_t i = 0; i < n; ++i) {
+ double d = dd.get(i);
+ dd.set(i, d / sf[i]);
+ for (size_t j = i; j < n; ++j) {
+ const double f = sf[i] * sf[j];
+ double tmp = H.get(i, j);
+ H.set(i, j, tmp / f);
+ if (i != j) {
+ tmp = H.get(j, i);
+ H.set(j, i, tmp / f);
+ }
+ }
+ }
+
+ if (debug && m_rho > 0) {
+ g_log.warning() << "Hessian:\n" << H;
+ g_log.warning() << "Right-hand side:\n";
+ for (size_t j = 0; j < n; ++j) {
+ g_log.warning() << dd.get(j) << ' ';
+ }
+ g_log.warning() << std::endl;
+ g_log.warning() << "Determinant=" << H.det() << std::endl;
+ }
+
+ // Parameter corrections
+ GSLVector dx(n);
+ // To find dx solve the system of linear equations H * dx == -m_der
+ dd *= -1.0;
+ H.solve(dd, dx);
+
+ if (debug) {
+ g_log.warning() << "\nScaling factors:" << std::endl;
+ for (size_t j = 0; j < n; ++j) {
+ g_log.warning() << sf[j] << ' ';
+ }
+ g_log.warning() << std::endl;
+ g_log.warning() << "Corrections:" << std::endl;
+ for (size_t j = 0; j < n; ++j) {
+ g_log.warning() << dx.get(j) << ' ';
+ }
+ g_log.warning() << std::endl
+ << std::endl;
+ }
+
+ // restore scaling
+ for (size_t i = 0; i < n; ++i) {
+ double d = dx.get(i);
+ dx.set(i, d / sf[i]);
+ d = dd.get(i);
+ dd.set(i, d * sf[i]);
+ }
+
+ // save previous state
+ m_leastSquares->push();
+ // Update the parameters of the cost function.
+ for (size_t i = 0; i < n; ++i) {
+ double d = m_leastSquares->getParameter(i) + dx.get(i);
+ m_leastSquares->setParameter(i, d);
+ if (debug) {
+ g_log.warning() << "Parameter(" << i << ")=" << d << std::endl;
+ }
+ }
+ m_leastSquares->getFittingFunction()->applyTies();
+
+ // --- prepare for the next iteration --- //
+
+ double dL;
+ // der -> - der - 0.5 * hessian * dx
+ gsl_blas_dgemv(CblasNoTrans, -0.5, m_leastSquares->getHessian().gsl(),
+ dx.gsl(), 1., dd.gsl());
+ // calculate the linear part of the change in cost function
+ // dL = - der * dx - 0.5 * dx * hessian * dx
+ gsl_blas_ddot(dd.gsl(), dx.gsl(), &dL);
+
+ double F1 = m_leastSquares->val();
+ if (debug) {
+ g_log.warning() << std::endl;
+ g_log.warning() << "Old cost function " << m_F << std::endl;
+ g_log.warning() << "New cost function " << F1 << std::endl;
+ g_log.warning() << "Linear part " << dL << std::endl;
+ }
+
+ // Try the stop condition
+ if (m_rho >= 0) {
+ GSLVector p(n);
+ m_leastSquares->getParameters(p);
+ double dx_norm = gsl_blas_dnrm2(dx.gsl());
+ if (dx_norm < absError) {
+ if (debug) {
+ g_log.warning() << "Successful fit, parameters changed by less than "
+ << absError << std::endl;
+ }
+ return false;
+ }
+ if (m_rho == 0) {
+ if (m_F != F1) {
+ this->m_errorString = "Failed to converge, rho == 0";
+ g_log.warning() << m_errorString << std::endl;
+ }
+ if (debug) {
+ g_log.warning() << "Successful fit, cost function didn't change."
+ << std::endl;
+ }
+ return false;
+ }
+ }
+
+ if (fabs(dL) == 0.0) {
+ if (m_F == F1)
+ m_rho = 1.0;
+ else
+ m_rho = 0;
+ } else {
+ m_rho = (m_F - F1) / dL;
+ if (m_rho == 0) {
+ return false;
+ }
+ }
+ if (debug) {
+ g_log.warning() << "rho=" << m_rho << std::endl;
+ }
+
+ if (m_rho > 0) { // good progress, decrease m_mu but no more than by 1/3
+ // rho = 1 - (2*rho - 1)^3
+ m_rho = 2.0 * m_rho - 1.0;
+ m_rho = 1.0 - m_rho * m_rho * m_rho;
+ const double I3 = 1.0 / 3.0;
+ if (m_rho > I3)
+ m_rho = I3;
+ if (m_rho < 0.0001)
+ m_rho = 0.1;
+ m_mu *= m_rho;
+ m_nu = 2.0;
+ m_F = F1;
+ if (debug) {
+ g_log.warning() << "Good iteration, accept new parameters." << std::endl;
+ g_log.warning() << "rho=" << m_rho << std::endl;
+ }
+ // drop saved state, accept new parameters
+ m_leastSquares->drop();
+ } else { // bad iteration. increase m_mu and revert changes to parameters
+ m_mu *= m_nu;
+ m_nu *= 2.0;
+ // undo parameter update
+ m_leastSquares->pop();
+ m_F = m_leastSquares->val();
+ if (debug) {
+ g_log.warning()
+ << "Bad iteration, increase mu and revert changes to parameters."
+ << std::endl;
+ }
+ }
+
+ return true;
+}
+
+/// Return current value of the cost function
+double LevenbergMarquardtMDMinimizer::costFunctionVal() {
+ if (!m_leastSquares) {
+ throw std::runtime_error("Cost function isn't set up.");
+ }
+ return m_leastSquares->val();
+}
+
+} // namespace CurveFitting
+} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
new file mode 100644
index 00000000000..bb409af97fd
--- /dev/null
+++ b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
@@ -0,0 +1,145 @@
+//----------------------------------------------------------------------
+// Includes
+//----------------------------------------------------------------------
+#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h"
+#include "MantidCurveFitting/CostFuncLeastSquares.h"
+
+#include "MantidAPI/CostFunctionFactory.h"
+#include "MantidAPI/FuncMinimizerFactory.h"
+
+#include "MantidKernel/Exception.h"
+#include "MantidKernel/Logger.h"
+#include "MantidKernel/System.h"
+
+#include <boost/lexical_cast.hpp>
+#include <gsl/gsl_blas.h>
+#include <iostream>
+
+namespace Mantid {
+namespace CurveFitting {
+namespace {
+// Get a reference to the logger
+Kernel::Logger g_log("LevenbergMarquardtMinimizer");
+}
+
+// clang-format off
+DECLARE_FUNCMINIMIZER(LevenbergMarquardtMinimizer, Levenberg-Marquardt)
+// clang-format on
+
+LevenbergMarquardtMinimizer::LevenbergMarquardtMinimizer()
+ : m_data(NULL), gslContainer(), m_gslSolver(NULL), m_function(),
+ m_absError(1e-4), m_relError(1e-4) {
+ declareProperty("AbsError", m_absError, "Absolute error allowed for "
+ "parameters - a stopping parameter "
+ "in success.");
+ declareProperty("RelError", m_relError, "Relative error allowed for "
+ "parameters - a stopping parameter "
+ "in success.");
+}
+
+void LevenbergMarquardtMinimizer::initialize(
+ API::ICostFunction_sptr costFunction, size_t) {
+ // set-up GSL container to be used with GSL simplex algorithm
+ auto leastSquares =
+ boost::dynamic_pointer_cast<CostFuncLeastSquares>(costFunction);
+ if (leastSquares) {
+ m_data = new GSL_FitData(leastSquares);
+ } else {
+ throw std::runtime_error("LevenbergMarquardt can only be used with Least "
+ "squares cost function.");
+ }
+
+ // specify the type of GSL solver to use
+ const gsl_multifit_fdfsolver_type *T = gsl_multifit_fdfsolver_lmsder;
+
+ // setup GSL container
+ gslContainer.f = &gsl_f;
+ gslContainer.df = &gsl_df;
+ gslContainer.fdf = &gsl_fdf;
+ gslContainer.n = m_data->n;
+ gslContainer.p = m_data->p;
+ gslContainer.params = m_data;
+
+ // setup GSL solver
+ m_gslSolver = gsl_multifit_fdfsolver_alloc(T, m_data->n, m_data->p);
+ if (!m_gslSolver) {
+ throw std::runtime_error(
+ "Levenberg-Marquardt minimizer failed to initialize. \n" +
+ boost::lexical_cast<std::string>(m_data->n) + " data points, " +
+ boost::lexical_cast<std::string>(m_data->p) + " fitting parameters. ");
+ }
+ gsl_multifit_fdfsolver_set(m_gslSolver, &gslContainer,
+ m_data->initFuncParams);
+
+ m_function = leastSquares->getFittingFunction();
+}
+
+LevenbergMarquardtMinimizer::~LevenbergMarquardtMinimizer() {
+ if (m_data) {
+ delete m_data;
+ }
+ if (m_gslSolver) {
+ gsl_multifit_fdfsolver_free(m_gslSolver);
+ }
+}
+
+bool LevenbergMarquardtMinimizer::iterate(size_t) {
+ m_absError = getProperty("AbsError");
+ m_relError = getProperty("RelError");
+
+ int retVal = gsl_multifit_fdfsolver_iterate(m_gslSolver);
+
+ // From experience it is found that gsl_multifit_fdfsolver_iterate
+ // occasionally get
+ // stock - even after having achieved a sensible fit. This seem in particular
+ // to be a
+ // problem on Linux. However, to force GSL not to return ga ga have to do
+ // stuff in the
+ // if statement below
+ // GSL 1.14 changed return value from GSL_CONTINUE->GSL_ENOPROG for
+ // non-converging fits at 10 iterations
+ if (retVal == GSL_CONTINUE || retVal == GSL_ENOPROG) {
+ size_t ia = 0;
+ for (size_t i = 0; i < m_function->nParams(); i++) {
+ if (m_function->isActive(i)) {
+ m_function->setActiveParameter(i, gsl_vector_get(m_gslSolver->x, ia));
+ ++ia;
+ }
+ }
+ m_function->applyTies();
+ retVal = GSL_CONTINUE;
+ }
+
+ if (retVal && retVal != GSL_CONTINUE) {
+ m_errorString = gsl_strerror(retVal);
+ return false;
+ }
+
+ retVal = hasConverged();
+ m_errorString = gsl_strerror(retVal);
+
+ return retVal != GSL_SUCCESS;
+}
+
+int LevenbergMarquardtMinimizer::hasConverged() {
+ return gsl_multifit_test_delta(m_gslSolver->dx, m_gslSolver->x, m_absError,
+ m_relError);
+}
+
+double LevenbergMarquardtMinimizer::costFunctionVal() {
+ double chi = gsl_blas_dnrm2(m_gslSolver->f);
+ return chi * chi;
+}
+
+/* Calculates covariance matrix
+ *
+ * @param epsrel :: Is used to remove linear-dependent columns
+ * @param covar :: Returned covariance matrix, here as
+ */
+void LevenbergMarquardtMinimizer::calCovarianceMatrix(double epsrel,
+ gsl_matrix *covar) {
+ gsl_multifit_covar(m_gslSolver->J, epsrel, covar);
+}
+
+} // namespace CurveFitting
+} // namespace Mantid
diff --git a/Framework/CurveFitting/src/PRConjugateGradientMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
similarity index 91%
rename from Framework/CurveFitting/src/PRConjugateGradientMinimizer.cpp
rename to Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
index ae9d3adaa6f..88cf0bb80b5 100644
--- a/Framework/CurveFitting/src/PRConjugateGradientMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/PRConjugateGradientMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h"
#include "MantidAPI/CostFunctionFactory.h"
#include "MantidAPI/FuncMinimizerFactory.h"
diff --git a/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
new file mode 100644
index 00000000000..22d734e9d95
--- /dev/null
+++ b/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
@@ -0,0 +1,121 @@
+//----------------------------------------------------------------------
+// Includes
+//----------------------------------------------------------------------
+#include "MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h"
+#include "MantidCurveFitting/CostFuncFitting.h"
+
+#include "MantidAPI/FuncMinimizerFactory.h"
+
+#include "MantidKernel/Logger.h"
+
+namespace Mantid {
+namespace CurveFitting {
+namespace {
+/// static logger
+Kernel::Logger g_log("SimplexMinimizer");
+}
+
+DECLARE_FUNCMINIMIZER(SimplexMinimizer, Simplex)
+
+/** Calculating cost function
+*
+* @param x :: Input function arguments
+* @param params :: Pointer to a SimplexMinimizer
+* @return Value of the cost function
+*/
+double SimplexMinimizer::fun(const gsl_vector *x, void *params) {
+ SimplexMinimizer &minimizer = *static_cast<SimplexMinimizer *>(params);
+ // update function parameters
+ if (x->data) {
+ for (size_t i = 0; i < minimizer.m_costFunction->nParams(); ++i) {
+ minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
+ }
+ }
+ boost::shared_ptr<CostFuncFitting> fitting =
+ boost::dynamic_pointer_cast<CostFuncFitting>(minimizer.m_costFunction);
+ if (fitting) {
+ fitting->getFittingFunction()->applyTies();
+ }
+ return minimizer.m_costFunction->val();
+}
+
+SimplexMinimizer::SimplexMinimizer(const double epsabs)
+ : m_epsabs(epsabs), m_costFunction(), m_size(1.0), m_simplexStepSize(NULL),
+ m_startGuess(NULL), m_gslSolver(NULL) {
+ gslContainer.f = NULL;
+ gslContainer.n = -1;
+ gslContainer.params = NULL;
+}
+
+void SimplexMinimizer::initialize(API::ICostFunction_sptr function, size_t) {
+ m_costFunction = function;
+
+ const gsl_multimin_fminimizer_type *T = gsl_multimin_fminimizer_nmsimplex;
+
+ size_t np = function->nParams();
+ // step size for simplex
+ m_simplexStepSize = gsl_vector_alloc(np);
+ gsl_vector_set_all(m_simplexStepSize, m_size);
+
+ // setup simplex container
+ gslContainer.n = np;
+ gslContainer.f = &fun;
+ gslContainer.params = this;
+
+ // fill in parameter values
+ m_startGuess = gsl_vector_alloc(np);
+ for (size_t i = 0; i < np; ++i) {
+ gsl_vector_set(m_startGuess, i, function->getParameter(i));
+ }
+
+ // setup minimizer
+ m_gslSolver = gsl_multimin_fminimizer_alloc(T, np);
+ gsl_multimin_fminimizer_set(m_gslSolver, &gslContainer, m_startGuess,
+ m_simplexStepSize);
+}
+
+/**
+ * Do one iteration.
+ * @return :: true if iterations to be continued, false if they can stop
+ */
+bool SimplexMinimizer::iterate(size_t) {
+ int status = gsl_multimin_fminimizer_iterate(m_gslSolver);
+ if (status) {
+ m_errorString = gsl_strerror(status);
+ return false;
+ }
+ double size = gsl_multimin_fminimizer_size(m_gslSolver);
+ status = gsl_multimin_test_size(size, m_epsabs);
+ if (status != GSL_CONTINUE) {
+ m_errorString = gsl_strerror(status);
+ return false;
+ }
+ return true;
+}
+
+/// resets the size
+void SimplexMinimizer::resetSize(const double &size) {
+ m_size = size;
+ clearMemory();
+ initialize(m_costFunction);
+}
+
+SimplexMinimizer::~SimplexMinimizer() { clearMemory(); }
+
+/// clear memory
+void SimplexMinimizer::clearMemory() {
+ if (m_simplexStepSize) {
+ gsl_vector_free(m_simplexStepSize);
+ }
+ if (m_startGuess) {
+ gsl_vector_free(m_startGuess);
+ }
+ if (m_gslSolver) {
+ gsl_multimin_fminimizer_free(m_gslSolver);
+ }
+}
+
+double SimplexMinimizer::costFunctionVal() { return m_gslSolver->fval; }
+
+} // namespace CurveFitting
+} // namespace Mantid
diff --git a/Framework/CurveFitting/src/SteepestDescentMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp
similarity index 91%
rename from Framework/CurveFitting/src/SteepestDescentMinimizer.cpp
rename to Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp
index be4c4380ab1..9b52e228062 100644
--- a/Framework/CurveFitting/src/SteepestDescentMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/SteepestDescentMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h"
#include "MantidAPI/CostFunctionFactory.h"
#include "MantidAPI/FuncMinimizerFactory.h"
diff --git a/Framework/CurveFitting/test/BSplineTest.h b/Framework/CurveFitting/test/BSplineTest.h
index 0b5e362ab4c..a7bc5c20670 100644
--- a/Framework/CurveFitting/test/BSplineTest.h
+++ b/Framework/CurveFitting/test/BSplineTest.h
@@ -3,7 +3,7 @@
#include "MantidCurveFitting/BSpline.h"
#include "MantidCurveFitting/UserFunction.h"
-#include "MantidCurveFitting/LevenbergMarquardtMDMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
#include "MantidCurveFitting/CostFuncLeastSquares.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/CompositeFunctionTest.h b/Framework/CurveFitting/test/CompositeFunctionTest.h
index 9ee29464309..99a33d192fc 100644
--- a/Framework/CurveFitting/test/CompositeFunctionTest.h
+++ b/Framework/CurveFitting/test/CompositeFunctionTest.h
@@ -13,9 +13,9 @@
#include "MantidKernel/ConfigService.h"
#include "MantidAPI/FrameworkManager.h"
-#include "MantidCurveFitting/SimplexMinimizer.h"
-#include "MantidCurveFitting/BFGS_Minimizer.h"
-#include "MantidCurveFitting/LevenbergMarquardtMDMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
#include "MantidCurveFitting/UserFunction.h"
#include "MantidCurveFitting/ExpDecay.h"
#include "MantidCurveFitting/CostFuncLeastSquares.h"
diff --git a/Framework/CurveFitting/test/BFGSTest.h b/Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h
similarity index 96%
rename from Framework/CurveFitting/test/BFGSTest.h
rename to Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h
index f0c03cb3e37..c7233dc2e79 100644
--- a/Framework/CurveFitting/test/BFGSTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/BFGS_Minimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h"
#include "MantidAPI/ICostFunction.h"
#include <sstream>
diff --git a/Framework/CurveFitting/test/DampingMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
similarity index 99%
rename from Framework/CurveFitting/test/DampingMinimizerTest.h
rename to Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
index 61ce4aa560f..9da641fd168 100644
--- a/Framework/CurveFitting/test/DampingMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/CostFuncLeastSquares.h"
-#include "MantidCurveFitting/DampingMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/DampingMinimizer.h"
#include "MantidCurveFitting/UserFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/FABADAMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
similarity index 99%
rename from Framework/CurveFitting/test/FABADAMinimizerTest.h
rename to Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
index 29b304014eb..0027399d436 100644
--- a/Framework/CurveFitting/test/FABADAMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/FABADAMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidAPI/AlgorithmManager.h"
diff --git a/Framework/CurveFitting/test/FRConjugateGradientTest.h b/Framework/CurveFitting/test/FuncMinimizers/FRConjugateGradientTest.h
similarity index 96%
rename from Framework/CurveFitting/test/FRConjugateGradientTest.h
rename to Framework/CurveFitting/test/FuncMinimizers/FRConjugateGradientTest.h
index 34028a02dd1..f1a6841a08b 100644
--- a/Framework/CurveFitting/test/FRConjugateGradientTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/FRConjugateGradientTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/FRConjugateGradientMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h"
#include "MantidAPI/ICostFunction.h"
#include <sstream>
diff --git a/Framework/CurveFitting/test/LevenbergMarquardtMDTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
similarity index 99%
rename from Framework/CurveFitting/test/LevenbergMarquardtMDTest.h
rename to Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
index 93ae0e5dd0a..2c4a847c7a2 100644
--- a/Framework/CurveFitting/test/LevenbergMarquardtMDTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/CostFuncLeastSquares.h"
-#include "MantidCurveFitting/LevenbergMarquardtMDMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
#include "MantidCurveFitting/UserFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/LevenbergMarquardtTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
similarity index 99%
rename from Framework/CurveFitting/test/LevenbergMarquardtTest.h
rename to Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
index 30a690d98b9..79e3a84f078 100644
--- a/Framework/CurveFitting/test/LevenbergMarquardtTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/CostFuncLeastSquares.h"
-#include "MantidCurveFitting/LevenbergMarquardtMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h"
#include "MantidCurveFitting/UserFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/PRConjugateGradientTest.h b/Framework/CurveFitting/test/FuncMinimizers/PRConjugateGradientTest.h
similarity index 96%
rename from Framework/CurveFitting/test/PRConjugateGradientTest.h
rename to Framework/CurveFitting/test/FuncMinimizers/PRConjugateGradientTest.h
index b5a8a910e14..4208adb298f 100644
--- a/Framework/CurveFitting/test/PRConjugateGradientTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/PRConjugateGradientTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/PRConjugateGradientMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h"
#include "MantidAPI/ICostFunction.h"
#include <sstream>
diff --git a/Framework/CurveFitting/test/SimplexTest.h b/Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h
similarity index 96%
rename from Framework/CurveFitting/test/SimplexTest.h
rename to Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h
index 95811e16131..4a4c660f5e6 100644
--- a/Framework/CurveFitting/test/SimplexTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/SimplexMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h"
#include "MantidAPI/ICostFunction.h"
#include <sstream>
diff --git a/Framework/CurveFitting/test/GaussianTest.h b/Framework/CurveFitting/test/GaussianTest.h
index 91492c50f5a..e8d53898385 100644
--- a/Framework/CurveFitting/test/GaussianTest.h
+++ b/Framework/CurveFitting/test/GaussianTest.h
@@ -23,7 +23,7 @@
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
-#include "MantidCurveFitting/LevenbergMarquardtMDMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
#include "MantidCurveFitting/UserFunction.h"
#include "MantidCurveFitting/CostFuncLeastSquares.h"
diff --git a/Framework/CurveFitting/test/LeastSquaresTest.h b/Framework/CurveFitting/test/LeastSquaresTest.h
index 3f49a8cb110..2b38ad0b891 100644
--- a/Framework/CurveFitting/test/LeastSquaresTest.h
+++ b/Framework/CurveFitting/test/LeastSquaresTest.h
@@ -5,9 +5,9 @@
#include "MantidCurveFitting/CostFuncLeastSquares.h"
#include "MantidCurveFitting/CostFuncRwp.h"
-#include "MantidCurveFitting/SimplexMinimizer.h"
-#include "MantidCurveFitting/BFGS_Minimizer.h"
-#include "MantidCurveFitting/LevenbergMarquardtMDMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
#include "MantidCurveFitting/UserFunction.h"
#include "MantidCurveFitting/ExpDecay.h"
#include "MantidAPI/FunctionDomain1D.h"
diff --git a/Framework/CurveFitting/test/MultiDomainFunctionTest.h b/Framework/CurveFitting/test/MultiDomainFunctionTest.h
index f99acf8e0d5..09a65c88819 100644
--- a/Framework/CurveFitting/test/MultiDomainFunctionTest.h
+++ b/Framework/CurveFitting/test/MultiDomainFunctionTest.h
@@ -10,7 +10,7 @@
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/FrameworkManager.h"
#include "MantidCurveFitting/CostFuncLeastSquares.h"
-#include "MantidCurveFitting/LevenbergMarquardtMDMinimizer.h"
+#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidTestHelpers/FakeObjects.h"
--
GitLab
From 2f7d18e6146d0765dc926c7caba627ed633b373d Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Thu, 8 Oct 2015 09:46:23 +0100
Subject: [PATCH 061/223] Move FuncMinimizers to there own sub namesspace
re #13347
---
.../MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h | 2 ++
.../MantidCurveFitting/FuncMinimizers/DampingMinimizer.h | 7 ++++---
.../MantidCurveFitting/FuncMinimizers/DerivMinimizer.h | 2 ++
.../MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h | 9 +++++++++
.../FuncMinimizers/FRConjugateGradientMinimizer.h | 2 ++
.../FuncMinimizers/LevenbergMarquardtMDMinimizer.h | 2 ++
.../FuncMinimizers/LevenbergMarquardtMinimizer.h | 2 ++
.../FuncMinimizers/PRConjugateGradientMinimizer.h | 2 ++
.../MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h | 2 ++
.../FuncMinimizers/SteepestDescentMinimizer.h | 2 ++
.../CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp | 2 ++
.../CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp | 5 ++++-
.../CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp | 2 ++
.../CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp | 2 ++
.../src/FuncMinimizers/FRConjugateGradientMinimizer.cpp | 2 ++
.../src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp | 2 ++
.../src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp | 2 ++
.../src/FuncMinimizers/PRConjugateGradientMinimizer.cpp | 2 ++
.../CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp | 2 ++
.../src/FuncMinimizers/SteepestDescentMinimizer.cpp | 3 +++
Framework/CurveFitting/test/BSplineTest.h | 2 +-
Framework/CurveFitting/test/CompositeFunctionTest.h | 1 +
Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h | 1 +
.../test/FuncMinimizers/DampingMinimizerTest.h | 1 +
.../test/FuncMinimizers/FABADAMinimizerTest.h | 2 +-
.../test/FuncMinimizers/FRConjugateGradientTest.h | 1 +
.../test/FuncMinimizers/LevenbergMarquardtMDTest.h | 1 +
.../test/FuncMinimizers/LevenbergMarquardtTest.h | 1 +
.../test/FuncMinimizers/PRConjugateGradientTest.h | 1 +
Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h | 1 +
Framework/CurveFitting/test/GaussianTest.h | 2 +-
Framework/CurveFitting/test/LeastSquaresTest.h | 1 +
Framework/CurveFitting/test/MultiDomainFunctionTest.h | 2 +-
33 files changed, 65 insertions(+), 8 deletions(-)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
index 29c4efa07b5..d95d370ee8f 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Implementing Broyden-Fletcher-Goldfarb-Shanno (BFGS) algorithm
by wrapping the IFuncMinimizer interface around the GSL implementation of
this algorithm.
@@ -52,6 +53,7 @@ protected:
static Kernel::Logger &g_log;
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
index 4c8be89a8f2..ccadc518f5f 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
@@ -10,8 +10,9 @@
namespace Mantid {
namespace CurveFitting {
-
class CostFuncLeastSquares;
+namespace FuncMinimisers {
+
/**
Implements a least squares minimization algorithm with damping.
@@ -56,13 +57,13 @@ public:
private:
/// Pointer to the cost function. Must be the least squares.
- boost::shared_ptr<CostFuncLeastSquares> m_leastSquares;
+ boost::shared_ptr<CurveFitting::CostFuncLeastSquares> m_leastSquares;
/// Relative tolerance.
double m_relTol;
/// The damping mu parameter in the Levenberg-Marquardt method.
// double m_damping;
};
-
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
index f894626253e..bc3277e6df2 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
@@ -12,6 +12,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** A wrapper around the GSL functions implementing a minimizer using
derivatives.
Concrete classes must implement the getGSLMinimizerType() method.
@@ -94,6 +95,7 @@ private:
void initGSLMMin();
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
index 751e195e233..e7d341910c4 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
@@ -10,7 +10,14 @@
namespace Mantid {
namespace CurveFitting {
+/// Forward Declaration
class CostFuncLeastSquares;
+}
+}
+
+namespace Mantid {
+namespace CurveFitting {
+namespace FuncMinimisers {
/** FABADA : TODO: DESCRIPTION
@@ -88,6 +95,8 @@ private:
/// Maximum number of iterations
size_t m_max_iter;
};
+
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
index 0444ff7d159..8d516e72aa4 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Implementing Fletcher-Reeves flavour of the conjugate gradient algorithm
by wrapping the IFuncMinimizer interface around the GSL implementation of
this algorithm.
@@ -51,6 +52,7 @@ protected:
virtual const gsl_multimin_fdfminimizer_type *getGSLMinimizerType();
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
index 5d39606ed1f..7e6bc6cb39d 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
@@ -13,6 +13,7 @@ namespace CurveFitting {
class CostFuncLeastSquares;
+namespace FuncMinimisers {
/** Implementing Levenberg-Marquardt algorithm. Uses the normal system calculate
the corrections to the parameters. Expects a cost function that can evaluate
the value, the derivatives and the hessian matrix.
@@ -71,6 +72,7 @@ private:
std::vector<double> m_D;
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
index a5af8ed9882..0431a6327bd 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
@@ -11,6 +11,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Implementing Levenberg-Marquardt by wrapping the IFuncMinimizer interface
around the GSL implementation of this algorithm.
@@ -79,6 +80,7 @@ private:
double m_relError;
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
index 62e9fa704f4..1c3a308127c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Implementing Polak-Ribiere flavour of the conjugate gradient algorithm
by wrapping the IFuncMinimizer interface around the GSL implementation of
this algorithm.
@@ -49,6 +50,7 @@ protected:
virtual const gsl_multimin_fdfminimizer_type *getGSLMinimizerType();
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
index 5ca099ae2b2..b52f4823fd5 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Implementing Simplex by wrapping the IFuncMinimizer interface
around the GSL implementation of this algorithm.
@@ -87,6 +88,7 @@ private:
gsl_multimin_function gslContainer;
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
index bd0a8073218..9c24fb6e34d 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Implementing the steepest descent algorithm
by wrapping the IFuncMinimizer interface around the GSL implementation of
this algorithm.
@@ -51,6 +52,7 @@ protected:
static Kernel::Logger &g_log;
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp
index 42b3d6d1622..75067d25822 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
namespace {
/// static logger object
Kernel::Logger g_log("BFGS_Minimizer");
@@ -23,5 +24,6 @@ const gsl_multimin_fdfminimizer_type *BFGS_Minimizer::getGSLMinimizerType() {
return gsl_multimin_fdfminimizer_vector_bfgs2;
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
index e666a42209a..4a408b9789c 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
@@ -17,6 +17,8 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
+
namespace {
/// static logger
Kernel::Logger g_log("DampingMinimizer");
@@ -32,7 +34,7 @@ DampingMinimizer::DampingMinimizer(double relTol)
/// Initialize minimizer, i.e. pass a function to minimize.
void DampingMinimizer::initialize(API::ICostFunction_sptr function, size_t) {
- m_leastSquares = boost::dynamic_pointer_cast<CostFuncLeastSquares>(function);
+ m_leastSquares = boost::dynamic_pointer_cast<CurveFitting::CostFuncLeastSquares>(function);
if (!m_leastSquares) {
throw std::invalid_argument("Damping minimizer works only with least "
"squares. Different function was given.");
@@ -121,5 +123,6 @@ double DampingMinimizer::costFunctionVal() {
return m_leastSquares->val();
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
index aad022b04ae..d94c82151bc 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Used by the GSL to calculate the cost function.
* @param x :: Vector with parameters
@@ -173,5 +174,6 @@ void DerivMinimizer::setStopGradient(const double value) {
double DerivMinimizer::costFunctionVal() { return m_gslSolver->f; }
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
index 6020760e963..28c6983e668 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
@@ -31,6 +31,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
namespace {
// static logger object
@@ -641,5 +642,6 @@ void FABADAMinimizer::finalize() {
}
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
index 99fe0c35f12..f8decf01d8e 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
namespace {
/// static logger
Kernel::Logger g_log("FRConjugateGradientMinimizer");
@@ -28,5 +29,6 @@ FRConjugateGradientMinimizer::getGSLMinimizerType() {
return gsl_multimin_fdfminimizer_conjugate_fr;
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
index 7bfd0c587cb..b33c202472e 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
@@ -17,6 +17,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
namespace {
/// static logger object
Kernel::Logger g_log("LevenbergMarquardMD");
@@ -287,5 +288,6 @@ double LevenbergMarquardtMDMinimizer::costFunctionVal() {
return m_leastSquares->val();
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
index bb409af97fd..e19ad6d29a6 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
@@ -17,6 +17,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
namespace {
// Get a reference to the logger
Kernel::Logger g_log("LevenbergMarquardtMinimizer");
@@ -141,5 +142,6 @@ void LevenbergMarquardtMinimizer::calCovarianceMatrix(double epsrel,
gsl_multifit_covar(m_gslSolver->J, epsrel, covar);
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
index 88cf0bb80b5..8c4a96f8076 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
// clang-format off
///@cond nodoc
@@ -24,5 +25,6 @@ PRConjugateGradientMinimizer::getGSLMinimizerType() {
return gsl_multimin_fdfminimizer_conjugate_pr;
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
index 22d734e9d95..a1e42154285 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
namespace {
/// static logger
Kernel::Logger g_log("SimplexMinimizer");
@@ -117,5 +118,6 @@ void SimplexMinimizer::clearMemory() {
double SimplexMinimizer::costFunctionVal() { return m_gslSolver->fval; }
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp
index 9b52e228062..6bdc8eda40f 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp
@@ -10,6 +10,8 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
+
namespace {
// Get a reference to the logger
Kernel::Logger g_log("SteepestDescentMinimizer");
@@ -24,5 +26,6 @@ SteepestDescentMinimizer::getGSLMinimizerType() {
return gsl_multimin_fdfminimizer_steepest_descent;
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/test/BSplineTest.h b/Framework/CurveFitting/test/BSplineTest.h
index a7bc5c20670..d8f27154137 100644
--- a/Framework/CurveFitting/test/BSplineTest.h
+++ b/Framework/CurveFitting/test/BSplineTest.h
@@ -345,7 +345,7 @@ private:
boost::shared_ptr<CostFuncLeastSquares> costFun(new CostFuncLeastSquares);
costFun->setFittingFunction(bsp, domain, values);
- LevenbergMarquardtMDMinimizer s;
+ FuncMinimisers::LevenbergMarquardtMDMinimizer s;
s.initialize(costFun);
TS_ASSERT(s.minimize());
return costFun->val();
diff --git a/Framework/CurveFitting/test/CompositeFunctionTest.h b/Framework/CurveFitting/test/CompositeFunctionTest.h
index 99a33d192fc..30a8837c179 100644
--- a/Framework/CurveFitting/test/CompositeFunctionTest.h
+++ b/Framework/CurveFitting/test/CompositeFunctionTest.h
@@ -28,6 +28,7 @@
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
typedef Mantid::DataObjects::Workspace2D_sptr WS_type;
typedef Mantid::DataObjects::TableWorkspace_sptr TWS_type;
diff --git a/Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h b/Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h
index c7233dc2e79..0343e667771 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h
@@ -10,6 +10,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class BFGSTestCostFunction : public ICostFunction {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
index 9da641fd168..070031d0f6c 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
@@ -14,6 +14,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class DampingMinimizerTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
index 0027399d436..0ecece57b64 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
@@ -13,7 +13,7 @@
#include "MantidTestHelpers/FakeObjects.h"
#include "MantidKernel/Exception.h"
-using Mantid::CurveFitting::FABADAMinimizer;
+using Mantid::CurveFitting::FuncMinimisers::FABADAMinimizer;
using namespace Mantid::API;
using namespace Mantid;
using namespace Mantid::CurveFitting;
diff --git a/Framework/CurveFitting/test/FuncMinimizers/FRConjugateGradientTest.h b/Framework/CurveFitting/test/FuncMinimizers/FRConjugateGradientTest.h
index f1a6841a08b..12629afb2db 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/FRConjugateGradientTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/FRConjugateGradientTest.h
@@ -10,6 +10,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class FRConjugateGradientTestCostFunction : public ICostFunction {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
index 2c4a847c7a2..7ded8b10d3f 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
@@ -14,6 +14,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class LevenbergMarquardtMDTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
index 79e3a84f078..322868c5e23 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
@@ -14,6 +14,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class LevenbergMarquardtTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/PRConjugateGradientTest.h b/Framework/CurveFitting/test/FuncMinimizers/PRConjugateGradientTest.h
index 4208adb298f..6f250d93aa4 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/PRConjugateGradientTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/PRConjugateGradientTest.h
@@ -10,6 +10,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class PRConjugateGradientTestCostFunction : public ICostFunction {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h b/Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h
index 4a4c660f5e6..6edf55ccb18 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h
@@ -10,6 +10,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class SimplexTestCostFunction : public ICostFunction {
diff --git a/Framework/CurveFitting/test/GaussianTest.h b/Framework/CurveFitting/test/GaussianTest.h
index e8d53898385..1b59b3a3322 100644
--- a/Framework/CurveFitting/test/GaussianTest.h
+++ b/Framework/CurveFitting/test/GaussianTest.h
@@ -201,7 +201,7 @@ public:
costFun->setFittingFunction(fnWithBk, domain, values);
// TS_ASSERT_EQUALS(costFun->nParams(),3);
- LevenbergMarquardtMDMinimizer s;
+ FuncMinimisers::LevenbergMarquardtMDMinimizer s;
s.initialize(costFun);
TS_ASSERT(s.minimize());
diff --git a/Framework/CurveFitting/test/LeastSquaresTest.h b/Framework/CurveFitting/test/LeastSquaresTest.h
index 2b38ad0b891..a14f1e591c6 100644
--- a/Framework/CurveFitting/test/LeastSquaresTest.h
+++ b/Framework/CurveFitting/test/LeastSquaresTest.h
@@ -21,6 +21,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class LeastSquaresTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/MultiDomainFunctionTest.h b/Framework/CurveFitting/test/MultiDomainFunctionTest.h
index 09a65c88819..434d3e5c518 100644
--- a/Framework/CurveFitting/test/MultiDomainFunctionTest.h
+++ b/Framework/CurveFitting/test/MultiDomainFunctionTest.h
@@ -162,7 +162,7 @@ public:
costFun->setFittingFunction(multi, domain, values);
TS_ASSERT_EQUALS(costFun->nParams(), 6);
- LevenbergMarquardtMDMinimizer s;
+ FuncMinimisers::LevenbergMarquardtMDMinimizer s;
s.initialize(costFun);
TS_ASSERT(s.minimize());
--
GitLab
From 0ae726e1abeac41433ee9bf24d7df923ad2e4268 Mon Sep 17 00:00:00 2001
From: Marina Ganeva <m.ganeva@fz-juelich.de>
Date: Thu, 8 Oct 2015 11:32:17 +0200
Subject: [PATCH 062/223] Algorithm to merge TOFTOF runs.
---
.../plugins/algorithms/TOFTOFMergeRuns.py | 190 ++++++++++++++++++
.../plugins/algorithms/mlzutils.py | 66 +++++-
.../python/plugins/algorithms/CMakeLists.txt | 1 +
.../plugins/algorithms/TOFTOFMergeRunsTest.py | 93 +++++++++
docs/source/algorithms/TOFTOFMergeRuns-v1.rst | 150 ++++++++++++++
5 files changed, 495 insertions(+), 5 deletions(-)
create mode 100644 Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py
create mode 100644 Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFMergeRunsTest.py
create mode 100644 docs/source/algorithms/TOFTOFMergeRuns-v1.rst
diff --git a/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py b/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py
new file mode 100644
index 00000000000..8a78f121f11
--- /dev/null
+++ b/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py
@@ -0,0 +1,190 @@
+from mantid.kernel import Direction, StringArrayProperty, StringArrayLengthValidator
+from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty, WorkspaceGroup
+import mantid.simpleapi as api
+import numpy as np
+from dateutil.parser import parse
+import mlzutils
+
+
+class TOFTOFMergeRuns(PythonAlgorithm):
+ """ Clean the Sample Logs of workspace after merging for TOFTOF instrument
+ """
+
+ mandatory_properties = ['channel_width', 'chopper_ratio', 'chopper_speed', 'Ei', 'wavelength', 'full_channels', 'EPP']
+ optional_properties = ['temperature', 'run_title']
+ properties_to_merge = ['temperature', 'monitor_counts', 'duration', 'run_number', 'run_start', 'run_end']
+ must_have_properties = ['monitor_counts', 'duration', 'run_number', 'run_start', 'run_end']
+
+ def __init__(self):
+ """
+ Init
+ """
+ PythonAlgorithm.__init__(self)
+ self.wsNames = []
+
+ def category(self):
+ """ Return category
+ """
+ return "PythonAlgorithms\\MLZ\\TOFTOF;Utility"
+
+ def name(self):
+ """ Return summary
+ """
+ return "TOFTOFMergeRuns"
+
+ def summary(self):
+ return "Merge runs and the sample logs."
+
+ def PyInit(self):
+ """ Declare properties
+ """
+ validator = StringArrayLengthValidator()
+ validator.setLengthMin(1)
+ self.declareProperty(StringArrayProperty(name="InputWorkspaces", direction=Direction.Input, validator=validator),
+ doc="Comma separated list of workspaces or groups of workspaces.")
+ self.declareProperty(WorkspaceProperty("OutputWorkspace", "", direction=Direction.Output),
+ doc="Name of the workspace that will contain the merged workspaces.")
+ return
+
+ def _validate_input(self):
+ """
+ Checks for the valid input:
+ all given workspaces and/or groups must exist
+ gets names of the grouped workspaces
+ """
+ workspaces = self.getProperty("InputWorkspaces").value
+ mlzutils.ws_exist(workspaces, self.log())
+ if len(workspaces) < 1:
+ message = "List of workspaces is empty. Nothing to merge."
+ self.log().error(message)
+ raise RuntimeError(message)
+ for wsname in workspaces:
+ wks = api.AnalysisDataService.retrieve(wsname)
+ if isinstance(wks, WorkspaceGroup):
+ self.wsNames.extend(wks.getNames())
+ else:
+ self.wsNames.append(wsname)
+
+ def _can_merge(self):
+ """
+ Checks whether given workspaces can be merged
+ """
+ # mandatory properties must be identical
+ mlzutils.compare_mandatory(self.wsNames, self.mandatory_properties, self.log())
+
+ # timing (x-axis binning) must match
+ # is it possible to use WorkspaceHelpers::matchingBins from python?
+ self.timingsMatch(self.wsNames)
+
+ # Check sample logs for must have properties
+ for wsname in self.wsNames:
+ wks = api.AnalysisDataService.retrieve(wsname)
+ run = wks.getRun()
+ for prop in self.must_have_properties:
+ if not run.hasProperty(prop):
+ message = "Error: Workspace " + wsname + " does not have property " + prop +\
+ ". Cannot merge."
+ self.log().error(message)
+ raise RuntimeError(message)
+
+ # warnig if optional properties are not identical must be given
+ ws1 = api.AnalysisDataService.retrieve(self.wsNames[0])
+ run1 = ws1.getRun()
+ for wsname in self.wsNames[1:]:
+ wks = api.AnalysisDataService.retrieve(wsname)
+ run = wks.getRun()
+ mlzutils.compare_properties(run1, run, self.optional_properties, self.log(), tolerance=0.01)
+ return True
+
+ def PyExec(self):
+ """ Main execution body
+ """
+ # get list of input workspaces
+ self._validate_input()
+ workspaceCount = len(self.wsNames)
+ self.log().information("Workspaces to merge " + str(workspaceCount))
+ wsOutput = self.getPropertyValue("OutputWorkspace")
+
+ if workspaceCount < 2:
+ api.CloneWorkspace(InputWorkspace=self.wsNames[0], OutputWorkspace=wsOutput)
+ self.log().warning("Cannot merge one workspace. Clone is produced.")
+ return
+
+ # check whether given workspaces can be merged
+ self._can_merge()
+
+ # delete output workspace if it exists
+ if api.mtd.doesExist(wsOutput):
+ api.DeleteWorkspace(Workspace=wsOutput)
+
+ # Merge runs
+ api.MergeRuns(InputWorkspaces=self.wsNames, OutputWorkspace=wsOutput)
+
+ # Merge logs
+ # MergeRuns by default copies all logs from the first workspace
+ pdict = {}
+ for prop in self.properties_to_merge:
+ pdict[prop] = []
+
+ for wsname in self.wsNames:
+ wks = api.AnalysisDataService.retrieve(wsname)
+ run = wks.getRun()
+ for prop in self.properties_to_merge:
+ if run.hasProperty(prop):
+ pdict[prop].append(run.getProperty(prop).value)
+
+ # take average for temperatures
+ nentries = len(pdict['temperature'])
+ if nentries > 0:
+ temps = [float(temp) for temp in pdict['temperature']]
+ tmean = sum(temps)/nentries
+ api.AddSampleLog(Workspace=wsOutput, LogName='temperature', LogText=str(tmean),
+ LogType='Number', LogUnit='K')
+ # sum monitor counts
+ mcounts = [int(mco) for mco in pdict['monitor_counts']]
+ # check for zero monitor counts
+ zeros = np.where(np.array(mcounts) == 0)[0]
+ if len(zeros) > 0:
+ for index in zeros:
+ self.log().warning("Workspace " + self.wsNames[index] + " has zero monitor counts.")
+ # create sample log
+ api.AddSampleLog(Workspace=wsOutput, LogName='monitor_counts', LogText=str(sum(mcounts)),
+ LogType='Number')
+ # sum durations
+ durations = [int(dur) for dur in pdict['duration']]
+ api.AddSampleLog(Workspace=wsOutput, LogName='duration', LogText=str(sum(durations)),
+ LogType='Number', LogUnit='s')
+ # get minimal run_start
+ fmt = "%Y-%m-%dT%H:%M:%S%z"
+ run_start = [parse(entry) for entry in pdict['run_start']]
+ api.AddSampleLog(Workspace=wsOutput, LogName='run_start',
+ LogText=min(run_start).strftime(fmt), LogType='String')
+ # get maximal run_end
+ run_end = [parse(entry) for entry in pdict['run_end']]
+ api.AddSampleLog(Workspace=wsOutput, LogName='run_end',
+ LogText=max(run_end).strftime(fmt), LogType='String')
+ # list of run_numbers
+ api.AddSampleLog(Workspace=wsOutput, LogName='run_number',
+ LogText=str(pdict['run_number']), LogType='String')
+
+ self.setProperty("OutputWorkspace", wsOutput)
+
+ def timingsMatch(self, wsNames):
+ """
+ :param wsNames:
+ :return:
+ """
+ for i in range(len(wsNames)):
+ leftWorkspace = wsNames[i]
+ rightWorkspace = wsNames[i+1]
+ leftXData = api.mtd[leftWorkspace].dataX(0)
+ rightXData = api.mtd[rightWorkspace].dataX(0)
+ leftDeltaX = leftXData[0] - leftXData[1]
+ rightDeltaX = rightXData[0] - rightXData[1]
+ if abs(leftDeltaX - rightDeltaX) >= 1e-4 or abs(rightXData[0] - leftXData[0]) >= 1e-4:
+ raise RuntimeError("Timings don't match")
+ else:
+ return True
+
+# Register algorithm with Mantid.
+AlgorithmFactory.subscribe(TOFTOFMergeRuns)
diff --git a/Framework/PythonInterface/plugins/algorithms/mlzutils.py b/Framework/PythonInterface/plugins/algorithms/mlzutils.py
index 11929ab069a..3b69302522b 100644
--- a/Framework/PythonInterface/plugins/algorithms/mlzutils.py
+++ b/Framework/PythonInterface/plugins/algorithms/mlzutils.py
@@ -55,7 +55,7 @@ def ws_exist(wslist, logger):
return True
-def compare_properties(lhs_run, rhs_run, plist, logger):
+def compare_properties(lhs_run, rhs_run, plist, logger, tolerance=5e-3):
"""
checks whether properties match in the given runs, produces warnings
@param lhs_run Left-hand-side run
@@ -65,11 +65,16 @@ def compare_properties(lhs_run, rhs_run, plist, logger):
"""
lhs_title = ""
rhs_title = ""
- if lhs_run.hasProperty('run_title'):
+ if lhs_run.hasProperty('run_title') and rhs_run.hasProperty('run_title'):
lhs_title = lhs_run.getProperty('run_title').value
- if rhs_run.hasProperty('run_title'):
rhs_title = rhs_run.getProperty('run_title').value
+ # for TOFTOF run_titles can be identical
+ if lhs_title == rhs_title:
+ if lhs_run.hasProperty('run_number') and rhs_run.hasProperty('run_number'):
+ lhs_title = str(lhs_run.getProperty('run_number').value)
+ rhs_title = str(rhs_run.getProperty('run_number').value)
+
for property_name in plist:
if lhs_run.hasProperty(property_name) and rhs_run.hasProperty(property_name):
lhs_property = lhs_run.getProperty(property_name)
@@ -81,8 +86,8 @@ def compare_properties(lhs_run, rhs_run, plist, logger):
lhs_title + ": " + lhs_property.value + ", but " + \
rhs_title + ": " + rhs_property.value
logger.warning(message)
- if lhs_property.type == 'number':
- if abs(lhs_property.value - rhs_property.value) > 5e-3:
+ elif lhs_property.type == 'number':
+ if abs(lhs_property.value - rhs_property.value) > tolerance:
message = "Property " + property_name + " does not match! " + \
lhs_title + ": " + str(lhs_property.value) + ", but " + \
rhs_title + ": " + str(rhs_property.value)
@@ -98,3 +103,54 @@ def compare_properties(lhs_run, rhs_run, plist, logger):
lhs_title + " or " + rhs_title + " - skipping comparison."
logger.warning(message)
return
+
+
+def compare_mandatory(wslist, plist, logger, tolerance=0.01):
+ """
+ Compares properties which are required to be the same.
+ Produces error message and throws exception if difference is observed
+ or if one of the sample logs is not found.
+ Important: exits after the first difference is observed. No further check is performed.
+ @param wslist List of workspaces
+ @param plist List of properties to compare
+ @param logger Logger self.log()
+ @param tolerance Tolerance for comparison of the double values.
+ """
+ # retrieve the workspaces, form dictionary {wsname: run}
+ runs = {}
+ for wsname in wslist:
+ wks = api.AnalysisDataService.retrieve(wsname)
+ runs[wsname] = wks.getRun()
+
+ for prop in plist:
+ properties = []
+ for wsname in wslist:
+ run = runs[wsname]
+ if not run.hasProperty(prop):
+ message = "Workspace " + wsname + " does not have sample log " + prop
+ logger.error(message)
+ raise RuntimeError(message)
+
+ curprop = run.getProperty(prop)
+ if curprop.type == 'string':
+ properties.append(curprop.value)
+ elif curprop.type == 'number':
+ properties.append(int(curprop.value/tolerance))
+ else:
+ message = "Unknown type " + str(curprop.type) + " for the sample log " +\
+ prop + " in the workspace " + wsname
+ logger.error(message)
+ raise RuntimeError(message)
+ # this should never happen, but lets check
+ nprop = len(properties)
+ if nprop != len(wslist):
+ message = "Error. Number of properties " + str(nprop) + " for property " + prop +\
+ " is not equal to number of workspaces " + str(len(wslist))
+ logger.error(message)
+ raise RuntimeError(message)
+ pvalue = properties[0]
+ if properties.count(pvalue) != nprop:
+ message = "Sample log " + prop + " is not identical in the given list of workspaces. \n" +\
+ "Workspaces: " + ", ".join(wslist) + "\n Values: " + str(properties)
+ logger.error(message)
+ raise RuntimeError(message)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt b/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
index bb68b040a2e..c12c040cddb 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
@@ -75,6 +75,7 @@ set ( TEST_PY_FILES
UpdatePeakParameterTableValueTest.py
SANSSubtractTest.py
TimeSliceTest.py
+ TOFTOFMergeRunsTest.py
TOSCABankCorrectionTest.py
TransformToIqtTest.py
ExportSampleLogsToCSVFileTest.py
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFMergeRunsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFMergeRunsTest.py
new file mode 100644
index 00000000000..3e0b4dac93a
--- /dev/null
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFMergeRunsTest.py
@@ -0,0 +1,93 @@
+import unittest
+from mantid.simpleapi import Load, DeleteWorkspace, AddSampleLogMultiple, \
+ DeleteLog
+from testhelpers import run_algorithm
+from mantid.api import AnalysisDataService
+
+
+class TOFTOFMergeRunsTest(unittest.TestCase):
+
+ def setUp(self):
+ input_ws = Load(Filename="TOFTOFTestdata.nxs")
+ self._input_ws_base = input_ws
+ self._input_good = input_ws
+ AddSampleLogMultiple(Workspace=self._input_good, LogNames=['run_number'], LogValues=[001])
+
+ self._input_bad_entry = input_ws+0
+ # remove a compulsory entry in Logs
+ DeleteLog(self._input_bad_entry, 'duration')
+
+ self._input_bad_value = input_ws+0
+ AddSampleLogMultiple(Workspace=self._input_bad_value, LogNames=['wavelength'], LogValues=[0.])
+
+ def test_success(self):
+ OutputWorkspaceName = "output_ws"
+ Inputws = "%s, %s" % (self._input_ws_base.name(), self._input_good.name())
+
+ alg_test = run_algorithm("TOFTOFMergeRuns",
+ InputWorkspaces=Inputws,
+ OutputWorkspace=OutputWorkspaceName)
+ self.assertTrue(alg_test.isExecuted())
+
+ wsoutput = AnalysisDataService.retrieve(OutputWorkspaceName)
+
+ run_out = wsoutput.getRun()
+ run_in = self._input_ws_base.getRun()
+ self.assertEqual(run_out.getLogData('wavelength').value, run_in.getLogData('wavelength').value)
+ self.assertEqual(run_out.getLogData('chopper_speed').value, run_in.getLogData('chopper_speed').value)
+ self.assertEqual(run_out.getLogData('chopper_ratio').value, run_in.getLogData('chopper_ratio').value)
+ self.assertEqual(run_out.getLogData('channel_width').value, run_in.getLogData('channel_width').value)
+ self.assertEqual(run_out.getLogData('Ei').value, run_in.getLogData('Ei').value)
+ self.assertEqual(run_out.getLogData('EPP').value, run_in.getLogData('EPP').value)
+ self.assertEqual(run_out.getLogData('proposal_number').value, run_in.getLogData('proposal_number').value)
+ self.assertEqual(run_out.getLogData('proposal_title').value, run_in.getLogData('proposal_title').value)
+ self.assertEqual(run_out.getLogData('mode').value, run_in.getLogData('mode').value)
+ self.assertEqual(run_out.getLogData('experiment_team').value, run_in.getLogData('experiment_team').value)
+
+ run_in_good = self._input_good.getRun()
+ self.assertEqual(run_out.getLogData('run_number').value,
+ str([run_in.getLogData('run_number').value, run_in_good.getLogData('run_number').value]))
+
+ self.assertEqual(run_out.getLogData('temperature').value, float(run_in.getLogData('temperature').value))
+ self.assertEqual(run_out.getLogData('duration').value,
+ float(run_in.getLogData('duration').value) + float(run_in_good.getLogData('duration').value))
+ self.assertEqual(run_out.getLogData('run_start').value, run_in.getLogData('run_start').value)
+ self.assertEqual(run_out.getLogData('run_end').value, run_in.getLogData('run_end').value)
+ self.assertEqual(run_out.getLogData('full_channels').value, run_in.getLogData('full_channels').value)
+ self.assertEqual(run_out.getLogData('monitor_counts').value, 2*int(run_in.getLogData('monitor_counts').value))
+ # Dimension output workspace
+ self.assertEqual(wsoutput.getNumberHistograms(), self._input_ws_base.getNumberHistograms())
+ self.assertEqual(wsoutput.blocksize(), self._input_ws_base.blocksize())
+ # check instrument
+ self.assertEqual(wsoutput.getInstrument().getName(), "TOFTOF")
+
+ AnalysisDataService.remove("output_ws")
+
+ def test_failed(self):
+ """
+ Failed tests because of missing keys or different values
+ """
+ OutputWorkspaceName = "output_ws"
+ Inputws_badvalue = "%s, %s" % (self._input_ws_base.name(), self._input_bad_value.name())
+ self.assertRaises(RuntimeError,
+ run_algorithm, 'TOFTOFMergeRuns',
+ InputWorkspaces=Inputws_badvalue,
+ OutputWorkspace=OutputWorkspaceName,
+ rethrow=True)
+
+ Inputws_badentry = "%s, %s" % (self._input_ws_base.name(), self._input_bad_entry.name())
+ self.assertRaises(RuntimeError,
+ run_algorithm, 'TOFTOFMergeRuns',
+ InputWorkspaces=Inputws_badentry,
+ OutputWorkspace=OutputWorkspaceName,
+ rethrow=True)
+
+ if "output_ws" is not None:
+ AnalysisDataService.remove("output_ws")
+
+ def cleanUp(self):
+ if self._input_ws_base is not None:
+ DeleteWorkspace(self._input_ws_base)
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/docs/source/algorithms/TOFTOFMergeRuns-v1.rst b/docs/source/algorithms/TOFTOFMergeRuns-v1.rst
new file mode 100644
index 00000000000..25aec61d5f1
--- /dev/null
+++ b/docs/source/algorithms/TOFTOFMergeRuns-v1.rst
@@ -0,0 +1,150 @@
+.. algorithm::
+
+.. summary::
+
+.. alias::
+
+.. properties::
+
+Description
+-----------
+
+Merges workspaces from a given list using :ref:`algm-MergeRuns` algorithm. Sample logs are merged in the following way.
+
++---------++-------------------------------+
+| Type of || Parameter |
+| merging || |
++=========++===============================+
+| Average || temperature |
++---------++-------------------------------+
+| Minimum || run_start |
++---------++-------------------------------+
+| Maximum || run_end |
++---------++-------------------------------+
+| Summed || duration, monitor_counts |
++---------++-------------------------------+
+| Listed || run_number |
++---------++-------------------------------+
+
+Other sample logs are copied from the first workspace.
+
+**Valid input workspaces**
+
+Algorithm accepts both, matrix workspaces and groups of matrix workspaces. Valid input workspaces
+
+- must have following sample logs: *channel_width*, *chopper_ratio*, *chopper_speed*, *Ei*, *wavelength*, *full_channels*, *EPP*, *monitor_counts*, *duration*, *run_number*, *run_start*, *run_end*
+- must have identical following sample logs: *channel_width*, *chopper_ratio*, *chopper_speed*, *Ei*, *wavelength*, *full_channels*, *EPP*. Tolerance for double comparison is 0.01.
+- must have common binning for all its spectra for each input workspace.
+
+If these conditions are not fulfilled, algorithm terminates with an error message.
+
+Sample log *temperature* is optional. If it is present in some of input workspaces, mean value will be calculated. Otherwise, no *temperature* sample log will be created in the output workspace.
+
+Algorithm will produce warning if
+- *temperature* and *run_title* sample logs are not present or different,
+- some of input workspaces have zero monitor counts.
+
+Usage
+-----
+
+**Example - Merge list of workspaces**
+
+.. testcode:: ExTOFTOFMergeRuns2ws
+
+ ws1 = LoadMLZ(Filename='TOFTOFTestdata.nxs')
+ ws2 = LoadMLZ(Filename='TOFTOFTestdata.nxs')
+
+ # change sample logs for a second workspace, not needed for real workspaces
+ lognames = 'temperature,run_start,run_end,monitor_counts,run_number'
+ logvalues = '296.15,2013-07-28T11:32:19+0053,2013-07-28T12:32:19+0053,145145,TOFTOFTestdata2'
+ AddSampleLogMultiple(ws2, lognames, logvalues)
+
+ # Input = list of workspaces
+ ws3 = TOFTOFMergeRuns('ws1,ws2')
+
+ # Temperature
+ print "Temperature of experiment for 1st workspace (in K): ", ws1.getRun().getLogData('temperature').value
+ print "Temperature of experiment for 2nd workspace (in K): ", ws2.getRun().getLogData('temperature').value
+ print "Temperature of experiment for merged workspaces = average over workspaces (in K): ", ws3.getRun().getLogData('temperature').value
+
+ # Duration
+ print "Duration of experiment for 1st workspace (in s): ", ws1.getRun().getLogData('duration').value
+ print "Duration of experiment for 2nd workspace (in s): ", ws2.getRun().getLogData('duration').value
+ print "Duration of experiment for merged workspaces = sum of all durations (in s): ", ws3.getRun().getLogData('duration').value
+
+ # Run start
+ print "Start of experiment for 1st workspace: ", ws1.getRun().getLogData('run_start').value
+ print "Start of experiment for 2nd workspace: ", ws2.getRun().getLogData('run_start').value
+ print "Start of experiment for merged workspaces = miminum of all workspaces: ", ws3.getRun().getLogData('run_start').value
+
+ # Run end
+ print "End of experiment for 1st workspace: ", ws1.getRun().getLogData('run_end').value
+ print "End of experiment for 2nd workspace: ", ws2.getRun().getLogData('run_end').value
+ print "End of experiment for merged workspaces = maximum of all workspaces: ", ws3.getRun().getLogData('run_end').value
+
+ # Run number
+ print "Run number for 1st workspace: ", ws1.getRun().getLogData('run_number').value
+ print "Run number for 2nd workspace: ", ws2.getRun().getLogData('run_number').value
+ print "Run number for merged workspaces = list of all workspaces: ", ws3.getRun().getLogData('run_number').value
+
+ # Monitor counts
+ print "Monitor counts for 1st workspace: ", ws1.getRun().getLogData('monitor_counts').value
+ print "Monitor counts for 2nd workspace: ", ws2.getRun().getLogData('monitor_counts').value
+ print "Monitor counts for merged workspaces = sum over all workspaces: ", ws3.getRun().getLogData('monitor_counts').value
+
+
+Output:
+
+.. testoutput:: ExTOFTOFMergeRuns2ws
+
+ Temperature of experiment for 1st workspace (in K): 294.149414
+ Temperature of experiment for 2nd workspace (in K): 296.15
+ Temperature of experiment for merged workspaces = average over workspaces (in K): 295.149707
+ Duration of experiment for 1st workspace (in s): 3601
+ Duration of experiment for 2nd workspace (in s): 3601
+ Duration of experiment for merged workspaces = sum of all durations (in s): 7202
+ Start of experiment for 1st workspace: 2013-07-28T10:32:19+0053
+ Start of experiment for 2nd workspace: 2013-07-28T11:32:19+0053
+ Start of experiment for merged workspaces = miminum of all workspaces: 2013-07-28T10:32:19+0053
+ End of experiment for 1st workspace: 2013-07-28T11:32:20+0053
+ End of experiment for 2nd workspace: 2013-07-28T12:32:19+0053
+ End of experiment for merged workspaces = maximum of all workspaces: 2013-07-28T12:32:19+0053
+ Run number for 1st workspace: TOFTOFTestdata
+ Run number for 2nd workspace: TOFTOFTestdata2
+ Run number for merged workspaces = list of all workspaces: ['TOFTOFTestdata', 'TOFTOFTestdata2']
+ Monitor counts for 1st workspace: 136935
+ Monitor counts for 2nd workspace: 145145
+ Monitor counts for merged workspaces = sum over all workspaces: 282080
+
+**Example - Merge group of workspaces**
+
+.. testcode:: ExTOFTOFMergeRunsGroup
+
+ ws1 = LoadMLZ(Filename='TOFTOFTestdata.nxs')
+ ws2 = LoadMLZ(Filename='TOFTOFTestdata.nxs')
+
+ # change sample logs for a second workspace, not needed for real workspaces
+ lognames = 'temperature,run_start,run_end,monitor_counts,run_number'
+ logvalues = '296.15,2013-07-28T11:32:19+0053,2013-07-28T12:32:19+0053,145145,TOFTOFTestdata2'
+ AddSampleLogMultiple(ws2, lognames, logvalues)
+
+ group=GroupWorkspaces('ws1,ws2')
+ groupmerged=TOFTOFMergeRuns(group)
+ print "Monitor counts for 1st workspace: ", ws1.getRun().getLogData('monitor_counts').value
+ print "Monitor counts for 2nd workspace: ", ws2.getRun().getLogData('monitor_counts').value
+ print "Monitor counts for merged workspaces = sum over all workspaces: ", groupmerged.getRun().getLogData('monitor_counts').value
+
+Output:
+
+.. testoutput:: ExTOFTOFMergeRunsGroup
+
+ Monitor counts for 1st workspace: 136935
+ Monitor counts for 2nd workspace: 145145
+ Monitor counts for merged workspaces = sum over all workspaces: 282080
+
+.. categories::
+
+.. sourcelink::
+
+
+
--
GitLab
From 0ff49eb87012e822ee10b915f48ade8ea7dafce0 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Thu, 8 Oct 2015 11:12:05 +0100
Subject: [PATCH 063/223] Move Cost Functions to a sub directory
re #13347
---
Framework/CurveFitting/CMakeLists.txt | 76 +++++++++----------
.../{ => CostFunctions}/CostFuncFitting.h | 0
.../CostFuncIgnorePosPeaks.h | 0
.../CostFuncLeastSquares.h | 2 +-
.../{ => CostFunctions}/CostFuncRwp.h | 2 +-
.../CostFuncUnweightedLeastSquares.h | 2 +-
.../inc/MantidCurveFitting/GSLFunctions.h | 2 +-
.../inc/MantidCurveFitting/SeqDomain.h | 4 +-
.../{ => CostFunctions}/CostFuncFitting.cpp | 2 +-
.../CostFuncIgnorePosPeaks.cpp | 2 +-
.../CostFuncLeastSquares.cpp | 2 +-
.../src/{ => CostFunctions}/CostFuncRwp.cpp | 2 +-
.../CostFuncUnweightedLeastSquares.cpp | 2 +-
.../LevenbergMarquardtMinimizer.cpp | 2 +-
Framework/CurveFitting/test/BSplineTest.h | 2 +-
.../CostFuncUnweightedLeastSquaresTest.h | 2 +-
.../{ => CostFunctions}/LeastSquaresTest.h | 4 +-
.../FuncMinimizers/DampingMinimizerTest.h | 2 +-
.../FuncMinimizers/LevenbergMarquardtMDTest.h | 2 +-
.../FuncMinimizers/LevenbergMarquardtTest.h | 2 +-
Framework/CurveFitting/test/GaussianTest.h | 2 +-
21 files changed, 58 insertions(+), 58 deletions(-)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => CostFunctions}/CostFuncFitting.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => CostFunctions}/CostFuncIgnorePosPeaks.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => CostFunctions}/CostFuncLeastSquares.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => CostFunctions}/CostFuncRwp.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => CostFunctions}/CostFuncUnweightedLeastSquares.h (96%)
rename Framework/CurveFitting/src/{ => CostFunctions}/CostFuncFitting.cpp (98%)
rename Framework/CurveFitting/src/{ => CostFunctions}/CostFuncIgnorePosPeaks.cpp (97%)
rename Framework/CurveFitting/src/{ => CostFunctions}/CostFuncLeastSquares.cpp (99%)
rename Framework/CurveFitting/src/{ => CostFunctions}/CostFuncRwp.cpp (97%)
rename Framework/CurveFitting/src/{ => CostFunctions}/CostFuncUnweightedLeastSquares.cpp (97%)
rename Framework/CurveFitting/test/{ => CostFunctions}/CostFuncUnweightedLeastSquaresTest.h (97%)
rename Framework/CurveFitting/test/{ => CostFunctions}/LeastSquaresTest.h (98%)
diff --git a/Framework/CurveFitting/CMakeLists.txt b/Framework/CurveFitting/CMakeLists.txt
index 767ef45f733..2d7cf8e07bc 100644
--- a/Framework/CurveFitting/CMakeLists.txt
+++ b/Framework/CurveFitting/CMakeLists.txt
@@ -5,7 +5,6 @@ set ( SRC_FILES
#src/RefinePowderInstrumentParameters.cpp
src/Abragam.cpp
src/AugmentedLagrangianOptimizer.cpp
- src/FuncMinimizers/BFGS_Minimizer.cpp
src/BSpline.cpp
src/BackToBackExponential.cpp
src/BackgroundFunction.cpp
@@ -23,14 +22,12 @@ set ( SRC_FILES
src/ConvertToYSpace.cpp
src/Convolution.cpp
src/ConvolveWorkspaces.cpp
- src/CostFuncFitting.cpp
- src/CostFuncLeastSquares.cpp
- src/CostFuncRwp.cpp
- src/CostFuncUnweightedLeastSquares.cpp
+ src/CostFunctions/CostFuncFitting.cpp
+ src/CostFunctions/CostFuncLeastSquares.cpp
+ src/CostFunctions/CostFuncRwp.cpp
+ src/CostFunctions/CostFuncUnweightedLeastSquares.cpp
src/CubicSpline.cpp
- src/FuncMinimizers/DampingMinimizer.cpp
src/DeltaFunction.cpp
- src/FuncMinimizers/DerivMinimizer.cpp
src/DiffRotDiscreteCircle.cpp
src/DiffSphere.cpp
src/DynamicKuboToyabe.cpp
@@ -40,14 +37,22 @@ set ( SRC_FILES
src/ExpDecay.cpp
src/ExpDecayMuon.cpp
src/ExpDecayOsc.cpp
- src/FuncMinimizers/FABADAMinimizer.cpp
- src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
src/Fit.cpp
src/Fit1D.cpp
src/FitMW.cpp
src/FitPowderDiffPeaks.cpp
src/FlatBackground.cpp
src/FullprofPolynomial.cpp
+ src/FuncMinimizers/BFGS_Minimizer.cpp
+ src/FuncMinimizers/DampingMinimizer.cpp
+ src/FuncMinimizers/DerivMinimizer.cpp
+ src/FuncMinimizers/FABADAMinimizer.cpp
+ src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
+ src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
+ src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
+ src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
+ src/FuncMinimizers/SimplexMinimizer.cpp
+ src/FuncMinimizers/SteepestDescentMinimizer.cpp
src/FunctionDomain1DSpectrumCreator.cpp
src/GSLFunctions.cpp
src/GSLMatrix.cpp
@@ -63,8 +68,6 @@ set ( SRC_FILES
src/LatticeFunction.cpp
src/LeBailFit.cpp
src/LeBailFunction.cpp
- src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
- src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
src/LinearBackground.cpp
src/LogNormal.cpp
src/Lorentzian.cpp
@@ -74,7 +77,6 @@ set ( SRC_FILES
src/MuonFInteraction.cpp
src/NeutronBk2BkExpConvPVoigt.cpp
src/NormaliseByPeakArea.cpp
- src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
src/ParDomain.cpp
src/ParameterEstimator.cpp
src/PawleyFit.cpp
@@ -94,7 +96,6 @@ set ( SRC_FILES
src/SeqDomain.cpp
src/SeqDomainSpectrumCreator.cpp
src/SimpleChebfun.cpp
- src/FuncMinimizers/SimplexMinimizer.cpp
src/SpecialFunctionHelper.cpp
src/SplineBackground.cpp
src/SplineInterpolation.cpp
@@ -102,7 +103,6 @@ set ( SRC_FILES
src/StaticKuboToyabe.cpp
src/StaticKuboToyabeTimesExpDecay.cpp
src/StaticKuboToyabeTimesGausDecay.cpp
- src/FuncMinimizers/SteepestDescentMinimizer.cpp
src/StretchExp.cpp
src/StretchExpMuon.cpp
src/TabulatedFunction.cpp
@@ -126,7 +126,6 @@ set ( INC_FILES
#inc/MantidCurveFitting/RefinePowderInstrumentParameters.h
inc/MantidCurveFitting/Abragam.h
inc/MantidCurveFitting/AugmentedLagrangianOptimizer.h
- inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
inc/MantidCurveFitting/BSpline.h
inc/MantidCurveFitting/BackToBackExponential.h
inc/MantidCurveFitting/BackgroundFunction.h
@@ -144,14 +143,12 @@ set ( INC_FILES
inc/MantidCurveFitting/ConvertToYSpace.h
inc/MantidCurveFitting/Convolution.h
inc/MantidCurveFitting/ConvolveWorkspaces.h
- inc/MantidCurveFitting/CostFuncFitting.h
- inc/MantidCurveFitting/CostFuncLeastSquares.h
- inc/MantidCurveFitting/CostFuncRwp.h
- inc/MantidCurveFitting/CostFuncUnweightedLeastSquares.h
+ inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
+ inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
+ inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
+ inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
inc/MantidCurveFitting/CubicSpline.h
- inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
inc/MantidCurveFitting/DeltaFunction.h
- inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
inc/MantidCurveFitting/DiffRotDiscreteCircle.h
inc/MantidCurveFitting/DiffSphere.h
inc/MantidCurveFitting/DllConfig.h
@@ -162,14 +159,22 @@ set ( INC_FILES
inc/MantidCurveFitting/ExpDecay.h
inc/MantidCurveFitting/ExpDecayMuon.h
inc/MantidCurveFitting/ExpDecayOsc.h
- inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
- inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
inc/MantidCurveFitting/Fit.h
inc/MantidCurveFitting/Fit1D.h
inc/MantidCurveFitting/FitMW.h
inc/MantidCurveFitting/FitPowderDiffPeaks.h
inc/MantidCurveFitting/FlatBackground.h
inc/MantidCurveFitting/FullprofPolynomial.h
+ inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
+ inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
inc/MantidCurveFitting/FunctionDomain1DSpectrumCreator.h
inc/MantidCurveFitting/GSLFunctions.h
inc/MantidCurveFitting/GSLJacobian.h
@@ -188,8 +193,6 @@ set ( INC_FILES
inc/MantidCurveFitting/LatticeFunction.h
inc/MantidCurveFitting/LeBailFit.h
inc/MantidCurveFitting/LeBailFunction.h
- inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
- inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
inc/MantidCurveFitting/LinearBackground.h
inc/MantidCurveFitting/LogNormal.h
inc/MantidCurveFitting/Lorentzian.h
@@ -199,7 +202,6 @@ set ( INC_FILES
inc/MantidCurveFitting/MuonFInteraction.h
inc/MantidCurveFitting/NeutronBk2BkExpConvPVoigt.h
inc/MantidCurveFitting/NormaliseByPeakArea.h
- inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
inc/MantidCurveFitting/ParDomain.h
inc/MantidCurveFitting/ParameterEstimator.h
inc/MantidCurveFitting/PawleyFit.h
@@ -219,7 +221,6 @@ set ( INC_FILES
inc/MantidCurveFitting/SeqDomain.h
inc/MantidCurveFitting/SeqDomainSpectrumCreator.h
inc/MantidCurveFitting/SimpleChebfun.h
- inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
inc/MantidCurveFitting/SpecialFunctionSupport.h
inc/MantidCurveFitting/SplineBackground.h
inc/MantidCurveFitting/SplineInterpolation.h
@@ -227,7 +228,6 @@ set ( INC_FILES
inc/MantidCurveFitting/StaticKuboToyabe.h
inc/MantidCurveFitting/StaticKuboToyabeTimesExpDecay.h
inc/MantidCurveFitting/StaticKuboToyabeTimesGausDecay.h
- inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
inc/MantidCurveFitting/StretchExp.h
inc/MantidCurveFitting/StretchExpMuon.h
inc/MantidCurveFitting/TabulatedFunction.h
@@ -248,7 +248,6 @@ set ( TEST_FILES
#SCDPanelErrorsTest.h
AbragamTest.h
AugmentedLagrangianOptimizerTest.h
- FuncMinimizers/BFGSTest.h
BSplineTest.h
BackToBackExponentialTest.h
BivariateNormalTest.h
@@ -266,9 +265,8 @@ set ( TEST_FILES
ConvertToYSpaceTest.h
ConvolutionTest.h
ConvolveWorkspacesTest.h
- CostFuncUnweightedLeastSquaresTest.h
+ CostFunctions/CostFuncUnweightedLeastSquaresTest.h
CubicSplineTest.h
- FuncMinimizers/DampingMinimizerTest.h
DeltaFunctionTest.h
DiffRotDiscreteCircleTest.h
DiffSphereTest.h
@@ -279,13 +277,19 @@ set ( TEST_FILES
ExpDecayMuonTest.h
ExpDecayOscTest.h
ExpDecayTest.h
- FuncMinimizers/FABADAMinimizerTest.h
- FuncMinimizers/FRConjugateGradientTest.h
FitMWTest.h
FitPowderDiffPeaksTest.h
FitTest.h
FlatBackgroundTest.h
FullprofPolynomialTest.h
+ FuncMinimizers/BFGSTest.h
+ FuncMinimizers/DampingMinimizerTest.h
+ FuncMinimizers/FABADAMinimizerTest.h
+ FuncMinimizers/FRConjugateGradientTest.h
+ FuncMinimizers/LevenbergMarquardtMDTest.h
+ FuncMinimizers/LevenbergMarquardtTest.h
+ FuncMinimizers/PRConjugateGradientTest.h
+ FuncMinimizers/SimplexTest.h
FunctionDomain1DSpectrumCreatorTest.h
FunctionFactoryConstraintTest.h
FunctionParameterDecoratorFitTest.h
@@ -303,9 +307,7 @@ set ( TEST_FILES
LatticeFunctionTest.h
LeBailFitTest.h
LeBailFunctionTest.h
- LeastSquaresTest.h
- FuncMinimizers/LevenbergMarquardtMDTest.h
- FuncMinimizers/LevenbergMarquardtTest.h
+ CostFunctions/LeastSquaresTest.h
LinearBackgroundTest.h
LogNormalTest.h
Lorentzian1DTest.h
@@ -315,7 +317,6 @@ set ( TEST_FILES
MuonFInteractionTest.h
NeutronBk2BkExpConvPVoigtTest.h
NormaliseByPeakAreaTest.h
- FuncMinimizers/PRConjugateGradientTest.h
ParameterEstimatorTest.h
PawleyFitTest.h
PawleyFunctionTest.h
@@ -333,7 +334,6 @@ set ( TEST_FILES
ResolutionTest.h
SeqDomainSpectrumCreatorTest.h
SimpleChebfunTest.h
- FuncMinimizers/SimplexTest.h
SpecialFunctionSupportTest.h
SplineBackgroundTest.h
SplineInterpolationTest.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFuncFitting.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/CostFuncFitting.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFuncIgnorePosPeaks.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncIgnorePosPeaks.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/CostFuncIgnorePosPeaks.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncIgnorePosPeaks.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFuncLeastSquares.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/CostFuncLeastSquares.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
index be05dae8779..4d3fa4cbca5 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFuncLeastSquares.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
@@ -4,7 +4,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/CostFuncFitting.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncFitting.h"
#include "MantidCurveFitting/GSLMatrix.h"
#include "MantidCurveFitting/GSLVector.h"
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFuncRwp.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/CostFuncRwp.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
index a58da7c674c..7b3b79232ae 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFuncRwp.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
@@ -4,7 +4,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/GSLMatrix.h"
#include "MantidCurveFitting/GSLVector.h"
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFuncUnweightedLeastSquares.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
similarity index 96%
rename from Framework/CurveFitting/inc/MantidCurveFitting/CostFuncUnweightedLeastSquares.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
index 17fc016bb42..1986b4f1d64 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFuncUnweightedLeastSquares.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
@@ -2,7 +2,7 @@
#define MANTID_CURVEFITTING_COSTFUNCUNWEIGHTEDLEASTSQUARES_H_
#include "MantidKernel/System.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/GSLFunctions.h b/Framework/CurveFitting/inc/MantidCurveFitting/GSLFunctions.h
index 259599a1901..f012e046e2f 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/GSLFunctions.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/GSLFunctions.h
@@ -7,7 +7,7 @@
#include <gsl/gsl_blas.h>
#include "MantidAPI/IFunction.h"
#include "MantidAPI/ICostFunction.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h b/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
index 5e451efdf33..26dd3d232bb 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
@@ -8,8 +8,8 @@
#include "MantidAPI/FunctionDomain.h"
#include "MantidAPI/FunctionValues.h"
#include "MantidAPI/IDomainCreator.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
-#include "MantidCurveFitting/CostFuncRwp.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncRwp.h"
#include <stdexcept>
#include <vector>
diff --git a/Framework/CurveFitting/src/CostFuncFitting.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp
similarity index 98%
rename from Framework/CurveFitting/src/CostFuncFitting.cpp
rename to Framework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp
index 425bdcce324..3b5edf48e56 100644
--- a/Framework/CurveFitting/src/CostFuncFitting.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/CostFuncFitting.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncFitting.h"
#include "MantidCurveFitting/GSLJacobian.h"
#include "MantidAPI/IConstraint.h"
diff --git a/Framework/CurveFitting/src/CostFuncIgnorePosPeaks.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncIgnorePosPeaks.cpp
similarity index 97%
rename from Framework/CurveFitting/src/CostFuncIgnorePosPeaks.cpp
rename to Framework/CurveFitting/src/CostFunctions/CostFuncIgnorePosPeaks.cpp
index 6e6b404b1b2..7d073a7ca33 100644
--- a/Framework/CurveFitting/src/CostFuncIgnorePosPeaks.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncIgnorePosPeaks.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/CostFuncIgnorePosPeaks.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncIgnorePosPeaks.h"
#include "MantidKernel/PhysicalConstants.h"
#include <cmath>
#include <gsl/gsl_sf_erf.h>
diff --git a/Framework/CurveFitting/src/CostFuncLeastSquares.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncLeastSquares.cpp
similarity index 99%
rename from Framework/CurveFitting/src/CostFuncLeastSquares.cpp
rename to Framework/CurveFitting/src/CostFunctions/CostFuncLeastSquares.cpp
index e1fa52338bf..b0dcf06a1d8 100644
--- a/Framework/CurveFitting/src/CostFuncLeastSquares.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncLeastSquares.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/Jacobian.h"
#include "MantidCurveFitting/SeqDomain.h"
#include "MantidAPI/IConstraint.h"
diff --git a/Framework/CurveFitting/src/CostFuncRwp.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncRwp.cpp
similarity index 97%
rename from Framework/CurveFitting/src/CostFuncRwp.cpp
rename to Framework/CurveFitting/src/CostFunctions/CostFuncRwp.cpp
index c72d9d3d4a1..1878ca91006 100644
--- a/Framework/CurveFitting/src/CostFuncRwp.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncRwp.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/CostFuncRwp.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncRwp.h"
#include "MantidCurveFitting/Jacobian.h"
#include "MantidCurveFitting/SeqDomain.h"
#include "MantidAPI/IConstraint.h"
diff --git a/Framework/CurveFitting/src/CostFuncUnweightedLeastSquares.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncUnweightedLeastSquares.cpp
similarity index 97%
rename from Framework/CurveFitting/src/CostFuncUnweightedLeastSquares.cpp
rename to Framework/CurveFitting/src/CostFunctions/CostFuncUnweightedLeastSquares.cpp
index da4e2bd1170..4166bb5fa45 100644
--- a/Framework/CurveFitting/src/CostFuncUnweightedLeastSquares.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncUnweightedLeastSquares.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/CostFuncUnweightedLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h"
#include "MantidKernel/Logger.h"
#include <iomanip>
diff --git a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
index e19ad6d29a6..4d43e806c7e 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
@@ -2,7 +2,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidAPI/CostFunctionFactory.h"
#include "MantidAPI/FuncMinimizerFactory.h"
diff --git a/Framework/CurveFitting/test/BSplineTest.h b/Framework/CurveFitting/test/BSplineTest.h
index d8f27154137..9558664c50d 100644
--- a/Framework/CurveFitting/test/BSplineTest.h
+++ b/Framework/CurveFitting/test/BSplineTest.h
@@ -4,7 +4,7 @@
#include "MantidCurveFitting/BSpline.h"
#include "MantidCurveFitting/UserFunction.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/test/CostFuncUnweightedLeastSquaresTest.h b/Framework/CurveFitting/test/CostFunctions/CostFuncUnweightedLeastSquaresTest.h
similarity index 97%
rename from Framework/CurveFitting/test/CostFuncUnweightedLeastSquaresTest.h
rename to Framework/CurveFitting/test/CostFunctions/CostFuncUnweightedLeastSquaresTest.h
index 7604eac7691..9af27bd25c6 100644
--- a/Framework/CurveFitting/test/CostFuncUnweightedLeastSquaresTest.h
+++ b/Framework/CurveFitting/test/CostFunctions/CostFuncUnweightedLeastSquaresTest.h
@@ -5,7 +5,7 @@
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionFactory.h"
-#include "MantidCurveFitting/CostFuncUnweightedLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h"
#include <boost/make_shared.hpp>
diff --git a/Framework/CurveFitting/test/LeastSquaresTest.h b/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h
similarity index 98%
rename from Framework/CurveFitting/test/LeastSquaresTest.h
rename to Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h
index a14f1e591c6..db3b9067e41 100644
--- a/Framework/CurveFitting/test/LeastSquaresTest.h
+++ b/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h
@@ -3,8 +3,8 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
-#include "MantidCurveFitting/CostFuncRwp.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncRwp.h"
#include "MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h"
#include "MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
diff --git a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
index 070031d0f6c..8bfc1e4edb6 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/FuncMinimizers/DampingMinimizer.h"
#include "MantidCurveFitting/UserFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
index 7ded8b10d3f..efb19202d29 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
#include "MantidCurveFitting/UserFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
index 322868c5e23..b270a643d3f 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h"
#include "MantidCurveFitting/UserFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
diff --git a/Framework/CurveFitting/test/GaussianTest.h b/Framework/CurveFitting/test/GaussianTest.h
index 1b59b3a3322..275a955824c 100644
--- a/Framework/CurveFitting/test/GaussianTest.h
+++ b/Framework/CurveFitting/test/GaussianTest.h
@@ -25,7 +25,7 @@
#include "MantidAPI/FunctionValues.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
#include "MantidCurveFitting/UserFunction.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
using namespace Mantid;
using namespace Mantid::Kernel;
--
GitLab
From 3b9b1685ca9d51e02bd7c253b651a70a6bbee3d8 Mon Sep 17 00:00:00 2001
From: Elliot Oram <Elliot.Oram@stfc.ac.uk>
Date: Thu, 8 Oct 2015 11:21:32 +0100
Subject: [PATCH 064/223] Added check for background start/end in plot Time
validation
Refs #13769
---
.../CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp b/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
index ae32ddc36c2..9839ec88af9 100644
--- a/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
+++ b/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
@@ -447,6 +447,15 @@ void ISISEnergyTransfer::plotRaw() {
return;
}
+ if (m_uiForm.ckBackgroundRemoval->isChecked() == true) {
+ int startBack = m_uiForm.spBackgroundStart->value();
+ int endBack = m_uiForm.spBackgroundEnd->value();
+ if (startBack > endBack) {
+ emit showMessageBox("Background Start must be less than Background End");
+ return;
+ }
+ }
+
QString rawFile = m_uiForm.dsRunFiles->getFirstFilename();
auto pos = rawFile.lastIndexOf(".");
auto extension = rawFile.right(rawFile.length() - pos);
--
GitLab
From 914bffb0afbb945457416743a41d0518dbdcd2d4 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Thu, 8 Oct 2015 11:46:48 +0100
Subject: [PATCH 065/223] Moved Cost functions to a sub namespace
re #13347
---
.../CostFunctions/CostFuncFitting.h | 2 ++
.../CostFunctions/CostFuncIgnorePosPeaks.h | 2 ++
.../CostFunctions/CostFuncLeastSquares.h | 2 ++
.../MantidCurveFitting/CostFunctions/CostFuncRwp.h | 3 +++
.../CostFunctions/CostFuncUnweightedLeastSquares.h | 2 ++
.../FuncMinimizers/DampingMinimizer.h | 5 ++++-
.../FuncMinimizers/FABADAMinimizer.h | 4 +++-
.../FuncMinimizers/LevenbergMarquardtMDMinimizer.h | 5 +++--
.../inc/MantidCurveFitting/GSLFunctions.h | 6 +++---
.../inc/MantidCurveFitting/ParDomain.h | 4 ++--
.../inc/MantidCurveFitting/SeqDomain.h | 8 ++++----
.../src/CostFunctions/CostFuncFitting.cpp | 2 ++
.../src/CostFunctions/CostFuncIgnorePosPeaks.cpp | 2 ++
.../src/CostFunctions/CostFuncLeastSquares.cpp | 2 ++
.../CurveFitting/src/CostFunctions/CostFuncRwp.cpp | 2 ++
.../CostFuncUnweightedLeastSquares.cpp | 2 ++
Framework/CurveFitting/src/Fit.cpp | 8 ++++----
Framework/CurveFitting/src/FitPowderDiffPeaks.cpp | 2 +-
.../src/FuncMinimizers/DampingMinimizer.cpp | 4 ++--
.../src/FuncMinimizers/DerivMinimizer.cpp | 14 +++++++-------
.../src/FuncMinimizers/FABADAMinimizer.cpp | 4 ++--
.../LevenbergMarquardtMDMinimizer.cpp | 4 ++--
.../FuncMinimizers/LevenbergMarquardtMinimizer.cpp | 2 +-
.../src/FuncMinimizers/SimplexMinimizer.cpp | 6 +++---
Framework/CurveFitting/src/GSLFunctions.cpp | 4 ++--
Framework/CurveFitting/src/ParDomain.cpp | 4 ++--
Framework/CurveFitting/src/SeqDomain.cpp | 8 ++++----
Framework/CurveFitting/test/BSplineTest.h | 1 +
.../CurveFitting/test/CompositeFunctionTest.h | 3 ++-
.../CostFuncUnweightedLeastSquaresTest.h | 2 +-
.../test/CostFunctions/LeastSquaresTest.h | 1 +
.../test/FuncMinimizers/DampingMinimizerTest.h | 1 +
.../test/FuncMinimizers/LevenbergMarquardtMDTest.h | 1 +
.../test/FuncMinimizers/LevenbergMarquardtTest.h | 1 +
Framework/CurveFitting/test/GaussianTest.h | 1 +
.../CurveFitting/test/MultiDomainFunctionTest.h | 3 ++-
36 files changed, 81 insertions(+), 46 deletions(-)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
index 7bbc76c8bb8..10798d98883 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
@@ -12,6 +12,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace CostFunctions {
/** A semi-abstract class for a cost function for fitting functions.
Implement val(), deriv(), and valAndDeriv() methods in a concrete class.
@@ -100,6 +101,7 @@ protected:
mutable bool m_dirtyHessian; /// dirty hessian flag
};
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncIgnorePosPeaks.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncIgnorePosPeaks.h
index ffef9d66667..3ff4f734a25 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncIgnorePosPeaks.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncIgnorePosPeaks.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace CostFunctions {
/** Cost function which allows positive peaks to be ignored and is suitable
for e.g. fitting the background
@@ -61,6 +62,7 @@ private:
const std::string m_name;
};
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
index 4d3fa4cbca5..bd3f28187f4 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
@@ -13,6 +13,7 @@ namespace CurveFitting {
class SeqDomain;
class ParDomain;
+namespace CostFunctions {
/** Cost function for least squares
@author Anders Markvardsen, ISIS, RAL
@@ -107,6 +108,7 @@ protected:
double m_factor;
};
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
index 7b3b79232ae..f8105e11d06 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
@@ -16,6 +16,8 @@ namespace CurveFitting {
class SeqDomain;
class ParDomain;
+namespace CostFunctions {
+
/** Cost function for Rwp = (sum_i (( obs_i - cal_i )/sigma_i)**2 ) / (sum_i
(obs_i/sigma_i)**2)
@@ -68,6 +70,7 @@ private:
double calSqrtW(API::FunctionValues_sptr values) const;
};
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
index 1986b4f1d64..3d0df2b5387 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace CostFunctions {
/** @class CostFuncUnweightedLeastSquares
*
@@ -53,6 +54,7 @@ protected:
double getResidualVariance() const;
};
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
index ccadc518f5f..882b42634a3 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
@@ -10,7 +10,10 @@
namespace Mantid {
namespace CurveFitting {
+namespace CostFunctions
+{
class CostFuncLeastSquares;
+} // namespace CostFunctions
namespace FuncMinimisers {
@@ -57,7 +60,7 @@ public:
private:
/// Pointer to the cost function. Must be the least squares.
- boost::shared_ptr<CurveFitting::CostFuncLeastSquares> m_leastSquares;
+ boost::shared_ptr<CostFunctions::CostFuncLeastSquares> m_leastSquares;
/// Relative tolerance.
double m_relTol;
/// The damping mu parameter in the Levenberg-Marquardt method.
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
index e7d341910c4..f7547eb9efe 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
@@ -10,10 +10,12 @@
namespace Mantid {
namespace CurveFitting {
+namespace CostFunctions {
/// Forward Declaration
class CostFuncLeastSquares;
}
}
+}
namespace Mantid {
namespace CurveFitting {
@@ -63,7 +65,7 @@ private:
/// Pointer to the cost function. Must be the least squares.
/// Intentar encontrar una manera de sacar aqui el numero de parametros que
/// no sea necesaria la cost function
- boost::shared_ptr<CostFuncLeastSquares> m_leastSquares;
+ boost::shared_ptr<CostFunctions::CostFuncLeastSquares> m_leastSquares;
/// The number of iterations done.
size_t m_counter;
///
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
index 7e6bc6cb39d..57ce85a7f29 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
@@ -10,8 +10,9 @@
namespace Mantid {
namespace CurveFitting {
-
+namespace CostFunctions {
class CostFuncLeastSquares;
+} // namespace CostFunctions
namespace FuncMinimisers {
/** Implementing Levenberg-Marquardt algorithm. Uses the normal system calculate
@@ -58,7 +59,7 @@ public:
private:
/// Pointer to the cost function. Must be the least squares.
- boost::shared_ptr<CostFuncLeastSquares> m_leastSquares;
+ boost::shared_ptr<CostFunctions::CostFuncLeastSquares> m_leastSquares;
/// The tau parameter in the Levenberg-Marquardt method.
double m_tau;
/// The damping mu parameter in the Levenberg-Marquardt method.
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/GSLFunctions.h b/Framework/CurveFitting/inc/MantidCurveFitting/GSLFunctions.h
index f012e046e2f..bde389d04c8 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/GSLFunctions.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/GSLFunctions.h
@@ -85,7 +85,7 @@ public:
/// Structure to contain least squares data and used by GSL
struct GSL_FitData {
/// Constructor
- GSL_FitData(boost::shared_ptr<CostFuncLeastSquares> cf);
+ GSL_FitData(boost::shared_ptr<CostFunctions::CostFuncLeastSquares> cf);
/// Destructor
~GSL_FitData();
/// number of points to be fitted (size of X, Y and sqrtWeightData arrays)
@@ -94,14 +94,14 @@ struct GSL_FitData {
size_t p;
/// Pointer to the function
API::IFunction_sptr function;
- boost::shared_ptr<CostFuncLeastSquares> costFunction;
+ boost::shared_ptr<CostFunctions::CostFuncLeastSquares> costFunction;
/// Initial function parameters
gsl_vector *initFuncParams;
/// Jacobi matrix interface
JacobianImpl1 J;
// this is presently commented out in the implementation
- // gsl_matrix *holdCalculatedJacobian; ///< cache of the claculated jacobian
+ // gsl_matrix *holdCalculatedJacobian; ///< cache of the calculated jacobian
};
int gsl_f(const gsl_vector *x, void *params, gsl_vector *f);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h b/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h
index bda5ec1da7c..35d36fbdecf 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h
@@ -43,11 +43,11 @@ public:
virtual void getDomainAndValues(size_t i, API::FunctionDomain_sptr &domain,
API::FunctionValues_sptr &values) const;
/// Calculate the value of a least squares cost function
- virtual void leastSquaresVal(const CostFuncLeastSquares &leastSquares);
+ virtual void leastSquaresVal(const CostFunctions::CostFuncLeastSquares &leastSquares);
/// Calculate the value, first and second derivatives of a least squares cost
/// function
virtual void
- leastSquaresValDerivHessian(const CostFuncLeastSquares &leastSquares,
+ leastSquaresValDerivHessian(const CostFunctions::CostFuncLeastSquares &leastSquares,
bool evalDeriv, bool evalHessian);
};
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h b/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
index 26dd3d232bb..a2bf5722f30 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
@@ -57,16 +57,16 @@ public:
/// Add new domain creator
void addCreator(API::IDomainCreator_sptr creator);
/// Calculate the value of a least squares cost function
- virtual void leastSquaresVal(const CostFuncLeastSquares &leastSquares);
+ virtual void leastSquaresVal(const CostFunctions::CostFuncLeastSquares &leastSquares);
/// Calculate the value, first and second derivatives of a least squares cost
/// function
virtual void
- leastSquaresValDerivHessian(const CostFuncLeastSquares &leastSquares,
+ leastSquaresValDerivHessian(const CostFunctions::CostFuncLeastSquares &leastSquares,
bool evalDeriv, bool evalHessian);
/// Calculate the value of a Rwp cost function
- void rwpVal(const CostFuncRwp &rwp);
+ void rwpVal(const CostFunctions::CostFuncRwp &rwp);
/// Calculate the value, first and second derivatives of a RWP cost function
- void rwpValDerivHessian(const CostFuncRwp &rwp, bool evalDeriv,
+ void rwpValDerivHessian(const CostFunctions::CostFuncRwp &rwp, bool evalDeriv,
bool evalHessian);
/// Create an instance of SeqDomain in one of two forms: either SeqDomain for
diff --git a/Framework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp
index 3b5edf48e56..a33bad40180 100644
--- a/Framework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace CostFunctions {
/**
* Constructor.
@@ -202,5 +203,6 @@ void CostFuncFitting::calTransformationMatrixNumerically(GSLMatrix &tm) {
}
}
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/CostFunctions/CostFuncIgnorePosPeaks.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncIgnorePosPeaks.cpp
index 7d073a7ca33..349f294989a 100644
--- a/Framework/CurveFitting/src/CostFunctions/CostFuncIgnorePosPeaks.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncIgnorePosPeaks.cpp
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace CostFunctions {
DECLARE_COSTFUNCTION(CostFuncIgnorePosPeaks, Ignore positive peaks)
@@ -73,5 +74,6 @@ void CostFuncIgnorePosPeaks::deriv(const double *yData,
}
}
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/CostFunctions/CostFuncLeastSquares.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncLeastSquares.cpp
index b0dcf06a1d8..7f358afef70 100644
--- a/Framework/CurveFitting/src/CostFunctions/CostFuncLeastSquares.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncLeastSquares.cpp
@@ -14,6 +14,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace CostFunctions {
namespace {
/// static logger
Kernel::Logger g_log("CostFuncLeastSquares");
@@ -438,5 +439,6 @@ void CostFuncLeastSquares::calActiveCovarianceMatrix(GSLMatrix &covar,
}
}
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/CostFunctions/CostFuncRwp.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncRwp.cpp
index 1878ca91006..bd60edca12a 100644
--- a/Framework/CurveFitting/src/CostFunctions/CostFuncRwp.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncRwp.cpp
@@ -13,6 +13,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace CostFunctions {
DECLARE_COSTFUNCTION(CostFuncRwp, Rwp)
@@ -64,5 +65,6 @@ double CostFuncRwp::calSqrtW(API::FunctionValues_sptr values) const {
return sqrt(weight);
}
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/CostFunctions/CostFuncUnweightedLeastSquares.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncUnweightedLeastSquares.cpp
index 4166bb5fa45..1f3c71968b1 100644
--- a/Framework/CurveFitting/src/CostFunctions/CostFuncUnweightedLeastSquares.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncUnweightedLeastSquares.cpp
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace CostFunctions {
namespace {
/// static logger
@@ -80,5 +81,6 @@ double CostFuncUnweightedLeastSquares::getResidualVariance() const {
return residualVariance;
}
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Fit.cpp b/Framework/CurveFitting/src/Fit.cpp
index c37debe935c..95bae234e21 100644
--- a/Framework/CurveFitting/src/Fit.cpp
+++ b/Framework/CurveFitting/src/Fit.cpp
@@ -2,7 +2,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/Fit.h"
-#include "MantidCurveFitting/CostFuncFitting.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncFitting.h"
#include "MantidAPI/CostFunctionFactory.h"
#include "MantidAPI/FuncMinimizerFactory.h"
@@ -63,7 +63,7 @@ void Fit::initConcrete() {
API::CostFunctionFactory::Instance().getKeys();
// select only CostFuncFitting variety
for (auto it = costFuncOptions.begin(); it != costFuncOptions.end(); ++it) {
- auto costFunc = boost::dynamic_pointer_cast<CostFuncFitting>(
+ auto costFunc = boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(
API::CostFunctionFactory::Instance().create(*it));
if (!costFunc) {
*it = "";
@@ -152,8 +152,8 @@ void Fit::execConcrete() {
const size_t maxIterations = static_cast<size_t>(intMaxIterations);
// get the cost function which must be a CostFuncFitting
- boost::shared_ptr<CostFuncFitting> costFunc =
- boost::dynamic_pointer_cast<CostFuncFitting>(
+ boost::shared_ptr<CostFunctions::CostFuncFitting> costFunc =
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(
API::CostFunctionFactory::Instance().create(
getPropertyValue("CostFunction")));
diff --git a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
index 10503a0e595..ec7e15bd8a9 100644
--- a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
+++ b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
@@ -25,7 +25,7 @@
#include "MantidCurveFitting/BackToBackExponential.h"
#include "MantidCurveFitting/ThermalNeutronBk2BkExpConvPVoigt.h"
#include "MantidCurveFitting/FuncMinimizers/DampingMinimizer.h"
-#include "MantidCurveFitting/CostFuncFitting.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncFitting.h"
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/split.hpp>
diff --git a/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
index 4a408b9789c..b075932deda 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
@@ -2,7 +2,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/FuncMinimizers/DampingMinimizer.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidAPI/CostFunctionFactory.h"
#include "MantidAPI/FuncMinimizerFactory.h"
@@ -34,7 +34,7 @@ DampingMinimizer::DampingMinimizer(double relTol)
/// Initialize minimizer, i.e. pass a function to minimize.
void DampingMinimizer::initialize(API::ICostFunction_sptr function, size_t) {
- m_leastSquares = boost::dynamic_pointer_cast<CurveFitting::CostFuncLeastSquares>(function);
+ m_leastSquares = boost::dynamic_pointer_cast<CostFunctions::CostFuncLeastSquares>(function);
if (!m_leastSquares) {
throw std::invalid_argument("Damping minimizer works only with least "
"squares. Different function was given.");
diff --git a/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
index d94c82151bc..a04ccc98e54 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
@@ -2,7 +2,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/FuncMinimizers/DerivMinimizer.h"
-#include "MantidCurveFitting/CostFuncFitting.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncFitting.h"
namespace Mantid {
namespace CurveFitting {
@@ -18,8 +18,8 @@ double DerivMinimizer::fun(const gsl_vector *x, void *params) {
for (size_t i = 0; i < n; ++i) {
minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
}
- boost::shared_ptr<CostFuncFitting> fitting =
- boost::dynamic_pointer_cast<CostFuncFitting>(minimizer.m_costFunction);
+ boost::shared_ptr<CostFunctions::CostFuncFitting> fitting =
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(minimizer.m_costFunction);
if (fitting) {
fitting->getFittingFunction()->applyTies();
}
@@ -37,8 +37,8 @@ void DerivMinimizer::dfun(const gsl_vector *x, void *params, gsl_vector *g) {
for (size_t i = 0; i < n; ++i) {
minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
}
- boost::shared_ptr<CostFuncFitting> fitting =
- boost::dynamic_pointer_cast<CostFuncFitting>(minimizer.m_costFunction);
+ boost::shared_ptr<CostFunctions::CostFuncFitting> fitting =
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(minimizer.m_costFunction);
if (fitting) {
fitting->getFittingFunction()->applyTies();
}
@@ -62,8 +62,8 @@ void DerivMinimizer::fundfun(const gsl_vector *x, void *params, double *f,
for (size_t i = 0; i < n; ++i) {
minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
}
- boost::shared_ptr<CostFuncFitting> fitting =
- boost::dynamic_pointer_cast<CostFuncFitting>(minimizer.m_costFunction);
+ boost::shared_ptr<CostFunctions::CostFuncFitting> fitting =
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(minimizer.m_costFunction);
if (fitting) {
fitting->getFittingFunction()->applyTies();
}
diff --git a/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
index 28c6983e668..e1dbc421376 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
@@ -1,5 +1,5 @@
#include "MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include <stdio.h>
@@ -93,7 +93,7 @@ FABADAMinimizer::~FABADAMinimizer() {}
void FABADAMinimizer::initialize(API::ICostFunction_sptr function,
size_t maxIterations) {
- m_leastSquares = boost::dynamic_pointer_cast<CostFuncLeastSquares>(function);
+ m_leastSquares = boost::dynamic_pointer_cast<CostFunctions::CostFuncLeastSquares>(function);
if (!m_leastSquares) {
throw std::invalid_argument(
"FABADA works only with least squares. Different function was given.");
diff --git a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
index b33c202472e..9b05b017b03 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
@@ -2,7 +2,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidAPI/CostFunctionFactory.h"
#include "MantidAPI/FuncMinimizerFactory.h"
@@ -41,7 +41,7 @@ LevenbergMarquardtMDMinimizer::LevenbergMarquardtMDMinimizer()
/// Initialize minimizer, i.e. pass a function to minimize.
void LevenbergMarquardtMDMinimizer::initialize(API::ICostFunction_sptr function,
size_t) {
- m_leastSquares = boost::dynamic_pointer_cast<CostFuncLeastSquares>(function);
+ m_leastSquares = boost::dynamic_pointer_cast<CostFunctions::CostFuncLeastSquares>(function);
if (!m_leastSquares) {
throw std::invalid_argument("Levenberg-Marquardt minimizer works only with "
"least squares. Different function was given.");
diff --git a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
index 4d43e806c7e..3ad03046b40 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
@@ -42,7 +42,7 @@ void LevenbergMarquardtMinimizer::initialize(
API::ICostFunction_sptr costFunction, size_t) {
// set-up GSL container to be used with GSL simplex algorithm
auto leastSquares =
- boost::dynamic_pointer_cast<CostFuncLeastSquares>(costFunction);
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncLeastSquares>(costFunction);
if (leastSquares) {
m_data = new GSL_FitData(leastSquares);
} else {
diff --git a/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
index a1e42154285..2a0041f43aa 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
@@ -2,7 +2,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h"
-#include "MantidCurveFitting/CostFuncFitting.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncFitting.h"
#include "MantidAPI/FuncMinimizerFactory.h"
@@ -32,8 +32,8 @@ double SimplexMinimizer::fun(const gsl_vector *x, void *params) {
minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
}
}
- boost::shared_ptr<CostFuncFitting> fitting =
- boost::dynamic_pointer_cast<CostFuncFitting>(minimizer.m_costFunction);
+ boost::shared_ptr<CostFunctions::CostFuncFitting> fitting =
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(minimizer.m_costFunction);
if (fitting) {
fitting->getFittingFunction()->applyTies();
}
diff --git a/Framework/CurveFitting/src/GSLFunctions.cpp b/Framework/CurveFitting/src/GSLFunctions.cpp
index d5c4445dcc0..90b670cc33c 100644
--- a/Framework/CurveFitting/src/GSLFunctions.cpp
+++ b/Framework/CurveFitting/src/GSLFunctions.cpp
@@ -126,7 +126,7 @@ int gsl_df(const gsl_vector *x, void *params, gsl_matrix *J) {
// functionDeriv() return derivatives of calculated data values. Need to
// convert this values into
- // derivatives of calculated-observed devided by error values used by GSL
+ // derivatives of calculated-observed divided by error values used by GSL
auto values = boost::dynamic_pointer_cast<API::FunctionValues>(
p->costFunction->getValues());
if (!values) {
@@ -159,7 +159,7 @@ int gsl_fdf(const gsl_vector *x, void *params, gsl_vector *f, gsl_matrix *J) {
* Constructor. Creates declared -> active index map
* @param cf :: ICostFunction
*/
-GSL_FitData::GSL_FitData(boost::shared_ptr<CostFuncLeastSquares> cf)
+GSL_FitData::GSL_FitData(boost::shared_ptr<CostFunctions::CostFuncLeastSquares> cf)
: function(cf->getFittingFunction()), costFunction(cf) {
gsl_set_error_handler_off();
// number of active parameters
diff --git a/Framework/CurveFitting/src/ParDomain.cpp b/Framework/CurveFitting/src/ParDomain.cpp
index 7cd4fdfe9e2..18f8155704e 100644
--- a/Framework/CurveFitting/src/ParDomain.cpp
+++ b/Framework/CurveFitting/src/ParDomain.cpp
@@ -28,7 +28,7 @@ void ParDomain::getDomainAndValues(size_t i, API::FunctionDomain_sptr &domain,
* Calculate the value of a least squares cost function
* @param leastSquares :: The least squares cost func to calculate the value for
*/
-void ParDomain::leastSquaresVal(const CostFuncLeastSquares &leastSquares) {
+void ParDomain::leastSquaresVal(const CostFunctions::CostFuncLeastSquares &leastSquares) {
const int n = static_cast<int>(getNDomains());
PARALLEL_FOR_NO_WSP_CHECK()
for (int i = 0; i < n; ++i) {
@@ -54,7 +54,7 @@ void ParDomain::leastSquaresVal(const CostFuncLeastSquares &leastSquares) {
* @param evalHessian :: Flag to evaluate the Hessian (second derivatives)
*/
void ParDomain::leastSquaresValDerivHessian(
- const CostFuncLeastSquares &leastSquares, bool evalDeriv,
+ const CostFunctions::CostFuncLeastSquares &leastSquares, bool evalDeriv,
bool evalHessian) {
const int n = static_cast<int>(getNDomains());
PARALLEL_SET_DYNAMIC(0);
diff --git a/Framework/CurveFitting/src/SeqDomain.cpp b/Framework/CurveFitting/src/SeqDomain.cpp
index a36e808948d..6173e279e99 100644
--- a/Framework/CurveFitting/src/SeqDomain.cpp
+++ b/Framework/CurveFitting/src/SeqDomain.cpp
@@ -68,7 +68,7 @@ SeqDomain *SeqDomain::create(API::IDomainCreator::DomainType type) {
* Calculate the value of a least squares cost function
* @param leastSquares :: The least squares cost func to calculate the value for
*/
-void SeqDomain::leastSquaresVal(const CostFuncLeastSquares &leastSquares) {
+void SeqDomain::leastSquaresVal(const CostFunctions::CostFuncLeastSquares &leastSquares) {
API::FunctionDomain_sptr domain;
API::FunctionValues_sptr values;
const size_t n = getNDomains();
@@ -87,7 +87,7 @@ void SeqDomain::leastSquaresVal(const CostFuncLeastSquares &leastSquares) {
* Calculate the value of a least squares cost function
* @param rwp :: The RWP cost func to calculate the value for
*/
-void SeqDomain::rwpVal(const CostFuncRwp &rwp) {
+void SeqDomain::rwpVal(const CostFunctions::CostFuncRwp &rwp) {
API::FunctionDomain_sptr domain;
API::FunctionValues_sptr values;
const size_t n = getNDomains();
@@ -109,7 +109,7 @@ void SeqDomain::rwpVal(const CostFuncRwp &rwp) {
* @param evalHessian :: Flag to evaluate the Hessian (second derivatives)
*/
void SeqDomain::leastSquaresValDerivHessian(
- const CostFuncLeastSquares &leastSquares, bool evalDeriv,
+ const CostFunctions::CostFuncLeastSquares &leastSquares, bool evalDeriv,
bool evalHessian) {
API::FunctionDomain_sptr domain;
API::FunctionValues_sptr values;
@@ -131,7 +131,7 @@ void SeqDomain::leastSquaresValDerivHessian(
* @param evalDeriv :: Flag to evaluate the first derivatives
* @param evalHessian :: Flag to evaluate the Hessian (second derivatives)
*/
-void SeqDomain::rwpValDerivHessian(const CostFuncRwp &rwp, bool evalDeriv,
+void SeqDomain::rwpValDerivHessian(const CostFunctions::CostFuncRwp &rwp, bool evalDeriv,
bool evalHessian) {
API::FunctionDomain_sptr domain;
API::FunctionValues_sptr values;
diff --git a/Framework/CurveFitting/test/BSplineTest.h b/Framework/CurveFitting/test/BSplineTest.h
index 9558664c50d..86dff2a6e0e 100644
--- a/Framework/CurveFitting/test/BSplineTest.h
+++ b/Framework/CurveFitting/test/BSplineTest.h
@@ -16,6 +16,7 @@
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::CostFunctions;
class BSplineTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/CompositeFunctionTest.h b/Framework/CurveFitting/test/CompositeFunctionTest.h
index 30a8837c179..64171a8b229 100644
--- a/Framework/CurveFitting/test/CompositeFunctionTest.h
+++ b/Framework/CurveFitting/test/CompositeFunctionTest.h
@@ -18,7 +18,7 @@
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
#include "MantidCurveFitting/UserFunction.h"
#include "MantidCurveFitting/ExpDecay.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/GSLJacobian.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
@@ -29,6 +29,7 @@ using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::FuncMinimisers;
+using namespace Mantid::CurveFitting::CostFunctions;
typedef Mantid::DataObjects::Workspace2D_sptr WS_type;
typedef Mantid::DataObjects::TableWorkspace_sptr TWS_type;
diff --git a/Framework/CurveFitting/test/CostFunctions/CostFuncUnweightedLeastSquaresTest.h b/Framework/CurveFitting/test/CostFunctions/CostFuncUnweightedLeastSquaresTest.h
index 9af27bd25c6..6b79954f49e 100644
--- a/Framework/CurveFitting/test/CostFunctions/CostFuncUnweightedLeastSquaresTest.h
+++ b/Framework/CurveFitting/test/CostFunctions/CostFuncUnweightedLeastSquaresTest.h
@@ -9,7 +9,7 @@
#include <boost/make_shared.hpp>
-using Mantid::CurveFitting::CostFuncUnweightedLeastSquares;
+using Mantid::CurveFitting::CostFunctions::CostFuncUnweightedLeastSquares;
using namespace Mantid::API;
class CostFuncUnweightedLeastSquaresTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h b/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h
index db3b9067e41..e8975402aa1 100644
--- a/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h
+++ b/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h
@@ -22,6 +22,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::FuncMinimisers;
+using namespace Mantid::CurveFitting::CostFunctions;
using namespace Mantid::API;
class LeastSquaresTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
index 8bfc1e4edb6..371e8ea25eb 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
@@ -15,6 +15,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::FuncMinimisers;
+using namespace Mantid::CurveFitting::CostFunctions;
using namespace Mantid::API;
class DampingMinimizerTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
index efb19202d29..3a72c2dc30a 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
@@ -15,6 +15,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::FuncMinimisers;
+using namespace Mantid::CurveFitting::CostFunctions;
using namespace Mantid::API;
class LevenbergMarquardtMDTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
index b270a643d3f..9a7d43075b0 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
@@ -15,6 +15,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::FuncMinimisers;
+using namespace Mantid::CurveFitting::CostFunctions;
using namespace Mantid::API;
class LevenbergMarquardtTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/GaussianTest.h b/Framework/CurveFitting/test/GaussianTest.h
index 275a955824c..5ccebfd79b5 100644
--- a/Framework/CurveFitting/test/GaussianTest.h
+++ b/Framework/CurveFitting/test/GaussianTest.h
@@ -31,6 +31,7 @@ using namespace Mantid;
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::CostFunctions;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
diff --git a/Framework/CurveFitting/test/MultiDomainFunctionTest.h b/Framework/CurveFitting/test/MultiDomainFunctionTest.h
index 434d3e5c518..5061940cfea 100644
--- a/Framework/CurveFitting/test/MultiDomainFunctionTest.h
+++ b/Framework/CurveFitting/test/MultiDomainFunctionTest.h
@@ -9,7 +9,7 @@
#include "MantidAPI/ParamFunction.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/FrameworkManager.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
+#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
#include "MantidCurveFitting/Fit.h"
@@ -23,6 +23,7 @@
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::CostFunctions;
class MultiDomainFunctionTest_Function : public virtual IFunction1D,
public virtual ParamFunction {
--
GitLab
From 0507813898ffb9eb4a24293429fe258ef749dc59 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Thu, 8 Oct 2015 12:03:22 +0100
Subject: [PATCH 066/223] MultiBG File no longer used, not included in
cmakelists
re #13347
---
.../inc/MantidCurveFitting/MultiBG.h | 110 -------
Framework/CurveFitting/src/MultiBG.cpp | 307 ------------------
2 files changed, 417 deletions(-)
delete mode 100644 Framework/CurveFitting/inc/MantidCurveFitting/MultiBG.h
delete mode 100644 Framework/CurveFitting/src/MultiBG.cpp
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/MultiBG.h b/Framework/CurveFitting/inc/MantidCurveFitting/MultiBG.h
deleted file mode 100644
index 506d7e7f047..00000000000
--- a/Framework/CurveFitting/inc/MantidCurveFitting/MultiBG.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef MANTID_CURVEFITTING_MULTIBG_H_
-#define MANTID_CURVEFITTING_MULTIBG_H_
-
-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
-#include "MantidAPI/CompositeFunction.h"
-#include "MantidAPI/IFunctionMW.h"
-#include "MantidAPI/MatrixWorkspace_fwd.h"
-
-#ifdef _WIN32
-#pragma warning(disable : 4250)
-#endif
-
-namespace Mantid {
-
-namespace API {
-class WorkspaceGroup;
-}
-
-namespace CurveFitting {
-/** A composite function.
-
- @author Roman Tolchenov, Tessella Support Services plc
- @date 19/08/2011
-
- Copyright © 2009 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
- National Laboratory & European Spallation Source
-
- This file is part of Mantid.
-
- Mantid is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- Mantid is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- File change history is stored at: <https://github.com/mantidproject/mantid>.
- Code Documentation is available at: <http://doxygen.mantidproject.org>
-*/
-class DLLExport MultiBG : public API::CompositeFunction {
-public:
- /// Default constructor
- MultiBG() : API::CompositeFunction() {}
- /// Destructor
- virtual ~MultiBG();
-
- /* Overriden methods */
-
- using CompositeFunction::setWorkspace;
- virtual void setWorkspace(boost::shared_ptr<const API::Workspace>) {}
- /// Set the workspace
- void setWorkspace(boost::shared_ptr<const API::Workspace> ws, bool copyData);
- void setSlicing(const std::string &slicing);
- virtual boost::shared_ptr<const API::Workspace> getWorkspace() const {
- return m_spectra[0].first;
- }
- /// Returns the function's name
- std::string name() const { return "MultiBG"; }
- /// Returns the function's category
- virtual const std::string category() const { return "Background"; }
-
- virtual void function(API::FunctionDomain &) const {}
-
- /// Returns the size of the fitted data (number of double values returned by
- /// the function)
- virtual size_t dataSize() const { return m_data.size(); }
- /// Returns a reference to the fitted data. These data are taken from the
- /// workspace set by setWorkspace() method.
- virtual const double *getData() const { return &m_data[0]; }
- virtual const double *getWeights() const { return &m_weights[0]; }
- /// Function you want to fit to.
- void function(double *out) const;
- /// Derivatives of function with respect to active parameters
- void functionDeriv(API::Jacobian *out);
- void functionDeriv(API::FunctionDomain &domain, API::Jacobian &jacobian) {
- API::IFunction::functionDeriv(domain, jacobian);
- }
-
-protected:
- boost::shared_ptr<API::WorkspaceGroup> createCalculatedWorkspaceGroup(
- const std::vector<double> &sd = std::vector<double>());
-
- boost::shared_ptr<const API::MatrixWorkspace> m_workspace;
-
- /// to collect different workspaces found in child functions
- std::vector<std::pair<boost::shared_ptr<const API::MatrixWorkspace>, size_t>>
- m_spectra;
- /// to store function indices to workspaces: m_funIndex[i] gives vector of
- /// indexes of m_spectra for function i
- std::vector<std::vector<size_t>> m_funIndex;
- /// the data vector which is a composition of all fitted spectra
- std::vector<double> m_data;
- /// the vector of fitting weights, one for each value in m_data
- std::vector<double> m_weights;
- /// offsets of particular workspaces in the m_data and m_weights arrays
- std::vector<size_t> m_offset;
-};
-
-} // namespace CurveFitting
-} // namespace Mantid
-
-#endif /*MANTID_CURVEFITTING_MULTIBG_H_*/
diff --git a/Framework/CurveFitting/src/MultiBG.cpp b/Framework/CurveFitting/src/MultiBG.cpp
deleted file mode 100644
index 284b6ce3390..00000000000
--- a/Framework/CurveFitting/src/MultiBG.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
-#include "MantidCurveFitting/MultiBG.h"
-#include "MantidAPI/IFunctionMW.h"
-#include "MantidAPI/Expression.h"
-#include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/WorkspaceGroup.h"
-#include "MantidAPI/FunctionFactory.h"
-
-#include <boost/lambda/lambda.hpp>
-#include <boost/lexical_cast.hpp>
-
-#include <sstream>
-#include <iostream>
-#include <algorithm>
-#include <iterator>
-#include <float.h>
-
-using namespace boost::lambda;
-
-namespace Mantid {
-namespace CurveFitting {
-
-DECLARE_FUNCTION(MultiBG)
-
-/** A Jacobian for individual functions
- */
-class PartialJacobian : public API::Jacobian {
- API::Jacobian *m_J; ///< pointer to the overall Jacobian
- size_t m_iY0; ///< data array offset in the overall Jacobian for a particular
- /// function
- size_t m_iP0; ///< parameter offset in the overall Jacobian for a particular
- /// function
- size_t m_iaP0; ///< offset in the active Jacobian for a particular function
-public:
- /** Constructor
- * @param J :: A pointer to the overall Jacobian
- * @param iY0 :: Data array offset index (declared) for a particular function
- * @param iP0 :: The parameter index (declared) offset for a particular
- * function
- * @param iap0 :: The active parameter index (declared) offset for a
- * particular function
- */
- PartialJacobian(API::Jacobian *J, size_t iY0, size_t iP0, size_t iap0)
- : m_J(J), m_iY0(iY0), m_iP0(iP0), m_iaP0(iap0) {}
- /**
- * Overridden Jacobian::set(...).
- * @param iY :: The index of the data point
- * @param iP :: The parameter index of an individual function.
- * @param value :: The derivative value
- */
- void set(size_t iY, size_t iP, double value) {
- m_J->set(m_iY0 + iY, m_iP0 + iP, value);
- }
- /**
- * Overridden Jacobian::get(...).
- * @param iY :: The index of the data point
- * @param iP :: The parameter index of an individual function.
- */
- double get(size_t iY, size_t iP) { return m_J->get(m_iY0 + iY, m_iP0 + iP); }
- /** Add number to all iY (data) Jacobian elements for a given iP (parameter)
- * @param value :: Value to add
- * @param iActiveP :: The index of an active parameter.
- */
- virtual void addNumberToColumn(const double &value, const size_t &iActiveP) {
- m_J->addNumberToColumn(value, m_iaP0 + iActiveP);
- }
-};
-
-/// Destructor
-MultiBG::~MultiBG() {}
-
-/**
- * Function you want to fit to.
- */
-void MultiBG::function(double *out) const {
- std::vector<double> tmpOut(dataSize());
- std::fill_n(out, dataSize(), 0);
- for (size_t i = 0; i < nFunctions(); i++) {
- IFitFunction *fun = dynamic_cast<IFitFunction *>(getFunction(i));
- if (!fun) {
- throw std::runtime_error(
- "IFitFunction expected but function of another type found");
- }
- size_t nWS = m_funIndex[i].size();
- for (size_t k = 0; k < nWS; ++k) {
- size_t j = m_funIndex[i][k];
- fun->setWorkspace(m_spectra[k].first,
- "WorkspaceIndex=" + boost::lexical_cast<std::string>(
- m_spectra[j].second),
- false);
- // std::cerr << i << ' ' << k << " Function " << fun->name() << " ws " <<
- // fun->getWorkspace()->getName() << " wi "
- // << dynamic_cast<Mantid::API::IFunctionMW*>(fun)->getWorkspaceIndex()
- // << std::endl;
- double *out1 = out + m_offset[j];
- double *tmp1 = &tmpOut[0] + m_offset[j];
- size_t nData = 0;
- if (j < m_offset.size() - 1)
- nData = m_offset[j + 1] - m_offset[j];
- else
- nData = dataSize() - m_offset[j];
- if (i == 0) {
- fun->function(out1);
- } else {
- fun->function(tmp1);
- std::transform(out1, out1 + nData, tmp1, out1, std::plus<double>());
- }
- }
- }
- // std::cerr << "Function:\n";
- // for(size_t i = 0; i<nParams();++i)
- //{
- // std::cerr << getParameter(i) << ' ' ;
- //}
- // std::cerr << std::endl;
- // std::for_each(out,out+m_dataSize,std::cerr << _1 << '\n');
- // std::cerr << std::endl;
-}
-
-void MultiBG::functionDeriv(API::Jacobian *out) {
- // it is possible that out is NULL
- if (!out)
- return;
- for (size_t i = 0; i < nFunctions(); i++) {
- IFitFunction *fun = dynamic_cast<IFitFunction *>(getFunction(i));
- if (!fun) {
- throw std::runtime_error(
- "IFitFunction expected but function of another type found");
- }
- size_t nWS = m_funIndex[i].size();
- for (size_t k = 0; k < nWS; ++k) {
- size_t j = m_funIndex[i][k];
- fun->setWorkspace(m_spectra[k].first,
- "WorkspaceIndex=" + boost::lexical_cast<std::string>(
- m_spectra[j].second),
- false);
- PartialJacobian J(out, m_offset[j], paramOffset(i), activeOffset(i));
- fun->functionDeriv(&J);
- }
- }
-}
-
-void MultiBG::setWorkspace(boost::shared_ptr<const API::Workspace> ws, bool) {
- boost::shared_ptr<const API::MatrixWorkspace> mws =
- boost::dynamic_pointer_cast<const API::MatrixWorkspace>(ws);
- if (ws && !mws) {
- throw std::invalid_argument(
- "Workspace in MultiBG has a wrong type (not a MatrixWorkspace)");
- }
- m_workspace = mws;
-}
-/**
- * Sets workspaces to member functions. Constructs the data set for fitting.
- * @param slicing :: A map between member functions and workspaces or empty
- * string. Format:
- * "f0,Workspace0,i0;f1,Workspace1,i1;f2,Workspace2,i2;..."
- */
-void MultiBG::setSlicing(const std::string &slicing) {
- boost::shared_ptr<const API::MatrixWorkspace> mws = m_workspace;
-
- m_funIndex.resize(nFunctions());
-
- if (!slicing.empty()) {
- Mantid::API::Expression expr;
- expr.parse(slicing);
- // expr can be treated as a list even if it has only 1 term
- expr.toList(";");
- for (size_t i = 0; i < expr.size(); ++i) {
- const Mantid::API::Expression &e = expr[i];
- if (e.name() != "," || e.size() != 3) {
- // slicing has a wrong format - ignore it
- break;
- }
- try {
- std::string wsName = e[1].name();
- Mantid::API::MatrixWorkspace_sptr ws =
- boost::dynamic_pointer_cast<Mantid::API::MatrixWorkspace>(
- Mantid::API::AnalysisDataService::Instance().retrieve(wsName));
-
- size_t iFun = boost::lexical_cast<size_t>(e[0].name().substr(1));
- size_t wi = boost::lexical_cast<size_t>(e[2].name());
- if (iFun >= nFunctions()) {
- throw std::invalid_argument("MultiBG::setWorkspace: function " +
- e[0].name() + " not found");
- }
- std::pair<boost::shared_ptr<const API::MatrixWorkspace>, size_t>
- spectrum = std::make_pair(ws, wi);
- m_funIndex[iFun].push_back(m_spectra.size());
- m_spectra.push_back(spectrum);
- IFitFunction *fun = dynamic_cast<IFitFunction *>(getFunction(iFun));
- if (!fun) {
- throw std::runtime_error(
- "IFitFunction expected but function of another type found");
- }
- fun->setWorkspace(ws, "WorkspaceIndex=" + e[2].name(), false);
- } catch (...) {
- break;
- }
- }
- }
-
- // examine the member functions and fill in the m_funIndex array
- for (size_t iFun = 0; iFun < nFunctions(); iFun++) {
- API::IFunctionMW *fun = dynamic_cast<API::IFunctionMW *>(getFunction(iFun));
- if (!fun) {
- throw std::runtime_error("MultiBG works with IFunctionMW only");
- }
- if (fun->getWorkspace()) {
- boost::shared_ptr<const API::MatrixWorkspace> iws =
- fun->getMatrixWorkspace();
- std::pair<boost::shared_ptr<const API::MatrixWorkspace>, size_t>
- spectrum = std::make_pair(iws, fun->getWorkspaceIndex());
- std::vector<std::pair<boost::shared_ptr<const API::MatrixWorkspace>,
- size_t>>::iterator it =
- std::find(m_spectra.begin(), m_spectra.end(), spectrum);
- size_t i;
- if (it == m_spectra.end()) {
- i = m_spectra.size();
- m_spectra.push_back(spectrum);
- } else {
- i = size_t(std::distance(it, m_spectra.begin()));
- }
- m_funIndex[iFun].push_back(i);
- // fun->setWorkspace(boost::static_pointer_cast<const
- // API::Workspace>(iws),slicing,false);
- }
- }
-
- // setWorkspace can be called by GUI when the function had not been properly
- // initialized
- if (m_spectra.empty()) {
- return;
- }
-
- // make functions without set workspace fit to all workspaces
- for (size_t iFun = 0; iFun < nFunctions(); iFun++) {
- std::vector<size_t> &index = m_funIndex[iFun];
- if (index.empty()) {
- index.resize(m_spectra.size());
- int i = 0;
- std::for_each(index.begin(), index.end(), _1 = var(i)++);
- IFitFunction *fun = dynamic_cast<IFitFunction *>(getFunction(iFun));
- if (!fun) {
- throw std::runtime_error(
- "IFitFunction expected but function of another type found");
- }
- fun->setWorkspace(m_spectra[0].first,
- "WorkspaceIndex=" + boost::lexical_cast<std::string>(
- m_spectra[0].second),
- false);
- }
- }
-
- // set dimensions and calculate ws's contribution to m_dataSize
- // IFunctionMW::setWorkspace(ws,slicing,false);
- // add other workspaces
- m_offset.resize(m_spectra.size(), 0);
- size_t nData = 0;
- for (size_t i = 0; i < m_spectra.size(); ++i) {
- mws = m_spectra[i].first;
- size_t n = mws->blocksize();
- m_offset[i] = nData;
- nData += static_cast<int>(n);
- }
-
- m_data.resize(nData);
- m_weights.resize(nData);
-
- //... fill in the data and the weights ...
-
- for (size_t i = 0; i < m_spectra.size(); ++i) {
- mws = m_spectra[i].first;
- size_t wi = m_spectra[i].second;
- const Mantid::MantidVec &Y = mws->readY(wi);
- const Mantid::MantidVec &E = mws->readE(wi);
- size_t j0 = m_offset[i];
- for (size_t j = 0; j < Y.size(); ++j) {
- m_data[j0 + j] = Y[j];
- double err = E[j];
- m_weights[j0 + j] = err != 0.0 ? 1. / err : 1.0;
- }
- }
-
- // std::cerr << "Workspace:\n";
- // std::for_each(&m_data[0],&m_data[0]+m_dataSize,std::cerr << _1 << '\n');
-}
-
-/**
- * Creates a workspace containing values calculated with this function. It takes
- * a workspace and ws index
- * of a spectrum which this function may have been fitted to. The output
- * contains the original spectrum
- * (wi = 0), the calculated values (ws = 1), and the difference between them (ws
- * = 2).
- * @param sd :: optional standard deviations of the parameters for calculating
- * the error bars
- * @return created workspase
- */
-boost::shared_ptr<API::WorkspaceGroup>
-MultiBG::createCalculatedWorkspaceGroup(const std::vector<double> &sd) {
- UNUSED_ARG(sd)
- return boost::shared_ptr<API::WorkspaceGroup>();
-}
-} // namespace API
-} // namespace Mantid
--
GitLab
From f1db9a408bb69c6bc6d5711028de6597bf9eaee8 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 13:15:45 +0100
Subject: [PATCH 067/223] iostream out - all non-test headers (but incl test
helpers), re #13689
---
.../Crystal/SymmetryOperationFactory.h | 7 ++-
.../ICat/inc/MantidICat/GSoap/stdsoap2.h | 1 -
Framework/ICat/src/GSoap/stdsoap2.cpp | 4 ++
Framework/Kernel/inc/MantidKernel/ANN/ANN.h | 2 +-
Framework/Kernel/src/ANN/ANN.cpp | 1 +
.../MantidMDAlgorithms/LoadILLAsciiHelper.h | 1 -
.../inc/MantidTestHelpers/FakeObjects.h | 10 ++---
.../inc/MantidTestHelpers/ScopedFileHelper.h | 7 +--
.../src/Mantid/InstrumentWidget/GLColor.cpp | 2 +
.../src/Mantid/InstrumentWidget/GLColor.h | 2 +-
.../src/Mantid/InstrumentWidget/RectF.h | 2 +-
MantidPlot/src/Mantid/MantidMatrix.h | 43 +++++++++----------
MantidQt/API/inc/MantidQtAPI/Message.h | 2 -
.../inc/MantidQtSliceViewer/ColorBarWidget.h | 1 -
Vates/VatesAPI/inc/MantidVatesAPI/BoxInfo.h | 1 -
15 files changed, 42 insertions(+), 44 deletions(-)
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
index eabe3833aea..7a348ca0714 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
@@ -1,16 +1,15 @@
#ifndef MANTID_GEOMETRY_SYMMETRYOPERATIONFACTORY_H_
#define MANTID_GEOMETRY_SYMMETRYOPERATIONFACTORY_H_
+#include <list>
+#include <map>
+
#include "MantidGeometry/DllConfig.h"
#include "MantidKernel/SingletonHolder.h"
#include "MantidGeometry/Crystal/SymmetryOperation.h"
#include "MantidGeometry/Crystal/SymmetryOperationSymbolParser.h"
#include "MantidKernel/RegistrationHelper.h"
-#include <list>
-#include <map>
-#include <iostream>
-
namespace Mantid {
namespace Geometry {
/**
diff --git a/Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h b/Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h
index b3d14389304..e80b4e0c43f 100644
--- a/Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h
+++ b/Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h
@@ -639,7 +639,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
#if defined(__cplusplus) && !defined(WITH_LEAN) && !defined(WITH_COMPAT)
#include <string>
-#include <iostream>
#endif
#ifdef WITH_NOHTTP
diff --git a/Framework/ICat/src/GSoap/stdsoap2.cpp b/Framework/ICat/src/GSoap/stdsoap2.cpp
index b6eda2bb1b9..ec26daa1e2e 100644
--- a/Framework/ICat/src/GSoap/stdsoap2.cpp
+++ b/Framework/ICat/src/GSoap/stdsoap2.cpp
@@ -59,6 +59,10 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
#include "MantidICat/GSoap/stdsoap2.h"
+#if defined(__cplusplus) && !defined(WITH_LEAN) && !defined(WITH_COMPAT)
+#include <iostream>
+#endif
+
#if defined(VXWORKS) && defined(WM_SECURE_KEY_STORAGE)
#include <ipcom_key_db.h>
#endif
diff --git a/Framework/Kernel/inc/MantidKernel/ANN/ANN.h b/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
index db5de2b1e41..883617cb529 100644
--- a/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
+++ b/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
@@ -109,7 +109,7 @@
#include <cstdlib> // standard lib includes
#include <cmath> // math includes
-#include <iostream> // I/O streams
+#include <iosfwd> // I/O streams
#include <cstring> // C-style strings
//----------------------------------------------------------------------
diff --git a/Framework/Kernel/src/ANN/ANN.cpp b/Framework/Kernel/src/ANN/ANN.cpp
index 67f9c84987e..3cba35cc6c6 100644
--- a/Framework/Kernel/src/ANN/ANN.cpp
+++ b/Framework/Kernel/src/ANN/ANN.cpp
@@ -27,6 +27,7 @@
//----------------------------------------------------------------------
#include <cstdlib> // C standard lib defs
+#include <iostream> // I/O streams
#include "MantidKernel/ANN/ANNx.h" // all ANN includes
#include "MantidKernel/ANN/ANNperf.h" // ANN Perf Header
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadILLAsciiHelper.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadILLAsciiHelper.h
index f4e5d2fadaf..d2005ab91e8 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadILLAsciiHelper.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadILLAsciiHelper.h
@@ -3,7 +3,6 @@
#include "MantidMDAlgorithms/DllConfig.h"
-#include <iostream>
#include <fstream>
#include <vector>
#include <string>
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/FakeObjects.h b/Framework/TestHelpers/inc/MantidTestHelpers/FakeObjects.h
index d114a1ee434..b9c906a2804 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/FakeObjects.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/FakeObjects.h
@@ -18,19 +18,19 @@
* Author: Janik Zikovsky
*/
+#include <fstream>
+#include <map>
+#include <string>
+
#include "MantidAPI/ISpectrum.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidKernel/cow_ptr.h"
#include "MantidAPI/RefAxis.h"
#include "MantidAPI/SpectraAxis.h"
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidGeometry/Instrument/INearestNeighbours.h"
-#include <iostream>
-#include <fstream>
-#include <map>
-#include <string>
+#include "MantidKernel/cow_ptr.h"
using namespace Mantid::API;
using namespace Mantid::Kernel;
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/ScopedFileHelper.h b/Framework/TestHelpers/inc/MantidTestHelpers/ScopedFileHelper.h
index e1701b8e755..430cba7905b 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/ScopedFileHelper.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/ScopedFileHelper.h
@@ -1,12 +1,13 @@
//------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------
-#include <string>
-#include <iostream>
#include <fstream>
-#include <Poco/Path.h>
+#include <string>
+
#include "MantidKernel/ConfigService.h"
+#include <Poco/Path.h>
+
namespace ScopedFileHelper {
/** File object type. Provides exception save file creation/destruction.
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/GLColor.cpp b/MantidPlot/src/Mantid/InstrumentWidget/GLColor.cpp
index a7fe4c671ca..2c232127ba1 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/GLColor.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/GLColor.cpp
@@ -4,6 +4,8 @@
#include "GLColor.h"
#include "MantidGeometry/Rendering/OpenGL_Headers.h"
+#include <iostream>
+
/**
* Default Constructor
* @param red :: The red component of the RGB colour
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/GLColor.h b/MantidPlot/src/Mantid/InstrumentWidget/GLColor.h
index 612efad0ba0..8bbe5681766 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/GLColor.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/GLColor.h
@@ -1,7 +1,7 @@
#ifndef GLCOLOR_H_
#define GLCOLOR_H_
-#include <iostream>
+#include <iosfwd>
/**
\class GLColor
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/RectF.h b/MantidPlot/src/Mantid/InstrumentWidget/RectF.h
index 570edc68c82..2a2bbc99e6a 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/RectF.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/RectF.h
@@ -7,7 +7,7 @@
#include <QTransform>
#include <algorithm>
-#include <iostream>
+#include <iosfwd>
#include <stdexcept>
#include <cmath>
diff --git a/MantidPlot/src/Mantid/MantidMatrix.h b/MantidPlot/src/Mantid/MantidMatrix.h
index a26a55d01a9..84aed7cef47 100644
--- a/MantidPlot/src/Mantid/MantidMatrix.h
+++ b/MantidPlot/src/Mantid/MantidMatrix.h
@@ -1,6 +1,26 @@
#ifndef MANTIDMATRIX_H
#define MANTIDMATRIX_H
+#include <map>
+#include <math.h>
+#include <string>
+
+#include "MantidMatrixExtensionRequest.h"
+#include "MantidMatrixModel.h"
+#include "MantidMatrixTabExtension.h"
+
+#include "Mantid/IProjectSerialisable.h"
+#include "MantidAPI/AnalysisDataService.h"
+#include "MantidAPI/FrameworkManager.h"
+#include "MantidAPI/MatrixWorkspace_fwd.h"
+#include "MantidQtAPI/WorkspaceObserver.h"
+#include "../ContourLinesEditor.h"
+#include "../Graph.h"
+#include "../MdiSubWindow.h"
+#include "../UserFunction.h"
+
+#include <Poco/NObserver.h>
+
#include <QHeaderView>
#include <QTableView>
#include <QPrinter>
@@ -11,32 +31,9 @@
#include <QMap>
#include <QPointer>
-#include <Poco/NObserver.h>
-
-#include "MantidAPI/MatrixWorkspace_fwd.h"
-#include "MantidAPI/AnalysisDataService.h"
-#include "../UserFunction.h"
-#include "../MdiSubWindow.h"
-#include "../Graph.h"
-#include "MantidQtAPI/WorkspaceObserver.h"
-#include "Mantid/IProjectSerialisable.h"
-
#include <qwt_double_rect.h>
#include <qwt_color_map.h>
-#include <math.h>
-#include <string>
-#include <iostream>
-#include <map>
-
-#include "MantidAPI/FrameworkManager.h"
-#include "../ContourLinesEditor.h"
-
-#include "MantidMatrixExtensionRequest.h"
-#include "MantidMatrixModel.h"
-#include "MantidMatrixTabExtension.h"
-
-
class QLabel;
class QStackedWidget;
class QShortcut;
diff --git a/MantidQt/API/inc/MantidQtAPI/Message.h b/MantidQt/API/inc/MantidQtAPI/Message.h
index c14f3a1fd7a..6ce90fd8914 100644
--- a/MantidQt/API/inc/MantidQtAPI/Message.h
+++ b/MantidQt/API/inc/MantidQtAPI/Message.h
@@ -12,8 +12,6 @@
#include <QObject>
#include <QString>
-#include <iostream>
-
//----------------------------------------------------------
// Forward declarations
//----------------------------------------------------------
diff --git a/MantidQt/SliceViewer/inc/MantidQtSliceViewer/ColorBarWidget.h b/MantidQt/SliceViewer/inc/MantidQtSliceViewer/ColorBarWidget.h
index a6b08722eee..c2f95a52d16 100644
--- a/MantidQt/SliceViewer/inc/MantidQtSliceViewer/ColorBarWidget.h
+++ b/MantidQt/SliceViewer/inc/MantidQtSliceViewer/ColorBarWidget.h
@@ -6,7 +6,6 @@
#include <qwt_color_map.h>
#include <qwt_scale_widget.h>
#include "MantidQtAPI/MantidColorMap.h"
-#include <iostream>
#include <QKeyEvent>
#include <QtGui>
#include "DllOption.h"
diff --git a/Vates/VatesAPI/inc/MantidVatesAPI/BoxInfo.h b/Vates/VatesAPI/inc/MantidVatesAPI/BoxInfo.h
index b2f5520e9d5..dec4eabbd7d 100644
--- a/Vates/VatesAPI/inc/MantidVatesAPI/BoxInfo.h
+++ b/Vates/VatesAPI/inc/MantidVatesAPI/BoxInfo.h
@@ -2,7 +2,6 @@
#define MANTID_VATESAPI_BOXINFO_H
#include "MantidKernel/System.h"
-#include <iostream>
#include <boost/optional.hpp>
namespace Mantid
--
GitLab
From be845bd6358b184b3aabca8e49745f2849c9e170 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 13:18:38 +0100
Subject: [PATCH 068/223] tests in DataObjects, GPUAlgorithms, Kernel,
LiveData, re #13689
---
Framework/DataObjects/test/CoordTransformAlignedTest.h | 2 --
Framework/DataObjects/test/CoordTransformDistanceTest.h | 2 --
Framework/DataObjects/test/EventWorkspaceMRUTest.h | 2 --
Framework/DataObjects/test/GroupingWorkspaceTest.h | 2 --
Framework/DataObjects/test/MDBinTest.h | 2 --
Framework/DataObjects/test/MDBoxBaseTest.h | 2 --
Framework/DataObjects/test/MDBoxIteratorTest.h | 2 --
Framework/DataObjects/test/MDEventFactoryTest.h | 2 --
Framework/DataObjects/test/MDGridBoxTest.h | 1 -
Framework/DataObjects/test/MDHistoWorkspaceTest.h | 2 --
Framework/DataObjects/test/MDLeanEventTest.h | 2 --
Framework/DataObjects/test/OffsetsWorkspaceTest.h | 2 --
Framework/DataObjects/test/PeakColumnTest.h | 2 --
Framework/DataObjects/test/PeakTest.h | 2 --
Framework/DataObjects/test/PeaksWorkspaceTest.h | 2 --
Framework/DataObjects/test/RebinnedOutputTest.h | 2 --
Framework/DataObjects/test/SpecialWorkspace2DTest.h | 2 --
Framework/DataObjects/test/SplittersWorkspaceTest.h | 2 --
Framework/DataObjects/test/TableColumnTest.h | 1 -
Framework/GPUAlgorithms/test/GPUAlgorithmTest.h | 1 -
Framework/GPUAlgorithms/test/GPUTesterTest.h | 1 -
Framework/Kernel/test/ArrayLengthValidatorTest.h | 2 --
Framework/Kernel/test/BoseEinsteinDistributionTest.h | 2 --
Framework/Kernel/test/CPUTimerTest.h | 2 --
Framework/Kernel/test/CompositeValidatorTest.h | 2 --
Framework/Kernel/test/DiskBufferISaveableTest.h | 2 --
Framework/Kernel/test/DiskBufferTest.h | 2 --
Framework/Kernel/test/EnabledWhenPropertyTest.h | 2 --
Framework/Kernel/test/FreeBlockTest.h | 2 --
Framework/Kernel/test/FunctionTaskTest.h | 2 --
Framework/Kernel/test/HermitePolynomialsTest.h | 1 -
Framework/Kernel/test/IPropertySettingsTest.h | 2 --
Framework/Kernel/test/ISaveableTest.h | 2 --
Framework/Kernel/test/LogParserTest.h | 1 -
Framework/Kernel/test/MagneticFormFactorTableTest.h | 1 -
Framework/Kernel/test/MemoryTest.h | 2 --
Framework/Kernel/test/MutexTest.h | 1 -
Framework/Kernel/test/ProgressBaseTest.h | 2 --
Framework/Kernel/test/ProgressTextTest.h | 2 --
Framework/Kernel/test/StdoutChannelTest.h | 1 -
Framework/Kernel/test/TaskTest.h | 2 --
Framework/Kernel/test/ThreadPoolRunnableTest.h | 2 --
Framework/Kernel/test/ThreadPoolTest.h | 2 --
Framework/Kernel/test/ThreadSchedulerMutexesTest.h | 2 --
Framework/Kernel/test/ThreadSchedulerTest.h | 2 --
Framework/Kernel/test/UnitConversionTest.h | 1 -
Framework/Kernel/test/UtilsTest.h | 2 --
Framework/Kernel/test/VMDTest.h | 2 --
Framework/Kernel/test/VectorHelperTest.h | 2 --
Framework/Kernel/test/VisibleWhenPropertyTest.h | 2 --
Framework/LiveData/test/LiveDataAlgorithmTest.h | 2 --
Framework/LiveData/test/LoadLiveDataTest.h | 2 --
Framework/LiveData/test/MonitorLiveDataTest.h | 2 --
Framework/LiveData/test/StartLiveDataTest.h | 2 --
54 files changed, 98 deletions(-)
diff --git a/Framework/DataObjects/test/CoordTransformAlignedTest.h b/Framework/DataObjects/test/CoordTransformAlignedTest.h
index f15e0fe7a0a..746bebcae5d 100644
--- a/Framework/DataObjects/test/CoordTransformAlignedTest.h
+++ b/Framework/DataObjects/test/CoordTransformAlignedTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataObjects/CoordTransformAligned.h"
#include "MantidKernel/Matrix.h"
diff --git a/Framework/DataObjects/test/CoordTransformDistanceTest.h b/Framework/DataObjects/test/CoordTransformDistanceTest.h
index 27774e7bf32..77ac156e205 100644
--- a/Framework/DataObjects/test/CoordTransformDistanceTest.h
+++ b/Framework/DataObjects/test/CoordTransformDistanceTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/Timer.h"
#include "MantidDataObjects/CoordTransformDistance.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include "MantidAPI/CoordTransform.h"
#include <boost/scoped_ptr.hpp>
diff --git a/Framework/DataObjects/test/EventWorkspaceMRUTest.h b/Framework/DataObjects/test/EventWorkspaceMRUTest.h
index 75dafe93107..3d66875d8dc 100644
--- a/Framework/DataObjects/test/EventWorkspaceMRUTest.h
+++ b/Framework/DataObjects/test/EventWorkspaceMRUTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataObjects/EventWorkspaceMRU.h"
diff --git a/Framework/DataObjects/test/GroupingWorkspaceTest.h b/Framework/DataObjects/test/GroupingWorkspaceTest.h
index de94e12bb93..ee0db8b637f 100644
--- a/Framework/DataObjects/test/GroupingWorkspaceTest.h
+++ b/Framework/DataObjects/test/GroupingWorkspaceTest.h
@@ -7,8 +7,6 @@
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/DataObjects/test/MDBinTest.h b/Framework/DataObjects/test/MDBinTest.h
index 58746ad2f11..451ddc9e074 100644
--- a/Framework/DataObjects/test/MDBinTest.h
+++ b/Framework/DataObjects/test/MDBinTest.h
@@ -6,8 +6,6 @@
#include "MantidDataObjects/MDBin.h"
#include "MantidDataObjects/MDEventFactory.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::DataObjects;
diff --git a/Framework/DataObjects/test/MDBoxBaseTest.h b/Framework/DataObjects/test/MDBoxBaseTest.h
index fe6cf915099..1efac0d8869 100644
--- a/Framework/DataObjects/test/MDBoxBaseTest.h
+++ b/Framework/DataObjects/test/MDBoxBaseTest.h
@@ -7,8 +7,6 @@
#include "MantidKernel/Timer.h"
#include "MantidDataObjects/MDBoxBase.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <Poco/File.h>
#include "MantidAPI/CoordTransform.h"
diff --git a/Framework/DataObjects/test/MDBoxIteratorTest.h b/Framework/DataObjects/test/MDBoxIteratorTest.h
index 54f0c4ef0bd..cebfb6ab66f 100644
--- a/Framework/DataObjects/test/MDBoxIteratorTest.h
+++ b/Framework/DataObjects/test/MDBoxIteratorTest.h
@@ -12,8 +12,6 @@
#include "MantidDataObjects/MDBox.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <gmock/gmock.h>
using namespace Mantid::DataObjects;
diff --git a/Framework/DataObjects/test/MDEventFactoryTest.h b/Framework/DataObjects/test/MDEventFactoryTest.h
index 5d9a1486e99..35dddb54664 100644
--- a/Framework/DataObjects/test/MDEventFactoryTest.h
+++ b/Framework/DataObjects/test/MDEventFactoryTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include <MantidKernel/Timer.h>
#include <MantidKernel/System.h>
-#include <iostream>
-#include <iomanip>
#include <MantidDataObjects/MDEventFactory.h>
diff --git a/Framework/DataObjects/test/MDGridBoxTest.h b/Framework/DataObjects/test/MDGridBoxTest.h
index 0f8321bc99b..343c1507c85 100644
--- a/Framework/DataObjects/test/MDGridBoxTest.h
+++ b/Framework/DataObjects/test/MDGridBoxTest.h
@@ -27,7 +27,6 @@
#include <boost/random/variate_generator.hpp>
#include <cmath>
#include <cxxtest/TestSuite.h>
-#include <iomanip>
#include <map>
#include <memory>
#include <Poco/File.h>
diff --git a/Framework/DataObjects/test/MDHistoWorkspaceTest.h b/Framework/DataObjects/test/MDHistoWorkspaceTest.h
index 34e0819e614..d289a06ffa2 100644
--- a/Framework/DataObjects/test/MDHistoWorkspaceTest.h
+++ b/Framework/DataObjects/test/MDHistoWorkspaceTest.h
@@ -16,8 +16,6 @@
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include "MantidAPI/ExperimentInfo.h"
#include "MantidKernel/Strings.h"
diff --git a/Framework/DataObjects/test/MDLeanEventTest.h b/Framework/DataObjects/test/MDLeanEventTest.h
index 6bda924df64..89b3bf02ed8 100644
--- a/Framework/DataObjects/test/MDLeanEventTest.h
+++ b/Framework/DataObjects/test/MDLeanEventTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/Timer.h"
#include "MantidDataObjects/MDLeanEvent.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <boost/scoped_array.hpp>
diff --git a/Framework/DataObjects/test/OffsetsWorkspaceTest.h b/Framework/DataObjects/test/OffsetsWorkspaceTest.h
index 64525613150..08f5bff01aa 100644
--- a/Framework/DataObjects/test/OffsetsWorkspaceTest.h
+++ b/Framework/DataObjects/test/OffsetsWorkspaceTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataObjects/OffsetsWorkspace.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
diff --git a/Framework/DataObjects/test/PeakColumnTest.h b/Framework/DataObjects/test/PeakColumnTest.h
index 0c68f2805ff..247db345382 100644
--- a/Framework/DataObjects/test/PeakColumnTest.h
+++ b/Framework/DataObjects/test/PeakColumnTest.h
@@ -8,8 +8,6 @@
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <boost/make_shared.hpp>
-#include <iostream>
-#include <iomanip>
using namespace Mantid::DataObjects;
diff --git a/Framework/DataObjects/test/PeakTest.h b/Framework/DataObjects/test/PeakTest.h
index e2e41b04aa4..43043ba0b1c 100644
--- a/Framework/DataObjects/test/PeakTest.h
+++ b/Framework/DataObjects/test/PeakTest.h
@@ -10,8 +10,6 @@
#include "MantidKernel/V3D.h"
#include "MantidKernel/PhysicalConstants.h"
#include "MantidGeometry/Instrument/ReferenceFrame.h"
-#include <iostream>
-#include <iomanip>
#include <gmock/gmock.h>
#include "MantidDataObjects/Peak.h"
diff --git a/Framework/DataObjects/test/PeaksWorkspaceTest.h b/Framework/DataObjects/test/PeaksWorkspaceTest.h
index dccfacf8b75..3ffb18821ed 100644
--- a/Framework/DataObjects/test/PeaksWorkspaceTest.h
+++ b/Framework/DataObjects/test/PeaksWorkspaceTest.h
@@ -5,9 +5,7 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
#include "MantidAPI/FileProperty.h"
-#include <iostream>
#include <fstream>
-#include <iomanip>
#include <stdio.h>
#include <cmath>
#include "MantidDataObjects/PeaksWorkspace.h"
diff --git a/Framework/DataObjects/test/RebinnedOutputTest.h b/Framework/DataObjects/test/RebinnedOutputTest.h
index 41a3c5e3df6..87535e4f83f 100644
--- a/Framework/DataObjects/test/RebinnedOutputTest.h
+++ b/Framework/DataObjects/test/RebinnedOutputTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataObjects/RebinnedOutput.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/DataObjects/test/SpecialWorkspace2DTest.h b/Framework/DataObjects/test/SpecialWorkspace2DTest.h
index 6ecb30dbf29..9598500b315 100644
--- a/Framework/DataObjects/test/SpecialWorkspace2DTest.h
+++ b/Framework/DataObjects/test/SpecialWorkspace2DTest.h
@@ -8,8 +8,6 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidAPI/WorkspaceProperty.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid::DataObjects;
using namespace Mantid::Geometry;
diff --git a/Framework/DataObjects/test/SplittersWorkspaceTest.h b/Framework/DataObjects/test/SplittersWorkspaceTest.h
index a667a0715f9..45f52e9334e 100644
--- a/Framework/DataObjects/test/SplittersWorkspaceTest.h
+++ b/Framework/DataObjects/test/SplittersWorkspaceTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
#include "MantidAPI/WorkspaceProperty.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataObjects/SplittersWorkspace.h"
diff --git a/Framework/DataObjects/test/TableColumnTest.h b/Framework/DataObjects/test/TableColumnTest.h
index 26288968aab..1e33aa13247 100644
--- a/Framework/DataObjects/test/TableColumnTest.h
+++ b/Framework/DataObjects/test/TableColumnTest.h
@@ -8,7 +8,6 @@
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <boost/make_shared.hpp>
-#include <iostream>
using namespace Mantid::DataObjects;
diff --git a/Framework/GPUAlgorithms/test/GPUAlgorithmTest.h b/Framework/GPUAlgorithms/test/GPUAlgorithmTest.h
index c92156a5773..8128dd50802 100644
--- a/Framework/GPUAlgorithms/test/GPUAlgorithmTest.h
+++ b/Framework/GPUAlgorithms/test/GPUAlgorithmTest.h
@@ -4,7 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
#include <iomanip>
#include "MantidGPUAlgorithms/GPUAlgorithm.h"
diff --git a/Framework/GPUAlgorithms/test/GPUTesterTest.h b/Framework/GPUAlgorithms/test/GPUTesterTest.h
index e1014f01136..70e00ec653f 100644
--- a/Framework/GPUAlgorithms/test/GPUTesterTest.h
+++ b/Framework/GPUAlgorithms/test/GPUTesterTest.h
@@ -4,7 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
#include <iomanip>
#include "MantidGPUAlgorithms/GPUTester.h"
diff --git a/Framework/Kernel/test/ArrayLengthValidatorTest.h b/Framework/Kernel/test/ArrayLengthValidatorTest.h
index fee68f88eb3..11f5912f56b 100644
--- a/Framework/Kernel/test/ArrayLengthValidatorTest.h
+++ b/Framework/Kernel/test/ArrayLengthValidatorTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include <vector>
#include "MantidKernel/ArrayLengthValidator.h"
diff --git a/Framework/Kernel/test/BoseEinsteinDistributionTest.h b/Framework/Kernel/test/BoseEinsteinDistributionTest.h
index 8648aca16e7..99ead0791a9 100644
--- a/Framework/Kernel/test/BoseEinsteinDistributionTest.h
+++ b/Framework/Kernel/test/BoseEinsteinDistributionTest.h
@@ -6,8 +6,6 @@
#include <cxxtest/TestSuite.h>
-#include <iostream>
-#include <iomanip>
class BoseEinsteinDistributionTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/Kernel/test/CPUTimerTest.h b/Framework/Kernel/test/CPUTimerTest.h
index 4e7ce55ff50..802291637de 100644
--- a/Framework/Kernel/test/CPUTimerTest.h
+++ b/Framework/Kernel/test/CPUTimerTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidKernel/CPUTimer.h"
diff --git a/Framework/Kernel/test/CompositeValidatorTest.h b/Framework/Kernel/test/CompositeValidatorTest.h
index c13f5f99099..72f33a82d16 100644
--- a/Framework/Kernel/test/CompositeValidatorTest.h
+++ b/Framework/Kernel/test/CompositeValidatorTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidKernel/CompositeValidator.h"
#include "MantidKernel/BoundedValidator.h"
diff --git a/Framework/Kernel/test/DiskBufferISaveableTest.h b/Framework/Kernel/test/DiskBufferISaveableTest.h
index b75dbfba8bf..d6c674ec286 100644
--- a/Framework/Kernel/test/DiskBufferISaveableTest.h
+++ b/Framework/Kernel/test/DiskBufferISaveableTest.h
@@ -13,8 +13,6 @@
#include <boost/multi_index/mem_fun.hpp>
#include <boost/multi_index/sequenced_index.hpp>
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::Kernel;
diff --git a/Framework/Kernel/test/DiskBufferTest.h b/Framework/Kernel/test/DiskBufferTest.h
index 8da5e7cc4e3..82a451b6ffc 100644
--- a/Framework/Kernel/test/DiskBufferTest.h
+++ b/Framework/Kernel/test/DiskBufferTest.h
@@ -13,8 +13,6 @@
#include <boost/multi_index/mem_fun.hpp>
#include <boost/multi_index/sequenced_index.hpp>
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::Kernel;
diff --git a/Framework/Kernel/test/EnabledWhenPropertyTest.h b/Framework/Kernel/test/EnabledWhenPropertyTest.h
index af3453572a2..20caf9b2657 100644
--- a/Framework/Kernel/test/EnabledWhenPropertyTest.h
+++ b/Framework/Kernel/test/EnabledWhenPropertyTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidKernel/EnabledWhenProperty.h"
#include "MantidKernel/PropertyManager.h"
diff --git a/Framework/Kernel/test/FreeBlockTest.h b/Framework/Kernel/test/FreeBlockTest.h
index 9cf27660d30..1cf4e7408db 100644
--- a/Framework/Kernel/test/FreeBlockTest.h
+++ b/Framework/Kernel/test/FreeBlockTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::Kernel;
diff --git a/Framework/Kernel/test/FunctionTaskTest.h b/Framework/Kernel/test/FunctionTaskTest.h
index b1ce5a46108..48c4c3dcd27 100644
--- a/Framework/Kernel/test/FunctionTaskTest.h
+++ b/Framework/Kernel/test/FunctionTaskTest.h
@@ -7,8 +7,6 @@
#include "MantidKernel/Task.h"
#include "MantidKernel/FunctionTask.h"
-#include <iostream>
-#include <iomanip>
using namespace Mantid::Kernel;
diff --git a/Framework/Kernel/test/HermitePolynomialsTest.h b/Framework/Kernel/test/HermitePolynomialsTest.h
index 8e11b8279bf..7cfde2e885e 100644
--- a/Framework/Kernel/test/HermitePolynomialsTest.h
+++ b/Framework/Kernel/test/HermitePolynomialsTest.h
@@ -2,7 +2,6 @@
#define MANTID_KERNEL_HERMITEPOLYNOMIALSTEST_H_
#include <cxxtest/TestSuite.h>
-#include <iomanip>
#include "MantidKernel/Math/Distributions/HermitePolynomials.h"
class HermitePolynomialsTest : public CxxTest::TestSuite {
diff --git a/Framework/Kernel/test/IPropertySettingsTest.h b/Framework/Kernel/test/IPropertySettingsTest.h
index 3183c96e0d1..bb1e4afebba 100644
--- a/Framework/Kernel/test/IPropertySettingsTest.h
+++ b/Framework/Kernel/test/IPropertySettingsTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidKernel/IPropertySettings.h"
using namespace Mantid;
diff --git a/Framework/Kernel/test/ISaveableTest.h b/Framework/Kernel/test/ISaveableTest.h
index 2c053fef2c6..14be0493129 100644
--- a/Framework/Kernel/test/ISaveableTest.h
+++ b/Framework/Kernel/test/ISaveableTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
diff --git a/Framework/Kernel/test/LogParserTest.h b/Framework/Kernel/test/LogParserTest.h
index 558b1c2bd8f..0cf62d8730c 100644
--- a/Framework/Kernel/test/LogParserTest.h
+++ b/Framework/Kernel/test/LogParserTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
-#include <iostream>
#include <fstream>
#include "MantidKernel/LogParser.h"
diff --git a/Framework/Kernel/test/MagneticFormFactorTableTest.h b/Framework/Kernel/test/MagneticFormFactorTableTest.h
index 1762991bdfb..fe0cc907d33 100644
--- a/Framework/Kernel/test/MagneticFormFactorTableTest.h
+++ b/Framework/Kernel/test/MagneticFormFactorTableTest.h
@@ -6,7 +6,6 @@
#include <boost/scoped_ptr.hpp>
-#include <iomanip>
using Mantid::PhysicalConstants::MagneticFormFactorTable;
diff --git a/Framework/Kernel/test/MemoryTest.h b/Framework/Kernel/test/MemoryTest.h
index c2e55c723f6..4b515aa9a27 100644
--- a/Framework/Kernel/test/MemoryTest.h
+++ b/Framework/Kernel/test/MemoryTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidKernel/Memory.h"
#include "MantidKernel/MultiThreaded.h"
diff --git a/Framework/Kernel/test/MutexTest.h b/Framework/Kernel/test/MutexTest.h
index 2f52b64eac2..47194481d64 100644
--- a/Framework/Kernel/test/MutexTest.h
+++ b/Framework/Kernel/test/MutexTest.h
@@ -5,7 +5,6 @@
#include "MantidKernel/MultiThreaded.h"
#include "MantidKernel/ThreadPool.h"
#include "MantidKernel/FunctionTask.h"
-#include <iostream>
#include "MantidKernel/CPUTimer.h"
#include <Poco/RWLock.h>
using namespace Mantid::Kernel;
diff --git a/Framework/Kernel/test/ProgressBaseTest.h b/Framework/Kernel/test/ProgressBaseTest.h
index cecacc02982..ac58b058210 100644
--- a/Framework/Kernel/test/ProgressBaseTest.h
+++ b/Framework/Kernel/test/ProgressBaseTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidKernel/ProgressBase.h"
diff --git a/Framework/Kernel/test/ProgressTextTest.h b/Framework/Kernel/test/ProgressTextTest.h
index e70ab338386..03432ae35fd 100644
--- a/Framework/Kernel/test/ProgressTextTest.h
+++ b/Framework/Kernel/test/ProgressTextTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include <cstdlib>
#include "MantidKernel/ProgressText.h"
diff --git a/Framework/Kernel/test/StdoutChannelTest.h b/Framework/Kernel/test/StdoutChannelTest.h
index e0ef37350d8..3c24efdf4ec 100644
--- a/Framework/Kernel/test/StdoutChannelTest.h
+++ b/Framework/Kernel/test/StdoutChannelTest.h
@@ -5,7 +5,6 @@
#include "MantidKernel/StdoutChannel.h"
#include "MantidKernel/Logger.h"
-#include <iostream>
#include <Poco/Logger.h>
#include <Poco/NullChannel.h>
#include <Poco/AutoPtr.h>
diff --git a/Framework/Kernel/test/TaskTest.h b/Framework/Kernel/test/TaskTest.h
index b9d2fc3f0a1..8c21073991a 100644
--- a/Framework/Kernel/test/TaskTest.h
+++ b/Framework/Kernel/test/TaskTest.h
@@ -6,8 +6,6 @@
#include <MantidKernel/Timer.h>
#include "MantidKernel/Task.h"
-#include <iostream>
-#include <iomanip>
using namespace Mantid::Kernel;
diff --git a/Framework/Kernel/test/ThreadPoolRunnableTest.h b/Framework/Kernel/test/ThreadPoolRunnableTest.h
index 009dae5e2b8..9d7470406d7 100644
--- a/Framework/Kernel/test/ThreadPoolRunnableTest.h
+++ b/Framework/Kernel/test/ThreadPoolRunnableTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include <MantidKernel/Timer.h>
#include <MantidKernel/System.h>
-#include <iostream>
-#include <iomanip>
#include <MantidKernel/ThreadPoolRunnable.h>
#include <MantidKernel/ThreadScheduler.h>
diff --git a/Framework/Kernel/test/ThreadPoolTest.h b/Framework/Kernel/test/ThreadPoolTest.h
index c8aaca80a53..624221f4cfd 100644
--- a/Framework/Kernel/test/ThreadPoolTest.h
+++ b/Framework/Kernel/test/ThreadPoolTest.h
@@ -13,8 +13,6 @@
#include <boost/bind.hpp>
#include <boost/make_shared.hpp>
-#include <iostream>
-#include <iomanip>
#include <Poco/Mutex.h>
#include <cstdlib>
diff --git a/Framework/Kernel/test/ThreadSchedulerMutexesTest.h b/Framework/Kernel/test/ThreadSchedulerMutexesTest.h
index 9c8166f6795..bc74c0d5dd6 100644
--- a/Framework/Kernel/test/ThreadSchedulerMutexesTest.h
+++ b/Framework/Kernel/test/ThreadSchedulerMutexesTest.h
@@ -5,8 +5,6 @@
#include <MantidKernel/Timer.h>
#include <MantidKernel/System.h>
#include <boost/make_shared.hpp>
-#include <iostream>
-#include <iomanip>
#include <MantidKernel/ThreadSchedulerMutexes.h>
diff --git a/Framework/Kernel/test/ThreadSchedulerTest.h b/Framework/Kernel/test/ThreadSchedulerTest.h
index 16786463bf1..31d6e7f7b29 100644
--- a/Framework/Kernel/test/ThreadSchedulerTest.h
+++ b/Framework/Kernel/test/ThreadSchedulerTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include <MantidKernel/Timer.h>
#include <MantidKernel/System.h>
-#include <iostream>
-#include <iomanip>
#include <MantidKernel/ThreadScheduler.h>
#include <MantidKernel/Task.h>
diff --git a/Framework/Kernel/test/UnitConversionTest.h b/Framework/Kernel/test/UnitConversionTest.h
index f3b0a259c7b..495bbcb52f4 100644
--- a/Framework/Kernel/test/UnitConversionTest.h
+++ b/Framework/Kernel/test/UnitConversionTest.h
@@ -6,7 +6,6 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/PhysicalConstants.h"
-#include <iomanip>
using Mantid::Kernel::UnitConversion;
diff --git a/Framework/Kernel/test/UtilsTest.h b/Framework/Kernel/test/UtilsTest.h
index fd76bb7e91b..767a1a4b4dd 100644
--- a/Framework/Kernel/test/UtilsTest.h
+++ b/Framework/Kernel/test/UtilsTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidKernel/Utils.h"
diff --git a/Framework/Kernel/test/VMDTest.h b/Framework/Kernel/test/VMDTest.h
index 27ac5cc6087..0d550ab59a5 100644
--- a/Framework/Kernel/test/VMDTest.h
+++ b/Framework/Kernel/test/VMDTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
#include <cmath>
-#include <iostream>
-#include <iomanip>
#include "MantidKernel/VMD.h"
diff --git a/Framework/Kernel/test/VectorHelperTest.h b/Framework/Kernel/test/VectorHelperTest.h
index 2573f0b11e9..16f9f4b86a2 100644
--- a/Framework/Kernel/test/VectorHelperTest.h
+++ b/Framework/Kernel/test/VectorHelperTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/VectorHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <boost/assign/list_of.hpp>
using namespace Mantid::Kernel;
diff --git a/Framework/Kernel/test/VisibleWhenPropertyTest.h b/Framework/Kernel/test/VisibleWhenPropertyTest.h
index 1ed5da48cd5..197009c33bd 100644
--- a/Framework/Kernel/test/VisibleWhenPropertyTest.h
+++ b/Framework/Kernel/test/VisibleWhenPropertyTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidKernel/VisibleWhenProperty.h"
#include "MantidKernel/PropertyManagerOwner.h"
diff --git a/Framework/LiveData/test/LiveDataAlgorithmTest.h b/Framework/LiveData/test/LiveDataAlgorithmTest.h
index a3eb949773f..0e2b7344b38 100644
--- a/Framework/LiveData/test/LiveDataAlgorithmTest.h
+++ b/Framework/LiveData/test/LiveDataAlgorithmTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidLiveData/LiveDataAlgorithm.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidTestHelpers/FacilityHelper.h"
diff --git a/Framework/LiveData/test/LoadLiveDataTest.h b/Framework/LiveData/test/LoadLiveDataTest.h
index 91b69f5ad0e..77bdef423f6 100644
--- a/Framework/LiveData/test/LoadLiveDataTest.h
+++ b/Framework/LiveData/test/LoadLiveDataTest.h
@@ -7,8 +7,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <numeric>
#include "MantidDataObjects/Workspace2D.h"
#include "MantidKernel/ConfigService.h"
diff --git a/Framework/LiveData/test/MonitorLiveDataTest.h b/Framework/LiveData/test/MonitorLiveDataTest.h
index fc9d1e9a653..0fdd7f94b60 100644
--- a/Framework/LiveData/test/MonitorLiveDataTest.h
+++ b/Framework/LiveData/test/MonitorLiveDataTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidLiveData/MonitorLiveData.h"
#include "MantidAPI/AlgorithmManager.h"
diff --git a/Framework/LiveData/test/StartLiveDataTest.h b/Framework/LiveData/test/StartLiveDataTest.h
index 8f7729d14ee..023343ebd11 100644
--- a/Framework/LiveData/test/StartLiveDataTest.h
+++ b/Framework/LiveData/test/StartLiveDataTest.h
@@ -6,8 +6,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include "MantidKernel/SingletonHolder.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/FrameworkManager.h"
--
GitLab
From 43d786c57bd5d40e5fd135494436561bfa2ee045 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 13:19:14 +0100
Subject: [PATCH 069/223] tests in Algorithms, CurveFitting, Crystal, Geometry,
re #13689
---
Framework/Algorithms/test/AddLogDerivativeTest.h | 2 --
Framework/Algorithms/test/AddPeakTest.h | 2 --
Framework/Algorithms/test/ApplyDetailedBalanceTest.h | 2 --
Framework/Algorithms/test/BinaryOperateMasksTest.h | 2 --
Framework/Algorithms/test/ChangeBinOffsetTest.h | 1 -
Framework/Algorithms/test/ChangePulsetimeTest.h | 2 --
Framework/Algorithms/test/ConvertToEventWorkspaceTest.h | 2 --
Framework/Algorithms/test/CountEventsInPulsesTest.h | 2 --
Framework/Algorithms/test/CreateGroupingWorkspaceTest.h | 2 --
Framework/Algorithms/test/CreatePeaksWorkspaceTest.h | 2 --
Framework/Algorithms/test/DetectorEfficiencyVariationTest.h | 2 --
.../Algorithms/test/DiffractionEventCalibrateDetectorsTest.h | 2 --
Framework/Algorithms/test/EditInstrumentGeometryTest.h | 2 --
Framework/Algorithms/test/ElasticWindowTest.h | 2 --
Framework/Algorithms/test/ExportTimeSeriesLogTest.h | 2 --
Framework/Algorithms/test/FilterEventsTest.h | 2 --
Framework/Algorithms/test/GenerateEventsFilterTest.h | 2 --
Framework/Algorithms/test/GenerateIPythonNotebookTest.h | 2 --
Framework/Algorithms/test/GeneratePeaksTest.h | 2 --
Framework/Algorithms/test/GeneratePythonScriptTest.h | 2 --
Framework/Algorithms/test/GetTimeSeriesLogInformationTest.h | 2 --
Framework/Algorithms/test/InvertMaskTest.h | 2 --
Framework/Algorithms/test/MaskBinsFromTableTest.h | 2 --
Framework/Algorithms/test/MedianDetectorTestTest.h | 1 -
Framework/Algorithms/test/NormaliseByDetectorTest.h | 1 -
Framework/Algorithms/test/PDFFourierTransformTest.h | 2 --
Framework/Algorithms/test/PauseTest.h | 2 --
Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h | 1 -
Framework/Algorithms/test/Q1DWeightedTest.h | 1 -
Framework/Algorithms/test/RayTracerTesterTest.h | 2 --
Framework/Algorithms/test/RegroupTest.h | 1 -
Framework/Algorithms/test/RemoveBinsTest.h | 1 -
Framework/Algorithms/test/RemoveLowResTOFTest.h | 2 --
Framework/Algorithms/test/RemovePromptPulseTest.h | 2 --
Framework/Algorithms/test/ResetNegativesTest.h | 2 --
Framework/Algorithms/test/ResizeRectangularDetectorTest.h | 2 --
Framework/Algorithms/test/ShiftLogTimeTest.h | 2 --
Framework/Algorithms/test/SignalOverErrorTest.h | 2 --
Framework/Algorithms/test/SmoothNeighboursTest.h | 2 --
Framework/Algorithms/test/UnwrapSNSTest.h | 2 --
Framework/Algorithms/test/WeightingStrategyTest.h | 2 --
Framework/Algorithms/test/WorkspaceCreationHelperTest.h | 2 --
Framework/Crystal/test/AnvredCorrectionTest.h | 2 --
Framework/Crystal/test/CalculateUMatrixTest.h | 2 --
Framework/Crystal/test/CentroidPeaksTest.h | 2 --
Framework/Crystal/test/FindUBUsingFFTTest.h | 2 --
Framework/Crystal/test/FindUBUsingIndexedPeaksTest.h | 2 --
Framework/Crystal/test/FindUBUsingLatticeParametersTest.h | 2 --
Framework/Crystal/test/FindUBUsingMinMaxDTest.h | 2 --
Framework/Crystal/test/IndexPeaksTest.h | 2 --
Framework/Crystal/test/LoadHKLTest.h | 2 --
Framework/Crystal/test/LoadIsawPeaksTest.h | 2 --
Framework/Crystal/test/LoadIsawSpectrumTest.h | 2 --
Framework/Crystal/test/LoadIsawUBTest.h | 2 --
Framework/Crystal/test/NormaliseVanadiumTest.h | 2 --
Framework/Crystal/test/OptimizeLatticeForCellTypeTest.h | 2 --
Framework/Crystal/test/PeakIntegrationTest.h | 2 --
Framework/Crystal/test/PeakIntensityVsRadiusTest.h | 2 --
Framework/Crystal/test/PredictPeaksTest.h | 2 --
Framework/Crystal/test/SaveHKLTest.h | 2 --
Framework/Crystal/test/SaveIsawPeaksTest.h | 2 --
Framework/Crystal/test/SaveIsawUBTest.h | 1 -
Framework/Crystal/test/SaveLauenormTest.h | 2 --
Framework/Crystal/test/SavePeaksFileTest.h | 2 --
Framework/Crystal/test/SelectCellOfTypeTest.h | 2 --
Framework/Crystal/test/SelectCellWithFormTest.h | 2 --
Framework/Crystal/test/SetGoniometerTest.h | 2 --
Framework/Crystal/test/SetUBTest.h | 2 --
Framework/Crystal/test/ShowPossibleCellsTest.h | 2 --
Framework/Crystal/test/SortHKLTest.h | 2 --
Framework/Crystal/test/StatisticsOfPeaksWorkspaceTest.h | 2 --
Framework/Crystal/test/TransformHKLTest.h | 2 --
Framework/CurveFitting/test/BSplineTest.h | 1 -
Framework/CurveFitting/test/BivariateNormalTest.h | 1 -
Framework/CurveFitting/test/Bk2BkExpConvPVTest.h | 2 --
Framework/CurveFitting/test/CubicSplineTest.h | 1 -
Framework/CurveFitting/test/DiffSphereTest.h | 1 -
Framework/CurveFitting/test/FlatBackgroundTest.h | 2 --
Framework/CurveFitting/test/LeBailFitTest.h | 2 --
Framework/CurveFitting/test/LeBailFunctionTest.h | 2 --
Framework/CurveFitting/test/MultiDomainCreatorTest.h | 1 -
Framework/CurveFitting/test/MultiDomainFunctionTest.h | 1 -
.../CurveFitting/test/ThermalNeutronBk2BkExpConvPVoigtTest.h | 1 -
Framework/CurveFitting/test/ThermalNeutronDtoTOFFunctionTest.h | 1 -
Framework/Geometry/test/BoundingBoxTest.h | 1 -
Framework/Geometry/test/CompAssemblyTest.h | 1 -
Framework/Geometry/test/ComponentParserTest.h | 2 --
Framework/Geometry/test/ComponentTest.h | 1 -
Framework/Geometry/test/ConventionalCellTest.h | 2 --
Framework/Geometry/test/DetectorTest.h | 1 -
Framework/Geometry/test/GoniometerTest.h | 1 -
Framework/Geometry/test/IndexingUtilsTest.h | 2 --
Framework/Geometry/test/MDBoxImplicitFunctionTest.h | 2 --
Framework/Geometry/test/MDHistoDimensionTest.h | 2 --
Framework/Geometry/test/MDPlaneTest.h | 2 --
Framework/Geometry/test/NearestNeighboursFactoryTest.h | 2 --
Framework/Geometry/test/NiggliCellTest.h | 2 --
Framework/Geometry/test/ObjCompAssemblyTest.h | 1 -
Framework/Geometry/test/ObjectTest.h | 1 -
Framework/Geometry/test/OrientedLatticeTest.h | 2 --
Framework/Geometry/test/ParCompAssemblyTest.h | 1 -
Framework/Geometry/test/ParComponentFactoryTest.h | 2 --
Framework/Geometry/test/ParObjCompAssemblyTest.h | 1 -
Framework/Geometry/test/ParametrizedComponentTest.h | 1 -
Framework/Geometry/test/PointGroupTest.h | 2 --
Framework/Geometry/test/RectangularDetectorPixelTest.h | 2 --
Framework/Geometry/test/RectangularDetectorTest.h | 1 -
Framework/Geometry/test/ReducedCellTest.h | 2 --
Framework/Geometry/test/ReferenceFrameTest.h | 2 --
Framework/Geometry/test/ReflectionConditionTest.h | 2 --
Framework/Geometry/test/ScalarUtilsTest.h | 2 --
Framework/Geometry/test/UnitCellTest.h | 2 --
Framework/Geometry/test/XMLInstrumentParameterTest.h | 2 --
113 files changed, 199 deletions(-)
diff --git a/Framework/Algorithms/test/AddLogDerivativeTest.h b/Framework/Algorithms/test/AddLogDerivativeTest.h
index 696e229ef73..4d83e735cc5 100644
--- a/Framework/Algorithms/test/AddLogDerivativeTest.h
+++ b/Framework/Algorithms/test/AddLogDerivativeTest.h
@@ -6,8 +6,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidAPI/Run.h"
diff --git a/Framework/Algorithms/test/AddPeakTest.h b/Framework/Algorithms/test/AddPeakTest.h
index b534469ba4a..230ff5a306d 100644
--- a/Framework/Algorithms/test/AddPeakTest.h
+++ b/Framework/Algorithms/test/AddPeakTest.h
@@ -9,8 +9,6 @@
#include "MantidKernel/Timer.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid::Algorithms;
using namespace Mantid::API;
diff --git a/Framework/Algorithms/test/ApplyDetailedBalanceTest.h b/Framework/Algorithms/test/ApplyDetailedBalanceTest.h
index da83e4b77c5..e3880bcc1be 100644
--- a/Framework/Algorithms/test/ApplyDetailedBalanceTest.h
+++ b/Framework/Algorithms/test/ApplyDetailedBalanceTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAPI/AlgorithmManager.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/Algorithms/test/BinaryOperateMasksTest.h b/Framework/Algorithms/test/BinaryOperateMasksTest.h
index f60456beac5..3218fb7d200 100644
--- a/Framework/Algorithms/test/BinaryOperateMasksTest.h
+++ b/Framework/Algorithms/test/BinaryOperateMasksTest.h
@@ -9,8 +9,6 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidGeometry/Instrument.h"
#include <cxxtest/TestSuite.h>
-#include <iostream>
-#include <iomanip>
using namespace Mantid;
using namespace Mantid::Algorithms;
diff --git a/Framework/Algorithms/test/ChangeBinOffsetTest.h b/Framework/Algorithms/test/ChangeBinOffsetTest.h
index faa21e602c8..04c89a554fa 100644
--- a/Framework/Algorithms/test/ChangeBinOffsetTest.h
+++ b/Framework/Algorithms/test/ChangeBinOffsetTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
-#include <iostream>
#include <sstream>
#include <string>
diff --git a/Framework/Algorithms/test/ChangePulsetimeTest.h b/Framework/Algorithms/test/ChangePulsetimeTest.h
index 17f8e42eecf..b7a80e0d95f 100644
--- a/Framework/Algorithms/test/ChangePulsetimeTest.h
+++ b/Framework/Algorithms/test/ChangePulsetimeTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAlgorithms/ChangePulsetime.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/Algorithms/test/ConvertToEventWorkspaceTest.h b/Framework/Algorithms/test/ConvertToEventWorkspaceTest.h
index d37652d9f1e..f32dac5f19a 100644
--- a/Framework/Algorithms/test/ConvertToEventWorkspaceTest.h
+++ b/Framework/Algorithms/test/ConvertToEventWorkspaceTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAlgorithms/ConvertToEventWorkspace.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/Algorithms/test/CountEventsInPulsesTest.h b/Framework/Algorithms/test/CountEventsInPulsesTest.h
index b3db88e1ac1..1b49e7ebe0b 100644
--- a/Framework/Algorithms/test/CountEventsInPulsesTest.h
+++ b/Framework/Algorithms/test/CountEventsInPulsesTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAlgorithms/CountEventsInPulses.h"
#include "MantidKernel/TimeSeriesProperty.h"
diff --git a/Framework/Algorithms/test/CreateGroupingWorkspaceTest.h b/Framework/Algorithms/test/CreateGroupingWorkspaceTest.h
index 2854070451c..2b4f978934c 100644
--- a/Framework/Algorithms/test/CreateGroupingWorkspaceTest.h
+++ b/Framework/Algorithms/test/CreateGroupingWorkspaceTest.h
@@ -7,8 +7,6 @@
#include "MantidKernel/Timer.h"
#include "MantidAPI/FrameworkManager.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid::Algorithms;
using namespace Mantid::API;
diff --git a/Framework/Algorithms/test/CreatePeaksWorkspaceTest.h b/Framework/Algorithms/test/CreatePeaksWorkspaceTest.h
index 7d8e9eebeb1..fb822c6164e 100644
--- a/Framework/Algorithms/test/CreatePeaksWorkspaceTest.h
+++ b/Framework/Algorithms/test/CreatePeaksWorkspaceTest.h
@@ -9,8 +9,6 @@
#include "MantidKernel/Timer.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid::Algorithms;
using namespace Mantid::API;
diff --git a/Framework/Algorithms/test/DetectorEfficiencyVariationTest.h b/Framework/Algorithms/test/DetectorEfficiencyVariationTest.h
index d7fee9f63a9..182decc0f49 100644
--- a/Framework/Algorithms/test/DetectorEfficiencyVariationTest.h
+++ b/Framework/Algorithms/test/DetectorEfficiencyVariationTest.h
@@ -14,8 +14,6 @@
#include <boost/lexical_cast.hpp>
#include <Poco/Path.h>
#include <cmath>
-#include <iomanip>
-#include <iostream>
#include <sstream>
#include <fstream>
#include <ios>
diff --git a/Framework/Algorithms/test/DiffractionEventCalibrateDetectorsTest.h b/Framework/Algorithms/test/DiffractionEventCalibrateDetectorsTest.h
index 0823a4f3010..41a0dfbd9d2 100644
--- a/Framework/Algorithms/test/DiffractionEventCalibrateDetectorsTest.h
+++ b/Framework/Algorithms/test/DiffractionEventCalibrateDetectorsTest.h
@@ -6,8 +6,6 @@
#include "MantidKernel/Timer.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <fstream>
#include <Poco/File.h>
diff --git a/Framework/Algorithms/test/EditInstrumentGeometryTest.h b/Framework/Algorithms/test/EditInstrumentGeometryTest.h
index d801edecc27..f0ba68a4ee1 100644
--- a/Framework/Algorithms/test/EditInstrumentGeometryTest.h
+++ b/Framework/Algorithms/test/EditInstrumentGeometryTest.h
@@ -10,8 +10,6 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
using namespace Mantid;
using namespace Mantid::Algorithms;
diff --git a/Framework/Algorithms/test/ElasticWindowTest.h b/Framework/Algorithms/test/ElasticWindowTest.h
index babe4b95bd1..6d9d4c8ecd9 100644
--- a/Framework/Algorithms/test/ElasticWindowTest.h
+++ b/Framework/Algorithms/test/ElasticWindowTest.h
@@ -3,8 +3,6 @@
#include <cxxtest/TestSuite.h>
-#include <iostream>
-#include <iomanip>
#include "MantidAPI/FrameworkManager.h"
#include "MantidKernel/System.h"
diff --git a/Framework/Algorithms/test/ExportTimeSeriesLogTest.h b/Framework/Algorithms/test/ExportTimeSeriesLogTest.h
index 2d2f8e21e48..95ffd2e77ab 100644
--- a/Framework/Algorithms/test/ExportTimeSeriesLogTest.h
+++ b/Framework/Algorithms/test/ExportTimeSeriesLogTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
#include <cmath>
-#include <iostream>
-#include <iomanip>
#include <fstream>
#include <Poco/File.h>
diff --git a/Framework/Algorithms/test/FilterEventsTest.h b/Framework/Algorithms/test/FilterEventsTest.h
index 4de2165a833..ab3c1343d28 100644
--- a/Framework/Algorithms/test/FilterEventsTest.h
+++ b/Framework/Algorithms/test/FilterEventsTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAlgorithms/FilterEvents.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/Algorithms/test/GenerateEventsFilterTest.h b/Framework/Algorithms/test/GenerateEventsFilterTest.h
index abdd7afa091..c6520fbca5c 100644
--- a/Framework/Algorithms/test/GenerateEventsFilterTest.h
+++ b/Framework/Algorithms/test/GenerateEventsFilterTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
#include <cmath>
-#include <iostream>
-#include <iomanip>
#include <fstream>
#include <Poco/File.h>
diff --git a/Framework/Algorithms/test/GenerateIPythonNotebookTest.h b/Framework/Algorithms/test/GenerateIPythonNotebookTest.h
index 0e3d5fbe3ed..290f11a2dde 100644
--- a/Framework/Algorithms/test/GenerateIPythonNotebookTest.h
+++ b/Framework/Algorithms/test/GenerateIPythonNotebookTest.h
@@ -4,9 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
#include <fstream>
-#include <iomanip>
#include <boost/regex.hpp>
#include "MantidAlgorithms/GenerateIPythonNotebook.h"
diff --git a/Framework/Algorithms/test/GeneratePeaksTest.h b/Framework/Algorithms/test/GeneratePeaksTest.h
index b524ac99fbf..d25985d93b0 100644
--- a/Framework/Algorithms/test/GeneratePeaksTest.h
+++ b/Framework/Algorithms/test/GeneratePeaksTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAlgorithms/GeneratePeaks.h"
#include "MantidDataObjects/TableWorkspace.h"
diff --git a/Framework/Algorithms/test/GeneratePythonScriptTest.h b/Framework/Algorithms/test/GeneratePythonScriptTest.h
index 9d8c2860adc..48234f28bf7 100644
--- a/Framework/Algorithms/test/GeneratePythonScriptTest.h
+++ b/Framework/Algorithms/test/GeneratePythonScriptTest.h
@@ -4,9 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
#include <fstream>
-#include <iomanip>
#include <boost/regex.hpp>
#include "MantidAlgorithms/GeneratePythonScript.h"
diff --git a/Framework/Algorithms/test/GetTimeSeriesLogInformationTest.h b/Framework/Algorithms/test/GetTimeSeriesLogInformationTest.h
index ea6f2cfff30..237f5ab7a6d 100644
--- a/Framework/Algorithms/test/GetTimeSeriesLogInformationTest.h
+++ b/Framework/Algorithms/test/GetTimeSeriesLogInformationTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
#include <cmath>
-#include <iostream>
-#include <iomanip>
#include <fstream>
#include <Poco/File.h>
diff --git a/Framework/Algorithms/test/InvertMaskTest.h b/Framework/Algorithms/test/InvertMaskTest.h
index 2ddb4be78ec..422422e53fd 100644
--- a/Framework/Algorithms/test/InvertMaskTest.h
+++ b/Framework/Algorithms/test/InvertMaskTest.h
@@ -8,8 +8,6 @@
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidGeometry/Instrument.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAlgorithms/InvertMask.h"
diff --git a/Framework/Algorithms/test/MaskBinsFromTableTest.h b/Framework/Algorithms/test/MaskBinsFromTableTest.h
index fbac8eab834..72e265cbfa7 100644
--- a/Framework/Algorithms/test/MaskBinsFromTableTest.h
+++ b/Framework/Algorithms/test/MaskBinsFromTableTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidAlgorithms/MaskBinsFromTable.h"
diff --git a/Framework/Algorithms/test/MedianDetectorTestTest.h b/Framework/Algorithms/test/MedianDetectorTestTest.h
index bb69f74a2f3..da4fd49def2 100644
--- a/Framework/Algorithms/test/MedianDetectorTestTest.h
+++ b/Framework/Algorithms/test/MedianDetectorTestTest.h
@@ -16,7 +16,6 @@
#include <Poco/File.h>
#include <Poco/Path.h>
#include <cmath>
-#include <iostream>
#include <sstream>
#include <fstream>
#include <ios>
diff --git a/Framework/Algorithms/test/NormaliseByDetectorTest.h b/Framework/Algorithms/test/NormaliseByDetectorTest.h
index 8f32e4747e6..f2a30860010 100644
--- a/Framework/Algorithms/test/NormaliseByDetectorTest.h
+++ b/Framework/Algorithms/test/NormaliseByDetectorTest.h
@@ -16,7 +16,6 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidTestHelpers/ScopedFileHelper.h"
#include "MantidKernel/ConfigService.h"
-#include <iomanip>
using namespace Mantid;
using namespace Mantid::Algorithms;
diff --git a/Framework/Algorithms/test/PDFFourierTransformTest.h b/Framework/Algorithms/test/PDFFourierTransformTest.h
index 6b72b4f7b4b..724358a1880 100644
--- a/Framework/Algorithms/test/PDFFourierTransformTest.h
+++ b/Framework/Algorithms/test/PDFFourierTransformTest.h
@@ -11,8 +11,6 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/IAlgorithm.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAlgorithms/PDFFourierTransform.h"
diff --git a/Framework/Algorithms/test/PauseTest.h b/Framework/Algorithms/test/PauseTest.h
index 8ab46060034..4caceae6c1f 100644
--- a/Framework/Algorithms/test/PauseTest.h
+++ b/Framework/Algorithms/test/PauseTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAlgorithms/Pause.h"
diff --git a/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h b/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h
index e7ab84fb34d..8f7648d74fc 100644
--- a/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h
+++ b/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h
@@ -13,7 +13,6 @@
#include "MantidDataHandling/LoadInstrument.h"
#include "MantidDataHandling/SaveNexus.h"
-#include <iostream>
#include <Poco/File.h>
using namespace Mantid::API;
diff --git a/Framework/Algorithms/test/Q1DWeightedTest.h b/Framework/Algorithms/test/Q1DWeightedTest.h
index 0555cf4adf2..6abd0718970 100644
--- a/Framework/Algorithms/test/Q1DWeightedTest.h
+++ b/Framework/Algorithms/test/Q1DWeightedTest.h
@@ -5,7 +5,6 @@
#include "MantidAlgorithms/Q1DWeighted.h"
#include "MantidDataHandling/LoadSpice2D.h"
#include "MantidDataHandling/MoveInstrumentComponent.h"
-#include <iostream>
using namespace Mantid::API;
using namespace Mantid::Kernel;
diff --git a/Framework/Algorithms/test/RayTracerTesterTest.h b/Framework/Algorithms/test/RayTracerTesterTest.h
index 5b643f7871c..9f9e6972af7 100644
--- a/Framework/Algorithms/test/RayTracerTesterTest.h
+++ b/Framework/Algorithms/test/RayTracerTesterTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAlgorithms/RayTracerTester.h"
diff --git a/Framework/Algorithms/test/RegroupTest.h b/Framework/Algorithms/test/RegroupTest.h
index 3c49bc8e773..2ac82cc4188 100644
--- a/Framework/Algorithms/test/RegroupTest.h
+++ b/Framework/Algorithms/test/RegroupTest.h
@@ -8,7 +8,6 @@
#include "MantidAlgorithms/Regroup.h"
#include "MantidAPI/WorkspaceProperty.h"
-#include <iostream>
using namespace Mantid::Kernel;
using namespace Mantid::DataObjects;
diff --git a/Framework/Algorithms/test/RemoveBinsTest.h b/Framework/Algorithms/test/RemoveBinsTest.h
index 0eb0444239d..e4dd7d4d22f 100644
--- a/Framework/Algorithms/test/RemoveBinsTest.h
+++ b/Framework/Algorithms/test/RemoveBinsTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
-#include <iostream>
#include <sstream>
#include <string>
#include <stdexcept>
diff --git a/Framework/Algorithms/test/RemoveLowResTOFTest.h b/Framework/Algorithms/test/RemoveLowResTOFTest.h
index 2c4117254f2..151e8c9694c 100644
--- a/Framework/Algorithms/test/RemoveLowResTOFTest.h
+++ b/Framework/Algorithms/test/RemoveLowResTOFTest.h
@@ -9,8 +9,6 @@
#include "MantidKernel/UnitFactory.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
-#include <iostream>
-#include <iomanip>
#include <set>
#include <string>
diff --git a/Framework/Algorithms/test/RemovePromptPulseTest.h b/Framework/Algorithms/test/RemovePromptPulseTest.h
index f4500225d70..0675bf25926 100644
--- a/Framework/Algorithms/test/RemovePromptPulseTest.h
+++ b/Framework/Algorithms/test/RemovePromptPulseTest.h
@@ -2,8 +2,6 @@
#define MANTID_ALGORITHMS_REMOVEPROMPTPULSETEST_H_
#include <cxxtest/TestSuite.h>
-#include <iostream>
-#include <iomanip>
#include "MantidAPI/AnalysisDataService.h"
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidKernel/System.h"
diff --git a/Framework/Algorithms/test/ResetNegativesTest.h b/Framework/Algorithms/test/ResetNegativesTest.h
index 7db37fd2283..f9bbbec67ed 100644
--- a/Framework/Algorithms/test/ResetNegativesTest.h
+++ b/Framework/Algorithms/test/ResetNegativesTest.h
@@ -7,8 +7,6 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
-#include <iostream>
-#include <iomanip>
#include <string>
#include "MantidAlgorithms/ResetNegatives.h"
diff --git a/Framework/Algorithms/test/ResizeRectangularDetectorTest.h b/Framework/Algorithms/test/ResizeRectangularDetectorTest.h
index 588a827ad4f..c7fe587a3bf 100644
--- a/Framework/Algorithms/test/ResizeRectangularDetectorTest.h
+++ b/Framework/Algorithms/test/ResizeRectangularDetectorTest.h
@@ -11,8 +11,6 @@
#include "MantidKernel/V3D.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include "MantidGeometry/Instrument/RectangularDetectorPixel.h"
using namespace Mantid;
diff --git a/Framework/Algorithms/test/ShiftLogTimeTest.h b/Framework/Algorithms/test/ShiftLogTimeTest.h
index 45b0ceee013..fff95c4817c 100644
--- a/Framework/Algorithms/test/ShiftLogTimeTest.h
+++ b/Framework/Algorithms/test/ShiftLogTimeTest.h
@@ -7,8 +7,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include <iostream>
-#include <iomanip>
using namespace Mantid;
using namespace Mantid::Algorithms;
diff --git a/Framework/Algorithms/test/SignalOverErrorTest.h b/Framework/Algorithms/test/SignalOverErrorTest.h
index 7887d9c4523..be31dec1522 100644
--- a/Framework/Algorithms/test/SignalOverErrorTest.h
+++ b/Framework/Algorithms/test/SignalOverErrorTest.h
@@ -7,8 +7,6 @@
#include "MantidKernel/Timer.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::Algorithms;
diff --git a/Framework/Algorithms/test/SmoothNeighboursTest.h b/Framework/Algorithms/test/SmoothNeighboursTest.h
index 9fc602a9e04..2dab29faed2 100644
--- a/Framework/Algorithms/test/SmoothNeighboursTest.h
+++ b/Framework/Algorithms/test/SmoothNeighboursTest.h
@@ -14,8 +14,6 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iostream>
-#include <iomanip>
using namespace Mantid;
using namespace Mantid::Kernel;
diff --git a/Framework/Algorithms/test/UnwrapSNSTest.h b/Framework/Algorithms/test/UnwrapSNSTest.h
index 68ae1ed6d58..7fa34a7772f 100644
--- a/Framework/Algorithms/test/UnwrapSNSTest.h
+++ b/Framework/Algorithms/test/UnwrapSNSTest.h
@@ -9,8 +9,6 @@
#include "MantidKernel/UnitFactory.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
-#include <iostream>
-#include <iomanip>
#include <string>
#include "MantidAlgorithms/UnwrapSNS.h"
diff --git a/Framework/Algorithms/test/WeightingStrategyTest.h b/Framework/Algorithms/test/WeightingStrategyTest.h
index 01c8b69bc46..c3515c98c80 100644
--- a/Framework/Algorithms/test/WeightingStrategyTest.h
+++ b/Framework/Algorithms/test/WeightingStrategyTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAlgorithms/WeightingStrategy.h"
diff --git a/Framework/Algorithms/test/WorkspaceCreationHelperTest.h b/Framework/Algorithms/test/WorkspaceCreationHelperTest.h
index 3cc5b4bc796..a1c3804687d 100644
--- a/Framework/Algorithms/test/WorkspaceCreationHelperTest.h
+++ b/Framework/Algorithms/test/WorkspaceCreationHelperTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/Timer.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include "MantidAPI/SpectraDetectorTypes.h"
using namespace Mantid;
diff --git a/Framework/Crystal/test/AnvredCorrectionTest.h b/Framework/Crystal/test/AnvredCorrectionTest.h
index 860322223cd..6b5b5376fbc 100644
--- a/Framework/Crystal/test/AnvredCorrectionTest.h
+++ b/Framework/Crystal/test/AnvredCorrectionTest.h
@@ -18,8 +18,6 @@
#include <boost/random/variate_generator.hpp>
#include <math.h>
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::Crystal;
diff --git a/Framework/Crystal/test/CalculateUMatrixTest.h b/Framework/Crystal/test/CalculateUMatrixTest.h
index bfd583addb8..1541caefccd 100644
--- a/Framework/Crystal/test/CalculateUMatrixTest.h
+++ b/Framework/Crystal/test/CalculateUMatrixTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCrystal/CalculateUMatrix.h"
#include "MantidGeometry/Crystal/OrientedLattice.h"
diff --git a/Framework/Crystal/test/CentroidPeaksTest.h b/Framework/Crystal/test/CentroidPeaksTest.h
index 653179954cc..4843512cbdb 100644
--- a/Framework/Crystal/test/CentroidPeaksTest.h
+++ b/Framework/Crystal/test/CentroidPeaksTest.h
@@ -18,8 +18,6 @@
#include <boost/random/variate_generator.hpp>
#include <math.h>
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::Crystal;
diff --git a/Framework/Crystal/test/FindUBUsingFFTTest.h b/Framework/Crystal/test/FindUBUsingFFTTest.h
index 0c9e5c5dc85..ecc480cb467 100644
--- a/Framework/Crystal/test/FindUBUsingFFTTest.h
+++ b/Framework/Crystal/test/FindUBUsingFFTTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCrystal/FindUBUsingFFT.h"
#include "MantidCrystal/LoadIsawPeaks.h"
diff --git a/Framework/Crystal/test/FindUBUsingIndexedPeaksTest.h b/Framework/Crystal/test/FindUBUsingIndexedPeaksTest.h
index 3c3da2ce273..843071413a8 100644
--- a/Framework/Crystal/test/FindUBUsingIndexedPeaksTest.h
+++ b/Framework/Crystal/test/FindUBUsingIndexedPeaksTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCrystal/FindUBUsingIndexedPeaks.h"
#include "MantidCrystal/LoadIsawPeaks.h"
diff --git a/Framework/Crystal/test/FindUBUsingLatticeParametersTest.h b/Framework/Crystal/test/FindUBUsingLatticeParametersTest.h
index 1cef9de875a..4f25945262e 100644
--- a/Framework/Crystal/test/FindUBUsingLatticeParametersTest.h
+++ b/Framework/Crystal/test/FindUBUsingLatticeParametersTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCrystal/FindUBUsingLatticeParameters.h"
#include "MantidCrystal/LoadIsawPeaks.h"
diff --git a/Framework/Crystal/test/FindUBUsingMinMaxDTest.h b/Framework/Crystal/test/FindUBUsingMinMaxDTest.h
index 63ffb2254a1..58934d00d7f 100644
--- a/Framework/Crystal/test/FindUBUsingMinMaxDTest.h
+++ b/Framework/Crystal/test/FindUBUsingMinMaxDTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCrystal/FindUBUsingMinMaxD.h"
#include "MantidCrystal/LoadIsawPeaks.h"
diff --git a/Framework/Crystal/test/IndexPeaksTest.h b/Framework/Crystal/test/IndexPeaksTest.h
index 748bc85b78c..a9085df9d0e 100644
--- a/Framework/Crystal/test/IndexPeaksTest.h
+++ b/Framework/Crystal/test/IndexPeaksTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCrystal/IndexPeaks.h"
#include "MantidCrystal/LoadIsawPeaks.h"
diff --git a/Framework/Crystal/test/LoadHKLTest.h b/Framework/Crystal/test/LoadHKLTest.h
index b4a255d7e26..df8f5eb183b 100644
--- a/Framework/Crystal/test/LoadHKLTest.h
+++ b/Framework/Crystal/test/LoadHKLTest.h
@@ -10,8 +10,6 @@
#include "MantidKernel/Timer.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <fstream>
#include <Poco/File.h>
diff --git a/Framework/Crystal/test/LoadIsawPeaksTest.h b/Framework/Crystal/test/LoadIsawPeaksTest.h
index 8d40b021e44..57cde40ffec 100644
--- a/Framework/Crystal/test/LoadIsawPeaksTest.h
+++ b/Framework/Crystal/test/LoadIsawPeaksTest.h
@@ -9,8 +9,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid::API;
using namespace Mantid::Crystal;
diff --git a/Framework/Crystal/test/LoadIsawSpectrumTest.h b/Framework/Crystal/test/LoadIsawSpectrumTest.h
index 1beed81dcc2..2754a776006 100644
--- a/Framework/Crystal/test/LoadIsawSpectrumTest.h
+++ b/Framework/Crystal/test/LoadIsawSpectrumTest.h
@@ -10,8 +10,6 @@
#include "MantidGeometry/Crystal/OrientedLattice.h"
#include "MantidAPI/FrameworkManager.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid::Crystal;
using namespace Mantid::API;
diff --git a/Framework/Crystal/test/LoadIsawUBTest.h b/Framework/Crystal/test/LoadIsawUBTest.h
index a15fb23b678..8123d2272b2 100644
--- a/Framework/Crystal/test/LoadIsawUBTest.h
+++ b/Framework/Crystal/test/LoadIsawUBTest.h
@@ -11,8 +11,6 @@
#include "MantidGeometry/Crystal/OrientedLattice.h"
#include "MantidAPI/FrameworkManager.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid::Crystal;
using namespace Mantid::API;
diff --git a/Framework/Crystal/test/NormaliseVanadiumTest.h b/Framework/Crystal/test/NormaliseVanadiumTest.h
index ddda1f89f48..4d52925b22f 100644
--- a/Framework/Crystal/test/NormaliseVanadiumTest.h
+++ b/Framework/Crystal/test/NormaliseVanadiumTest.h
@@ -16,8 +16,6 @@
#include <boost/random/variate_generator.hpp>
#include <math.h>
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::Crystal;
diff --git a/Framework/Crystal/test/OptimizeLatticeForCellTypeTest.h b/Framework/Crystal/test/OptimizeLatticeForCellTypeTest.h
index 52d91d88e90..cfb87881032 100644
--- a/Framework/Crystal/test/OptimizeLatticeForCellTypeTest.h
+++ b/Framework/Crystal/test/OptimizeLatticeForCellTypeTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCrystal/OptimizeLatticeForCellType.h"
#include "MantidCrystal/FindUBUsingFFT.h"
diff --git a/Framework/Crystal/test/PeakIntegrationTest.h b/Framework/Crystal/test/PeakIntegrationTest.h
index 2801488ecac..a34be8927d4 100644
--- a/Framework/Crystal/test/PeakIntegrationTest.h
+++ b/Framework/Crystal/test/PeakIntegrationTest.h
@@ -18,8 +18,6 @@
#include <boost/random/variate_generator.hpp>
#include <math.h>
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::Crystal;
diff --git a/Framework/Crystal/test/PeakIntensityVsRadiusTest.h b/Framework/Crystal/test/PeakIntensityVsRadiusTest.h
index 5e560b92b22..e9b5733569b 100644
--- a/Framework/Crystal/test/PeakIntensityVsRadiusTest.h
+++ b/Framework/Crystal/test/PeakIntensityVsRadiusTest.h
@@ -11,8 +11,6 @@
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidAPI/FrameworkManager.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::Crystal;
diff --git a/Framework/Crystal/test/PredictPeaksTest.h b/Framework/Crystal/test/PredictPeaksTest.h
index 6234ee18989..01401b993b2 100644
--- a/Framework/Crystal/test/PredictPeaksTest.h
+++ b/Framework/Crystal/test/PredictPeaksTest.h
@@ -9,8 +9,6 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include "MantidKernel/V3D.h"
#include "MantidGeometry/IDTypes.h"
diff --git a/Framework/Crystal/test/SaveHKLTest.h b/Framework/Crystal/test/SaveHKLTest.h
index a7dba0a6a13..80b74770941 100644
--- a/Framework/Crystal/test/SaveHKLTest.h
+++ b/Framework/Crystal/test/SaveHKLTest.h
@@ -9,8 +9,6 @@
#include "MantidKernel/Timer.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <fstream>
#include <Poco/File.h>
diff --git a/Framework/Crystal/test/SaveIsawPeaksTest.h b/Framework/Crystal/test/SaveIsawPeaksTest.h
index 62766e5826a..53bd33d0cb1 100644
--- a/Framework/Crystal/test/SaveIsawPeaksTest.h
+++ b/Framework/Crystal/test/SaveIsawPeaksTest.h
@@ -9,8 +9,6 @@
#include "MantidKernel/Timer.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <Poco/File.h>
using namespace Mantid;
diff --git a/Framework/Crystal/test/SaveIsawUBTest.h b/Framework/Crystal/test/SaveIsawUBTest.h
index 3e781524bb3..77b9ce5e690 100644
--- a/Framework/Crystal/test/SaveIsawUBTest.h
+++ b/Framework/Crystal/test/SaveIsawUBTest.h
@@ -19,7 +19,6 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iostream>
#include <fstream>
#include <stdio.h>
#include <stdlib.h>
diff --git a/Framework/Crystal/test/SaveLauenormTest.h b/Framework/Crystal/test/SaveLauenormTest.h
index ffa2ff24f38..d5c88b526cd 100644
--- a/Framework/Crystal/test/SaveLauenormTest.h
+++ b/Framework/Crystal/test/SaveLauenormTest.h
@@ -9,8 +9,6 @@
#include "MantidKernel/Timer.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <fstream>
#include <Poco/File.h>
diff --git a/Framework/Crystal/test/SavePeaksFileTest.h b/Framework/Crystal/test/SavePeaksFileTest.h
index f6fe4353c75..4de6a339657 100644
--- a/Framework/Crystal/test/SavePeaksFileTest.h
+++ b/Framework/Crystal/test/SavePeaksFileTest.h
@@ -8,8 +8,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <Poco/File.h>
using namespace Mantid::Kernel;
diff --git a/Framework/Crystal/test/SelectCellOfTypeTest.h b/Framework/Crystal/test/SelectCellOfTypeTest.h
index 918286b3bd1..0e67f114ccc 100644
--- a/Framework/Crystal/test/SelectCellOfTypeTest.h
+++ b/Framework/Crystal/test/SelectCellOfTypeTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCrystal/SelectCellOfType.h"
#include "MantidCrystal/LoadIsawPeaks.h"
diff --git a/Framework/Crystal/test/SelectCellWithFormTest.h b/Framework/Crystal/test/SelectCellWithFormTest.h
index a711dd4f7fd..77cc15c40b3 100644
--- a/Framework/Crystal/test/SelectCellWithFormTest.h
+++ b/Framework/Crystal/test/SelectCellWithFormTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCrystal/SelectCellWithForm.h"
#include "MantidCrystal/LoadIsawPeaks.h"
diff --git a/Framework/Crystal/test/SetGoniometerTest.h b/Framework/Crystal/test/SetGoniometerTest.h
index dfd07fce6c8..7380082ff01 100644
--- a/Framework/Crystal/test/SetGoniometerTest.h
+++ b/Framework/Crystal/test/SetGoniometerTest.h
@@ -9,8 +9,6 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidAPI/FrameworkManager.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include "MantidKernel/V3D.h"
#include "MantidKernel/Matrix.h"
diff --git a/Framework/Crystal/test/SetUBTest.h b/Framework/Crystal/test/SetUBTest.h
index 801dc6bb3be..2b86a2180d3 100644
--- a/Framework/Crystal/test/SetUBTest.h
+++ b/Framework/Crystal/test/SetUBTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCrystal/SetUB.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/Crystal/test/ShowPossibleCellsTest.h b/Framework/Crystal/test/ShowPossibleCellsTest.h
index 5a623a0cbaf..4e731455a52 100644
--- a/Framework/Crystal/test/ShowPossibleCellsTest.h
+++ b/Framework/Crystal/test/ShowPossibleCellsTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCrystal/ShowPossibleCells.h"
#include "MantidCrystal/LoadIsawPeaks.h"
diff --git a/Framework/Crystal/test/SortHKLTest.h b/Framework/Crystal/test/SortHKLTest.h
index 72b6ea2fd61..656a41076d7 100644
--- a/Framework/Crystal/test/SortHKLTest.h
+++ b/Framework/Crystal/test/SortHKLTest.h
@@ -10,8 +10,6 @@
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidGeometry/Crystal/OrientedLattice.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <fstream>
#include <Poco/File.h>
diff --git a/Framework/Crystal/test/StatisticsOfPeaksWorkspaceTest.h b/Framework/Crystal/test/StatisticsOfPeaksWorkspaceTest.h
index 0499b1711c8..ee57d99bb17 100644
--- a/Framework/Crystal/test/StatisticsOfPeaksWorkspaceTest.h
+++ b/Framework/Crystal/test/StatisticsOfPeaksWorkspaceTest.h
@@ -10,8 +10,6 @@
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidGeometry/Crystal/OrientedLattice.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <fstream>
#include <Poco/File.h>
diff --git a/Framework/Crystal/test/TransformHKLTest.h b/Framework/Crystal/test/TransformHKLTest.h
index c958842c007..05acb7732de 100644
--- a/Framework/Crystal/test/TransformHKLTest.h
+++ b/Framework/Crystal/test/TransformHKLTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCrystal/TransformHKL.h"
#include "MantidCrystal/LoadIsawPeaks.h"
diff --git a/Framework/CurveFitting/test/BSplineTest.h b/Framework/CurveFitting/test/BSplineTest.h
index 0b5e362ab4c..b71c15a4ae3 100644
--- a/Framework/CurveFitting/test/BSplineTest.h
+++ b/Framework/CurveFitting/test/BSplineTest.h
@@ -11,7 +11,6 @@
#include <cxxtest/TestSuite.h>
#include <boost/lexical_cast.hpp>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/CurveFitting/test/BivariateNormalTest.h b/Framework/CurveFitting/test/BivariateNormalTest.h
index d3f8c5bd6c0..9645cd95927 100644
--- a/Framework/CurveFitting/test/BivariateNormalTest.h
+++ b/Framework/CurveFitting/test/BivariateNormalTest.h
@@ -21,7 +21,6 @@
#include "MantidCurveFitting/GSLFunctions.h"
#include "MantidKernel/UnitFactory.h"
*/
-#include <iostream>
#include <cmath>
#include <stdio.h>
#include <stdlib.h>
diff --git a/Framework/CurveFitting/test/Bk2BkExpConvPVTest.h b/Framework/CurveFitting/test/Bk2BkExpConvPVTest.h
index 9897818fbc4..46cb015c0f9 100644
--- a/Framework/CurveFitting/test/Bk2BkExpConvPVTest.h
+++ b/Framework/CurveFitting/test/Bk2BkExpConvPVTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include <fstream>
#include "MantidCurveFitting/Bk2BkExpConvPV.h"
diff --git a/Framework/CurveFitting/test/CubicSplineTest.h b/Framework/CurveFitting/test/CubicSplineTest.h
index 4412cd13f5e..f9a21e89591 100644
--- a/Framework/CurveFitting/test/CubicSplineTest.h
+++ b/Framework/CurveFitting/test/CubicSplineTest.h
@@ -4,7 +4,6 @@
#include <boost/scoped_array.hpp>
#include <cmath>
#include <cxxtest/TestSuite.h>
-#include <iostream>
#include "MantidCurveFitting/CubicSpline.h"
#include "MantidCurveFitting/Fit.h"
diff --git a/Framework/CurveFitting/test/DiffSphereTest.h b/Framework/CurveFitting/test/DiffSphereTest.h
index 45ef43ca107..17d2e95afd9 100644
--- a/Framework/CurveFitting/test/DiffSphereTest.h
+++ b/Framework/CurveFitting/test/DiffSphereTest.h
@@ -1,7 +1,6 @@
#ifndef DIFFSPHERETEST_H_
#define DIFFSPHERETEST_H_
-#include <iostream>
#include <fstream>
#include <limits>
#include <numeric>
diff --git a/Framework/CurveFitting/test/FlatBackgroundTest.h b/Framework/CurveFitting/test/FlatBackgroundTest.h
index a93d1a37924..bc0dd6bbe92 100644
--- a/Framework/CurveFitting/test/FlatBackgroundTest.h
+++ b/Framework/CurveFitting/test/FlatBackgroundTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidCurveFitting/FlatBackground.h"
diff --git a/Framework/CurveFitting/test/LeBailFitTest.h b/Framework/CurveFitting/test/LeBailFitTest.h
index 367da9173d5..0a680a21882 100644
--- a/Framework/CurveFitting/test/LeBailFitTest.h
+++ b/Framework/CurveFitting/test/LeBailFitTest.h
@@ -8,8 +8,6 @@
#include "MantidCurveFitting/LeBailFit.h"
#include "MantidDataHandling/LoadAscii.h"
-#include <iostream>
-#include <iomanip>
#include <fstream>
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/CurveFitting/test/LeBailFunctionTest.h b/Framework/CurveFitting/test/LeBailFunctionTest.h
index af5ecb5b30b..c4f22cd43ab 100644
--- a/Framework/CurveFitting/test/LeBailFunctionTest.h
+++ b/Framework/CurveFitting/test/LeBailFunctionTest.h
@@ -5,8 +5,6 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include <fstream>
#include "MantidCurveFitting/LeBailFunction.h"
diff --git a/Framework/CurveFitting/test/MultiDomainCreatorTest.h b/Framework/CurveFitting/test/MultiDomainCreatorTest.h
index 83eafed823d..96f3dbab2de 100644
--- a/Framework/CurveFitting/test/MultiDomainCreatorTest.h
+++ b/Framework/CurveFitting/test/MultiDomainCreatorTest.h
@@ -20,7 +20,6 @@
#include <cxxtest/TestSuite.h>
#include <boost/make_shared.hpp>
#include <algorithm>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/CurveFitting/test/MultiDomainFunctionTest.h b/Framework/CurveFitting/test/MultiDomainFunctionTest.h
index f99acf8e0d5..afc12650780 100644
--- a/Framework/CurveFitting/test/MultiDomainFunctionTest.h
+++ b/Framework/CurveFitting/test/MultiDomainFunctionTest.h
@@ -18,7 +18,6 @@
#include <cxxtest/TestSuite.h>
#include <boost/make_shared.hpp>
#include <algorithm>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/CurveFitting/test/ThermalNeutronBk2BkExpConvPVoigtTest.h b/Framework/CurveFitting/test/ThermalNeutronBk2BkExpConvPVoigtTest.h
index 4c4aaccc8a5..0be6d35d56e 100644
--- a/Framework/CurveFitting/test/ThermalNeutronBk2BkExpConvPVoigtTest.h
+++ b/Framework/CurveFitting/test/ThermalNeutronBk2BkExpConvPVoigtTest.h
@@ -2,7 +2,6 @@
#define MANTID_CURVEFITTING_THERMALNEUTRONBK2BKEXPCONVPVTEST_H_
#include <cxxtest/TestSuite.h>
-#include <iostream>
#include <fstream>
#include <cmath>
diff --git a/Framework/CurveFitting/test/ThermalNeutronDtoTOFFunctionTest.h b/Framework/CurveFitting/test/ThermalNeutronDtoTOFFunctionTest.h
index 991cb0884f5..e24ea0b0262 100644
--- a/Framework/CurveFitting/test/ThermalNeutronDtoTOFFunctionTest.h
+++ b/Framework/CurveFitting/test/ThermalNeutronDtoTOFFunctionTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include <cmath>
-#include <iostream>
#include <math.h>
#include <fstream>
diff --git a/Framework/Geometry/test/BoundingBoxTest.h b/Framework/Geometry/test/BoundingBoxTest.h
index a071493595c..12071a5b559 100644
--- a/Framework/Geometry/test/BoundingBoxTest.h
+++ b/Framework/Geometry/test/BoundingBoxTest.h
@@ -5,7 +5,6 @@
#include "MantidGeometry/Objects/BoundingBox.h"
#include "MantidGeometry/Objects/Track.h"
#include "MantidKernel/Timer.h"
-#include <iostream>
using namespace Mantid;
using namespace Mantid::Geometry;
diff --git a/Framework/Geometry/test/CompAssemblyTest.h b/Framework/Geometry/test/CompAssemblyTest.h
index fd3602f6097..1e69012097a 100644
--- a/Framework/Geometry/test/CompAssemblyTest.h
+++ b/Framework/Geometry/test/CompAssemblyTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include <cmath>
-#include <iostream>
#include <string>
#include "MantidGeometry/Instrument/CompAssembly.h"
#include "MantidKernel/V3D.h"
diff --git a/Framework/Geometry/test/ComponentParserTest.h b/Framework/Geometry/test/ComponentParserTest.h
index 1f23e83ad62..d8732db1245 100644
--- a/Framework/Geometry/test/ComponentParserTest.h
+++ b/Framework/Geometry/test/ComponentParserTest.h
@@ -7,8 +7,6 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/V3D.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <Poco/SAX/SAXParser.h>
#include <sstream>
#include "MantidKernel/CPUTimer.h"
diff --git a/Framework/Geometry/test/ComponentTest.h b/Framework/Geometry/test/ComponentTest.h
index 4137d5bf3d8..479ec51f31d 100644
--- a/Framework/Geometry/test/ComponentTest.h
+++ b/Framework/Geometry/test/ComponentTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include <cmath>
-#include <iostream>
#include <string>
#include "MantidGeometry/Instrument/Component.h"
#include "MantidKernel/V3D.h"
diff --git a/Framework/Geometry/test/ConventionalCellTest.h b/Framework/Geometry/test/ConventionalCellTest.h
index adb468c13f2..69d2b965b41 100644
--- a/Framework/Geometry/test/ConventionalCellTest.h
+++ b/Framework/Geometry/test/ConventionalCellTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include <MantidKernel/Timer.h>
#include <MantidKernel/System.h>
-#include <iostream>
-#include <iomanip>
#include <MantidKernel/V3D.h>
#include <MantidKernel/Matrix.h>
diff --git a/Framework/Geometry/test/DetectorTest.h b/Framework/Geometry/test/DetectorTest.h
index f7c2495e2bc..c9181e9192c 100644
--- a/Framework/Geometry/test/DetectorTest.h
+++ b/Framework/Geometry/test/DetectorTest.h
@@ -6,7 +6,6 @@
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidGeometry/Instrument/Component.h"
#include <cmath>
-#include <iostream>
using namespace Mantid::Geometry;
using Mantid::Kernel::V3D;
diff --git a/Framework/Geometry/test/GoniometerTest.h b/Framework/Geometry/test/GoniometerTest.h
index 9ae9bddf5f6..7cfad5d1b3f 100644
--- a/Framework/Geometry/test/GoniometerTest.h
+++ b/Framework/Geometry/test/GoniometerTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidGeometry/Instrument/Goniometer.h"
-#include <iostream>
#include <stdexcept>
#include <string>
#include "MantidKernel/Quat.h"
diff --git a/Framework/Geometry/test/IndexingUtilsTest.h b/Framework/Geometry/test/IndexingUtilsTest.h
index 57449f7b04a..f1ed265dda4 100644
--- a/Framework/Geometry/test/IndexingUtilsTest.h
+++ b/Framework/Geometry/test/IndexingUtilsTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include <MantidKernel/Timer.h>
#include <MantidKernel/System.h>
-#include <iostream>
-#include <iomanip>
#include <MantidKernel/V3D.h>
#include <MantidKernel/Matrix.h>
#include "MantidGeometry/Crystal/OrientedLattice.h"
diff --git a/Framework/Geometry/test/MDBoxImplicitFunctionTest.h b/Framework/Geometry/test/MDBoxImplicitFunctionTest.h
index 28ba764bda0..e27544409c8 100644
--- a/Framework/Geometry/test/MDBoxImplicitFunctionTest.h
+++ b/Framework/Geometry/test/MDBoxImplicitFunctionTest.h
@@ -6,8 +6,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::Geometry;
diff --git a/Framework/Geometry/test/MDHistoDimensionTest.h b/Framework/Geometry/test/MDHistoDimensionTest.h
index 63474366e71..f6dca8e74ba 100644
--- a/Framework/Geometry/test/MDHistoDimensionTest.h
+++ b/Framework/Geometry/test/MDHistoDimensionTest.h
@@ -7,8 +7,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::Geometry;
diff --git a/Framework/Geometry/test/MDPlaneTest.h b/Framework/Geometry/test/MDPlaneTest.h
index 05b165291f8..8004fa018dd 100644
--- a/Framework/Geometry/test/MDPlaneTest.h
+++ b/Framework/Geometry/test/MDPlaneTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include "MantidKernel/VMD.h"
using namespace Mantid;
diff --git a/Framework/Geometry/test/NearestNeighboursFactoryTest.h b/Framework/Geometry/test/NearestNeighboursFactoryTest.h
index 775478822a2..62307251240 100644
--- a/Framework/Geometry/test/NearestNeighboursFactoryTest.h
+++ b/Framework/Geometry/test/NearestNeighboursFactoryTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidGeometry/Instrument/NearestNeighboursFactory.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
diff --git a/Framework/Geometry/test/NiggliCellTest.h b/Framework/Geometry/test/NiggliCellTest.h
index d21190d4967..63611e21862 100644
--- a/Framework/Geometry/test/NiggliCellTest.h
+++ b/Framework/Geometry/test/NiggliCellTest.h
@@ -2,8 +2,6 @@
#define MANTID_GEOMETRY_NiggliCellTEST_H_
#include <cxxtest/TestSuite.h>
-#include <iostream>
-#include <iomanip>
#include "MantidKernel/Matrix.h"
#include "MantidGeometry/Crystal/NiggliCell.h"
#include "MantidGeometry/Crystal/OrientedLattice.h"
diff --git a/Framework/Geometry/test/ObjCompAssemblyTest.h b/Framework/Geometry/test/ObjCompAssemblyTest.h
index 178682005c6..1acc727c0e7 100644
--- a/Framework/Geometry/test/ObjCompAssemblyTest.h
+++ b/Framework/Geometry/test/ObjCompAssemblyTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include <cmath>
-#include <iostream>
#include <string>
#include "MantidGeometry/Instrument/ObjCompAssembly.h"
#include "MantidKernel/V3D.h"
diff --git a/Framework/Geometry/test/ObjectTest.h b/Framework/Geometry/test/ObjectTest.h
index 310d3970508..2c80fd8a758 100644
--- a/Framework/Geometry/test/ObjectTest.h
+++ b/Framework/Geometry/test/ObjectTest.h
@@ -7,7 +7,6 @@
#include <vector>
#include <algorithm>
#include <ctime>
-#include <iomanip>
#include <boost/shared_ptr.hpp>
diff --git a/Framework/Geometry/test/OrientedLatticeTest.h b/Framework/Geometry/test/OrientedLatticeTest.h
index d2536f13fd7..487231edeec 100644
--- a/Framework/Geometry/test/OrientedLatticeTest.h
+++ b/Framework/Geometry/test/OrientedLatticeTest.h
@@ -2,8 +2,6 @@
#define MANTID_GEOMETRY_ORIENTEDLATTICETEST_H_
#include <cxxtest/TestSuite.h>
-#include <iostream>
-#include <iomanip>
#include "MantidKernel/Matrix.h"
#include "MantidGeometry/Crystal/OrientedLattice.h"
#include "MantidTestHelpers/NexusTestHelper.h"
diff --git a/Framework/Geometry/test/ParCompAssemblyTest.h b/Framework/Geometry/test/ParCompAssemblyTest.h
index 048ca5fb842..bd9212db670 100644
--- a/Framework/Geometry/test/ParCompAssemblyTest.h
+++ b/Framework/Geometry/test/ParCompAssemblyTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include <cmath>
-#include <iostream>
#include <string>
#include "MantidGeometry/Instrument/CompAssembly.h"
#include "MantidGeometry/Instrument/CompAssembly.h"
diff --git a/Framework/Geometry/test/ParComponentFactoryTest.h b/Framework/Geometry/test/ParComponentFactoryTest.h
index 950f0efeb08..0fb537e000a 100644
--- a/Framework/Geometry/test/ParComponentFactoryTest.h
+++ b/Framework/Geometry/test/ParComponentFactoryTest.h
@@ -7,8 +7,6 @@
#include "MantidKernel/Timer.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid::Geometry;
diff --git a/Framework/Geometry/test/ParObjCompAssemblyTest.h b/Framework/Geometry/test/ParObjCompAssemblyTest.h
index 2efae136a5d..dd42abb3f81 100644
--- a/Framework/Geometry/test/ParObjCompAssemblyTest.h
+++ b/Framework/Geometry/test/ParObjCompAssemblyTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include <cmath>
-#include <iostream>
#include <string>
#include "MantidGeometry/Instrument/ObjCompAssembly.h"
#include "MantidGeometry/Instrument/ObjCompAssembly.h"
diff --git a/Framework/Geometry/test/ParametrizedComponentTest.h b/Framework/Geometry/test/ParametrizedComponentTest.h
index 467950faf55..b9120c7a335 100644
--- a/Framework/Geometry/test/ParametrizedComponentTest.h
+++ b/Framework/Geometry/test/ParametrizedComponentTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include <cmath>
-#include <iostream>
#include <string>
#include <boost/make_shared.hpp>
#include "MantidGeometry/Instrument/Component.h"
diff --git a/Framework/Geometry/test/PointGroupTest.h b/Framework/Geometry/test/PointGroupTest.h
index 6256893a3cf..406a4508cbe 100644
--- a/Framework/Geometry/test/PointGroupTest.h
+++ b/Framework/Geometry/test/PointGroupTest.h
@@ -7,8 +7,6 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidGeometry/Crystal/PointGroupFactory.h"
#include "MantidGeometry/Crystal/PointGroup.h"
#include <boost/lexical_cast.hpp>
diff --git a/Framework/Geometry/test/RectangularDetectorPixelTest.h b/Framework/Geometry/test/RectangularDetectorPixelTest.h
index 04fd8a6593e..83b920ad7e8 100644
--- a/Framework/Geometry/test/RectangularDetectorPixelTest.h
+++ b/Framework/Geometry/test/RectangularDetectorPixelTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidGeometry/Instrument/RectangularDetectorPixel.h"
diff --git a/Framework/Geometry/test/RectangularDetectorTest.h b/Framework/Geometry/test/RectangularDetectorTest.h
index ee6903e0b45..a0c1ca0b964 100644
--- a/Framework/Geometry/test/RectangularDetectorTest.h
+++ b/Framework/Geometry/test/RectangularDetectorTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include <cmath>
-#include <iostream>
#include <string>
#include "MantidGeometry/Instrument/RectangularDetector.h"
#include "MantidKernel/V3D.h"
diff --git a/Framework/Geometry/test/ReducedCellTest.h b/Framework/Geometry/test/ReducedCellTest.h
index cf2f44bcf77..3065f6553b8 100644
--- a/Framework/Geometry/test/ReducedCellTest.h
+++ b/Framework/Geometry/test/ReducedCellTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include <MantidKernel/Timer.h>
#include <MantidKernel/System.h>
-#include <iostream>
-#include <iomanip>
#include <MantidKernel/V3D.h>
#include <MantidKernel/Matrix.h>
diff --git a/Framework/Geometry/test/ReferenceFrameTest.h b/Framework/Geometry/test/ReferenceFrameTest.h
index 69cc05033f4..f203819da2d 100644
--- a/Framework/Geometry/test/ReferenceFrameTest.h
+++ b/Framework/Geometry/test/ReferenceFrameTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
#include "MantidKernel/V3D.h"
-#include <iostream>
-#include <iomanip>
#include "MantidGeometry/Instrument/ReferenceFrame.h"
diff --git a/Framework/Geometry/test/ReflectionConditionTest.h b/Framework/Geometry/test/ReflectionConditionTest.h
index 2e342729156..ba8a2582881 100644
--- a/Framework/Geometry/test/ReflectionConditionTest.h
+++ b/Framework/Geometry/test/ReflectionConditionTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <set>
using namespace Mantid::Geometry;
diff --git a/Framework/Geometry/test/ScalarUtilsTest.h b/Framework/Geometry/test/ScalarUtilsTest.h
index a428b760331..1bc65f8e32d 100644
--- a/Framework/Geometry/test/ScalarUtilsTest.h
+++ b/Framework/Geometry/test/ScalarUtilsTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include <MantidKernel/Timer.h>
#include <MantidKernel/System.h>
-#include <iostream>
-#include <iomanip>
#include <MantidKernel/V3D.h>
#include <MantidKernel/Matrix.h>
diff --git a/Framework/Geometry/test/UnitCellTest.h b/Framework/Geometry/test/UnitCellTest.h
index e05a25f66eb..b2ddd021baa 100644
--- a/Framework/Geometry/test/UnitCellTest.h
+++ b/Framework/Geometry/test/UnitCellTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include <MantidKernel/Timer.h>
#include <MantidKernel/System.h>
-#include <iostream>
-#include <iomanip>
#include <MantidKernel/Matrix.h>
#include <MantidGeometry/Crystal/UnitCell.h>
diff --git a/Framework/Geometry/test/XMLInstrumentParameterTest.h b/Framework/Geometry/test/XMLInstrumentParameterTest.h
index a6d4d47cd7f..e09348f8176 100644
--- a/Framework/Geometry/test/XMLInstrumentParameterTest.h
+++ b/Framework/Geometry/test/XMLInstrumentParameterTest.h
@@ -6,8 +6,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <boost/shared_ptr.hpp>
#include <boost/make_shared.hpp>
--
GitLab
From ebc9b6d342ee26b2fa91791c3fb714edd219472e Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 13:19:51 +0100
Subject: [PATCH 070/223] tests in MDAlgorithms, Nexus, DataHandling, API, re
#13689
---
Framework/API/test/AlgorithmPropertyTest.h | 2 --
Framework/API/test/AsynchronousTest.h | 1 -
Framework/API/test/CoordTransformTest.h | 2 --
Framework/API/test/DataProcessorAlgorithmTest.h | 2 --
Framework/API/test/EnabledWhenWorkspaceIsTypeTest.h | 2 --
Framework/API/test/FermiChopperModelTest.h | 1 -
Framework/API/test/FrameworkManagerTest.h | 1 -
Framework/API/test/FunctionDomainTest.h | 1 -
Framework/API/test/FunctionValuesTest.h | 1 -
Framework/API/test/IEventListTest.h | 2 --
Framework/API/test/IFunction1DTest.h | 1 -
Framework/API/test/IFunctionMDTest.h | 1 -
Framework/API/test/ISpectrumTest.h | 2 --
Framework/API/test/ImplicitFunctionFactoryTest.h | 1 -
Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h | 1 -
Framework/API/test/ImplicitFunctionParserFactoryTest.h | 1 -
Framework/API/test/InstrumentDataServiceTest.h | 1 -
Framework/API/test/MDGeometryTest.h | 2 --
Framework/API/test/MultiDomainFunctionTest.h | 1 -
Framework/API/test/MultipleExperimentInfosTest.h | 2 --
Framework/API/test/MultipleFilePropertyTest.h | 2 --
Framework/API/test/PropertyManagerDataServiceTest.h | 1 -
Framework/API/test/PropertyNexusTest.h | 2 --
Framework/API/test/WorkspaceFactoryTest.h | 1 -
Framework/API/test/WorkspaceGroupTest.h | 2 --
Framework/DataHandling/test/AppendGeometryToSNSNexusTest.h | 2 --
Framework/DataHandling/test/CompressEventsTest.h | 1 -
Framework/DataHandling/test/DetermineChunkingTest.h | 2 --
Framework/DataHandling/test/DownloadInstrumentTest.h | 1 -
.../DataHandling/test/FilterEventsByLogValuePreNexusTest.h | 1 -
Framework/DataHandling/test/GenerateGroupingPowderTest.h | 2 --
Framework/DataHandling/test/GroupDetectors2Test.h | 1 -
Framework/DataHandling/test/GroupDetectorsTest.h | 1 -
Framework/DataHandling/test/LoadCalFileTest.h | 2 --
Framework/DataHandling/test/LoadDetectorInfoTest.h | 1 -
Framework/DataHandling/test/LoadDetectorsGroupingFileTest.h | 2 --
Framework/DataHandling/test/LoadDspacemapTest.h | 2 --
Framework/DataHandling/test/LoadEventNexusTest.h | 1 -
Framework/DataHandling/test/LoadInstrumentTest.h | 1 -
Framework/DataHandling/test/LoadMaskTest.h | 2 --
Framework/DataHandling/test/LoadNXSPETest.h | 2 --
Framework/DataHandling/test/LoadNexusLogsTest.h | 1 -
Framework/DataHandling/test/LoadParameterFileTest.h | 1 -
Framework/DataHandling/test/LoadPreNexusTest.h | 2 --
Framework/DataHandling/test/LoadSNSNexusTest.h | 1 -
Framework/DataHandling/test/LoadVulcanCalFileTest.h | 2 --
Framework/DataHandling/test/MergeLogsTest.h | 2 --
Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h | 2 --
Framework/DataHandling/test/MoveInstrumentComponentTest.h | 1 -
Framework/DataHandling/test/NexusTesterTest.h | 2 --
Framework/DataHandling/test/ProcessDasNexusLogTest.h | 2 --
Framework/DataHandling/test/RawFileInfoTest.h | 2 --
Framework/DataHandling/test/RenameLogTest.h | 2 --
Framework/DataHandling/test/SaveCalFileTest.h | 2 --
Framework/DataHandling/test/SaveDaveGrpTest.h | 2 --
Framework/DataHandling/test/SaveDetectorsGroupingTest.h | 2 --
Framework/DataHandling/test/SaveDspacemapTest.h | 2 --
Framework/DataHandling/test/SaveFullprofResolutionTest.h | 1 -
Framework/DataHandling/test/SaveIsawDetCalTest.h | 2 --
Framework/DataHandling/test/SaveMaskTest.h | 2 --
Framework/DataHandling/test/XMLInstrumentParameterTest.h | 1 -
Framework/MDAlgorithms/test/AndMDTest.h | 2 --
Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h | 2 --
Framework/MDAlgorithms/test/DivideMDTest.h | 2 --
Framework/MDAlgorithms/test/ExponentialMDTest.h | 2 --
Framework/MDAlgorithms/test/GreaterThanMDTest.h | 2 --
Framework/MDAlgorithms/test/LogarithmMDTest.h | 2 --
Framework/MDAlgorithms/test/PowerMDTest.h | 2 --
Framework/MDAlgorithms/test/ReflectometryTransformPTest.h | 2 --
Framework/MDAlgorithms/test/SlicingAlgorithmTest.h | 1 -
Framework/Nexus/test/NexusAPITest.h | 1 -
71 files changed, 112 deletions(-)
diff --git a/Framework/API/test/AlgorithmPropertyTest.h b/Framework/API/test/AlgorithmPropertyTest.h
index e4f151be0b9..9d60a2b1cf9 100644
--- a/Framework/API/test/AlgorithmPropertyTest.h
+++ b/Framework/API/test/AlgorithmPropertyTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAPI/AlgorithmProperty.h"
#include "MantidAPI/AlgorithmHasProperty.h"
diff --git a/Framework/API/test/AsynchronousTest.h b/Framework/API/test/AsynchronousTest.h
index 07d419957de..8fa819cea2a 100644
--- a/Framework/API/test/AsynchronousTest.h
+++ b/Framework/API/test/AsynchronousTest.h
@@ -7,7 +7,6 @@
#include <Poco/ActiveResult.h>
#include <Poco/NObserver.h>
#include <Poco/Thread.h>
-#include <iostream>
using namespace Mantid::Kernel;
using namespace Mantid::API;
diff --git a/Framework/API/test/CoordTransformTest.h b/Framework/API/test/CoordTransformTest.h
index 7ce04f333e9..8f8e2fc42a0 100644
--- a/Framework/API/test/CoordTransformTest.h
+++ b/Framework/API/test/CoordTransformTest.h
@@ -5,8 +5,6 @@
#include "MantidKernel/Timer.h"
#include "MantidAPI/CoordTransform.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
using namespace Mantid;
diff --git a/Framework/API/test/DataProcessorAlgorithmTest.h b/Framework/API/test/DataProcessorAlgorithmTest.h
index 804ca82f23e..a3c689e8603 100644
--- a/Framework/API/test/DataProcessorAlgorithmTest.h
+++ b/Framework/API/test/DataProcessorAlgorithmTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAPI/DataProcessorAlgorithm.h"
#include "MantidTestHelpers/FakeObjects.h"
diff --git a/Framework/API/test/EnabledWhenWorkspaceIsTypeTest.h b/Framework/API/test/EnabledWhenWorkspaceIsTypeTest.h
index 5df2c41eb77..790b55da1cd 100644
--- a/Framework/API/test/EnabledWhenWorkspaceIsTypeTest.h
+++ b/Framework/API/test/EnabledWhenWorkspaceIsTypeTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAPI/EnabledWhenWorkspaceIsType.h"
#include "MantidKernel/PropertyManagerOwner.h"
diff --git a/Framework/API/test/FermiChopperModelTest.h b/Framework/API/test/FermiChopperModelTest.h
index 35e1ae34c2f..527a4c39080 100644
--- a/Framework/API/test/FermiChopperModelTest.h
+++ b/Framework/API/test/FermiChopperModelTest.h
@@ -7,7 +7,6 @@
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <cxxtest/TestSuite.h>
#include <boost/make_shared.hpp>
-#include <iomanip>
class FermiChopperModelTest : public CxxTest::TestSuite {
typedef boost::shared_ptr<Mantid::API::FermiChopperModel>
diff --git a/Framework/API/test/FrameworkManagerTest.h b/Framework/API/test/FrameworkManagerTest.h
index fedbaf2891f..3f1b0176797 100644
--- a/Framework/API/test/FrameworkManagerTest.h
+++ b/Framework/API/test/FrameworkManagerTest.h
@@ -7,7 +7,6 @@
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/AlgorithmFactory.h"
#include <stdexcept>
-#include <iostream>
using namespace Mantid::Kernel;
using namespace Mantid::API;
diff --git a/Framework/API/test/FunctionDomainTest.h b/Framework/API/test/FunctionDomainTest.h
index 46c8dbbadf6..cd9d99bfe53 100644
--- a/Framework/API/test/FunctionDomainTest.h
+++ b/Framework/API/test/FunctionDomainTest.h
@@ -6,7 +6,6 @@
#include "MantidAPI/WorkspaceFactory.h"
#include <cxxtest/TestSuite.h>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/API/test/FunctionValuesTest.h b/Framework/API/test/FunctionValuesTest.h
index ece5090d9bd..30cf805f718 100644
--- a/Framework/API/test/FunctionValuesTest.h
+++ b/Framework/API/test/FunctionValuesTest.h
@@ -5,7 +5,6 @@
#include "MantidAPI/FunctionValues.h"
#include <cxxtest/TestSuite.h>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/API/test/IEventListTest.h b/Framework/API/test/IEventListTest.h
index ab960042e57..334ed6e3fa4 100644
--- a/Framework/API/test/IEventListTest.h
+++ b/Framework/API/test/IEventListTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAPI/IEventList.h"
diff --git a/Framework/API/test/IFunction1DTest.h b/Framework/API/test/IFunction1DTest.h
index b2b55489f11..0eabfc571e2 100644
--- a/Framework/API/test/IFunction1DTest.h
+++ b/Framework/API/test/IFunction1DTest.h
@@ -7,7 +7,6 @@
#include "MantidAPI/FunctionValues.h"
#include <cxxtest/TestSuite.h>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/API/test/IFunctionMDTest.h b/Framework/API/test/IFunctionMDTest.h
index 7e21a71544b..e3f563fc1b2 100644
--- a/Framework/API/test/IFunctionMDTest.h
+++ b/Framework/API/test/IFunctionMDTest.h
@@ -3,7 +3,6 @@
#include "MantidAPI/IFunctionMD.h"
#include <cxxtest/TestSuite.h>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/API/test/ISpectrumTest.h b/Framework/API/test/ISpectrumTest.h
index fea22024ddb..625bb42f14e 100644
--- a/Framework/API/test/ISpectrumTest.h
+++ b/Framework/API/test/ISpectrumTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAPI/ISpectrum.h"
#include "MantidTestHelpers/FakeObjects.h"
diff --git a/Framework/API/test/ImplicitFunctionFactoryTest.h b/Framework/API/test/ImplicitFunctionFactoryTest.h
index abcea3ce1f0..1b1ef4b16c3 100644
--- a/Framework/API/test/ImplicitFunctionFactoryTest.h
+++ b/Framework/API/test/ImplicitFunctionFactoryTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include <vector>
-#include <iostream>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include "MantidAPI/ImplicitFunctionParameterParserFactory.h"
diff --git a/Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h b/Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h
index 2362545a857..976ea132f0f 100644
--- a/Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h
+++ b/Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include <vector>
-#include <iostream>
#include "MantidAPI/ImplicitFunctionParameterParserFactory.h"
#include "MantidKernel/ConfigService.h"
diff --git a/Framework/API/test/ImplicitFunctionParserFactoryTest.h b/Framework/API/test/ImplicitFunctionParserFactoryTest.h
index 009e0409d80..4cee2938158 100644
--- a/Framework/API/test/ImplicitFunctionParserFactoryTest.h
+++ b/Framework/API/test/ImplicitFunctionParserFactoryTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include <vector>
-#include <iostream>
#include "MantidAPI/ImplicitFunctionParserFactory.h"
#include "MantidKernel/ConfigService.h"
diff --git a/Framework/API/test/InstrumentDataServiceTest.h b/Framework/API/test/InstrumentDataServiceTest.h
index 27b411e76d9..034b18bd9e3 100644
--- a/Framework/API/test/InstrumentDataServiceTest.h
+++ b/Framework/API/test/InstrumentDataServiceTest.h
@@ -6,7 +6,6 @@
#include "MantidAPI/InstrumentDataService.h"
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/Exception.h"
-#include <iostream>
using namespace Mantid::API;
using namespace Mantid::Geometry;
diff --git a/Framework/API/test/MDGeometryTest.h b/Framework/API/test/MDGeometryTest.h
index 126b2e28d6d..a933cffc4b1 100644
--- a/Framework/API/test/MDGeometryTest.h
+++ b/Framework/API/test/MDGeometryTest.h
@@ -6,8 +6,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include "MantidKernel/VMD.h"
#include "MantidAPI/IMDWorkspace.h"
#include "MantidTestHelpers/FakeObjects.h"
diff --git a/Framework/API/test/MultiDomainFunctionTest.h b/Framework/API/test/MultiDomainFunctionTest.h
index 87109b8220a..933a23c2291 100644
--- a/Framework/API/test/MultiDomainFunctionTest.h
+++ b/Framework/API/test/MultiDomainFunctionTest.h
@@ -12,7 +12,6 @@
#include <cxxtest/TestSuite.h>
#include <boost/make_shared.hpp>
#include <algorithm>
-#include <iostream>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/API/test/MultipleExperimentInfosTest.h b/Framework/API/test/MultipleExperimentInfosTest.h
index 3fce4df5933..8198fa528b1 100644
--- a/Framework/API/test/MultipleExperimentInfosTest.h
+++ b/Framework/API/test/MultipleExperimentInfosTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidAPI/MultipleExperimentInfos.h"
#include "MantidAPI/ExperimentInfo.h"
diff --git a/Framework/API/test/MultipleFilePropertyTest.h b/Framework/API/test/MultipleFilePropertyTest.h
index 2ce77d3b8b5..77497dad7d4 100644
--- a/Framework/API/test/MultipleFilePropertyTest.h
+++ b/Framework/API/test/MultipleFilePropertyTest.h
@@ -8,8 +8,6 @@
#include "MantidKernel/Logger.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <Poco/Path.h>
#include <Poco/File.h>
diff --git a/Framework/API/test/PropertyManagerDataServiceTest.h b/Framework/API/test/PropertyManagerDataServiceTest.h
index 6596e9bb84d..77063af16ab 100644
--- a/Framework/API/test/PropertyManagerDataServiceTest.h
+++ b/Framework/API/test/PropertyManagerDataServiceTest.h
@@ -6,7 +6,6 @@
#include "MantidAPI/PropertyManagerDataService.h"
#include "MantidKernel/PropertyManager.h"
#include "MantidKernel/Exception.h"
-#include <iostream>
using namespace Mantid::API;
using namespace Mantid::Kernel;
diff --git a/Framework/API/test/PropertyNexusTest.h b/Framework/API/test/PropertyNexusTest.h
index ce4c2492ec4..7d21f82e8d1 100644
--- a/Framework/API/test/PropertyNexusTest.h
+++ b/Framework/API/test/PropertyNexusTest.h
@@ -6,8 +6,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include "MantidTestHelpers/NexusTestHelper.h"
#include "MantidKernel/PropertyWithValue.h"
#include "MantidKernel/TimeSeriesProperty.h"
diff --git a/Framework/API/test/WorkspaceFactoryTest.h b/Framework/API/test/WorkspaceFactoryTest.h
index a3aa58f0d0f..8ec2978f7ba 100644
--- a/Framework/API/test/WorkspaceFactoryTest.h
+++ b/Framework/API/test/WorkspaceFactoryTest.h
@@ -3,7 +3,6 @@
#include <cxxtest/TestSuite.h>
#include <vector>
-#include <iostream>
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/WorkspaceFactory.h"
diff --git a/Framework/API/test/WorkspaceGroupTest.h b/Framework/API/test/WorkspaceGroupTest.h
index 1feaa40e635..f14a8d18889 100644
--- a/Framework/API/test/WorkspaceGroupTest.h
+++ b/Framework/API/test/WorkspaceGroupTest.h
@@ -10,8 +10,6 @@
#include <boost/shared_ptr.hpp>
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/Framework/DataHandling/test/AppendGeometryToSNSNexusTest.h b/Framework/DataHandling/test/AppendGeometryToSNSNexusTest.h
index 14df378e757..4d8dc738643 100644
--- a/Framework/DataHandling/test/AppendGeometryToSNSNexusTest.h
+++ b/Framework/DataHandling/test/AppendGeometryToSNSNexusTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataHandling/AppendGeometryToSNSNexus.h"
diff --git a/Framework/DataHandling/test/CompressEventsTest.h b/Framework/DataHandling/test/CompressEventsTest.h
index 5523f08c4af..1c2981657a4 100644
--- a/Framework/DataHandling/test/CompressEventsTest.h
+++ b/Framework/DataHandling/test/CompressEventsTest.h
@@ -6,7 +6,6 @@
#include "MantidDataHandling/CompressEvents.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
-#include <iostream>
using Mantid::MantidVecPtr;
using namespace Mantid::Kernel;
diff --git a/Framework/DataHandling/test/DetermineChunkingTest.h b/Framework/DataHandling/test/DetermineChunkingTest.h
index cf2f5bc2c61..b15a648fa30 100644
--- a/Framework/DataHandling/test/DetermineChunkingTest.h
+++ b/Framework/DataHandling/test/DetermineChunkingTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataHandling/DetermineChunking.h"
#include "MantidDataObjects/TableWorkspace.h"
diff --git a/Framework/DataHandling/test/DownloadInstrumentTest.h b/Framework/DataHandling/test/DownloadInstrumentTest.h
index 587b9fe1e47..fb5e0e48200 100644
--- a/Framework/DataHandling/test/DownloadInstrumentTest.h
+++ b/Framework/DataHandling/test/DownloadInstrumentTest.h
@@ -10,7 +10,6 @@
#include <Poco/File.h>
#include <Poco/Path.h>
-#include <iostream>
#include <fstream>
#include <string>
#include <cstdio>
diff --git a/Framework/DataHandling/test/FilterEventsByLogValuePreNexusTest.h b/Framework/DataHandling/test/FilterEventsByLogValuePreNexusTest.h
index 7cc915f7298..0358926efa0 100644
--- a/Framework/DataHandling/test/FilterEventsByLogValuePreNexusTest.h
+++ b/Framework/DataHandling/test/FilterEventsByLogValuePreNexusTest.h
@@ -16,7 +16,6 @@
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidDataHandling/FilterEventsByLogValuePreNexus.h"
#include <cxxtest/TestSuite.h>
-#include <iostream>
#include <Poco/File.h>
using namespace Mantid::Geometry;
diff --git a/Framework/DataHandling/test/GenerateGroupingPowderTest.h b/Framework/DataHandling/test/GenerateGroupingPowderTest.h
index f4476d6057a..85b0c8fd37d 100644
--- a/Framework/DataHandling/test/GenerateGroupingPowderTest.h
+++ b/Framework/DataHandling/test/GenerateGroupingPowderTest.h
@@ -4,9 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
#include <fstream>
-#include <iomanip>
#include "MantidDataHandling/LoadEmptyInstrument.h"
#include "MantidDataHandling/GenerateGroupingPowder.h"
#include "MantidDataHandling/LoadDetectorsGroupingFile.h"
diff --git a/Framework/DataHandling/test/GroupDetectors2Test.h b/Framework/DataHandling/test/GroupDetectors2Test.h
index f6ba151d45e..0d1e297b86b 100644
--- a/Framework/DataHandling/test/GroupDetectors2Test.h
+++ b/Framework/DataHandling/test/GroupDetectors2Test.h
@@ -15,7 +15,6 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <cxxtest/TestSuite.h>
#include <fstream>
-#include <iostream>
#include <numeric>
#include <Poco/Path.h>
#include "MantidDataHandling/MaskDetectors.h"
diff --git a/Framework/DataHandling/test/GroupDetectorsTest.h b/Framework/DataHandling/test/GroupDetectorsTest.h
index a8f801e769a..ab826382895 100644
--- a/Framework/DataHandling/test/GroupDetectorsTest.h
+++ b/Framework/DataHandling/test/GroupDetectorsTest.h
@@ -11,7 +11,6 @@
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidGeometry/Instrument/DetectorGroup.h"
-#include <iostream>
using Mantid::DataHandling::GroupDetectors;
using Mantid::MantidVecPtr;
diff --git a/Framework/DataHandling/test/LoadCalFileTest.h b/Framework/DataHandling/test/LoadCalFileTest.h
index c673ee55dff..6299545b388 100644
--- a/Framework/DataHandling/test/LoadCalFileTest.h
+++ b/Framework/DataHandling/test/LoadCalFileTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataHandling/LoadCalFile.h"
#include "MantidDataObjects/GroupingWorkspace.h"
diff --git a/Framework/DataHandling/test/LoadDetectorInfoTest.h b/Framework/DataHandling/test/LoadDetectorInfoTest.h
index fec164099da..106258dba36 100644
--- a/Framework/DataHandling/test/LoadDetectorInfoTest.h
+++ b/Framework/DataHandling/test/LoadDetectorInfoTest.h
@@ -19,7 +19,6 @@
#include <algorithm>
#include <fstream>
#include <vector>
-#include <iostream>
#include <boost/lexical_cast.hpp>
#include <nexus/NeXusFile.hpp>
diff --git a/Framework/DataHandling/test/LoadDetectorsGroupingFileTest.h b/Framework/DataHandling/test/LoadDetectorsGroupingFileTest.h
index e71c52d34af..90765cb6459 100644
--- a/Framework/DataHandling/test/LoadDetectorsGroupingFileTest.h
+++ b/Framework/DataHandling/test/LoadDetectorsGroupingFileTest.h
@@ -11,8 +11,6 @@
#include "Poco/File.h"
#include <cxxtest/TestSuite.h>
-#include <iostream>
-#include <iomanip>
#include <fstream>
using namespace Mantid;
diff --git a/Framework/DataHandling/test/LoadDspacemapTest.h b/Framework/DataHandling/test/LoadDspacemapTest.h
index d5714fe3713..d00455638b4 100644
--- a/Framework/DataHandling/test/LoadDspacemapTest.h
+++ b/Framework/DataHandling/test/LoadDspacemapTest.h
@@ -10,8 +10,6 @@
#include <cstring>
#include <cxxtest/TestSuite.h>
#include <fstream>
-#include <iomanip>
-#include <iostream>
#include <vector>
using namespace Mantid::DataHandling;
diff --git a/Framework/DataHandling/test/LoadEventNexusTest.h b/Framework/DataHandling/test/LoadEventNexusTest.h
index 7b53cf6a34a..9ce546c2c3a 100644
--- a/Framework/DataHandling/test/LoadEventNexusTest.h
+++ b/Framework/DataHandling/test/LoadEventNexusTest.h
@@ -11,7 +11,6 @@
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidDataHandling/LoadEventNexus.h"
#include <cxxtest/TestSuite.h>
-#include <iostream>
using namespace Mantid::Geometry;
using namespace Mantid::API;
diff --git a/Framework/DataHandling/test/LoadInstrumentTest.h b/Framework/DataHandling/test/LoadInstrumentTest.h
index b488f7c1458..497edfa26b5 100644
--- a/Framework/DataHandling/test/LoadInstrumentTest.h
+++ b/Framework/DataHandling/test/LoadInstrumentTest.h
@@ -17,7 +17,6 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <cxxtest/TestSuite.h>
#include <fstream>
-#include <iostream>
#include <string>
#include <vector>
#include "MantidAPI/ExperimentInfo.h"
diff --git a/Framework/DataHandling/test/LoadMaskTest.h b/Framework/DataHandling/test/LoadMaskTest.h
index 4003dc57e57..a44631c89cc 100644
--- a/Framework/DataHandling/test/LoadMaskTest.h
+++ b/Framework/DataHandling/test/LoadMaskTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include <sstream>
#include "boost/assign/list_of.hpp"
diff --git a/Framework/DataHandling/test/LoadNXSPETest.h b/Framework/DataHandling/test/LoadNXSPETest.h
index 2f878a61a59..f2c7994e83d 100644
--- a/Framework/DataHandling/test/LoadNXSPETest.h
+++ b/Framework/DataHandling/test/LoadNXSPETest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataHandling/LoadNXSPE.h"
diff --git a/Framework/DataHandling/test/LoadNexusLogsTest.h b/Framework/DataHandling/test/LoadNexusLogsTest.h
index 068c4a56b14..7e8f678637b 100644
--- a/Framework/DataHandling/test/LoadNexusLogsTest.h
+++ b/Framework/DataHandling/test/LoadNexusLogsTest.h
@@ -17,7 +17,6 @@ using namespace Mantid::DataHandling;
#include <cxxtest/TestSuite.h>
#include "MantidAPI/WorkspaceGroup.h"
-#include <iostream>
class LoadNexusLogsTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/DataHandling/test/LoadParameterFileTest.h b/Framework/DataHandling/test/LoadParameterFileTest.h
index 55c38c44234..8492f8086b8 100644
--- a/Framework/DataHandling/test/LoadParameterFileTest.h
+++ b/Framework/DataHandling/test/LoadParameterFileTest.h
@@ -12,7 +12,6 @@
#include "MantidAPI/Algorithm.h"
#include <vector>
-#include <iostream>
using namespace Mantid::API;
using namespace Mantid::Kernel;
diff --git a/Framework/DataHandling/test/LoadPreNexusTest.h b/Framework/DataHandling/test/LoadPreNexusTest.h
index 6b683bfb06d..ebaec312a33 100644
--- a/Framework/DataHandling/test/LoadPreNexusTest.h
+++ b/Framework/DataHandling/test/LoadPreNexusTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataHandling/LoadPreNexus.h"
diff --git a/Framework/DataHandling/test/LoadSNSNexusTest.h b/Framework/DataHandling/test/LoadSNSNexusTest.h
index 53c71ebbadf..dc1ada623d3 100644
--- a/Framework/DataHandling/test/LoadSNSNexusTest.h
+++ b/Framework/DataHandling/test/LoadSNSNexusTest.h
@@ -15,7 +15,6 @@ using namespace Mantid::Kernel;
#include <cxxtest/TestSuite.h>
#include "MantidAPI/WorkspaceGroup.h"
-#include <iostream>
class LoadSNSNexusTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/DataHandling/test/LoadVulcanCalFileTest.h b/Framework/DataHandling/test/LoadVulcanCalFileTest.h
index 2e97a33fd05..c4855a01b93 100644
--- a/Framework/DataHandling/test/LoadVulcanCalFileTest.h
+++ b/Framework/DataHandling/test/LoadVulcanCalFileTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataHandling/LoadVulcanCalFile.h"
#include "MantidDataObjects/GroupingWorkspace.h"
diff --git a/Framework/DataHandling/test/MergeLogsTest.h b/Framework/DataHandling/test/MergeLogsTest.h
index 9676875b9e9..3983186be04 100644
--- a/Framework/DataHandling/test/MergeLogsTest.h
+++ b/Framework/DataHandling/test/MergeLogsTest.h
@@ -8,8 +8,6 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/DateAndTime.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataHandling/MergeLogs.h"
diff --git a/Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h b/Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h
index 28f323b8d9d..025d4d4ef3f 100644
--- a/Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h
+++ b/Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h
@@ -4,9 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
#include <sstream>
-#include <iomanip>
#include "MantidDataHandling/ModifyDetectorDotDatFile.h"
#include "MantidDataHandling/LoadEmptyInstrument.h"
diff --git a/Framework/DataHandling/test/MoveInstrumentComponentTest.h b/Framework/DataHandling/test/MoveInstrumentComponentTest.h
index f797f70b4e4..83b5522ab4c 100644
--- a/Framework/DataHandling/test/MoveInstrumentComponentTest.h
+++ b/Framework/DataHandling/test/MoveInstrumentComponentTest.h
@@ -15,7 +15,6 @@
#include "MantidGeometry/Instrument/Component.h"
#include "MantidGeometry/Instrument/Detector.h"
#include <vector>
-#include <iostream>
using namespace Mantid::API;
using namespace Mantid::Kernel;
diff --git a/Framework/DataHandling/test/NexusTesterTest.h b/Framework/DataHandling/test/NexusTesterTest.h
index 3c7e10dca2f..53b59b9a484 100644
--- a/Framework/DataHandling/test/NexusTesterTest.h
+++ b/Framework/DataHandling/test/NexusTesterTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataHandling/NexusTester.h"
#include <Poco/File.h>
diff --git a/Framework/DataHandling/test/ProcessDasNexusLogTest.h b/Framework/DataHandling/test/ProcessDasNexusLogTest.h
index 0751b97d0b8..57034fe9926 100644
--- a/Framework/DataHandling/test/ProcessDasNexusLogTest.h
+++ b/Framework/DataHandling/test/ProcessDasNexusLogTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataHandling/ProcessDasNexusLog.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/DataHandling/test/RawFileInfoTest.h b/Framework/DataHandling/test/RawFileInfoTest.h
index 6a6a4de6443..b79e4a66897 100644
--- a/Framework/DataHandling/test/RawFileInfoTest.h
+++ b/Framework/DataHandling/test/RawFileInfoTest.h
@@ -5,8 +5,6 @@
#include "MantidDataHandling/RawFileInfo.h"
#include "MantidAPI/ITableWorkspace.h"
-#include <iostream>
-#include <iomanip>
using namespace Mantid::DataHandling;
diff --git a/Framework/DataHandling/test/RenameLogTest.h b/Framework/DataHandling/test/RenameLogTest.h
index 9a561afd1d9..4363e39e175 100644
--- a/Framework/DataHandling/test/RenameLogTest.h
+++ b/Framework/DataHandling/test/RenameLogTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataHandling/RenameLog.h"
#include "MantidKernel/TimeSeriesProperty.h"
diff --git a/Framework/DataHandling/test/SaveCalFileTest.h b/Framework/DataHandling/test/SaveCalFileTest.h
index bf9edf3f913..cdd7025bb62 100644
--- a/Framework/DataHandling/test/SaveCalFileTest.h
+++ b/Framework/DataHandling/test/SaveCalFileTest.h
@@ -12,8 +12,6 @@
#include <cxxtest/TestSuite.h>
#include <Poco/File.h>
#include <fstream>
-#include <iomanip>
-#include <iostream>
#include <iosfwd>
using namespace Mantid::DataHandling;
diff --git a/Framework/DataHandling/test/SaveDaveGrpTest.h b/Framework/DataHandling/test/SaveDaveGrpTest.h
index a9d6fce0800..c3b009b45f0 100644
--- a/Framework/DataHandling/test/SaveDaveGrpTest.h
+++ b/Framework/DataHandling/test/SaveDaveGrpTest.h
@@ -4,9 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
#include <fstream>
-#include <iomanip>
#include "MantidDataHandling/LoadEventNexus.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidDataHandling/SaveDaveGrp.h"
diff --git a/Framework/DataHandling/test/SaveDetectorsGroupingTest.h b/Framework/DataHandling/test/SaveDetectorsGroupingTest.h
index cc66311ef92..bd3b2f93e9e 100644
--- a/Framework/DataHandling/test/SaveDetectorsGroupingTest.h
+++ b/Framework/DataHandling/test/SaveDetectorsGroupingTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataHandling/SaveDetectorsGrouping.h"
#include "MantidDataHandling/LoadDetectorsGroupingFile.h"
diff --git a/Framework/DataHandling/test/SaveDspacemapTest.h b/Framework/DataHandling/test/SaveDspacemapTest.h
index 5a90c23d626..4b2bbffb535 100644
--- a/Framework/DataHandling/test/SaveDspacemapTest.h
+++ b/Framework/DataHandling/test/SaveDspacemapTest.h
@@ -8,8 +8,6 @@
#include "MantidKernel/Timer.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <Poco/File.h>
using namespace Mantid::DataHandling;
diff --git a/Framework/DataHandling/test/SaveFullprofResolutionTest.h b/Framework/DataHandling/test/SaveFullprofResolutionTest.h
index 7b5648dfa60..c2da2add45e 100644
--- a/Framework/DataHandling/test/SaveFullprofResolutionTest.h
+++ b/Framework/DataHandling/test/SaveFullprofResolutionTest.h
@@ -10,7 +10,6 @@
#include <Poco/File.h>
#include <fstream>
-#include <iostream>
using namespace std;
using namespace Mantid;
diff --git a/Framework/DataHandling/test/SaveIsawDetCalTest.h b/Framework/DataHandling/test/SaveIsawDetCalTest.h
index 780f05166b8..88c63a3e415 100644
--- a/Framework/DataHandling/test/SaveIsawDetCalTest.h
+++ b/Framework/DataHandling/test/SaveIsawDetCalTest.h
@@ -7,8 +7,6 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
#include <cxxtest/TestSuite.h>
-#include <iomanip>
-#include <iostream>
#include <Poco/File.h>
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/DataHandling/test/SaveMaskTest.h b/Framework/DataHandling/test/SaveMaskTest.h
index d2503727ad0..5f10a4447cc 100644
--- a/Framework/DataHandling/test/SaveMaskTest.h
+++ b/Framework/DataHandling/test/SaveMaskTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidDataHandling/SaveMask.h"
#include "MantidDataHandling/LoadMask.h"
diff --git a/Framework/DataHandling/test/XMLInstrumentParameterTest.h b/Framework/DataHandling/test/XMLInstrumentParameterTest.h
index 2cf0226dfa9..f9f2225fc1f 100644
--- a/Framework/DataHandling/test/XMLInstrumentParameterTest.h
+++ b/Framework/DataHandling/test/XMLInstrumentParameterTest.h
@@ -11,7 +11,6 @@
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include <iostream>
using namespace Mantid::API;
using namespace Mantid::Kernel;
diff --git a/Framework/MDAlgorithms/test/AndMDTest.h b/Framework/MDAlgorithms/test/AndMDTest.h
index c7be7993349..24d050ac45b 100644
--- a/Framework/MDAlgorithms/test/AndMDTest.h
+++ b/Framework/MDAlgorithms/test/AndMDTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidMDAlgorithms/AndMD.h"
#include "MantidTestHelpers/BinaryOperationMDTestHelper.h"
diff --git a/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h b/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
index 304d0f4e74d..534d7b00cde 100644
--- a/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
+++ b/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidMDAlgorithms/CreateMDHistoWorkspace.h"
diff --git a/Framework/MDAlgorithms/test/DivideMDTest.h b/Framework/MDAlgorithms/test/DivideMDTest.h
index 472b23933a9..da0c61996ac 100644
--- a/Framework/MDAlgorithms/test/DivideMDTest.h
+++ b/Framework/MDAlgorithms/test/DivideMDTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidMDAlgorithms/DivideMD.h"
#include "MantidTestHelpers/BinaryOperationMDTestHelper.h"
diff --git a/Framework/MDAlgorithms/test/ExponentialMDTest.h b/Framework/MDAlgorithms/test/ExponentialMDTest.h
index 44cd338b998..fedef53adb5 100644
--- a/Framework/MDAlgorithms/test/ExponentialMDTest.h
+++ b/Framework/MDAlgorithms/test/ExponentialMDTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidMDAlgorithms/ExponentialMD.h"
#include "MantidTestHelpers/BinaryOperationMDTestHelper.h"
diff --git a/Framework/MDAlgorithms/test/GreaterThanMDTest.h b/Framework/MDAlgorithms/test/GreaterThanMDTest.h
index 5ee14f9c0b3..a05aea3a7cd 100644
--- a/Framework/MDAlgorithms/test/GreaterThanMDTest.h
+++ b/Framework/MDAlgorithms/test/GreaterThanMDTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidMDAlgorithms/GreaterThanMD.h"
#include "MantidTestHelpers/BinaryOperationMDTestHelper.h"
diff --git a/Framework/MDAlgorithms/test/LogarithmMDTest.h b/Framework/MDAlgorithms/test/LogarithmMDTest.h
index dd6741aae47..d70a16b110d 100644
--- a/Framework/MDAlgorithms/test/LogarithmMDTest.h
+++ b/Framework/MDAlgorithms/test/LogarithmMDTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidMDAlgorithms/LogarithmMD.h"
#include "MantidDataObjects/MDHistoWorkspace.h"
diff --git a/Framework/MDAlgorithms/test/PowerMDTest.h b/Framework/MDAlgorithms/test/PowerMDTest.h
index c461d190b87..33608b09b03 100644
--- a/Framework/MDAlgorithms/test/PowerMDTest.h
+++ b/Framework/MDAlgorithms/test/PowerMDTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidMDAlgorithms/PowerMD.h"
#include "MantidTestHelpers/BinaryOperationMDTestHelper.h"
diff --git a/Framework/MDAlgorithms/test/ReflectometryTransformPTest.h b/Framework/MDAlgorithms/test/ReflectometryTransformPTest.h
index d446d23200e..f6af57673dc 100644
--- a/Framework/MDAlgorithms/test/ReflectometryTransformPTest.h
+++ b/Framework/MDAlgorithms/test/ReflectometryTransformPTest.h
@@ -5,8 +5,6 @@
#include <cmath>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidMDAlgorithms/ReflectometryTransformP.h"
using namespace Mantid::DataObjects;
diff --git a/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h b/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h
index d2673dca505..9f33ccbad80 100644
--- a/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h
+++ b/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h
@@ -9,7 +9,6 @@
#include <cxxtest/TestSuite.h>
-#include <iomanip>
using namespace Mantid::API;
using namespace Mantid::DataObjects;
diff --git a/Framework/Nexus/test/NexusAPITest.h b/Framework/Nexus/test/NexusAPITest.h
index 003ac5e4795..256f4854338 100644
--- a/Framework/Nexus/test/NexusAPITest.h
+++ b/Framework/Nexus/test/NexusAPITest.h
@@ -17,7 +17,6 @@
#include <cmath>
#include <Poco/File.h>
-#include <iostream>
#include <string>
#include <sstream>
#include <cstring>
--
GitLab
From 75cd12fa8918e0eda7b57b6926ea7442f2307975 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Thu, 8 Oct 2015 13:38:35 +0100
Subject: [PATCH 071/223] Move Fit Functions to a subdirectory
Still need to check the documentation is happy with this.
re #13347
---
Framework/CurveFitting/CMakeLists.txt | 372 +++++++++---------
.../MantidCurveFitting/ConvolveWorkspaces.h | 2 +-
.../MantidCurveFitting/FitPowderDiffPeaks.h | 6 +-
.../{ => Functions}/Abragam.h | 0
.../{ => Functions}/BSpline.h | 2 +-
.../{ => Functions}/BackToBackExponential.h | 0
.../{ => Functions}/BackgroundFunction.h | 0
.../{ => Functions}/BivariateNormal.h | 2 +-
.../{ => Functions}/Bk2BkExpConvPV.h | 0
.../{ => Functions}/ChebfunBase.h | 4 +-
.../{ => Functions}/Chebyshev.h | 2 +-
.../{ => Functions}/ComptonPeakProfile.h | 0
.../{ => Functions}/ComptonProfile.h | 2 +-
.../ComptonScatteringCountRate.h | 2 +-
.../{ => Functions}/Convolution.h | 0
.../{ => Functions}/CubicSpline.h | 2 +-
.../{ => Functions}/DeltaFunction.h | 0
.../{ => Functions}/DiffRotDiscreteCircle.h | 0
.../{ => Functions}/DiffSphere.h | 0
.../{ => Functions}/DynamicKuboToyabe.h | 0
.../{ => Functions}/EndErfc.h | 0
.../{ => Functions}/ExpDecay.h | 0
.../{ => Functions}/ExpDecayMuon.h | 0
.../{ => Functions}/ExpDecayOsc.h | 0
.../{ => Functions}/FlatBackground.h | 2 +-
.../{ => Functions}/FullprofPolynomial.h | 2 +-
.../{ => Functions}/GausDecay.h | 0
.../{ => Functions}/GausOsc.h | 0
.../{ => Functions}/Gaussian.h | 0
.../{ => Functions}/GaussianComptonProfile.h | 2 +-
.../GramCharlierComptonProfile.h | 2 +-
.../{ => Functions}/IkedaCarpenterPV.h | 0
.../{ => Functions}/LinearBackground.h | 2 +-
.../{ => Functions}/LogNormal.h | 0
.../{ => Functions}/Lorentzian.h | 0
.../{ => Functions}/Lorentzian1D.h | 0
.../{ => Functions}/MuonFInteraction.h | 0
.../NeutronBk2BkExpConvPVoigt.h | 0
.../{ => Functions}/PawleyFunction.h | 0
.../{ => Functions}/PeakParameterFunction.h | 0
.../{ => Functions}/Polynomial.h | 2 +-
.../{ => Functions}/ProcessBackground.h | 2 +-
.../{ => Functions}/ProductFunction.h | 0
.../{ => Functions}/ProductLinearExp.h | 0
.../{ => Functions}/ProductQuadraticExp.h | 0
.../{ => Functions}/PseudoVoigt.h | 0
.../{ => Functions}/Quadratic.h | 2 +-
.../{ => Functions}/ReflectivityMulf.h | 0
.../{ => Functions}/Resolution.h | 2 +-
.../{ => Functions}/SimpleChebfun.h | 2 +-
.../{ => Functions}/StaticKuboToyabe.h | 0
.../StaticKuboToyabeTimesExpDecay.h | 0
.../StaticKuboToyabeTimesGausDecay.h | 0
.../{ => Functions}/StretchExp.h | 0
.../{ => Functions}/StretchExpMuon.h | 0
.../{ => Functions}/TabulatedFunction.h | 0
.../ThermalNeutronBk2BkExpAlpha.h | 0
.../ThermalNeutronBk2BkExpBeta.h | 0
.../ThermalNeutronBk2BkExpConvPVoigt.h | 0
.../ThermalNeutronBk2BkExpSigma.h | 0
.../ThermalNeutronDtoTOFFunction.h | 0
.../{ => Functions}/UserFunction.h | 0
.../{ => Functions}/UserFunction1D.h | 0
.../{ => Functions}/VesuvioResolution.h | 0
.../{ => Functions}/Voigt.h | 0
.../inc/MantidCurveFitting/LatticeFunction.h | 2 +-
.../inc/MantidCurveFitting/LeBailFit.h | 4 +-
.../inc/MantidCurveFitting/LeBailFunction.h | 2 +-
.../inc/MantidCurveFitting/PawleyFit.h | 2 +-
.../RefinePowderInstrumentParameters3.h | 2 +-
.../MantidCurveFitting/SplineInterpolation.h | 2 +-
.../inc/MantidCurveFitting/SplineSmoothing.h | 2 +-
.../CurveFitting/src/CalculateChiSquared.cpp | 2 +-
.../src/CalculateGammaBackground.cpp | 4 +-
.../CurveFitting/src/CalculateMSVesuvio.cpp | 2 +-
.../CurveFitting/src/ConvolveWorkspaces.cpp | 4 +-
.../CurveFitting/src/EstimatePeakErrors.cpp | 2 +-
Framework/CurveFitting/src/FitMW.cpp | 2 +-
.../CurveFitting/src/FitPowderDiffPeaks.cpp | 12 +-
.../src/{ => Functions}/Abragam.cpp | 2 +-
.../src/{ => Functions}/BSpline.cpp | 2 +-
.../{ => Functions}/BackToBackExponential.cpp | 2 +-
.../{ => Functions}/BackgroundFunction.cpp | 2 +-
.../src/{ => Functions}/BivariateNormal.cpp | 2 +-
.../src/{ => Functions}/Bk2BkExpConvPV.cpp | 2 +-
.../src/{ => Functions}/ChebfunBase.cpp | 2 +-
.../src/{ => Functions}/Chebyshev.cpp | 2 +-
.../{ => Functions}/ComptonPeakProfile.cpp | 2 +-
.../src/{ => Functions}/ComptonProfile.cpp | 2 +-
.../ComptonScatteringCountRate.cpp | 2 +-
.../src/{ => Functions}/Convolution.cpp | 4 +-
.../src/{ => Functions}/CubicSpline.cpp | 2 +-
.../src/{ => Functions}/DeltaFunction.cpp | 2 +-
.../{ => Functions}/DiffRotDiscreteCircle.cpp | 2 +-
.../src/{ => Functions}/DiffSphere.cpp | 2 +-
.../src/{ => Functions}/DynamicKuboToyabe.cpp | 2 +-
.../src/{ => Functions}/EndErfc.cpp | 2 +-
.../src/{ => Functions}/ExpDecay.cpp | 2 +-
.../src/{ => Functions}/ExpDecayMuon.cpp | 2 +-
.../src/{ => Functions}/ExpDecayOsc.cpp | 2 +-
.../src/{ => Functions}/FlatBackground.cpp | 2 +-
.../{ => Functions}/FullprofPolynomial.cpp | 2 +-
.../src/{ => Functions}/GausDecay.cpp | 2 +-
.../src/{ => Functions}/GausOsc.cpp | 2 +-
.../src/{ => Functions}/Gaussian.cpp | 2 +-
.../GaussianComptonProfile.cpp | 2 +-
.../GramCharlierComptonProfile.cpp | 2 +-
.../src/{ => Functions}/IkedaCarpenterPV.cpp | 2 +-
.../src/{ => Functions}/LinearBackground.cpp | 2 +-
.../src/{ => Functions}/LogNormal.cpp | 2 +-
.../src/{ => Functions}/Lorentzian.cpp | 2 +-
.../src/{ => Functions}/Lorentzian1D.cpp | 2 +-
.../src/{ => Functions}/MuonFInteraction.cpp | 2 +-
.../NeutronBk2BkExpConvPVoigt.cpp | 2 +-
.../src/{ => Functions}/PawleyFunction.cpp | 2 +-
.../{ => Functions}/PeakParameterFunction.cpp | 2 +-
.../src/{ => Functions}/Polynomial.cpp | 2 +-
.../src/{ => Functions}/ProcessBackground.cpp | 6 +-
.../src/{ => Functions}/ProductFunction.cpp | 2 +-
.../src/{ => Functions}/ProductLinearExp.cpp | 8 +-
.../{ => Functions}/ProductQuadraticExp.cpp | 8 +-
.../src/{ => Functions}/PseudoVoigt.cpp | 2 +-
.../src/{ => Functions}/Quadratic.cpp | 2 +-
.../src/{ => Functions}/ReflectivityMulf.cpp | 2 +-
.../src/{ => Functions}/Resolution.cpp | 2 +-
.../src/{ => Functions}/SimpleChebfun.cpp | 2 +-
.../src/{ => Functions}/StaticKuboToyabe.cpp | 2 +-
.../StaticKuboToyabeTimesExpDecay.cpp | 2 +-
.../StaticKuboToyabeTimesGausDecay.cpp | 2 +-
.../src/{ => Functions}/StretchExp.cpp | 2 +-
.../src/{ => Functions}/StretchExpMuon.cpp | 2 +-
.../src/{ => Functions}/TabulatedFunction.cpp | 2 +-
.../ThermalNeutronBk2BkExpAlpha.cpp | 2 +-
.../ThermalNeutronBk2BkExpBeta.cpp | 2 +-
.../ThermalNeutronBk2BkExpConvPVoigt.cpp | 2 +-
.../ThermalNeutronBk2BkExpSigma.cpp | 2 +-
.../ThermalNeutronDtoTOFFunction.cpp | 2 +-
.../src/{ => Functions}/UserFunction.cpp | 2 +-
.../src/{ => Functions}/UserFunction1D.cpp | 2 +-
.../src/{ => Functions}/VesuvioResolution.cpp | 2 +-
.../src/{ => Functions}/Voigt.cpp | 2 +-
Framework/CurveFitting/src/LeBailFit.cpp | 2 +-
.../CurveFitting/src/ParameterEstimator.cpp | 2 +-
Framework/CurveFitting/src/PawleyFit.cpp | 2 +-
.../test/BoundaryConstraintTest.h | 4 +-
.../CurveFitting/test/CompositeFunctionTest.h | 4 +-
.../test/ConvolveWorkspacesTest.h | 2 +-
.../test/CostFunctions/LeastSquaresTest.h | 8 +-
Framework/CurveFitting/test/FitMWTest.h | 10 +-
.../FuncMinimizers/DampingMinimizerTest.h | 2 +-
.../test/FuncMinimizers/FABADAMinimizerTest.h | 2 +-
.../FuncMinimizers/LevenbergMarquardtMDTest.h | 2 +-
.../FuncMinimizers/LevenbergMarquardtTest.h | 2 +-
.../test/{ => Functions}/AbragamTest.h | 4 +-
.../test/{ => Functions}/BSplineTest.h | 4 +-
.../BackToBackExponentialTest.h | 2 +-
.../{ => Functions}/BivariateNormalTest.h | 2 +-
.../test/{ => Functions}/Bk2BkExpConvPVTest.h | 2 +-
.../test/{ => Functions}/ChebfunBaseTest.h | 2 +-
.../test/{ => Functions}/ChebyshevTest.h | 2 +-
.../{ => Functions}/ComptonPeakProfileTest.h | 2 +-
.../test/{ => Functions}/ComptonProfileTest.h | 2 +-
.../ComptonProfileTestHelpers.h | 0
.../ComptonScatteringCountRateTest.h | 2 +-
.../test/{ => Functions}/ConvolutionTest.h | 2 +-
.../test/{ => Functions}/CubicSplineTest.h | 2 +-
.../test/{ => Functions}/DeltaFunctionTest.h | 4 +-
.../DiffRotDiscreteCircleTest.h | 6 +-
.../test/{ => Functions}/DiffSphereTest.h | 6 +-
.../{ => Functions}/DynamicKuboToyabeTest.h | 4 +-
.../test/{ => Functions}/EndErfcTest.h | 4 +-
.../test/{ => Functions}/ExpDecayMuonTest.h | 4 +-
.../test/{ => Functions}/ExpDecayOscTest.h | 2 +-
.../test/{ => Functions}/ExpDecayTest.h | 4 +-
.../test/{ => Functions}/FlatBackgroundTest.h | 2 +-
.../{ => Functions}/FullprofPolynomialTest.h | 2 +-
.../test/{ => Functions}/GausDecayTest.h | 4 +-
.../test/{ => Functions}/GausOscTest.h | 4 +-
.../GaussianComptonProfileTest.h | 2 +-
.../test/{ => Functions}/GaussianTest.h | 6 +-
.../GramCharlierComptonProfileTest.h | 2 +-
.../{ => Functions}/IkedaCarpenterPVTest.h | 2 +-
.../{ => Functions}/LinearBackgroundTest.h | 2 +-
.../test/{ => Functions}/LogNormalTest.h | 4 +-
.../test/{ => Functions}/Lorentzian1DTest.h | 2 +-
.../test/{ => Functions}/LorentzianTest.h | 2 +-
.../{ => Functions}/MuonFInteractionTest.h | 4 +-
.../NeutronBk2BkExpConvPVoigtTest.h | 2 +-
.../test/{ => Functions}/PawleyFunctionTest.h | 2 +-
.../PeakParameterFunctionTest.h | 2 +-
.../test/{ => Functions}/PolynomialTest.h | 2 +-
.../{ => Functions}/ProcessBackgroundTest.h | 2 +-
.../{ => Functions}/ProductFunctionTest.h | 6 +-
.../{ => Functions}/ProductLinearExpTest.h | 8 +-
.../{ => Functions}/ProductQuadraticExpTest.h | 8 +-
.../test/{ => Functions}/PseudoVoigtTest.h | 6 +-
.../test/{ => Functions}/QuadraticTest.h | 2 +-
.../{ => Functions}/ReflectivityMulfTest.h | 2 +-
.../test/{ => Functions}/ResolutionTest.h | 4 +-
.../test/{ => Functions}/SimpleChebfunTest.h | 2 +-
.../{ => Functions}/StaticKuboToyabeTest.h | 4 +-
.../StaticKuboToyabeTimesExpDecayTest.h | 2 +-
.../StaticKuboToyabeTimesGausDecayTest.h | 2 +-
.../test/{ => Functions}/StretchExpMuonTest.h | 4 +-
.../test/{ => Functions}/StretchExpTest.h | 4 +-
.../{ => Functions}/TabulatedFunctionTest.h | 4 +-
.../ThermalNeutronBk2BkExpAlphaTest.h | 2 +-
.../ThermalNeutronBk2BkExpBetaTest.h | 2 +-
.../ThermalNeutronBk2BkExpConvPVoigtTest.h | 2 +-
.../ThermalNeutronBk2BkExpSigmaTest.h | 2 +-
.../ThermalNeutronDtoTOFFunctionTest.h | 2 +-
.../test/{ => Functions}/UserFunction1DTest.h | 2 +-
.../test/{ => Functions}/UserFunctionTest.h | 2 +-
.../{ => Functions}/VesuvioResolutionTest.h | 2 +-
.../test/{ => Functions}/VoigtTest.h | 2 +-
.../test/{ => Functions}/valgrind.h | 0
.../test/MultiDomainCreatorTest.h | 2 +-
.../test/NormaliseByPeakAreaTest.h | 2 +-
.../test/SpecialFunctionSupportTest.h | 2 +-
.../test/PoldiSpectrumDomainFunctionTest.h | 1 -
220 files changed, 418 insertions(+), 419 deletions(-)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/Abragam.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/BSpline.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/BackToBackExponential.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/BackgroundFunction.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/BivariateNormal.h (99%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/Bk2BkExpConvPV.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ChebfunBase.h (99%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/Chebyshev.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ComptonPeakProfile.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ComptonProfile.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ComptonScatteringCountRate.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/Convolution.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/CubicSpline.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/DeltaFunction.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/DiffRotDiscreteCircle.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/DiffSphere.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/DynamicKuboToyabe.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/EndErfc.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ExpDecay.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ExpDecayMuon.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ExpDecayOsc.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/FlatBackground.h (96%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/FullprofPolynomial.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/GausDecay.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/GausOsc.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/Gaussian.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/GaussianComptonProfile.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/GramCharlierComptonProfile.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/IkedaCarpenterPV.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/LinearBackground.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/LogNormal.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/Lorentzian.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/Lorentzian1D.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/MuonFInteraction.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/NeutronBk2BkExpConvPVoigt.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/PawleyFunction.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/PeakParameterFunction.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/Polynomial.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ProcessBackground.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ProductFunction.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ProductLinearExp.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ProductQuadraticExp.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/PseudoVoigt.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/Quadratic.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ReflectivityMulf.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/Resolution.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/SimpleChebfun.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/StaticKuboToyabe.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/StaticKuboToyabeTimesExpDecay.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/StaticKuboToyabeTimesGausDecay.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/StretchExp.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/StretchExpMuon.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/TabulatedFunction.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ThermalNeutronBk2BkExpAlpha.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ThermalNeutronBk2BkExpBeta.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ThermalNeutronBk2BkExpConvPVoigt.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ThermalNeutronBk2BkExpSigma.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/ThermalNeutronDtoTOFFunction.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/UserFunction.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/UserFunction1D.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/VesuvioResolution.h (100%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Functions}/Voigt.h (100%)
rename Framework/CurveFitting/src/{ => Functions}/Abragam.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/BSpline.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/BackToBackExponential.cpp (98%)
rename Framework/CurveFitting/src/{ => Functions}/BackgroundFunction.cpp (89%)
rename Framework/CurveFitting/src/{ => Functions}/BivariateNormal.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/Bk2BkExpConvPV.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/ChebfunBase.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/Chebyshev.cpp (98%)
rename Framework/CurveFitting/src/{ => Functions}/ComptonPeakProfile.cpp (98%)
rename Framework/CurveFitting/src/{ => Functions}/ComptonProfile.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/ComptonScatteringCountRate.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/Convolution.cpp (98%)
rename Framework/CurveFitting/src/{ => Functions}/CubicSpline.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/DeltaFunction.cpp (94%)
rename Framework/CurveFitting/src/{ => Functions}/DiffRotDiscreteCircle.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/DiffSphere.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/DynamicKuboToyabe.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/EndErfc.cpp (96%)
rename Framework/CurveFitting/src/{ => Functions}/ExpDecay.cpp (95%)
rename Framework/CurveFitting/src/{ => Functions}/ExpDecayMuon.cpp (95%)
rename Framework/CurveFitting/src/{ => Functions}/ExpDecayOsc.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/FlatBackground.cpp (96%)
rename Framework/CurveFitting/src/{ => Functions}/FullprofPolynomial.cpp (98%)
rename Framework/CurveFitting/src/{ => Functions}/GausDecay.cpp (96%)
rename Framework/CurveFitting/src/{ => Functions}/GausOsc.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/Gaussian.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/GaussianComptonProfile.cpp (98%)
rename Framework/CurveFitting/src/{ => Functions}/GramCharlierComptonProfile.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/IkedaCarpenterPV.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/LinearBackground.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/LogNormal.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/Lorentzian.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/Lorentzian1D.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/MuonFInteraction.cpp (95%)
rename Framework/CurveFitting/src/{ => Functions}/NeutronBk2BkExpConvPVoigt.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/PawleyFunction.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/PeakParameterFunction.cpp (96%)
rename Framework/CurveFitting/src/{ => Functions}/Polynomial.cpp (98%)
rename Framework/CurveFitting/src/{ => Functions}/ProcessBackground.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/ProductFunction.cpp (95%)
rename Framework/CurveFitting/src/{ => Functions}/ProductLinearExp.cpp (90%)
rename Framework/CurveFitting/src/{ => Functions}/ProductQuadraticExp.cpp (91%)
rename Framework/CurveFitting/src/{ => Functions}/PseudoVoigt.cpp (98%)
rename Framework/CurveFitting/src/{ => Functions}/Quadratic.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/ReflectivityMulf.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/Resolution.cpp (96%)
rename Framework/CurveFitting/src/{ => Functions}/SimpleChebfun.cpp (98%)
rename Framework/CurveFitting/src/{ => Functions}/StaticKuboToyabe.cpp (94%)
rename Framework/CurveFitting/src/{ => Functions}/StaticKuboToyabeTimesExpDecay.cpp (93%)
rename Framework/CurveFitting/src/{ => Functions}/StaticKuboToyabeTimesGausDecay.cpp (94%)
rename Framework/CurveFitting/src/{ => Functions}/StretchExp.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/StretchExpMuon.cpp (94%)
rename Framework/CurveFitting/src/{ => Functions}/TabulatedFunction.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/ThermalNeutronBk2BkExpAlpha.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/ThermalNeutronBk2BkExpBeta.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/ThermalNeutronBk2BkExpConvPVoigt.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/ThermalNeutronBk2BkExpSigma.cpp (97%)
rename Framework/CurveFitting/src/{ => Functions}/ThermalNeutronDtoTOFFunction.cpp (98%)
rename Framework/CurveFitting/src/{ => Functions}/UserFunction.cpp (98%)
rename Framework/CurveFitting/src/{ => Functions}/UserFunction1D.cpp (98%)
rename Framework/CurveFitting/src/{ => Functions}/VesuvioResolution.cpp (99%)
rename Framework/CurveFitting/src/{ => Functions}/Voigt.cpp (99%)
rename Framework/CurveFitting/test/{ => Functions}/AbragamTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/BSplineTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/BackToBackExponentialTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/BivariateNormalTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/Bk2BkExpConvPVTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/ChebfunBaseTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/ChebyshevTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/ComptonPeakProfileTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/ComptonProfileTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/ComptonProfileTestHelpers.h (100%)
rename Framework/CurveFitting/test/{ => Functions}/ComptonScatteringCountRateTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/ConvolutionTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/CubicSplineTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/DeltaFunctionTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/DiffRotDiscreteCircleTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/DiffSphereTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/DynamicKuboToyabeTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/EndErfcTest.h (96%)
rename Framework/CurveFitting/test/{ => Functions}/ExpDecayMuonTest.h (96%)
rename Framework/CurveFitting/test/{ => Functions}/ExpDecayOscTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/ExpDecayTest.h (96%)
rename Framework/CurveFitting/test/{ => Functions}/FlatBackgroundTest.h (96%)
rename Framework/CurveFitting/test/{ => Functions}/FullprofPolynomialTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/GausDecayTest.h (96%)
rename Framework/CurveFitting/test/{ => Functions}/GausOscTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/GaussianComptonProfileTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/GaussianTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/GramCharlierComptonProfileTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/IkedaCarpenterPVTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/LinearBackgroundTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/LogNormalTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/Lorentzian1DTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/LorentzianTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/MuonFInteractionTest.h (96%)
rename Framework/CurveFitting/test/{ => Functions}/NeutronBk2BkExpConvPVoigtTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/PawleyFunctionTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/PeakParameterFunctionTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/PolynomialTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/ProcessBackgroundTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/ProductFunctionTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/ProductLinearExpTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/ProductQuadraticExpTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/PseudoVoigtTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/QuadraticTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/ReflectivityMulfTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/ResolutionTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/SimpleChebfunTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/StaticKuboToyabeTest.h (96%)
rename Framework/CurveFitting/test/{ => Functions}/StaticKuboToyabeTimesExpDecayTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/StaticKuboToyabeTimesGausDecayTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/StretchExpMuonTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/StretchExpTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/TabulatedFunctionTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/ThermalNeutronBk2BkExpAlphaTest.h (96%)
rename Framework/CurveFitting/test/{ => Functions}/ThermalNeutronBk2BkExpBetaTest.h (96%)
rename Framework/CurveFitting/test/{ => Functions}/ThermalNeutronBk2BkExpConvPVoigtTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/ThermalNeutronBk2BkExpSigmaTest.h (96%)
rename Framework/CurveFitting/test/{ => Functions}/ThermalNeutronDtoTOFFunctionTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/UserFunction1DTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/UserFunctionTest.h (97%)
rename Framework/CurveFitting/test/{ => Functions}/VesuvioResolutionTest.h (98%)
rename Framework/CurveFitting/test/{ => Functions}/VoigtTest.h (99%)
rename Framework/CurveFitting/test/{ => Functions}/valgrind.h (100%)
diff --git a/Framework/CurveFitting/CMakeLists.txt b/Framework/CurveFitting/CMakeLists.txt
index 2d7cf8e07bc..366cbcc0e3e 100644
--- a/Framework/CurveFitting/CMakeLists.txt
+++ b/Framework/CurveFitting/CMakeLists.txt
@@ -3,46 +3,23 @@ set ( SRC_FILES
# src/SCDPanelErrors.cpp
# src/ChebyshevPolynomialBackground.cpp
#src/RefinePowderInstrumentParameters.cpp
- src/Abragam.cpp
src/AugmentedLagrangianOptimizer.cpp
- src/BSpline.cpp
- src/BackToBackExponential.cpp
- src/BackgroundFunction.cpp
- src/BivariateNormal.cpp
- src/Bk2BkExpConvPV.cpp
src/BoundaryConstraint.cpp
src/CalculateChiSquared.cpp
src/CalculateGammaBackground.cpp
src/CalculateMSVesuvio.cpp
- src/ChebfunBase.cpp
- src/Chebyshev.cpp
- src/ComptonPeakProfile.cpp
- src/ComptonProfile.cpp
- src/ComptonScatteringCountRate.cpp
src/ConvertToYSpace.cpp
- src/Convolution.cpp
src/ConvolveWorkspaces.cpp
src/CostFunctions/CostFuncFitting.cpp
src/CostFunctions/CostFuncLeastSquares.cpp
src/CostFunctions/CostFuncRwp.cpp
src/CostFunctions/CostFuncUnweightedLeastSquares.cpp
- src/CubicSpline.cpp
- src/DeltaFunction.cpp
- src/DiffRotDiscreteCircle.cpp
- src/DiffSphere.cpp
- src/DynamicKuboToyabe.cpp
- src/EndErfc.cpp
src/EstimatePeakErrors.cpp
src/EvaluateFunction.cpp
- src/ExpDecay.cpp
- src/ExpDecayMuon.cpp
- src/ExpDecayOsc.cpp
src/Fit.cpp
src/Fit1D.cpp
src/FitMW.cpp
src/FitPowderDiffPeaks.cpp
- src/FlatBackground.cpp
- src/FullprofPolynomial.cpp
src/FuncMinimizers/BFGS_Minimizer.cpp
src/FuncMinimizers/DampingMinimizer.cpp
src/FuncMinimizers/DerivMinimizer.cpp
@@ -54,67 +31,90 @@ set ( SRC_FILES
src/FuncMinimizers/SimplexMinimizer.cpp
src/FuncMinimizers/SteepestDescentMinimizer.cpp
src/FunctionDomain1DSpectrumCreator.cpp
+ src/Functions/Abragam.cpp
+ src/Functions/BSpline.cpp
+ src/Functions/BackToBackExponential.cpp
+ src/Functions/BackgroundFunction.cpp
+ src/Functions/BivariateNormal.cpp
+ src/Functions/Bk2BkExpConvPV.cpp
+ src/Functions/ChebfunBase.cpp
+ src/Functions/Chebyshev.cpp
+ src/Functions/ComptonPeakProfile.cpp
+ src/Functions/ComptonProfile.cpp
+ src/Functions/ComptonScatteringCountRate.cpp
+ src/Functions/Convolution.cpp
+ src/Functions/CubicSpline.cpp
+ src/Functions/DeltaFunction.cpp
+ src/Functions/DiffRotDiscreteCircle.cpp
+ src/Functions/DiffSphere.cpp
+ src/Functions/DynamicKuboToyabe.cpp
+ src/Functions/EndErfc.cpp
+ src/Functions/ExpDecay.cpp
+ src/Functions/ExpDecayMuon.cpp
+ src/Functions/ExpDecayOsc.cpp
+ src/Functions/FlatBackground.cpp
+ src/Functions/FullprofPolynomial.cpp
+ src/Functions/GausDecay.cpp
+ src/Functions/GausOsc.cpp
+ src/Functions/Gaussian.cpp
+ src/Functions/GaussianComptonProfile.cpp
+ src/Functions/GramCharlierComptonProfile.cpp
+ src/Functions/IkedaCarpenterPV.cpp
+ src/Functions/LinearBackground.cpp
+ src/Functions/LogNormal.cpp
+ src/Functions/Lorentzian.cpp
+ src/Functions/Lorentzian1D.cpp
+ src/Functions/MuonFInteraction.cpp
+ src/Functions/NeutronBk2BkExpConvPVoigt.cpp
+ src/Functions/PawleyFunction.cpp
+ src/Functions/PeakParameterFunction.cpp
+ src/Functions/Polynomial.cpp
+ src/Functions/ProcessBackground.cpp
+ src/Functions/ProductFunction.cpp
+ src/Functions/ProductLinearExp.cpp
+ src/Functions/ProductQuadraticExp.cpp
+ src/Functions/PseudoVoigt.cpp
+ src/Functions/Quadratic.cpp
+ src/Functions/ReflectivityMulf.cpp
+ src/Functions/Resolution.cpp
+ src/Functions/SimpleChebfun.cpp
+ src/Functions/StaticKuboToyabe.cpp
+ src/Functions/StaticKuboToyabeTimesExpDecay.cpp
+ src/Functions/StaticKuboToyabeTimesGausDecay.cpp
+ src/Functions/StretchExp.cpp
+ src/Functions/StretchExpMuon.cpp
+ src/Functions/TabulatedFunction.cpp
+ src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
+ src/Functions/ThermalNeutronBk2BkExpBeta.cpp
+ src/Functions/ThermalNeutronBk2BkExpConvPVoigt.cpp
+ src/Functions/ThermalNeutronBk2BkExpSigma.cpp
+ src/Functions/ThermalNeutronDtoTOFFunction.cpp
+ src/Functions/UserFunction.cpp
+ src/Functions/UserFunction1D.cpp
+ src/Functions/VesuvioResolution.cpp
+ src/Functions/Voigt.cpp
src/GSLFunctions.cpp
src/GSLMatrix.cpp
src/GSLVector.cpp
- src/GausDecay.cpp
- src/GausOsc.cpp
- src/Gaussian.cpp
- src/GaussianComptonProfile.cpp
- src/GramCharlierComptonProfile.cpp
src/IFittingAlgorithm.cpp
- src/IkedaCarpenterPV.cpp
src/LatticeDomainCreator.cpp
src/LatticeFunction.cpp
src/LeBailFit.cpp
src/LeBailFunction.cpp
- src/LinearBackground.cpp
- src/LogNormal.cpp
- src/Lorentzian.cpp
- src/Lorentzian1D.cpp
src/MSVesuvioHelpers.cpp
src/MultiDomainCreator.cpp
- src/MuonFInteraction.cpp
- src/NeutronBk2BkExpConvPVoigt.cpp
src/NormaliseByPeakArea.cpp
src/ParDomain.cpp
src/ParameterEstimator.cpp
src/PawleyFit.cpp
- src/PawleyFunction.cpp
- src/PeakParameterFunction.cpp
src/PlotPeakByLogValue.cpp
- src/Polynomial.cpp
- src/ProcessBackground.cpp
- src/ProductFunction.cpp
- src/ProductLinearExp.cpp
- src/ProductQuadraticExp.cpp
- src/PseudoVoigt.cpp
- src/Quadratic.cpp
src/RefinePowderInstrumentParameters3.cpp
- src/ReflectivityMulf.cpp
- src/Resolution.cpp
src/SeqDomain.cpp
src/SeqDomainSpectrumCreator.cpp
- src/SimpleChebfun.cpp
src/SpecialFunctionHelper.cpp
src/SplineBackground.cpp
src/SplineInterpolation.cpp
src/SplineSmoothing.cpp
- src/StaticKuboToyabe.cpp
- src/StaticKuboToyabeTimesExpDecay.cpp
- src/StaticKuboToyabeTimesGausDecay.cpp
- src/StretchExp.cpp
- src/StretchExpMuon.cpp
- src/TabulatedFunction.cpp
- src/ThermalNeutronBk2BkExpAlpha.cpp
- src/ThermalNeutronBk2BkExpBeta.cpp
- src/ThermalNeutronBk2BkExpConvPVoigt.cpp
- src/ThermalNeutronBk2BkExpSigma.cpp
- src/ThermalNeutronDtoTOFFunction.cpp
- src/UserFunction.cpp
- src/UserFunction1D.cpp
- src/VesuvioResolution.cpp
- src/Voigt.cpp
)
set ( SRC_UNITY_IGNORE_FILES src/Fit1D.cpp src/GSLFunctions.cpp )
@@ -124,47 +124,24 @@ set ( INC_FILES
# inc/MantidCurveFitting/SCDPanelErrors.h
# inc/MantidCurveFitting/ChebyshevPolynomialBackground.h
#inc/MantidCurveFitting/RefinePowderInstrumentParameters.h
- inc/MantidCurveFitting/Abragam.h
inc/MantidCurveFitting/AugmentedLagrangianOptimizer.h
- inc/MantidCurveFitting/BSpline.h
- inc/MantidCurveFitting/BackToBackExponential.h
- inc/MantidCurveFitting/BackgroundFunction.h
- inc/MantidCurveFitting/BivariateNormal.h
- inc/MantidCurveFitting/Bk2BkExpConvPV.h
inc/MantidCurveFitting/BoundaryConstraint.h
inc/MantidCurveFitting/CalculateChiSquared.h
inc/MantidCurveFitting/CalculateGammaBackground.h
inc/MantidCurveFitting/CalculateMSVesuvio.h
- inc/MantidCurveFitting/ChebfunBase.h
- inc/MantidCurveFitting/Chebyshev.h
- inc/MantidCurveFitting/ComptonPeakProfile.h
- inc/MantidCurveFitting/ComptonProfile.h
- inc/MantidCurveFitting/ComptonScatteringCountRate.h
inc/MantidCurveFitting/ConvertToYSpace.h
- inc/MantidCurveFitting/Convolution.h
inc/MantidCurveFitting/ConvolveWorkspaces.h
inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
- inc/MantidCurveFitting/CubicSpline.h
- inc/MantidCurveFitting/DeltaFunction.h
- inc/MantidCurveFitting/DiffRotDiscreteCircle.h
- inc/MantidCurveFitting/DiffSphere.h
inc/MantidCurveFitting/DllConfig.h
- inc/MantidCurveFitting/DynamicKuboToyabe.h
- inc/MantidCurveFitting/EndErfc.h
inc/MantidCurveFitting/EstimatePeakErrors.h
inc/MantidCurveFitting/EvaluateFunction.h
- inc/MantidCurveFitting/ExpDecay.h
- inc/MantidCurveFitting/ExpDecayMuon.h
- inc/MantidCurveFitting/ExpDecayOsc.h
inc/MantidCurveFitting/Fit.h
inc/MantidCurveFitting/Fit1D.h
inc/MantidCurveFitting/FitMW.h
inc/MantidCurveFitting/FitPowderDiffPeaks.h
- inc/MantidCurveFitting/FlatBackground.h
- inc/MantidCurveFitting/FullprofPolynomial.h
inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
@@ -176,112 +153,136 @@ set ( INC_FILES
inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
inc/MantidCurveFitting/FunctionDomain1DSpectrumCreator.h
+ inc/MantidCurveFitting/Functions/Abragam.h
+ inc/MantidCurveFitting/Functions/BSpline.h
+ inc/MantidCurveFitting/Functions/BackToBackExponential.h
+ inc/MantidCurveFitting/Functions/BackgroundFunction.h
+ inc/MantidCurveFitting/Functions/BivariateNormal.h
+ inc/MantidCurveFitting/Functions/Bk2BkExpConvPV.h
+ inc/MantidCurveFitting/Functions/ChebfunBase.h
+ inc/MantidCurveFitting/Functions/Chebyshev.h
+ inc/MantidCurveFitting/Functions/ComptonPeakProfile.h
+ inc/MantidCurveFitting/Functions/ComptonProfile.h
+ inc/MantidCurveFitting/Functions/ComptonScatteringCountRate.h
+ inc/MantidCurveFitting/Functions/Convolution.h
+ inc/MantidCurveFitting/Functions/CubicSpline.h
+ inc/MantidCurveFitting/Functions/DeltaFunction.h
+ inc/MantidCurveFitting/Functions/DiffRotDiscreteCircle.h
+ inc/MantidCurveFitting/Functions/DiffSphere.h
+ inc/MantidCurveFitting/Functions/DynamicKuboToyabe.h
+ inc/MantidCurveFitting/Functions/EndErfc.h
+ inc/MantidCurveFitting/Functions/ExpDecay.h
+ inc/MantidCurveFitting/Functions/ExpDecayMuon.h
+ inc/MantidCurveFitting/Functions/ExpDecayOsc.h
+ inc/MantidCurveFitting/Functions/FlatBackground.h
+ inc/MantidCurveFitting/Functions/FullprofPolynomial.h
+ inc/MantidCurveFitting/Functions/GausDecay.h
+ inc/MantidCurveFitting/Functions/GausOsc.h
+ inc/MantidCurveFitting/Functions/Gaussian.h
+ inc/MantidCurveFitting/Functions/GaussianComptonProfile.h
+ inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
+ inc/MantidCurveFitting/Functions/IkedaCarpenterPV.h
+ inc/MantidCurveFitting/Functions/LinearBackground.h
+ inc/MantidCurveFitting/Functions/LogNormal.h
+ inc/MantidCurveFitting/Functions/Lorentzian.h
+ inc/MantidCurveFitting/Functions/Lorentzian1D.h
+ inc/MantidCurveFitting/Functions/MuonFInteraction.h
+ inc/MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h
+ inc/MantidCurveFitting/Functions/PawleyFunction.h
+ inc/MantidCurveFitting/Functions/PeakParameterFunction.h
+ inc/MantidCurveFitting/Functions/Polynomial.h
+ inc/MantidCurveFitting/Functions/ProcessBackground.h
+ inc/MantidCurveFitting/Functions/ProductFunction.h
+ inc/MantidCurveFitting/Functions/ProductLinearExp.h
+ inc/MantidCurveFitting/Functions/ProductQuadraticExp.h
+ inc/MantidCurveFitting/Functions/PseudoVoigt.h
+ inc/MantidCurveFitting/Functions/Quadratic.h
+ inc/MantidCurveFitting/Functions/ReflectivityMulf.h
+ inc/MantidCurveFitting/Functions/Resolution.h
+ inc/MantidCurveFitting/Functions/SimpleChebfun.h
+ inc/MantidCurveFitting/Functions/StaticKuboToyabe.h
+ inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h
+ inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h
+ inc/MantidCurveFitting/Functions/StretchExp.h
+ inc/MantidCurveFitting/Functions/StretchExpMuon.h
+ inc/MantidCurveFitting/Functions/TabulatedFunction.h
+ inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h
+ inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h
+ inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
+ inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h
+ inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h
+ inc/MantidCurveFitting/Functions/UserFunction.h
+ inc/MantidCurveFitting/Functions/UserFunction1D.h
+ inc/MantidCurveFitting/Functions/VesuvioResolution.h
+ inc/MantidCurveFitting/Functions/Voigt.h
inc/MantidCurveFitting/GSLFunctions.h
inc/MantidCurveFitting/GSLJacobian.h
inc/MantidCurveFitting/GSLMatrix.h
inc/MantidCurveFitting/GSLVector.h
- inc/MantidCurveFitting/GausDecay.h
- inc/MantidCurveFitting/GausOsc.h
- inc/MantidCurveFitting/Gaussian.h
- inc/MantidCurveFitting/GaussianComptonProfile.h
- inc/MantidCurveFitting/GramCharlierComptonProfile.h
inc/MantidCurveFitting/HalfComplex.h
inc/MantidCurveFitting/IFittingAlgorithm.h
- inc/MantidCurveFitting/IkedaCarpenterPV.h
inc/MantidCurveFitting/Jacobian.h
inc/MantidCurveFitting/LatticeDomainCreator.h
inc/MantidCurveFitting/LatticeFunction.h
inc/MantidCurveFitting/LeBailFit.h
inc/MantidCurveFitting/LeBailFunction.h
- inc/MantidCurveFitting/LinearBackground.h
- inc/MantidCurveFitting/LogNormal.h
- inc/MantidCurveFitting/Lorentzian.h
- inc/MantidCurveFitting/Lorentzian1D.h
inc/MantidCurveFitting/MSVesuvioHelpers.h
inc/MantidCurveFitting/MultiDomainCreator.h
- inc/MantidCurveFitting/MuonFInteraction.h
- inc/MantidCurveFitting/NeutronBk2BkExpConvPVoigt.h
inc/MantidCurveFitting/NormaliseByPeakArea.h
inc/MantidCurveFitting/ParDomain.h
inc/MantidCurveFitting/ParameterEstimator.h
inc/MantidCurveFitting/PawleyFit.h
- inc/MantidCurveFitting/PawleyFunction.h
- inc/MantidCurveFitting/PeakParameterFunction.h
inc/MantidCurveFitting/PlotPeakByLogValue.h
- inc/MantidCurveFitting/Polynomial.h
- inc/MantidCurveFitting/ProcessBackground.h
- inc/MantidCurveFitting/ProductFunction.h
- inc/MantidCurveFitting/ProductLinearExp.h
- inc/MantidCurveFitting/ProductQuadraticExp.h
- inc/MantidCurveFitting/PseudoVoigt.h
- inc/MantidCurveFitting/Quadratic.h
inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
- inc/MantidCurveFitting/ReflectivityMulf.h
- inc/MantidCurveFitting/Resolution.h
inc/MantidCurveFitting/SeqDomain.h
inc/MantidCurveFitting/SeqDomainSpectrumCreator.h
- inc/MantidCurveFitting/SimpleChebfun.h
inc/MantidCurveFitting/SpecialFunctionSupport.h
inc/MantidCurveFitting/SplineBackground.h
inc/MantidCurveFitting/SplineInterpolation.h
inc/MantidCurveFitting/SplineSmoothing.h
- inc/MantidCurveFitting/StaticKuboToyabe.h
- inc/MantidCurveFitting/StaticKuboToyabeTimesExpDecay.h
- inc/MantidCurveFitting/StaticKuboToyabeTimesGausDecay.h
- inc/MantidCurveFitting/StretchExp.h
- inc/MantidCurveFitting/StretchExpMuon.h
- inc/MantidCurveFitting/TabulatedFunction.h
- inc/MantidCurveFitting/ThermalNeutronBk2BkExpAlpha.h
- inc/MantidCurveFitting/ThermalNeutronBk2BkExpBeta.h
- inc/MantidCurveFitting/ThermalNeutronBk2BkExpConvPVoigt.h
- inc/MantidCurveFitting/ThermalNeutronBk2BkExpSigma.h
- inc/MantidCurveFitting/ThermalNeutronDtoTOFFunction.h
- inc/MantidCurveFitting/UserFunction.h
- inc/MantidCurveFitting/UserFunction1D.h
- inc/MantidCurveFitting/VesuvioResolution.h
- inc/MantidCurveFitting/Voigt.h
)
set ( TEST_FILES
# ChebyshevPolynomialBackgroundTest.h
# RefinePowderInstrumentParametersTest.h
#SCDPanelErrorsTest.h
- AbragamTest.h
+ Functions/AbragamTest.h
AugmentedLagrangianOptimizerTest.h
- BSplineTest.h
- BackToBackExponentialTest.h
- BivariateNormalTest.h
- Bk2BkExpConvPVTest.h
+ Functions/BSplineTest.h
+ Functions/BackToBackExponentialTest.h
+ Functions/BivariateNormalTest.h
+ Functions/Bk2BkExpConvPVTest.h
BoundaryConstraintTest.h
CalculateChiSquaredTest.h
CalculateGammaBackgroundTest.h
CalculateMSVesuvioTest.h
- ChebfunBaseTest.h
- ChebyshevTest.h
+ Functions/ChebfunBaseTest.h
+ Functions/ChebyshevTest.h
CompositeFunctionTest.h
- ComptonPeakProfileTest.h
- ComptonProfileTest.h
- ComptonScatteringCountRateTest.h
+ Functions/ComptonPeakProfileTest.h
+ Functions/ComptonProfileTest.h
+ Functions/ComptonScatteringCountRateTest.h
ConvertToYSpaceTest.h
- ConvolutionTest.h
+ Functions/ConvolutionTest.h
ConvolveWorkspacesTest.h
CostFunctions/CostFuncUnweightedLeastSquaresTest.h
- CubicSplineTest.h
- DeltaFunctionTest.h
- DiffRotDiscreteCircleTest.h
- DiffSphereTest.h
- DynamicKuboToyabeTest.h
- EndErfcTest.h
+ CostFunctions/LeastSquaresTest.h
+ Functions/CubicSplineTest.h
+ Functions/DeltaFunctionTest.h
+ Functions/DiffRotDiscreteCircleTest.h
+ Functions/DiffSphereTest.h
+ Functions/DynamicKuboToyabeTest.h
+ Functions/EndErfcTest.h
EstimatePeakErrorsTest.h
EvaluateFunctionTest.h
- ExpDecayMuonTest.h
- ExpDecayOscTest.h
- ExpDecayTest.h
+ Functions/ExpDecayMuonTest.h
+ Functions/ExpDecayOscTest.h
+ Functions/ExpDecayTest.h
FitMWTest.h
FitPowderDiffPeaksTest.h
FitTest.h
- FlatBackgroundTest.h
- FullprofPolynomialTest.h
+ Functions/FlatBackgroundTest.h
+ Functions/FullprofPolynomialTest.h
FuncMinimizers/BFGSTest.h
FuncMinimizers/DampingMinimizerTest.h
FuncMinimizers/FABADAMinimizerTest.h
@@ -295,64 +296,63 @@ set ( TEST_FILES
FunctionParameterDecoratorFitTest.h
GSLMatrixTest.h
GSLVectorTest.h
- GausDecayTest.h
- GausOscTest.h
- GaussianComptonProfileTest.h
- GaussianTest.h
- GramCharlierComptonProfileTest.h
+ Functions/GausDecayTest.h
+ Functions/GausOscTest.h
+ Functions/GaussianComptonProfileTest.h
+ Functions/GaussianTest.h
+ Functions/GramCharlierComptonProfileTest.h
IPeakFunctionCentreParameterNameTest.h
IPeakFunctionIntensityTest.h
- IkedaCarpenterPVTest.h
+ Functions/IkedaCarpenterPVTest.h
LatticeDomainCreatorTest.h
LatticeFunctionTest.h
LeBailFitTest.h
LeBailFunctionTest.h
- CostFunctions/LeastSquaresTest.h
- LinearBackgroundTest.h
- LogNormalTest.h
- Lorentzian1DTest.h
- LorentzianTest.h
+ Functions/LinearBackgroundTest.h
+ Functions/LogNormalTest.h
+ Functions/Lorentzian1DTest.h
+ Functions/LorentzianTest.h
MultiDomainCreatorTest.h
MultiDomainFunctionTest.h
- MuonFInteractionTest.h
- NeutronBk2BkExpConvPVoigtTest.h
+ Functions/MuonFInteractionTest.h
+ Functions/NeutronBk2BkExpConvPVoigtTest.h
NormaliseByPeakAreaTest.h
ParameterEstimatorTest.h
PawleyFitTest.h
- PawleyFunctionTest.h
- PeakParameterFunctionTest.h
+ Functions/PawleyFunctionTest.h
+ Functions/PeakParameterFunctionTest.h
PlotPeakByLogValueTest.h
- PolynomialTest.h
- ProcessBackgroundTest.h
- ProductFunctionTest.h
- ProductLinearExpTest.h
- ProductQuadraticExpTest.h
- PseudoVoigtTest.h
- QuadraticTest.h
+ Functions/PolynomialTest.h
+ Functions/ProcessBackgroundTest.h
+ Functions/ProductFunctionTest.h
+ Functions/ProductLinearExpTest.h
+ Functions/ProductQuadraticExpTest.h
+ Functions/PseudoVoigtTest.h
+ Functions/QuadraticTest.h
RefinePowderInstrumentParameters3Test.h
- ReflectivityMulfTest.h
- ResolutionTest.h
+ Functions/ReflectivityMulfTest.h
+ Functions/ResolutionTest.h
SeqDomainSpectrumCreatorTest.h
- SimpleChebfunTest.h
+ Functions/SimpleChebfunTest.h
SpecialFunctionSupportTest.h
SplineBackgroundTest.h
SplineInterpolationTest.h
SplineSmoothingTest.h
- StaticKuboToyabeTest.h
- StaticKuboToyabeTimesExpDecayTest.h
- StaticKuboToyabeTimesGausDecayTest.h
- StretchExpMuonTest.h
- StretchExpTest.h
- TabulatedFunctionTest.h
- ThermalNeutronBk2BkExpAlphaTest.h
- ThermalNeutronBk2BkExpBetaTest.h
- ThermalNeutronBk2BkExpConvPVoigtTest.h
- ThermalNeutronBk2BkExpSigmaTest.h
- ThermalNeutronDtoTOFFunctionTest.h
- UserFunction1DTest.h
- UserFunctionTest.h
- VesuvioResolutionTest.h
- VoigtTest.h
+ Functions/StaticKuboToyabeTest.h
+ Functions/StaticKuboToyabeTimesExpDecayTest.h
+ Functions/StaticKuboToyabeTimesGausDecayTest.h
+ Functions/StretchExpMuonTest.h
+ Functions/StretchExpTest.h
+ Functions/TabulatedFunctionTest.h
+ Functions/ThermalNeutronBk2BkExpAlphaTest.h
+ Functions/ThermalNeutronBk2BkExpBetaTest.h
+ Functions/ThermalNeutronBk2BkExpConvPVoigtTest.h
+ Functions/ThermalNeutronBk2BkExpSigmaTest.h
+ Functions/ThermalNeutronDtoTOFFunctionTest.h
+ Functions/UserFunction1DTest.h
+ Functions/UserFunctionTest.h
+ Functions/VesuvioResolutionTest.h
+ Functions/VoigtTest.h
)
if (COVERALLS)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ConvolveWorkspaces.h b/Framework/CurveFitting/inc/MantidCurveFitting/ConvolveWorkspaces.h
index 30ad9f3f040..6ddf94ef02f 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/ConvolveWorkspaces.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/ConvolveWorkspaces.h
@@ -9,7 +9,7 @@
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/Workspace2D.h"
-#include "MantidCurveFitting/CubicSpline.h"
+#include "MantidCurveFitting/Functions/CubicSpline.h"
#include "MantidAPI/ParamFunction.h"
#include "MantidAPI/IFunction1D.h"
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FitPowderDiffPeaks.h b/Framework/CurveFitting/inc/MantidCurveFitting/FitPowderDiffPeaks.h
index 1fe1d2551eb..c315c7c29ca 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FitPowderDiffPeaks.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FitPowderDiffPeaks.h
@@ -8,9 +8,9 @@
#include "MantidAPI/ITableWorkspace_fwd.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidDataObjects/Workspace2D.h"
-#include "MantidCurveFitting/BackgroundFunction.h"
-#include "MantidCurveFitting/Polynomial.h"
-#include "MantidCurveFitting/BackToBackExponential.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/Polynomial.h"
+#include "MantidCurveFitting/Functions/BackToBackExponential.h"
#include "MantidGeometry/Crystal/UnitCell.h"
namespace Mantid {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Abragam.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Abragam.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Abragam.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/Abragam.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/BSpline.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/BSpline.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h
index a2a59dad635..b5bfb46bb67 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/BSpline.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h
@@ -4,7 +4,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
#include <boost/shared_ptr.hpp>
#include <gsl/gsl_errno.h>
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/BackToBackExponential.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackToBackExponential.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/BackToBackExponential.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackToBackExponential.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/BackgroundFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackgroundFunction.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/BackgroundFunction.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackgroundFunction.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/BivariateNormal.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h
similarity index 99%
rename from Framework/CurveFitting/inc/MantidCurveFitting/BivariateNormal.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h
index 5404e669d06..cdddca1c7c9 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/BivariateNormal.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h
@@ -4,7 +4,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/UserFunction.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidAPI/IFunctionMW.h"
#include "MantidAPI/IFunction1D.h"
#include "MantidAPI/ParamFunction.h"
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Bk2BkExpConvPV.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Bk2BkExpConvPV.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Bk2BkExpConvPV.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/Bk2BkExpConvPV.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ChebfunBase.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ChebfunBase.h
similarity index 99%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ChebfunBase.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ChebfunBase.h
index 37eafa709eb..84b7dc703ba 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/ChebfunBase.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ChebfunBase.h
@@ -1,8 +1,8 @@
#ifndef MANTID_CURVEFITTING_CHEBFUNBASE_H
#define MANTID_CURVEFITTING_CHEBFUNBASE_H
-#include "DllConfig.h"
-#include "GSLMatrix.h"
+#include "MantidCurveFitting/DllConfig.h"
+#include "MantidCurveFitting/GSLMatrix.h"
#include <boost/shared_ptr.hpp>
#include <vector>
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Chebyshev.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Chebyshev.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h
index 100a00197e1..2c8f4c2bec5 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Chebyshev.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h
@@ -4,7 +4,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
#include <valarray>
namespace Mantid {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ComptonPeakProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonPeakProfile.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ComptonPeakProfile.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonPeakProfile.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ComptonProfile.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
index c533219940a..2c677bfebc3 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/ComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
@@ -2,7 +2,7 @@
#define MANTID_CURVEFITTING_COMPTONPROFILE_H_
#include "MantidCurveFitting/DllConfig.h"
-#include "MantidCurveFitting/VesuvioResolution.h"
+#include "MantidCurveFitting/Functions/VesuvioResolution.h"
#include "MantidAPI/IPeakFunction.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidAPI/ParamFunction.h"
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ComptonScatteringCountRate.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonScatteringCountRate.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ComptonScatteringCountRate.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonScatteringCountRate.h
index 1b3c42cfd9c..1ef57d0652d 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/ComptonScatteringCountRate.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonScatteringCountRate.h
@@ -2,7 +2,7 @@
#define MANTID_CURVEFITTING_COMPTONSCATTERINGCOUNTRATE_H_
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/ComptonProfile.h"
+#include "MantidCurveFitting/Functions/ComptonProfile.h"
#include "MantidKernel/ClassMacros.h"
#include "MantidKernel/Matrix.h"
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Convolution.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Convolution.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CubicSpline.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/CubicSpline.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h
index 0ad0f34ccc0..57f3df02f9c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CubicSpline.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h
@@ -4,7 +4,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
#include <boost/scoped_array.hpp>
#include <gsl/gsl_errno.h>
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/DeltaFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DeltaFunction.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/DeltaFunction.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/DeltaFunction.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/DiffRotDiscreteCircle.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffRotDiscreteCircle.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/DiffRotDiscreteCircle.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffRotDiscreteCircle.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/DiffSphere.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffSphere.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/DiffSphere.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffSphere.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/DynamicKuboToyabe.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DynamicKuboToyabe.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/DynamicKuboToyabe.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/DynamicKuboToyabe.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/EndErfc.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/EndErfc.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/EndErfc.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/EndErfc.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ExpDecay.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecay.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ExpDecay.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecay.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ExpDecayMuon.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayMuon.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ExpDecayMuon.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayMuon.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ExpDecayOsc.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayOsc.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ExpDecayOsc.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayOsc.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FlatBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FlatBackground.h
similarity index 96%
rename from Framework/CurveFitting/inc/MantidCurveFitting/FlatBackground.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/FlatBackground.h
index 1de1aba3bd9..fe028898ffb 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FlatBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FlatBackground.h
@@ -1,7 +1,7 @@
#ifndef MANTID_CURVEFITTING_FLATBACKGROUND_H_
#define MANTID_CURVEFITTING_FLATBACKGROUND_H_
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
#include "MantidKernel/System.h"
namespace Mantid {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FullprofPolynomial.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/FullprofPolynomial.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h
index 114437e08a4..630b2d05fb8 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FullprofPolynomial.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h
@@ -2,7 +2,7 @@
#define MANTID_CURVEFITTING_FULLPROFPOLYNOMIAL_H_
#include "MantidKernel/System.h"
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/GausDecay.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausDecay.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/GausDecay.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausDecay.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/GausOsc.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausOsc.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/GausOsc.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausOsc.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Gaussian.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Gaussian.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Gaussian.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/Gaussian.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/GaussianComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GaussianComptonProfile.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/GaussianComptonProfile.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/GaussianComptonProfile.h
index 4030a64cac4..d70a4fe39d9 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/GaussianComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GaussianComptonProfile.h
@@ -2,7 +2,7 @@
#define MANTID_CURVEFITTING_GAUSSIANCOMPTONPROFILE_H_
#include "MantidCurveFitting/DllConfig.h"
-#include "MantidCurveFitting/ComptonProfile.h"
+#include "MantidCurveFitting/Functions/ComptonProfile.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/GramCharlierComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/GramCharlierComptonProfile.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
index bc8e1b4fd01..410c024e5fc 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/GramCharlierComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
@@ -2,7 +2,7 @@
#define MANTID_CURVEFITTING_GRAMCHARLIERCOMPTONPROFILE_H_
#include "MantidCurveFitting/DllConfig.h"
-#include "MantidCurveFitting/ComptonProfile.h"
+#include "MantidCurveFitting/Functions/ComptonProfile.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/IkedaCarpenterPV.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/IkedaCarpenterPV.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/IkedaCarpenterPV.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/IkedaCarpenterPV.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LinearBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LinearBackground.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/LinearBackground.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/LinearBackground.h
index 3919c08b162..90508ebbe78 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/LinearBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LinearBackground.h
@@ -4,7 +4,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LogNormal.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LogNormal.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/LogNormal.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/LogNormal.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Lorentzian.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Lorentzian.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Lorentzian1D.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Lorentzian1D.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/MuonFInteraction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/MuonFInteraction.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/MuonFInteraction.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/MuonFInteraction.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/NeutronBk2BkExpConvPVoigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/NeutronBk2BkExpConvPVoigt.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/PawleyFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/PawleyFunction.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/PeakParameterFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PeakParameterFunction.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/PeakParameterFunction.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/PeakParameterFunction.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Polynomial.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Polynomial.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Polynomial.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/Polynomial.h
index 94cfa29b53e..6d2c89a1ed1 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Polynomial.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Polynomial.h
@@ -2,7 +2,7 @@
#define MANTID_CURVEFITTING_POLYNOMIAL_H_
#include "MantidKernel/System.h"
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
#include <cmath>
namespace Mantid {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ProcessBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProcessBackground.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ProcessBackground.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProcessBackground.h
index 3b9c09886fe..8ccd29796cf 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/ProcessBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProcessBackground.h
@@ -3,7 +3,7 @@
#include "MantidKernel/System.h"
#include "MantidAPI/Algorithm.h"
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidKernel/ArrayProperty.h"
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ProductFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductFunction.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ProductFunction.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductFunction.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ProductLinearExp.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductLinearExp.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ProductLinearExp.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductLinearExp.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ProductQuadraticExp.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductQuadraticExp.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ProductQuadraticExp.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductQuadraticExp.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/PseudoVoigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PseudoVoigt.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/PseudoVoigt.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/PseudoVoigt.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Quadratic.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Quadratic.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Quadratic.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/Quadratic.h
index 0e1e6f08553..4b39a909bd2 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Quadratic.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Quadratic.h
@@ -4,7 +4,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ReflectivityMulf.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ReflectivityMulf.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ReflectivityMulf.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ReflectivityMulf.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Resolution.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Resolution.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Resolution.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/Resolution.h
index fd7237629dd..3961ac99727 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Resolution.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Resolution.h
@@ -4,7 +4,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/TabulatedFunction.h"
+#include "MantidCurveFitting/Functions/TabulatedFunction.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SimpleChebfun.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/SimpleChebfun.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/SimpleChebfun.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/SimpleChebfun.h
index 5da29131ea0..ee4082ce689 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SimpleChebfun.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/SimpleChebfun.h
@@ -2,7 +2,7 @@
#define MANTID_CURVEFITTING_SIMPLECHEBFUN_H_
#include "MantidKernel/System.h"
-#include "MantidCurveFitting/ChebfunBase.h"
+#include "MantidCurveFitting/Functions/ChebfunBase.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/StaticKuboToyabe.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabe.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/StaticKuboToyabe.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabe.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/StaticKuboToyabeTimesExpDecay.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/StaticKuboToyabeTimesExpDecay.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/StaticKuboToyabeTimesGausDecay.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/StaticKuboToyabeTimesGausDecay.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/StretchExp.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExp.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/StretchExp.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExp.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/StretchExpMuon.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExpMuon.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/StretchExpMuon.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExpMuon.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/TabulatedFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/TabulatedFunction.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/TabulatedFunction.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/TabulatedFunction.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ThermalNeutronBk2BkExpAlpha.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ThermalNeutronBk2BkExpAlpha.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ThermalNeutronBk2BkExpBeta.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ThermalNeutronBk2BkExpBeta.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ThermalNeutronBk2BkExpConvPVoigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ThermalNeutronBk2BkExpConvPVoigt.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ThermalNeutronBk2BkExpSigma.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ThermalNeutronBk2BkExpSigma.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ThermalNeutronDtoTOFFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ThermalNeutronDtoTOFFunction.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/UserFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/UserFunction.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/UserFunction1D.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/UserFunction1D.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/VesuvioResolution.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/VesuvioResolution.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Voigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Voigt.h
similarity index 100%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Voigt.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Functions/Voigt.h
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LatticeFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/LatticeFunction.h
index dda2fcf1d83..400a66e687a 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/LatticeFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/LatticeFunction.h
@@ -4,7 +4,7 @@
#include "MantidKernel/System.h"
#include "MantidAPI/ILatticeFunction.h"
-#include "MantidCurveFitting/PawleyFunction.h"
+#include "MantidCurveFitting/Functions/PawleyFunction.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFit.h b/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFit.h
index cd602195197..9759038a6a0 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFit.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFit.h
@@ -7,9 +7,9 @@
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
-#include "MantidCurveFitting/ThermalNeutronBk2BkExpConvPVoigt.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
#include "MantidAPI/IFunction.h"
#include <gsl/gsl_sf_erf.h>
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFunction.h
index 3b46dfb4dd6..cad2f0e9667 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFunction.h
@@ -5,7 +5,7 @@
#include "MantidAPI/CompositeFunction.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidAPI/IPowderDiffPeakFunction.h"
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/PawleyFit.h b/Framework/CurveFitting/inc/MantidCurveFitting/PawleyFit.h
index c1c78b1044c..5a209cfa165 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/PawleyFit.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/PawleyFit.h
@@ -5,7 +5,7 @@
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
#include "MantidAPI/TableRow.h"
-#include "MantidCurveFitting/PawleyFunction.h"
+#include "MantidCurveFitting/Functions/PawleyFunction.h"
#include "MantidKernel/Unit.h"
namespace Mantid {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h b/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
index 3af13a083e6..323c19b6543 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
@@ -9,7 +9,7 @@
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidCurveFitting/LeBailFit.h"
-#include "MantidCurveFitting/ThermalNeutronDtoTOFFunction.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
namespace Mantid {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SplineInterpolation.h b/Framework/CurveFitting/inc/MantidCurveFitting/SplineInterpolation.h
index b75259124c0..dbec8b37898 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SplineInterpolation.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/SplineInterpolation.h
@@ -3,7 +3,7 @@
#include "MantidKernel/System.h"
#include "MantidAPI/Algorithm.h"
-#include "MantidCurveFitting/CubicSpline.h"
+#include "MantidCurveFitting/Functions/CubicSpline.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SplineSmoothing.h b/Framework/CurveFitting/inc/MantidCurveFitting/SplineSmoothing.h
index 3c95fe4d0f9..66fc8771db7 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SplineSmoothing.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/SplineSmoothing.h
@@ -4,7 +4,7 @@
#include "MantidKernel/System.h"
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidCurveFitting/BSpline.h"
+#include "MantidCurveFitting/Functions/BSpline.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/src/CalculateChiSquared.cpp b/Framework/CurveFitting/src/CalculateChiSquared.cpp
index 0f65e001277..9a0f5b03130 100644
--- a/Framework/CurveFitting/src/CalculateChiSquared.cpp
+++ b/Framework/CurveFitting/src/CalculateChiSquared.cpp
@@ -3,7 +3,7 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/Column.h"
#include "MantidAPI/TableRow.h"
-#include "MantidCurveFitting/ChebfunBase.h"
+#include "MantidCurveFitting/Functions/ChebfunBase.h"
#include "MantidCurveFitting/GSLJacobian.h"
namespace Mantid {
diff --git a/Framework/CurveFitting/src/CalculateGammaBackground.cpp b/Framework/CurveFitting/src/CalculateGammaBackground.cpp
index d4dfeb2503d..e0f96bf6ee9 100644
--- a/Framework/CurveFitting/src/CalculateGammaBackground.cpp
+++ b/Framework/CurveFitting/src/CalculateGammaBackground.cpp
@@ -1,7 +1,7 @@
#include "MantidCurveFitting/CalculateGammaBackground.h"
-#include "MantidCurveFitting/ComptonProfile.h"
+#include "MantidCurveFitting/Functions/ComptonProfile.h"
#include "MantidCurveFitting/ConvertToYSpace.h"
-#include "MantidCurveFitting/VesuvioResolution.h"
+#include "MantidCurveFitting/Functions/VesuvioResolution.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidAPI/FunctionProperty.h"
diff --git a/Framework/CurveFitting/src/CalculateMSVesuvio.cpp b/Framework/CurveFitting/src/CalculateMSVesuvio.cpp
index 1b9aea72dde..ba6dc91e81b 100644
--- a/Framework/CurveFitting/src/CalculateMSVesuvio.cpp
+++ b/Framework/CurveFitting/src/CalculateMSVesuvio.cpp
@@ -5,7 +5,7 @@
// Use helpers for storing detector/resolution parameters
#include "MantidCurveFitting/ConvertToYSpace.h"
#include "MantidCurveFitting/MSVesuvioHelpers.h"
-#include "MantidCurveFitting/VesuvioResolution.h"
+#include "MantidCurveFitting/Functions/VesuvioResolution.h"
#include "MantidAPI/SampleShapeValidator.h"
#include "MantidAPI/WorkspaceValidators.h"
diff --git a/Framework/CurveFitting/src/ConvolveWorkspaces.cpp b/Framework/CurveFitting/src/ConvolveWorkspaces.cpp
index c8bc4034617..976dfaf6b1e 100644
--- a/Framework/CurveFitting/src/ConvolveWorkspaces.cpp
+++ b/Framework/CurveFitting/src/ConvolveWorkspaces.cpp
@@ -2,8 +2,8 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/ConvolveWorkspaces.h"
-#include "MantidCurveFitting/Convolution.h"
-#include "MantidCurveFitting/TabulatedFunction.h"
+#include "MantidCurveFitting/Functions/Convolution.h"
+#include "MantidCurveFitting/Functions/TabulatedFunction.h"
#include <sstream>
#include <gsl/gsl_errno.h>
#include <gsl/gsl_fft_real.h>
diff --git a/Framework/CurveFitting/src/EstimatePeakErrors.cpp b/Framework/CurveFitting/src/EstimatePeakErrors.cpp
index f9f0903ea36..aa69cb5b550 100644
--- a/Framework/CurveFitting/src/EstimatePeakErrors.cpp
+++ b/Framework/CurveFitting/src/EstimatePeakErrors.cpp
@@ -1,6 +1,6 @@
#include "MantidCurveFitting/EstimatePeakErrors.h"
#include "MantidCurveFitting/GSLMatrix.h"
-#include "MantidCurveFitting/PeakParameterFunction.h"
+#include "MantidCurveFitting/Functions/PeakParameterFunction.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidAPI/FunctionProperty.h"
diff --git a/Framework/CurveFitting/src/FitMW.cpp b/Framework/CurveFitting/src/FitMW.cpp
index d98e9dc7f37..7a4ab09c0b9 100644
--- a/Framework/CurveFitting/src/FitMW.cpp
+++ b/Framework/CurveFitting/src/FitMW.cpp
@@ -2,7 +2,7 @@
//----------------------------------------------------------------------
#include "MantidCurveFitting/FitMW.h"
#include "MantidCurveFitting/SeqDomain.h"
-#include "MantidCurveFitting/Convolution.h"
+#include "MantidCurveFitting/Functions/Convolution.h"
#include "MantidCurveFitting/ParameterEstimator.h"
#include "MantidAPI/CompositeFunction.h"
diff --git a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
index ec7e15bd8a9..627154c519a 100644
--- a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
+++ b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
@@ -17,13 +17,13 @@
#include "MantidAPI/TextAxis.h"
#include "MantidCurveFitting/Fit.h"
-#include "MantidCurveFitting/BackgroundFunction.h"
-#include "MantidCurveFitting/ThermalNeutronDtoTOFFunction.h"
-#include "MantidCurveFitting/Polynomial.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
-#include "MantidCurveFitting/Gaussian.h"
-#include "MantidCurveFitting/BackToBackExponential.h"
-#include "MantidCurveFitting/ThermalNeutronBk2BkExpConvPVoigt.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h"
+#include "MantidCurveFitting/Functions/Polynomial.h"
+#include "MantidCurveFitting/Functions/Gaussian.h"
+#include "MantidCurveFitting/Functions/BackToBackExponential.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h"
#include "MantidCurveFitting/FuncMinimizers/DampingMinimizer.h"
#include "MantidCurveFitting/CostFunctions/CostFuncFitting.h"
diff --git a/Framework/CurveFitting/src/Abragam.cpp b/Framework/CurveFitting/src/Functions/Abragam.cpp
similarity index 97%
rename from Framework/CurveFitting/src/Abragam.cpp
rename to Framework/CurveFitting/src/Functions/Abragam.cpp
index cd24227e314..5f073b2a156 100644
--- a/Framework/CurveFitting/src/Abragam.cpp
+++ b/Framework/CurveFitting/src/Functions/Abragam.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/Abragam.h"
+#include "MantidCurveFitting/Functions/Abragam.h"
#include "MantidAPI//FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/BSpline.cpp b/Framework/CurveFitting/src/Functions/BSpline.cpp
similarity index 99%
rename from Framework/CurveFitting/src/BSpline.cpp
rename to Framework/CurveFitting/src/Functions/BSpline.cpp
index b174fdc184d..5bbf9b84368 100644
--- a/Framework/CurveFitting/src/BSpline.cpp
+++ b/Framework/CurveFitting/src/Functions/BSpline.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/BSpline.h"
+#include "MantidCurveFitting/Functions/BSpline.h"
#include "MantidCurveFitting/GSLVector.h"
#include "MantidCurveFitting/GSLMatrix.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/src/BackToBackExponential.cpp b/Framework/CurveFitting/src/Functions/BackToBackExponential.cpp
similarity index 98%
rename from Framework/CurveFitting/src/BackToBackExponential.cpp
rename to Framework/CurveFitting/src/Functions/BackToBackExponential.cpp
index 0c623c678de..99fb5feb937 100644
--- a/Framework/CurveFitting/src/BackToBackExponential.cpp
+++ b/Framework/CurveFitting/src/Functions/BackToBackExponential.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/BackToBackExponential.h"
+#include "MantidCurveFitting/Functions/BackToBackExponential.h"
#include "MantidAPI/FunctionFactory.h"
#include <gsl/gsl_sf_erf.h>
diff --git a/Framework/CurveFitting/src/BackgroundFunction.cpp b/Framework/CurveFitting/src/Functions/BackgroundFunction.cpp
similarity index 89%
rename from Framework/CurveFitting/src/BackgroundFunction.cpp
rename to Framework/CurveFitting/src/Functions/BackgroundFunction.cpp
index a7d79bd6fe4..2a54bfa701e 100644
--- a/Framework/CurveFitting/src/BackgroundFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/BackgroundFunction.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/src/BivariateNormal.cpp b/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
similarity index 99%
rename from Framework/CurveFitting/src/BivariateNormal.cpp
rename to Framework/CurveFitting/src/Functions/BivariateNormal.cpp
index f9cae2a8038..b6d2c5cfbea 100644
--- a/Framework/CurveFitting/src/BivariateNormal.cpp
+++ b/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/BivariateNormal.h"
+#include "MantidCurveFitting/Functions/BivariateNormal.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidKernel/PhysicalConstants.h"
diff --git a/Framework/CurveFitting/src/Bk2BkExpConvPV.cpp b/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
similarity index 99%
rename from Framework/CurveFitting/src/Bk2BkExpConvPV.cpp
rename to Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
index 7052c100cf8..6fb1733c1f0 100644
--- a/Framework/CurveFitting/src/Bk2BkExpConvPV.cpp
+++ b/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
@@ -1,6 +1,6 @@
#include <cmath>
-#include "MantidCurveFitting/Bk2BkExpConvPV.h"
+#include "MantidCurveFitting/Functions/Bk2BkExpConvPV.h"
#include "MantidKernel/System.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/src/ChebfunBase.cpp b/Framework/CurveFitting/src/Functions/ChebfunBase.cpp
similarity index 99%
rename from Framework/CurveFitting/src/ChebfunBase.cpp
rename to Framework/CurveFitting/src/Functions/ChebfunBase.cpp
index 3a1844b9563..0aa3e9de492 100644
--- a/Framework/CurveFitting/src/ChebfunBase.cpp
+++ b/Framework/CurveFitting/src/Functions/ChebfunBase.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/ChebfunBase.h"
+#include "MantidCurveFitting/Functions/ChebfunBase.h"
#include "MantidAPI/IFunction1D.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/src/Chebyshev.cpp b/Framework/CurveFitting/src/Functions/Chebyshev.cpp
similarity index 98%
rename from Framework/CurveFitting/src/Chebyshev.cpp
rename to Framework/CurveFitting/src/Functions/Chebyshev.cpp
index 7da4e1d0b88..cfbee5ff8d0 100644
--- a/Framework/CurveFitting/src/Chebyshev.cpp
+++ b/Framework/CurveFitting/src/Functions/Chebyshev.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/Chebyshev.h"
+#include "MantidCurveFitting/Functions/Chebyshev.h"
#include "MantidAPI/FunctionFactory.h"
#include <boost/lexical_cast.hpp>
diff --git a/Framework/CurveFitting/src/ComptonPeakProfile.cpp b/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp
similarity index 98%
rename from Framework/CurveFitting/src/ComptonPeakProfile.cpp
rename to Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp
index 89aaaab815f..b962921c334 100644
--- a/Framework/CurveFitting/src/ComptonPeakProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp
@@ -1,7 +1,7 @@
//-----------------------------------------------------------------------------
// Includes
//-----------------------------------------------------------------------------
-#include "MantidCurveFitting/ComptonPeakProfile.h"
+#include "MantidCurveFitting/Functions/ComptonPeakProfile.h"
#include "MantidCurveFitting/ConvertToYSpace.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/src/ComptonProfile.cpp b/Framework/CurveFitting/src/Functions/ComptonProfile.cpp
similarity index 99%
rename from Framework/CurveFitting/src/ComptonProfile.cpp
rename to Framework/CurveFitting/src/Functions/ComptonProfile.cpp
index b7d2ede6cb7..76b6430c0f6 100644
--- a/Framework/CurveFitting/src/ComptonProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/ComptonProfile.cpp
@@ -1,7 +1,7 @@
//-----------------------------------------------------------------------------
// Includes
//-----------------------------------------------------------------------------
-#include "MantidCurveFitting/ComptonProfile.h"
+#include "MantidCurveFitting/Functions/ComptonProfile.h"
#include "MantidCurveFitting/ConvertToYSpace.h"
#include "MantidAPI/FunctionFactory.h"
#include <gsl/gsl_poly.h>
diff --git a/Framework/CurveFitting/src/ComptonScatteringCountRate.cpp b/Framework/CurveFitting/src/Functions/ComptonScatteringCountRate.cpp
similarity index 99%
rename from Framework/CurveFitting/src/ComptonScatteringCountRate.cpp
rename to Framework/CurveFitting/src/Functions/ComptonScatteringCountRate.cpp
index 67051c8d316..95b90772a47 100644
--- a/Framework/CurveFitting/src/ComptonScatteringCountRate.cpp
+++ b/Framework/CurveFitting/src/Functions/ComptonScatteringCountRate.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/ComptonScatteringCountRate.h"
+#include "MantidCurveFitting/Functions/ComptonScatteringCountRate.h"
#include "MantidCurveFitting/AugmentedLagrangianOptimizer.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/Framework/CurveFitting/src/Convolution.cpp b/Framework/CurveFitting/src/Functions/Convolution.cpp
similarity index 98%
rename from Framework/CurveFitting/src/Convolution.cpp
rename to Framework/CurveFitting/src/Functions/Convolution.cpp
index db1f62ad49f..44bc7671df7 100644
--- a/Framework/CurveFitting/src/Convolution.cpp
+++ b/Framework/CurveFitting/src/Functions/Convolution.cpp
@@ -1,8 +1,8 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/Convolution.h"
-#include "MantidCurveFitting/DeltaFunction.h"
+#include "MantidCurveFitting/Functions/Convolution.h"
+#include "MantidCurveFitting/Functions/DeltaFunction.h"
#include "MantidAPI/IFunction1D.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/src/CubicSpline.cpp b/Framework/CurveFitting/src/Functions/CubicSpline.cpp
similarity index 99%
rename from Framework/CurveFitting/src/CubicSpline.cpp
rename to Framework/CurveFitting/src/Functions/CubicSpline.cpp
index 6b0d2815989..6bebe00be5b 100644
--- a/Framework/CurveFitting/src/CubicSpline.cpp
+++ b/Framework/CurveFitting/src/Functions/CubicSpline.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/CubicSpline.h"
+#include "MantidCurveFitting/Functions/CubicSpline.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidKernel/Logger.h"
diff --git a/Framework/CurveFitting/src/DeltaFunction.cpp b/Framework/CurveFitting/src/Functions/DeltaFunction.cpp
similarity index 94%
rename from Framework/CurveFitting/src/DeltaFunction.cpp
rename to Framework/CurveFitting/src/Functions/DeltaFunction.cpp
index 883e0ed5428..e013742ad1b 100644
--- a/Framework/CurveFitting/src/DeltaFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/DeltaFunction.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/DeltaFunction.h"
+#include "MantidCurveFitting/Functions/DeltaFunction.h"
#include "MantidAPI/FunctionFactory.h"
#include <algorithm>
diff --git a/Framework/CurveFitting/src/DiffRotDiscreteCircle.cpp b/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp
similarity index 99%
rename from Framework/CurveFitting/src/DiffRotDiscreteCircle.cpp
rename to Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp
index ceb07007e26..bc59c8dae98 100644
--- a/Framework/CurveFitting/src/DiffRotDiscreteCircle.cpp
+++ b/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/DiffRotDiscreteCircle.h"
+#include "MantidCurveFitting/Functions/DiffRotDiscreteCircle.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/Framework/CurveFitting/src/DiffSphere.cpp b/Framework/CurveFitting/src/Functions/DiffSphere.cpp
similarity index 99%
rename from Framework/CurveFitting/src/DiffSphere.cpp
rename to Framework/CurveFitting/src/Functions/DiffSphere.cpp
index bf7d4a80309..d32d35172d6 100644
--- a/Framework/CurveFitting/src/DiffSphere.cpp
+++ b/Framework/CurveFitting/src/Functions/DiffSphere.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/DiffSphere.h"
+#include "MantidCurveFitting/Functions/DiffSphere.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/Framework/CurveFitting/src/DynamicKuboToyabe.cpp b/Framework/CurveFitting/src/Functions/DynamicKuboToyabe.cpp
similarity index 99%
rename from Framework/CurveFitting/src/DynamicKuboToyabe.cpp
rename to Framework/CurveFitting/src/Functions/DynamicKuboToyabe.cpp
index e62d0ba82c4..4db28775ba8 100644
--- a/Framework/CurveFitting/src/DynamicKuboToyabe.cpp
+++ b/Framework/CurveFitting/src/Functions/DynamicKuboToyabe.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/DynamicKuboToyabe.h"
+#include "MantidCurveFitting/Functions/DynamicKuboToyabe.h"
#include "MantidAPI/Jacobian.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/Framework/CurveFitting/src/EndErfc.cpp b/Framework/CurveFitting/src/Functions/EndErfc.cpp
similarity index 96%
rename from Framework/CurveFitting/src/EndErfc.cpp
rename to Framework/CurveFitting/src/Functions/EndErfc.cpp
index 7d5de37a67d..801c1a7ec12 100644
--- a/Framework/CurveFitting/src/EndErfc.cpp
+++ b/Framework/CurveFitting/src/Functions/EndErfc.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/EndErfc.h"
+#include "MantidCurveFitting/Functions/EndErfc.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
#include <gsl/gsl_sf_erf.h>
diff --git a/Framework/CurveFitting/src/ExpDecay.cpp b/Framework/CurveFitting/src/Functions/ExpDecay.cpp
similarity index 95%
rename from Framework/CurveFitting/src/ExpDecay.cpp
rename to Framework/CurveFitting/src/Functions/ExpDecay.cpp
index c5d92311a04..347d9dbf0ec 100644
--- a/Framework/CurveFitting/src/ExpDecay.cpp
+++ b/Framework/CurveFitting/src/Functions/ExpDecay.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/ExpDecay.h"
+#include "MantidCurveFitting/Functions/ExpDecay.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/ExpDecayMuon.cpp b/Framework/CurveFitting/src/Functions/ExpDecayMuon.cpp
similarity index 95%
rename from Framework/CurveFitting/src/ExpDecayMuon.cpp
rename to Framework/CurveFitting/src/Functions/ExpDecayMuon.cpp
index 2f0867e8c10..3c30d5b5480 100644
--- a/Framework/CurveFitting/src/ExpDecayMuon.cpp
+++ b/Framework/CurveFitting/src/Functions/ExpDecayMuon.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/ExpDecayMuon.h"
+#include "MantidCurveFitting/Functions/ExpDecayMuon.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/ExpDecayOsc.cpp b/Framework/CurveFitting/src/Functions/ExpDecayOsc.cpp
similarity index 97%
rename from Framework/CurveFitting/src/ExpDecayOsc.cpp
rename to Framework/CurveFitting/src/Functions/ExpDecayOsc.cpp
index f3d677feee5..c07e5cf5a98 100644
--- a/Framework/CurveFitting/src/ExpDecayOsc.cpp
+++ b/Framework/CurveFitting/src/Functions/ExpDecayOsc.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/ExpDecayOsc.h"
+#include "MantidCurveFitting/Functions/ExpDecayOsc.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/FlatBackground.cpp b/Framework/CurveFitting/src/Functions/FlatBackground.cpp
similarity index 96%
rename from Framework/CurveFitting/src/FlatBackground.cpp
rename to Framework/CurveFitting/src/Functions/FlatBackground.cpp
index d1fc5c08ad6..88554b4808a 100644
--- a/Framework/CurveFitting/src/FlatBackground.cpp
+++ b/Framework/CurveFitting/src/Functions/FlatBackground.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/FlatBackground.h"
+#include "MantidCurveFitting/Functions/FlatBackground.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidKernel/System.h"
diff --git a/Framework/CurveFitting/src/FullprofPolynomial.cpp b/Framework/CurveFitting/src/Functions/FullprofPolynomial.cpp
similarity index 98%
rename from Framework/CurveFitting/src/FullprofPolynomial.cpp
rename to Framework/CurveFitting/src/Functions/FullprofPolynomial.cpp
index c11007ea6c0..9affef7717a 100644
--- a/Framework/CurveFitting/src/FullprofPolynomial.cpp
+++ b/Framework/CurveFitting/src/Functions/FullprofPolynomial.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/FullprofPolynomial.h"
+#include "MantidCurveFitting/Functions/FullprofPolynomial.h"
#include "MantidAPI/FunctionFactory.h"
#include <boost/lexical_cast.hpp>
diff --git a/Framework/CurveFitting/src/GausDecay.cpp b/Framework/CurveFitting/src/Functions/GausDecay.cpp
similarity index 96%
rename from Framework/CurveFitting/src/GausDecay.cpp
rename to Framework/CurveFitting/src/Functions/GausDecay.cpp
index 1497dbd6af7..b613b01b8e5 100644
--- a/Framework/CurveFitting/src/GausDecay.cpp
+++ b/Framework/CurveFitting/src/Functions/GausDecay.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/GausDecay.h"
+#include "MantidCurveFitting/Functions/GausDecay.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/GausOsc.cpp b/Framework/CurveFitting/src/Functions/GausOsc.cpp
similarity index 97%
rename from Framework/CurveFitting/src/GausOsc.cpp
rename to Framework/CurveFitting/src/Functions/GausOsc.cpp
index fbf341f190a..cf33e02685c 100644
--- a/Framework/CurveFitting/src/GausOsc.cpp
+++ b/Framework/CurveFitting/src/Functions/GausOsc.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/GausOsc.h"
+#include "MantidCurveFitting/Functions/GausOsc.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/Gaussian.cpp b/Framework/CurveFitting/src/Functions/Gaussian.cpp
similarity index 97%
rename from Framework/CurveFitting/src/Gaussian.cpp
rename to Framework/CurveFitting/src/Functions/Gaussian.cpp
index 886d31e3f3e..fb22ec25051 100644
--- a/Framework/CurveFitting/src/Gaussian.cpp
+++ b/Framework/CurveFitting/src/Functions/Gaussian.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/Gaussian.h"
+#include "MantidCurveFitting/Functions/Gaussian.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/GaussianComptonProfile.cpp b/Framework/CurveFitting/src/Functions/GaussianComptonProfile.cpp
similarity index 98%
rename from Framework/CurveFitting/src/GaussianComptonProfile.cpp
rename to Framework/CurveFitting/src/Functions/GaussianComptonProfile.cpp
index 3cc941c9964..c9ceb919986 100644
--- a/Framework/CurveFitting/src/GaussianComptonProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/GaussianComptonProfile.cpp
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------------------------
-#include "MantidCurveFitting/GaussianComptonProfile.h"
+#include "MantidCurveFitting/Functions/GaussianComptonProfile.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/GramCharlierComptonProfile.cpp b/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp
similarity index 99%
rename from Framework/CurveFitting/src/GramCharlierComptonProfile.cpp
rename to Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp
index 7003021e27e..7f732cb1c7c 100644
--- a/Framework/CurveFitting/src/GramCharlierComptonProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------------------------
-#include "MantidCurveFitting/GramCharlierComptonProfile.h"
+#include "MantidCurveFitting/Functions/GramCharlierComptonProfile.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidKernel/Math/Distributions/HermitePolynomials.h"
diff --git a/Framework/CurveFitting/src/IkedaCarpenterPV.cpp b/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
similarity index 99%
rename from Framework/CurveFitting/src/IkedaCarpenterPV.cpp
rename to Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
index 527a9c39698..1b113570fcc 100644
--- a/Framework/CurveFitting/src/IkedaCarpenterPV.cpp
+++ b/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/IkedaCarpenterPV.h"
+#include "MantidCurveFitting/Functions/IkedaCarpenterPV.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/SpecialFunctionSupport.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/Framework/CurveFitting/src/LinearBackground.cpp b/Framework/CurveFitting/src/Functions/LinearBackground.cpp
similarity index 97%
rename from Framework/CurveFitting/src/LinearBackground.cpp
rename to Framework/CurveFitting/src/Functions/LinearBackground.cpp
index 5961d95a20e..1daef05e516 100644
--- a/Framework/CurveFitting/src/LinearBackground.cpp
+++ b/Framework/CurveFitting/src/Functions/LinearBackground.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidAPI/FunctionFactory.h"
namespace Mantid {
diff --git a/Framework/CurveFitting/src/LogNormal.cpp b/Framework/CurveFitting/src/Functions/LogNormal.cpp
similarity index 97%
rename from Framework/CurveFitting/src/LogNormal.cpp
rename to Framework/CurveFitting/src/Functions/LogNormal.cpp
index e7cba5f58ea..114011372a9 100644
--- a/Framework/CurveFitting/src/LogNormal.cpp
+++ b/Framework/CurveFitting/src/Functions/LogNormal.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/LogNormal.h"
+#include "MantidCurveFitting/Functions/LogNormal.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/Lorentzian.cpp b/Framework/CurveFitting/src/Functions/Lorentzian.cpp
similarity index 97%
rename from Framework/CurveFitting/src/Lorentzian.cpp
rename to Framework/CurveFitting/src/Functions/Lorentzian.cpp
index 8d58c9a3915..b11e875601a 100644
--- a/Framework/CurveFitting/src/Lorentzian.cpp
+++ b/Framework/CurveFitting/src/Functions/Lorentzian.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/Lorentzian.h"
+#include "MantidCurveFitting/Functions/Lorentzian.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/Lorentzian1D.cpp b/Framework/CurveFitting/src/Functions/Lorentzian1D.cpp
similarity index 97%
rename from Framework/CurveFitting/src/Lorentzian1D.cpp
rename to Framework/CurveFitting/src/Functions/Lorentzian1D.cpp
index 763d9a92ed1..e7771cf95a3 100644
--- a/Framework/CurveFitting/src/Lorentzian1D.cpp
+++ b/Framework/CurveFitting/src/Functions/Lorentzian1D.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/Lorentzian1D.h"
+#include "MantidCurveFitting/Functions/Lorentzian1D.h"
#include <gsl/gsl_sf_erf.h>
#include <gsl/gsl_multifit_nlin.h>
#include "MantidKernel/BoundedValidator.h"
diff --git a/Framework/CurveFitting/src/MuonFInteraction.cpp b/Framework/CurveFitting/src/Functions/MuonFInteraction.cpp
similarity index 95%
rename from Framework/CurveFitting/src/MuonFInteraction.cpp
rename to Framework/CurveFitting/src/Functions/MuonFInteraction.cpp
index a11f82c92ae..c06c3f4680a 100644
--- a/Framework/CurveFitting/src/MuonFInteraction.cpp
+++ b/Framework/CurveFitting/src/Functions/MuonFInteraction.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/MuonFInteraction.h"
+#include "MantidCurveFitting/Functions/MuonFInteraction.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/NeutronBk2BkExpConvPVoigt.cpp b/Framework/CurveFitting/src/Functions/NeutronBk2BkExpConvPVoigt.cpp
similarity index 99%
rename from Framework/CurveFitting/src/NeutronBk2BkExpConvPVoigt.cpp
rename to Framework/CurveFitting/src/Functions/NeutronBk2BkExpConvPVoigt.cpp
index 9f4d315690d..c3be6535033 100644
--- a/Framework/CurveFitting/src/NeutronBk2BkExpConvPVoigt.cpp
+++ b/Framework/CurveFitting/src/Functions/NeutronBk2BkExpConvPVoigt.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/NeutronBk2BkExpConvPVoigt.h"
+#include "MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/ParamFunction.h"
#include "MantidKernel/EmptyValues.h"
diff --git a/Framework/CurveFitting/src/PawleyFunction.cpp b/Framework/CurveFitting/src/Functions/PawleyFunction.cpp
similarity index 99%
rename from Framework/CurveFitting/src/PawleyFunction.cpp
rename to Framework/CurveFitting/src/Functions/PawleyFunction.cpp
index ab4c06fb473..1c5802a8729 100644
--- a/Framework/CurveFitting/src/PawleyFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/PawleyFunction.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/PawleyFunction.h"
+#include "MantidCurveFitting/Functions/PawleyFunction.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/Framework/CurveFitting/src/PeakParameterFunction.cpp b/Framework/CurveFitting/src/Functions/PeakParameterFunction.cpp
similarity index 96%
rename from Framework/CurveFitting/src/PeakParameterFunction.cpp
rename to Framework/CurveFitting/src/Functions/PeakParameterFunction.cpp
index 068e7d5440d..00080ec3333 100644
--- a/Framework/CurveFitting/src/PeakParameterFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/PeakParameterFunction.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/PeakParameterFunction.h"
+#include "MantidCurveFitting/Functions/PeakParameterFunction.h"
#include "MantidAPI/IPeakFunction.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/src/Polynomial.cpp b/Framework/CurveFitting/src/Functions/Polynomial.cpp
similarity index 98%
rename from Framework/CurveFitting/src/Polynomial.cpp
rename to Framework/CurveFitting/src/Functions/Polynomial.cpp
index d6b20c93df5..ac9cc3740cc 100644
--- a/Framework/CurveFitting/src/Polynomial.cpp
+++ b/Framework/CurveFitting/src/Functions/Polynomial.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/Polynomial.h"
+#include "MantidCurveFitting/Functions/Polynomial.h"
#include "MantidAPI/FunctionFactory.h"
#include <boost/lexical_cast.hpp>
diff --git a/Framework/CurveFitting/src/ProcessBackground.cpp b/Framework/CurveFitting/src/Functions/ProcessBackground.cpp
similarity index 99%
rename from Framework/CurveFitting/src/ProcessBackground.cpp
rename to Framework/CurveFitting/src/Functions/ProcessBackground.cpp
index d6bd7e43f1a..2e894fd37c6 100644
--- a/Framework/CurveFitting/src/ProcessBackground.cpp
+++ b/Framework/CurveFitting/src/Functions/ProcessBackground.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/ProcessBackground.h"
+#include "MantidCurveFitting/Functions/ProcessBackground.h"
#include "MantidAPI/WorkspaceProperty.h"
#include "MantidKernel/Property.h"
#include "MantidKernel/ListValidator.h"
@@ -6,8 +6,8 @@
#include "MantidKernel/VisibleWhenProperty.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidCurveFitting/Polynomial.h"
-#include "MantidCurveFitting/Chebyshev.h"
+#include "MantidCurveFitting/Functions/Polynomial.h"
+#include "MantidCurveFitting/Functions/Chebyshev.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidGeometry/Crystal/IPeak.h"
#include "MantidAPI/TableRow.h"
diff --git a/Framework/CurveFitting/src/ProductFunction.cpp b/Framework/CurveFitting/src/Functions/ProductFunction.cpp
similarity index 95%
rename from Framework/CurveFitting/src/ProductFunction.cpp
rename to Framework/CurveFitting/src/Functions/ProductFunction.cpp
index 91152ccf885..a0d1d2ca95d 100644
--- a/Framework/CurveFitting/src/ProductFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/ProductFunction.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/ProductFunction.h"
+#include "MantidCurveFitting/Functions/ProductFunction.h"
#include "MantidAPI/FunctionFactory.h"
namespace Mantid {
diff --git a/Framework/CurveFitting/src/ProductLinearExp.cpp b/Framework/CurveFitting/src/Functions/ProductLinearExp.cpp
similarity index 90%
rename from Framework/CurveFitting/src/ProductLinearExp.cpp
rename to Framework/CurveFitting/src/Functions/ProductLinearExp.cpp
index 58079f6a9cd..6f1a2e1ee8d 100644
--- a/Framework/CurveFitting/src/ProductLinearExp.cpp
+++ b/Framework/CurveFitting/src/Functions/ProductLinearExp.cpp
@@ -1,7 +1,7 @@
-#include "MantidCurveFitting/ProductLinearExp.h"
-#include "MantidCurveFitting/ExpDecay.h"
-#include "MantidCurveFitting/LinearBackground.h"
-#include "MantidCurveFitting/ProductFunction.h"
+#include "MantidCurveFitting/Functions/ProductLinearExp.h"
+#include "MantidCurveFitting/Functions/ExpDecay.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
+#include "MantidCurveFitting/Functions/ProductFunction.h"
#include "MantidAPI/FunctionFactory.h"
namespace Mantid {
diff --git a/Framework/CurveFitting/src/ProductQuadraticExp.cpp b/Framework/CurveFitting/src/Functions/ProductQuadraticExp.cpp
similarity index 91%
rename from Framework/CurveFitting/src/ProductQuadraticExp.cpp
rename to Framework/CurveFitting/src/Functions/ProductQuadraticExp.cpp
index 0d6dc24cd09..61f49e74edc 100644
--- a/Framework/CurveFitting/src/ProductQuadraticExp.cpp
+++ b/Framework/CurveFitting/src/Functions/ProductQuadraticExp.cpp
@@ -1,7 +1,7 @@
-#include "MantidCurveFitting/ProductQuadraticExp.h"
-#include "MantidCurveFitting/ExpDecay.h"
-#include "MantidCurveFitting/Quadratic.h"
-#include "MantidCurveFitting/ProductFunction.h"
+#include "MantidCurveFitting/Functions/ProductQuadraticExp.h"
+#include "MantidCurveFitting/Functions/ExpDecay.h"
+#include "MantidCurveFitting/Functions/Quadratic.h"
+#include "MantidCurveFitting/Functions/ProductFunction.h"
#include "MantidAPI/FunctionFactory.h"
namespace Mantid {
diff --git a/Framework/CurveFitting/src/PseudoVoigt.cpp b/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp
similarity index 98%
rename from Framework/CurveFitting/src/PseudoVoigt.cpp
rename to Framework/CurveFitting/src/Functions/PseudoVoigt.cpp
index a492df6add6..fb02af64e85 100644
--- a/Framework/CurveFitting/src/PseudoVoigt.cpp
+++ b/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/PseudoVoigt.h"
+#include "MantidCurveFitting/Functions/PseudoVoigt.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
diff --git a/Framework/CurveFitting/src/Quadratic.cpp b/Framework/CurveFitting/src/Functions/Quadratic.cpp
similarity index 97%
rename from Framework/CurveFitting/src/Quadratic.cpp
rename to Framework/CurveFitting/src/Functions/Quadratic.cpp
index 0b364ce4a23..c88e4e6b281 100644
--- a/Framework/CurveFitting/src/Quadratic.cpp
+++ b/Framework/CurveFitting/src/Functions/Quadratic.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/Quadratic.h"
+#include "MantidCurveFitting/Functions/Quadratic.h"
#include "MantidAPI/FunctionFactory.h"
namespace Mantid {
diff --git a/Framework/CurveFitting/src/ReflectivityMulf.cpp b/Framework/CurveFitting/src/Functions/ReflectivityMulf.cpp
similarity index 99%
rename from Framework/CurveFitting/src/ReflectivityMulf.cpp
rename to Framework/CurveFitting/src/Functions/ReflectivityMulf.cpp
index 17ab832f7de..60d4e51a903 100644
--- a/Framework/CurveFitting/src/ReflectivityMulf.cpp
+++ b/Framework/CurveFitting/src/Functions/ReflectivityMulf.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/ReflectivityMulf.h"
+#include "MantidCurveFitting/Functions/ReflectivityMulf.h"
#include "MantidAPI/FunctionFactory.h"
#include <boost/lexical_cast.hpp>
#include <cmath>
diff --git a/Framework/CurveFitting/src/Resolution.cpp b/Framework/CurveFitting/src/Functions/Resolution.cpp
similarity index 96%
rename from Framework/CurveFitting/src/Resolution.cpp
rename to Framework/CurveFitting/src/Functions/Resolution.cpp
index 75319dbcb07..906f5ccac05 100644
--- a/Framework/CurveFitting/src/Resolution.cpp
+++ b/Framework/CurveFitting/src/Functions/Resolution.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/Resolution.h"
+#include "MantidCurveFitting/Functions/Resolution.h"
#include "MantidAPI/FunctionFactory.h"
namespace Mantid {
diff --git a/Framework/CurveFitting/src/SimpleChebfun.cpp b/Framework/CurveFitting/src/Functions/SimpleChebfun.cpp
similarity index 98%
rename from Framework/CurveFitting/src/SimpleChebfun.cpp
rename to Framework/CurveFitting/src/Functions/SimpleChebfun.cpp
index 9416aaaae31..a765bf8b763 100644
--- a/Framework/CurveFitting/src/SimpleChebfun.cpp
+++ b/Framework/CurveFitting/src/Functions/SimpleChebfun.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/SimpleChebfun.h"
+#include "MantidCurveFitting/Functions/SimpleChebfun.h"
#include "MantidAPI/IFunction.h"
#include <boost/make_shared.hpp>
diff --git a/Framework/CurveFitting/src/StaticKuboToyabe.cpp b/Framework/CurveFitting/src/Functions/StaticKuboToyabe.cpp
similarity index 94%
rename from Framework/CurveFitting/src/StaticKuboToyabe.cpp
rename to Framework/CurveFitting/src/Functions/StaticKuboToyabe.cpp
index 6d96804846a..68ba9df35aa 100644
--- a/Framework/CurveFitting/src/StaticKuboToyabe.cpp
+++ b/Framework/CurveFitting/src/Functions/StaticKuboToyabe.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/StaticKuboToyabe.h"
+#include "MantidCurveFitting/Functions/StaticKuboToyabe.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/StaticKuboToyabeTimesExpDecay.cpp b/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesExpDecay.cpp
similarity index 93%
rename from Framework/CurveFitting/src/StaticKuboToyabeTimesExpDecay.cpp
rename to Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesExpDecay.cpp
index 8ee826d6dbc..616b8cb9ddb 100644
--- a/Framework/CurveFitting/src/StaticKuboToyabeTimesExpDecay.cpp
+++ b/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesExpDecay.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/StaticKuboToyabeTimesExpDecay.h"
+#include "MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/StaticKuboToyabeTimesGausDecay.cpp b/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesGausDecay.cpp
similarity index 94%
rename from Framework/CurveFitting/src/StaticKuboToyabeTimesGausDecay.cpp
rename to Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesGausDecay.cpp
index 50a84ee40c9..2259dcf03fb 100644
--- a/Framework/CurveFitting/src/StaticKuboToyabeTimesGausDecay.cpp
+++ b/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesGausDecay.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/StaticKuboToyabeTimesGausDecay.h"
+#include "MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/StretchExp.cpp b/Framework/CurveFitting/src/Functions/StretchExp.cpp
similarity index 97%
rename from Framework/CurveFitting/src/StretchExp.cpp
rename to Framework/CurveFitting/src/Functions/StretchExp.cpp
index 51064e2b85c..a5a14f74e8e 100644
--- a/Framework/CurveFitting/src/StretchExp.cpp
+++ b/Framework/CurveFitting/src/Functions/StretchExp.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/StretchExp.h"
+#include "MantidCurveFitting/Functions/StretchExp.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/StretchExpMuon.cpp b/Framework/CurveFitting/src/Functions/StretchExpMuon.cpp
similarity index 94%
rename from Framework/CurveFitting/src/StretchExpMuon.cpp
rename to Framework/CurveFitting/src/Functions/StretchExpMuon.cpp
index 3c14c8fead5..afad7082e43 100644
--- a/Framework/CurveFitting/src/StretchExpMuon.cpp
+++ b/Framework/CurveFitting/src/Functions/StretchExpMuon.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/StretchExpMuon.h"
+#include "MantidCurveFitting/Functions/StretchExpMuon.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
diff --git a/Framework/CurveFitting/src/TabulatedFunction.cpp b/Framework/CurveFitting/src/Functions/TabulatedFunction.cpp
similarity index 99%
rename from Framework/CurveFitting/src/TabulatedFunction.cpp
rename to Framework/CurveFitting/src/Functions/TabulatedFunction.cpp
index 10f9e8168a8..c5979f42c6e 100644
--- a/Framework/CurveFitting/src/TabulatedFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/TabulatedFunction.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/TabulatedFunction.h"
+#include "MantidCurveFitting/Functions/TabulatedFunction.h"
#include "MantidKernel/FileValidator.h"
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/src/ThermalNeutronBk2BkExpAlpha.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
similarity index 97%
rename from Framework/CurveFitting/src/ThermalNeutronBk2BkExpAlpha.cpp
rename to Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
index 9eff40af371..518c1f418a9 100644
--- a/Framework/CurveFitting/src/ThermalNeutronBk2BkExpAlpha.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/ThermalNeutronBk2BkExpAlpha.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h"
#include "MantidKernel/System.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/src/ThermalNeutronBk2BkExpBeta.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp
similarity index 97%
rename from Framework/CurveFitting/src/ThermalNeutronBk2BkExpBeta.cpp
rename to Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp
index ae117080359..95f5be7b8ad 100644
--- a/Framework/CurveFitting/src/ThermalNeutronBk2BkExpBeta.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/ThermalNeutronBk2BkExpBeta.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h"
#include "MantidKernel/System.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/src/ThermalNeutronBk2BkExpConvPVoigt.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpConvPVoigt.cpp
similarity index 99%
rename from Framework/CurveFitting/src/ThermalNeutronBk2BkExpConvPVoigt.cpp
rename to Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpConvPVoigt.cpp
index 521becfcc47..6ea3aef1db5 100644
--- a/Framework/CurveFitting/src/ThermalNeutronBk2BkExpConvPVoigt.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpConvPVoigt.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/ThermalNeutronBk2BkExpConvPVoigt.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/ParamFunction.h"
#include "MantidKernel/EmptyValues.h"
diff --git a/Framework/CurveFitting/src/ThermalNeutronBk2BkExpSigma.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp
similarity index 97%
rename from Framework/CurveFitting/src/ThermalNeutronBk2BkExpSigma.cpp
rename to Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp
index ed8f0af7b19..f6912678137 100644
--- a/Framework/CurveFitting/src/ThermalNeutronBk2BkExpSigma.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/ThermalNeutronBk2BkExpSigma.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h"
#include "MantidKernel/System.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/src/ThermalNeutronDtoTOFFunction.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp
similarity index 98%
rename from Framework/CurveFitting/src/ThermalNeutronDtoTOFFunction.cpp
rename to Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp
index 8566384197f..5bb0a8fe256 100644
--- a/Framework/CurveFitting/src/ThermalNeutronDtoTOFFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/ThermalNeutronDtoTOFFunction.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h"
#include "MantidKernel/System.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/FunctionDomain1D.h"
diff --git a/Framework/CurveFitting/src/UserFunction.cpp b/Framework/CurveFitting/src/Functions/UserFunction.cpp
similarity index 98%
rename from Framework/CurveFitting/src/UserFunction.cpp
rename to Framework/CurveFitting/src/Functions/UserFunction.cpp
index b367c452958..0b950a52005 100644
--- a/Framework/CurveFitting/src/UserFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/UserFunction.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/UserFunction.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidAPI/FunctionFactory.h"
#include <boost/tokenizer.hpp>
#include "MantidGeometry/muParser_Silent.h"
diff --git a/Framework/CurveFitting/src/UserFunction1D.cpp b/Framework/CurveFitting/src/Functions/UserFunction1D.cpp
similarity index 98%
rename from Framework/CurveFitting/src/UserFunction1D.cpp
rename to Framework/CurveFitting/src/Functions/UserFunction1D.cpp
index 5164c2322bb..b85eacaca42 100644
--- a/Framework/CurveFitting/src/UserFunction1D.cpp
+++ b/Framework/CurveFitting/src/Functions/UserFunction1D.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/UserFunction1D.h"
+#include "MantidCurveFitting/Functions/UserFunction1D.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidKernel/MandatoryValidator.h"
#include <boost/tokenizer.hpp>
diff --git a/Framework/CurveFitting/src/VesuvioResolution.cpp b/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp
similarity index 99%
rename from Framework/CurveFitting/src/VesuvioResolution.cpp
rename to Framework/CurveFitting/src/Functions/VesuvioResolution.cpp
index d850ed0f223..38d56c018b3 100644
--- a/Framework/CurveFitting/src/VesuvioResolution.cpp
+++ b/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp
@@ -1,7 +1,7 @@
//-----------------------------------------------------------------------------
// Includes
//-----------------------------------------------------------------------------
-#include "MantidCurveFitting/VesuvioResolution.h"
+#include "MantidCurveFitting/Functions/VesuvioResolution.h"
#include "MantidCurveFitting/ConvertToYSpace.h"
#include "MantidAPI/FunctionFactory.h"
#include <gsl/gsl_poly.h>
diff --git a/Framework/CurveFitting/src/Voigt.cpp b/Framework/CurveFitting/src/Functions/Voigt.cpp
similarity index 99%
rename from Framework/CurveFitting/src/Voigt.cpp
rename to Framework/CurveFitting/src/Functions/Voigt.cpp
index 9e006da4d31..497ba4e5b0d 100644
--- a/Framework/CurveFitting/src/Voigt.cpp
+++ b/Framework/CurveFitting/src/Functions/Voigt.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------------------------------
-#include "MantidCurveFitting/Voigt.h"
+#include "MantidCurveFitting/Functions/Voigt.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/src/LeBailFit.cpp b/Framework/CurveFitting/src/LeBailFit.cpp
index 0ea5ae09288..22e7a9340d1 100644
--- a/Framework/CurveFitting/src/LeBailFit.cpp
+++ b/Framework/CurveFitting/src/LeBailFit.cpp
@@ -12,7 +12,7 @@
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/ArrayProperty.h"
#include "MantidKernel/VisibleWhenProperty.h"
-#include "MantidCurveFitting/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
#include "MantidAPI/TextAxis.h"
#include <boost/algorithm/string.hpp>
diff --git a/Framework/CurveFitting/src/ParameterEstimator.cpp b/Framework/CurveFitting/src/ParameterEstimator.cpp
index b06ef9bf59e..620ea5d23a9 100644
--- a/Framework/CurveFitting/src/ParameterEstimator.cpp
+++ b/Framework/CurveFitting/src/ParameterEstimator.cpp
@@ -1,5 +1,5 @@
#include "MantidCurveFitting/ParameterEstimator.h"
-#include "MantidCurveFitting/SimpleChebfun.h"
+#include "MantidCurveFitting/Functions/SimpleChebfun.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
diff --git a/Framework/CurveFitting/src/PawleyFit.cpp b/Framework/CurveFitting/src/PawleyFit.cpp
index 19cfd18fd2c..df3c4cac6d3 100644
--- a/Framework/CurveFitting/src/PawleyFit.cpp
+++ b/Framework/CurveFitting/src/PawleyFit.cpp
@@ -1,7 +1,7 @@
#include "MantidCurveFitting/PawleyFit.h"
#include "MantidAPI/FunctionFactory.h"
-#include "MantidCurveFitting/PawleyFunction.h"
+#include "MantidCurveFitting/Functions/PawleyFunction.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
diff --git a/Framework/CurveFitting/test/BoundaryConstraintTest.h b/Framework/CurveFitting/test/BoundaryConstraintTest.h
index e23d1847af1..13ea3e32ac9 100644
--- a/Framework/CurveFitting/test/BoundaryConstraintTest.h
+++ b/Framework/CurveFitting/test/BoundaryConstraintTest.h
@@ -4,8 +4,8 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/BoundaryConstraint.h"
-#include "MantidCurveFitting/Gaussian.h"
-#include "MantidCurveFitting/Lorentzian.h"
+#include "MantidCurveFitting/Functions/Gaussian.h"
+#include "MantidCurveFitting/Functions/Lorentzian.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
diff --git a/Framework/CurveFitting/test/CompositeFunctionTest.h b/Framework/CurveFitting/test/CompositeFunctionTest.h
index 64171a8b229..0bd3491b34d 100644
--- a/Framework/CurveFitting/test/CompositeFunctionTest.h
+++ b/Framework/CurveFitting/test/CompositeFunctionTest.h
@@ -16,8 +16,8 @@
#include "MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h"
#include "MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
-#include "MantidCurveFitting/UserFunction.h"
-#include "MantidCurveFitting/ExpDecay.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
+#include "MantidCurveFitting/Functions/ExpDecay.h"
#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/GSLJacobian.h"
#include "MantidAPI/FunctionDomain1D.h"
diff --git a/Framework/CurveFitting/test/ConvolveWorkspacesTest.h b/Framework/CurveFitting/test/ConvolveWorkspacesTest.h
index 0e748fa7ad2..64d07f6281f 100644
--- a/Framework/CurveFitting/test/ConvolveWorkspacesTest.h
+++ b/Framework/CurveFitting/test/ConvolveWorkspacesTest.h
@@ -15,7 +15,7 @@
#include "MantidAPI/FunctionFactory.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidTestHelpers/FakeObjects.h"
-#include "MantidCurveFitting/Gaussian.h"
+#include "MantidCurveFitting/Functions/Gaussian.h"
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h b/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h
index e8975402aa1..52cb9a0ca9e 100644
--- a/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h
+++ b/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h
@@ -8,13 +8,13 @@
#include "MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h"
#include "MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
-#include "MantidCurveFitting/UserFunction.h"
-#include "MantidCurveFitting/ExpDecay.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
-#include "MantidCurveFitting/Gaussian.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
+#include "MantidCurveFitting/Functions/Gaussian.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
+#include "MantidCurveFitting/Functions/ExpDecay.h"
#include <gsl/gsl_blas.h>
#include <sstream>
diff --git a/Framework/CurveFitting/test/FitMWTest.h b/Framework/CurveFitting/test/FitMWTest.h
index 78782f80d06..db879700d70 100644
--- a/Framework/CurveFitting/test/FitMWTest.h
+++ b/Framework/CurveFitting/test/FitMWTest.h
@@ -6,12 +6,12 @@
#include "MantidCurveFitting/FitMW.h"
#include "MantidCurveFitting/Fit.h"
-#include "MantidCurveFitting/UserFunction.h"
-#include "MantidCurveFitting/ExpDecay.h"
#include "MantidCurveFitting/SeqDomain.h"
-#include "MantidCurveFitting/Convolution.h"
-#include "MantidCurveFitting/Gaussian.h"
-#include "MantidCurveFitting/Polynomial.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
+#include "MantidCurveFitting/Functions/ExpDecay.h"
+#include "MantidCurveFitting/Functions/Convolution.h"
+#include "MantidCurveFitting/Functions/Gaussian.h"
+#include "MantidCurveFitting/Functions/Polynomial.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidAPI/FrameworkManager.h"
diff --git a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
index 371e8ea25eb..64b486d611e 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
@@ -5,7 +5,7 @@
#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/FuncMinimizers/DampingMinimizer.h"
-#include "MantidCurveFitting/UserFunction.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
diff --git a/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
index 0ecece57b64..b91888386fd 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
@@ -8,7 +8,7 @@
#include "MantidCurveFitting/Fit.h"
#include "MantidAPI/AlgorithmManager.h"
-#include "MantidCurveFitting/ExpDecay.h"
+#include "MantidCurveFitting/Functions/ExpDecay.h"
#include "MantidKernel/PropertyManager.h"
#include "MantidTestHelpers/FakeObjects.h"
#include "MantidKernel/Exception.h"
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
index 3a72c2dc30a..1d0965e42d7 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
@@ -5,7 +5,7 @@
#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
-#include "MantidCurveFitting/UserFunction.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
index 9a7d43075b0..a2d9bd2d703 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
@@ -5,7 +5,7 @@
#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h"
-#include "MantidCurveFitting/UserFunction.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
diff --git a/Framework/CurveFitting/test/AbragamTest.h b/Framework/CurveFitting/test/Functions/AbragamTest.h
similarity index 97%
rename from Framework/CurveFitting/test/AbragamTest.h
rename to Framework/CurveFitting/test/Functions/AbragamTest.h
index 342eb7360e7..c6a79b99bcd 100644
--- a/Framework/CurveFitting/test/AbragamTest.h
+++ b/Framework/CurveFitting/test/Functions/AbragamTest.h
@@ -3,9 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/Abragam.h"
+#include "MantidCurveFitting/Functions/Abragam.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
diff --git a/Framework/CurveFitting/test/BSplineTest.h b/Framework/CurveFitting/test/Functions/BSplineTest.h
similarity index 99%
rename from Framework/CurveFitting/test/BSplineTest.h
rename to Framework/CurveFitting/test/Functions/BSplineTest.h
index 86dff2a6e0e..ddfadf88c44 100644
--- a/Framework/CurveFitting/test/BSplineTest.h
+++ b/Framework/CurveFitting/test/Functions/BSplineTest.h
@@ -1,8 +1,8 @@
#ifndef BSPLINETEST_H_
#define BSPLINETEST_H_
-#include "MantidCurveFitting/BSpline.h"
-#include "MantidCurveFitting/UserFunction.h"
+#include "MantidCurveFitting/Functions/BSpline.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidAPI/FunctionDomain1D.h"
diff --git a/Framework/CurveFitting/test/BackToBackExponentialTest.h b/Framework/CurveFitting/test/Functions/BackToBackExponentialTest.h
similarity index 98%
rename from Framework/CurveFitting/test/BackToBackExponentialTest.h
rename to Framework/CurveFitting/test/Functions/BackToBackExponentialTest.h
index bd30cef1e09..d11af404386 100644
--- a/Framework/CurveFitting/test/BackToBackExponentialTest.h
+++ b/Framework/CurveFitting/test/Functions/BackToBackExponentialTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/BackToBackExponential.h"
+#include "MantidCurveFitting/Functions/BackToBackExponential.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/BivariateNormalTest.h b/Framework/CurveFitting/test/Functions/BivariateNormalTest.h
similarity index 98%
rename from Framework/CurveFitting/test/BivariateNormalTest.h
rename to Framework/CurveFitting/test/Functions/BivariateNormalTest.h
index d3f8c5bd6c0..84db687f917 100644
--- a/Framework/CurveFitting/test/BivariateNormalTest.h
+++ b/Framework/CurveFitting/test/Functions/BivariateNormalTest.h
@@ -9,7 +9,7 @@
#define BIVARIATENORMALTEST_H_
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/BivariateNormal.h"
+#include "MantidCurveFitting/Functions/BivariateNormal.h"
#include "MantidKernel/Matrix.h"
#include "MantidAPI/Jacobian.h"
#include "MantidAPI/WorkspaceFactory.h"
diff --git a/Framework/CurveFitting/test/Bk2BkExpConvPVTest.h b/Framework/CurveFitting/test/Functions/Bk2BkExpConvPVTest.h
similarity index 99%
rename from Framework/CurveFitting/test/Bk2BkExpConvPVTest.h
rename to Framework/CurveFitting/test/Functions/Bk2BkExpConvPVTest.h
index 9897818fbc4..9e5ae1e9769 100644
--- a/Framework/CurveFitting/test/Bk2BkExpConvPVTest.h
+++ b/Framework/CurveFitting/test/Functions/Bk2BkExpConvPVTest.h
@@ -8,7 +8,7 @@
#include <iomanip>
#include <fstream>
-#include "MantidCurveFitting/Bk2BkExpConvPV.h"
+#include "MantidCurveFitting/Functions/Bk2BkExpConvPV.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/CurveFitting/test/ChebfunBaseTest.h b/Framework/CurveFitting/test/Functions/ChebfunBaseTest.h
similarity index 99%
rename from Framework/CurveFitting/test/ChebfunBaseTest.h
rename to Framework/CurveFitting/test/Functions/ChebfunBaseTest.h
index 0d2a8fb5fef..10be2886859 100644
--- a/Framework/CurveFitting/test/ChebfunBaseTest.h
+++ b/Framework/CurveFitting/test/Functions/ChebfunBaseTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ChebfunBase.h"
+#include "MantidCurveFitting/Functions/ChebfunBase.h"
#include <cmath>
using namespace Mantid;
diff --git a/Framework/CurveFitting/test/ChebyshevTest.h b/Framework/CurveFitting/test/Functions/ChebyshevTest.h
similarity index 98%
rename from Framework/CurveFitting/test/ChebyshevTest.h
rename to Framework/CurveFitting/test/Functions/ChebyshevTest.h
index 7cad35f6467..f592a086c69 100644
--- a/Framework/CurveFitting/test/ChebyshevTest.h
+++ b/Framework/CurveFitting/test/Functions/ChebyshevTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/Chebyshev.h"
+#include "MantidCurveFitting/Functions/Chebyshev.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/test/ComptonPeakProfileTest.h b/Framework/CurveFitting/test/Functions/ComptonPeakProfileTest.h
similarity index 97%
rename from Framework/CurveFitting/test/ComptonPeakProfileTest.h
rename to Framework/CurveFitting/test/Functions/ComptonPeakProfileTest.h
index b66b087aa80..398b75d37a3 100644
--- a/Framework/CurveFitting/test/ComptonPeakProfileTest.h
+++ b/Framework/CurveFitting/test/Functions/ComptonPeakProfileTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ComptonPeakProfile.h"
+#include "MantidCurveFitting/Functions/ComptonPeakProfile.h"
#include "ComptonProfileTestHelpers.h"
using Mantid::CurveFitting::ComptonPeakProfile;
diff --git a/Framework/CurveFitting/test/ComptonProfileTest.h b/Framework/CurveFitting/test/Functions/ComptonProfileTest.h
similarity index 97%
rename from Framework/CurveFitting/test/ComptonProfileTest.h
rename to Framework/CurveFitting/test/Functions/ComptonProfileTest.h
index f1a33b8d848..01f51224ec1 100644
--- a/Framework/CurveFitting/test/ComptonProfileTest.h
+++ b/Framework/CurveFitting/test/Functions/ComptonProfileTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ComptonProfile.h"
+#include "MantidCurveFitting/Functions/ComptonProfile.h"
#include <boost/make_shared.hpp>
using Mantid::CurveFitting::ComptonProfile;
diff --git a/Framework/CurveFitting/test/ComptonProfileTestHelpers.h b/Framework/CurveFitting/test/Functions/ComptonProfileTestHelpers.h
similarity index 100%
rename from Framework/CurveFitting/test/ComptonProfileTestHelpers.h
rename to Framework/CurveFitting/test/Functions/ComptonProfileTestHelpers.h
diff --git a/Framework/CurveFitting/test/ComptonScatteringCountRateTest.h b/Framework/CurveFitting/test/Functions/ComptonScatteringCountRateTest.h
similarity index 99%
rename from Framework/CurveFitting/test/ComptonScatteringCountRateTest.h
rename to Framework/CurveFitting/test/Functions/ComptonScatteringCountRateTest.h
index 714776b1bef..90b4cdd680b 100644
--- a/Framework/CurveFitting/test/ComptonScatteringCountRateTest.h
+++ b/Framework/CurveFitting/test/Functions/ComptonScatteringCountRateTest.h
@@ -2,7 +2,7 @@
#define MANTID_CURVEFITTING_COMPTONSCATTERINGCOUNTRATETEST_H_
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ComptonScatteringCountRate.h"
+#include "MantidCurveFitting/Functions/ComptonScatteringCountRate.h"
#include "ComptonProfileTestHelpers.h"
class ComptonScatteringCountRateTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/ConvolutionTest.h b/Framework/CurveFitting/test/Functions/ConvolutionTest.h
similarity index 99%
rename from Framework/CurveFitting/test/ConvolutionTest.h
rename to Framework/CurveFitting/test/Functions/ConvolutionTest.h
index 222e8768956..5f60380b79e 100644
--- a/Framework/CurveFitting/test/ConvolutionTest.h
+++ b/Framework/CurveFitting/test/Functions/ConvolutionTest.h
@@ -5,7 +5,7 @@
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/AnalysisDataService.h"
-#include "MantidCurveFitting/Convolution.h"
+#include "MantidCurveFitting/Functions/Convolution.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidDataObjects/TableWorkspace.h"
diff --git a/Framework/CurveFitting/test/CubicSplineTest.h b/Framework/CurveFitting/test/Functions/CubicSplineTest.h
similarity index 99%
rename from Framework/CurveFitting/test/CubicSplineTest.h
rename to Framework/CurveFitting/test/Functions/CubicSplineTest.h
index 4412cd13f5e..d681ef0056b 100644
--- a/Framework/CurveFitting/test/CubicSplineTest.h
+++ b/Framework/CurveFitting/test/Functions/CubicSplineTest.h
@@ -6,7 +6,7 @@
#include <cxxtest/TestSuite.h>
#include <iostream>
-#include "MantidCurveFitting/CubicSpline.h"
+#include "MantidCurveFitting/Functions/CubicSpline.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/test/DeltaFunctionTest.h b/Framework/CurveFitting/test/Functions/DeltaFunctionTest.h
similarity index 97%
rename from Framework/CurveFitting/test/DeltaFunctionTest.h
rename to Framework/CurveFitting/test/Functions/DeltaFunctionTest.h
index d6ff22def11..d0efefab9e9 100644
--- a/Framework/CurveFitting/test/DeltaFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/DeltaFunctionTest.h
@@ -4,8 +4,8 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/Fit.h"
-#include "MantidCurveFitting/DeltaFunction.h"
-#include "MantidCurveFitting/Convolution.h"
+#include "MantidCurveFitting/Functions/DeltaFunction.h"
+#include "MantidCurveFitting/Functions/Convolution.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/DiffRotDiscreteCircleTest.h b/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h
similarity index 99%
rename from Framework/CurveFitting/test/DiffRotDiscreteCircleTest.h
rename to Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h
index b6ffb6e4c0f..020cc1b3383 100644
--- a/Framework/CurveFitting/test/DiffRotDiscreteCircleTest.h
+++ b/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h
@@ -3,9 +3,9 @@
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/AlgorithmFactory.h"
-#include "MantidCurveFitting/Convolution.h"
-#include "MantidCurveFitting/DiffRotDiscreteCircle.h"
-#include "MantidCurveFitting/Gaussian.h"
+#include "MantidCurveFitting/Functions/Convolution.h"
+#include "MantidCurveFitting/Functions/DiffRotDiscreteCircle.h"
+#include "MantidCurveFitting/Functions/Gaussian.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidGeometry/Instrument/ReferenceFrame.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
diff --git a/Framework/CurveFitting/test/DiffSphereTest.h b/Framework/CurveFitting/test/Functions/DiffSphereTest.h
similarity index 99%
rename from Framework/CurveFitting/test/DiffSphereTest.h
rename to Framework/CurveFitting/test/Functions/DiffSphereTest.h
index 45ef43ca107..bb83296f5b2 100644
--- a/Framework/CurveFitting/test/DiffSphereTest.h
+++ b/Framework/CurveFitting/test/Functions/DiffSphereTest.h
@@ -11,9 +11,9 @@
// Include local copy of Valgrind header to avoid creating a dependency
#include "valgrind.h"
-#include "MantidCurveFitting/DiffSphere.h"
-#include "MantidCurveFitting/Gaussian.h"
-#include "MantidCurveFitting/Convolution.h"
+#include "MantidCurveFitting/Functions/DiffSphere.h"
+#include "MantidCurveFitting/Functions/Gaussian.h"
+#include "MantidCurveFitting/Functions/Convolution.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/test/DynamicKuboToyabeTest.h b/Framework/CurveFitting/test/Functions/DynamicKuboToyabeTest.h
similarity index 97%
rename from Framework/CurveFitting/test/DynamicKuboToyabeTest.h
rename to Framework/CurveFitting/test/Functions/DynamicKuboToyabeTest.h
index cb987b5fc70..6bd094b15fd 100644
--- a/Framework/CurveFitting/test/DynamicKuboToyabeTest.h
+++ b/Framework/CurveFitting/test/Functions/DynamicKuboToyabeTest.h
@@ -3,8 +3,8 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/DynamicKuboToyabe.h"
-#include "MantidCurveFitting/StaticKuboToyabe.h"
+#include "MantidCurveFitting/Functions/DynamicKuboToyabe.h"
+#include "MantidCurveFitting/Functions/StaticKuboToyabe.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/EndErfcTest.h b/Framework/CurveFitting/test/Functions/EndErfcTest.h
similarity index 96%
rename from Framework/CurveFitting/test/EndErfcTest.h
rename to Framework/CurveFitting/test/Functions/EndErfcTest.h
index 8e2ba2f3485..41fc838ee98 100644
--- a/Framework/CurveFitting/test/EndErfcTest.h
+++ b/Framework/CurveFitting/test/Functions/EndErfcTest.h
@@ -3,9 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/EndErfc.h"
+#include "MantidCurveFitting/Functions/EndErfc.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/CurveFitting/test/ExpDecayMuonTest.h b/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h
similarity index 96%
rename from Framework/CurveFitting/test/ExpDecayMuonTest.h
rename to Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h
index bf17e5d9a77..4115baab642 100644
--- a/Framework/CurveFitting/test/ExpDecayMuonTest.h
+++ b/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h
@@ -3,9 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ExpDecayMuon.h"
+#include "MantidCurveFitting/Functions/ExpDecayMuon.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/CurveFitting/test/ExpDecayOscTest.h b/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h
similarity index 98%
rename from Framework/CurveFitting/test/ExpDecayOscTest.h
rename to Framework/CurveFitting/test/Functions/ExpDecayOscTest.h
index 865c28d2c1c..2f3c6868d17 100644
--- a/Framework/CurveFitting/test/ExpDecayOscTest.h
+++ b/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include <cmath>
-#include "MantidCurveFitting/ExpDecayOsc.h"
+#include "MantidCurveFitting/Functions/ExpDecayOsc.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/CurveFitting/test/ExpDecayTest.h b/Framework/CurveFitting/test/Functions/ExpDecayTest.h
similarity index 96%
rename from Framework/CurveFitting/test/ExpDecayTest.h
rename to Framework/CurveFitting/test/Functions/ExpDecayTest.h
index fbfa2c5a556..ea35ec12b3c 100644
--- a/Framework/CurveFitting/test/ExpDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/ExpDecayTest.h
@@ -3,9 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ExpDecay.h"
+#include "MantidCurveFitting/Functions/ExpDecay.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
diff --git a/Framework/CurveFitting/test/FlatBackgroundTest.h b/Framework/CurveFitting/test/Functions/FlatBackgroundTest.h
similarity index 96%
rename from Framework/CurveFitting/test/FlatBackgroundTest.h
rename to Framework/CurveFitting/test/Functions/FlatBackgroundTest.h
index a93d1a37924..e9a0cda11e4 100644
--- a/Framework/CurveFitting/test/FlatBackgroundTest.h
+++ b/Framework/CurveFitting/test/Functions/FlatBackgroundTest.h
@@ -7,7 +7,7 @@
#include <iostream>
#include <iomanip>
-#include "MantidCurveFitting/FlatBackground.h"
+#include "MantidCurveFitting/Functions/FlatBackground.h"
using namespace Mantid;
using namespace Mantid::CurveFitting;
diff --git a/Framework/CurveFitting/test/FullprofPolynomialTest.h b/Framework/CurveFitting/test/Functions/FullprofPolynomialTest.h
similarity index 98%
rename from Framework/CurveFitting/test/FullprofPolynomialTest.h
rename to Framework/CurveFitting/test/Functions/FullprofPolynomialTest.h
index 2ecf9c6d841..2b4a19bf252 100644
--- a/Framework/CurveFitting/test/FullprofPolynomialTest.h
+++ b/Framework/CurveFitting/test/Functions/FullprofPolynomialTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/FullprofPolynomial.h"
+#include "MantidCurveFitting/Functions/FullprofPolynomial.h"
#include "MantidAPI/IFunction.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidCurveFitting/Fit.h"
diff --git a/Framework/CurveFitting/test/GausDecayTest.h b/Framework/CurveFitting/test/Functions/GausDecayTest.h
similarity index 96%
rename from Framework/CurveFitting/test/GausDecayTest.h
rename to Framework/CurveFitting/test/Functions/GausDecayTest.h
index d3a087a5a04..bab41f5fed0 100644
--- a/Framework/CurveFitting/test/GausDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/GausDecayTest.h
@@ -3,9 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/GausDecay.h"
+#include "MantidCurveFitting/Functions/GausDecay.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
diff --git a/Framework/CurveFitting/test/GausOscTest.h b/Framework/CurveFitting/test/Functions/GausOscTest.h
similarity index 97%
rename from Framework/CurveFitting/test/GausOscTest.h
rename to Framework/CurveFitting/test/Functions/GausOscTest.h
index 434cf9ba475..ba89e9f470b 100644
--- a/Framework/CurveFitting/test/GausOscTest.h
+++ b/Framework/CurveFitting/test/Functions/GausOscTest.h
@@ -4,9 +4,9 @@
#include <cxxtest/TestSuite.h>
#include <cmath>
-#include "MantidCurveFitting/GausOsc.h"
+#include "MantidCurveFitting/Functions/GausOsc.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
diff --git a/Framework/CurveFitting/test/GaussianComptonProfileTest.h b/Framework/CurveFitting/test/Functions/GaussianComptonProfileTest.h
similarity index 98%
rename from Framework/CurveFitting/test/GaussianComptonProfileTest.h
rename to Framework/CurveFitting/test/Functions/GaussianComptonProfileTest.h
index 546dd4a9de2..36d1f43bfb2 100644
--- a/Framework/CurveFitting/test/GaussianComptonProfileTest.h
+++ b/Framework/CurveFitting/test/Functions/GaussianComptonProfileTest.h
@@ -2,7 +2,7 @@
#define MANTID_CURVEFITTING_GAUSSIANCOMPTONPROFILETEST_H_
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/GaussianComptonProfile.h"
+#include "MantidCurveFitting/Functions/GaussianComptonProfile.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "ComptonProfileTestHelpers.h"
diff --git a/Framework/CurveFitting/test/GaussianTest.h b/Framework/CurveFitting/test/Functions/GaussianTest.h
similarity index 99%
rename from Framework/CurveFitting/test/GaussianTest.h
rename to Framework/CurveFitting/test/Functions/GaussianTest.h
index 5ccebfd79b5..340f45c64e0 100644
--- a/Framework/CurveFitting/test/GaussianTest.h
+++ b/Framework/CurveFitting/test/Functions/GaussianTest.h
@@ -3,10 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/Gaussian.h"
+#include "MantidCurveFitting/Functions/Gaussian.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
@@ -24,7 +23,8 @@
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
-#include "MantidCurveFitting/UserFunction.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
using namespace Mantid;
diff --git a/Framework/CurveFitting/test/GramCharlierComptonProfileTest.h b/Framework/CurveFitting/test/Functions/GramCharlierComptonProfileTest.h
similarity index 98%
rename from Framework/CurveFitting/test/GramCharlierComptonProfileTest.h
rename to Framework/CurveFitting/test/Functions/GramCharlierComptonProfileTest.h
index 8220bfd74ed..f052a583111 100644
--- a/Framework/CurveFitting/test/GramCharlierComptonProfileTest.h
+++ b/Framework/CurveFitting/test/Functions/GramCharlierComptonProfileTest.h
@@ -2,7 +2,7 @@
#define MANTID_CURVEFITTING_GRAMCHARLIERCOMPTONPROFILETEST_H_
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/GramCharlierComptonProfile.h"
+#include "MantidCurveFitting/Functions/GramCharlierComptonProfile.h"
#include "ComptonProfileTestHelpers.h"
diff --git a/Framework/CurveFitting/test/IkedaCarpenterPVTest.h b/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
similarity index 99%
rename from Framework/CurveFitting/test/IkedaCarpenterPVTest.h
rename to Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
index 53cc7b2f7d9..ec14ed211ae 100644
--- a/Framework/CurveFitting/test/IkedaCarpenterPVTest.h
+++ b/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/IkedaCarpenterPV.h"
+#include "MantidCurveFitting/Functions/IkedaCarpenterPV.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/ConfigService.h"
diff --git a/Framework/CurveFitting/test/LinearBackgroundTest.h b/Framework/CurveFitting/test/Functions/LinearBackgroundTest.h
similarity index 97%
rename from Framework/CurveFitting/test/LinearBackgroundTest.h
rename to Framework/CurveFitting/test/Functions/LinearBackgroundTest.h
index f281f018e05..197fb3da4c7 100644
--- a/Framework/CurveFitting/test/LinearBackgroundTest.h
+++ b/Framework/CurveFitting/test/Functions/LinearBackgroundTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
diff --git a/Framework/CurveFitting/test/LogNormalTest.h b/Framework/CurveFitting/test/Functions/LogNormalTest.h
similarity index 97%
rename from Framework/CurveFitting/test/LogNormalTest.h
rename to Framework/CurveFitting/test/Functions/LogNormalTest.h
index b6ca2231c59..ceccef59837 100644
--- a/Framework/CurveFitting/test/LogNormalTest.h
+++ b/Framework/CurveFitting/test/Functions/LogNormalTest.h
@@ -3,9 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/LogNormal.h"
+#include "MantidCurveFitting/Functions/LogNormal.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
diff --git a/Framework/CurveFitting/test/Lorentzian1DTest.h b/Framework/CurveFitting/test/Functions/Lorentzian1DTest.h
similarity index 98%
rename from Framework/CurveFitting/test/Lorentzian1DTest.h
rename to Framework/CurveFitting/test/Functions/Lorentzian1DTest.h
index 10d4d940f17..5a64acaba28 100644
--- a/Framework/CurveFitting/test/Lorentzian1DTest.h
+++ b/Framework/CurveFitting/test/Functions/Lorentzian1DTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/Lorentzian1D.h"
+#include "MantidCurveFitting/Functions/Lorentzian1D.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
diff --git a/Framework/CurveFitting/test/LorentzianTest.h b/Framework/CurveFitting/test/Functions/LorentzianTest.h
similarity index 98%
rename from Framework/CurveFitting/test/LorentzianTest.h
rename to Framework/CurveFitting/test/Functions/LorentzianTest.h
index f4fa3ef83c7..b39995cd290 100644
--- a/Framework/CurveFitting/test/LorentzianTest.h
+++ b/Framework/CurveFitting/test/Functions/LorentzianTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/Lorentzian.h"
+#include "MantidCurveFitting/Functions/Lorentzian.h"
#include "MantidCurveFitting/Jacobian.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/MuonFInteractionTest.h b/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h
similarity index 96%
rename from Framework/CurveFitting/test/MuonFInteractionTest.h
rename to Framework/CurveFitting/test/Functions/MuonFInteractionTest.h
index b9b5b3b7d96..7688eeafd0c 100644
--- a/Framework/CurveFitting/test/MuonFInteractionTest.h
+++ b/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h
@@ -3,9 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/MuonFInteraction.h"
+#include "MantidCurveFitting/Functions/MuonFInteraction.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
diff --git a/Framework/CurveFitting/test/NeutronBk2BkExpConvPVoigtTest.h b/Framework/CurveFitting/test/Functions/NeutronBk2BkExpConvPVoigtTest.h
similarity index 99%
rename from Framework/CurveFitting/test/NeutronBk2BkExpConvPVoigtTest.h
rename to Framework/CurveFitting/test/Functions/NeutronBk2BkExpConvPVoigtTest.h
index 946ebe697dc..6744a31194b 100644
--- a/Framework/CurveFitting/test/NeutronBk2BkExpConvPVoigtTest.h
+++ b/Framework/CurveFitting/test/Functions/NeutronBk2BkExpConvPVoigtTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/NeutronBk2BkExpConvPVoigt.h"
+#include "MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h"
using namespace std;
using Mantid::CurveFitting::NeutronBk2BkExpConvPVoigt;
diff --git a/Framework/CurveFitting/test/PawleyFunctionTest.h b/Framework/CurveFitting/test/Functions/PawleyFunctionTest.h
similarity index 99%
rename from Framework/CurveFitting/test/PawleyFunctionTest.h
rename to Framework/CurveFitting/test/Functions/PawleyFunctionTest.h
index 141f4d008e4..52ca22849bb 100644
--- a/Framework/CurveFitting/test/PawleyFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/PawleyFunctionTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/PawleyFunction.h"
+#include "MantidCurveFitting/Functions/PawleyFunction.h"
#include "MantidGeometry/Crystal/PointGroup.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/test/PeakParameterFunctionTest.h b/Framework/CurveFitting/test/Functions/PeakParameterFunctionTest.h
similarity index 98%
rename from Framework/CurveFitting/test/PeakParameterFunctionTest.h
rename to Framework/CurveFitting/test/Functions/PeakParameterFunctionTest.h
index 4f5bb331730..607fea4a988 100644
--- a/Framework/CurveFitting/test/PeakParameterFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/PeakParameterFunctionTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/PeakParameterFunction.h"
+#include "MantidCurveFitting/Functions/PeakParameterFunction.h"
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/Framework/CurveFitting/test/PolynomialTest.h b/Framework/CurveFitting/test/Functions/PolynomialTest.h
similarity index 98%
rename from Framework/CurveFitting/test/PolynomialTest.h
rename to Framework/CurveFitting/test/Functions/PolynomialTest.h
index c33a5e18356..90f21e51acb 100644
--- a/Framework/CurveFitting/test/PolynomialTest.h
+++ b/Framework/CurveFitting/test/Functions/PolynomialTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/Polynomial.h"
+#include "MantidCurveFitting/Functions/Polynomial.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidCurveFitting/Fit.h"
diff --git a/Framework/CurveFitting/test/ProcessBackgroundTest.h b/Framework/CurveFitting/test/Functions/ProcessBackgroundTest.h
similarity index 99%
rename from Framework/CurveFitting/test/ProcessBackgroundTest.h
rename to Framework/CurveFitting/test/Functions/ProcessBackgroundTest.h
index 393ef4b2ceb..d5d9e4f6fe5 100644
--- a/Framework/CurveFitting/test/ProcessBackgroundTest.h
+++ b/Framework/CurveFitting/test/Functions/ProcessBackgroundTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ProcessBackground.h"
+#include "MantidCurveFitting/Functions/ProcessBackground.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidAPI/WorkspaceFactory.h"
diff --git a/Framework/CurveFitting/test/ProductFunctionTest.h b/Framework/CurveFitting/test/Functions/ProductFunctionTest.h
similarity index 98%
rename from Framework/CurveFitting/test/ProductFunctionTest.h
rename to Framework/CurveFitting/test/Functions/ProductFunctionTest.h
index 48cb11dc1fe..848753eee48 100644
--- a/Framework/CurveFitting/test/ProductFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/ProductFunctionTest.h
@@ -3,10 +3,10 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ProductFunction.h"
-#include "MantidCurveFitting/Fit.h"
-#include "MantidCurveFitting/Gaussian.h"
+#include "MantidCurveFitting/Functions/ProductFunction.h"
+#include "MantidCurveFitting/Functions/Gaussian.h"
#include "MantidCurveFitting/Jacobian.h"
+#include "MantidCurveFitting/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/CurveFitting/test/ProductLinearExpTest.h b/Framework/CurveFitting/test/Functions/ProductLinearExpTest.h
similarity index 97%
rename from Framework/CurveFitting/test/ProductLinearExpTest.h
rename to Framework/CurveFitting/test/Functions/ProductLinearExpTest.h
index 99cb313f5f6..c502f29c6d5 100644
--- a/Framework/CurveFitting/test/ProductLinearExpTest.h
+++ b/Framework/CurveFitting/test/Functions/ProductLinearExpTest.h
@@ -3,10 +3,10 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ProductLinearExp.h"
-#include "MantidCurveFitting/ExpDecay.h"
-#include "MantidCurveFitting/LinearBackground.h"
-#include "MantidCurveFitting/ProductFunction.h"
+#include "MantidCurveFitting/Functions/ProductLinearExp.h"
+#include "MantidCurveFitting/Functions/ExpDecay.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
+#include "MantidCurveFitting/Functions/ProductFunction.h"
#include "MantidCurveFitting/Jacobian.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/ProductQuadraticExpTest.h b/Framework/CurveFitting/test/Functions/ProductQuadraticExpTest.h
similarity index 97%
rename from Framework/CurveFitting/test/ProductQuadraticExpTest.h
rename to Framework/CurveFitting/test/Functions/ProductQuadraticExpTest.h
index 51604e1a486..972cda5ad9f 100644
--- a/Framework/CurveFitting/test/ProductQuadraticExpTest.h
+++ b/Framework/CurveFitting/test/Functions/ProductQuadraticExpTest.h
@@ -3,10 +3,10 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ProductQuadraticExp.h"
-#include "MantidCurveFitting/ExpDecay.h"
-#include "MantidCurveFitting/Quadratic.h"
-#include "MantidCurveFitting/ProductFunction.h"
+#include "MantidCurveFitting/Functions/ProductQuadraticExp.h"
+#include "MantidCurveFitting/Functions/ExpDecay.h"
+#include "MantidCurveFitting/Functions/Quadratic.h"
+#include "MantidCurveFitting/Functions/ProductFunction.h"
#include "MantidCurveFitting/Jacobian.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/PseudoVoigtTest.h b/Framework/CurveFitting/test/Functions/PseudoVoigtTest.h
similarity index 98%
rename from Framework/CurveFitting/test/PseudoVoigtTest.h
rename to Framework/CurveFitting/test/Functions/PseudoVoigtTest.h
index 53a4d256f16..30656398d96 100644
--- a/Framework/CurveFitting/test/PseudoVoigtTest.h
+++ b/Framework/CurveFitting/test/Functions/PseudoVoigtTest.h
@@ -3,13 +3,13 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/PseudoVoigt.h"
+#include "MantidCurveFitting/Functions/PseudoVoigt.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidCurveFitting/Jacobian.h"
#include <boost/make_shared.hpp>
-#include "MantidCurveFitting/Gaussian.h"
-#include "MantidCurveFitting/Lorentzian.h"
+#include "MantidCurveFitting/Functions/Gaussian.h"
+#include "MantidCurveFitting/Functions/Lorentzian.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/CurveFitting/test/QuadraticTest.h b/Framework/CurveFitting/test/Functions/QuadraticTest.h
similarity index 98%
rename from Framework/CurveFitting/test/QuadraticTest.h
rename to Framework/CurveFitting/test/Functions/QuadraticTest.h
index 110a2f079bb..bf7e6c4d83f 100644
--- a/Framework/CurveFitting/test/QuadraticTest.h
+++ b/Framework/CurveFitting/test/Functions/QuadraticTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/Quadratic.h"
+#include "MantidCurveFitting/Functions/Quadratic.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
diff --git a/Framework/CurveFitting/test/ReflectivityMulfTest.h b/Framework/CurveFitting/test/Functions/ReflectivityMulfTest.h
similarity index 97%
rename from Framework/CurveFitting/test/ReflectivityMulfTest.h
rename to Framework/CurveFitting/test/Functions/ReflectivityMulfTest.h
index 7c045ddccc3..0e472e116d3 100644
--- a/Framework/CurveFitting/test/ReflectivityMulfTest.h
+++ b/Framework/CurveFitting/test/Functions/ReflectivityMulfTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ReflectivityMulf.h"
+#include "MantidCurveFitting/Functions/ReflectivityMulf.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/ResolutionTest.h b/Framework/CurveFitting/test/Functions/ResolutionTest.h
similarity index 98%
rename from Framework/CurveFitting/test/ResolutionTest.h
rename to Framework/CurveFitting/test/Functions/ResolutionTest.h
index 5dfdd646bde..57cf71f3837 100644
--- a/Framework/CurveFitting/test/ResolutionTest.h
+++ b/Framework/CurveFitting/test/Functions/ResolutionTest.h
@@ -3,9 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/Resolution.h"
+#include "MantidCurveFitting/Functions/Resolution.h"
#include "MantidCurveFitting/Fit.h"
-#include "MantidCurveFitting/Convolution.h"
+#include "MantidCurveFitting/Functions/Convolution.h"
#include "MantidAPI/IPeakFunction.h"
#include "MantidAPI/FunctionFactory.h"
#include <Poco/File.h>
diff --git a/Framework/CurveFitting/test/SimpleChebfunTest.h b/Framework/CurveFitting/test/Functions/SimpleChebfunTest.h
similarity index 99%
rename from Framework/CurveFitting/test/SimpleChebfunTest.h
rename to Framework/CurveFitting/test/Functions/SimpleChebfunTest.h
index 7d13981bb55..989740403db 100644
--- a/Framework/CurveFitting/test/SimpleChebfunTest.h
+++ b/Framework/CurveFitting/test/Functions/SimpleChebfunTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/SimpleChebfun.h"
+#include "MantidCurveFitting/Functions/SimpleChebfun.h"
#include <cmath>
using namespace Mantid;
diff --git a/Framework/CurveFitting/test/StaticKuboToyabeTest.h b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h
similarity index 96%
rename from Framework/CurveFitting/test/StaticKuboToyabeTest.h
rename to Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h
index 6d188da076a..a15fc355e6b 100644
--- a/Framework/CurveFitting/test/StaticKuboToyabeTest.h
+++ b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h
@@ -3,9 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/StaticKuboToyabe.h"
+#include "MantidCurveFitting/Functions/StaticKuboToyabe.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
diff --git a/Framework/CurveFitting/test/StaticKuboToyabeTimesExpDecayTest.h b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesExpDecayTest.h
similarity index 98%
rename from Framework/CurveFitting/test/StaticKuboToyabeTimesExpDecayTest.h
rename to Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesExpDecayTest.h
index 1546f743eef..0a10d7031cc 100644
--- a/Framework/CurveFitting/test/StaticKuboToyabeTimesExpDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesExpDecayTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/StaticKuboToyabeTimesExpDecay.h"
+#include "MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/CurveFitting/test/StaticKuboToyabeTimesGausDecayTest.h b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesGausDecayTest.h
similarity index 98%
rename from Framework/CurveFitting/test/StaticKuboToyabeTimesGausDecayTest.h
rename to Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesGausDecayTest.h
index e49a1065582..b2109b9966d 100644
--- a/Framework/CurveFitting/test/StaticKuboToyabeTimesGausDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesGausDecayTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/StaticKuboToyabeTimesGausDecay.h"
+#include "MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/CurveFitting/test/StretchExpMuonTest.h b/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h
similarity index 97%
rename from Framework/CurveFitting/test/StretchExpMuonTest.h
rename to Framework/CurveFitting/test/Functions/StretchExpMuonTest.h
index dcf022becee..281f63c3d8e 100644
--- a/Framework/CurveFitting/test/StretchExpMuonTest.h
+++ b/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h
@@ -3,9 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/StretchExpMuon.h"
+#include "MantidCurveFitting/Functions/StretchExpMuon.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
diff --git a/Framework/CurveFitting/test/StretchExpTest.h b/Framework/CurveFitting/test/Functions/StretchExpTest.h
similarity index 97%
rename from Framework/CurveFitting/test/StretchExpTest.h
rename to Framework/CurveFitting/test/Functions/StretchExpTest.h
index 8ad7fbd1546..8d7aa08e822 100644
--- a/Framework/CurveFitting/test/StretchExpTest.h
+++ b/Framework/CurveFitting/test/Functions/StretchExpTest.h
@@ -3,9 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/StretchExp.h"
+#include "MantidCurveFitting/Functions/StretchExp.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/LinearBackground.h"
+#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
diff --git a/Framework/CurveFitting/test/TabulatedFunctionTest.h b/Framework/CurveFitting/test/Functions/TabulatedFunctionTest.h
similarity index 98%
rename from Framework/CurveFitting/test/TabulatedFunctionTest.h
rename to Framework/CurveFitting/test/Functions/TabulatedFunctionTest.h
index f243adc7765..f7cdd0c99f8 100644
--- a/Framework/CurveFitting/test/TabulatedFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/TabulatedFunctionTest.h
@@ -3,8 +3,8 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/TabulatedFunction.h"
-#include "MantidCurveFitting/UserFunction.h"
+#include "MantidCurveFitting/Functions/TabulatedFunction.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidCurveFitting/Jacobian.h"
#include "MantidAPI/FunctionDomain.h"
#include "MantidAPI/AlgorithmFactory.h"
diff --git a/Framework/CurveFitting/test/ThermalNeutronBk2BkExpAlphaTest.h b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpAlphaTest.h
similarity index 96%
rename from Framework/CurveFitting/test/ThermalNeutronBk2BkExpAlphaTest.h
rename to Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpAlphaTest.h
index 93179e74925..8abed0b7639 100644
--- a/Framework/CurveFitting/test/ThermalNeutronBk2BkExpAlphaTest.h
+++ b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpAlphaTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ThermalNeutronBk2BkExpAlpha.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h"
using namespace Mantid;
using Mantid::CurveFitting::ThermalNeutronBk2BkExpAlpha;
diff --git a/Framework/CurveFitting/test/ThermalNeutronBk2BkExpBetaTest.h b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpBetaTest.h
similarity index 96%
rename from Framework/CurveFitting/test/ThermalNeutronBk2BkExpBetaTest.h
rename to Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpBetaTest.h
index 226e9229d10..70888cb88a2 100644
--- a/Framework/CurveFitting/test/ThermalNeutronBk2BkExpBetaTest.h
+++ b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpBetaTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ThermalNeutronBk2BkExpBeta.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h"
using namespace Mantid;
using Mantid::CurveFitting::ThermalNeutronBk2BkExpBeta;
diff --git a/Framework/CurveFitting/test/ThermalNeutronBk2BkExpConvPVoigtTest.h b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpConvPVoigtTest.h
similarity index 99%
rename from Framework/CurveFitting/test/ThermalNeutronBk2BkExpConvPVoigtTest.h
rename to Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpConvPVoigtTest.h
index 4c4aaccc8a5..8ac3f4721a3 100644
--- a/Framework/CurveFitting/test/ThermalNeutronBk2BkExpConvPVoigtTest.h
+++ b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpConvPVoigtTest.h
@@ -6,7 +6,7 @@
#include <fstream>
#include <cmath>
-#include "MantidCurveFitting/ThermalNeutronBk2BkExpConvPVoigt.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h"
using namespace Mantid;
using namespace Kernel;
diff --git a/Framework/CurveFitting/test/ThermalNeutronBk2BkExpSigmaTest.h b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpSigmaTest.h
similarity index 96%
rename from Framework/CurveFitting/test/ThermalNeutronBk2BkExpSigmaTest.h
rename to Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpSigmaTest.h
index 3e861dafcbd..234882735dc 100644
--- a/Framework/CurveFitting/test/ThermalNeutronBk2BkExpSigmaTest.h
+++ b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpSigmaTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ThermalNeutronBk2BkExpSigma.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h"
using Mantid::CurveFitting::ThermalNeutronBk2BkExpSigma;
using namespace Mantid;
diff --git a/Framework/CurveFitting/test/ThermalNeutronDtoTOFFunctionTest.h b/Framework/CurveFitting/test/Functions/ThermalNeutronDtoTOFFunctionTest.h
similarity index 98%
rename from Framework/CurveFitting/test/ThermalNeutronDtoTOFFunctionTest.h
rename to Framework/CurveFitting/test/Functions/ThermalNeutronDtoTOFFunctionTest.h
index 991cb0884f5..1dc0ec71375 100644
--- a/Framework/CurveFitting/test/ThermalNeutronDtoTOFFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/ThermalNeutronDtoTOFFunctionTest.h
@@ -7,7 +7,7 @@
#include <math.h>
#include <fstream>
-#include "MantidCurveFitting/ThermalNeutronDtoTOFFunction.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/UserFunction1DTest.h b/Framework/CurveFitting/test/Functions/UserFunction1DTest.h
similarity index 98%
rename from Framework/CurveFitting/test/UserFunction1DTest.h
rename to Framework/CurveFitting/test/Functions/UserFunction1DTest.h
index 43abd49d3c9..3d89d4771ea 100644
--- a/Framework/CurveFitting/test/UserFunction1DTest.h
+++ b/Framework/CurveFitting/test/Functions/UserFunction1DTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/UserFunction1D.h"
+#include "MantidCurveFitting/Functions/UserFunction1D.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/FrameworkManager.h"
#include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/CurveFitting/test/UserFunctionTest.h b/Framework/CurveFitting/test/Functions/UserFunctionTest.h
similarity index 97%
rename from Framework/CurveFitting/test/UserFunctionTest.h
rename to Framework/CurveFitting/test/Functions/UserFunctionTest.h
index 7355f712093..316d5c1a352 100644
--- a/Framework/CurveFitting/test/UserFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/UserFunctionTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/UserFunction.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidAPI/Jacobian.h"
#include "MantidAPI/FunctionDomain1D.h"
diff --git a/Framework/CurveFitting/test/VesuvioResolutionTest.h b/Framework/CurveFitting/test/Functions/VesuvioResolutionTest.h
similarity index 98%
rename from Framework/CurveFitting/test/VesuvioResolutionTest.h
rename to Framework/CurveFitting/test/Functions/VesuvioResolutionTest.h
index 2e0fe33a435..2e658ae140f 100644
--- a/Framework/CurveFitting/test/VesuvioResolutionTest.h
+++ b/Framework/CurveFitting/test/Functions/VesuvioResolutionTest.h
@@ -2,7 +2,7 @@
#define MANTID_CURVEFITTING_VESUVIORESOLUTIONTEST_H_
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/VesuvioResolution.h"
+#include "MantidCurveFitting/Functions/VesuvioResolution.h"
#include "ComptonProfileTestHelpers.h"
diff --git a/Framework/CurveFitting/test/VoigtTest.h b/Framework/CurveFitting/test/Functions/VoigtTest.h
similarity index 99%
rename from Framework/CurveFitting/test/VoigtTest.h
rename to Framework/CurveFitting/test/Functions/VoigtTest.h
index 769a77f2d4b..266345b4ba4 100644
--- a/Framework/CurveFitting/test/VoigtTest.h
+++ b/Framework/CurveFitting/test/Functions/VoigtTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/Voigt.h"
+#include "MantidCurveFitting/Functions/Voigt.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
diff --git a/Framework/CurveFitting/test/valgrind.h b/Framework/CurveFitting/test/Functions/valgrind.h
similarity index 100%
rename from Framework/CurveFitting/test/valgrind.h
rename to Framework/CurveFitting/test/Functions/valgrind.h
diff --git a/Framework/CurveFitting/test/MultiDomainCreatorTest.h b/Framework/CurveFitting/test/MultiDomainCreatorTest.h
index 83eafed823d..82865fb776c 100644
--- a/Framework/CurveFitting/test/MultiDomainCreatorTest.h
+++ b/Framework/CurveFitting/test/MultiDomainCreatorTest.h
@@ -12,7 +12,7 @@
#include "MantidAPI/ParamFunction.h"
#include "MantidCurveFitting/MultiDomainCreator.h"
#include "MantidCurveFitting/FitMW.h"
-#include "MantidCurveFitting/UserFunction.h"
+#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidKernel/PropertyManager.h"
#include "MantidTestHelpers/FakeObjects.h"
diff --git a/Framework/CurveFitting/test/NormaliseByPeakAreaTest.h b/Framework/CurveFitting/test/NormaliseByPeakAreaTest.h
index 42e26ed2efc..17dd123a735 100644
--- a/Framework/CurveFitting/test/NormaliseByPeakAreaTest.h
+++ b/Framework/CurveFitting/test/NormaliseByPeakAreaTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/NormaliseByPeakArea.h"
-#include "ComptonProfileTestHelpers.h"
+#include "Functions/ComptonProfileTestHelpers.h"
using Mantid::CurveFitting::NormaliseByPeakArea;
diff --git a/Framework/CurveFitting/test/SpecialFunctionSupportTest.h b/Framework/CurveFitting/test/SpecialFunctionSupportTest.h
index 4117c204942..60cef0c51dc 100644
--- a/Framework/CurveFitting/test/SpecialFunctionSupportTest.h
+++ b/Framework/CurveFitting/test/SpecialFunctionSupportTest.h
@@ -5,7 +5,7 @@
#include <complex>
#include "MantidCurveFitting/SpecialFunctionSupport.h"
-#include "MantidCurveFitting/Lorentzian1D.h"
+#include "MantidCurveFitting/Functions/Lorentzian1D.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
diff --git a/Framework/SINQ/test/PoldiSpectrumDomainFunctionTest.h b/Framework/SINQ/test/PoldiSpectrumDomainFunctionTest.h
index f9eb1090896..492393f6b0a 100644
--- a/Framework/SINQ/test/PoldiSpectrumDomainFunctionTest.h
+++ b/Framework/SINQ/test/PoldiSpectrumDomainFunctionTest.h
@@ -12,7 +12,6 @@
#include "MantidAPI/FunctionValues.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/MultiDomainFunction.h"
-#include "MantidCurveFitting/Gaussian.h"
#include "MantidCurveFitting/FitMW.h"
#include "MantidCurveFitting/Jacobian.h"
--
GitLab
From dab782f07d7fc2641d8a30122c25a4aa64f916c5 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Thu, 8 Oct 2015 13:42:23 +0100
Subject: [PATCH 072/223] Added new case for unit tests
Refs #13508
---
Framework/MDAlgorithms/test/CompactMDTest.h | 69 +++++++++++++++++++--
1 file changed, 65 insertions(+), 4 deletions(-)
diff --git a/Framework/MDAlgorithms/test/CompactMDTest.h b/Framework/MDAlgorithms/test/CompactMDTest.h
index 7134f5dc971..076bbf8afdb 100644
--- a/Framework/MDAlgorithms/test/CompactMDTest.h
+++ b/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -137,23 +137,84 @@ public:
outputWorkspace->getSignalAt(6), 1);
TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
outputWorkspace->getSignalAt(8), 1);
- TSM_ASSERT_EQUALS("Minimum should be cropped to -1: ",
+ TSM_ASSERT_EQUALS("Minimum for dim 0 should be consistent: ",
outputWorkspace->getDimension(0)->getMinimum(),
inWS->getDimension(0)->getMinimum());
- TSM_ASSERT_EQUALS("Maximum should be cropped to 1: ",
+ TSM_ASSERT_EQUALS("Maximum for dim 0 should be consistent: ",
outputWorkspace->getDimension(0)->getMaximum(),
inWS->getDimension(0)->getMaximum());
- TSM_ASSERT_EQUALS("Number of Bins should be 1 : ",
+ TSM_ASSERT_EQUALS("Minimum for dim 1 should be consistent:",
+ outputWorkspace->getDimension(1)->getMinimum(),
+ inWS->getDimension(1)->getMinimum());
+ TSM_ASSERT_EQUALS("Maximum for dim 1 should be consistent: ",
+ outputWorkspace->getDimension(1)->getMaximum(),
+ inWS->getDimension(1)->getMaximum());
+ TSM_ASSERT_EQUALS("Number of Bins for dim 0 should be consistent : ",
outputWorkspace->getDimension(0)->getNBins(),
inWS->getDimension(0)->getNBins());
- TSM_ASSERT_EQUALS("Bin width should be consistent: ",
+ TSM_ASSERT_EQUALS("Number of Bins for dim 1 should be consistent : ",
+ outputWorkspace->getDimension(1)->getNBins(),
+ inWS->getDimension(1)->getNBins());
+ TSM_ASSERT_EQUALS("Bin width for dim 0 should be consistent: ",
outputWorkspace->getDimension(0)->getBinWidth(),
inWS->getDimension(0)->getBinWidth());
+ TSM_ASSERT_EQUALS("Bin width for dim 1 should be consistent: ",
+ outputWorkspace->getDimension(1)->getBinWidth(),
+ inWS->getDimension(1)->getBinWidth());
}
void
test_all_non_zero_signals_are_kept_when_data_is_concentrated_in_one_half_of_the_workspace() {
+ /*
+ *testing the effectiveness of CompactMD when the data looks like this:
+ *------------------
+ * Input structure:
+ *------------------
+ * -------------
+ * | | |///|
+ * -------------
+ * -3-2-1 0 1 2 3
+ *---------------------------
+ * Expected output structure:
+ *----------------------------
+ * should trim until the first non-zero value.
+ * -----
+ * |///|
+ * -----
+ * 1 2 3
+ */
+
+ using namespace Mantid::DataObjects;
+ const size_t numDims = 1;
+ const double signal = 0.0;
+ const double errorSquared = 1.3;
+ size_t numBins[static_cast<int>(numDims)] = {3};
+ Mantid::coord_t min[static_cast<int>(numDims)] = {-3};
+ Mantid::coord_t max[static_cast<int>(numDims)] = {3};
+ const std::string name("test");
+ auto inWS = MDEventsTestHelper::makeFakeMDHistoWorkspaceGeneral(
+ numDims, signal, errorSquared, numBins, min, max, name);
+ inWS->setSignalAt(2, 1.0); // set right-most bin signal to one
+ CompactMD alg;
+ alg.setChild(true);
+ alg.setRethrows(true);
+ alg.initialize();
+ alg.setProperty("InputWorkspace", inWS);
+ alg.setProperty("OutputWorkspace", "out");
+ alg.execute();
+ IMDHistoWorkspace_sptr outputWorkspace = alg.getProperty("OutputWorkspace");
+ TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
+ outputWorkspace->getSignalAt(0), 1);
+ TSM_ASSERT_EQUALS("Minimum should be cut to 1: ",
+ outputWorkspace->getDimension(0)->getMinimum(), 1.0);
+ TSM_ASSERT_EQUALS("Maximum should still be 3: ",
+ outputWorkspace->getDimension(0)->getMaximum(), 3.0);
+ TSM_ASSERT_EQUALS("Number of Bins should be 1 : ",
+ outputWorkspace->getDimension(0)->getNBins(), 1);
+ TSM_ASSERT_EQUALS("Bin width should be consistent: ",
+ outputWorkspace->getDimension(0)->getBinWidth(),
+ inWS->getDimension(0)->getBinWidth());
}
};
//===================
--
GitLab
From f9362b6f6263229bbdb89a4fb12f1fe9884caf5f Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 14:04:14 +0100
Subject: [PATCH 073/223] include iostream/iomanip remove from a few remaining
tests, re #13689
---
MantidQt/API/test/MantidColorMapTest.h | 2 --
MantidQt/API/test/QwtWorkspaceSpectrumDataTest.h | 2 --
MantidQt/Factory/test/WidgetFactoryTest.h | 2 --
Vates/VatesAPI/test/vtkNullStructuredGridTest.h | 1 -
4 files changed, 7 deletions(-)
diff --git a/MantidQt/API/test/MantidColorMapTest.h b/MantidQt/API/test/MantidColorMapTest.h
index 0c2af82d211..21cacf06e87 100644
--- a/MantidQt/API/test/MantidColorMapTest.h
+++ b/MantidQt/API/test/MantidColorMapTest.h
@@ -2,8 +2,6 @@
#define MANTIDQT_API_MANTIDCOLORMAPTEST_H_
#include <cxxtest/TestSuite.h>
-#include <iostream>
-#include <iomanip>
#include "MantidQtAPI/MantidColorMap.h"
#include <limits>
#include <QRgb>
diff --git a/MantidQt/API/test/QwtWorkspaceSpectrumDataTest.h b/MantidQt/API/test/QwtWorkspaceSpectrumDataTest.h
index d86d2e172bf..a0a0dd32aef 100644
--- a/MantidQt/API/test/QwtWorkspaceSpectrumDataTest.h
+++ b/MantidQt/API/test/QwtWorkspaceSpectrumDataTest.h
@@ -2,8 +2,6 @@
#define MANTIDQT_API_MANTIDQWTWORKSPACESPECTRUMDATA_H_
#include <cxxtest/TestSuite.h>
-#include <iostream>
-#include <iomanip>
#include <limits>
#include <QRgb>
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/MantidQt/Factory/test/WidgetFactoryTest.h b/MantidQt/Factory/test/WidgetFactoryTest.h
index c1c0ba1a3b2..c71fdc3eb2f 100644
--- a/MantidQt/Factory/test/WidgetFactoryTest.h
+++ b/MantidQt/Factory/test/WidgetFactoryTest.h
@@ -4,8 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include <iostream>
-#include <iomanip>
#include "MantidFactory/WidgetFactory.h"
diff --git a/Vates/VatesAPI/test/vtkNullStructuredGridTest.h b/Vates/VatesAPI/test/vtkNullStructuredGridTest.h
index b8ecc47ac82..64a31dfec14 100644
--- a/Vates/VatesAPI/test/vtkNullStructuredGridTest.h
+++ b/Vates/VatesAPI/test/vtkNullStructuredGridTest.h
@@ -9,7 +9,6 @@
#include <vtkStructuredGrid.h>
#include <vtkPoints.h>
-#include <iostream>
using namespace Mantid::VATES;
--
GitLab
From f5ce9b177bd27b2c8d572788cb0b7e9372d79618 Mon Sep 17 00:00:00 2001
From: Raquel Alvarez Banos <raquel.alvarez.banos@gmail.com>
Date: Thu, 8 Oct 2015 13:19:03 +0100
Subject: [PATCH 074/223] Re #13899 Disable the system busy icon
---
.../MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h | 2 --
.../Muon/IALCDataLoadingView.h | 6 ------
.../src/Muon/ALCDataLoadingPresenter.cpp | 2 --
.../CustomInterfaces/src/Muon/ALCDataLoadingView.cpp | 10 ----------
4 files changed, 20 deletions(-)
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h
index d9329f71448..938a902cfd2 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h
@@ -80,8 +80,6 @@ namespace CustomInterfaces
void setAvailablePeriods(const std::vector<std::string> &periods);
void setTimeLimits(double tMin, double tMax);
void setTimeRange (double tMin, double tMax);
- void setWaitingCursor();
- void restoreCursor();
void help();
// -- End of IALCDataLoadingView interface -----------------------------------------------------
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h
index c5772cdbea8..09ebe86f25b 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h
@@ -119,12 +119,6 @@ namespace CustomInterfaces
/// @param tMax :: Maximum X value available
virtual void setTimeRange(double tMin, double tMax) = 0;
- /// Set waiting cursor for long operation
- virtual void setWaitingCursor() = 0;
-
- /// Restore the original cursor
- virtual void restoreCursor() = 0;
-
/// Opens the Mantid Wiki web page
virtual void help() = 0;
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingPresenter.cpp b/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingPresenter.cpp
index 4492c6f9187..f080e742c28 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingPresenter.cpp
+++ b/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingPresenter.cpp
@@ -36,7 +36,6 @@ namespace CustomInterfaces
void ALCDataLoadingPresenter::load()
{
- m_view->setWaitingCursor();
try
{
@@ -114,7 +113,6 @@ namespace CustomInterfaces
m_view->displayError(e.what());
}
- m_view->restoreCursor();
}
void ALCDataLoadingPresenter::updateAvailableInfo()
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingView.cpp b/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingView.cpp
index f2e6c9712f4..84775ecd9ae 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingView.cpp
+++ b/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingView.cpp
@@ -221,15 +221,5 @@ namespace CustomInterfaces
MantidQt::API::HelpWindow::showCustomInterface(NULL, QString("Muon_ALC"));
}
- void ALCDataLoadingView::setWaitingCursor()
- {
- QApplication::setOverrideCursor(Qt::WaitCursor);
- }
-
- void ALCDataLoadingView::restoreCursor()
- {
- QApplication::restoreOverrideCursor();
- }
-
} // namespace CustomInterfaces
} // namespace MantidQt
--
GitLab
From 3d7b73ad4500c9fb4bf2d96d20e5a260254a8b4c Mon Sep 17 00:00:00 2001
From: Raquel Alvarez Banos <raquel.alvarez.banos@gmail.com>
Date: Thu, 8 Oct 2015 14:51:32 +0100
Subject: [PATCH 075/223] Re #13899 Disable widgets while loading data
---
.../Muon/ALCDataLoadingView.h | 2 ++
.../Muon/ALCDataLoadingView.ui | 2 +-
.../Muon/IALCDataLoadingView.h | 6 ++++
.../src/Muon/ALCDataLoadingPresenter.cpp | 2 ++
.../src/Muon/ALCDataLoadingView.cpp | 36 +++++++++++++++++++
5 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h
index 938a902cfd2..d1a4d3042e6 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h
@@ -81,6 +81,8 @@ namespace CustomInterfaces
void setTimeLimits(double tMin, double tMax);
void setTimeRange (double tMin, double tMax);
void help();
+ void disableAll();
+ void enableAll();
// -- End of IALCDataLoadingView interface -----------------------------------------------------
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.ui b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.ui
index e42aeb10421..b99c1ebe774 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.ui
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.ui
@@ -383,7 +383,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_2">
+ <widget class="QGroupBox" name="calculationGroup">
<property name="title">
<string>Calculation</string>
</property>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h
index 09ebe86f25b..6fba19509b8 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h
@@ -122,6 +122,12 @@ namespace CustomInterfaces
/// Opens the Mantid Wiki web page
virtual void help() = 0;
+ /// Disables all the widgets
+ virtual void disableAll() = 0;
+
+ /// Enables all the widgets
+ virtual void enableAll() = 0;
+
signals:
/// Request to load data
void loadRequested();
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingPresenter.cpp b/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingPresenter.cpp
index f080e742c28..b22f5b4fe00 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingPresenter.cpp
+++ b/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingPresenter.cpp
@@ -36,6 +36,7 @@ namespace CustomInterfaces
void ALCDataLoadingPresenter::load()
{
+ m_view->disableAll();
try
{
@@ -113,6 +114,7 @@ namespace CustomInterfaces
m_view->displayError(e.what());
}
+ m_view->enableAll();
}
void ALCDataLoadingPresenter::updateAvailableInfo()
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingView.cpp b/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingView.cpp
index 84775ecd9ae..7f1d5b57864 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingView.cpp
+++ b/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingView.cpp
@@ -40,6 +40,18 @@ namespace CustomInterfaces
m_dataCurve->setSymbol(QwtSymbol(QwtSymbol::Ellipse, QBrush(), QPen(), QSize(7,7)));
m_dataCurve->setRenderHint(QwtPlotItem::RenderAntialiased, true);
m_dataCurve->attach(m_ui.dataPlot);
+
+ // The following lines disable the groups' titles when the
+ // group is disabled
+ QPalette palette;
+ palette.setColor(QPalette::Disabled, QPalette::WindowText,
+ QApplication::palette().color(QPalette::Disabled,
+ QPalette::WindowText));
+ m_ui.dataGroup->setPalette(palette);
+ m_ui.deadTimeGroup->setPalette(palette);
+ m_ui.detectorGroupingGroup->setPalette(palette);
+ m_ui.periodsGroup->setPalette(palette);
+ m_ui.calculationGroup->setPalette(palette);
}
std::string ALCDataLoadingView::firstRun() const
@@ -221,5 +233,29 @@ namespace CustomInterfaces
MantidQt::API::HelpWindow::showCustomInterface(NULL, QString("Muon_ALC"));
}
+ void ALCDataLoadingView::disableAll() {
+
+ // Disable all the widgets in the view
+ m_ui.dataGroup->setEnabled(false);
+ m_ui.deadTimeGroup->setEnabled(false);
+ m_ui.detectorGroupingGroup->setEnabled(false);
+ m_ui.periodsGroup->setEnabled(false);
+ m_ui.calculationGroup->setEnabled(false);
+ m_ui.load->setEnabled(false);
+
+ }
+
+ void ALCDataLoadingView::enableAll() {
+
+ // Enable all the widgets in the view
+ m_ui.deadTimeGroup->setEnabled(true);
+ m_ui.dataGroup->setEnabled(true);
+ m_ui.detectorGroupingGroup->setEnabled(true);
+ m_ui.periodsGroup->setEnabled(true);
+ m_ui.calculationGroup->setEnabled(true);
+ m_ui.load->setEnabled(true);
+
+ }
+
} // namespace CustomInterfaces
} // namespace MantidQt
--
GitLab
From e13200922af26041a785a979e3cf812442b27b4a Mon Sep 17 00:00:00 2001
From: Raquel Alvarez Banos <raquel.alvarez.banos@gmail.com>
Date: Thu, 8 Oct 2015 14:55:55 +0100
Subject: [PATCH 076/223] Re #13899 Update unit tests
---
.../test/ALCDataLoadingPresenterTest.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/MantidQt/CustomInterfaces/test/ALCDataLoadingPresenterTest.h b/MantidQt/CustomInterfaces/test/ALCDataLoadingPresenterTest.h
index 86e42f3506f..ff393f00104 100644
--- a/MantidQt/CustomInterfaces/test/ALCDataLoadingPresenterTest.h
+++ b/MantidQt/CustomInterfaces/test/ALCDataLoadingPresenterTest.h
@@ -51,8 +51,8 @@ public:
MOCK_METHOD1(setAvailablePeriods, void(const std::vector<std::string>&));
MOCK_METHOD2(setTimeLimits, void(double,double));
MOCK_METHOD2(setTimeRange, void(double,double));
- MOCK_METHOD0(setWaitingCursor, void());
- MOCK_METHOD0(restoreCursor, void());
+ MOCK_METHOD0(disableAll, void());
+ MOCK_METHOD0(enableAll, void());
MOCK_METHOD0(help, void());
void requestLoading() { emit loadRequested(); }
@@ -116,7 +116,7 @@ public:
void test_defaultLoad()
{
InSequence s;
- EXPECT_CALL(*m_view, setWaitingCursor());
+ EXPECT_CALL(*m_view, disableAll());
EXPECT_CALL(*m_view, setDataCurve(AllOf(Property(&QwtData::size,3),
QwtDataX(0, 1350, 1E-8),
@@ -130,7 +130,7 @@ public:
VectorValue(1,1.284E-3,1E-6),
VectorValue(2,1.280E-3,1E-6))));
- EXPECT_CALL(*m_view, restoreCursor());
+ EXPECT_CALL(*m_view, enableAll());
m_view->requestLoading();
}
@@ -232,7 +232,7 @@ public:
ON_CALL(*m_view, deadTimeType()).WillByDefault(Return("FromRunData"));
EXPECT_CALL(*m_view, deadTimeType()).Times(2);
EXPECT_CALL(*m_view, deadTimeFile()).Times(0);
- EXPECT_CALL(*m_view, restoreCursor()).Times(1);
+ EXPECT_CALL(*m_view, enableAll()).Times(1);
EXPECT_CALL(*m_view, setDataCurve(AllOf(Property(&QwtData::size,3),
QwtDataY(0, 0.150616, 1E-3),
QwtDataY(1, 0.143444, 1E-3),
@@ -251,7 +251,7 @@ public:
ON_CALL(*m_view, deadTimeType()).WillByDefault(Return("FromSpecifiedFile"));
EXPECT_CALL(*m_view, deadTimeType()).Times(2);
EXPECT_CALL(*m_view, deadTimeFile()).Times(1);
- EXPECT_CALL(*m_view, restoreCursor()).Times(1);
+ EXPECT_CALL(*m_view, enableAll()).Times(1);
m_view->requestLoading();
}
@@ -264,7 +264,7 @@ public:
ON_CALL(*m_view, getBackwardGrouping()).WillByDefault(Return("1-32"));
EXPECT_CALL(*m_view, getForwardGrouping()).Times(1);
EXPECT_CALL(*m_view, getBackwardGrouping()).Times(1);
- EXPECT_CALL(*m_view, restoreCursor()).Times(1);
+ EXPECT_CALL(*m_view, enableAll()).Times(1);
EXPECT_CALL(*m_view, setDataCurve(AllOf(Property(&QwtData::size, 3),
QwtDataX(0, 1350, 1E-8),
QwtDataX(1, 1360, 1E-8),
--
GitLab
From 0b2958ca541a64b5efa1f56f4a637930026324b0 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Thu, 8 Oct 2015 15:00:15 +0100
Subject: [PATCH 077/223] Functional tests complete
CompactMD now throws invalid arguement exception if the min extent is greater than max
.
Refs #13508
---
Framework/MDAlgorithms/src/CompactMD.cpp | 8 ++++++--
Framework/MDAlgorithms/test/CompactMDTest.h | 12 ++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Framework/MDAlgorithms/src/CompactMD.cpp b/Framework/MDAlgorithms/src/CompactMD.cpp
index c5b55d62f11..a999f14dc89 100644
--- a/Framework/MDAlgorithms/src/CompactMD.cpp
+++ b/Framework/MDAlgorithms/src/CompactMD.cpp
@@ -17,6 +17,10 @@ createPBinStringVector(std::vector<Mantid::coord_t> minVector,
std::vector<std::string> pBinStrVector;
for (size_t iter = 0; iter < numDims; iter++) {
// creating pbin string using Min and Max Centre positions
+ if (minVector[iter] > maxVector[iter]) {
+ throw std::invalid_argument(
+ "Minimum extents MUST be less than Maximum extents");
+ }
auto pBinStr = boost::lexical_cast<std::string>(
minVector[iter] -
(inputWs->getDimension(iter)->getBinWidth() * 0.5)) +
@@ -39,7 +43,7 @@ void CompactMD::findFirstNonZeroMinMaxExtents(
IMDHistoWorkspace_sptr inputWs, std::vector<Mantid::coord_t> &minVec,
std::vector<Mantid::coord_t> &maxVec) {
auto ws_iter = inputWs->createIterator();
- while (ws_iter->next()) {
+ do {
if (ws_iter->getSignal() == 0) {
// if signal is 0 then go to next index
continue;
@@ -59,7 +63,7 @@ void CompactMD::findFirstNonZeroMinMaxExtents(
}
}
}
- }
+ } while (ws_iter->next());
}
void CompactMD::init() {
diff --git a/Framework/MDAlgorithms/test/CompactMDTest.h b/Framework/MDAlgorithms/test/CompactMDTest.h
index 076bbf8afdb..ef1a18a8fa4 100644
--- a/Framework/MDAlgorithms/test/CompactMDTest.h
+++ b/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -171,7 +171,7 @@ public:
* Input structure:
*------------------
* -------------
- * | | |///|
+ * |///| | |
* -------------
* -3-2-1 0 1 2 3
*---------------------------
@@ -194,22 +194,22 @@ public:
const std::string name("test");
auto inWS = MDEventsTestHelper::makeFakeMDHistoWorkspaceGeneral(
numDims, signal, errorSquared, numBins, min, max, name);
- inWS->setSignalAt(2, 1.0); // set right-most bin signal to one
-
+ inWS->setSignalAt(0, 1.0); // set right-most bin signal to one
CompactMD alg;
alg.setChild(true);
alg.setRethrows(true);
alg.initialize();
alg.setProperty("InputWorkspace", inWS);
alg.setProperty("OutputWorkspace", "out");
- alg.execute();
+ TS_ASSERT_THROWS_NOTHING(alg.execute());
IMDHistoWorkspace_sptr outputWorkspace = alg.getProperty("OutputWorkspace");
+ TS_ASSERT(outputWorkspace);
TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
outputWorkspace->getSignalAt(0), 1);
TSM_ASSERT_EQUALS("Minimum should be cut to 1: ",
- outputWorkspace->getDimension(0)->getMinimum(), 1.0);
+ outputWorkspace->getDimension(0)->getMinimum(), -3.0);
TSM_ASSERT_EQUALS("Maximum should still be 3: ",
- outputWorkspace->getDimension(0)->getMaximum(), 3.0);
+ outputWorkspace->getDimension(0)->getMaximum(),-1.0);
TSM_ASSERT_EQUALS("Number of Bins should be 1 : ",
outputWorkspace->getDimension(0)->getNBins(), 1);
TSM_ASSERT_EQUALS("Bin width should be consistent: ",
--
GitLab
From 5ef09a1d3ccac85e54c413b5a7a30340a21a760f Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Thu, 8 Oct 2015 15:07:40 +0100
Subject: [PATCH 078/223] Clang format test file for CompactMD
Refs #13508
---
Framework/MDAlgorithms/test/CompactMDTest.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Framework/MDAlgorithms/test/CompactMDTest.h b/Framework/MDAlgorithms/test/CompactMDTest.h
index ef1a18a8fa4..515b9bb6a7c 100644
--- a/Framework/MDAlgorithms/test/CompactMDTest.h
+++ b/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -209,7 +209,7 @@ public:
TSM_ASSERT_EQUALS("Minimum should be cut to 1: ",
outputWorkspace->getDimension(0)->getMinimum(), -3.0);
TSM_ASSERT_EQUALS("Maximum should still be 3: ",
- outputWorkspace->getDimension(0)->getMaximum(),-1.0);
+ outputWorkspace->getDimension(0)->getMaximum(), -1.0);
TSM_ASSERT_EQUALS("Number of Bins should be 1 : ",
outputWorkspace->getDimension(0)->getNBins(), 1);
TSM_ASSERT_EQUALS("Bin width should be consistent: ",
--
GitLab
From ccd0912eb70295335cf313e299778934ad4ad95c Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Thu, 8 Oct 2015 15:24:04 +0100
Subject: [PATCH 079/223] Added empty workspace functional test
Refs #13508
---
Framework/MDAlgorithms/test/CompactMDTest.h | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/Framework/MDAlgorithms/test/CompactMDTest.h b/Framework/MDAlgorithms/test/CompactMDTest.h
index 515b9bb6a7c..57f5d98cc60 100644
--- a/Framework/MDAlgorithms/test/CompactMDTest.h
+++ b/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -216,6 +216,25 @@ public:
outputWorkspace->getDimension(0)->getBinWidth(),
inWS->getDimension(0)->getBinWidth());
}
+ void test_compact_md_throws_when_loading_empty_workspace() {
+ using namespace Mantid::DataObjects;
+ const size_t numDims = 1;
+ const double signal = 0.0;
+ const double errorSquared = 1.3;
+ size_t numBins[static_cast<int>(numDims)] = {3};
+ Mantid::coord_t min[static_cast<int>(numDims)] = {-3};
+ Mantid::coord_t max[static_cast<int>(numDims)] = {3};
+ const std::string name("test");
+ auto inWS = MDEventsTestHelper::makeFakeMDHistoWorkspaceGeneral(
+ numDims, signal, errorSquared, numBins, min, max, name);
+ CompactMD alg;
+ alg.setChild(true);
+ alg.setRethrows(true);
+ alg.initialize();
+ alg.setProperty("InputWorkspace", inWS);
+ alg.setProperty("OutputWorkspace", "out");
+ TS_ASSERT_THROWS(alg.execute(), std::invalid_argument);
+ }
};
//===================
// Performance Tests
--
GitLab
From 74cf2119c5cdbbbe316bd198d640e9d38d4b2c58 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Thu, 8 Oct 2015 15:37:04 +0100
Subject: [PATCH 080/223] Moved the functions to their own namespace
re #13347
---
.../CalculateGammaBackground.h | 6 +-
.../MantidCurveFitting/CalculateMSVesuvio.h | 9 ++-
.../MantidCurveFitting/FitPowderDiffPeaks.h | 64 +++++++++----------
.../MantidCurveFitting/Functions/Abragam.h | 2 +
.../MantidCurveFitting/Functions/BSpline.h | 2 +
.../Functions/BackToBackExponential.h | 2 +
.../Functions/BackgroundFunction.h | 2 +
.../Functions/BivariateNormal.h | 2 +
.../Functions/Bk2BkExpConvPV.h | 2 +
.../Functions/ChebfunBase.h | 2 +
.../MantidCurveFitting/Functions/Chebyshev.h | 2 +
.../Functions/ComptonPeakProfile.h | 2 +
.../Functions/ComptonProfile.h | 6 +-
.../Functions/ComptonScatteringCountRate.h | 2 +
.../Functions/Convolution.h | 2 +
.../Functions/CubicSpline.h | 2 +
.../Functions/DeltaFunction.h | 2 +
.../Functions/DiffRotDiscreteCircle.h | 2 +
.../MantidCurveFitting/Functions/DiffSphere.h | 2 +
.../Functions/DynamicKuboToyabe.h | 2 +
.../MantidCurveFitting/Functions/EndErfc.h | 2 +
.../MantidCurveFitting/Functions/ExpDecay.h | 2 +
.../Functions/ExpDecayMuon.h | 2 +
.../Functions/ExpDecayOsc.h | 2 +
.../Functions/FlatBackground.h | 2 +
.../Functions/FullprofPolynomial.h | 2 +
.../MantidCurveFitting/Functions/GausDecay.h | 2 +
.../MantidCurveFitting/Functions/GausOsc.h | 2 +
.../MantidCurveFitting/Functions/Gaussian.h | 2 +
.../Functions/GaussianComptonProfile.h | 2 +
.../Functions/GramCharlierComptonProfile.h | 2 +
.../Functions/IkedaCarpenterPV.h | 2 +
.../Functions/LinearBackground.h | 2 +
.../MantidCurveFitting/Functions/LogNormal.h | 2 +
.../MantidCurveFitting/Functions/Lorentzian.h | 2 +
.../Functions/Lorentzian1D.h | 2 +
.../Functions/MuonFInteraction.h | 2 +
.../Functions/NeutronBk2BkExpConvPVoigt.h | 2 +
.../Functions/PawleyFunction.h | 2 +
.../Functions/PeakParameterFunction.h | 2 +
.../MantidCurveFitting/Functions/Polynomial.h | 2 +
.../Functions/ProcessBackground.h | 2 +
.../Functions/ProductFunction.h | 2 +
.../Functions/ProductLinearExp.h | 2 +
.../Functions/ProductQuadraticExp.h | 2 +
.../Functions/PseudoVoigt.h | 2 +
.../MantidCurveFitting/Functions/Quadratic.h | 2 +
.../Functions/ReflectivityMulf.h | 2 +
.../MantidCurveFitting/Functions/Resolution.h | 2 +
.../Functions/SimpleChebfun.h | 2 +
.../Functions/StaticKuboToyabe.h | 2 +
.../Functions/StaticKuboToyabeTimesExpDecay.h | 2 +
.../StaticKuboToyabeTimesGausDecay.h | 2 +
.../MantidCurveFitting/Functions/StretchExp.h | 2 +
.../Functions/StretchExpMuon.h | 2 +
.../Functions/TabulatedFunction.h | 2 +
.../Functions/ThermalNeutronBk2BkExpAlpha.h | 2 +
.../Functions/ThermalNeutronBk2BkExpBeta.h | 2 +
.../ThermalNeutronBk2BkExpConvPVoigt.h | 2 +
.../Functions/ThermalNeutronBk2BkExpSigma.h | 2 +
.../Functions/ThermalNeutronDtoTOFFunction.h | 2 +
.../Functions/UserFunction.h | 2 +
.../Functions/UserFunction1D.h | 2 +
.../Functions/VesuvioResolution.h | 3 +
.../inc/MantidCurveFitting/Functions/Voigt.h | 2 +
.../inc/MantidCurveFitting/LatticeFunction.h | 2 +-
.../inc/MantidCurveFitting/LeBailFit.h | 8 +--
.../inc/MantidCurveFitting/LeBailFunction.h | 2 +-
.../inc/MantidCurveFitting/PawleyFit.h | 8 +--
.../RefinePowderInstrumentParameters3.h | 2 +-
.../MantidCurveFitting/SplineInterpolation.h | 2 +-
.../inc/MantidCurveFitting/SplineSmoothing.h | 2 +-
.../CurveFitting/src/CalculateChiSquared.cpp | 5 +-
.../src/CalculateGammaBackground.cpp | 6 +-
.../CurveFitting/src/CalculateMSVesuvio.cpp | 5 +-
.../CurveFitting/src/ConvolveWorkspaces.cpp | 1 +
Framework/CurveFitting/src/FitMW.cpp | 10 +--
.../CurveFitting/src/FitPowderDiffPeaks.cpp | 3 +-
.../CurveFitting/src/Functions/Abragam.cpp | 6 ++
.../CurveFitting/src/Functions/BSpline.cpp | 6 ++
.../src/Functions/BackToBackExponential.cpp | 6 ++
.../src/Functions/BackgroundFunction.cpp | 6 ++
.../src/Functions/BivariateNormal.cpp | 5 ++
.../src/Functions/Bk2BkExpConvPV.cpp | 7 ++
.../src/Functions/ChebfunBase.cpp | 10 ++-
.../CurveFitting/src/Functions/Chebyshev.cpp | 6 ++
.../src/Functions/ComptonPeakProfile.cpp | 7 +-
.../src/Functions/ComptonProfile.cpp | 16 +++--
.../Functions/ComptonScatteringCountRate.cpp | 4 ++
.../src/Functions/Convolution.cpp | 6 ++
.../src/Functions/CubicSpline.cpp | 6 ++
.../src/Functions/DeltaFunction.cpp | 6 ++
.../src/Functions/DiffRotDiscreteCircle.cpp | 6 ++
.../CurveFitting/src/Functions/DiffSphere.cpp | 7 ++
.../src/Functions/DynamicKuboToyabe.cpp | 6 ++
.../CurveFitting/src/Functions/EndErfc.cpp | 6 ++
.../CurveFitting/src/Functions/ExpDecay.cpp | 6 ++
.../src/Functions/ExpDecayMuon.cpp | 6 ++
.../src/Functions/ExpDecayOsc.cpp | 6 ++
.../src/Functions/FlatBackground.cpp | 6 ++
.../src/Functions/FullprofPolynomial.cpp | 4 ++
.../CurveFitting/src/Functions/GausDecay.cpp | 6 ++
.../CurveFitting/src/Functions/GausOsc.cpp | 6 ++
.../CurveFitting/src/Functions/Gaussian.cpp | 6 ++
.../src/Functions/GaussianComptonProfile.cpp | 4 ++
.../Functions/GramCharlierComptonProfile.cpp | 13 +++-
.../src/Functions/IkedaCarpenterPV.cpp | 7 ++
.../src/Functions/LinearBackground.cpp | 6 ++
.../CurveFitting/src/Functions/LogNormal.cpp | 6 ++
.../CurveFitting/src/Functions/Lorentzian.cpp | 6 ++
.../src/Functions/Lorentzian1D.cpp | 5 ++
.../src/Functions/MuonFInteraction.cpp | 6 ++
.../Functions/NeutronBk2BkExpConvPVoigt.cpp | 5 ++
.../src/Functions/PawleyFunction.cpp | 7 ++
.../src/Functions/PeakParameterFunction.cpp | 5 ++
.../CurveFitting/src/Functions/Polynomial.cpp | 7 ++
.../src/Functions/ProcessBackground.cpp | 20 ++++--
.../src/Functions/ProductFunction.cpp | 4 ++
.../src/Functions/ProductLinearExp.cpp | 6 ++
.../src/Functions/ProductQuadraticExp.cpp | 4 ++
.../src/Functions/PseudoVoigt.cpp | 5 ++
.../CurveFitting/src/Functions/Quadratic.cpp | 6 ++
.../src/Functions/ReflectivityMulf.cpp | 7 ++
.../CurveFitting/src/Functions/Resolution.cpp | 6 ++
.../src/Functions/SimpleChebfun.cpp | 4 ++
.../src/Functions/StaticKuboToyabe.cpp | 6 ++
.../StaticKuboToyabeTimesExpDecay.cpp | 6 ++
.../StaticKuboToyabeTimesGausDecay.cpp | 6 ++
.../CurveFitting/src/Functions/StretchExp.cpp | 6 ++
.../src/Functions/StretchExpMuon.cpp | 6 ++
.../src/Functions/TabulatedFunction.cpp | 6 ++
.../Functions/ThermalNeutronBk2BkExpAlpha.cpp | 8 +++
.../Functions/ThermalNeutronBk2BkExpBeta.cpp | 8 +++
.../ThermalNeutronBk2BkExpConvPVoigt.cpp | 7 ++
.../Functions/ThermalNeutronBk2BkExpSigma.cpp | 8 +++
.../ThermalNeutronDtoTOFFunction.cpp | 6 ++
.../src/Functions/UserFunction.cpp | 6 ++
.../src/Functions/UserFunction1D.cpp | 6 ++
.../src/Functions/VesuvioResolution.cpp | 7 +-
.../CurveFitting/src/Functions/Voigt.cpp | 4 ++
.../CurveFitting/src/LatticeFunction.cpp | 4 +-
Framework/CurveFitting/src/LeBailFunction.cpp | 2 +-
.../CurveFitting/src/ParameterEstimator.cpp | 2 +
Framework/CurveFitting/src/PawleyFit.cpp | 14 ++--
.../src/RefinePowderInstrumentParameters3.cpp | 1 +
.../CurveFitting/src/SplineInterpolation.cpp | 1 +
.../CurveFitting/src/SplineSmoothing.cpp | 2 +-
.../test/BoundaryConstraintTest.h | 1 +
.../test/CalculateGammaBackgroundTest.h | 2 +-
.../test/CalculateMSVesuvioTest.h | 2 +-
.../CurveFitting/test/CompositeFunctionTest.h | 1 +
.../test/CostFunctions/LeastSquaresTest.h | 1 +
Framework/CurveFitting/test/FitMWTest.h | 1 +
.../FuncMinimizers/DampingMinimizerTest.h | 1 +
.../test/FuncMinimizers/FABADAMinimizerTest.h | 1 +
.../FuncMinimizers/LevenbergMarquardtMDTest.h | 1 +
.../FuncMinimizers/LevenbergMarquardtTest.h | 1 +
.../CurveFitting/test/Functions/AbragamTest.h | 1 +
.../CurveFitting/test/Functions/BSplineTest.h | 1 +
.../Functions/BackToBackExponentialTest.h | 2 +-
.../test/Functions/BivariateNormalTest.h | 1 +
.../test/Functions/Bk2BkExpConvPVTest.h | 1 +
.../test/Functions/ChebfunBaseTest.h | 1 +
.../test/Functions/ChebyshevTest.h | 1 +
.../test/Functions/ComptonPeakProfileTest.h | 2 +-
.../test/Functions/ComptonProfileTest.h | 2 +-
.../ComptonScatteringCountRateTest.h | 10 +--
.../test/Functions/ConvolutionTest.h | 1 +
.../test/Functions/CubicSplineTest.h | 1 +
.../test/Functions/DeltaFunctionTest.h | 1 +
.../Functions/DiffRotDiscreteCircleTest.h | 37 ++++++-----
.../test/Functions/DiffSphereTest.h | 31 +++++----
.../test/Functions/DynamicKuboToyabeTest.h | 1 +
.../CurveFitting/test/Functions/EndErfcTest.h | 1 +
.../test/Functions/ExpDecayMuonTest.h | 1 +
.../test/Functions/ExpDecayOscTest.h | 1 +
.../test/Functions/ExpDecayTest.h | 1 +
.../test/Functions/FlatBackgroundTest.h | 1 +
.../test/Functions/FullprofPolynomialTest.h | 3 +-
.../test/Functions/GausDecayTest.h | 1 +
.../CurveFitting/test/Functions/GausOscTest.h | 1 +
.../Functions/GaussianComptonProfileTest.h | 5 +-
.../test/Functions/GaussianTest.h | 1 +
.../GramCharlierComptonProfileTest.h | 7 +-
.../test/Functions/IkedaCarpenterPVTest.h | 3 +
.../test/Functions/LinearBackgroundTest.h | 2 +-
.../test/Functions/LogNormalTest.h | 1 +
.../test/Functions/Lorentzian1DTest.h | 2 +-
.../test/Functions/LorentzianTest.h | 17 ++---
.../test/Functions/MuonFInteractionTest.h | 1 +
.../Functions/NeutronBk2BkExpConvPVoigtTest.h | 2 +-
.../test/Functions/PawleyFunctionTest.h | 1 +
.../Functions/PeakParameterFunctionTest.h | 1 +
.../test/Functions/PolynomialTest.h | 2 +-
.../test/Functions/ProcessBackgroundTest.h | 2 +-
.../test/Functions/ProductFunctionTest.h | 18 +++---
.../test/Functions/ProductLinearExpTest.h | 1 +
.../test/Functions/ProductQuadraticExpTest.h | 1 +
.../test/Functions/PseudoVoigtTest.h | 1 +
.../test/Functions/QuadraticTest.h | 2 +-
.../test/Functions/ReflectivityMulfTest.h | 1 +
.../test/Functions/ResolutionTest.h | 1 +
.../test/Functions/SimpleChebfunTest.h | 1 +
.../test/Functions/StaticKuboToyabeTest.h | 1 +
.../StaticKuboToyabeTimesExpDecayTest.h | 3 +-
.../StaticKuboToyabeTimesGausDecayTest.h | 3 +-
.../test/Functions/StretchExpMuonTest.h | 1 +
.../test/Functions/StretchExpTest.h | 1 +
.../test/Functions/TabulatedFunctionTest.h | 1 +
.../ThermalNeutronBk2BkExpAlphaTest.h | 4 +-
.../ThermalNeutronBk2BkExpBetaTest.h | 4 +-
.../ThermalNeutronBk2BkExpConvPVoigtTest.h | 4 +-
.../ThermalNeutronBk2BkExpSigmaTest.h | 4 +-
.../ThermalNeutronDtoTOFFunctionTest.h | 4 +-
.../test/Functions/UserFunction1DTest.h | 1 +
.../test/Functions/UserFunctionTest.h | 1 +
.../test/Functions/VesuvioResolutionTest.h | 2 +-
.../CurveFitting/test/Functions/VoigtTest.h | 2 +-
.../test/MultiDomainCreatorTest.h | 1 +
219 files changed, 743 insertions(+), 176 deletions(-)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CalculateGammaBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/CalculateGammaBackground.h
index 4cf7ebc54a2..a7c97b9d8c0 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CalculateGammaBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CalculateGammaBackground.h
@@ -11,7 +11,9 @@ namespace CurveFitting {
// Forward declarations
//---------------------------------------------------------------------------
struct DetectorParams;
+namespace Functions {
struct ResolutionParams;
+}
/**
@@ -80,12 +82,12 @@ private:
const FoilInfo &foilInfo,
const Kernel::V3D &detPos,
const DetectorParams &detPar,
- const ResolutionParams &detRes);
+ const Functions::ResolutionParams &detRes);
/// Compute a TOF spectrum for the given inputs & spectrum
void calculateTofSpectrum(std::vector<double> &result,
std::vector<double> &tmpWork, const size_t wsIndex,
const DetectorParams &detpar,
- const ResolutionParams &respar);
+ const Functions::ResolutionParams &respar);
/// Check and store appropriate input data
void retrieveInputs();
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h b/Framework/CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h
index 71b9767435f..49691f5f00d 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h
@@ -9,11 +9,10 @@
namespace Mantid {
namespace CurveFitting {
-//-----------------------------------------------------------------------------
-// CurveFitting forward declarations
-//-----------------------------------------------------------------------------
struct DetectorParams;
+namespace Functions{
struct ResolutionParams;
+}
namespace MSVesuvioHelper {
class RandomNumberGenerator;
struct Simulation;
@@ -88,12 +87,12 @@ private:
void cacheInputs();
void calculateMS(const size_t wsIndex, API::ISpectrum &totalsc,
API::ISpectrum &multsc) const;
- void simulate(const DetectorParams &detpar, const ResolutionParams &respar,
+ void simulate(const DetectorParams &detpar, const Functions::ResolutionParams &respar,
MSVesuvioHelper::Simulation &simulCounts) const;
void assignToOutput(const MSVesuvioHelper::SimulationWithErrors &avgCounts,
API::ISpectrum &totalsc, API::ISpectrum &multsc) const;
double calculateCounts(const DetectorParams &detpar,
- const ResolutionParams &respar,
+ const Functions::ResolutionParams &respar,
MSVesuvioHelper::Simulation &simulation) const;
// single-event helpers
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FitPowderDiffPeaks.h b/Framework/CurveFitting/inc/MantidCurveFitting/FitPowderDiffPeaks.h
index c315c7c29ca..99b67e7fa3f 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FitPowderDiffPeaks.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FitPowderDiffPeaks.h
@@ -88,7 +88,7 @@ private:
void genPeaksFromTable(DataObjects::TableWorkspace_sptr peakparamws);
/// Generate a peak
- BackToBackExponential_sptr
+ Functions::BackToBackExponential_sptr
genPeak(std::map<std::string, int> hklmap,
std::map<std::string, double> parammap,
std::map<std::string, std::string> bk2bk2braggmap, bool &good,
@@ -114,62 +114,62 @@ private:
void fitPeaksRobust();
/// Fit a single peak
- bool fitPeak(BackToBackExponential_sptr peak,
- BackgroundFunction_sptr background, double leftdev,
+ bool fitPeak(Functions::BackToBackExponential_sptr peak,
+ Functions::BackgroundFunction_sptr background, double leftdev,
double rightdev, size_t m_wsIndex, double &chi2);
//---------------------------------------------------------------------------
/// Fit single peak in robust mode (no hint)
- bool fitSinglePeakRobust(BackToBackExponential_sptr peak,
- BackgroundFunction_sptr background, double leftdev,
+ bool fitSinglePeakRobust(Functions::BackToBackExponential_sptr peak,
+ Functions::BackgroundFunction_sptr background, double leftdev,
double rightdev,
std::map<std::string, double> rightpeakparammap,
double &finalchi2);
/// Fit signle peak by Monte Carlo/simulated annealing
- bool fitSinglePeakSimulatedAnnealing(BackToBackExponential_sptr peak,
+ bool fitSinglePeakSimulatedAnnealing(Functions::BackToBackExponential_sptr peak,
std::vector<std::string> paramtodomc);
/// Fit peak with confidence of the centre
- bool fitSinglePeakConfidentX(BackToBackExponential_sptr peak);
+ bool fitSinglePeakConfidentX(Functions::BackToBackExponential_sptr peak);
/// Fit peak with trustful peak parameters
- bool fitSinglePeakConfident(BackToBackExponential_sptr peak,
- BackgroundFunction_sptr backgroundfunction,
+ bool fitSinglePeakConfident(Functions::BackToBackExponential_sptr peak,
+ Functions::BackgroundFunction_sptr backgroundfunction,
double leftbound, double rightbound, double &chi2,
bool &annhilatedpeak);
/// Fit peak with confident parameters
bool fitSinglePeakConfidentY(DataObjects::Workspace2D_sptr dataws,
- BackToBackExponential_sptr peak,
+ Functions::BackToBackExponential_sptr peak,
double dampingfactor);
/// Fit peaks with confidence in fwhm and etc.
- bool fitOverlappedPeaks(std::vector<BackToBackExponential_sptr> peaks,
- BackgroundFunction_sptr backgroundfunction,
+ bool fitOverlappedPeaks(std::vector<Functions::BackToBackExponential_sptr> peaks,
+ Functions::BackgroundFunction_sptr backgroundfunction,
double gfwhm);
/// Fit multiple (overlapped) peaks
bool doFitMultiplePeaks(DataObjects::Workspace2D_sptr dataws, size_t wsindex,
API::CompositeFunction_sptr peaksfunc,
- std::vector<BackToBackExponential_sptr> peakfuncs,
+ std::vector<Functions::BackToBackExponential_sptr> peakfuncs,
std::vector<bool> &vecfitgood,
std::vector<double> &vecchi2s);
/// Use Le Bail method to estimate and set the peak heights
void estimatePeakHeightsLeBail(DataObjects::Workspace2D_sptr dataws,
size_t wsindex,
- std::vector<BackToBackExponential_sptr> peaks);
+ std::vector<Functions::BackToBackExponential_sptr> peaks);
/// Set constraints on a group of overlapped peaks for fitting
void
- setOverlappedPeaksConstraints(std::vector<BackToBackExponential_sptr> peaks);
+ setOverlappedPeaksConstraints(std::vector<Functions::BackToBackExponential_sptr> peaks);
/// Fit 1 peak by 1 minimizer of 1 call of minimzer (simple version)
bool doFit1PeakSimple(DataObjects::Workspace2D_sptr dataws,
size_t workspaceindex,
- BackToBackExponential_sptr peakfunction,
+ Functions::BackToBackExponential_sptr peakfunction,
std::string minimzername, size_t maxiteration,
double &chi2);
@@ -182,14 +182,14 @@ private:
/// Fit single peak with background to raw data
bool doFit1PeakBackground(DataObjects::Workspace2D_sptr dataws,
- size_t wsindex, BackToBackExponential_sptr peak,
- BackgroundFunction_sptr backgroundfunction,
+ size_t wsindex, Functions::BackToBackExponential_sptr peak,
+ Functions::BackgroundFunction_sptr backgroundfunction,
double &chi2);
/// Fit 1 peak by using a sequential of minimizer
bool doFit1PeakSequential(DataObjects::Workspace2D_sptr dataws,
size_t workspaceindex,
- BackToBackExponential_sptr peakfunction,
+ Functions::BackToBackExponential_sptr peakfunction,
std::vector<std::string> minimzernames,
std::vector<size_t> maxiterations,
std::vector<double> dampfactors, double &chi2);
@@ -197,7 +197,7 @@ private:
/// Fit N overlapped peaks in a simple manner
bool doFitNPeaksSimple(DataObjects::Workspace2D_sptr dataws, size_t wsindex,
API::CompositeFunction_sptr peaksfunc,
- std::vector<BackToBackExponential_sptr> peakfuncs,
+ std::vector<Functions::BackToBackExponential_sptr> peakfuncs,
std::string minimizername, size_t maxiteration,
double &chi2);
@@ -241,15 +241,15 @@ private:
// double leftbound, double rightbound);
/// Estimate the range of a single peak
- bool estimateSinglePeakRange(BackToBackExponential_sptr peak,
- BackgroundFunction_sptr background,
- BackToBackExponential_sptr rightpeak,
+ bool estimateSinglePeakRange(Functions::BackToBackExponential_sptr peak,
+ Functions::BackgroundFunction_sptr background,
+ Functions::BackToBackExponential_sptr rightpeak,
double fwhm, bool ismostright, size_t m_wsIndex,
double &chi2);
/// Observe peak range with hint from right peak's properties
- void observePeakRange(BackToBackExponential_sptr thispeak,
- BackToBackExponential_sptr rightpeak,
+ void observePeakRange(Functions::BackToBackExponential_sptr thispeak,
+ Functions::BackToBackExponential_sptr rightpeak,
double refpeakshift, double &peakleftbound,
double &peakrightbound);
@@ -266,16 +266,16 @@ private:
/// Fit background function by removing the peak properly
bool doFitBackground(DataObjects::Workspace2D_sptr dataws,
- BackgroundFunction_sptr background, double leftpeakbound,
+ Functions::BackgroundFunction_sptr background, double leftpeakbound,
double rightpeakbound);
/// Fit single peak without background
std::pair<bool, double> doFitPeak_Old(DataObjects::Workspace2D_sptr dataws,
- BackToBackExponential_sptr peak,
+ Functions::BackToBackExponential_sptr peak,
double guessedfwhm, bool calchi2);
std::pair<bool, double> doFitPeak(DataObjects::Workspace2D_sptr dataws,
- BackToBackExponential_sptr peakfunction,
+ Functions::BackToBackExponential_sptr peakfunction,
double guessedfwhm);
/// Fit background-removed peak by Gaussian
@@ -289,7 +289,7 @@ private:
/// Calcualte the value of a single peak in a given range.
void calculate1PeakGroup(std::vector<size_t> peakindexes,
- BackgroundFunction_sptr background);
+ Functions::BackgroundFunction_sptr background);
/// Parse the fitting result
std::string parseFitResult(API::IAlgorithm_sptr fitalg, double &chi2,
@@ -312,7 +312,7 @@ private:
/// Plot a single peak to output vector
void plotFunction(API::IFunction_sptr peakfunction,
- BackgroundFunction_sptr background,
+ Functions::BackgroundFunction_sptr background,
API::FunctionDomain1DVector domain);
//-----------------------------------------------------------------------------------------------
@@ -332,7 +332,7 @@ private:
/// Sorted vector for peaks. double = d_h, vector = (HKL), peak
std::vector<std::pair<
- double, std::pair<std::vector<int>, BackToBackExponential_sptr>>>
+ double, std::pair<std::vector<int>, Functions::BackToBackExponential_sptr>>>
m_vecPeakFunctions;
/// Peak fitting information
@@ -415,7 +415,7 @@ inline double linearInterpolateY(double x0, double xf, double y0, double yf,
/// Estimate background for a pattern in a coarse mode
void estimateBackgroundCoarse(DataObjects::Workspace2D_sptr dataws,
- BackgroundFunction_sptr background,
+ Functions::BackgroundFunction_sptr background,
size_t wsindexraw, size_t wsindexbkgd,
size_t wsindexpeak);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Abragam.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Abragam.h
index 426c69d337e..0bfcade021d 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Abragam.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Abragam.h
@@ -12,6 +12,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide Abragam fitting function for muon scientists
@@ -64,6 +65,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h
index b5bfb46bb67..b45302749aa 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h
@@ -12,6 +12,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
A wrapper around GSL functions implementing a B-spline.
@@ -75,6 +76,7 @@ private:
m_bsplineDerivWorkspace;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackToBackExponential.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackToBackExponential.h
index 103d8679b41..83910c281db 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackToBackExponential.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackToBackExponential.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide BackToBackExponential peak shape function interface to IPeakFunction.
That is the function:
@@ -87,6 +88,7 @@ protected:
typedef boost::shared_ptr<BackToBackExponential> BackToBackExponential_sptr;
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackgroundFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackgroundFunction.h
index 46f9f2f25c3..fc373fc1331 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackgroundFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackgroundFunction.h
@@ -13,6 +13,7 @@ class Parser;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
A background function. Functions that are intended to be used as backgrounds
should inherit from this class to enable certain features. E.g. querying
@@ -74,6 +75,7 @@ public:
typedef boost::shared_ptr<BackgroundFunction> BackgroundFunction_sptr;
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h
index cdddca1c7c9..821eb0f3bbf 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h
@@ -13,6 +13,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
* Provide peak shape function interface a Peak shape on one time slice of a
@@ -176,6 +177,7 @@ protected:
expCoeffxy; //<Other common values used in calculating values and
//<derivatives
};
+} // namespace Functions
}
}
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Bk2BkExpConvPV.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Bk2BkExpConvPV.h
index f7511c3810a..be7ed03f4ad 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Bk2BkExpConvPV.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Bk2BkExpConvPV.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** Bk2BkExpConvPV : Peak profile as tback-to-back exponential convoluted with
pseudo-Voigt.
@@ -92,6 +93,7 @@ private:
typedef boost::shared_ptr<Bk2BkExpConvPV> Bk2BkExpConvPV_sptr;
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ChebfunBase.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ChebfunBase.h
index 84b7dc703ba..92dd84b3ddf 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ChebfunBase.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ChebfunBase.h
@@ -15,6 +15,7 @@ class IFunction;
}
namespace CurveFitting {
+namespace Functions {
/// Type of the approximated function
typedef std::function<double(double)> ChebfunFunctionType;
@@ -213,6 +214,7 @@ boost::shared_ptr<ChebfunBase> ChebfunBase::bestFitAnyTolerance(
return ChebfunBase_sptr();
}
+} // namespace Functions
} // CurveFitting
} // Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h
index 2c8f4c2bec5..0b4209636d5 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Implements Chebyshev polynomial expansion.
@@ -72,6 +73,7 @@ private:
typedef boost::shared_ptr<Chebyshev> Chebyshev_sptr;
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonPeakProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonPeakProfile.h
index 22d9514f8f6..a3a8d2dfb18 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonPeakProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonPeakProfile.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
This implements a resolution function for fitting a single mass in a compton
scattering spectrum. The
@@ -81,6 +82,7 @@ private:
double m_hwhmLorentz;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
index 2c677bfebc3..5190737dc2d 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
@@ -14,6 +14,7 @@ namespace CurveFitting {
//---------------------------------------------------------------------------
struct DetectorParams;
+namespace Functions {
/**
This class serves as a base-class for ComptonProfile type functions. @see
GaussianComptonProfile, GramCharlierComptonProfile
@@ -59,13 +60,13 @@ public:
/// Pre-calculate the Y-space values with specified resolution parameters
void cacheYSpaceValues(const std::vector<double> &tseconds,
- const bool isHistogram, const DetectorParams &detpar,
+ const bool isHistogram, const CurveFitting::DetectorParams &detpar,
const ResolutionParams &respar);
/// Pre-calculate the Y-space values
virtual void cacheYSpaceValues(const std::vector<double> &tseconds,
const bool isHistogram,
- const DetectorParams &detpar);
+ const CurveFitting::DetectorParams &detpar);
/// Turn off logger
void disableLogging() { m_log.setEnabled(false); }
///@}
@@ -133,6 +134,7 @@ protected:
///@}
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonScatteringCountRate.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonScatteringCountRate.h
index 1ef57d0652d..a34ee169656 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonScatteringCountRate.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonScatteringCountRate.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Implements a specialized function that encapsulates the combination of
@@ -92,6 +93,7 @@ private:
std::vector<double> m_dataErrorRatio;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h
index 499d426d8bb..b1e5791269a 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h
@@ -11,6 +11,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Performes convolution of two functions.
@@ -151,6 +152,7 @@ private:
mutable std::vector<double> m_resolution;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h
index 57f3df02f9c..3dbaa2c4dc2 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h
@@ -13,6 +13,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
A wrapper around GSL functions implementing cubic spline interpolation.
@@ -117,6 +118,7 @@ private:
typedef boost::shared_ptr<CubicSpline> CubicSpline_sptr;
typedef const boost::shared_ptr<CubicSpline> CubicSpline_const_sptr;
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DeltaFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DeltaFunction.h
index 1f0b682f088..9f98b9cafbc 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DeltaFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DeltaFunction.h
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Delta function. Makes sence in Convolution only.
@@ -78,6 +79,7 @@ protected:
}
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffRotDiscreteCircle.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffRotDiscreteCircle.h
index 8b1c38f194a..0157a963217 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffRotDiscreteCircle.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffRotDiscreteCircle.h
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
@author Jose Borreguero, NScD
@date December 02 2013
@@ -125,6 +126,7 @@ private:
boost::shared_ptr<InelasticDiffRotDiscreteCircle> m_inelastic;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffSphere.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffSphere.h
index 7db3b4e8053..b7eeb4b57e0 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffSphere.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffSphere.h
@@ -14,6 +14,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
@author Jose Borreguero, NScD
@date 11/14/2011
@@ -172,6 +173,7 @@ private:
m_inelastic; // inelastic intensity of the DiffSphere structure factor
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DynamicKuboToyabe.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DynamicKuboToyabe.h
index 7b24a53770f..9865dd6b967 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DynamicKuboToyabe.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DynamicKuboToyabe.h
@@ -11,6 +11,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide Dynamic Kubo Toyabe function interface to IFunction1D for muon
scientists.
@@ -87,6 +88,7 @@ private:
double m_minEps, m_maxEps;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/EndErfc.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/EndErfc.h
index 490ab7dba3c..1519739ca40 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/EndErfc.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/EndErfc.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide Errore function erfc()for calibrating the end of a tube.
@@ -57,6 +58,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecay.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecay.h
index 60ccb117530..45732a7d112 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecay.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecay.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide exponential decay function: h*exp(-(x-c)/t)
@@ -56,6 +57,7 @@ protected:
const size_t nData);
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayMuon.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayMuon.h
index b12e4e30a12..7a42e6a9aaf 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayMuon.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayMuon.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide exponential decay function: h*exp(-lambda.x)
@@ -59,6 +60,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayOsc.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayOsc.h
index 9f896924044..07d3ad4d03a 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayOsc.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayOsc.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide oscillating exponential decay function:
h*exp(-lambda.x)*(cos(2pi*f*x+phi))
@@ -61,6 +62,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FlatBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FlatBackground.h
index fe028898ffb..cb1add33745 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FlatBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FlatBackground.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** FlatBackground : TODO: DESCRIPTION
@@ -47,6 +48,7 @@ private:
void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h
index 630b2d05fb8..8a5f52c3953 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** FullprofPolynomial : Polynomial background defined in Fullprof
@@ -75,6 +76,7 @@ private:
typedef boost::shared_ptr<FullprofPolynomial> FullprofPolynomial_sptr;
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausDecay.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausDecay.h
index ac17d712218..053d65163a9 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausDecay.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausDecay.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide gaussian decay function: A*exp(-(sigma.x)^2))
@@ -59,6 +60,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausOsc.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausOsc.h
index a80e5df087e..b54279a77ad 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausOsc.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausOsc.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide gaussian decay function: A*exp(-(sigma.x)^2))
@@ -59,6 +60,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Gaussian.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Gaussian.h
index da8d2b4914c..c56f8618d54 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Gaussian.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Gaussian.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide gaussian peak shape function interface to IPeakFunction.
I.e. the function: Height*exp(-0.5*((x-PeakCentre)/Sigma)^2).
@@ -79,6 +80,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GaussianComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GaussianComptonProfile.h
index d70a4fe39d9..60c6ffe5f62 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GaussianComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GaussianComptonProfile.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Implements a function to calculate the Compton profile of a nucleus using a
@@ -64,6 +65,7 @@ private:
const double amplitude) const;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
index 410c024e5fc..5a28323ba55 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Implements a function to calculate the Compton profile of a nucleus using a
@@ -95,6 +96,7 @@ private:
bool m_userFixedFSE;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/IkedaCarpenterPV.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/IkedaCarpenterPV.h
index ecb2f57bc91..bc8cc43f3e6 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/IkedaCarpenterPV.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/IkedaCarpenterPV.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide Ikeda-Carpenter-pseudo-Voigt peak shape function interface to
IPeakFunction. See wiki
@@ -96,6 +97,7 @@ private:
double &eta) const;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LinearBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LinearBackground.h
index 90508ebbe78..e8ba0edd444 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LinearBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LinearBackground.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide linear function interface to IFunction.
I.e. the function: A0+A1*x.
@@ -61,6 +62,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LogNormal.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LogNormal.h
index 6816b53db95..90273384e73 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LogNormal.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LogNormal.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide Log Normal function: h*exp(-(log(x)-t)^2 / (2*b^2) )/x
@@ -54,6 +55,7 @@ protected:
const size_t nData);
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian.h
index b6b816d9d1f..132408dee74 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide lorentzian peak shape function interface to IPeakFunction.
I.e. the function: \f$ \frac{A}{\pi}( \Gamma/2((x-PeakCentre)^2+(\Gamma/2)^2)
@@ -69,6 +70,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h
index 66fb65e1847..0977728612c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Deprecation notice: instead of using this algorithm please use the Fit algorithm
where the Function parameter of this algorithm is used
@@ -80,6 +81,7 @@ private:
const double *xValues, const size_t nData);
};
+} // namespace Functions
} // namespace Algorithm
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/MuonFInteraction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/MuonFInteraction.h
index 508ea9d2279..f474266b560 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/MuonFInteraction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/MuonFInteraction.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide Muon F Interaction fitting function
@@ -57,6 +58,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h
index 93933ea8871..7ddc907fdab 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** NeutronBk2BkExpConvPVoigt : Back-to-back exponential function convoluted
with pseudo-voigt
@@ -128,6 +129,7 @@ private:
mutable double m_N;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h
index a9e3214fd49..a56373b3107 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h
@@ -13,6 +13,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** @class PawleyParameterFunction
@@ -173,6 +174,7 @@ protected:
typedef boost::shared_ptr<PawleyFunction> PawleyFunction_sptr;
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PeakParameterFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PeakParameterFunction.h
index 22621031ef1..e0d34610fbf 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PeakParameterFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PeakParameterFunction.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** PeakParameterFunction :
@@ -62,6 +63,7 @@ protected:
API::IPeakFunction_sptr m_peakFunction;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Polynomial.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Polynomial.h
index 6d2c89a1ed1..fcb94465278 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Polynomial.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Polynomial.h
@@ -7,6 +7,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** Polynomial : N-th polynomial background function.
@@ -73,6 +74,7 @@ private:
typedef boost::shared_ptr<Polynomial> Polynomial_sptr;
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProcessBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProcessBackground.h
index 8ccd29796cf..e5b8e1dd272 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProcessBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProcessBackground.h
@@ -13,6 +13,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
class RemovePeaks {
public:
@@ -141,6 +142,7 @@ private:
void fitBackgroundFunction(std::string bkgdfunctiontype);
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductFunction.h
index 83ca1c3239d..cef21a28232 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductFunction.h
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Allow user to create a fit function which is the product of two or
more other fit functions.
@@ -62,6 +63,7 @@ protected:
virtual void init(){};
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductLinearExp.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductLinearExp.h
index b49be7f9b1d..2e54ad0d69c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductLinearExp.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductLinearExp.h
@@ -7,6 +7,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** ProductLinearExp : Function that evauates the product of an exponential and
linear function.
@@ -49,6 +50,7 @@ protected:
const size_t nData) const;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductQuadraticExp.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductQuadraticExp.h
index 257482ed18e..ac047a16d19 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductQuadraticExp.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductQuadraticExp.h
@@ -7,6 +7,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** ProductQuadraticExp : Function that evauates the product of an exponential
and quadratic function.
@@ -49,6 +50,7 @@ protected:
const size_t nData) const;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PseudoVoigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PseudoVoigt.h
index 6c970c4b17c..53a3f331d2b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PseudoVoigt.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PseudoVoigt.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** PseudoVoigt
@@ -71,6 +72,7 @@ protected:
void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Quadratic.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Quadratic.h
index 4b39a909bd2..41eb1812f44 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Quadratic.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Quadratic.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide quadratic function interface to IFunction.
I.e. the function: A0+A1*x+A2*x^2
@@ -60,6 +61,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ReflectivityMulf.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ReflectivityMulf.h
index 0ccf77e23f6..b1c6fb99b98 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ReflectivityMulf.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ReflectivityMulf.h
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** ReflectivityMulf : Calculate the ReflectivityMulf from a simple layer model.
@@ -59,6 +60,7 @@ private:
typedef boost::shared_ptr<ReflectivityMulf> ReflectivityMulf_sptr;
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Resolution.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Resolution.h
index 3961ac99727..bfb2f49bc06 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Resolution.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Resolution.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Resolution function. It is implemented in terms of TabulatedFunction but doesn't
inherit form it.
@@ -67,6 +68,7 @@ private:
TabulatedFunction m_fun;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/SimpleChebfun.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/SimpleChebfun.h
index ee4082ce689..e05bfbcd112 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/SimpleChebfun.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/SimpleChebfun.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** SimpleChebfun : approximates smooth 1d functions and
provides methods to manipulate them.
@@ -94,6 +95,7 @@ private:
bool m_badFit;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabe.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabe.h
index b959aa5ecf4..b6beff8a18a 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabe.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabe.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide static Kubo Toyabe fitting function
@@ -57,6 +58,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h
index 143973e3c74..0ceebf0aa2e 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
StaticKuboToyabeTimesExpDecay fitting function
@@ -51,6 +52,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h
index 0b4d63300dc..6f9370af94c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
StaticKuboToyabeTimesGausDecay fitting function.
@@ -51,6 +52,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExp.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExp.h
index 7f61f545b00..43677513e13 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExp.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExp.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide Streteched Exponential fitting function: h*exp(-(x/t)^b )
@@ -55,6 +56,7 @@ protected:
const size_t nData);
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExpMuon.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExpMuon.h
index 433965a3487..4816212d1a4 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExpMuon.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExpMuon.h
@@ -8,6 +8,7 @@
#include "MantidAPI/IFunction1D.h"
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Provide stetch exponential function for Muon scientists
@@ -52,6 +53,7 @@ protected:
virtual void init();
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/TabulatedFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/TabulatedFunction.h
index 2fe8d9ae5d1..a4e4812efbe 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/TabulatedFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/TabulatedFunction.h
@@ -19,6 +19,7 @@ class MatrixWorkspace;
}
namespace CurveFitting {
+namespace Functions {
/**
A function which takes its values from a file or a workspace. The values atr
@@ -124,6 +125,7 @@ private:
mutable bool m_setupFinished;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h
index a8b2aee386c..5ee5b6e50b5 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h
@@ -7,6 +7,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** ThermalNeutronBk2BkExpAlpha : Function to calculate Alpha of Bk2Bk
Exponential function from
@@ -71,6 +72,7 @@ private:
typedef boost::shared_ptr<ThermalNeutronBk2BkExpAlpha>
ThermalNeutronBk2BkExpAlpha_sptr;
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h
index f88f29f5001..31e1d7efd79 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h
@@ -7,6 +7,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** ThermalNeutronBk2BkExpBETA : Function to calculate Beta of Bk2Bk Exponential
function from
@@ -71,6 +72,7 @@ private:
typedef boost::shared_ptr<ThermalNeutronBk2BkExpBeta>
ThermalNeutronBk2BkExpBeta_sptr;
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
index e36a938cb9b..267f3ab7819 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** ThermalNeutronBk2BkExpConvPVoigt :
Back-to-back exponential convoluted with pseudo Voigt for thermal neutron
@@ -196,6 +197,7 @@ inline double calCubicDSpace(double a, int h, int k, int l)
/// Integral for Gamma
// std::complex<double> E1X(std::complex<double> z);
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h
index c4534681d1b..412ea0d4402 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h
@@ -7,6 +7,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** ThermalNeutronBk2BkExpSIGMA : Function to calculate Sigma of Bk2Bk
Exponential function from
@@ -70,6 +71,7 @@ private:
typedef boost::shared_ptr<ThermalNeutronBk2BkExpSigma>
ThermalNeutronBk2BkExpSigma_sptr;
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h
index 0fef3abbf8c..8d0c4a2ed84 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h
@@ -14,6 +14,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/** ThermalNeutronDtoTOFFunction : TODO: DESCRIPTION
@@ -98,6 +99,7 @@ inline double calThermalNeutronTOF(double dh, double dtt1, double dtt1t,
return tof_h;
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h
index ca9c41550d9..cd6e468fee1 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h
@@ -14,6 +14,7 @@ class Parser;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
A user defined function.
@@ -95,6 +96,7 @@ private:
static double *AddVariable(const char *varName, void *pufun);
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h
index 1c27d36a0a1..e8d09262245 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Deprecation notice: instead of using this algorithm please use the Fit algorithm
where the Function parameter of this algorithm is used
@@ -121,6 +122,7 @@ private:
boost::shared_array<double> m_tmp1;
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
index 02f62fb838f..0dee35e1066 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
@@ -12,6 +12,8 @@ namespace CurveFitting {
// Forward declarations
//---------------------------------------------------------------------------
struct DetectorParams;
+namespace Functions {
+
//---------------------------------------------------------------------------
/// Simple data structure to store resolution parameter values
@@ -118,6 +120,7 @@ private:
///@}
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Voigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Voigt.h
index 192bcb12d02..780771239cd 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Voigt.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Voigt.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
/**
Implements an analytical approximation to the Voigt function.
@@ -66,6 +67,7 @@ private:
void setFwhm(const double value);
};
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LatticeFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/LatticeFunction.h
index 400a66e687a..3c8886b0b64 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/LatticeFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/LatticeFunction.h
@@ -61,7 +61,7 @@ protected:
void beforeDecoratedFunctionSet(const API::IFunction_sptr &fn);
private:
- PawleyParameterFunction_sptr m_cellParameters;
+ Functions::PawleyParameterFunction_sptr m_cellParameters;
};
typedef boost::shared_ptr<LatticeFunction> LatticeFunction_sptr;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFit.h b/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFit.h
index 9759038a6a0..ac2377fab9b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFit.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFit.h
@@ -136,7 +136,7 @@ private:
/// Examine whether the insturment parameter set to a peak can cause a valid
/// set of peak profile of that peak
bool examinInstrumentParameterValid(
- CurveFitting::ThermalNeutronBk2BkExpConvPVoigt_sptr peak, double &d_h,
+ Functions::ThermalNeutronBk2BkExpConvPVoigt_sptr peak, double &d_h,
double &tof_h, std::string &errmsg);
/// Set parameters to each peak
@@ -161,13 +161,13 @@ private:
/// Group peaks together
void groupPeaks(std::vector<std::vector<
- std::pair<double, CurveFitting::ThermalNeutronBk2BkExpConvPVoigt_sptr>>> &
+ std::pair<double, Functions::ThermalNeutronBk2BkExpConvPVoigt_sptr>>> &
peakgroupvec);
/// Calcualate the peak heights of a group of overlapped peaks
bool calculateGroupPeakIntensities(
std::vector<std::pair<
- double, CurveFitting::ThermalNeutronBk2BkExpConvPVoigt_sptr>>
+ double, Functions::ThermalNeutronBk2BkExpConvPVoigt_sptr>>
peakgroup,
API::MatrixWorkspace_sptr dataws, size_t wsindex, bool zerobackground,
std::vector<double> &allpeaksvalues);
@@ -343,7 +343,7 @@ private:
-------------------------------*/
/// Background function
- CurveFitting::BackgroundFunction_sptr m_backgroundFunction;
+ Functions::BackgroundFunction_sptr m_backgroundFunction;
/// Function parameters updated by fit
std::map<std::string, Parameter>
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFunction.h
index cad2f0e9667..5133b660fb0 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFunction.h
@@ -174,7 +174,7 @@ private:
/// Composite functions for all peaks and background
API::CompositeFunction_sptr m_compsiteFunction;
/// Background function
- BackgroundFunction_sptr m_background;
+ Functions::BackgroundFunction_sptr m_background;
/// Parameters
std::map<std::string, double> m_functionParameters;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/PawleyFit.h b/Framework/CurveFitting/inc/MantidCurveFitting/PawleyFit.h
index 5a209cfa165..e7a45729d87 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/PawleyFit.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/PawleyFit.h
@@ -76,18 +76,18 @@ public:
protected:
double getTransformedCenter(double d, const Kernel::Unit_sptr &unit) const;
- void addHKLsToFunction(PawleyFunction_sptr &pawleyFn,
+ void addHKLsToFunction(Functions::PawleyFunction_sptr &pawleyFn,
const API::ITableWorkspace_sptr &tableWs,
const Kernel::Unit_sptr &unit, double startX,
double endX) const;
API::ITableWorkspace_sptr
- getLatticeFromFunction(const PawleyFunction_sptr &pawleyFn) const;
+ getLatticeFromFunction(const Functions::PawleyFunction_sptr &pawleyFn) const;
API::ITableWorkspace_sptr
- getPeakParametersFromFunction(const PawleyFunction_sptr &pawleyFn) const;
+ getPeakParametersFromFunction(const Functions::PawleyFunction_sptr &pawleyFn) const;
API::IFunction_sptr
- getCompositeFunction(const PawleyFunction_sptr &pawleyFn) const;
+ getCompositeFunction(const Functions::PawleyFunction_sptr &pawleyFn) const;
void init();
void exec();
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h b/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
index 323c19b6543..f60697f3585 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
@@ -183,7 +183,7 @@ private:
std::map<std::string, Parameter> m_profileParameters;
/// My function for peak positions
- ThermalNeutronDtoTOFFunction_sptr m_positionFunc;
+ Functions::ThermalNeutronDtoTOFFunction_sptr m_positionFunc;
/// Damping factor
double m_dampingFactor;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SplineInterpolation.h b/Framework/CurveFitting/inc/MantidCurveFitting/SplineInterpolation.h
index dbec8b37898..f74ba662a3c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SplineInterpolation.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/SplineInterpolation.h
@@ -62,7 +62,7 @@ private:
void exec();
/// CubicSpline member used to perform interpolation
- boost::shared_ptr<CubicSpline> m_cspline;
+ boost::shared_ptr<Functions::CubicSpline> m_cspline;
/// setup an output workspace using meta data from inws and taking a number of
/// spectra
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SplineSmoothing.h b/Framework/CurveFitting/inc/MantidCurveFitting/SplineSmoothing.h
index 66fc8771db7..86692dee31c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SplineSmoothing.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/SplineSmoothing.h
@@ -106,7 +106,7 @@ private:
void performAdditionalFitting(API::MatrixWorkspace_sptr ws, const int row);
/// CubicSpline member used to perform smoothing
- boost::shared_ptr<BSpline> m_cspline;
+ boost::shared_ptr<Functions::BSpline> m_cspline;
/// pointer to the input workspace
API::MatrixWorkspace_sptr m_inputWorkspace;
/// pointer to the input workspace converted to point data
diff --git a/Framework/CurveFitting/src/CalculateChiSquared.cpp b/Framework/CurveFitting/src/CalculateChiSquared.cpp
index 9a0f5b03130..5c6016c6ba0 100644
--- a/Framework/CurveFitting/src/CalculateChiSquared.cpp
+++ b/Framework/CurveFitting/src/CalculateChiSquared.cpp
@@ -9,8 +9,9 @@
namespace Mantid {
namespace CurveFitting {
-using namespace Mantid::Kernel;
-using namespace Mantid::API;
+using namespace Kernel;
+using namespace API;
+using namespace Functions;
// Register the algorithm into the AlgorithmFactory
DECLARE_ALGORITHM(CalculateChiSquared)
diff --git a/Framework/CurveFitting/src/CalculateGammaBackground.cpp b/Framework/CurveFitting/src/CalculateGammaBackground.cpp
index e0f96bf6ee9..35467b55fe1 100644
--- a/Framework/CurveFitting/src/CalculateGammaBackground.cpp
+++ b/Framework/CurveFitting/src/CalculateGammaBackground.cpp
@@ -18,6 +18,8 @@ namespace Mantid {
namespace CurveFitting {
using namespace API;
using namespace Kernel;
+using namespace Functions;
+using namespace BOOST_FUNCTION_STD_NS;
using namespace std;
// Subscription
@@ -227,8 +229,8 @@ void CalculateGammaBackground::calculateSpectrumFromDetector(
// -- Setup detector & resolution parameters --
DetectorParams detPar =
ConvertToYSpace::getDetectorParameters(m_inputWS, inputIndex);
- ResolutionParams detRes =
- VesuvioResolution::getResolutionParameters(m_inputWS, inputIndex);
+ Functions::ResolutionParams detRes =
+ Functions::VesuvioResolution::getResolutionParameters(m_inputWS, inputIndex);
// Compute a time of flight spectrum convolved with a Voigt resolution
// function for each mass
diff --git a/Framework/CurveFitting/src/CalculateMSVesuvio.cpp b/Framework/CurveFitting/src/CalculateMSVesuvio.cpp
index ba6dc91e81b..ff8d17b1f56 100644
--- a/Framework/CurveFitting/src/CalculateMSVesuvio.cpp
+++ b/Framework/CurveFitting/src/CalculateMSVesuvio.cpp
@@ -27,6 +27,7 @@ namespace Mantid {
namespace CurveFitting {
using namespace API;
using namespace Kernel;
+using namespace Functions;
using Geometry::Link;
using Geometry::ParameterMap;
using Geometry::Track;
@@ -319,8 +320,8 @@ void CalculateMSVesuvio::calculateMS(const size_t wsIndex,
DetectorParams detpar =
ConvertToYSpace::getDetectorParameters(m_inputWS, wsIndex);
detpar.t0 *= 1e6; // t0 in microseconds here
- ResolutionParams respar =
- VesuvioResolution::getResolutionParameters(m_inputWS, wsIndex);
+ Functions::ResolutionParams respar =
+ Functions::VesuvioResolution::getResolutionParameters(m_inputWS, wsIndex);
// Final counts averaged over all simulations
MSVesuvioHelper::SimulationAggregator accumulator(m_nruns);
diff --git a/Framework/CurveFitting/src/ConvolveWorkspaces.cpp b/Framework/CurveFitting/src/ConvolveWorkspaces.cpp
index 976dfaf6b1e..3234f14e9ee 100644
--- a/Framework/CurveFitting/src/ConvolveWorkspaces.cpp
+++ b/Framework/CurveFitting/src/ConvolveWorkspaces.cpp
@@ -25,6 +25,7 @@ using namespace Kernel;
using namespace API;
using namespace DataObjects;
using namespace Geometry;
+using namespace Functions;
void ConvolveWorkspaces::init() {
declareProperty(
diff --git a/Framework/CurveFitting/src/FitMW.cpp b/Framework/CurveFitting/src/FitMW.cpp
index 7a4ab09c0b9..730110936f4 100644
--- a/Framework/CurveFitting/src/FitMW.cpp
+++ b/Framework/CurveFitting/src/FitMW.cpp
@@ -449,7 +449,7 @@ void FitMW::appendCompositeFunctionMembers(
// if function is a Convolution then output of convolved model's mebers may be
// required
if (m_convolutionCompositeMembers &&
- boost::dynamic_pointer_cast<CurveFitting::Convolution>(function)) {
+ boost::dynamic_pointer_cast<Functions::Convolution>(function)) {
appendConvolvedCompositeFunctionMembers(functionList, function);
} else {
const auto compositeFn =
@@ -486,8 +486,8 @@ void FitMW::appendCompositeFunctionMembers(
void FitMW::appendConvolvedCompositeFunctionMembers(
std::list<API::IFunction_sptr> &functionList,
const API::IFunction_sptr &function) const {
- boost::shared_ptr<CurveFitting::Convolution> convolution =
- boost::dynamic_pointer_cast<CurveFitting::Convolution>(function);
+ boost::shared_ptr<Functions::Convolution> convolution =
+ boost::dynamic_pointer_cast<Functions::Convolution>(function);
const auto compositeFn = boost::dynamic_pointer_cast<API::CompositeFunction>(
convolution->getFunction(1));
@@ -498,8 +498,8 @@ void FitMW::appendConvolvedCompositeFunctionMembers(
const size_t nlocals = compositeFn->nFunctions();
for (size_t i = 0; i < nlocals; ++i) {
auto localFunction = compositeFn->getFunction(i);
- boost::shared_ptr<CurveFitting::Convolution> localConvolution =
- boost::make_shared<CurveFitting::Convolution>();
+ boost::shared_ptr<Functions::Convolution> localConvolution =
+ boost::make_shared<Functions::Convolution>();
localConvolution->addFunction(resolution);
localConvolution->addFunction(localFunction);
functionList.insert(functionList.end(), localConvolution);
diff --git a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
index 627154c519a..e5ba3d3ff3a 100644
--- a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
+++ b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
@@ -51,6 +51,7 @@ using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::DataObjects;
+using namespace Mantid::CurveFitting::Functions;
using namespace std;
@@ -2812,7 +2813,7 @@ FitPowderDiffPeaks::genPeak(map<string, int> hklmap,
map<string, string> bk2bk2braggmap, bool &good,
vector<int> &hkl, double &d_h) {
// Generate a peak function
- CurveFitting::BackToBackExponential newpeak;
+ BackToBackExponential newpeak;
newpeak.initialize();
BackToBackExponential_sptr newpeakptr =
boost::make_shared<BackToBackExponential>(newpeak);
diff --git a/Framework/CurveFitting/src/Functions/Abragam.cpp b/Framework/CurveFitting/src/Functions/Abragam.cpp
index 5f073b2a156..c0c3af800f9 100644
--- a/Framework/CurveFitting/src/Functions/Abragam.cpp
+++ b/Framework/CurveFitting/src/Functions/Abragam.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(Abragam)
@@ -61,5 +66,6 @@ void Abragam::setActiveParameter(size_t i, double value) {
setParameter(j, value, false);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/BSpline.cpp b/Framework/CurveFitting/src/Functions/BSpline.cpp
index 5bbf9b84368..6b7ab1fffe2 100644
--- a/Framework/CurveFitting/src/Functions/BSpline.cpp
+++ b/Framework/CurveFitting/src/Functions/BSpline.cpp
@@ -11,7 +11,12 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(BSpline)
@@ -251,5 +256,6 @@ void BSpline::getGSLBreakPoints(std::vector<double> &bp) const {
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/BackToBackExponential.cpp b/Framework/CurveFitting/src/Functions/BackToBackExponential.cpp
index 99fb5feb937..a6fb5d6d32f 100644
--- a/Framework/CurveFitting/src/Functions/BackToBackExponential.cpp
+++ b/Framework/CurveFitting/src/Functions/BackToBackExponential.cpp
@@ -12,8 +12,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(BackToBackExponential)
@@ -144,5 +149,6 @@ double BackToBackExponential::expWidth() const {
return M_LN2 * (a + b) / (a * b);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/BackgroundFunction.cpp b/Framework/CurveFitting/src/Functions/BackgroundFunction.cpp
index 2a54bfa701e..3770a40d547 100644
--- a/Framework/CurveFitting/src/Functions/BackgroundFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/BackgroundFunction.cpp
@@ -5,8 +5,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
void BackgroundFunction::fit(const std::vector<double> &X,
@@ -15,5 +20,6 @@ void BackgroundFunction::fit(const std::vector<double> &X,
(void)Y; // Avoid compiler warning
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/BivariateNormal.cpp b/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
index b6d2c5cfbea..3e290bbcae5 100644
--- a/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
+++ b/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
@@ -14,10 +14,14 @@
#include <string>
#include <cstdio>
+
using namespace Mantid::API;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
namespace {
/// static logger
@@ -680,5 +684,6 @@ double BivariateNormal::initCoeff(const MantidVec &D, const MantidVec &X,
return penalty;
}
+} // namespace Functions
} // namespace curveFitting
} // namespaceMantid
diff --git a/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp b/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
index 6fb1733c1f0..d3d85a16fc5 100644
--- a/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
+++ b/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
@@ -6,13 +6,19 @@
#include <gsl/gsl_sf_erf.h>
+
using namespace Mantid::Kernel;
+
using namespace Mantid::API;
+
using namespace std;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
namespace {
/// static logger
Kernel::Logger g_log("Bk2BkExpConvPV");
@@ -250,4 +256,5 @@ void Bk2BkExpConvPV::calHandEta(double sigma2, double gamma, double &H,
}
} // namespace Mantid
+} // namespace Functions
} // namespace CurveFitting
diff --git a/Framework/CurveFitting/src/Functions/ChebfunBase.cpp b/Framework/CurveFitting/src/Functions/ChebfunBase.cpp
index 0aa3e9de492..cdfe41b9ac3 100644
--- a/Framework/CurveFitting/src/Functions/ChebfunBase.cpp
+++ b/Framework/CurveFitting/src/Functions/ChebfunBase.cpp
@@ -19,6 +19,9 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
// Set the comparison tolerance.
const double ChebfunBase::g_tolerance = 1e-15;
@@ -297,7 +300,8 @@ ChebfunBase::evalVector(const std::vector<double> &x,
*/
void ChebfunBase::derivative(const std::vector<double> &a,
std::vector<double> &aout) const {
- using namespace std::placeholders;
+
+using namespace std::placeholders;
if (a.size() != m_x.size()) {
throw std::invalid_argument(
"Cannot calculate derivative: coeffs vector has wrong size.");
@@ -331,7 +335,8 @@ void ChebfunBase::derivative(const std::vector<double> &a,
*/
ChebfunBase_sptr ChebfunBase::integral(const std::vector<double> &a,
std::vector<double> &aout) const {
- using namespace std::placeholders;
+
+using namespace std::placeholders;
if (a.size() != m_x.size()) {
throw std::invalid_argument(
"Cannot calculate integral: coeffs vector has wrong size.");
@@ -926,5 +931,6 @@ ChebfunBase::smooth(const std::vector<double> &xvalues,
return y;
}
+} // Functions
} // CurveFitting
} // Mantid
diff --git a/Framework/CurveFitting/src/Functions/Chebyshev.cpp b/Framework/CurveFitting/src/Functions/Chebyshev.cpp
index cfbee5ff8d0..a55577ab665 100644
--- a/Framework/CurveFitting/src/Functions/Chebyshev.cpp
+++ b/Framework/CurveFitting/src/Functions/Chebyshev.cpp
@@ -9,8 +9,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(Chebyshev)
@@ -99,5 +104,6 @@ void Chebyshev::setAttribute(const std::string &attName,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp b/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp
index b962921c334..f13a5e20c07 100644
--- a/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp
@@ -9,6 +9,9 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(ComptonPeakProfile)
@@ -82,7 +85,8 @@ void ComptonPeakProfile::function1D(double *out, const double *xValues,
*/
void ComptonPeakProfile::setUpForFit() {
// Voigt & Gaussian
- using namespace Mantid::API;
+
+using namespace Mantid::API;
m_gauss = boost::dynamic_pointer_cast<IPeakFunction>(
FunctionFactory::Instance().createFunction("Gaussian"));
m_voigt = boost::dynamic_pointer_cast<IPeakFunction>(
@@ -165,5 +169,6 @@ void ComptonPeakProfile::setAttribute(const std::string &name,
m_voigtCutOff = value.asDouble();
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ComptonProfile.cpp b/Framework/CurveFitting/src/Functions/ComptonProfile.cpp
index 76b6430c0f6..0810d501baf 100644
--- a/Framework/CurveFitting/src/Functions/ComptonProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/ComptonProfile.cpp
@@ -8,6 +8,9 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
namespace {
///@cond
@@ -24,7 +27,8 @@ ComptonProfile::ComptonProfile()
: API::ParamFunction(), API::IFunction1D(), m_log("ComptonProfile"),
m_wsIndex(0), m_mass(0.0), m_voigt(), m_resolutionFunction(), m_yspace(),
m_modQ(), m_e0() {
- using namespace Mantid::API;
+
+using namespace Mantid::API;
m_resolutionFunction = boost::dynamic_pointer_cast<VesuvioResolution>(
FunctionFactory::Instance().createFunction("VesuvioResolution"));
}
@@ -53,7 +57,8 @@ void ComptonProfile::function1D(double *out, const double *xValues,
* Creates the internal caches
*/
void ComptonProfile::setUpForFit() {
- using namespace Mantid::API;
+
+using namespace Mantid::API;
m_voigt = boost::dynamic_pointer_cast<IPeakFunction>(
FunctionFactory::Instance().createFunction("Voigt"));
m_resolutionFunction->setUpForFit();
@@ -92,7 +97,7 @@ void ComptonProfile::setMatrixWorkspace(
m_resolutionFunction->setAttributeValue("Mass", m_mass);
m_resolutionFunction->setMatrixWorkspace(workspace, wsIndex, startX, endX);
- DetectorParams detpar =
+ CurveFitting::DetectorParams detpar =
ConvertToYSpace::getDetectorParameters(workspace, m_wsIndex);
this->cacheYSpaceValues(workspace->readX(m_wsIndex),
workspace->isHistogramData(), detpar);
@@ -100,7 +105,7 @@ void ComptonProfile::setMatrixWorkspace(
void ComptonProfile::cacheYSpaceValues(const std::vector<double> &tseconds,
const bool isHistogram,
- const DetectorParams &detpar,
+ const CurveFitting::DetectorParams &detpar,
const ResolutionParams &respar) {
m_resolutionFunction->cacheResolutionComponents(detpar, respar);
this->cacheYSpaceValues(tseconds, isHistogram, detpar);
@@ -113,7 +118,7 @@ void ComptonProfile::cacheYSpaceValues(const std::vector<double> &tseconds,
*/
void ComptonProfile::cacheYSpaceValues(const std::vector<double> &tseconds,
const bool isHistogram,
- const DetectorParams &detpar) {
+ const CurveFitting::DetectorParams &detpar) {
// ------ Fixed coefficients related to resolution & Y-space transforms
// ------------------
const double mevToK = PhysicalConstants::E_mev_toNeutronWavenumberSq;
@@ -235,5 +240,6 @@ void ComptonProfile::voigtApproxDiff(std::vector<double> &voigtDiff,
2.0 * std::pow(epsilon, 3))); // divided by (2eps^3)
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ComptonScatteringCountRate.cpp b/Framework/CurveFitting/src/Functions/ComptonScatteringCountRate.cpp
index 95b90772a47..fa9ed893cb0 100644
--- a/Framework/CurveFitting/src/Functions/ComptonScatteringCountRate.cpp
+++ b/Framework/CurveFitting/src/Functions/ComptonScatteringCountRate.cpp
@@ -10,6 +10,9 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
using Kernel::Logger;
namespace {
@@ -445,5 +448,6 @@ void ComptonScatteringCountRate::createEqualityCM(const size_t nmasses) {
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/Convolution.cpp b/Framework/CurveFitting/src/Functions/Convolution.cpp
index 44bc7671df7..c1f9b0f00a3 100644
--- a/Framework/CurveFitting/src/Functions/Convolution.cpp
+++ b/Framework/CurveFitting/src/Functions/Convolution.cpp
@@ -20,8 +20,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(Convolution)
@@ -297,5 +302,6 @@ void Convolution::refreshResolution() const {
m_resolution.clear();
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/CubicSpline.cpp b/Framework/CurveFitting/src/Functions/CubicSpline.cpp
index 6bebe00be5b..0aaedf393e8 100644
--- a/Framework/CurveFitting/src/Functions/CubicSpline.cpp
+++ b/Framework/CurveFitting/src/Functions/CubicSpline.cpp
@@ -13,12 +13,17 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
namespace {
/// static logger
Kernel::Logger g_log("CubicSpline");
}
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(CubicSpline)
@@ -359,5 +364,6 @@ void CubicSpline::reallocGSLObjects(const int n) {
*
*/
CubicSpline::~CubicSpline() {}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/DeltaFunction.cpp b/Framework/CurveFitting/src/Functions/DeltaFunction.cpp
index e013742ad1b..75bf6d4a42e 100644
--- a/Framework/CurveFitting/src/Functions/DeltaFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/DeltaFunction.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(DeltaFunction)
@@ -32,5 +37,6 @@ void DeltaFunction::functionDeriv1D(Jacobian *out, const double *xValues,
std::runtime_error("Cannot compute derivative of a delta function");
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp b/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp
index bc59c8dae98..80377a015d5 100644
--- a/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp
+++ b/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp
@@ -20,8 +20,13 @@ Mantid::Kernel::Logger g_log("DiffSphere");
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace API;
+
using namespace Geometry;
DECLARE_FUNCTION(ElasticDiffRotDiscreteCircle)
@@ -247,5 +252,6 @@ void DiffRotDiscreteCircle::init() {
applyTies();
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/DiffSphere.cpp b/Framework/CurveFitting/src/Functions/DiffSphere.cpp
index d32d35172d6..17e975a3796 100644
--- a/Framework/CurveFitting/src/Functions/DiffSphere.cpp
+++ b/Framework/CurveFitting/src/Functions/DiffSphere.cpp
@@ -22,9 +22,15 @@ Mantid::Kernel::Logger g_log("DiffSphere");
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace API;
+
using namespace Geometry;
+
using namespace Kernel;
DECLARE_FUNCTION(ElasticDiffSphere)
@@ -351,5 +357,6 @@ void DiffSphere::init() {
applyTies();
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/DynamicKuboToyabe.cpp b/Framework/CurveFitting/src/Functions/DynamicKuboToyabe.cpp
index 4db28775ba8..53e58e5ee2f 100644
--- a/Framework/CurveFitting/src/Functions/DynamicKuboToyabe.cpp
+++ b/Framework/CurveFitting/src/Functions/DynamicKuboToyabe.cpp
@@ -9,8 +9,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(DynamicKuboToyabe)
@@ -375,5 +380,6 @@ bool DynamicKuboToyabe::hasAttribute(const std::string &attName) const {
return attName == "BinWidth";
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/EndErfc.cpp b/Framework/CurveFitting/src/Functions/EndErfc.cpp
index 801c1a7ec12..25469d991ff 100644
--- a/Framework/CurveFitting/src/Functions/EndErfc.cpp
+++ b/Framework/CurveFitting/src/Functions/EndErfc.cpp
@@ -8,8 +8,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(EndErfc)
@@ -51,5 +56,6 @@ void EndErfc::setActiveParameter(size_t i, double value) {
setParameter(j, value, false);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ExpDecay.cpp b/Framework/CurveFitting/src/Functions/ExpDecay.cpp
index 347d9dbf0ec..c08ae76676b 100644
--- a/Framework/CurveFitting/src/Functions/ExpDecay.cpp
+++ b/Framework/CurveFitting/src/Functions/ExpDecay.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(ExpDecay)
@@ -41,5 +46,6 @@ void ExpDecay::functionDeriv1D(Jacobian *out, const double *xValues,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ExpDecayMuon.cpp b/Framework/CurveFitting/src/Functions/ExpDecayMuon.cpp
index 3c30d5b5480..c1318303c9e 100644
--- a/Framework/CurveFitting/src/Functions/ExpDecayMuon.cpp
+++ b/Framework/CurveFitting/src/Functions/ExpDecayMuon.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(ExpDecayMuon)
@@ -41,5 +46,6 @@ void ExpDecayMuon::functionDeriv1D(Jacobian *out, const double *xValues,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ExpDecayOsc.cpp b/Framework/CurveFitting/src/Functions/ExpDecayOsc.cpp
index c07e5cf5a98..f615255fc45 100644
--- a/Framework/CurveFitting/src/Functions/ExpDecayOsc.cpp
+++ b/Framework/CurveFitting/src/Functions/ExpDecayOsc.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(ExpDecayOsc)
@@ -68,5 +73,6 @@ void ExpDecayOsc::setActiveParameter(size_t i, double value) {
setParameter(j, value, false);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/FlatBackground.cpp b/Framework/CurveFitting/src/Functions/FlatBackground.cpp
index 88554b4808a..53246069f04 100644
--- a/Framework/CurveFitting/src/Functions/FlatBackground.cpp
+++ b/Framework/CurveFitting/src/Functions/FlatBackground.cpp
@@ -2,11 +2,16 @@
#include "MantidAPI/FunctionFactory.h"
#include "MantidKernel/System.h"
+
using namespace Mantid::Kernel;
+
using namespace Mantid::API;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(FlatBackground)
//----------------------------------------------------------------------------------------------
@@ -60,4 +65,5 @@ void FlatBackground::functionDeriv1D(API::Jacobian *out, const double *xValues,
}
} // namespace Mantid
+} // namespace Functions
} // namespace CurveFitting
diff --git a/Framework/CurveFitting/src/Functions/FullprofPolynomial.cpp b/Framework/CurveFitting/src/Functions/FullprofPolynomial.cpp
index 9affef7717a..0c694afb8b9 100644
--- a/Framework/CurveFitting/src/Functions/FullprofPolynomial.cpp
+++ b/Framework/CurveFitting/src/Functions/FullprofPolynomial.cpp
@@ -4,6 +4,9 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(FullprofPolynomial)
@@ -161,5 +164,6 @@ bool FullprofPolynomial::hasAttribute(const std::string &attName) const {
return has;
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/GausDecay.cpp b/Framework/CurveFitting/src/Functions/GausDecay.cpp
index b613b01b8e5..dfc79b6c15a 100644
--- a/Framework/CurveFitting/src/Functions/GausDecay.cpp
+++ b/Framework/CurveFitting/src/Functions/GausDecay.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(GausDecay)
@@ -51,5 +56,6 @@ void GausDecay::setActiveParameter(size_t i, double value) {
setParameter(j, value, false);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/GausOsc.cpp b/Framework/CurveFitting/src/Functions/GausOsc.cpp
index cf33e02685c..8cf906c3ae6 100644
--- a/Framework/CurveFitting/src/Functions/GausOsc.cpp
+++ b/Framework/CurveFitting/src/Functions/GausOsc.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(GausOsc)
@@ -69,5 +74,6 @@ void GausOsc::setActiveParameter(size_t i, double value) {
setParameter(j, value, false);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/Gaussian.cpp b/Framework/CurveFitting/src/Functions/Gaussian.cpp
index fb22ec25051..0f056700e25 100644
--- a/Framework/CurveFitting/src/Functions/Gaussian.cpp
+++ b/Framework/CurveFitting/src/Functions/Gaussian.cpp
@@ -9,8 +9,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(Gaussian)
@@ -69,5 +74,6 @@ double Gaussian::activeParameter(size_t i) const {
return getParameter(i);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/GaussianComptonProfile.cpp b/Framework/CurveFitting/src/Functions/GaussianComptonProfile.cpp
index c9ceb919986..23af0e475ee 100644
--- a/Framework/CurveFitting/src/Functions/GaussianComptonProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/GaussianComptonProfile.cpp
@@ -8,6 +8,9 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(GaussianComptonProfile)
const char *WIDTH_PARAM = "Width";
@@ -112,5 +115,6 @@ void GaussianComptonProfile::massProfile(double *result, const size_t nData,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp b/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp
index 7f732cb1c7c..40efd9a5ea2 100644
--- a/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp
@@ -14,6 +14,9 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
// Register into factory
DECLARE_FUNCTION(GramCharlierComptonProfile)
@@ -247,7 +250,8 @@ size_t GramCharlierComptonProfile::fillConstraintMatrix(
void GramCharlierComptonProfile::massProfile(double *result,
const size_t nData) const {
UNUSED_ARG(nData);
- using namespace Mantid::Kernel;
+
+using namespace Mantid::Kernel;
// Hermite expansion (only even terms) + FSE term
const size_t nhermite(m_hermite.size());
@@ -275,7 +279,8 @@ void GramCharlierComptonProfile::massProfile(double *result,
*/
void GramCharlierComptonProfile::addMassProfile(
double *result, const unsigned int npoly) const {
- using namespace Mantid::Kernel;
+
+using namespace Mantid::Kernel;
const double amp(1.0), wg(getParameter(WIDTH_PARAM));
const double ampNorm = amp / (std::sqrt(2.0 * M_PI) * wg);
@@ -300,7 +305,8 @@ void GramCharlierComptonProfile::addMassProfile(
*/
void GramCharlierComptonProfile::addFSETerm(std::vector<double> &lhs) const {
assert(static_cast<size_t>(NFINE_Y) == lhs.size());
- using namespace Mantid::Kernel;
+
+using namespace Mantid::Kernel;
const double amp(1.0), wg(getParameter(WIDTH_PARAM));
const double ampNorm = amp / (std::sqrt(2.0 * M_PI) * wg);
@@ -438,5 +444,6 @@ void GramCharlierComptonProfile::cacheYSpaceValues(
// vector
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp b/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
index 1b113570fcc..72a22b1a576 100644
--- a/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
+++ b/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
@@ -21,14 +21,20 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
namespace {
/// static logger
Kernel::Logger g_log("IkedaCarpenterPV");
}
+
using namespace Kernel;
+
using namespace SpecialFunctionSupport;
+
using namespace Geometry;
DECLARE_FUNCTION(IkedaCarpenterPV)
@@ -366,5 +372,6 @@ void IkedaCarpenterPV::functionDeriv(const API::FunctionDomain &domain,
calNumericalDeriv(domain, jacobian);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/LinearBackground.cpp b/Framework/CurveFitting/src/Functions/LinearBackground.cpp
index 1daef05e516..2882a8b3423 100644
--- a/Framework/CurveFitting/src/Functions/LinearBackground.cpp
+++ b/Framework/CurveFitting/src/Functions/LinearBackground.cpp
@@ -6,8 +6,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(LinearBackground)
@@ -79,5 +84,6 @@ void LinearBackground::fit(const std::vector<double> &X,
setParameter("A1", a1);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/LogNormal.cpp b/Framework/CurveFitting/src/Functions/LogNormal.cpp
index 114011372a9..5382ba6edd6 100644
--- a/Framework/CurveFitting/src/Functions/LogNormal.cpp
+++ b/Framework/CurveFitting/src/Functions/LogNormal.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(LogNormal)
@@ -78,5 +83,6 @@ void LogNormal::functionDeriv1D(API::Jacobian *out, const double *xValues,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/Lorentzian.cpp b/Framework/CurveFitting/src/Functions/Lorentzian.cpp
index b11e875601a..03f0179039e 100644
--- a/Framework/CurveFitting/src/Functions/Lorentzian.cpp
+++ b/Framework/CurveFitting/src/Functions/Lorentzian.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(Lorentzian)
@@ -75,5 +80,6 @@ void Lorentzian::functionDerivLocal(Jacobian *out, const double *xValues,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/Lorentzian1D.cpp b/Framework/CurveFitting/src/Functions/Lorentzian1D.cpp
index e7771cf95a3..604b77dfbc5 100644
--- a/Framework/CurveFitting/src/Functions/Lorentzian1D.cpp
+++ b/Framework/CurveFitting/src/Functions/Lorentzian1D.cpp
@@ -8,11 +8,15 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
using API::Jacobian;
// Register the class into the algorithm factory
DECLARE_ALGORITHM(Lorentzian1D)
+
using namespace Kernel;
void Lorentzian1D::declareParameters() {
@@ -69,5 +73,6 @@ void Lorentzian1D::functionDeriv(const double *in, Jacobian *out,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/MuonFInteraction.cpp b/Framework/CurveFitting/src/Functions/MuonFInteraction.cpp
index c06c3f4680a..095880cbb78 100644
--- a/Framework/CurveFitting/src/Functions/MuonFInteraction.cpp
+++ b/Framework/CurveFitting/src/Functions/MuonFInteraction.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(MuonFInteraction)
@@ -40,5 +45,6 @@ void MuonFInteraction::function1D(double *out, const double *xValues,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/NeutronBk2BkExpConvPVoigt.cpp b/Framework/CurveFitting/src/Functions/NeutronBk2BkExpConvPVoigt.cpp
index c3be6535033..c86a3d3dcff 100644
--- a/Framework/CurveFitting/src/Functions/NeutronBk2BkExpConvPVoigt.cpp
+++ b/Framework/CurveFitting/src/Functions/NeutronBk2BkExpConvPVoigt.cpp
@@ -13,10 +13,14 @@
const double PEAKRANGE = 5.0;
const double NEG_DBL_MAX = -1. * DBL_MAX;
+
using namespace std;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
namespace {
/// static logger
Kernel::Logger g_log("NeutronBk2BkExpConvPV");
@@ -504,5 +508,6 @@ double NeutronBk2BkExpConvPVoigt::calOmega(const double x, const double eta,
return omega;
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/PawleyFunction.cpp b/Framework/CurveFitting/src/Functions/PawleyFunction.cpp
index 1c5802a8729..be3bb4fb202 100644
--- a/Framework/CurveFitting/src/Functions/PawleyFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/PawleyFunction.cpp
@@ -13,11 +13,17 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(PawleyParameterFunction)
+
using namespace API;
+
using namespace Geometry;
+
using namespace Kernel;
/// Constructor
@@ -572,5 +578,6 @@ void PawleyFunction::beforeDecoratedFunctionSet(const API::IFunction_sptr &fn) {
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/PeakParameterFunction.cpp b/Framework/CurveFitting/src/Functions/PeakParameterFunction.cpp
index 00080ec3333..8dfbdf29ca3 100644
--- a/Framework/CurveFitting/src/Functions/PeakParameterFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/PeakParameterFunction.cpp
@@ -4,6 +4,10 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace API;
@@ -59,5 +63,6 @@ void PeakParameterFunction::beforeDecoratedFunctionSet(
m_peakFunction = peakFunction;
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/Polynomial.cpp b/Framework/CurveFitting/src/Functions/Polynomial.cpp
index ac9cc3740cc..573c7c1d29c 100644
--- a/Framework/CurveFitting/src/Functions/Polynomial.cpp
+++ b/Framework/CurveFitting/src/Functions/Polynomial.cpp
@@ -2,13 +2,19 @@
#include "MantidAPI/FunctionFactory.h"
#include <boost/lexical_cast.hpp>
+
using namespace Mantid::Kernel;
+
using namespace Mantid::API;
+
using namespace std;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(Polynomial)
@@ -154,5 +160,6 @@ bool Polynomial::hasAttribute(const std::string &attName) const {
return attName == "n";
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ProcessBackground.cpp b/Framework/CurveFitting/src/Functions/ProcessBackground.cpp
index 2e894fd37c6..0aed9a4a236 100644
--- a/Framework/CurveFitting/src/Functions/ProcessBackground.cpp
+++ b/Framework/CurveFitting/src/Functions/ProcessBackground.cpp
@@ -16,16 +16,25 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/split.hpp>
+
using namespace Mantid;
+
using namespace Mantid::API;
+
using namespace Mantid::Kernel;
+
using namespace Mantid::DataObjects;
+
using namespace Mantid::CurveFitting;
+
using namespace std;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_ALGORITHM(ProcessBackground)
@@ -677,17 +686,17 @@ ProcessBackground::autoBackgroundSelection(Workspace2D_sptr bkgdWS) {
*/
BackgroundFunction_sptr
ProcessBackground::createBackgroundFunction(const string backgroundtype) {
- CurveFitting::BackgroundFunction_sptr bkgdfunction;
+ Functions::BackgroundFunction_sptr bkgdfunction;
if (backgroundtype.compare("Polynomial") == 0) {
bkgdfunction =
- boost::dynamic_pointer_cast<CurveFitting::BackgroundFunction>(
- boost::make_shared<CurveFitting::Polynomial>());
+ boost::dynamic_pointer_cast<Functions::BackgroundFunction>(
+ boost::make_shared<Functions::Polynomial>());
bkgdfunction->initialize();
} else if (backgroundtype.compare("Chebyshev") == 0) {
- Chebyshev_sptr cheby = boost::make_shared<CurveFitting::Chebyshev>();
+ Chebyshev_sptr cheby = boost::make_shared<Functions::Chebyshev>();
bkgdfunction =
- boost::dynamic_pointer_cast<CurveFitting::BackgroundFunction>(cheby);
+ boost::dynamic_pointer_cast<Functions::BackgroundFunction>(cheby);
bkgdfunction->initialize();
g_log.debug() << "[D] Chebyshev is set to range " << m_lowerBound << ", "
@@ -1099,5 +1108,6 @@ size_t RemovePeaks::excludePeaks(vector<double> v_inX, vector<bool> &v_useX,
return count;
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ProductFunction.cpp b/Framework/CurveFitting/src/Functions/ProductFunction.cpp
index a0d1d2ca95d..777e29e20fc 100644
--- a/Framework/CurveFitting/src/Functions/ProductFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/ProductFunction.cpp
@@ -6,6 +6,9 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(ProductFunction)
@@ -34,5 +37,6 @@ void ProductFunction::functionDeriv(const API::FunctionDomain &domain,
calNumericalDeriv(domain, jacobian);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ProductLinearExp.cpp b/Framework/CurveFitting/src/Functions/ProductLinearExp.cpp
index 6f1a2e1ee8d..11330cae66e 100644
--- a/Framework/CurveFitting/src/Functions/ProductLinearExp.cpp
+++ b/Framework/CurveFitting/src/Functions/ProductLinearExp.cpp
@@ -6,8 +6,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(ProductLinearExp)
@@ -72,5 +77,6 @@ void ProductLinearExp::function1D(double *out, const double *xValues,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ProductQuadraticExp.cpp b/Framework/CurveFitting/src/Functions/ProductQuadraticExp.cpp
index 61f49e74edc..5bd2458173b 100644
--- a/Framework/CurveFitting/src/Functions/ProductQuadraticExp.cpp
+++ b/Framework/CurveFitting/src/Functions/ProductQuadraticExp.cpp
@@ -6,6 +6,9 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(ProductQuadraticExp)
@@ -73,5 +76,6 @@ void ProductQuadraticExp::function1D(double *out, const double *xValues,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp b/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp
index fb02af64e85..1992434d583 100644
--- a/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp
+++ b/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp
@@ -6,6 +6,10 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace API;
@@ -83,5 +87,6 @@ void PseudoVoigt::init() {
addConstraint(mixingConstraint);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/Quadratic.cpp b/Framework/CurveFitting/src/Functions/Quadratic.cpp
index c88e4e6b281..105b18d1f96 100644
--- a/Framework/CurveFitting/src/Functions/Quadratic.cpp
+++ b/Framework/CurveFitting/src/Functions/Quadratic.cpp
@@ -6,8 +6,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(Quadratic)
@@ -53,5 +58,6 @@ void Quadratic::functionDeriv1D(API::Jacobian *out, const double *xValues,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ReflectivityMulf.cpp b/Framework/CurveFitting/src/Functions/ReflectivityMulf.cpp
index 60d4e51a903..e1fbe71a230 100644
--- a/Framework/CurveFitting/src/Functions/ReflectivityMulf.cpp
+++ b/Framework/CurveFitting/src/Functions/ReflectivityMulf.cpp
@@ -3,13 +3,19 @@
#include <boost/lexical_cast.hpp>
#include <cmath>
+
using namespace Mantid::Kernel;
+
using namespace Mantid::API;
+
using namespace std;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(ReflectivityMulf)
@@ -292,5 +298,6 @@ void ReflectivityMulf::setAttribute(const std::string &attName,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/Resolution.cpp b/Framework/CurveFitting/src/Functions/Resolution.cpp
index 906f5ccac05..cd46e0cb592 100644
--- a/Framework/CurveFitting/src/Functions/Resolution.cpp
+++ b/Framework/CurveFitting/src/Functions/Resolution.cpp
@@ -6,8 +6,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(Resolution)
@@ -43,5 +48,6 @@ bool Resolution::hasAttribute(const std::string &attName) const {
return m_fun.hasAttribute(attName);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/SimpleChebfun.cpp b/Framework/CurveFitting/src/Functions/SimpleChebfun.cpp
index a765bf8b763..1cc4ce08e3f 100644
--- a/Framework/CurveFitting/src/Functions/SimpleChebfun.cpp
+++ b/Framework/CurveFitting/src/Functions/SimpleChebfun.cpp
@@ -5,6 +5,9 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
//----------------------------------------------------------------------------------------------
/// Constructs a SimpleChebfun that approximates a function with a polynomial of
@@ -163,5 +166,6 @@ SimpleChebfun &SimpleChebfun::operator+=(ChebfunFunctionType fun) {
return *this;
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/StaticKuboToyabe.cpp b/Framework/CurveFitting/src/Functions/StaticKuboToyabe.cpp
index 68ba9df35aa..cec65d94e65 100644
--- a/Framework/CurveFitting/src/Functions/StaticKuboToyabe.cpp
+++ b/Framework/CurveFitting/src/Functions/StaticKuboToyabe.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(StaticKuboToyabe)
@@ -30,5 +35,6 @@ void StaticKuboToyabe::function1D(double *out, const double *xValues,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesExpDecay.cpp b/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesExpDecay.cpp
index 616b8cb9ddb..9afab2aff21 100644
--- a/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesExpDecay.cpp
+++ b/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesExpDecay.cpp
@@ -4,8 +4,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(StaticKuboToyabeTimesExpDecay)
@@ -34,5 +39,6 @@ void StaticKuboToyabeTimesExpDecay::function1D(double *out,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesGausDecay.cpp b/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesGausDecay.cpp
index 2259dcf03fb..3fd2c5394f9 100644
--- a/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesGausDecay.cpp
+++ b/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesGausDecay.cpp
@@ -4,7 +4,12 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(StaticKuboToyabeTimesGausDecay)
@@ -36,5 +41,6 @@ void StaticKuboToyabeTimesGausDecay::function1D(double *out,
A * (exp(-(x2 * D2) / 2) * (1 - x2 * D2) * C1 + C2) * exp(-S2 * x2);
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/StretchExp.cpp b/Framework/CurveFitting/src/Functions/StretchExp.cpp
index a5a14f74e8e..31819073a00 100644
--- a/Framework/CurveFitting/src/Functions/StretchExp.cpp
+++ b/Framework/CurveFitting/src/Functions/StretchExp.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(StretchExp)
@@ -71,5 +76,6 @@ void StretchExp::functionDeriv1D(API::Jacobian *out, const double *xValues,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/StretchExpMuon.cpp b/Framework/CurveFitting/src/Functions/StretchExpMuon.cpp
index afad7082e43..d0e330c6891 100644
--- a/Framework/CurveFitting/src/Functions/StretchExpMuon.cpp
+++ b/Framework/CurveFitting/src/Functions/StretchExpMuon.cpp
@@ -7,8 +7,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
DECLARE_FUNCTION(StretchExpMuon)
@@ -31,5 +36,6 @@ void StretchExpMuon::function1D(double *out, const double *xValues,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/TabulatedFunction.cpp b/Framework/CurveFitting/src/Functions/TabulatedFunction.cpp
index c5979f42c6e..d0efc13940a 100644
--- a/Framework/CurveFitting/src/Functions/TabulatedFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/TabulatedFunction.cpp
@@ -14,7 +14,12 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
+
using namespace Kernel;
+
using namespace API;
namespace {
@@ -276,5 +281,6 @@ void TabulatedFunction::setupData() const {
m_setupFinished = true;
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
index 518c1f418a9..b89938cc5d6 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
@@ -5,13 +5,20 @@
#include <gsl/gsl_sf_erf.h>
#include <cmath>
+
using namespace std;
+
using namespace Mantid;
+
using namespace Mantid::API;
+
using namespace Mantid::CurveFitting;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(ThermalNeutronBk2BkExpAlpha)
@@ -80,5 +87,6 @@ double ThermalNeutronBk2BkExpAlpha::corefunction(double dh, double width,
return alpha;
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp
index 95f5be7b8ad..5b968b8b270 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp
@@ -5,13 +5,20 @@
#include <gsl/gsl_sf_erf.h>
#include <cmath>
+
using namespace std;
+
using namespace Mantid;
+
using namespace Mantid::CurveFitting;
+
using namespace Mantid::API;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(ThermalNeutronBk2BkExpBeta)
@@ -79,5 +86,6 @@ double ThermalNeutronBk2BkExpBeta::corefunction(double dh, double width,
return beta;
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpConvPVoigt.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpConvPVoigt.cpp
index 6ea3aef1db5..bdba393886a 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpConvPVoigt.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpConvPVoigt.cpp
@@ -13,12 +13,18 @@
const double PEAKRANGE = 5.0;
const double NEG_DBL_MAX = -1. * DBL_MAX;
+
using namespace std;
+
using namespace Mantid;
+
using namespace Mantid::API;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
namespace {
/// static reference to the logger
Kernel::Logger g_log("ThermalNeutronBk2BkExpConvPV");
@@ -774,5 +780,6 @@ void ThermalNeutronBk2BkExpConvPVoigt::setPeakRadius(const int& r)
}
*/
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp
index f6912678137..a8fb8aad84b 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp
@@ -5,13 +5,20 @@
#include <gsl/gsl_sf_erf.h>
#include <cmath>
+
using namespace std;
+
using namespace Mantid;
+
using namespace Mantid::API;
+
using namespace Mantid::CurveFitting;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(ThermalNeutronBk2BkExpSigma)
@@ -77,5 +84,6 @@ double ThermalNeutronBk2BkExpSigma::corefunction(double dh, double sig0sq,
return sigma;
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp
index 5bb0a8fe256..8acbebb7a28 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp
@@ -5,11 +5,16 @@
#include <gsl/gsl_sf_erf.h>
#include <cmath>
+
using namespace Mantid::API;
+
using namespace std;
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
//----------------------------------------------------------------------------------------------
DECLARE_FUNCTION(ThermalNeutronDtoTOFFunction)
@@ -140,5 +145,6 @@ void ThermalNeutronDtoTOFFunction::functionDerivLocal(API::Jacobian *,
"ThermalNeutronDtoTOFFunction.");
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/UserFunction.cpp b/Framework/CurveFitting/src/Functions/UserFunction.cpp
index 0b950a52005..90208658fab 100644
--- a/Framework/CurveFitting/src/Functions/UserFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/UserFunction.cpp
@@ -8,11 +8,16 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
// Register the class into the function factory
DECLARE_FUNCTION(UserFunction)
+
using namespace Kernel;
+
using namespace API;
/// Constructor
@@ -113,5 +118,6 @@ void UserFunction::functionDeriv(const API::FunctionDomain &domain,
calNumericalDeriv(domain, jacobian);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/UserFunction1D.cpp b/Framework/CurveFitting/src/Functions/UserFunction1D.cpp
index b85eacaca42..c7e84763dc4 100644
--- a/Framework/CurveFitting/src/Functions/UserFunction1D.cpp
+++ b/Framework/CurveFitting/src/Functions/UserFunction1D.cpp
@@ -8,11 +8,16 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
// Register the class into the algorithm factory
DECLARE_ALGORITHM(UserFunction1D)
+
using namespace Kernel;
+
using namespace API;
/** Static callback function used by MuParser to initialize variables implicitly
@@ -155,5 +160,6 @@ void UserFunction1D::functionDeriv(const double *in, Jacobian *out,
}
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp b/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp
index 38d56c018b3..e1acbb1aba3 100644
--- a/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp
+++ b/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp
@@ -8,6 +8,9 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
namespace {
///@cond
const char *MASS_NAME = "Mass";
@@ -78,7 +81,8 @@ std::string VesuvioResolution::name() const { return "VesuvioResolution"; }
*/
void VesuvioResolution::setUpForFit() {
// Voigt
- using namespace Mantid::API;
+
+using namespace Mantid::API;
m_voigt = boost::dynamic_pointer_cast<IPeakFunction>(
FunctionFactory::Instance().createFunction("Voigt"));
}
@@ -253,5 +257,6 @@ void VesuvioResolution::voigtApprox(std::vector<double> &voigt,
std::bind2nd(std::multiplies<double>(), norm));
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/Voigt.cpp b/Framework/CurveFitting/src/Functions/Voigt.cpp
index 497ba4e5b0d..73ce3f49f99 100644
--- a/Framework/CurveFitting/src/Functions/Voigt.cpp
+++ b/Framework/CurveFitting/src/Functions/Voigt.cpp
@@ -9,6 +9,9 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+
+using namespace CurveFitting;
DECLARE_FUNCTION(Voigt)
namespace {
@@ -165,5 +168,6 @@ void Voigt::setFwhm(const double value) {
this->setParameter(GAUSSIAN_FWHM, 0.5 * value);
}
+} // namespace Functions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/LatticeFunction.cpp b/Framework/CurveFitting/src/LatticeFunction.cpp
index 895327b1d97..0fd29c73d27 100644
--- a/Framework/CurveFitting/src/LatticeFunction.cpp
+++ b/Framework/CurveFitting/src/LatticeFunction.cpp
@@ -62,8 +62,8 @@ void LatticeFunction::init() {
/// Checks that the decorated function is a PawleyParameterFunction.
void LatticeFunction::beforeDecoratedFunctionSet(const IFunction_sptr &fn) {
- PawleyParameterFunction_sptr paramFn =
- boost::dynamic_pointer_cast<PawleyParameterFunction>(fn);
+ Functions::PawleyParameterFunction_sptr paramFn =
+ boost::dynamic_pointer_cast<Functions::PawleyParameterFunction>(fn);
if (!paramFn) {
throw std::invalid_argument(
diff --git a/Framework/CurveFitting/src/LeBailFunction.cpp b/Framework/CurveFitting/src/LeBailFunction.cpp
index bed2bfd968f..7a47d8a0127 100644
--- a/Framework/CurveFitting/src/LeBailFunction.cpp
+++ b/Framework/CurveFitting/src/LeBailFunction.cpp
@@ -894,7 +894,7 @@ void LeBailFunction::addBackgroundFunction(
// Create background function from factory
auto background = FunctionFactory::Instance().createFunction(backgroundtype);
- m_background = boost::dynamic_pointer_cast<BackgroundFunction>(background);
+ m_background = boost::dynamic_pointer_cast<Functions::BackgroundFunction>(background);
// Set order and initialize
m_background->setAttributeValue("n", static_cast<int>(order));
diff --git a/Framework/CurveFitting/src/ParameterEstimator.cpp b/Framework/CurveFitting/src/ParameterEstimator.cpp
index 620ea5d23a9..93c46fd68fb 100644
--- a/Framework/CurveFitting/src/ParameterEstimator.cpp
+++ b/Framework/CurveFitting/src/ParameterEstimator.cpp
@@ -13,6 +13,8 @@ namespace Mantid {
namespace CurveFitting {
namespace ParameterEstimator {
+using namespace Functions;
+
/// The logger.
Kernel::Logger g_log("ParameterEstimator");
diff --git a/Framework/CurveFitting/src/PawleyFit.cpp b/Framework/CurveFitting/src/PawleyFit.cpp
index df3c4cac6d3..90c55982d74 100644
--- a/Framework/CurveFitting/src/PawleyFit.cpp
+++ b/Framework/CurveFitting/src/PawleyFit.cpp
@@ -62,7 +62,7 @@ double PawleyFit::getTransformedCenter(double d, const Unit_sptr &unit) const {
* @param startX :: Lowest allowed x-value for reflection position.
* @param endX :: Highest allowed x-value for reflection position.
*/
-void PawleyFit::addHKLsToFunction(PawleyFunction_sptr &pawleyFn,
+void PawleyFit::addHKLsToFunction(Functions::PawleyFunction_sptr &pawleyFn,
const ITableWorkspace_sptr &tableWs,
const Unit_sptr &unit, double startX,
double endX) const {
@@ -106,7 +106,7 @@ void PawleyFit::addHKLsToFunction(PawleyFunction_sptr &pawleyFn,
/// Creates a table containing the cell parameters stored in the supplied
/// function.
ITableWorkspace_sptr
-PawleyFit::getLatticeFromFunction(const PawleyFunction_sptr &pawleyFn) const {
+PawleyFit::getLatticeFromFunction(const Functions::PawleyFunction_sptr &pawleyFn) const {
if (!pawleyFn) {
throw std::invalid_argument(
"Cannot extract lattice parameters from null function.");
@@ -119,7 +119,7 @@ PawleyFit::getLatticeFromFunction(const PawleyFunction_sptr &pawleyFn) const {
latticeParameterTable->addColumn("double", "Value");
latticeParameterTable->addColumn("double", "Error");
- PawleyParameterFunction_sptr parameters =
+ Functions::PawleyParameterFunction_sptr parameters =
pawleyFn->getPawleyParameterFunction();
for (size_t i = 0; i < parameters->nParams(); ++i) {
@@ -133,7 +133,7 @@ PawleyFit::getLatticeFromFunction(const PawleyFunction_sptr &pawleyFn) const {
/// Extracts all profile parameters from the supplied function.
ITableWorkspace_sptr PawleyFit::getPeakParametersFromFunction(
- const PawleyFunction_sptr &pawleyFn) const {
+ const Functions::PawleyFunction_sptr &pawleyFn) const {
if (!pawleyFn) {
throw std::invalid_argument(
"Cannot extract peak parameters from null function.");
@@ -168,7 +168,7 @@ ITableWorkspace_sptr PawleyFit::getPeakParametersFromFunction(
/// Returns a composite function consisting of the Pawley function and Chebyshev
/// background if enabled in the algorithm.
IFunction_sptr
-PawleyFit::getCompositeFunction(const PawleyFunction_sptr &pawleyFn) const {
+PawleyFit::getCompositeFunction(const Functions::PawleyFunction_sptr &pawleyFn) const {
CompositeFunction_sptr composite = boost::make_shared<CompositeFunction>();
composite->addFunction(pawleyFn);
@@ -271,7 +271,7 @@ void PawleyFit::init() {
/// Execution of algorithm.
void PawleyFit::exec() {
// Setup PawleyFunction with cell from input parameters
- PawleyFunction_sptr pawleyFn = boost::dynamic_pointer_cast<PawleyFunction>(
+ Functions::PawleyFunction_sptr pawleyFn = boost::dynamic_pointer_cast<Functions::PawleyFunction>(
FunctionFactory::Instance().createFunction("PawleyFunction"));
g_log.information() << "Setting up Pawley function..." << std::endl;
@@ -286,7 +286,7 @@ void PawleyFit::exec() {
<< std::endl;
pawleyFn->setUnitCell(getProperty("InitialCell"));
- PawleyParameterFunction_sptr pawleyParameterFunction =
+ Functions::PawleyParameterFunction_sptr pawleyParameterFunction =
pawleyFn->getPawleyParameterFunction();
g_log.information()
<< " Initial unit cell: "
diff --git a/Framework/CurveFitting/src/RefinePowderInstrumentParameters3.cpp b/Framework/CurveFitting/src/RefinePowderInstrumentParameters3.cpp
index b2f339bc14e..bfc7bc09849 100644
--- a/Framework/CurveFitting/src/RefinePowderInstrumentParameters3.cpp
+++ b/Framework/CurveFitting/src/RefinePowderInstrumentParameters3.cpp
@@ -7,6 +7,7 @@
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
using namespace Mantid::Kernel;
using namespace std;
diff --git a/Framework/CurveFitting/src/SplineInterpolation.cpp b/Framework/CurveFitting/src/SplineInterpolation.cpp
index 63731d8bd08..37a81ceee3c 100644
--- a/Framework/CurveFitting/src/SplineInterpolation.cpp
+++ b/Framework/CurveFitting/src/SplineInterpolation.cpp
@@ -12,6 +12,7 @@ DECLARE_ALGORITHM(SplineInterpolation)
using namespace API;
using namespace Kernel;
+using Functions::CubicSpline;
//----------------------------------------------------------------------------------------------
/** Constructor
diff --git a/Framework/CurveFitting/src/SplineSmoothing.cpp b/Framework/CurveFitting/src/SplineSmoothing.cpp
index 9cac9523f02..9c942956ac0 100644
--- a/Framework/CurveFitting/src/SplineSmoothing.cpp
+++ b/Framework/CurveFitting/src/SplineSmoothing.cpp
@@ -16,7 +16,7 @@ DECLARE_ALGORITHM(SplineSmoothing)
using namespace API;
using namespace Kernel;
-
+using Functions::BSpline;
//----------------------------------------------------------------------------------------------
/** Constructor
*/
diff --git a/Framework/CurveFitting/test/BoundaryConstraintTest.h b/Framework/CurveFitting/test/BoundaryConstraintTest.h
index 13ea3e32ac9..b4fe9bb2d01 100644
--- a/Framework/CurveFitting/test/BoundaryConstraintTest.h
+++ b/Framework/CurveFitting/test/BoundaryConstraintTest.h
@@ -15,6 +15,7 @@
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
class BoundaryConstraintTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/CalculateGammaBackgroundTest.h b/Framework/CurveFitting/test/CalculateGammaBackgroundTest.h
index d5d7dbf487a..8fdc2508ece 100644
--- a/Framework/CurveFitting/test/CalculateGammaBackgroundTest.h
+++ b/Framework/CurveFitting/test/CalculateGammaBackgroundTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/CalculateGammaBackground.h"
-#include "ComptonProfileTestHelpers.h"
+#include "Functions/ComptonProfileTestHelpers.h"
using Mantid::CurveFitting::CalculateGammaBackground;
diff --git a/Framework/CurveFitting/test/CalculateMSVesuvioTest.h b/Framework/CurveFitting/test/CalculateMSVesuvioTest.h
index 33f7f30b77a..b1cd29c4d73 100644
--- a/Framework/CurveFitting/test/CalculateMSVesuvioTest.h
+++ b/Framework/CurveFitting/test/CalculateMSVesuvioTest.h
@@ -13,7 +13,7 @@
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
-#include "ComptonProfileTestHelpers.h"
+#include "Functions/ComptonProfileTestHelpers.h"
using Mantid::CurveFitting::CalculateMSVesuvio;
diff --git a/Framework/CurveFitting/test/CompositeFunctionTest.h b/Framework/CurveFitting/test/CompositeFunctionTest.h
index 0bd3491b34d..2c9a053c3a8 100644
--- a/Framework/CurveFitting/test/CompositeFunctionTest.h
+++ b/Framework/CurveFitting/test/CompositeFunctionTest.h
@@ -28,6 +28,7 @@
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::CurveFitting::CostFunctions;
diff --git a/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h b/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h
index 52cb9a0ca9e..425d34058f9 100644
--- a/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h
+++ b/Framework/CurveFitting/test/CostFunctions/LeastSquaresTest.h
@@ -23,6 +23,7 @@ using namespace Mantid;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::CurveFitting::CostFunctions;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class LeastSquaresTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FitMWTest.h b/Framework/CurveFitting/test/FitMWTest.h
index db879700d70..3065472ccea 100644
--- a/Framework/CurveFitting/test/FitMWTest.h
+++ b/Framework/CurveFitting/test/FitMWTest.h
@@ -29,6 +29,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class FitMWTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
index 64b486d611e..8e1ec30d01a 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
@@ -16,6 +16,7 @@ using namespace Mantid;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::CurveFitting::CostFunctions;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class DampingMinimizerTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
index b91888386fd..cd59c1aef27 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
@@ -17,6 +17,7 @@ using Mantid::CurveFitting::FuncMinimisers::FABADAMinimizer;
using namespace Mantid::API;
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
class FABADAMinimizerTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
index 1d0965e42d7..49a24f2a9a0 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
@@ -16,6 +16,7 @@ using namespace Mantid;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::CurveFitting::CostFunctions;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class LevenbergMarquardtMDTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
index a2d9bd2d703..7537ee88047 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
@@ -16,6 +16,7 @@ using namespace Mantid;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::CurveFitting::CostFunctions;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class LevenbergMarquardtTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/AbragamTest.h b/Framework/CurveFitting/test/Functions/AbragamTest.h
index c6a79b99bcd..1bea6f89482 100644
--- a/Framework/CurveFitting/test/Functions/AbragamTest.h
+++ b/Framework/CurveFitting/test/Functions/AbragamTest.h
@@ -19,6 +19,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
class AbragamTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/BSplineTest.h b/Framework/CurveFitting/test/Functions/BSplineTest.h
index ddfadf88c44..b1effded8b5 100644
--- a/Framework/CurveFitting/test/Functions/BSplineTest.h
+++ b/Framework/CurveFitting/test/Functions/BSplineTest.h
@@ -16,6 +16,7 @@
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::CurveFitting::CostFunctions;
class BSplineTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/BackToBackExponentialTest.h b/Framework/CurveFitting/test/Functions/BackToBackExponentialTest.h
index d11af404386..764131715ec 100644
--- a/Framework/CurveFitting/test/Functions/BackToBackExponentialTest.h
+++ b/Framework/CurveFitting/test/Functions/BackToBackExponentialTest.h
@@ -9,7 +9,7 @@
#include <cmath>
-using Mantid::CurveFitting::BackToBackExponential;
+using Mantid::CurveFitting::Functions::BackToBackExponential;
namespace {
/**
diff --git a/Framework/CurveFitting/test/Functions/BivariateNormalTest.h b/Framework/CurveFitting/test/Functions/BivariateNormalTest.h
index 84db687f917..77ba54984ad 100644
--- a/Framework/CurveFitting/test/Functions/BivariateNormalTest.h
+++ b/Framework/CurveFitting/test/Functions/BivariateNormalTest.h
@@ -32,6 +32,7 @@ using namespace Mantid::API;
using namespace Mantid::Geometry;
using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
/**
* Used for testing only
*/
diff --git a/Framework/CurveFitting/test/Functions/Bk2BkExpConvPVTest.h b/Framework/CurveFitting/test/Functions/Bk2BkExpConvPVTest.h
index 9e5ae1e9769..81556c847a0 100644
--- a/Framework/CurveFitting/test/Functions/Bk2BkExpConvPVTest.h
+++ b/Framework/CurveFitting/test/Functions/Bk2BkExpConvPVTest.h
@@ -15,6 +15,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class Bk2BkExpConvPVTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/ChebfunBaseTest.h b/Framework/CurveFitting/test/Functions/ChebfunBaseTest.h
index 10be2886859..175fa53033d 100644
--- a/Framework/CurveFitting/test/Functions/ChebfunBaseTest.h
+++ b/Framework/CurveFitting/test/Functions/ChebfunBaseTest.h
@@ -9,6 +9,7 @@
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
double Sin(double x) { return sin(x); }
double MinusSin(double x) { return -sin(x); }
diff --git a/Framework/CurveFitting/test/Functions/ChebyshevTest.h b/Framework/CurveFitting/test/Functions/ChebyshevTest.h
index f592a086c69..1e348c7bc88 100644
--- a/Framework/CurveFitting/test/Functions/ChebyshevTest.h
+++ b/Framework/CurveFitting/test/Functions/ChebyshevTest.h
@@ -14,6 +14,7 @@
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
class ChebyshevTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/Functions/ComptonPeakProfileTest.h b/Framework/CurveFitting/test/Functions/ComptonPeakProfileTest.h
index 398b75d37a3..1d5a8488d99 100644
--- a/Framework/CurveFitting/test/Functions/ComptonPeakProfileTest.h
+++ b/Framework/CurveFitting/test/Functions/ComptonPeakProfileTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/ComptonPeakProfile.h"
#include "ComptonProfileTestHelpers.h"
-using Mantid::CurveFitting::ComptonPeakProfile;
+using Mantid::CurveFitting::Functions::ComptonPeakProfile;
class ComptonPeakProfileTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/ComptonProfileTest.h b/Framework/CurveFitting/test/Functions/ComptonProfileTest.h
index 01f51224ec1..2d21d6981ca 100644
--- a/Framework/CurveFitting/test/Functions/ComptonProfileTest.h
+++ b/Framework/CurveFitting/test/Functions/ComptonProfileTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/ComptonProfile.h"
#include <boost/make_shared.hpp>
-using Mantid::CurveFitting::ComptonProfile;
+using Mantid::CurveFitting::Functions::ComptonProfile;
class ComptonProfileTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/ComptonScatteringCountRateTest.h b/Framework/CurveFitting/test/Functions/ComptonScatteringCountRateTest.h
index 90b4cdd680b..fe70cba1fcb 100644
--- a/Framework/CurveFitting/test/Functions/ComptonScatteringCountRateTest.h
+++ b/Framework/CurveFitting/test/Functions/ComptonScatteringCountRateTest.h
@@ -5,6 +5,9 @@
#include "MantidCurveFitting/Functions/ComptonScatteringCountRate.h"
#include "ComptonProfileTestHelpers.h"
+using Mantid::CurveFitting::Functions::ComptonScatteringCountRate;
+using Mantid::CurveFitting::Functions::ComptonProfile;
+
class ComptonScatteringCountRateTest : public CxxTest::TestSuite {
public:
// This pair of boilerplate methods prevent the suite being created statically
@@ -209,7 +212,7 @@ public:
private:
/// A simple working object to use for the testing
/// Provides a canned answer of 1 for the massProfile
- class ComptonProfileStub : public Mantid::CurveFitting::ComptonProfile {
+ class ComptonProfileStub : public ComptonProfile {
public:
ComptonProfileStub() : ComptonProfile() {
declareParameter("Width", 1.0);
@@ -289,7 +292,7 @@ private:
return func;
}
- boost::shared_ptr<Mantid::CurveFitting::ComptonScatteringCountRate>
+ boost::shared_ptr<ComptonScatteringCountRate>
createFunctionNoBackground(const bool useTwoIntensityFuncAsFirst = false) {
boost::shared_ptr<ComptonProfileStub> func1;
if (useTwoIntensityFuncAsFirst) {
@@ -310,7 +313,7 @@ private:
func2->setParameter("Width", 10.0);
func2->setParameter("Intensity", 3.0);
- using Mantid::CurveFitting::ComptonScatteringCountRate;
+
auto profile = boost::make_shared<ComptonScatteringCountRate>();
profile->initialize();
profile->addFunction(func1);
@@ -321,7 +324,6 @@ private:
}
Mantid::API::IFunction_sptr createFunction() {
- using Mantid::CurveFitting::ComptonScatteringCountRate;
auto profile = boost::make_shared<ComptonScatteringCountRate>();
profile->initialize();
diff --git a/Framework/CurveFitting/test/Functions/ConvolutionTest.h b/Framework/CurveFitting/test/Functions/ConvolutionTest.h
index 5f60380b79e..e7ee0eecece 100644
--- a/Framework/CurveFitting/test/Functions/ConvolutionTest.h
+++ b/Framework/CurveFitting/test/Functions/ConvolutionTest.h
@@ -21,6 +21,7 @@ using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
typedef Mantid::DataObjects::Workspace2D_sptr WS_type;
typedef Mantid::DataObjects::TableWorkspace_sptr TWS_type;
diff --git a/Framework/CurveFitting/test/Functions/CubicSplineTest.h b/Framework/CurveFitting/test/Functions/CubicSplineTest.h
index d681ef0056b..fd9c1d3231c 100644
--- a/Framework/CurveFitting/test/Functions/CubicSplineTest.h
+++ b/Framework/CurveFitting/test/Functions/CubicSplineTest.h
@@ -17,6 +17,7 @@
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
class CubicSplineTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/Functions/DeltaFunctionTest.h b/Framework/CurveFitting/test/Functions/DeltaFunctionTest.h
index d0efefab9e9..a29e7043d8b 100644
--- a/Framework/CurveFitting/test/Functions/DeltaFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/DeltaFunctionTest.h
@@ -13,6 +13,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
// same class as ConvolutionTest_Gauss in ConvolutionTest.h
class DeltaFunctionTest_Gauss : public IPeakFunction {
diff --git a/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h b/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h
index 020cc1b3383..98bcc699040 100644
--- a/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h
+++ b/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h
@@ -18,6 +18,9 @@
#include <boost/random/uniform_real.hpp>
#include <boost/shared_ptr.hpp>
+using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
+
class DiffRotDiscreteCircleTest : public CxxTest::TestSuite {
public:
@@ -34,8 +37,8 @@ public:
const double w0 = random_value(-1.0, 1.0);
const double h = random_value(1.0, 1000.0);
const double fwhm = random_value(1.0, 100.0);
- boost::shared_ptr<Mantid::CurveFitting::Gaussian> resolution(
- new Mantid::CurveFitting::Gaussian());
+ boost::shared_ptr<Gaussian> resolution(
+ new Gaussian());
resolution->initialize(); // declare parameters
resolution->setCentre(w0);
resolution->setHeight(h);
@@ -47,16 +50,16 @@ public:
const double r = random_value(0.3, 9.8);
const double Q = 0.9;
const int N = 6;
- boost::shared_ptr<Mantid::CurveFitting::ElasticDiffRotDiscreteCircle>
+ boost::shared_ptr<ElasticDiffRotDiscreteCircle>
structure_factor(
- new Mantid::CurveFitting::ElasticDiffRotDiscreteCircle());
+ new ElasticDiffRotDiscreteCircle());
structure_factor->setParameter("Height", I);
structure_factor->setParameter("Radius", r);
structure_factor->setAttributeValue("Q", Q);
structure_factor->setAttributeValue("N", N);
// initialize the convolution function
- Mantid::CurveFitting::Convolution conv;
+ Convolution conv;
conv.addFunction(resolution);
conv.addFunction(structure_factor);
@@ -124,7 +127,7 @@ public:
"9,Intensity=2.9,Radius=2.3,Decay=0.468";
// Do a fit with no iterations
- Mantid::CurveFitting::Fit fitalg;
+ Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
fitalg.setProperty("Function", funtion_string);
@@ -172,7 +175,7 @@ public:
const double tao = 0.45;
const double Q = 0.7;
const int N = 4;
- Mantid::CurveFitting::DiffRotDiscreteCircle func;
+ DiffRotDiscreteCircle func;
func.init();
func.setParameter("f1.Intensity", I);
func.setParameter("f1.Radius", R);
@@ -182,7 +185,7 @@ public:
// check values where correctly initialized
auto ids = boost::dynamic_pointer_cast<
- Mantid::CurveFitting::InelasticDiffRotDiscreteCircle>(
+ InelasticDiffRotDiscreteCircle>(
func.getFunction(1));
TS_ASSERT_EQUALS(ids->getParameter("Intensity"), I);
TS_ASSERT_EQUALS(ids->getParameter("Radius"), R);
@@ -193,7 +196,7 @@ public:
// check the ties were applied correctly
func.applyTies(); // elastic parameters are tied to inelastic parameters
auto eds = boost::dynamic_pointer_cast<
- Mantid::CurveFitting::ElasticDiffRotDiscreteCircle>(
+ ElasticDiffRotDiscreteCircle>(
func.getFunction(0));
TS_ASSERT_EQUALS(eds->getParameter("Height"), I);
TS_ASSERT_EQUALS(eds->getParameter("Radius"), R);
@@ -207,7 +210,7 @@ public:
const double tao = 0.45;
// This should set parameters of the inelastic part
- Mantid::CurveFitting::DiffRotDiscreteCircle func;
+ DiffRotDiscreteCircle func;
func.init();
func.setParameter("Intensity", I);
func.setParameter("Radius", R);
@@ -215,7 +218,7 @@ public:
// check the parameter of the inelastic part
auto ifunc = boost::dynamic_pointer_cast<
- Mantid::CurveFitting::InelasticDiffRotDiscreteCircle>(
+ InelasticDiffRotDiscreteCircle>(
func.getFunction(1));
TS_ASSERT_EQUALS(ifunc->getParameter("Intensity"), I);
TS_ASSERT_EQUALS(ifunc->getParameter("Radius"), R);
@@ -224,7 +227,7 @@ public:
// check the parameters of the elastic part
func.applyTies(); // elastic parameters are tied to inelastic parameters
auto efunc = boost::dynamic_pointer_cast<
- Mantid::CurveFitting::ElasticDiffRotDiscreteCircle>(
+ ElasticDiffRotDiscreteCircle>(
func.getFunction(0));
TS_ASSERT_EQUALS(efunc->getParameter("Height"), I);
TS_ASSERT_EQUALS(efunc->getParameter("Radius"), R);
@@ -244,7 +247,7 @@ public:
"Radius=1.567,Decay=7.567))";
// Initialize the fit function in the Fit algorithm
- Mantid::CurveFitting::Fit fitalg;
+ Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
fitalg.setProperty("Function", funtion_string);
@@ -277,7 +280,7 @@ public:
Mantid::API::IFunction_sptr fitalg_function =
fitalg.getProperty("Function");
auto fitalg_conv =
- boost::dynamic_pointer_cast<Mantid::CurveFitting::Convolution>(
+ boost::dynamic_pointer_cast<Convolution>(
fitalg_function);
Mantid::API::IFunction_sptr fitalg_resolution = fitalg_conv->getFunction(0);
TS_ASSERT_DELTA(fitalg_resolution->getParameter("PeakCentre"), 0.0,
@@ -342,7 +345,7 @@ private:
<< ",Shift=" << S << ")";
// Initialize the fit function in the Fit algorithm
- Mantid::CurveFitting::Fit fitalg;
+ Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
fitalg.setProperty("Function", function_stream.str());
@@ -384,7 +387,7 @@ private:
Mantid::API::IFunction_sptr fitalg_function =
fitalg.getProperty("Function");
auto fitalg_conv =
- boost::dynamic_pointer_cast<Mantid::CurveFitting::Convolution>(
+ boost::dynamic_pointer_cast<Convolution>(
fitalg_function);
Mantid::API::IFunction_sptr fitalg_resolution = fitalg_conv->getFunction(0);
TS_ASSERT_DELTA(fitalg_resolution->getParameter("PeakCentre"), 0.0,
@@ -525,7 +528,7 @@ private:
// create a data workspace using a Fit algorithm
Mantid::DataObjects::Workspace2D_sptr
- generateWorkspaceFromFitAlgorithm(Mantid::CurveFitting::Fit &fitalg) {
+ generateWorkspaceFromFitAlgorithm(Fit &fitalg) {
using namespace Mantid::Kernel;
using namespace Mantid::Geometry;
diff --git a/Framework/CurveFitting/test/Functions/DiffSphereTest.h b/Framework/CurveFitting/test/Functions/DiffSphereTest.h
index bb83296f5b2..9a77f604da6 100644
--- a/Framework/CurveFitting/test/Functions/DiffSphereTest.h
+++ b/Framework/CurveFitting/test/Functions/DiffSphereTest.h
@@ -22,6 +22,9 @@
#include "MantidGeometry/Instrument/ReferenceFrame.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
+using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
+
class DiffSphereTest : public CxxTest::TestSuite {
public:
bool skipTests() {
@@ -43,7 +46,7 @@ public:
"Sigma=0.002);name=ElasticDiffSphere,Q=0.5,Height=47.014,Radius=3.567)";
// Initialize the fit function in the Fit algorithm
- Mantid::CurveFitting::Fit fitalg;
+ Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
fitalg.setProperty("Function", funtion_string);
@@ -83,7 +86,7 @@ public:
Mantid::API::IFunction_sptr fitalg_function =
fitalg.getProperty("Function");
auto fitalg_conv =
- boost::dynamic_pointer_cast<Mantid::CurveFitting::Convolution>(
+ boost::dynamic_pointer_cast<Convolution>(
fitalg_function);
Mantid::API::IFunction_sptr fitalg_resolution = fitalg_conv->getFunction(0);
TS_ASSERT_DELTA(fitalg_resolution->getParameter("PeakCentre"), 0.0,
@@ -133,16 +136,16 @@ public:
// of the 99 coefficients to break down
// initialize the elastic part
- boost::shared_ptr<Mantid::CurveFitting::ElasticDiffSphere> elastic_part(
- new Mantid::CurveFitting::ElasticDiffSphere());
+ boost::shared_ptr<ElasticDiffSphere> elastic_part(
+ new ElasticDiffSphere());
elastic_part->setParameter("Height", I);
elastic_part->setParameter("Radius", R);
elastic_part->setAttributeValue("Q", Q);
elastic_part->init();
// initialize the inelastic part
- boost::shared_ptr<Mantid::CurveFitting::InelasticDiffSphere> inelastic_part(
- new Mantid::CurveFitting::InelasticDiffSphere());
+ boost::shared_ptr<InelasticDiffSphere> inelastic_part(
+ new InelasticDiffSphere());
inelastic_part->setParameter("Intensity", I);
inelastic_part->setParameter("Radius", R);
inelastic_part->setParameter("Diffusion", D);
@@ -186,7 +189,7 @@ public:
const double Q(0.5);
// Initialize the fit function in the Fit algorithm
- Mantid::CurveFitting::Fit fitalg;
+ Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
std::ostringstream funtion_stream;
@@ -207,16 +210,16 @@ public:
fitalg.getProperty("Function"); // main function
fitalg_function->initialize();
auto fitalg_conv =
- boost::dynamic_pointer_cast<Mantid::CurveFitting::Convolution>(
+ boost::dynamic_pointer_cast<Convolution>(
fitalg_function); // cast to Convolution
fitalg_function = fitalg_conv->getFunction(1); // DiffSphere
auto fitalg_structure_factor =
- boost::dynamic_pointer_cast<Mantid::CurveFitting::DiffSphere>(
+ boost::dynamic_pointer_cast<DiffSphere>(
fitalg_function);
fitalg_function = fitalg_structure_factor->getFunction(0);
auto fitalg_elastic =
- boost::dynamic_pointer_cast<Mantid::CurveFitting::ElasticDiffSphere>(
+ boost::dynamic_pointer_cast<ElasticDiffSphere>(
fitalg_function);
TS_ASSERT_DELTA(fitalg_elastic->getParameter("Height"), I_0,
std::numeric_limits<double>::epsilon());
@@ -230,7 +233,7 @@ public:
fitalg_function = fitalg_structure_factor->getFunction(1);
auto fitalg_inelastic =
- boost::dynamic_pointer_cast<Mantid::CurveFitting::InelasticDiffSphere>(
+ boost::dynamic_pointer_cast<InelasticDiffSphere>(
fitalg_function);
TS_ASSERT_DELTA(fitalg_inelastic->getParameter("Intensity"), I_0,
std::numeric_limits<double>::epsilon());
@@ -332,7 +335,7 @@ private:
simQ = 0.20092;
// Initialize the fit function in the Fit algorithm
- Mantid::CurveFitting::Fit fitalg;
+ Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
std::ostringstream funtion_stream;
@@ -399,7 +402,7 @@ private:
Mantid::API::IFunction_sptr fitalg_function =
fitalg.getProperty("Function");
auto fitalg_conv =
- boost::dynamic_pointer_cast<Mantid::CurveFitting::Convolution>(
+ boost::dynamic_pointer_cast<Convolution>(
fitalg_function);
Mantid::API::IFunction_sptr fitalg_resolution = fitalg_conv->getFunction(0);
@@ -458,7 +461,7 @@ private:
// create a data workspace using a Fit algorithm
Mantid::DataObjects::Workspace2D_sptr
- generateWorkspaceFromFitAlgorithm(Mantid::CurveFitting::Fit &fitalg) {
+ generateWorkspaceFromFitAlgorithm(Fit &fitalg) {
using namespace Mantid::Kernel;
using namespace Mantid::Geometry;
diff --git a/Framework/CurveFitting/test/Functions/DynamicKuboToyabeTest.h b/Framework/CurveFitting/test/Functions/DynamicKuboToyabeTest.h
index 6bd094b15fd..dd533ab427d 100644
--- a/Framework/CurveFitting/test/Functions/DynamicKuboToyabeTest.h
+++ b/Framework/CurveFitting/test/Functions/DynamicKuboToyabeTest.h
@@ -11,6 +11,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
class DynamicKuboToyabeTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/Functions/EndErfcTest.h b/Framework/CurveFitting/test/Functions/EndErfcTest.h
index 41fc838ee98..7c9ad2d9ecd 100644
--- a/Framework/CurveFitting/test/Functions/EndErfcTest.h
+++ b/Framework/CurveFitting/test/Functions/EndErfcTest.h
@@ -16,6 +16,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
class EndErfcTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h b/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h
index 4115baab642..7171baaba31 100644
--- a/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h
+++ b/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h
@@ -16,6 +16,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
class ExpDecayMuonTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h b/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h
index 2f3c6868d17..67025d69e22 100644
--- a/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h
+++ b/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h
@@ -14,6 +14,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
class ExpDecayOscTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/ExpDecayTest.h b/Framework/CurveFitting/test/Functions/ExpDecayTest.h
index ea35ec12b3c..243a2dd2ebe 100644
--- a/Framework/CurveFitting/test/Functions/ExpDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/ExpDecayTest.h
@@ -19,6 +19,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
class ExpDecayTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/FlatBackgroundTest.h b/Framework/CurveFitting/test/Functions/FlatBackgroundTest.h
index e9a0cda11e4..072c8a6b867 100644
--- a/Framework/CurveFitting/test/Functions/FlatBackgroundTest.h
+++ b/Framework/CurveFitting/test/Functions/FlatBackgroundTest.h
@@ -11,6 +11,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class FlatBackgroundTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/FullprofPolynomialTest.h b/Framework/CurveFitting/test/Functions/FullprofPolynomialTest.h
index 2b4a19bf252..fc6b72a1cbc 100644
--- a/Framework/CurveFitting/test/Functions/FullprofPolynomialTest.h
+++ b/Framework/CurveFitting/test/Functions/FullprofPolynomialTest.h
@@ -9,11 +9,12 @@
#include "MantidCurveFitting/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
-using Mantid::CurveFitting::FullprofPolynomial;
+using Mantid::CurveFitting::Functions::FullprofPolynomial;
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
using namespace Mantid::Kernel;
diff --git a/Framework/CurveFitting/test/Functions/GausDecayTest.h b/Framework/CurveFitting/test/Functions/GausDecayTest.h
index bab41f5fed0..248fdd6cfb8 100644
--- a/Framework/CurveFitting/test/Functions/GausDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/GausDecayTest.h
@@ -21,6 +21,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
diff --git a/Framework/CurveFitting/test/Functions/GausOscTest.h b/Framework/CurveFitting/test/Functions/GausOscTest.h
index ba89e9f470b..abdc63650ff 100644
--- a/Framework/CurveFitting/test/Functions/GausOscTest.h
+++ b/Framework/CurveFitting/test/Functions/GausOscTest.h
@@ -22,6 +22,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
diff --git a/Framework/CurveFitting/test/Functions/GaussianComptonProfileTest.h b/Framework/CurveFitting/test/Functions/GaussianComptonProfileTest.h
index 36d1f43bfb2..baffaafdcda 100644
--- a/Framework/CurveFitting/test/Functions/GaussianComptonProfileTest.h
+++ b/Framework/CurveFitting/test/Functions/GaussianComptonProfileTest.h
@@ -7,7 +7,8 @@
#include "MantidAPI/FunctionDomain1D.h"
#include "ComptonProfileTestHelpers.h"
-using Mantid::CurveFitting::GaussianComptonProfile;
+using Mantid::CurveFitting::Functions::GaussianComptonProfile;
+using Mantid::CurveFitting::Functions::ComptonProfile;
class GaussianComptonProfileTest : public CxxTest::TestSuite {
public:
@@ -40,7 +41,7 @@ public:
}
void test_Function_Has_One_Intensity_Coefficient() {
- boost::shared_ptr<Mantid::CurveFitting::ComptonProfile> profile =
+ boost::shared_ptr<ComptonProfile> profile =
createFunction();
auto intensityIndices = profile->intensityParameterIndices();
diff --git a/Framework/CurveFitting/test/Functions/GaussianTest.h b/Framework/CurveFitting/test/Functions/GaussianTest.h
index 340f45c64e0..903fdeb96ef 100644
--- a/Framework/CurveFitting/test/Functions/GaussianTest.h
+++ b/Framework/CurveFitting/test/Functions/GaussianTest.h
@@ -31,6 +31,7 @@ using namespace Mantid;
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::CurveFitting::CostFunctions;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
diff --git a/Framework/CurveFitting/test/Functions/GramCharlierComptonProfileTest.h b/Framework/CurveFitting/test/Functions/GramCharlierComptonProfileTest.h
index f052a583111..19e8bb1d95c 100644
--- a/Framework/CurveFitting/test/Functions/GramCharlierComptonProfileTest.h
+++ b/Framework/CurveFitting/test/Functions/GramCharlierComptonProfileTest.h
@@ -6,7 +6,8 @@
#include "ComptonProfileTestHelpers.h"
-using Mantid::CurveFitting::GramCharlierComptonProfile;
+using Mantid::CurveFitting::Functions::ComptonProfile;
+using Mantid::CurveFitting::Functions::GramCharlierComptonProfile;
class GramCharlierComptonProfileTest : public CxxTest::TestSuite {
public:
@@ -58,7 +59,7 @@ public:
void
test_Function_Returns_Same_Number_Intensity_Coefficents_As_Active_Hermite_Coefficients_If_KFSE_Is_Fixed() {
- boost::shared_ptr<Mantid::CurveFitting::ComptonProfile> profile =
+ boost::shared_ptr<ComptonProfile> profile =
createFunction();
profile->setAttributeValue("HermiteCoeffs", "1 0 1"); // turn on C_0 & C_4
profile->fix(profile->parameterIndex("FSECoeff"));
@@ -69,7 +70,7 @@ public:
void
test_Function_Returns_Same_Number_Intensity_Coefficents_As_Active_Hermite_Coefficients_Plus_One_If_KFSE_Is_Free() {
- boost::shared_ptr<Mantid::CurveFitting::ComptonProfile> profile =
+ boost::shared_ptr<ComptonProfile> profile =
createFunction();
profile->setAttributeValue("HermiteCoeffs", "1 0 1"); // turn on C_0 & C_4
diff --git a/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h b/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
index ec14ed211ae..0d6464341d4 100644
--- a/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
+++ b/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
@@ -102,6 +102,7 @@ public:
void testAgainstMockData() {
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
/**
* Changing compiler on OS X has yet again caused this (and only this) test to
@@ -172,6 +173,7 @@ public:
void test_Against_Data_In_DeltaE() {
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
#if !(defined __APPLE__)
@@ -253,6 +255,7 @@ private:
Mantid::API::IAlgorithm_sptr runFit(const std::string &wsName) {
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
// set up fitting function and pass to Fit
IkedaCarpenterPV icpv;
diff --git a/Framework/CurveFitting/test/Functions/LinearBackgroundTest.h b/Framework/CurveFitting/test/Functions/LinearBackgroundTest.h
index 197fb3da4c7..8e8905a7f86 100644
--- a/Framework/CurveFitting/test/Functions/LinearBackgroundTest.h
+++ b/Framework/CurveFitting/test/Functions/LinearBackgroundTest.h
@@ -17,7 +17,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
-using Mantid::CurveFitting::LinearBackground;
+using Mantid::CurveFitting::Functions::LinearBackground;
using Mantid::CurveFitting::Fit;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
diff --git a/Framework/CurveFitting/test/Functions/LogNormalTest.h b/Framework/CurveFitting/test/Functions/LogNormalTest.h
index ceccef59837..2d950578e8a 100644
--- a/Framework/CurveFitting/test/Functions/LogNormalTest.h
+++ b/Framework/CurveFitting/test/Functions/LogNormalTest.h
@@ -19,6 +19,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
class LogNormalTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/Lorentzian1DTest.h b/Framework/CurveFitting/test/Functions/Lorentzian1DTest.h
index 5a64acaba28..d56d87abe45 100644
--- a/Framework/CurveFitting/test/Functions/Lorentzian1DTest.h
+++ b/Framework/CurveFitting/test/Functions/Lorentzian1DTest.h
@@ -12,7 +12,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
-using Mantid::CurveFitting::Lorentzian1D;
+using Mantid::CurveFitting::Functions::Lorentzian1D;
using namespace Mantid::DataObjects;
class Lorentzian1DTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/LorentzianTest.h b/Framework/CurveFitting/test/Functions/LorentzianTest.h
index b39995cd290..50f9bc895d5 100644
--- a/Framework/CurveFitting/test/Functions/LorentzianTest.h
+++ b/Framework/CurveFitting/test/Functions/LorentzianTest.h
@@ -9,6 +9,7 @@
#include "MantidAPI/FunctionValues.h"
#include <boost/make_shared.hpp>
+using Mantid::CurveFitting::Functions::Lorentzian;
class LorentzianTest : public CxxTest::TestSuite {
public:
@@ -41,7 +42,7 @@ public:
}
void test_categories() {
- Mantid::CurveFitting::Lorentzian forCat;
+ Lorentzian forCat;
const std::vector<std::string> categories = forCat.categories();
TS_ASSERT(categories.size() == 1);
TS_ASSERT(categories[0] == "Peak");
@@ -49,7 +50,7 @@ public:
void test_FWHM() {
double hwhm = 0.5;
- Mantid::CurveFitting::Lorentzian lor;
+ Lorentzian lor;
lor.initialize();
lor.setParameter("Amplitude", 1.0);
lor.setParameter("PeakCentre", 0.0);
@@ -63,7 +64,7 @@ public:
}
void test_height() {
- Mantid::CurveFitting::Lorentzian lor;
+ Lorentzian lor;
lor.initialize();
lor.setHeight(2.0);
lor.setCentre(3.0);
@@ -78,7 +79,7 @@ public:
}
void test_height_zero_width() {
- Mantid::CurveFitting::Lorentzian lor;
+ Lorentzian lor;
lor.initialize();
lor.setHeight(2.0);
lor.setCentre(3.0);
@@ -96,7 +97,7 @@ public:
}
void testIntensity() {
- Mantid::CurveFitting::Lorentzian lor;
+ Lorentzian lor;
lor.initialize();
lor.setHeight(2.0);
lor.setCentre(3.0);
@@ -110,15 +111,15 @@ public:
}
private:
- class TestableLorentzian : public Mantid::CurveFitting::Lorentzian {
+ class TestableLorentzian : public Lorentzian {
public:
void functionLocal(double *out, const double *xValues,
const size_t nData) const {
- Mantid::CurveFitting::Lorentzian::functionLocal(out, xValues, nData);
+ Lorentzian::functionLocal(out, xValues, nData);
}
void functionDerivLocal(Mantid::API::Jacobian *out, const double *xValues,
const size_t nData) {
- Mantid::CurveFitting::Lorentzian::functionDerivLocal(out, xValues, nData);
+ Lorentzian::functionDerivLocal(out, xValues, nData);
}
};
diff --git a/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h b/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h
index 7688eeafd0c..61e05b91013 100644
--- a/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h
+++ b/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h
@@ -19,6 +19,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
class MuonFInteractionTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/NeutronBk2BkExpConvPVoigtTest.h b/Framework/CurveFitting/test/Functions/NeutronBk2BkExpConvPVoigtTest.h
index 6744a31194b..ad44379ead2 100644
--- a/Framework/CurveFitting/test/Functions/NeutronBk2BkExpConvPVoigtTest.h
+++ b/Framework/CurveFitting/test/Functions/NeutronBk2BkExpConvPVoigtTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h"
using namespace std;
-using Mantid::CurveFitting::NeutronBk2BkExpConvPVoigt;
+using Mantid::CurveFitting::Functions::NeutronBk2BkExpConvPVoigt;
class NeutronBk2BkExpConvPVoigtTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/Functions/PawleyFunctionTest.h b/Framework/CurveFitting/test/Functions/PawleyFunctionTest.h
index 52ca22849bb..f746d52c86d 100644
--- a/Framework/CurveFitting/test/Functions/PawleyFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/PawleyFunctionTest.h
@@ -11,6 +11,7 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
diff --git a/Framework/CurveFitting/test/Functions/PeakParameterFunctionTest.h b/Framework/CurveFitting/test/Functions/PeakParameterFunctionTest.h
index 607fea4a988..80cf00d8049 100644
--- a/Framework/CurveFitting/test/Functions/PeakParameterFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/PeakParameterFunctionTest.h
@@ -13,6 +13,7 @@
#include "MantidCurveFitting/Jacobian.h"
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class PeakParameterFunctionTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/PolynomialTest.h b/Framework/CurveFitting/test/Functions/PolynomialTest.h
index 90f21e51acb..8af4cebb7ef 100644
--- a/Framework/CurveFitting/test/Functions/PolynomialTest.h
+++ b/Framework/CurveFitting/test/Functions/PolynomialTest.h
@@ -8,7 +8,7 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidCurveFitting/Fit.h"
-using Mantid::CurveFitting::Polynomial;
+using Mantid::CurveFitting::Functions::Polynomial;
using namespace Mantid;
using namespace API;
using namespace Kernel;
diff --git a/Framework/CurveFitting/test/Functions/ProcessBackgroundTest.h b/Framework/CurveFitting/test/Functions/ProcessBackgroundTest.h
index d5d9e4f6fe5..9ad20b34455 100644
--- a/Framework/CurveFitting/test/Functions/ProcessBackgroundTest.h
+++ b/Framework/CurveFitting/test/Functions/ProcessBackgroundTest.h
@@ -11,7 +11,7 @@
#include <fstream>
-using Mantid::CurveFitting::ProcessBackground;
+using Mantid::CurveFitting::Functions::ProcessBackground;
using namespace Mantid;
using namespace Mantid::API;
using namespace Kernel;
diff --git a/Framework/CurveFitting/test/Functions/ProductFunctionTest.h b/Framework/CurveFitting/test/Functions/ProductFunctionTest.h
index 848753eee48..a87ac082001 100644
--- a/Framework/CurveFitting/test/Functions/ProductFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/ProductFunctionTest.h
@@ -19,6 +19,8 @@
#include "MantidAPI/FunctionValues.h"
typedef Mantid::DataObjects::Workspace2D_sptr WS_type;
+using Mantid::CurveFitting::Functions::ProductFunction;
+using Mantid::CurveFitting::Functions::Gaussian;
class ProductFunctionMWTest_Gauss : public Mantid::API::IPeakFunction {
public:
@@ -99,7 +101,7 @@ DECLARE_FUNCTION(ProductFunctionMWTest_Linear)
class ProductFunctionTest : public CxxTest::TestSuite {
public:
void testFunction() {
- Mantid::CurveFitting::ProductFunction prodF;
+ ProductFunction prodF;
Mantid::API::IFunction_sptr gauss1(new ProductFunctionMWTest_Gauss);
gauss1->setParameter(0, 1.1);
@@ -154,8 +156,8 @@ public:
prodF.asString());
TS_ASSERT(fun);
- Mantid::CurveFitting::ProductFunction *prodF1 =
- dynamic_cast<Mantid::CurveFitting::ProductFunction *>(fun.get());
+ ProductFunction *prodF1 =
+ dynamic_cast<ProductFunction *>(fun.get());
TS_ASSERT(prodF1);
TS_ASSERT_EQUALS(prodF1->nFunctions(), 4);
@@ -182,12 +184,12 @@ public:
}
void testProductFunction() {
- Mantid::CurveFitting::ProductFunction prodF;
+ ProductFunction prodF;
double c1 = 1.0;
double h1 = 3.0;
double s1 = 0.5;
- Mantid::API::IFunction_sptr f0(new Mantid::CurveFitting::Gaussian);
+ Mantid::API::IFunction_sptr f0(new Gaussian);
f0->initialize();
f0->setParameter("PeakCentre", c1);
f0->setParameter("Height", h1);
@@ -208,7 +210,7 @@ public:
double c2 = 2;
double h2 = 10.0;
double s2 = 0.5;
- Mantid::API::IFunction_sptr f1(new Mantid::CurveFitting::Gaussian);
+ Mantid::API::IFunction_sptr f1(new Gaussian);
f1->initialize();
f1->setParameter("PeakCentre", c2);
f1->setParameter("Height", h2);
@@ -284,14 +286,14 @@ public:
}
void testForCategories() {
- Mantid::CurveFitting::ProductFunction forCat;
+ ProductFunction forCat;
const std::vector<std::string> categories = forCat.categories();
TS_ASSERT(categories.size() == 1);
TS_ASSERT(categories[0] == "General");
}
void testDerivatives() {
- Mantid::CurveFitting::ProductFunction prodF;
+ ProductFunction prodF;
Mantid::API::IFunction_sptr linear1(new ProductFunctionMWTest_Linear);
linear1->setParameter(0, 1.0);
diff --git a/Framework/CurveFitting/test/Functions/ProductLinearExpTest.h b/Framework/CurveFitting/test/Functions/ProductLinearExpTest.h
index c502f29c6d5..a198b826c7a 100644
--- a/Framework/CurveFitting/test/Functions/ProductLinearExpTest.h
+++ b/Framework/CurveFitting/test/Functions/ProductLinearExpTest.h
@@ -16,6 +16,7 @@
#include <boost/make_shared.hpp>
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class ProductLinearExpTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/ProductQuadraticExpTest.h b/Framework/CurveFitting/test/Functions/ProductQuadraticExpTest.h
index 972cda5ad9f..c6c4385de3e 100644
--- a/Framework/CurveFitting/test/Functions/ProductQuadraticExpTest.h
+++ b/Framework/CurveFitting/test/Functions/ProductQuadraticExpTest.h
@@ -16,6 +16,7 @@
#include <boost/make_shared.hpp>
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class ProductQuadraticExpTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/PseudoVoigtTest.h b/Framework/CurveFitting/test/Functions/PseudoVoigtTest.h
index 30656398d96..fd94bc3955f 100644
--- a/Framework/CurveFitting/test/Functions/PseudoVoigtTest.h
+++ b/Framework/CurveFitting/test/Functions/PseudoVoigtTest.h
@@ -17,6 +17,7 @@
#include "MantidKernel/MersenneTwister.h"
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
diff --git a/Framework/CurveFitting/test/Functions/QuadraticTest.h b/Framework/CurveFitting/test/Functions/QuadraticTest.h
index bf7e6c4d83f..72836c16fd7 100644
--- a/Framework/CurveFitting/test/Functions/QuadraticTest.h
+++ b/Framework/CurveFitting/test/Functions/QuadraticTest.h
@@ -17,7 +17,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
-using Mantid::CurveFitting::Quadratic;
+using Mantid::CurveFitting::Functions::Quadratic;
using Mantid::CurveFitting::Fit;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
diff --git a/Framework/CurveFitting/test/Functions/ReflectivityMulfTest.h b/Framework/CurveFitting/test/Functions/ReflectivityMulfTest.h
index 0e472e116d3..b32cfb9c05f 100644
--- a/Framework/CurveFitting/test/Functions/ReflectivityMulfTest.h
+++ b/Framework/CurveFitting/test/Functions/ReflectivityMulfTest.h
@@ -10,6 +10,7 @@
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
class ReflectivityMulfTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/Functions/ResolutionTest.h b/Framework/CurveFitting/test/Functions/ResolutionTest.h
index 57cf71f3837..c4adc4e2e5e 100644
--- a/Framework/CurveFitting/test/Functions/ResolutionTest.h
+++ b/Framework/CurveFitting/test/Functions/ResolutionTest.h
@@ -13,6 +13,7 @@
#include <fstream>
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class ResolutionTest_Gauss : public IPeakFunction {
diff --git a/Framework/CurveFitting/test/Functions/SimpleChebfunTest.h b/Framework/CurveFitting/test/Functions/SimpleChebfunTest.h
index 989740403db..c512c001280 100644
--- a/Framework/CurveFitting/test/Functions/SimpleChebfunTest.h
+++ b/Framework/CurveFitting/test/Functions/SimpleChebfunTest.h
@@ -9,6 +9,7 @@
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
namespace {
double Sin(double x) { return sin(x); }
diff --git a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h
index a15fc355e6b..220de48b325 100644
--- a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h
+++ b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h
@@ -19,6 +19,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
class StaticKuboToyabeTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesExpDecayTest.h b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesExpDecayTest.h
index 0a10d7031cc..a47df64ce63 100644
--- a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesExpDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesExpDecayTest.h
@@ -8,11 +8,12 @@
#include "MantidCurveFitting/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
-using Mantid::CurveFitting::StaticKuboToyabeTimesExpDecay;
+using Mantid::CurveFitting::Functions::StaticKuboToyabeTimesExpDecay;
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
class StaticKuboToyabeTimesExpDecayTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesGausDecayTest.h b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesGausDecayTest.h
index b2109b9966d..74ad5d74c8c 100644
--- a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesGausDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesGausDecayTest.h
@@ -8,10 +8,11 @@
#include "MantidCurveFitting/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
-using Mantid::CurveFitting::StaticKuboToyabeTimesGausDecay;
+using Mantid::CurveFitting::Functions::StaticKuboToyabeTimesGausDecay;
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
class StaticKuboToyabeTimesGausDecayTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h b/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h
index 281f63c3d8e..d86db44ec7a 100644
--- a/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h
+++ b/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h
@@ -19,6 +19,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
class StretchExpMuonTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/StretchExpTest.h b/Framework/CurveFitting/test/Functions/StretchExpTest.h
index 8d7aa08e822..d25b966d7d2 100644
--- a/Framework/CurveFitting/test/Functions/StretchExpTest.h
+++ b/Framework/CurveFitting/test/Functions/StretchExpTest.h
@@ -21,6 +21,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
class StretchExpTest_Jacobian : public Mantid::API::Jacobian {
diff --git a/Framework/CurveFitting/test/Functions/TabulatedFunctionTest.h b/Framework/CurveFitting/test/Functions/TabulatedFunctionTest.h
index f7cdd0c99f8..1937f365c1c 100644
--- a/Framework/CurveFitting/test/Functions/TabulatedFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/TabulatedFunctionTest.h
@@ -19,6 +19,7 @@
#include <fstream>
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
namespace {
diff --git a/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpAlphaTest.h b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpAlphaTest.h
index 8abed0b7639..5a61091389e 100644
--- a/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpAlphaTest.h
+++ b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpAlphaTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h"
using namespace Mantid;
-using Mantid::CurveFitting::ThermalNeutronBk2BkExpAlpha;
+using Mantid::CurveFitting::Functions::ThermalNeutronBk2BkExpAlpha;
class ThermalNeutronBk2BkExpAlphaTest : public CxxTest::TestSuite {
public:
@@ -36,7 +36,7 @@ public:
vec_tof.push_back(124187);
// 2. Initialize the method
- Mantid::CurveFitting::ThermalNeutronBk2BkExpAlpha function;
+ ThermalNeutronBk2BkExpAlpha function;
function.initialize();
function.setParameter("Alph0", 4.026);
diff --git a/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpBetaTest.h b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpBetaTest.h
index 70888cb88a2..978370be218 100644
--- a/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpBetaTest.h
+++ b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpBetaTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h"
using namespace Mantid;
-using Mantid::CurveFitting::ThermalNeutronBk2BkExpBeta;
+using Mantid::CurveFitting::Functions::ThermalNeutronBk2BkExpBeta;
class ThermalNeutronBk2BkExpBetaTest : public CxxTest::TestSuite {
public:
@@ -36,7 +36,7 @@ public:
vec_tof.push_back(124187);
// 2. Initialize the method
- Mantid::CurveFitting::ThermalNeutronBk2BkExpBeta function;
+ ThermalNeutronBk2BkExpBeta function;
function.initialize();
function.setParameter("Beta0", 3.489);
diff --git a/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpConvPVoigtTest.h b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpConvPVoigtTest.h
index 8ac3f4721a3..0157a0bfeca 100644
--- a/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpConvPVoigtTest.h
+++ b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpConvPVoigtTest.h
@@ -11,7 +11,7 @@
using namespace Mantid;
using namespace Kernel;
using namespace std;
-using Mantid::CurveFitting::ThermalNeutronBk2BkExpConvPVoigt;
+using Mantid::CurveFitting::Functions::ThermalNeutronBk2BkExpConvPVoigt;
class ThermalNeutronBk2BkExpConvPVoigtTest : public CxxTest::TestSuite {
public:
@@ -138,7 +138,7 @@ public:
generateData(vecX, vecY, vecE);
// 1. Create peak
- CurveFitting::ThermalNeutronBk2BkExpConvPVoigt peak;
+ ThermalNeutronBk2BkExpConvPVoigt peak;
peak.initialize();
peak.setMillerIndex(1, 1, 1);
diff --git a/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpSigmaTest.h b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpSigmaTest.h
index 234882735dc..cdc782f2850 100644
--- a/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpSigmaTest.h
+++ b/Framework/CurveFitting/test/Functions/ThermalNeutronBk2BkExpSigmaTest.h
@@ -5,7 +5,7 @@
#include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h"
-using Mantid::CurveFitting::ThermalNeutronBk2BkExpSigma;
+using Mantid::CurveFitting::Functions::ThermalNeutronBk2BkExpSigma;
using namespace Mantid;
class ThermalNeutronBk2BkExpSigmaTest : public CxxTest::TestSuite {
@@ -36,7 +36,7 @@ public:
vec_tof.push_back(124187);
// 2. Initialize the method
- Mantid::CurveFitting::ThermalNeutronBk2BkExpSigma function;
+ ThermalNeutronBk2BkExpSigma function;
function.initialize();
function.setParameter("Sig2", sqrt(11.380));
diff --git a/Framework/CurveFitting/test/Functions/ThermalNeutronDtoTOFFunctionTest.h b/Framework/CurveFitting/test/Functions/ThermalNeutronDtoTOFFunctionTest.h
index 1dc0ec71375..95a0cf0093c 100644
--- a/Framework/CurveFitting/test/Functions/ThermalNeutronDtoTOFFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/ThermalNeutronDtoTOFFunctionTest.h
@@ -11,7 +11,7 @@
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
-using Mantid::CurveFitting::ThermalNeutronDtoTOFFunction;
+using Mantid::CurveFitting::Functions::ThermalNeutronDtoTOFFunction;
using namespace Mantid;
using namespace Mantid::API;
@@ -45,7 +45,7 @@ public:
vec_tof.push_back(124187);
// 2. Initialize the method
- Mantid::CurveFitting::ThermalNeutronDtoTOFFunction function;
+ ThermalNeutronDtoTOFFunction function;
function.initialize();
function.setParameter("Dtt1", 22777.1);
diff --git a/Framework/CurveFitting/test/Functions/UserFunction1DTest.h b/Framework/CurveFitting/test/Functions/UserFunction1DTest.h
index 3d89d4771ea..8ea1cd7792c 100644
--- a/Framework/CurveFitting/test/Functions/UserFunction1DTest.h
+++ b/Framework/CurveFitting/test/Functions/UserFunction1DTest.h
@@ -11,6 +11,7 @@
#include "MantidAPI/ITableWorkspace.h"
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class UserFunction1DTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/UserFunctionTest.h b/Framework/CurveFitting/test/Functions/UserFunctionTest.h
index 316d5c1a352..b527257a175 100644
--- a/Framework/CurveFitting/test/Functions/UserFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/UserFunctionTest.h
@@ -8,6 +8,7 @@
#include "MantidAPI/FunctionDomain1D.h"
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
class UserFunctionTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/VesuvioResolutionTest.h b/Framework/CurveFitting/test/Functions/VesuvioResolutionTest.h
index 2e658ae140f..8488b55e505 100644
--- a/Framework/CurveFitting/test/Functions/VesuvioResolutionTest.h
+++ b/Framework/CurveFitting/test/Functions/VesuvioResolutionTest.h
@@ -6,7 +6,7 @@
#include "ComptonProfileTestHelpers.h"
-using Mantid::CurveFitting::VesuvioResolution;
+using Mantid::CurveFitting::Functions::VesuvioResolution;
class VesuvioResolutionTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/Functions/VoigtTest.h b/Framework/CurveFitting/test/Functions/VoigtTest.h
index 266345b4ba4..74c76e0aa51 100644
--- a/Framework/CurveFitting/test/Functions/VoigtTest.h
+++ b/Framework/CurveFitting/test/Functions/VoigtTest.h
@@ -12,7 +12,7 @@
#include <boost/scoped_ptr.hpp>
#include <boost/make_shared.hpp>
-using Mantid::CurveFitting::Voigt;
+using Mantid::CurveFitting::Functions::Voigt;
using Mantid::API::IFunction;
class VoigtTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/MultiDomainCreatorTest.h b/Framework/CurveFitting/test/MultiDomainCreatorTest.h
index 82865fb776c..625f7b64712 100644
--- a/Framework/CurveFitting/test/MultiDomainCreatorTest.h
+++ b/Framework/CurveFitting/test/MultiDomainCreatorTest.h
@@ -25,6 +25,7 @@
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
class MultiDomainCreatorTest_Fun : public IFunction1D, public ParamFunction {
public:
--
GitLab
From 01748be434bdefcf95ed61a5265b6157e98913d8 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 16:00:23 +0100
Subject: [PATCH 081/223] unnecessary include iostream/iomanip removed from cpp
files, re #13689
---
Framework/API/src/AlgorithmFactory.cpp | 1 -
Framework/API/src/Axis.cpp | 1 -
Framework/API/src/Column.cpp | 5 +++--
Framework/API/src/ColumnFactory.cpp | 1 -
Framework/API/src/CompositeFunction.cpp | 1 -
Framework/API/src/CostFunctionFactory.cpp | 1 -
Framework/API/src/Expression.cpp | 8 ++++----
Framework/API/src/FileProperty.cpp | 1 -
Framework/API/src/FunctionDomain1D.cpp | 1 -
Framework/API/src/FunctionValues.cpp | 1 -
Framework/API/src/GridDomain.cpp | 1 -
Framework/API/src/GridDomain1D.cpp | 1 -
Framework/API/src/IFunction.cpp | 1 -
Framework/API/src/IFunction1D.cpp | 1 -
Framework/API/src/IFunctionMD.cpp | 1 -
Framework/API/src/IFunctionMW.cpp | 1 -
Framework/API/src/LinearScale.cpp | 1 -
Framework/API/src/LogarithmScale.cpp | 1 -
Framework/API/src/ParamFunction.cpp | 1 -
Framework/API/src/PeakFunctionIntegrator.cpp | 1 -
Framework/API/src/SpectraAxis.cpp | 1 -
Framework/API/src/TempFunction.cpp | 1 -
Framework/Algorithms/src/ApplyDeadTimeCorr.cpp | 1 -
Framework/Algorithms/src/ApplyDetailedBalance.cpp | 1 -
Framework/Algorithms/src/ConvertUnits.cpp | 1 -
.../Algorithms/src/ConvertUnitsUsingDetectorTable.cpp | 1 -
Framework/Algorithms/src/CopyInstrumentParameters.cpp | 1 -
Framework/Algorithms/src/CreateCalFileByNames.cpp | 1 -
Framework/Algorithms/src/CreateDummyCalFile.cpp | 1 -
Framework/Algorithms/src/CreateLogTimeCorrection.cpp | 1 -
Framework/Algorithms/src/CropWorkspace.cpp | 1 -
.../Algorithms/src/DiffractionEventCalibrateDetectors.cpp | 1 -
Framework/Algorithms/src/ExtractSpectra.cpp | 1 -
Framework/Algorithms/src/FFTSmooth.cpp | 1 -
Framework/Algorithms/src/FFTSmooth2.cpp | 1 -
Framework/Algorithms/src/FindCenterOfMassPosition.cpp | 1 -
Framework/Algorithms/src/FindCenterOfMassPosition2.cpp | 1 -
Framework/Algorithms/src/FindPeaks.cpp | 1 -
Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp | 1 -
Framework/Algorithms/src/GetDetectorOffsets.cpp | 1 -
Framework/Algorithms/src/MaskDetectorsIf.cpp | 1 -
.../src/MultipleScatteringCylinderAbsorption.cpp | 1 -
Framework/Algorithms/src/NormaliseToMonitor.cpp | 1 -
Framework/Algorithms/src/Q1DTOF.cpp | 1 -
Framework/Algorithms/src/Q1DWeighted.cpp | 1 -
Framework/Algorithms/src/RealFFT.cpp | 1 -
Framework/Algorithms/src/Regroup.cpp | 1 -
Framework/Algorithms/src/SANSDirectBeamScaling.cpp | 1 -
Framework/Algorithms/src/SaveGSASInstrumentFile.cpp | 1 -
Framework/Algorithms/src/SolidAngle.cpp | 1 -
Framework/Algorithms/src/SpatialGrouping.cpp | 1 -
Framework/CurveFitting/src/BSpline.cpp | 1 -
Framework/CurveFitting/src/BivariateNormal.cpp | 1 -
Framework/CurveFitting/src/CostFuncLeastSquares.cpp | 1 -
Framework/CurveFitting/src/CostFuncRwp.cpp | 1 -
.../CurveFitting/src/CostFuncUnweightedLeastSquares.cpp | 1 -
Framework/CurveFitting/src/CubicSpline.cpp | 1 -
Framework/CurveFitting/src/FABADAMinimizer.cpp | 1 -
Framework/CurveFitting/src/Fit1D.cpp | 1 -
Framework/CurveFitting/src/FitPowderDiffPeaks.cpp | 1 -
Framework/CurveFitting/src/LeBailFit.cpp | 1 -
.../CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp | 1 -
.../CurveFitting/src/LevenbergMarquardtMinimizer.cpp | 1 -
Framework/CurveFitting/src/MultiBG.cpp | 1 -
Framework/CurveFitting/src/PlotPeakByLogValue.cpp | 1 -
.../CurveFitting/src/RefinePowderInstrumentParameters.cpp | 1 -
.../DataHandling/src/FilterEventsByLogValuePreNexus.cpp | 1 -
Framework/DataHandling/src/FindDetectorsPar.cpp | 1 -
Framework/DataHandling/src/ISISDataArchive.cpp | 1 -
Framework/DataHandling/src/LoadEventPreNexus.cpp | 1 -
Framework/DataHandling/src/LoadEventPreNexus2.cpp | 1 -
Framework/DataHandling/src/LoadGSS.cpp | 2 --
Framework/DataHandling/src/LoadILL.cpp | 1 -
Framework/DataHandling/src/LoadILLIndirect.cpp | 2 --
Framework/DataHandling/src/LoadILLReflectometry.cpp | 1 -
Framework/DataHandling/src/LoadInstrument.cpp | 1 -
Framework/DataHandling/src/LoadIsawDetCal.cpp | 1 -
Framework/DataHandling/src/LoadLLB.cpp | 1 -
Framework/DataHandling/src/LoadLogsForSNSPulsedMagnet.cpp | 1 -
Framework/DataHandling/src/LoadMLZ.cpp | 1 -
Framework/DataHandling/src/LoadPreNexusMonitors.cpp | 1 -
Framework/DataHandling/src/LoadQKK.cpp | 2 --
Framework/DataHandling/src/LoadSINQFocus.cpp | 1 -
Framework/DataHandling/src/LoadSpice2D.cpp | 1 -
Framework/DataHandling/src/SNSDataArchive.cpp | 1 -
Framework/DataHandling/src/SaveCSV.cpp | 1 -
Framework/DataHandling/src/SaveFocusedXYE.cpp | 1 -
Framework/DataHandling/src/SaveFullprofResolution.cpp | 1 -
Framework/DataHandling/src/SaveGSS.cpp | 1 -
Framework/DataHandling/src/SaveNISTDAT.cpp | 1 -
Framework/DataHandling/src/SavePAR.cpp | 1 -
Framework/DataHandling/src/SavePDFGui.cpp | 1 -
Framework/DataHandling/src/SavePHX.cpp | 1 -
Framework/DataHandling/src/SaveRKH.cpp | 1 -
Framework/DataObjects/src/CoordTransformAffine.cpp | 1 -
Framework/DataObjects/src/EventList.cpp | 1 -
Framework/DataObjects/src/Events.cpp | 1 -
Framework/DataObjects/src/Histogram1D.cpp | 1 -
Framework/DataObjects/src/PeaksWorkspace.cpp | 1 -
Framework/DataObjects/src/RebinnedOutput.cpp | 1 -
Framework/DataObjects/src/TableWorkspace.cpp | 1 -
Framework/Geometry/src/Crystal/IndexingUtils.cpp | 1 -
Framework/Geometry/src/Crystal/NiggliCell.cpp | 1 -
Framework/Geometry/src/Crystal/PointGroup.cpp | 1 -
Framework/Geometry/src/Crystal/ScalarUtils.cpp | 1 -
Framework/Geometry/src/Math/BnId.cpp | 2 --
Framework/Geometry/src/Math/PolyBase.cpp | 1 -
Framework/Geometry/src/Math/PolygonIntersection.cpp | 1 -
Framework/Geometry/src/Math/RotCounter.cpp | 2 --
Framework/Geometry/src/Objects/RuleItems.cpp | 2 --
Framework/Geometry/src/Objects/Track.cpp | 1 -
.../Geometry/src/Rendering/vtkGeometryCacheReader.cpp | 1 -
.../Geometry/src/Rendering/vtkGeometryCacheWriter.cpp | 1 -
Framework/Geometry/src/Surfaces/Cone.cpp | 2 --
Framework/Geometry/src/Surfaces/Torus.cpp | 2 --
Framework/Kernel/src/Atom.cpp | 1 -
Framework/Kernel/src/DllOpen.cpp | 1 -
Framework/Kernel/src/Exception.cpp | 1 -
Framework/Kernel/src/FacilityInfo.cpp | 1 -
Framework/Kernel/src/LibraryManager.cpp | 1 -
Framework/Kernel/src/Memory.cpp | 2 --
Framework/Kernel/src/NetworkProxyOSX.cpp | 1 -
Framework/Kernel/src/NeutronAtom.cpp | 1 -
Framework/Kernel/src/ProxyInfo.cpp | 1 -
Framework/Kernel/src/Strings.cpp | 1 -
Framework/Kernel/src/ThreadSafeLogStream.cpp | 1 -
Framework/Kernel/src/V3D.cpp | 1 -
Framework/Kernel/src/VectorHelper.cpp | 1 -
Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp | 1 -
Framework/MDAlgorithms/src/ImportMDHistoWorkspace.cpp | 1 -
Framework/MDAlgorithms/src/Integrate3DEvents.cpp | 1 -
Framework/MDAlgorithms/src/LoadILLAscii.cpp | 1 -
Framework/MDAlgorithms/src/LoadSQW.cpp | 1 -
Framework/SINQ/src/LoadFlexiNexus.cpp | 1 -
Framework/SINQ/src/MDHistoToWorkspace2D.cpp | 1 -
Framework/SINQ/src/SINQHMListener.cpp | 1 -
Framework/TestHelpers/src/LoggingCleaner.cpp | 1 -
MantidPlot/src/CanvasPicker.cpp | 1 -
MantidPlot/src/Graph.cpp | 1 -
MantidPlot/src/ImportASCIIDialog.cpp | 1 -
MantidPlot/src/LegendWidget.cpp | 1 -
MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp | 1 -
MantidPlot/src/Mantid/AlgorithmMonitor.cpp | 1 -
MantidPlot/src/Mantid/FitParameterTie.cpp | 1 -
MantidPlot/src/Mantid/InputHistory.cpp | 1 -
.../src/Mantid/InstrumentWidget/CollapsiblePanel.cpp | 1 -
.../src/Mantid/InstrumentWidget/GLActorCollection.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/GLObject.cpp | 1 -
.../src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/PeakMarker2D.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/Shape2D.cpp | 1 -
.../src/Mantid/InstrumentWidget/Shape2DCollection.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/Viewport.cpp | 1 -
MantidPlot/src/Mantid/MantidApplication.cpp | 1 -
MantidPlot/src/Mantid/MantidMatrix.cpp | 1 -
MantidPlot/src/Mantid/MantidSampleLogDialog.cpp | 1 -
MantidPlot/src/Mantid/MantidTable.cpp | 1 -
MantidPlot/src/Mantid/MantidUI.cpp | 1 -
MantidPlot/src/Mantid/PeakPickerTool.cpp | 1 -
MantidPlot/src/Mantid/UserFitFunctionDialog.cpp | 1 -
MantidPlot/src/PythonScript.cpp | 1 -
MantidPlot/src/Spectrogram.cpp | 1 -
MantidPlot/src/origin/OPJFile.cpp | 1 -
MantidPlot/src/pixmaps.cpp | 1 -
MantidQt/API/src/UserSubWindow.cpp | 2 --
MantidQt/MantidWidgets/src/MantidHelpWindow.cpp | 1 -
MantidQt/MantidWidgets/src/ScriptEditor.cpp | 1 -
MantidQt/MantidWidgets/src/StringDialogEditor.cpp | 1 -
MantidQt/RefDetectorViewer/src/RefDetectorViewDemo.cpp | 1 -
MantidQt/RefDetectorViewer/src/RefIVConnections.cpp | 1 -
MantidQt/RefDetectorViewer/src/RefImageView.cpp | 1 -
MantidQt/RefDetectorViewer/src/RefMatrixWSImageView.cpp | 1 -
MantidQt/RefDetectorViewer/src/RefRangeHandler.cpp | 1 -
MantidQt/RefDetectorViewer/src/RefSliderHandler.cpp | 1 -
MantidQt/SliceViewer/src/ColorBarWidget.cpp | 1 -
MantidQt/SliceViewer/src/CustomTools.cpp | 2 --
MantidQt/SliceViewer/src/DimensionSliceWidget.cpp | 2 --
MantidQt/SliceViewer/src/LineOverlay.cpp | 1 -
MantidQt/SliceViewer/src/PeaksTableColumnsDialog.cpp | 1 -
MantidQt/SliceViewer/src/SliceViewer.cpp | 2 --
MantidQt/SliceViewer/src/main_ColorBarWidgetDemo.cpp | 1 -
MantidQt/SliceViewer/src/main_LineViewerDemo.cpp | 1 -
MantidQt/SliceViewer/src/main_SliceViewerDemo.cpp | 1 -
MantidQt/SliceViewer/src/main_SliceViewerWindowDemo.cpp | 1 -
MantidQt/SpectrumViewer/src/ArrayDataSource.cpp | 1 -
MantidQt/SpectrumViewer/src/ColorMaps.cpp | 1 -
MantidQt/SpectrumViewer/src/DataArray.cpp | 1 -
MantidQt/SpectrumViewer/src/EModeHandler.cpp | 1 -
MantidQt/SpectrumViewer/src/GraphDisplay.cpp | 1 -
MantidQt/SpectrumViewer/src/MatrixWSDataSource.cpp | 1 -
MantidQt/SpectrumViewer/src/MatrixWSSpectrumView.cpp | 1 -
MantidQt/SpectrumViewer/src/RangeHandler.cpp | 1 -
MantidQt/SpectrumViewer/src/SVConnections.cpp | 1 -
MantidQt/SpectrumViewer/src/SliderHandler.cpp | 1 -
MantidQt/SpectrumViewer/src/SpectrumDataSource.cpp | 1 -
MantidQt/SpectrumViewer/src/SpectrumDisplay.cpp | 1 -
MantidQt/SpectrumViewer/src/SpectrumPlotItem.cpp | 1 -
MantidQt/SpectrumViewer/src/SpectrumView.cpp | 1 -
QtPropertyBrowser/src/DoubleEditorFactory.cpp | 1 -
QtPropertyBrowser/src/qttreepropertybrowser.cpp | 1 -
Vates/VatesAPI/src/vtkNullStructuredGrid.cpp | 2 +-
Vates/VatesSimpleGui/QtWidgets/src/GeometryParser.cpp | 1 -
Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp | 1 -
.../ViewWidgets/src/ColorSelectionWidget.cpp | 1 -
Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp | 1 -
Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp | 1 -
Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp | 3 ---
tools/DAEserv/DAEserv/isisds_command.cpp | 2 --
212 files changed, 8 insertions(+), 232 deletions(-)
diff --git a/Framework/API/src/AlgorithmFactory.cpp b/Framework/API/src/AlgorithmFactory.cpp
index b208e36ca73..c21455f2545 100644
--- a/Framework/API/src/AlgorithmFactory.cpp
+++ b/Framework/API/src/AlgorithmFactory.cpp
@@ -1,7 +1,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <iostream>
#include <sstream>
#include "MantidAPI/AlgorithmFactory.h"
#include "MantidAPI/Algorithm.h"
diff --git a/Framework/API/src/Axis.cpp b/Framework/API/src/Axis.cpp
index 025e8fac19d..e8db95989d5 100644
--- a/Framework/API/src/Axis.cpp
+++ b/Framework/API/src/Axis.cpp
@@ -5,7 +5,6 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/UnitFactory.h"
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/Column.cpp b/Framework/API/src/Column.cpp
index 2611772b535..1be47194e89 100644
--- a/Framework/API/src/Column.cpp
+++ b/Framework/API/src/Column.cpp
@@ -1,9 +1,10 @@
-#include "MantidAPI/Column.h"
-#include "MantidKernel/Logger.h"
#include <algorithm>
#include <iostream>
#include <stdexcept>
+#include "MantidAPI/Column.h"
+#include "MantidKernel/Logger.h"
+
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/ColumnFactory.cpp b/Framework/API/src/ColumnFactory.cpp
index 313dc12290c..0ccf9d87644 100644
--- a/Framework/API/src/ColumnFactory.cpp
+++ b/Framework/API/src/ColumnFactory.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <sstream>
#include "MantidAPI/ColumnFactory.h"
#include "MantidAPI/Column.h"
diff --git a/Framework/API/src/CompositeFunction.cpp b/Framework/API/src/CompositeFunction.cpp
index 1f4481e9a01..cc2c652fffb 100644
--- a/Framework/API/src/CompositeFunction.cpp
+++ b/Framework/API/src/CompositeFunction.cpp
@@ -11,7 +11,6 @@
#include <boost/lexical_cast.hpp>
#include <boost/shared_array.hpp>
#include <sstream>
-#include <iostream>
#include <algorithm>
namespace Mantid {
diff --git a/Framework/API/src/CostFunctionFactory.cpp b/Framework/API/src/CostFunctionFactory.cpp
index 4037501fa47..ea0e131e3a0 100644
--- a/Framework/API/src/CostFunctionFactory.cpp
+++ b/Framework/API/src/CostFunctionFactory.cpp
@@ -1,7 +1,6 @@
#include "MantidAPI/CostFunctionFactory.h"
#include "MantidAPI/ICostFunction.h"
#include "MantidKernel/LibraryManager.h"
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/Expression.cpp b/Framework/API/src/Expression.cpp
index 6343c714044..011dd6d1de3 100644
--- a/Framework/API/src/Expression.cpp
+++ b/Framework/API/src/Expression.cpp
@@ -1,11 +1,11 @@
+#include <iostream>
+#include <locale>
+#include <sstream>
+
#include "MantidAPI/Expression.h"
#include <Poco/StringTokenizer.h>
-#include <sstream>
-#include <iostream>
-#include <locale>
-
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/FileProperty.cpp b/Framework/API/src/FileProperty.cpp
index 064edc4553b..c7baf7b1e2c 100644
--- a/Framework/API/src/FileProperty.cpp
+++ b/Framework/API/src/FileProperty.cpp
@@ -13,7 +13,6 @@
#include <Poco/File.h>
#include <cctype>
#include <algorithm>
-#include <iostream>
namespace Mantid {
diff --git a/Framework/API/src/FunctionDomain1D.cpp b/Framework/API/src/FunctionDomain1D.cpp
index 30f8bf1d7d6..bf466655d6a 100644
--- a/Framework/API/src/FunctionDomain1D.cpp
+++ b/Framework/API/src/FunctionDomain1D.cpp
@@ -2,7 +2,6 @@
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/FunctionDomain1D.h"
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/FunctionValues.cpp b/Framework/API/src/FunctionValues.cpp
index 0cc95afbdf7..ac8552df041 100644
--- a/Framework/API/src/FunctionValues.cpp
+++ b/Framework/API/src/FunctionValues.cpp
@@ -2,7 +2,6 @@
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/FunctionValues.h"
-#include <iostream>
#include <algorithm>
namespace Mantid {
diff --git a/Framework/API/src/GridDomain.cpp b/Framework/API/src/GridDomain.cpp
index 05fafaaf9e6..0d8ed05ee4b 100644
--- a/Framework/API/src/GridDomain.cpp
+++ b/Framework/API/src/GridDomain.cpp
@@ -1,7 +1,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <iostream>
#include <numeric>
#include <stdexcept>
diff --git a/Framework/API/src/GridDomain1D.cpp b/Framework/API/src/GridDomain1D.cpp
index 3c9422233f7..a85cf869325 100644
--- a/Framework/API/src/GridDomain1D.cpp
+++ b/Framework/API/src/GridDomain1D.cpp
@@ -1,7 +1,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <iostream>
#include <numeric>
#include "MantidAPI/GridDomain1D.h"
diff --git a/Framework/API/src/IFunction.cpp b/Framework/API/src/IFunction.cpp
index 539b092f315..379ee94adba 100644
--- a/Framework/API/src/IFunction.cpp
+++ b/Framework/API/src/IFunction.cpp
@@ -28,7 +28,6 @@
#include <limits>
#include <sstream>
-#include <iostream>
#include <algorithm>
namespace Mantid {
diff --git a/Framework/API/src/IFunction1D.cpp b/Framework/API/src/IFunction1D.cpp
index bbab2dacced..17bf113464a 100644
--- a/Framework/API/src/IFunction1D.cpp
+++ b/Framework/API/src/IFunction1D.cpp
@@ -23,7 +23,6 @@
#include <boost/lexical_cast.hpp>
#include <sstream>
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/IFunctionMD.cpp b/Framework/API/src/IFunctionMD.cpp
index 83d2d3d433c..6eaacaedfe1 100644
--- a/Framework/API/src/IFunctionMD.cpp
+++ b/Framework/API/src/IFunctionMD.cpp
@@ -15,7 +15,6 @@
#include <boost/lambda/lambda.hpp>
#include <sstream>
-#include <iostream>
#include <algorithm>
#include <functional>
#include <iterator>
diff --git a/Framework/API/src/IFunctionMW.cpp b/Framework/API/src/IFunctionMW.cpp
index a0c5793f76a..0d8f987a1e4 100644
--- a/Framework/API/src/IFunctionMW.cpp
+++ b/Framework/API/src/IFunctionMW.cpp
@@ -4,7 +4,6 @@
#include "MantidAPI/IFunctionMW.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/LinearScale.cpp b/Framework/API/src/LinearScale.cpp
index 4d11c0fb962..4c44e30a040 100644
--- a/Framework/API/src/LinearScale.cpp
+++ b/Framework/API/src/LinearScale.cpp
@@ -1,7 +1,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <iostream>
#include "MantidAPI/LinearScale.h"
#include "MantidAPI/TransformScaleFactory.h"
diff --git a/Framework/API/src/LogarithmScale.cpp b/Framework/API/src/LogarithmScale.cpp
index 1e4abfdd83c..a5eda36399e 100644
--- a/Framework/API/src/LogarithmScale.cpp
+++ b/Framework/API/src/LogarithmScale.cpp
@@ -1,7 +1,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <iostream>
#include <cmath>
#include <stdexcept>
diff --git a/Framework/API/src/ParamFunction.cpp b/Framework/API/src/ParamFunction.cpp
index 8d58067639d..2d43466f5d7 100644
--- a/Framework/API/src/ParamFunction.cpp
+++ b/Framework/API/src/ParamFunction.cpp
@@ -11,7 +11,6 @@
#include <boost/math/special_functions/fpclassify.hpp>
#include <sstream>
-#include <iostream>
#include <limits>
namespace Mantid {
diff --git a/Framework/API/src/PeakFunctionIntegrator.cpp b/Framework/API/src/PeakFunctionIntegrator.cpp
index b36896423ff..c2dc90a12cb 100644
--- a/Framework/API/src/PeakFunctionIntegrator.cpp
+++ b/Framework/API/src/PeakFunctionIntegrator.cpp
@@ -2,7 +2,6 @@
#include "MantidAPI/FunctionDomain1D.h"
#include "gsl/gsl_errno.h"
-#include <iostream>
#include <iomanip>
namespace Mantid {
diff --git a/Framework/API/src/SpectraAxis.cpp b/Framework/API/src/SpectraAxis.cpp
index ebd17d4b814..43db4d27829 100644
--- a/Framework/API/src/SpectraAxis.cpp
+++ b/Framework/API/src/SpectraAxis.cpp
@@ -9,7 +9,6 @@
#include "MantidKernel/Unit.h"
#include <boost/lexical_cast.hpp>
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/TempFunction.cpp b/Framework/API/src/TempFunction.cpp
index 4f95ae8ecad..2e7e30e8f05 100644
--- a/Framework/API/src/TempFunction.cpp
+++ b/Framework/API/src/TempFunction.cpp
@@ -8,7 +8,6 @@
#include "MantidAPI/ParameterTie.h"
#include <sstream>
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/Algorithms/src/ApplyDeadTimeCorr.cpp b/Framework/Algorithms/src/ApplyDeadTimeCorr.cpp
index 965faf0ceef..dc16356c68a 100644
--- a/Framework/Algorithms/src/ApplyDeadTimeCorr.cpp
+++ b/Framework/Algorithms/src/ApplyDeadTimeCorr.cpp
@@ -10,7 +10,6 @@
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
-#include <iostream>
#include <cmath>
using std::string;
diff --git a/Framework/Algorithms/src/ApplyDetailedBalance.cpp b/Framework/Algorithms/src/ApplyDetailedBalance.cpp
index 2b90b823acd..c5fdf286546 100644
--- a/Framework/Algorithms/src/ApplyDetailedBalance.cpp
+++ b/Framework/Algorithms/src/ApplyDetailedBalance.cpp
@@ -3,7 +3,6 @@
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/PropertyWithValue.h"
#include "boost/lexical_cast.hpp"
-#include <iostream>
#include <cmath>
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidKernel/PhysicalConstants.h"
diff --git a/Framework/Algorithms/src/ConvertUnits.cpp b/Framework/Algorithms/src/ConvertUnits.cpp
index d2148cfe5d8..5a3012b50bf 100644
--- a/Framework/Algorithms/src/ConvertUnits.cpp
+++ b/Framework/Algorithms/src/ConvertUnits.cpp
@@ -12,7 +12,6 @@
#include <boost/bind.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
#include <cfloat>
-#include <iostream>
#include <limits>
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/ListValidator.h"
diff --git a/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp b/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
index d358c6406bc..33c06ad4900 100644
--- a/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
+++ b/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
@@ -20,7 +20,6 @@
#include <boost/bind.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
#include <cfloat>
-#include <iostream>
#include <limits>
#include <vector>
#include <algorithm>
diff --git a/Framework/Algorithms/src/CopyInstrumentParameters.cpp b/Framework/Algorithms/src/CopyInstrumentParameters.cpp
index bef54b26b61..2eacc15ba85 100644
--- a/Framework/Algorithms/src/CopyInstrumentParameters.cpp
+++ b/Framework/Algorithms/src/CopyInstrumentParameters.cpp
@@ -3,7 +3,6 @@
//----------------------------------------------------------------------
#include "MantidAlgorithms/CopyInstrumentParameters.h"
#include "MantidAPI/WorkspaceValidators.h"
-#include <iostream>
#include "MantidAPI/MemoryManager.h"
#include "MantidGeometry/Instrument/ParameterMap.h"
diff --git a/Framework/Algorithms/src/CreateCalFileByNames.cpp b/Framework/Algorithms/src/CreateCalFileByNames.cpp
index 2f4abb226ec..67e006535d1 100644
--- a/Framework/Algorithms/src/CreateCalFileByNames.cpp
+++ b/Framework/Algorithms/src/CreateCalFileByNames.cpp
@@ -11,7 +11,6 @@
#include <boost/algorithm/string/detail/classification.hpp>
#include <boost/algorithm/string/split.hpp>
#include <fstream>
-#include <iomanip>
#include <queue>
using namespace Mantid::API;
diff --git a/Framework/Algorithms/src/CreateDummyCalFile.cpp b/Framework/Algorithms/src/CreateDummyCalFile.cpp
index f64c069ce29..d7c9020aaf9 100644
--- a/Framework/Algorithms/src/CreateDummyCalFile.cpp
+++ b/Framework/Algorithms/src/CreateDummyCalFile.cpp
@@ -10,7 +10,6 @@
#include <queue>
#include <fstream>
-#include <iomanip>
#include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/Document.h>
#include <Poco/DOM/Element.h>
diff --git a/Framework/Algorithms/src/CreateLogTimeCorrection.cpp b/Framework/Algorithms/src/CreateLogTimeCorrection.cpp
index 7bab28c41c7..61264770e98 100644
--- a/Framework/Algorithms/src/CreateLogTimeCorrection.cpp
+++ b/Framework/Algorithms/src/CreateLogTimeCorrection.cpp
@@ -5,7 +5,6 @@
#include "MantidAPI/WorkspaceValidators.h"
#include <fstream>
-#include <iomanip>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/Algorithms/src/CropWorkspace.cpp b/Framework/Algorithms/src/CropWorkspace.cpp
index c37de109ab2..3107951ca43 100644
--- a/Framework/Algorithms/src/CropWorkspace.cpp
+++ b/Framework/Algorithms/src/CropWorkspace.cpp
@@ -7,7 +7,6 @@
#include "MantidAPI/NumericAxis.h"
#include "MantidAPI/TextAxis.h"
#include "MantidKernel/VectorHelper.h"
-#include <iostream>
#include "MantidAPI/MemoryManager.h"
#include "MantidKernel/BoundedValidator.h"
diff --git a/Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp b/Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp
index e27473a81d6..050b93edf61 100644
--- a/Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp
+++ b/Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp
@@ -16,7 +16,6 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/UnitFactory.h"
#include <cmath>
-#include <iomanip>
#include <numeric>
#include <Poco/File.h>
#include <sstream>
diff --git a/Framework/Algorithms/src/ExtractSpectra.cpp b/Framework/Algorithms/src/ExtractSpectra.cpp
index d342b94ce3d..c797b9b7bcc 100644
--- a/Framework/Algorithms/src/ExtractSpectra.cpp
+++ b/Framework/Algorithms/src/ExtractSpectra.cpp
@@ -9,7 +9,6 @@
#include "MantidKernel/VectorHelper.h"
#include <algorithm>
-#include <iostream>
namespace {
/// The percentage 'fuzziness' to use when comparing to bin boundaries
diff --git a/Framework/Algorithms/src/FFTSmooth.cpp b/Framework/Algorithms/src/FFTSmooth.cpp
index 9069be1a52b..6f7291d1a20 100644
--- a/Framework/Algorithms/src/FFTSmooth.cpp
+++ b/Framework/Algorithms/src/FFTSmooth.cpp
@@ -4,7 +4,6 @@
#include "MantidAlgorithms/FFTSmooth.h"
#include "MantidKernel/Exception.h"
-#include <iostream>
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/ListValidator.h"
diff --git a/Framework/Algorithms/src/FFTSmooth2.cpp b/Framework/Algorithms/src/FFTSmooth2.cpp
index 745441a1a97..88c68e75e13 100644
--- a/Framework/Algorithms/src/FFTSmooth2.cpp
+++ b/Framework/Algorithms/src/FFTSmooth2.cpp
@@ -6,7 +6,6 @@
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/detail/classification.hpp>
-#include <iostream>
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/ListValidator.h"
diff --git a/Framework/Algorithms/src/FindCenterOfMassPosition.cpp b/Framework/Algorithms/src/FindCenterOfMassPosition.cpp
index 726ed0e305d..20964f31e5e 100644
--- a/Framework/Algorithms/src/FindCenterOfMassPosition.cpp
+++ b/Framework/Algorithms/src/FindCenterOfMassPosition.cpp
@@ -10,7 +10,6 @@
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
-#include <iostream>
#include <vector>
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/NullValidator.h"
diff --git a/Framework/Algorithms/src/FindCenterOfMassPosition2.cpp b/Framework/Algorithms/src/FindCenterOfMassPosition2.cpp
index 3a69693e049..76bb448c085 100644
--- a/Framework/Algorithms/src/FindCenterOfMassPosition2.cpp
+++ b/Framework/Algorithms/src/FindCenterOfMassPosition2.cpp
@@ -10,7 +10,6 @@
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
-#include <iostream>
#include <vector>
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/EventList.h"
diff --git a/Framework/Algorithms/src/FindPeaks.cpp b/Framework/Algorithms/src/FindPeaks.cpp
index d352b14d85d..5273c255ad5 100644
--- a/Framework/Algorithms/src/FindPeaks.cpp
+++ b/Framework/Algorithms/src/FindPeaks.cpp
@@ -15,7 +15,6 @@
#include "MantidKernel/VectorHelper.h"
#include <boost/algorithm/string.hpp>
-#include <iostream>
#include <numeric>
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/ListValidator.h"
diff --git a/Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp b/Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp
index 871287bc800..07e9673ba21 100644
--- a/Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp
+++ b/Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp
@@ -18,7 +18,6 @@
#include "MantidKernel/Statistics.h"
#include <boost/math/special_functions/fpclassify.hpp>
#include <fstream>
-#include <iomanip>
#include <ostream>
#include <sstream>
diff --git a/Framework/Algorithms/src/GetDetectorOffsets.cpp b/Framework/Algorithms/src/GetDetectorOffsets.cpp
index 0739b7dcb86..86b595c4c5f 100644
--- a/Framework/Algorithms/src/GetDetectorOffsets.cpp
+++ b/Framework/Algorithms/src/GetDetectorOffsets.cpp
@@ -9,7 +9,6 @@
#include "MantidDataObjects/MaskWorkspace.h"
#include <boost/math/special_functions/fpclassify.hpp>
#include <fstream>
-#include <iomanip>
#include <ostream>
#include <sstream>
#include "MantidKernel/BoundedValidator.h"
diff --git a/Framework/Algorithms/src/MaskDetectorsIf.cpp b/Framework/Algorithms/src/MaskDetectorsIf.cpp
index e1000af59a0..209f7a9873e 100644
--- a/Framework/Algorithms/src/MaskDetectorsIf.cpp
+++ b/Framework/Algorithms/src/MaskDetectorsIf.cpp
@@ -5,7 +5,6 @@
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/WorkspaceValidators.h"
#include <fstream>
-#include <iomanip>
#include "MantidKernel/ListValidator.h"
namespace Mantid {
diff --git a/Framework/Algorithms/src/MultipleScatteringCylinderAbsorption.cpp b/Framework/Algorithms/src/MultipleScatteringCylinderAbsorption.cpp
index 8196bf18e08..5008df1b96e 100644
--- a/Framework/Algorithms/src/MultipleScatteringCylinderAbsorption.cpp
+++ b/Framework/Algorithms/src/MultipleScatteringCylinderAbsorption.cpp
@@ -7,7 +7,6 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/PhysicalConstants.h"
-#include <iostream>
#include <stdexcept>
namespace Mantid {
diff --git a/Framework/Algorithms/src/NormaliseToMonitor.cpp b/Framework/Algorithms/src/NormaliseToMonitor.cpp
index 82031ba8347..d870469b1b2 100644
--- a/Framework/Algorithms/src/NormaliseToMonitor.cpp
+++ b/Framework/Algorithms/src/NormaliseToMonitor.cpp
@@ -11,7 +11,6 @@
#include "MantidKernel/BoundedValidator.h"
#include <cfloat>
-#include <iomanip>
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidKernel/IPropertyManager.h"
diff --git a/Framework/Algorithms/src/Q1DTOF.cpp b/Framework/Algorithms/src/Q1DTOF.cpp
index 955a8a9fccf..50108eb2adb 100644
--- a/Framework/Algorithms/src/Q1DTOF.cpp
+++ b/Framework/Algorithms/src/Q1DTOF.cpp
@@ -9,7 +9,6 @@
#include "MantidKernel/VectorHelper.h"
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidDataObjects/Histogram1D.h"
-#include <iostream>
#include <vector>
namespace Mantid {
diff --git a/Framework/Algorithms/src/Q1DWeighted.cpp b/Framework/Algorithms/src/Q1DWeighted.cpp
index dcae515bf49..daa445af929 100644
--- a/Framework/Algorithms/src/Q1DWeighted.cpp
+++ b/Framework/Algorithms/src/Q1DWeighted.cpp
@@ -9,7 +9,6 @@
#include "MantidKernel/VectorHelper.h"
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidDataObjects/Histogram1D.h"
-#include <iostream>
#include <vector>
#include "MantidKernel/BoundedValidator.h"
diff --git a/Framework/Algorithms/src/RealFFT.cpp b/Framework/Algorithms/src/RealFFT.cpp
index dd320924de1..db2466098cd 100644
--- a/Framework/Algorithms/src/RealFFT.cpp
+++ b/Framework/Algorithms/src/RealFFT.cpp
@@ -20,7 +20,6 @@
#include <functional>
#include <cmath>
-#include <iostream>
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/ListValidator.h"
diff --git a/Framework/Algorithms/src/Regroup.cpp b/Framework/Algorithms/src/Regroup.cpp
index 6d966fdc523..9a218cf3604 100644
--- a/Framework/Algorithms/src/Regroup.cpp
+++ b/Framework/Algorithms/src/Regroup.cpp
@@ -12,7 +12,6 @@
#include <functional>
#include <cmath>
-#include <iostream>
namespace Mantid {
namespace Algorithms {
diff --git a/Framework/Algorithms/src/SANSDirectBeamScaling.cpp b/Framework/Algorithms/src/SANSDirectBeamScaling.cpp
index a9fb178f996..f603aaed91c 100644
--- a/Framework/Algorithms/src/SANSDirectBeamScaling.cpp
+++ b/Framework/Algorithms/src/SANSDirectBeamScaling.cpp
@@ -9,7 +9,6 @@
#include "MantidKernel/VectorHelper.h"
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidDataObjects/Histogram1D.h"
-#include <iostream>
#include <vector>
#include "MantidKernel/BoundedValidator.h"
diff --git a/Framework/Algorithms/src/SaveGSASInstrumentFile.cpp b/Framework/Algorithms/src/SaveGSASInstrumentFile.cpp
index 4416295a73b..8fc922fe4b8 100644
--- a/Framework/Algorithms/src/SaveGSASInstrumentFile.cpp
+++ b/Framework/Algorithms/src/SaveGSASInstrumentFile.cpp
@@ -7,7 +7,6 @@
#include "MantidAPI/TableRow.h"
#include <stdio.h>
-#include <iomanip>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/Algorithms/src/SolidAngle.cpp b/Framework/Algorithms/src/SolidAngle.cpp
index e5d33e7c4ea..43b76ee1ee8 100644
--- a/Framework/Algorithms/src/SolidAngle.cpp
+++ b/Framework/Algorithms/src/SolidAngle.cpp
@@ -6,7 +6,6 @@
#include "MantidAPI/AlgorithmFactory.h"
#include "MantidKernel/UnitFactory.h"
#include <cfloat>
-#include <iostream>
#include "MantidKernel/BoundedValidator.h"
namespace Mantid {
diff --git a/Framework/Algorithms/src/SpatialGrouping.cpp b/Framework/Algorithms/src/SpatialGrouping.cpp
index 4d53df62741..bfc5744a005 100644
--- a/Framework/Algorithms/src/SpatialGrouping.cpp
+++ b/Framework/Algorithms/src/SpatialGrouping.cpp
@@ -12,7 +12,6 @@
#include <map>
#include <fstream>
-#include <iostream>
#include <algorithm>
#include "MantidAPI/ISpectrum.h"
diff --git a/Framework/CurveFitting/src/BSpline.cpp b/Framework/CurveFitting/src/BSpline.cpp
index b174fdc184d..787672bc570 100644
--- a/Framework/CurveFitting/src/BSpline.cpp
+++ b/Framework/CurveFitting/src/BSpline.cpp
@@ -7,7 +7,6 @@
#include "MantidAPI/FunctionFactory.h"
#include <boost/lexical_cast.hpp>
-#include <iostream>
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/src/BivariateNormal.cpp b/Framework/CurveFitting/src/BivariateNormal.cpp
index f9cae2a8038..d48ab8555ea 100644
--- a/Framework/CurveFitting/src/BivariateNormal.cpp
+++ b/Framework/CurveFitting/src/BivariateNormal.cpp
@@ -9,7 +9,6 @@
#include <fstream>
#include <algorithm>
#include <math.h>
-#include <iostream>
#include <sstream>
#include <string>
#include <cstdio>
diff --git a/Framework/CurveFitting/src/CostFuncLeastSquares.cpp b/Framework/CurveFitting/src/CostFuncLeastSquares.cpp
index e1fa52338bf..8a2c0d99007 100644
--- a/Framework/CurveFitting/src/CostFuncLeastSquares.cpp
+++ b/Framework/CurveFitting/src/CostFuncLeastSquares.cpp
@@ -10,7 +10,6 @@
#include "MantidKernel/Logger.h"
#include "MantidKernel/MultiThreaded.h"
-#include <iomanip>
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/src/CostFuncRwp.cpp b/Framework/CurveFitting/src/CostFuncRwp.cpp
index c72d9d3d4a1..0bd327fd7ea 100644
--- a/Framework/CurveFitting/src/CostFuncRwp.cpp
+++ b/Framework/CurveFitting/src/CostFuncRwp.cpp
@@ -9,7 +9,6 @@
#include "MantidAPI/FunctionValues.h"
#include <cmath>
-#include <iomanip>
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/src/CostFuncUnweightedLeastSquares.cpp b/Framework/CurveFitting/src/CostFuncUnweightedLeastSquares.cpp
index da4e2bd1170..278e5c6b9bd 100644
--- a/Framework/CurveFitting/src/CostFuncUnweightedLeastSquares.cpp
+++ b/Framework/CurveFitting/src/CostFuncUnweightedLeastSquares.cpp
@@ -1,7 +1,6 @@
#include "MantidCurveFitting/CostFuncUnweightedLeastSquares.h"
#include "MantidKernel/Logger.h"
-#include <iomanip>
#include <cmath>
namespace Mantid {
diff --git a/Framework/CurveFitting/src/CubicSpline.cpp b/Framework/CurveFitting/src/CubicSpline.cpp
index 6b0d2815989..b955d04215d 100644
--- a/Framework/CurveFitting/src/CubicSpline.cpp
+++ b/Framework/CurveFitting/src/CubicSpline.cpp
@@ -7,7 +7,6 @@
#include <algorithm>
#include <boost/lexical_cast.hpp>
-#include <iostream>
#include <stdexcept>
#include <vector>
diff --git a/Framework/CurveFitting/src/FABADAMinimizer.cpp b/Framework/CurveFitting/src/FABADAMinimizer.cpp
index 8e8f7e3d708..f6c47ccff74 100644
--- a/Framework/CurveFitting/src/FABADAMinimizer.cpp
+++ b/Framework/CurveFitting/src/FABADAMinimizer.cpp
@@ -26,7 +26,6 @@
#include <boost/version.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
-#include <iostream>
#include <ctime>
namespace Mantid {
diff --git a/Framework/CurveFitting/src/Fit1D.cpp b/Framework/CurveFitting/src/Fit1D.cpp
index f4c054ddc09..d6db35e872a 100644
--- a/Framework/CurveFitting/src/Fit1D.cpp
+++ b/Framework/CurveFitting/src/Fit1D.cpp
@@ -5,7 +5,6 @@
#include <sstream>
#include <numeric>
#include <cmath>
-#include <iomanip>
#include "MantidKernel/Exception.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
diff --git a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
index b5ad39301dd..e24430a6d96 100644
--- a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
+++ b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
@@ -31,7 +31,6 @@
#include <boost/algorithm/string/split.hpp>
#include <fstream>
-#include <iomanip>
#include <gsl/gsl_sf_erf.h>
#include <cmath>
diff --git a/Framework/CurveFitting/src/LeBailFit.cpp b/Framework/CurveFitting/src/LeBailFit.cpp
index 0ea5ae09288..9996f804985 100644
--- a/Framework/CurveFitting/src/LeBailFit.cpp
+++ b/Framework/CurveFitting/src/LeBailFit.cpp
@@ -17,7 +17,6 @@
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/split.hpp>
-#include <iomanip>
#include <fstream>
diff --git a/Framework/CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp b/Framework/CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp
index 11793321b58..78c90dca7c8 100644
--- a/Framework/CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp
+++ b/Framework/CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp
@@ -12,7 +12,6 @@
#include <boost/lexical_cast.hpp>
#include <gsl/gsl_blas.h>
-#include <iostream>
#include <cmath>
namespace Mantid {
diff --git a/Framework/CurveFitting/src/LevenbergMarquardtMinimizer.cpp b/Framework/CurveFitting/src/LevenbergMarquardtMinimizer.cpp
index 7e561468929..19bfbdc7c06 100644
--- a/Framework/CurveFitting/src/LevenbergMarquardtMinimizer.cpp
+++ b/Framework/CurveFitting/src/LevenbergMarquardtMinimizer.cpp
@@ -13,7 +13,6 @@
#include <boost/lexical_cast.hpp>
#include <gsl/gsl_blas.h>
-#include <iostream>
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/src/MultiBG.cpp b/Framework/CurveFitting/src/MultiBG.cpp
index 284b6ce3390..d0cc9705068 100644
--- a/Framework/CurveFitting/src/MultiBG.cpp
+++ b/Framework/CurveFitting/src/MultiBG.cpp
@@ -12,7 +12,6 @@
#include <boost/lexical_cast.hpp>
#include <sstream>
-#include <iostream>
#include <algorithm>
#include <iterator>
#include <float.h>
diff --git a/Framework/CurveFitting/src/PlotPeakByLogValue.cpp b/Framework/CurveFitting/src/PlotPeakByLogValue.cpp
index f380f15c43c..152331bab77 100644
--- a/Framework/CurveFitting/src/PlotPeakByLogValue.cpp
+++ b/Framework/CurveFitting/src/PlotPeakByLogValue.cpp
@@ -3,7 +3,6 @@
//----------------------------------------------------------------------
#include <cmath>
#include <vector>
-#include <iostream>
#include <fstream>
#include <sstream>
#include <algorithm>
diff --git a/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp b/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp
index 56a400e3b11..f47bdf5eac1 100644
--- a/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp
+++ b/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp
@@ -26,7 +26,6 @@
#include <boost/algorithm/string/split.hpp>
#include <fstream>
-#include <iomanip>
#include <gsl/gsl_sf_erf.h>
diff --git a/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp b/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp
index 3684648d6bb..78f98e8ac21 100644
--- a/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp
+++ b/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp
@@ -3,7 +3,6 @@
#include <sstream>
#include <stdexcept>
#include <functional>
-#include <iostream>
#include <set>
#include <vector>
#include <Poco/File.h>
diff --git a/Framework/DataHandling/src/FindDetectorsPar.cpp b/Framework/DataHandling/src/FindDetectorsPar.cpp
index a47d89cc731..ebf13530cb1 100644
--- a/Framework/DataHandling/src/FindDetectorsPar.cpp
+++ b/Framework/DataHandling/src/FindDetectorsPar.cpp
@@ -13,7 +13,6 @@
#include <Poco/File.h>
#include <limits>
-#include <iostream>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/ISISDataArchive.cpp b/Framework/DataHandling/src/ISISDataArchive.cpp
index cf814ef149f..033e7187378 100644
--- a/Framework/DataHandling/src/ISISDataArchive.cpp
+++ b/Framework/DataHandling/src/ISISDataArchive.cpp
@@ -12,7 +12,6 @@
#include <Poco/Exception.h>
#include <sstream>
-#include <iostream>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/LoadEventPreNexus.cpp b/Framework/DataHandling/src/LoadEventPreNexus.cpp
index 2024d53cfc9..43f73c8f10a 100644
--- a/Framework/DataHandling/src/LoadEventPreNexus.cpp
+++ b/Framework/DataHandling/src/LoadEventPreNexus.cpp
@@ -26,7 +26,6 @@
#include <sstream>
#include <stdexcept>
#include <functional>
-#include <iostream>
#include <set>
#include <vector>
#include <Poco/File.h>
diff --git a/Framework/DataHandling/src/LoadEventPreNexus2.cpp b/Framework/DataHandling/src/LoadEventPreNexus2.cpp
index e50dd9c66b0..0b441914762 100644
--- a/Framework/DataHandling/src/LoadEventPreNexus2.cpp
+++ b/Framework/DataHandling/src/LoadEventPreNexus2.cpp
@@ -3,7 +3,6 @@
#include <sstream>
#include <stdexcept>
#include <functional>
-#include <iostream>
#include <set>
#include <vector>
#include <Poco/File.h>
diff --git a/Framework/DataHandling/src/LoadGSS.cpp b/Framework/DataHandling/src/LoadGSS.cpp
index 9ddea8c26c2..deeaeab02cb 100644
--- a/Framework/DataHandling/src/LoadGSS.cpp
+++ b/Framework/DataHandling/src/LoadGSS.cpp
@@ -14,10 +14,8 @@
#include <boost/math/special_functions/fpclassify.hpp>
#include <Poco/File.h>
-#include <iostream>
#include <fstream>
#include <sstream>
-#include <iomanip>
using namespace Mantid::DataHandling;
using namespace Mantid::API;
diff --git a/Framework/DataHandling/src/LoadILL.cpp b/Framework/DataHandling/src/LoadILL.cpp
index 0f84c252a6f..402c72e9672 100644
--- a/Framework/DataHandling/src/LoadILL.cpp
+++ b/Framework/DataHandling/src/LoadILL.cpp
@@ -14,7 +14,6 @@
#include <limits>
#include <algorithm>
-#include <iostream>
#include <vector>
#include <cmath>
diff --git a/Framework/DataHandling/src/LoadILLIndirect.cpp b/Framework/DataHandling/src/LoadILLIndirect.cpp
index 30c647209df..269c04e8bb0 100644
--- a/Framework/DataHandling/src/LoadILLIndirect.cpp
+++ b/Framework/DataHandling/src/LoadILLIndirect.cpp
@@ -7,8 +7,6 @@
#include <boost/algorithm/string.hpp>
#include <nexus/napi.h>
-#include <iostream>
-#include <iomanip> // std::setw
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/LoadILLReflectometry.cpp b/Framework/DataHandling/src/LoadILLReflectometry.cpp
index 2230840c96f..18a7f5888d6 100644
--- a/Framework/DataHandling/src/LoadILLReflectometry.cpp
+++ b/Framework/DataHandling/src/LoadILLReflectometry.cpp
@@ -13,7 +13,6 @@
#include <algorithm>
#include <nexus/napi.h>
-#include <iostream>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/LoadInstrument.cpp b/Framework/DataHandling/src/LoadInstrument.cpp
index 595dd5d8b1c..6337801bb66 100644
--- a/Framework/DataHandling/src/LoadInstrument.cpp
+++ b/Framework/DataHandling/src/LoadInstrument.cpp
@@ -20,7 +20,6 @@
#include <Poco/Exception.h>
#include <sstream>
#include <fstream>
-#include <iostream>
#include "MantidGeometry/Instrument/InstrumentDefinitionParser.h"
using Poco::XML::DOMParser;
diff --git a/Framework/DataHandling/src/LoadIsawDetCal.cpp b/Framework/DataHandling/src/LoadIsawDetCal.cpp
index 99294d57ece..5a7ddf61096 100644
--- a/Framework/DataHandling/src/LoadIsawDetCal.cpp
+++ b/Framework/DataHandling/src/LoadIsawDetCal.cpp
@@ -21,7 +21,6 @@
#include <fstream>
#include <numeric>
#include <cmath>
-#include <iomanip>
#include "MantidAPI/WorkspaceValidators.h"
namespace Mantid {
diff --git a/Framework/DataHandling/src/LoadLLB.cpp b/Framework/DataHandling/src/LoadLLB.cpp
index 353f8ccc8b4..bc37e7062bc 100644
--- a/Framework/DataHandling/src/LoadLLB.cpp
+++ b/Framework/DataHandling/src/LoadLLB.cpp
@@ -7,7 +7,6 @@
#include <limits>
#include <algorithm>
-#include <iostream>
#include <vector>
#include <cmath>
diff --git a/Framework/DataHandling/src/LoadLogsForSNSPulsedMagnet.cpp b/Framework/DataHandling/src/LoadLogsForSNSPulsedMagnet.cpp
index 7327e048fb6..f6ec882919c 100644
--- a/Framework/DataHandling/src/LoadLogsForSNSPulsedMagnet.cpp
+++ b/Framework/DataHandling/src/LoadLogsForSNSPulsedMagnet.cpp
@@ -4,7 +4,6 @@
#include "MantidAPI/FileProperty.h"
#include "MantidKernel/ConfigService.h"
-#include <iostream>
#include <fstream>
#include <sys/stat.h>
#include <sstream>
diff --git a/Framework/DataHandling/src/LoadMLZ.cpp b/Framework/DataHandling/src/LoadMLZ.cpp
index 7d2b4b9c94d..7f516fd0b87 100644
--- a/Framework/DataHandling/src/LoadMLZ.cpp
+++ b/Framework/DataHandling/src/LoadMLZ.cpp
@@ -12,7 +12,6 @@
#include <limits>
#include <algorithm>
-#include <iostream>
#include <vector>
#include <cmath>
//-----------------------------------------------------------------------
diff --git a/Framework/DataHandling/src/LoadPreNexusMonitors.cpp b/Framework/DataHandling/src/LoadPreNexusMonitors.cpp
index af5cce8e457..2ab2dd8416b 100644
--- a/Framework/DataHandling/src/LoadPreNexusMonitors.cpp
+++ b/Framework/DataHandling/src/LoadPreNexusMonitors.cpp
@@ -1,7 +1,6 @@
#include <cmath>
#include <cstdlib>
#include <fstream>
-#include <iostream>
#include <iterator>
#include "MantidDataHandling/LoadPreNexusMonitors.h"
diff --git a/Framework/DataHandling/src/LoadQKK.cpp b/Framework/DataHandling/src/LoadQKK.cpp
index 859b592c087..316cffc185a 100644
--- a/Framework/DataHandling/src/LoadQKK.cpp
+++ b/Framework/DataHandling/src/LoadQKK.cpp
@@ -14,9 +14,7 @@
#include <boost/math/special_functions/fpclassify.hpp>
#include <Poco/File.h>
-#include <iostream>
#include <fstream>
-#include <iomanip>
using namespace Mantid::DataHandling;
using namespace Mantid::API;
diff --git a/Framework/DataHandling/src/LoadSINQFocus.cpp b/Framework/DataHandling/src/LoadSINQFocus.cpp
index 096ebd88e5a..59d15f805e8 100644
--- a/Framework/DataHandling/src/LoadSINQFocus.cpp
+++ b/Framework/DataHandling/src/LoadSINQFocus.cpp
@@ -7,7 +7,6 @@
#include <limits>
#include <algorithm>
-#include <iostream>
#include <vector>
#include <cmath>
diff --git a/Framework/DataHandling/src/LoadSpice2D.cpp b/Framework/DataHandling/src/LoadSpice2D.cpp
index d3c4216fa83..79219379943 100644
--- a/Framework/DataHandling/src/LoadSpice2D.cpp
+++ b/Framework/DataHandling/src/LoadSpice2D.cpp
@@ -23,7 +23,6 @@
#include <Poco/DOM/Text.h>
#include <Poco/SAX/InputSource.h>
-#include <iostream>
//-----------------------------------------------------------------------
using Poco::XML::DOMParser;
diff --git a/Framework/DataHandling/src/SNSDataArchive.cpp b/Framework/DataHandling/src/SNSDataArchive.cpp
index 6045f308b66..028dcde170b 100644
--- a/Framework/DataHandling/src/SNSDataArchive.cpp
+++ b/Framework/DataHandling/src/SNSDataArchive.cpp
@@ -1,7 +1,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <iostream>
#include <sstream>
#include "MantidKernel/Logger.h"
diff --git a/Framework/DataHandling/src/SaveCSV.cpp b/Framework/DataHandling/src/SaveCSV.cpp
index 9cef6163fd7..d73643c8301 100644
--- a/Framework/DataHandling/src/SaveCSV.cpp
+++ b/Framework/DataHandling/src/SaveCSV.cpp
@@ -27,7 +27,6 @@
#include "MantidAPI/FileProperty.h"
#include <fstream> // used to get ofstream
-#include <iomanip> // setw() used below
/* @class SaveCSV
diff --git a/Framework/DataHandling/src/SaveFocusedXYE.cpp b/Framework/DataHandling/src/SaveFocusedXYE.cpp
index 6da1189b5b8..f6b917b15e2 100644
--- a/Framework/DataHandling/src/SaveFocusedXYE.cpp
+++ b/Framework/DataHandling/src/SaveFocusedXYE.cpp
@@ -8,7 +8,6 @@
#include <Poco/File.h>
#include <Poco/Path.h>
#include <fstream>
-#include <iomanip>
#include <cmath>
#include <exception>
diff --git a/Framework/DataHandling/src/SaveFullprofResolution.cpp b/Framework/DataHandling/src/SaveFullprofResolution.cpp
index 057694d26f3..5ef18d5b0db 100644
--- a/Framework/DataHandling/src/SaveFullprofResolution.cpp
+++ b/Framework/DataHandling/src/SaveFullprofResolution.cpp
@@ -8,7 +8,6 @@
#include <boost/algorithm/string.hpp>
#include <Poco/File.h>
-#include <iomanip>
#include <fstream>
using namespace Mantid;
diff --git a/Framework/DataHandling/src/SaveGSS.cpp b/Framework/DataHandling/src/SaveGSS.cpp
index d3e1cb6520f..460f326f800 100644
--- a/Framework/DataHandling/src/SaveGSS.cpp
+++ b/Framework/DataHandling/src/SaveGSS.cpp
@@ -11,7 +11,6 @@
#include <Poco/File.h>
#include <Poco/Path.h>
#include <fstream>
-#include <iomanip>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/SaveNISTDAT.cpp b/Framework/DataHandling/src/SaveNISTDAT.cpp
index 38441e68e44..0b32dc7d6dc 100644
--- a/Framework/DataHandling/src/SaveNISTDAT.cpp
+++ b/Framework/DataHandling/src/SaveNISTDAT.cpp
@@ -5,7 +5,6 @@
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/WorkspaceValidators.h"
#include <fstream> // used to get ofstream
-#include <iostream>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/SavePAR.cpp b/Framework/DataHandling/src/SavePAR.cpp
index d318f94f549..bf4ea3d2395 100644
--- a/Framework/DataHandling/src/SavePAR.cpp
+++ b/Framework/DataHandling/src/SavePAR.cpp
@@ -8,7 +8,6 @@
#include <cstdio>
#include <fstream>
-#include <iomanip>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/SavePDFGui.cpp b/Framework/DataHandling/src/SavePDFGui.cpp
index e6c1c2e622d..5afcbc2d76b 100644
--- a/Framework/DataHandling/src/SavePDFGui.cpp
+++ b/Framework/DataHandling/src/SavePDFGui.cpp
@@ -2,7 +2,6 @@
#include "MantidAPI/FileProperty.h"
#include "MantidKernel/MantidVersion.h"
#include <fstream>
-#include <iomanip>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/SavePHX.cpp b/Framework/DataHandling/src/SavePHX.cpp
index 7c221896f8b..579ba691415 100644
--- a/Framework/DataHandling/src/SavePHX.cpp
+++ b/Framework/DataHandling/src/SavePHX.cpp
@@ -8,7 +8,6 @@
#include <cstdio>
#include <fstream>
-#include <iomanip>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/SaveRKH.cpp b/Framework/DataHandling/src/SaveRKH.cpp
index 33316a700ba..915a33bf21f 100644
--- a/Framework/DataHandling/src/SaveRKH.cpp
+++ b/Framework/DataHandling/src/SaveRKH.cpp
@@ -7,7 +7,6 @@
#include <Poco/LocalDateTime.h>
#include <Poco/DateTimeFormatter.h>
-#include <iomanip>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataObjects/src/CoordTransformAffine.cpp b/Framework/DataObjects/src/CoordTransformAffine.cpp
index e9e0f9a688b..8f9584d6061 100644
--- a/Framework/DataObjects/src/CoordTransformAffine.cpp
+++ b/Framework/DataObjects/src/CoordTransformAffine.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidAPI/CoordTransform.h"
#include "MantidDataObjects/CoordTransformAffine.h"
diff --git a/Framework/DataObjects/src/EventList.cpp b/Framework/DataObjects/src/EventList.cpp
index 0e4260274c5..efb6e74c713 100644
--- a/Framework/DataObjects/src/EventList.cpp
+++ b/Framework/DataObjects/src/EventList.cpp
@@ -9,7 +9,6 @@
#include <cfloat>
#include <functional>
-#include <iostream>
#include <limits>
#include <math.h>
#include <Poco/ScopedLock.h>
diff --git a/Framework/DataObjects/src/Events.cpp b/Framework/DataObjects/src/Events.cpp
index ffb9e0c32be..c3483787091 100644
--- a/Framework/DataObjects/src/Events.cpp
+++ b/Framework/DataObjects/src/Events.cpp
@@ -5,7 +5,6 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/DateAndTime.h"
#include <functional>
-#include <iostream>
#include <math.h>
using std::ostream;
diff --git a/Framework/DataObjects/src/Histogram1D.cpp b/Framework/DataObjects/src/Histogram1D.cpp
index da29de62522..077adc23d52 100644
--- a/Framework/DataObjects/src/Histogram1D.cpp
+++ b/Framework/DataObjects/src/Histogram1D.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidDataObjects/Histogram1D.h"
#include "MantidKernel/Exception.h"
#include "MantidAPI/WorkspaceFactory.h"
diff --git a/Framework/DataObjects/src/PeaksWorkspace.cpp b/Framework/DataObjects/src/PeaksWorkspace.cpp
index 33bcd0d5000..083c66123c4 100644
--- a/Framework/DataObjects/src/PeaksWorkspace.cpp
+++ b/Framework/DataObjects/src/PeaksWorkspace.cpp
@@ -22,7 +22,6 @@
#include <boost/shared_ptr.hpp>
#include <exception>
#include <fstream>
-#include <iostream>
#include <math.h>
#include <ostream>
#include <stdio.h>
diff --git a/Framework/DataObjects/src/RebinnedOutput.cpp b/Framework/DataObjects/src/RebinnedOutput.cpp
index b6addfb0c0e..3be5eff9d10 100644
--- a/Framework/DataObjects/src/RebinnedOutput.cpp
+++ b/Framework/DataObjects/src/RebinnedOutput.cpp
@@ -3,7 +3,6 @@
#include "MantidAPI/WorkspaceFactory.h"
#include <algorithm>
-#include <iostream>
namespace Mantid {
namespace DataObjects {
diff --git a/Framework/DataObjects/src/TableWorkspace.cpp b/Framework/DataObjects/src/TableWorkspace.cpp
index 80290952df3..c352028bfd1 100644
--- a/Framework/DataObjects/src/TableWorkspace.cpp
+++ b/Framework/DataObjects/src/TableWorkspace.cpp
@@ -4,7 +4,6 @@
#include "MantidAPI/WorkspaceProperty.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include <iostream>
#include <queue>
namespace Mantid {
diff --git a/Framework/Geometry/src/Crystal/IndexingUtils.cpp b/Framework/Geometry/src/Crystal/IndexingUtils.cpp
index 65d194797e7..dbd81b746f3 100644
--- a/Framework/Geometry/src/Crystal/IndexingUtils.cpp
+++ b/Framework/Geometry/src/Crystal/IndexingUtils.cpp
@@ -3,7 +3,6 @@
#include "MantidKernel/Quat.h"
#include <boost/math/special_functions/fpclassify.hpp>
#include "MantidGeometry/Crystal/OrientedLattice.h"
-#include <iostream>
#include <stdexcept>
#include <algorithm>
diff --git a/Framework/Geometry/src/Crystal/NiggliCell.cpp b/Framework/Geometry/src/Crystal/NiggliCell.cpp
index baf61f0b7e3..bb91bf01670 100644
--- a/Framework/Geometry/src/Crystal/NiggliCell.cpp
+++ b/Framework/Geometry/src/Crystal/NiggliCell.cpp
@@ -3,7 +3,6 @@
#include "MantidKernel/Quat.h"
#include <boost/math/special_functions/fpclassify.hpp>
#include "MantidGeometry/Crystal/OrientedLattice.h"
-#include <iostream>
#include <stdexcept>
#include <algorithm>
diff --git a/Framework/Geometry/src/Crystal/PointGroup.cpp b/Framework/Geometry/src/Crystal/PointGroup.cpp
index e0805c6529c..85ff7e7dee1 100644
--- a/Framework/Geometry/src/Crystal/PointGroup.cpp
+++ b/Framework/Geometry/src/Crystal/PointGroup.cpp
@@ -4,7 +4,6 @@
#include <set>
#include <boost/make_shared.hpp>
#include <boost/algorithm/string.hpp>
-#include <iostream>
#include "MantidGeometry/Crystal/PointGroupFactory.h"
#include "MantidGeometry/Crystal/SymmetryOperationFactory.h"
diff --git a/Framework/Geometry/src/Crystal/ScalarUtils.cpp b/Framework/Geometry/src/Crystal/ScalarUtils.cpp
index 7dda5e72a8a..096cbabf474 100644
--- a/Framework/Geometry/src/Crystal/ScalarUtils.cpp
+++ b/Framework/Geometry/src/Crystal/ScalarUtils.cpp
@@ -1,6 +1,5 @@
/* File: ScalarUtils.cpp */
-#include <iostream>
#include <stdexcept>
#include "MantidGeometry/Crystal/ScalarUtils.h"
#include "MantidGeometry/Crystal/ReducedCell.h"
diff --git a/Framework/Geometry/src/Math/BnId.cpp b/Framework/Geometry/src/Math/BnId.cpp
index 25a999388cb..556e536328f 100644
--- a/Framework/Geometry/src/Math/BnId.cpp
+++ b/Framework/Geometry/src/Math/BnId.cpp
@@ -1,6 +1,4 @@
#include <fstream>
-#include <iomanip>
-#include <iostream>
#include <cmath>
#include <vector>
#include <set>
diff --git a/Framework/Geometry/src/Math/PolyBase.cpp b/Framework/Geometry/src/Math/PolyBase.cpp
index eac6ba5b99a..b3738109c6f 100644
--- a/Framework/Geometry/src/Math/PolyBase.cpp
+++ b/Framework/Geometry/src/Math/PolyBase.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <cmath>
#include <complex>
#include <vector>
diff --git a/Framework/Geometry/src/Math/PolygonIntersection.cpp b/Framework/Geometry/src/Math/PolygonIntersection.cpp
index f18f0c27a41..26d2558d8e4 100644
--- a/Framework/Geometry/src/Math/PolygonIntersection.cpp
+++ b/Framework/Geometry/src/Math/PolygonIntersection.cpp
@@ -7,7 +7,6 @@
#include "MantidKernel/Logger.h"
#include "MantidKernel/V2D.h"
-#include <iostream>
using namespace Mantid::Kernel;
diff --git a/Framework/Geometry/src/Math/RotCounter.cpp b/Framework/Geometry/src/Math/RotCounter.cpp
index 7a56cae785b..387a1041f87 100644
--- a/Framework/Geometry/src/Math/RotCounter.cpp
+++ b/Framework/Geometry/src/Math/RotCounter.cpp
@@ -1,6 +1,4 @@
#include <fstream>
-#include <iomanip>
-#include <iostream>
#include <algorithm>
#include <iterator>
#include <vector>
diff --git a/Framework/Geometry/src/Objects/RuleItems.cpp b/Framework/Geometry/src/Objects/RuleItems.cpp
index ebac656d63d..505fda685ee 100644
--- a/Framework/Geometry/src/Objects/RuleItems.cpp
+++ b/Framework/Geometry/src/Objects/RuleItems.cpp
@@ -1,6 +1,4 @@
#include <fstream>
-#include <iomanip>
-#include <iostream>
#include <complex>
#include <cmath>
#include <vector>
diff --git a/Framework/Geometry/src/Objects/Track.cpp b/Framework/Geometry/src/Objects/Track.cpp
index 8bfb529d730..ccb4c9dca1a 100644
--- a/Framework/Geometry/src/Objects/Track.cpp
+++ b/Framework/Geometry/src/Objects/Track.cpp
@@ -6,7 +6,6 @@
#include <cmath>
#include <algorithm>
-#include <iostream>
namespace Mantid {
namespace Geometry {
diff --git a/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp b/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp
index 76dd2da3ea2..ddfc5d61177 100644
--- a/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp
+++ b/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp
@@ -6,7 +6,6 @@
#include <Poco/SAX/InputSource.h>
#include <Poco/Exception.h>
#include <Poco/DOM/Element.h>
-#include <iostream>
using Poco::XML::DOMParser;
using Poco::XML::InputSource;
diff --git a/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp b/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp
index 2054aaad089..91cd38f113b 100644
--- a/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp
+++ b/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp
@@ -1,5 +1,4 @@
#include <fstream>
-#include <iostream>
#include <sstream>
#include "MantidGeometry/Rendering/vtkGeometryCacheWriter.h"
diff --git a/Framework/Geometry/src/Surfaces/Cone.cpp b/Framework/Geometry/src/Surfaces/Cone.cpp
index c40f71e018c..c584fe7daf6 100644
--- a/Framework/Geometry/src/Surfaces/Cone.cpp
+++ b/Framework/Geometry/src/Surfaces/Cone.cpp
@@ -1,6 +1,4 @@
#include <fstream>
-#include <iomanip>
-#include <iostream>
#include <sstream>
#include <cmath>
#include <complex>
diff --git a/Framework/Geometry/src/Surfaces/Torus.cpp b/Framework/Geometry/src/Surfaces/Torus.cpp
index 77cf5ea14f9..2f8ed1d860d 100644
--- a/Framework/Geometry/src/Surfaces/Torus.cpp
+++ b/Framework/Geometry/src/Surfaces/Torus.cpp
@@ -1,6 +1,4 @@
#include <fstream>
-#include <iomanip>
-#include <iostream>
#include <string>
#include <sstream>
#include <cmath>
diff --git a/Framework/Kernel/src/Atom.cpp b/Framework/Kernel/src/Atom.cpp
index 7a9e2551517..43452e3b8d6 100644
--- a/Framework/Kernel/src/Atom.cpp
+++ b/Framework/Kernel/src/Atom.cpp
@@ -1,5 +1,4 @@
#include <algorithm>
-#include <iostream> // REMOVE
#include <sstream>
#include <stdexcept>
#include "MantidKernel/Atom.h"
diff --git a/Framework/Kernel/src/DllOpen.cpp b/Framework/Kernel/src/DllOpen.cpp
index 927e518eac7..e66b0dced4b 100644
--- a/Framework/Kernel/src/DllOpen.cpp
+++ b/Framework/Kernel/src/DllOpen.cpp
@@ -1,5 +1,4 @@
#include <string>
-#include <iostream>
/*
If the OS is Windows then LoadLibrary, GetProcAddress and FreeLibrary are used.
diff --git a/Framework/Kernel/src/Exception.cpp b/Framework/Kernel/src/Exception.cpp
index ee12a3b5d95..26e6e194942 100644
--- a/Framework/Kernel/src/Exception.cpp
+++ b/Framework/Kernel/src/Exception.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <sstream>
#include "MantidKernel/Exception.h"
diff --git a/Framework/Kernel/src/FacilityInfo.cpp b/Framework/Kernel/src/FacilityInfo.cpp
index b85fb675073..9a42c5a2083 100644
--- a/Framework/Kernel/src/FacilityInfo.cpp
+++ b/Framework/Kernel/src/FacilityInfo.cpp
@@ -2,7 +2,6 @@
// Includes
//----------------------------------------------------------------------
#include <algorithm>
-#include <iostream>
#include "MantidKernel/FacilityInfo.h"
#include "MantidKernel/ConfigService.h"
diff --git a/Framework/Kernel/src/LibraryManager.cpp b/Framework/Kernel/src/LibraryManager.cpp
index 438e55b9b1d..da72c1042cb 100644
--- a/Framework/Kernel/src/LibraryManager.cpp
+++ b/Framework/Kernel/src/LibraryManager.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/DllOpen.h"
diff --git a/Framework/Kernel/src/Memory.cpp b/Framework/Kernel/src/Memory.cpp
index a1f11272d0a..448b2276787 100644
--- a/Framework/Kernel/src/Memory.cpp
+++ b/Framework/Kernel/src/Memory.cpp
@@ -1,8 +1,6 @@
#include "MantidKernel/Memory.h"
#include "MantidKernel/Logger.h"
-#include <iostream>
-#include <iomanip>
#include <sstream>
#ifdef __linux__
diff --git a/Framework/Kernel/src/NetworkProxyOSX.cpp b/Framework/Kernel/src/NetworkProxyOSX.cpp
index b3dbeb96dbc..5bdae5c9c29 100644
--- a/Framework/Kernel/src/NetworkProxyOSX.cpp
+++ b/Framework/Kernel/src/NetworkProxyOSX.cpp
@@ -5,7 +5,6 @@
#include <SystemConfiguration/SystemConfiguration.h>
#include <CoreFoundation/CoreFoundation.h>
#include <CFNetwork/CFProxySupport.h>
-#include <iostream>
#include <sstream>
#include <string>
#include <vector>
diff --git a/Framework/Kernel/src/NeutronAtom.cpp b/Framework/Kernel/src/NeutronAtom.cpp
index 03874b20567..4469af38fb7 100644
--- a/Framework/Kernel/src/NeutronAtom.cpp
+++ b/Framework/Kernel/src/NeutronAtom.cpp
@@ -4,7 +4,6 @@
#include "MantidKernel/NeutronAtom.h"
#include "MantidKernel/PhysicalConstants.h"
#include <algorithm>
-#include <iostream> // REMOVE
#include <sstream>
#include <stdexcept>
#include <boost/math/special_functions/fpclassify.hpp>
diff --git a/Framework/Kernel/src/ProxyInfo.cpp b/Framework/Kernel/src/ProxyInfo.cpp
index 1299ff719d8..c34da7a9411 100644
--- a/Framework/Kernel/src/ProxyInfo.cpp
+++ b/Framework/Kernel/src/ProxyInfo.cpp
@@ -1,6 +1,5 @@
#include "MantidKernel/ProxyInfo.h"
#include <stdexcept>
-#include <iostream>
namespace Mantid {
namespace Kernel {
diff --git a/Framework/Kernel/src/Strings.cpp b/Framework/Kernel/src/Strings.cpp
index c396f0e02c9..c2bf98bd5ac 100644
--- a/Framework/Kernel/src/Strings.cpp
+++ b/Framework/Kernel/src/Strings.cpp
@@ -11,7 +11,6 @@
#include <cmath>
#include <fstream>
-#include <iomanip>
using std::size_t;
diff --git a/Framework/Kernel/src/ThreadSafeLogStream.cpp b/Framework/Kernel/src/ThreadSafeLogStream.cpp
index e487fe13169..23eceb0c53e 100644
--- a/Framework/Kernel/src/ThreadSafeLogStream.cpp
+++ b/Framework/Kernel/src/ThreadSafeLogStream.cpp
@@ -2,7 +2,6 @@
// Includes
//-----------------------------------------------
#include "MantidKernel/ThreadSafeLogStream.h"
-#include <iostream>
using namespace Mantid::Kernel;
diff --git a/Framework/Kernel/src/V3D.cpp b/Framework/Kernel/src/V3D.cpp
index 0d504d14bec..fc9ef31b403 100644
--- a/Framework/Kernel/src/V3D.cpp
+++ b/Framework/Kernel/src/V3D.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <cmath>
#include <float.h>
#include <vector>
diff --git a/Framework/Kernel/src/VectorHelper.cpp b/Framework/Kernel/src/VectorHelper.cpp
index 71a917e2628..61aedadfc83 100644
--- a/Framework/Kernel/src/VectorHelper.cpp
+++ b/Framework/Kernel/src/VectorHelper.cpp
@@ -3,7 +3,6 @@
#include "MantidKernel/VectorHelper.h"
#include <algorithm>
-#include <iostream>
#include <numeric>
#include <sstream>
#include <boost/algorithm/string.hpp>
diff --git a/Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp b/Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp
index a4efd01bb0b..9bb7c6d1a17 100644
--- a/Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp
@@ -1,6 +1,5 @@
#include "MantidMDAlgorithms/ImportMDEventWorkspace.h"
-#include <iostream>
#include <fstream>
#include "MantidAPI/FileProperty.h"
diff --git a/Framework/MDAlgorithms/src/ImportMDHistoWorkspace.cpp b/Framework/MDAlgorithms/src/ImportMDHistoWorkspace.cpp
index 15f5a9a509f..86c15fc3b05 100644
--- a/Framework/MDAlgorithms/src/ImportMDHistoWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/ImportMDHistoWorkspace.cpp
@@ -2,7 +2,6 @@
#include "MantidAPI/FileProperty.h"
#include <deque>
-#include <iostream>
#include <fstream>
#include <iterator>
diff --git a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
index 8c1bf115599..f3db57b5fd7 100644
--- a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
+++ b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
@@ -1,5 +1,4 @@
#include <math.h>
-#include <iostream>
#include <fstream>
#include <boost/math/special_functions/round.hpp>
#include <boost/make_shared.hpp>
diff --git a/Framework/MDAlgorithms/src/LoadILLAscii.cpp b/Framework/MDAlgorithms/src/LoadILLAscii.cpp
index 835d1fe1868..86aaa741729 100644
--- a/Framework/MDAlgorithms/src/LoadILLAscii.cpp
+++ b/Framework/MDAlgorithms/src/LoadILLAscii.cpp
@@ -24,7 +24,6 @@
#include <algorithm>
#include <iterator> // std::distance
#include <sstream>
-#include <iostream>
#include <fstream>
#include <stdio.h>
#include <string.h>
diff --git a/Framework/MDAlgorithms/src/LoadSQW.cpp b/Framework/MDAlgorithms/src/LoadSQW.cpp
index 9df49767131..b3bc63d11e5 100644
--- a/Framework/MDAlgorithms/src/LoadSQW.cpp
+++ b/Framework/MDAlgorithms/src/LoadSQW.cpp
@@ -13,7 +13,6 @@
#include "MantidKernel/ThreadScheduler.h"
#include "MantidMDAlgorithms/LoadSQW.h"
#include "MantidAPI/RegisterFileLoader.h"
-#include <iostream>
#include <cfloat>
#include "MantidDataObjects/MDBox.h"
#include "MantidDataObjects/BoxControllerNeXusIO.h"
diff --git a/Framework/SINQ/src/LoadFlexiNexus.cpp b/Framework/SINQ/src/LoadFlexiNexus.cpp
index 2bb6ca7cd7c..d589ce89c86 100644
--- a/Framework/SINQ/src/LoadFlexiNexus.cpp
+++ b/Framework/SINQ/src/LoadFlexiNexus.cpp
@@ -5,7 +5,6 @@
#include "MantidGeometry/MDGeometry/MDTypes.h"
#include "MantidDataObjects/MDHistoWorkspace.h"
#include "MantidKernel/Utils.h"
-#include <iostream>
#include <fstream>
#include <sstream>
#include <boost/algorithm/string.hpp>
diff --git a/Framework/SINQ/src/MDHistoToWorkspace2D.cpp b/Framework/SINQ/src/MDHistoToWorkspace2D.cpp
index 25153f13116..2433e266d31 100644
--- a/Framework/SINQ/src/MDHistoToWorkspace2D.cpp
+++ b/Framework/SINQ/src/MDHistoToWorkspace2D.cpp
@@ -13,7 +13,6 @@
#include "MantidAPI/IMDHistoWorkspace.h"
#include <cmath>
-#include <iostream>
// Register the algorithm into the AlgorithmFactory
DECLARE_ALGORITHM(MDHistoToWorkspace2D)
diff --git a/Framework/SINQ/src/SINQHMListener.cpp b/Framework/SINQ/src/SINQHMListener.cpp
index d8434b56b5c..fd449cb9648 100644
--- a/Framework/SINQ/src/SINQHMListener.cpp
+++ b/Framework/SINQ/src/SINQHMListener.cpp
@@ -4,7 +4,6 @@
* Created on: Nov 14, 2012
* Author: mark.koennecke@psi.ch
*/
-#include <iostream>
#include <sstream>
#include "MantidAPI/LiveListenerFactory.h"
diff --git a/Framework/TestHelpers/src/LoggingCleaner.cpp b/Framework/TestHelpers/src/LoggingCleaner.cpp
index 7e6bcdaef45..81b7cead7dc 100644
--- a/Framework/TestHelpers/src/LoggingCleaner.cpp
+++ b/Framework/TestHelpers/src/LoggingCleaner.cpp
@@ -1,5 +1,4 @@
#include "MantidKernel/Logger.h"
-#include <iostream>
class LoggingCleaner {
public:
diff --git a/MantidPlot/src/CanvasPicker.cpp b/MantidPlot/src/CanvasPicker.cpp
index 2e918d8e064..96b5f6f4f32 100644
--- a/MantidPlot/src/CanvasPicker.cpp
+++ b/MantidPlot/src/CanvasPicker.cpp
@@ -39,7 +39,6 @@
#include <QVector>
#include <qwt_text_label.h>
#include <qwt_plot_canvas.h>
-//#include <iostream>
CanvasPicker::CanvasPicker(Graph *graph):
QObject(graph)
diff --git a/MantidPlot/src/Graph.cpp b/MantidPlot/src/Graph.cpp
index 4896dda0ac8..db3b3e6fcd2 100644
--- a/MantidPlot/src/Graph.cpp
+++ b/MantidPlot/src/Graph.cpp
@@ -107,7 +107,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <stddef.h>
-#include <iostream>
// We can safely ignore warnings about assuming signed overflow does not occur from qvector.h
// (They really should have implemented it with unsigned types!
diff --git a/MantidPlot/src/ImportASCIIDialog.cpp b/MantidPlot/src/ImportASCIIDialog.cpp
index c93828a2545..44c2ff0105b 100644
--- a/MantidPlot/src/ImportASCIIDialog.cpp
+++ b/MantidPlot/src/ImportASCIIDialog.cpp
@@ -46,7 +46,6 @@
#include <QHeaderView>
#include <gsl/gsl_math.h>
-#include<iostream>
ImportASCIIDialog::ImportASCIIDialog(bool new_windows_only, QWidget * parent, bool extended, Qt::WFlags flags )
: ExtensibleFileDialog(parent, extended, flags )
diff --git a/MantidPlot/src/LegendWidget.cpp b/MantidPlot/src/LegendWidget.cpp
index d17de386853..b11a10f70fd 100644
--- a/MantidPlot/src/LegendWidget.cpp
+++ b/MantidPlot/src/LegendWidget.cpp
@@ -45,7 +45,6 @@
#include <qwt_layout_metrics.h>
#include <qwt_symbol.h>
-#include <iostream>
LegendWidget::LegendWidget(Plot *plot):QWidget(plot),
d_plot(plot),
diff --git a/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp b/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp
index 3a3b77c8fd9..54bd5afaec5 100644
--- a/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp
+++ b/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp
@@ -19,7 +19,6 @@
#include <QDir>
#include <numeric>
-#include <iostream>
#include <fstream>
#include <stdio.h>
diff --git a/MantidPlot/src/Mantid/AlgorithmMonitor.cpp b/MantidPlot/src/Mantid/AlgorithmMonitor.cpp
index 04364ef9d71..5b4ffee3981 100644
--- a/MantidPlot/src/Mantid/AlgorithmMonitor.cpp
+++ b/MantidPlot/src/Mantid/AlgorithmMonitor.cpp
@@ -8,7 +8,6 @@
#include <QtGui>
#include <QThread>
-#include <iostream>
#include <algorithm>
using namespace std;
diff --git a/MantidPlot/src/Mantid/FitParameterTie.cpp b/MantidPlot/src/Mantid/FitParameterTie.cpp
index 928315ab13e..28bdb2c7bc4 100644
--- a/MantidPlot/src/Mantid/FitParameterTie.cpp
+++ b/MantidPlot/src/Mantid/FitParameterTie.cpp
@@ -2,7 +2,6 @@
#include "MantidAPI/CompositeFunction.h"
#include <QRegExp>
#include <stdexcept>
-#include <iostream>
/// Constructor
FitParameterTie::FitParameterTie(boost::shared_ptr<Mantid::API::CompositeFunction> cf)
diff --git a/MantidPlot/src/Mantid/InputHistory.cpp b/MantidPlot/src/Mantid/InputHistory.cpp
index 9487afac9e6..3b0da1e014e 100644
--- a/MantidPlot/src/Mantid/InputHistory.cpp
+++ b/MantidPlot/src/Mantid/InputHistory.cpp
@@ -3,7 +3,6 @@
#include <QSettings>
#include <vector>
-#include <iostream>
using namespace Mantid::API;
using namespace Mantid::Kernel;
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/CollapsiblePanel.cpp b/MantidPlot/src/Mantid/InstrumentWidget/CollapsiblePanel.cpp
index 1aa71735f6e..6876cced0e8 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/CollapsiblePanel.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/CollapsiblePanel.cpp
@@ -6,7 +6,6 @@
#include <QPolygon>
#include <stdexcept>
-#include <iostream>
CaptionLabel::CaptionLabel(const QString& caption,QWidget* parent):QLabel(caption,parent),m_collapsed(false)
{
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/GLActorCollection.cpp b/MantidPlot/src/Mantid/InstrumentWidget/GLActorCollection.cpp
index ad3abc03981..b023799998c 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/GLActorCollection.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/GLActorCollection.cpp
@@ -5,7 +5,6 @@
#include "MantidKernel/Exception.h"
#include <stdexcept>
-#include <iostream>
#include <functional>
#include <algorithm>
#include <float.h>
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/GLObject.cpp b/MantidPlot/src/Mantid/InstrumentWidget/GLObject.cpp
index 87815c5cf41..f93d0d9e942 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/GLObject.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/GLObject.cpp
@@ -5,7 +5,6 @@
#include "ObjCompAssemblyActor.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/System.h"
-#include <iostream>
int icount;
GLObject::GLObject(bool withDisplayList,const std::string& name):mName(name), mChanged(true)
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp
index d725f608279..1b9cd0ce1ea 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp
@@ -12,7 +12,6 @@
#include <QMessageBox>
#include <QString>
#include <cfloat>
-#include <iostream>
InstrumentTreeWidget::InstrumentTreeWidget(QWidget *w):QTreeView(w), m_instrActor(NULL), m_treeModel(NULL)
{
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.cpp b/MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.cpp
index 9fea8e14de8..dcd5dfc856a 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.cpp
@@ -15,7 +15,6 @@
#include <map>
#include <string>
-#include <iostream>
#include <cfloat>
#include <typeinfo>
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp b/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp
index ea8e944da90..090cde16df1 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp
@@ -16,7 +16,6 @@
#include <QPainter>
#include <QFont>
-#include <iostream>
#include <cmath>
OneCurvePlot::OneCurvePlot(QWidget* parent):
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp b/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp
index e8cea2ea006..8da241a02ea 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp
@@ -1,5 +1,4 @@
#include "OpenGLError.h"
-#include <iostream>
#include <sstream>
#include "MantidKernel/Logger.h"
#include "MantidGeometry/Rendering/OpenGL_Headers.h"
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/PeakMarker2D.cpp b/MantidPlot/src/Mantid/InstrumentWidget/PeakMarker2D.cpp
index e7c5915aea5..99135d6c0b9 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/PeakMarker2D.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/PeakMarker2D.cpp
@@ -7,7 +7,6 @@
#include <QMouseEvent>
#include <QWheelEvent>
-#include <iostream>
#include <algorithm>
#include <stdexcept>
#include <cmath>
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp b/MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp
index d02948d9a19..688652c8c9e 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp
@@ -23,7 +23,6 @@
#include <map>
#include <string>
-#include <iostream>
#include <cfloat>
#include <algorithm>
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/Shape2D.cpp b/MantidPlot/src/Mantid/InstrumentWidget/Shape2D.cpp
index 0a40a6ff188..bb5d301443a 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/Shape2D.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/Shape2D.cpp
@@ -8,7 +8,6 @@
#include <QLine>
#include <QMap>
-#include <iostream>
#include <algorithm>
#include <stdexcept>
#include <cmath>
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/Shape2DCollection.cpp b/MantidPlot/src/Mantid/InstrumentWidget/Shape2DCollection.cpp
index dcbb04b15d4..f2c38011600 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/Shape2DCollection.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/Shape2DCollection.cpp
@@ -7,7 +7,6 @@
#include <QApplication>
#include <QStringList>
-#include <iostream>
#include <stdexcept>
#include <cmath>
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/Viewport.cpp b/MantidPlot/src/Mantid/InstrumentWidget/Viewport.cpp
index fe0de8deb05..1c1c1cce8e7 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/Viewport.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/Viewport.cpp
@@ -1,6 +1,5 @@
#include "Viewport.h"
#include <math.h>
-#include <iostream>
#include "MantidGeometry/Rendering/OpenGL_Headers.h"
#include "MantidKernel/V3D.h"
#include "OpenGLError.h"
diff --git a/MantidPlot/src/Mantid/MantidApplication.cpp b/MantidPlot/src/Mantid/MantidApplication.cpp
index 67a264b7b77..dead6d262b4 100644
--- a/MantidPlot/src/Mantid/MantidApplication.cpp
+++ b/MantidPlot/src/Mantid/MantidApplication.cpp
@@ -8,7 +8,6 @@
#include <QMessageBox>
#include <QPushButton>
-#include <iostream>
namespace
{
diff --git a/MantidPlot/src/Mantid/MantidMatrix.cpp b/MantidPlot/src/Mantid/MantidMatrix.cpp
index 1bfeabebe8f..0702315186a 100644
--- a/MantidPlot/src/Mantid/MantidMatrix.cpp
+++ b/MantidPlot/src/Mantid/MantidMatrix.cpp
@@ -49,7 +49,6 @@
#include <QTabWidget>
#include <stdlib.h>
-#include <iostream>
#include <algorithm>
#include <limits>
diff --git a/MantidPlot/src/Mantid/MantidSampleLogDialog.cpp b/MantidPlot/src/Mantid/MantidSampleLogDialog.cpp
index 75d103842c8..7e5969971fe 100644
--- a/MantidPlot/src/Mantid/MantidSampleLogDialog.cpp
+++ b/MantidPlot/src/Mantid/MantidSampleLogDialog.cpp
@@ -20,7 +20,6 @@
#include <QRadioButton>
#include <QFileInfo>
#include <QMessageBox>
-#include <iostream>
#include <sstream>
#include "MantidAPI/ExperimentInfo.h"
#include "MantidAPI/MultipleExperimentInfos.h"
diff --git a/MantidPlot/src/Mantid/MantidTable.cpp b/MantidPlot/src/Mantid/MantidTable.cpp
index de0d7ddf842..722da9ddc35 100644
--- a/MantidPlot/src/Mantid/MantidTable.cpp
+++ b/MantidPlot/src/Mantid/MantidTable.cpp
@@ -10,7 +10,6 @@
#include <QMessageBox>
#include <QHash>
-#include <iostream>
#include <qfontmetrics.h>
using namespace MantidQt::API;
diff --git a/MantidPlot/src/Mantid/MantidUI.cpp b/MantidPlot/src/Mantid/MantidUI.cpp
index 57ff719e17b..d076bdf1574 100644
--- a/MantidPlot/src/Mantid/MantidUI.cpp
+++ b/MantidPlot/src/Mantid/MantidUI.cpp
@@ -68,7 +68,6 @@
#include <locale>
#include <set>
#include <fstream>
-#include <iostream>
#include <sstream>
#include <boost/tokenizer.hpp>
diff --git a/MantidPlot/src/Mantid/PeakPickerTool.cpp b/MantidPlot/src/Mantid/PeakPickerTool.cpp
index 2b5f31ed2bc..0e071aa584d 100644
--- a/MantidPlot/src/Mantid/PeakPickerTool.cpp
+++ b/MantidPlot/src/Mantid/PeakPickerTool.cpp
@@ -22,7 +22,6 @@
#include <QInputDialog>
#include <QMessageBox>
-#include <iostream>
namespace
{
diff --git a/MantidPlot/src/Mantid/UserFitFunctionDialog.cpp b/MantidPlot/src/Mantid/UserFitFunctionDialog.cpp
index eee79fa5b3a..0814da59551 100644
--- a/MantidPlot/src/Mantid/UserFitFunctionDialog.cpp
+++ b/MantidPlot/src/Mantid/UserFitFunctionDialog.cpp
@@ -7,7 +7,6 @@
#include <qcheckbox.h>
#include <qmessagebox.h>
#include <qheaderview.h>
-#include <iostream>
//---------------------------------------
// Public member functions
diff --git a/MantidPlot/src/PythonScript.cpp b/MantidPlot/src/PythonScript.cpp
index 23717ada1db..a83c5a096e4 100644
--- a/MantidPlot/src/PythonScript.cpp
+++ b/MantidPlot/src/PythonScript.cpp
@@ -39,7 +39,6 @@
#include <QVariant>
#include <QMessageBox>
-#include <iostream>
#include <stdexcept>
diff --git a/MantidPlot/src/Spectrogram.cpp b/MantidPlot/src/Spectrogram.cpp
index ece80d7b100..db3ab2aaa13 100644
--- a/MantidPlot/src/Spectrogram.cpp
+++ b/MantidPlot/src/Spectrogram.cpp
@@ -46,7 +46,6 @@
#include "TSVSerialiser.h"
-#include <iostream>
#include <numeric>
Spectrogram::Spectrogram():
diff --git a/MantidPlot/src/origin/OPJFile.cpp b/MantidPlot/src/origin/OPJFile.cpp
index 4a37431010c..c0eaf257564 100644
--- a/MantidPlot/src/origin/OPJFile.cpp
+++ b/MantidPlot/src/origin/OPJFile.cpp
@@ -51,7 +51,6 @@
#endif
#include <stdio.h>
-#include <iostream>
#include <stdlib.h>
#include <math.h>
#include <cstring>
diff --git a/MantidPlot/src/pixmaps.cpp b/MantidPlot/src/pixmaps.cpp
index ddb37192d96..75faddbc7ae 100644
--- a/MantidPlot/src/pixmaps.cpp
+++ b/MantidPlot/src/pixmaps.cpp
@@ -6,7 +6,6 @@
*/
#include "pixmaps.h"
-#include <iostream>
#include <sstream>
#include <stdexcept>
diff --git a/MantidQt/API/src/UserSubWindow.cpp b/MantidQt/API/src/UserSubWindow.cpp
index 4c9354d8f67..6dace365d7f 100644
--- a/MantidQt/API/src/UserSubWindow.cpp
+++ b/MantidQt/API/src/UserSubWindow.cpp
@@ -12,8 +12,6 @@
#include <QTemporaryFile>
#include <QTextStream>
-#include <iostream>
-
using namespace MantidQt::API;
//------------------------------------------------------
diff --git a/MantidQt/MantidWidgets/src/MantidHelpWindow.cpp b/MantidQt/MantidWidgets/src/MantidHelpWindow.cpp
index 110d04a7ce3..c599d37c08e 100644
--- a/MantidQt/MantidWidgets/src/MantidHelpWindow.cpp
+++ b/MantidQt/MantidWidgets/src/MantidHelpWindow.cpp
@@ -6,7 +6,6 @@
#include "MantidKernel/RegistrationHelper.h"
#include <boost/make_shared.hpp>
#include <boost/lexical_cast.hpp>
-#include <iostream>
#include <Poco/File.h>
#include <Poco/Path.h>
#include <QDesktopServices>
diff --git a/MantidQt/MantidWidgets/src/ScriptEditor.cpp b/MantidQt/MantidWidgets/src/ScriptEditor.cpp
index 5e4c2bdfdc1..c43f2cfbb1a 100644
--- a/MantidQt/MantidWidgets/src/ScriptEditor.cpp
+++ b/MantidQt/MantidWidgets/src/ScriptEditor.cpp
@@ -33,7 +33,6 @@
// std
#include <cmath>
-#include <iostream>
#include <stdexcept>
//***************************************************************************
diff --git a/MantidQt/MantidWidgets/src/StringDialogEditor.cpp b/MantidQt/MantidWidgets/src/StringDialogEditor.cpp
index e84f62ba444..ade129f78b7 100644
--- a/MantidQt/MantidWidgets/src/StringDialogEditor.cpp
+++ b/MantidQt/MantidWidgets/src/StringDialogEditor.cpp
@@ -8,7 +8,6 @@
#include <QDialog>
#include <QSettings>
-#include <iostream>
/**
* Do nothing to connect a manager.
diff --git a/MantidQt/RefDetectorViewer/src/RefDetectorViewDemo.cpp b/MantidQt/RefDetectorViewer/src/RefDetectorViewDemo.cpp
index e2ea0e8b756..1b1e345cf84 100644
--- a/MantidQt/RefDetectorViewer/src/RefDetectorViewDemo.cpp
+++ b/MantidQt/RefDetectorViewer/src/RefDetectorViewDemo.cpp
@@ -1,5 +1,4 @@
-#include <iostream>
#include <qapplication.h>
#include <QMainWindow>
diff --git a/MantidQt/RefDetectorViewer/src/RefIVConnections.cpp b/MantidQt/RefDetectorViewer/src/RefIVConnections.cpp
index 42109cf39cb..fede037dfe0 100644
--- a/MantidQt/RefDetectorViewer/src/RefIVConnections.cpp
+++ b/MantidQt/RefDetectorViewer/src/RefIVConnections.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QLineEdit>
#include <qwt_plot_canvas.h>
diff --git a/MantidQt/RefDetectorViewer/src/RefImageView.cpp b/MantidQt/RefDetectorViewer/src/RefImageView.cpp
index d5385cb4dfa..6c35c6eca90 100644
--- a/MantidQt/RefDetectorViewer/src/RefImageView.cpp
+++ b/MantidQt/RefDetectorViewer/src/RefImageView.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidQtRefDetectorViewer/RefImageView.h"
#include "MantidQtSpectrumViewer/ColorMaps.h"
diff --git a/MantidQt/RefDetectorViewer/src/RefMatrixWSImageView.cpp b/MantidQt/RefDetectorViewer/src/RefMatrixWSImageView.cpp
index 91e32036086..f63397e1da6 100644
--- a/MantidQt/RefDetectorViewer/src/RefMatrixWSImageView.cpp
+++ b/MantidQt/RefDetectorViewer/src/RefMatrixWSImageView.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidQtRefDetectorViewer/RefMatrixWSImageView.h"
#include "MantidQtSpectrumViewer/ArrayDataSource.h"
#include "MantidQtRefDetectorViewer/RefIVConnections.h"
diff --git a/MantidQt/RefDetectorViewer/src/RefRangeHandler.cpp b/MantidQt/RefDetectorViewer/src/RefRangeHandler.cpp
index 437a3cc7efa..a2f7d1d8b70 100644
--- a/MantidQt/RefDetectorViewer/src/RefRangeHandler.cpp
+++ b/MantidQt/RefDetectorViewer/src/RefRangeHandler.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QLineEdit>
#include "MantidQtRefDetectorViewer/RefRangeHandler.h"
diff --git a/MantidQt/RefDetectorViewer/src/RefSliderHandler.cpp b/MantidQt/RefDetectorViewer/src/RefSliderHandler.cpp
index 2fc6a2faef4..e11b1cbf465 100644
--- a/MantidQt/RefDetectorViewer/src/RefSliderHandler.cpp
+++ b/MantidQt/RefDetectorViewer/src/RefSliderHandler.cpp
@@ -1,5 +1,4 @@
-#include <iostream>
#include <QScrollBar>
#include "MantidQtRefDetectorViewer/RefSliderHandler.h"
diff --git a/MantidQt/SliceViewer/src/ColorBarWidget.cpp b/MantidQt/SliceViewer/src/ColorBarWidget.cpp
index 0f3c72044c8..0d07267f675 100644
--- a/MantidQt/SliceViewer/src/ColorBarWidget.cpp
+++ b/MantidQt/SliceViewer/src/ColorBarWidget.cpp
@@ -4,7 +4,6 @@
#include "qwt_scale_div.h"
#include "MantidQtAPI/PowerScaleEngine.h"
#include <iosfwd>
-#include <iostream>
#include <qwt_scale_map.h>
#include <qwt_scale_widget.h>
#include <QKeyEvent>
diff --git a/MantidQt/SliceViewer/src/CustomTools.cpp b/MantidQt/SliceViewer/src/CustomTools.cpp
index 34439d2e5dc..f0a8f6ca9a7 100644
--- a/MantidQt/SliceViewer/src/CustomTools.cpp
+++ b/MantidQt/SliceViewer/src/CustomTools.cpp
@@ -1,7 +1,5 @@
#include "MantidQtSliceViewer/CustomTools.h"
-#include <iomanip>
#include <iosfwd>
-#include <iostream>
namespace MantidQt
{
diff --git a/MantidQt/SliceViewer/src/DimensionSliceWidget.cpp b/MantidQt/SliceViewer/src/DimensionSliceWidget.cpp
index 7d2892969e7..9572cd4842e 100644
--- a/MantidQt/SliceViewer/src/DimensionSliceWidget.cpp
+++ b/MantidQt/SliceViewer/src/DimensionSliceWidget.cpp
@@ -1,8 +1,6 @@
#include "MantidQtSliceViewer/DimensionSliceWidget.h"
#include "MantidKernel/UnitLabel.h"
#include <iosfwd>
-#include <iostream>
-#include <iomanip>
#include <qlayout.h>
namespace MantidQt
diff --git a/MantidQt/SliceViewer/src/LineOverlay.cpp b/MantidQt/SliceViewer/src/LineOverlay.cpp
index b68d0a89adb..4a172e3a2b9 100644
--- a/MantidQt/SliceViewer/src/LineOverlay.cpp
+++ b/MantidQt/SliceViewer/src/LineOverlay.cpp
@@ -1,7 +1,6 @@
#include "MantidQtSliceViewer/LineOverlay.h"
#include <qwt_plot.h>
#include <qwt_plot_canvas.h>
-#include <iostream>
#include <qpainter.h>
#include <QRect>
#include <QShowEvent>
diff --git a/MantidQt/SliceViewer/src/PeaksTableColumnsDialog.cpp b/MantidQt/SliceViewer/src/PeaksTableColumnsDialog.cpp
index 1de3e15906e..bde8b1a41bd 100644
--- a/MantidQt/SliceViewer/src/PeaksTableColumnsDialog.cpp
+++ b/MantidQt/SliceViewer/src/PeaksTableColumnsDialog.cpp
@@ -3,7 +3,6 @@
#include "ui_PeaksTableColumnsDialog.h"
// REMOVE
-#include <iostream>
namespace MantidQt
{
diff --git a/MantidQt/SliceViewer/src/SliceViewer.cpp b/MantidQt/SliceViewer/src/SliceViewer.cpp
index 003b774d559..f251baaf444 100644
--- a/MantidQt/SliceViewer/src/SliceViewer.cpp
+++ b/MantidQt/SliceViewer/src/SliceViewer.cpp
@@ -1,6 +1,4 @@
-#include <iomanip>
#include <iosfwd>
-#include <iostream>
#include <limits>
#include <sstream>
#include <vector>
diff --git a/MantidQt/SliceViewer/src/main_ColorBarWidgetDemo.cpp b/MantidQt/SliceViewer/src/main_ColorBarWidgetDemo.cpp
index a0fb09e4c9b..e15a843addf 100644
--- a/MantidQt/SliceViewer/src/main_ColorBarWidgetDemo.cpp
+++ b/MantidQt/SliceViewer/src/main_ColorBarWidgetDemo.cpp
@@ -1,6 +1,5 @@
#include "MantidQtSliceViewer/ColorBarWidget.h"
#include "qmainwindow.h"
-#include <iostream>
#include <QApplication>
#include <QDir>
#include <QMessageBox>
diff --git a/MantidQt/SliceViewer/src/main_LineViewerDemo.cpp b/MantidQt/SliceViewer/src/main_LineViewerDemo.cpp
index ab70ae54f02..cd15090523f 100644
--- a/MantidQt/SliceViewer/src/main_LineViewerDemo.cpp
+++ b/MantidQt/SliceViewer/src/main_LineViewerDemo.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QApplication>
#include <QSplashScreen>
#include <QMessageBox>
diff --git a/MantidQt/SliceViewer/src/main_SliceViewerDemo.cpp b/MantidQt/SliceViewer/src/main_SliceViewerDemo.cpp
index cb76eb2a00b..37ce5d6153d 100644
--- a/MantidQt/SliceViewer/src/main_SliceViewerDemo.cpp
+++ b/MantidQt/SliceViewer/src/main_SliceViewerDemo.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QApplication>
#include <QSplashScreen>
#include <QMessageBox>
diff --git a/MantidQt/SliceViewer/src/main_SliceViewerWindowDemo.cpp b/MantidQt/SliceViewer/src/main_SliceViewerWindowDemo.cpp
index 0167bc47a4b..41db0d8e18d 100644
--- a/MantidQt/SliceViewer/src/main_SliceViewerWindowDemo.cpp
+++ b/MantidQt/SliceViewer/src/main_SliceViewerWindowDemo.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QApplication>
#include <QSplashScreen>
#include <QMessageBox>
diff --git a/MantidQt/SpectrumViewer/src/ArrayDataSource.cpp b/MantidQt/SpectrumViewer/src/ArrayDataSource.cpp
index f07a4d1fff2..30953f04ffd 100644
--- a/MantidQt/SpectrumViewer/src/ArrayDataSource.cpp
+++ b/MantidQt/SpectrumViewer/src/ArrayDataSource.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <math.h>
diff --git a/MantidQt/SpectrumViewer/src/ColorMaps.cpp b/MantidQt/SpectrumViewer/src/ColorMaps.cpp
index 9b09dc5da6f..b140b53c22b 100644
--- a/MantidQt/SpectrumViewer/src/ColorMaps.cpp
+++ b/MantidQt/SpectrumViewer/src/ColorMaps.cpp
@@ -1,5 +1,4 @@
-#include <iostream>
#include <sstream>
#include <math.h>
diff --git a/MantidQt/SpectrumViewer/src/DataArray.cpp b/MantidQt/SpectrumViewer/src/DataArray.cpp
index b18fa101558..e3c58c8b732 100644
--- a/MantidQt/SpectrumViewer/src/DataArray.cpp
+++ b/MantidQt/SpectrumViewer/src/DataArray.cpp
@@ -2,7 +2,6 @@
* File DataArray.cpp
*/
-#include <iostream>
#include <math.h>
#include "MantidQtSpectrumViewer/DataArray.h"
diff --git a/MantidQt/SpectrumViewer/src/EModeHandler.cpp b/MantidQt/SpectrumViewer/src/EModeHandler.cpp
index 6176600a7cf..784ff1ce791 100644
--- a/MantidQt/SpectrumViewer/src/EModeHandler.cpp
+++ b/MantidQt/SpectrumViewer/src/EModeHandler.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QLineEdit>
#include "MantidQtSpectrumViewer/EModeHandler.h"
diff --git a/MantidQt/SpectrumViewer/src/GraphDisplay.cpp b/MantidQt/SpectrumViewer/src/GraphDisplay.cpp
index 2cf6a0fdb43..fb458c40088 100644
--- a/MantidQt/SpectrumViewer/src/GraphDisplay.cpp
+++ b/MantidQt/SpectrumViewer/src/GraphDisplay.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QtGui>
#include <QVector>
#include <QString>
diff --git a/MantidQt/SpectrumViewer/src/MatrixWSDataSource.cpp b/MantidQt/SpectrumViewer/src/MatrixWSDataSource.cpp
index 583079fd990..4992d41c67b 100644
--- a/MantidQt/SpectrumViewer/src/MatrixWSDataSource.cpp
+++ b/MantidQt/SpectrumViewer/src/MatrixWSDataSource.cpp
@@ -3,7 +3,6 @@
*/
#include <boost/lexical_cast.hpp>
-#include <iostream>
#include <sstream>
#include <math.h>
diff --git a/MantidQt/SpectrumViewer/src/MatrixWSSpectrumView.cpp b/MantidQt/SpectrumViewer/src/MatrixWSSpectrumView.cpp
index a7622cd74bf..07f3aa6ea64 100644
--- a/MantidQt/SpectrumViewer/src/MatrixWSSpectrumView.cpp
+++ b/MantidQt/SpectrumViewer/src/MatrixWSSpectrumView.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidQtSpectrumViewer/MatrixWSSpectrumView.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/MantidQt/SpectrumViewer/src/RangeHandler.cpp b/MantidQt/SpectrumViewer/src/RangeHandler.cpp
index 416b7f2a444..5f48eb56546 100644
--- a/MantidQt/SpectrumViewer/src/RangeHandler.cpp
+++ b/MantidQt/SpectrumViewer/src/RangeHandler.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QLineEdit>
#include "MantidQtSpectrumViewer/RangeHandler.h"
diff --git a/MantidQt/SpectrumViewer/src/SVConnections.cpp b/MantidQt/SpectrumViewer/src/SVConnections.cpp
index ca5442b9f60..1d01bd13634 100644
--- a/MantidQt/SpectrumViewer/src/SVConnections.cpp
+++ b/MantidQt/SpectrumViewer/src/SVConnections.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <qwt_plot_canvas.h>
#include <QDesktopServices>
diff --git a/MantidQt/SpectrumViewer/src/SliderHandler.cpp b/MantidQt/SpectrumViewer/src/SliderHandler.cpp
index d5fec750d75..715029998ea 100644
--- a/MantidQt/SpectrumViewer/src/SliderHandler.cpp
+++ b/MantidQt/SpectrumViewer/src/SliderHandler.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QScrollBar>
#include "MantidQtSpectrumViewer/SliderHandler.h"
diff --git a/MantidQt/SpectrumViewer/src/SpectrumDataSource.cpp b/MantidQt/SpectrumViewer/src/SpectrumDataSource.cpp
index 510b583f2d4..680ceb0a500 100644
--- a/MantidQt/SpectrumViewer/src/SpectrumDataSource.cpp
+++ b/MantidQt/SpectrumViewer/src/SpectrumDataSource.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <math.h>
diff --git a/MantidQt/SpectrumViewer/src/SpectrumDisplay.cpp b/MantidQt/SpectrumViewer/src/SpectrumDisplay.cpp
index f66bb0b012b..408c6d7f79c 100644
--- a/MantidQt/SpectrumViewer/src/SpectrumDisplay.cpp
+++ b/MantidQt/SpectrumViewer/src/SpectrumDisplay.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <sstream>
#include <cfloat>
diff --git a/MantidQt/SpectrumViewer/src/SpectrumPlotItem.cpp b/MantidQt/SpectrumViewer/src/SpectrumPlotItem.cpp
index 1ae3028c5de..84b355b43ed 100644
--- a/MantidQt/SpectrumViewer/src/SpectrumPlotItem.cpp
+++ b/MantidQt/SpectrumViewer/src/SpectrumPlotItem.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QThread>
#include "MantidQtSpectrumViewer/SpectrumPlotItem.h"
diff --git a/MantidQt/SpectrumViewer/src/SpectrumView.cpp b/MantidQt/SpectrumViewer/src/SpectrumView.cpp
index 9b01297abec..272a637544f 100644
--- a/MantidQt/SpectrumViewer/src/SpectrumView.cpp
+++ b/MantidQt/SpectrumViewer/src/SpectrumView.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidQtSpectrumViewer/SpectrumView.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/QtPropertyBrowser/src/DoubleEditorFactory.cpp b/QtPropertyBrowser/src/DoubleEditorFactory.cpp
index 666130ec533..6e93ddb27cc 100644
--- a/QtPropertyBrowser/src/DoubleEditorFactory.cpp
+++ b/QtPropertyBrowser/src/DoubleEditorFactory.cpp
@@ -4,7 +4,6 @@
#include <QDoubleValidator>
-#include <iostream>
#include <cfloat>
#include <sstream>
#include <cmath>
diff --git a/QtPropertyBrowser/src/qttreepropertybrowser.cpp b/QtPropertyBrowser/src/qttreepropertybrowser.cpp
index 53f493d7bee..63b6b13a9ac 100644
--- a/QtPropertyBrowser/src/qttreepropertybrowser.cpp
+++ b/QtPropertyBrowser/src/qttreepropertybrowser.cpp
@@ -100,7 +100,6 @@
#include <QtGui/qcheckbox.h>
#include <QtGui/qlineedit.h>
-#include <iostream>
#if QT_VERSION >= 0x040400
QT_BEGIN_NAMESPACE
diff --git a/Vates/VatesAPI/src/vtkNullStructuredGrid.cpp b/Vates/VatesAPI/src/vtkNullStructuredGrid.cpp
index a246ffbe36d..7947450b22d 100644
--- a/Vates/VatesAPI/src/vtkNullStructuredGrid.cpp
+++ b/Vates/VatesAPI/src/vtkNullStructuredGrid.cpp
@@ -7,7 +7,7 @@
#include <vtkFloatArray.h>
#include <vtkSmartPointer.h>
#include <vtkStructuredGrid.h>
-#include <iostream>
+
namespace Mantid {
namespace VATES {
diff --git a/Vates/VatesSimpleGui/QtWidgets/src/GeometryParser.cpp b/Vates/VatesSimpleGui/QtWidgets/src/GeometryParser.cpp
index e8aa4715613..28f88d9e6f2 100644
--- a/Vates/VatesSimpleGui/QtWidgets/src/GeometryParser.cpp
+++ b/Vates/VatesSimpleGui/QtWidgets/src/GeometryParser.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <sstream>
#include "MantidVatesSimpleGuiQtWidgets/GeometryParser.h"
diff --git a/Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp b/Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp
index 93c1e5d511c..4e456176744 100644
--- a/Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp
+++ b/Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp
@@ -7,7 +7,6 @@
#include <QPushButton>
#include <exception>
-#include <iostream>
namespace
{
diff --git a/Vates/VatesSimpleGui/ViewWidgets/src/ColorSelectionWidget.cpp b/Vates/VatesSimpleGui/ViewWidgets/src/ColorSelectionWidget.cpp
index 2a56dae5488..d215e3aaa53 100644
--- a/Vates/VatesSimpleGui/ViewWidgets/src/ColorSelectionWidget.cpp
+++ b/Vates/VatesSimpleGui/ViewWidgets/src/ColorSelectionWidget.cpp
@@ -1,5 +1,4 @@
#include <cfloat>
-#include <iostream>
#include "MantidVatesSimpleGuiViewWidgets/ColorSelectionWidget.h"
#include "MantidKernel/ConfigService.h"
diff --git a/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp b/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
index d5cc40e9793..dbf6fd81743 100644
--- a/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
+++ b/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <vector>
#include <set>
#include <string>
diff --git a/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp b/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp
index 65311bdb14c..00e3995b05c 100644
--- a/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp
+++ b/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp
@@ -36,7 +36,6 @@
#include <QString>
-#include <iostream>
using namespace Mantid::Geometry;
using namespace MantidQt::SliceViewer;
diff --git a/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp b/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp
index b56216a2207..962a116fc52 100644
--- a/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp
+++ b/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp
@@ -27,9 +27,6 @@
#include <QMessageBox>
-#include <iostream>
-#include <string>
-
namespace Mantid
{
namespace Vates
diff --git a/tools/DAEserv/DAEserv/isisds_command.cpp b/tools/DAEserv/DAEserv/isisds_command.cpp
index 131c03ade6e..b354735c732 100644
--- a/tools/DAEserv/DAEserv/isisds_command.cpp
+++ b/tools/DAEserv/DAEserv/isisds_command.cpp
@@ -20,8 +20,6 @@
#include <stdio.h>
#include "isisds_command.h"
-#include <iostream>
-
using namespace std;
/*
--
GitLab
From 7bc228a321bf0fcdcd8c481b602e26bf13b99df9 Mon Sep 17 00:00:00 2001
From: Jiao Lin <linjiao@ornl.gov>
Date: Thu, 8 Oct 2015 11:11:38 -0400
Subject: [PATCH 082/223] Re #13572. fix Y axis unit text
---
.../PythonInterface/plugins/algorithms/SavePlot1DAsJson.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
index 1ae6b0dca96..7bc6cc43370 100644
--- a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
+++ b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
@@ -112,7 +112,8 @@ class SavePlot1DAsJson(PythonAlgorithm):
xlabel=label(workspace.getAxis(0)),
ylabel=label(workspace.getAxis(1)),
xunit = unit(workspace.getAxis(0)),
- yunit = unit(workspace.getAxis(1)),
+ # yunit = unit(workspace.getAxis(1)),
+ yunit = workspace.YUnitLabel(),
)
serialized['axes'] = axes
return {pname: serialized}
--
GitLab
From d512d4b72edead06e43463a8f14b7d898c032252 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 16:15:20 +0100
Subject: [PATCH 083/223] make clang-format happy about spaces and new lines,
re #13689
---
Framework/API/src/Axis.cpp | 1 -
Framework/API/src/IFunctionMW.cpp | 1 -
Framework/Algorithms/src/Regroup.cpp | 1 -
Framework/Algorithms/test/RegroupTest.h | 1 -
Framework/CurveFitting/src/CostFuncLeastSquares.cpp | 1 -
Framework/DataHandling/src/SaveRKH.cpp | 1 -
Framework/DataHandling/test/RawFileInfoTest.h | 1 -
Framework/DataHandling/test/XMLInstrumentParameterTest.h | 1 -
Framework/Geometry/src/Math/PolygonIntersection.cpp | 1 -
Framework/Kernel/inc/MantidKernel/ANN/ANN.h | 8 ++++----
Framework/Kernel/test/BoseEinsteinDistributionTest.h | 1 -
Framework/Kernel/test/FunctionTaskTest.h | 1 -
Framework/Kernel/test/MagneticFormFactorTableTest.h | 1 -
Framework/Kernel/test/TaskTest.h | 1 -
Framework/Kernel/test/UnitConversionTest.h | 1 -
Framework/MDAlgorithms/test/SlicingAlgorithmTest.h | 1 -
16 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/Framework/API/src/Axis.cpp b/Framework/API/src/Axis.cpp
index e8db95989d5..6f8abc8a5af 100644
--- a/Framework/API/src/Axis.cpp
+++ b/Framework/API/src/Axis.cpp
@@ -5,7 +5,6 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/UnitFactory.h"
-
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/IFunctionMW.cpp b/Framework/API/src/IFunctionMW.cpp
index 0d8f987a1e4..9797475d1d8 100644
--- a/Framework/API/src/IFunctionMW.cpp
+++ b/Framework/API/src/IFunctionMW.cpp
@@ -4,7 +4,6 @@
#include "MantidAPI/IFunctionMW.h"
#include "MantidAPI/MatrixWorkspace.h"
-
namespace Mantid {
namespace API {
using namespace Geometry;
diff --git a/Framework/Algorithms/src/Regroup.cpp b/Framework/Algorithms/src/Regroup.cpp
index 9a218cf3604..b3997f78f68 100644
--- a/Framework/Algorithms/src/Regroup.cpp
+++ b/Framework/Algorithms/src/Regroup.cpp
@@ -12,7 +12,6 @@
#include <functional>
#include <cmath>
-
namespace Mantid {
namespace Algorithms {
diff --git a/Framework/Algorithms/test/RegroupTest.h b/Framework/Algorithms/test/RegroupTest.h
index 2ac82cc4188..fd329c37d4f 100644
--- a/Framework/Algorithms/test/RegroupTest.h
+++ b/Framework/Algorithms/test/RegroupTest.h
@@ -8,7 +8,6 @@
#include "MantidAlgorithms/Regroup.h"
#include "MantidAPI/WorkspaceProperty.h"
-
using namespace Mantid::Kernel;
using namespace Mantid::DataObjects;
using namespace Mantid::API;
diff --git a/Framework/CurveFitting/src/CostFuncLeastSquares.cpp b/Framework/CurveFitting/src/CostFuncLeastSquares.cpp
index 8a2c0d99007..f0ada5744ed 100644
--- a/Framework/CurveFitting/src/CostFuncLeastSquares.cpp
+++ b/Framework/CurveFitting/src/CostFuncLeastSquares.cpp
@@ -10,7 +10,6 @@
#include "MantidKernel/Logger.h"
#include "MantidKernel/MultiThreaded.h"
-
namespace Mantid {
namespace CurveFitting {
namespace {
diff --git a/Framework/DataHandling/src/SaveRKH.cpp b/Framework/DataHandling/src/SaveRKH.cpp
index 915a33bf21f..0caf9bc73b0 100644
--- a/Framework/DataHandling/src/SaveRKH.cpp
+++ b/Framework/DataHandling/src/SaveRKH.cpp
@@ -7,7 +7,6 @@
#include <Poco/LocalDateTime.h>
#include <Poco/DateTimeFormatter.h>
-
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/test/RawFileInfoTest.h b/Framework/DataHandling/test/RawFileInfoTest.h
index b79e4a66897..ad68b2485b0 100644
--- a/Framework/DataHandling/test/RawFileInfoTest.h
+++ b/Framework/DataHandling/test/RawFileInfoTest.h
@@ -5,7 +5,6 @@
#include "MantidDataHandling/RawFileInfo.h"
#include "MantidAPI/ITableWorkspace.h"
-
using namespace Mantid::DataHandling;
class RawFileInfoTest : public CxxTest::TestSuite {
diff --git a/Framework/DataHandling/test/XMLInstrumentParameterTest.h b/Framework/DataHandling/test/XMLInstrumentParameterTest.h
index f9f2225fc1f..4e022520d27 100644
--- a/Framework/DataHandling/test/XMLInstrumentParameterTest.h
+++ b/Framework/DataHandling/test/XMLInstrumentParameterTest.h
@@ -11,7 +11,6 @@
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/TimeSeriesProperty.h"
-
using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::DataHandling;
diff --git a/Framework/Geometry/src/Math/PolygonIntersection.cpp b/Framework/Geometry/src/Math/PolygonIntersection.cpp
index 26d2558d8e4..29d1b209a9d 100644
--- a/Framework/Geometry/src/Math/PolygonIntersection.cpp
+++ b/Framework/Geometry/src/Math/PolygonIntersection.cpp
@@ -7,7 +7,6 @@
#include "MantidKernel/Logger.h"
#include "MantidKernel/V2D.h"
-
using namespace Mantid::Kernel;
namespace Mantid {
diff --git a/Framework/Kernel/inc/MantidKernel/ANN/ANN.h b/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
index 883617cb529..30d66ac44a7 100644
--- a/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
+++ b/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
@@ -107,10 +107,10 @@
// basic includes
//----------------------------------------------------------------------
-#include <cstdlib> // standard lib includes
-#include <cmath> // math includes
-#include <iosfwd> // I/O streams
-#include <cstring> // C-style strings
+#include <cstdlib> // standard lib includes
+#include <cmath> // math includes
+#include <iosfwd> // I/O streams
+#include <cstring> // C-style strings
//----------------------------------------------------------------------
// Limits
diff --git a/Framework/Kernel/test/BoseEinsteinDistributionTest.h b/Framework/Kernel/test/BoseEinsteinDistributionTest.h
index 99ead0791a9..38809270e46 100644
--- a/Framework/Kernel/test/BoseEinsteinDistributionTest.h
+++ b/Framework/Kernel/test/BoseEinsteinDistributionTest.h
@@ -6,7 +6,6 @@
#include <cxxtest/TestSuite.h>
-
class BoseEinsteinDistributionTest : public CxxTest::TestSuite {
public:
void test_Standard_Distribution_Gives_Correct_Value_Away_From_Edge() {
diff --git a/Framework/Kernel/test/FunctionTaskTest.h b/Framework/Kernel/test/FunctionTaskTest.h
index 48c4c3dcd27..ff7054fa190 100644
--- a/Framework/Kernel/test/FunctionTaskTest.h
+++ b/Framework/Kernel/test/FunctionTaskTest.h
@@ -7,7 +7,6 @@
#include "MantidKernel/Task.h"
#include "MantidKernel/FunctionTask.h"
-
using namespace Mantid::Kernel;
/** Functions for use by the tasks */
diff --git a/Framework/Kernel/test/MagneticFormFactorTableTest.h b/Framework/Kernel/test/MagneticFormFactorTableTest.h
index fe0cc907d33..1d660d419e6 100644
--- a/Framework/Kernel/test/MagneticFormFactorTableTest.h
+++ b/Framework/Kernel/test/MagneticFormFactorTableTest.h
@@ -6,7 +6,6 @@
#include <boost/scoped_ptr.hpp>
-
using Mantid::PhysicalConstants::MagneticFormFactorTable;
class MagneticFormFactorTableTest : public CxxTest::TestSuite {
diff --git a/Framework/Kernel/test/TaskTest.h b/Framework/Kernel/test/TaskTest.h
index 8c21073991a..975a27f179e 100644
--- a/Framework/Kernel/test/TaskTest.h
+++ b/Framework/Kernel/test/TaskTest.h
@@ -6,7 +6,6 @@
#include <MantidKernel/Timer.h>
#include "MantidKernel/Task.h"
-
using namespace Mantid::Kernel;
namespace TaskTestNamespace {
diff --git a/Framework/Kernel/test/UnitConversionTest.h b/Framework/Kernel/test/UnitConversionTest.h
index 495bbcb52f4..369caac852a 100644
--- a/Framework/Kernel/test/UnitConversionTest.h
+++ b/Framework/Kernel/test/UnitConversionTest.h
@@ -6,7 +6,6 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/PhysicalConstants.h"
-
using Mantid::Kernel::UnitConversion;
class UnitConversionTest : public CxxTest::TestSuite {
diff --git a/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h b/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h
index 9f33ccbad80..762ffd5f2d1 100644
--- a/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h
+++ b/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h
@@ -9,7 +9,6 @@
#include <cxxtest/TestSuite.h>
-
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::Geometry;
--
GitLab
From 6a7f737d6526c014eb542550fa33aa5c32682400 Mon Sep 17 00:00:00 2001
From: Shahroz Ahmed <shahroz.ahmed@stfc.ac.uk>
Date: Thu, 8 Oct 2015 16:17:18 +0100
Subject: [PATCH 084/223] fully functioning comboBox, separate pycode passed
for each option
Refs #13811
---
.../EnggDiffractionPresenter.h | 1 +
.../EnggDiffractionQtTabFocus.ui | 402 +++++++++++-------
.../EnggDiffractionViewQtGUI.h | 16 +
.../IEnggDiffractionPresenter.h | 21 +-
.../EnggDiffraction/IEnggDiffractionView.h | 24 ++
.../EnggDiffractionPresenter.cpp | 77 +++-
.../EnggDiffractionViewQtGUI.cpp | 62 ++-
.../test/EnggDiffractionViewMock.h | 14 +-
8 files changed, 430 insertions(+), 187 deletions(-)
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h
index ab2cb4672c8..ab21b8c925e 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h
@@ -85,6 +85,7 @@ protected:
void processLogMsg();
void processInstChange();
void processShutDown();
+ void processPlotRepChange();
protected slots:
void calibrationFinished();
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFocus.ui b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFocus.ui
index da4954af862..76e0aa9e045 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFocus.ui
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFocus.ui
@@ -7,30 +7,123 @@
<x>0</x>
<y>0</y>
<width>614</width>
- <height>533</height>
+ <height>545</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="6" column="0">
- <widget class="QGroupBox" name="groupBox_focus_2">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="groupBox_focus">
<property name="title">
- <string>Output</string>
+ <string>Focus run</string>
</property>
- <layout class="QGridLayout" name="gridLayout_2">
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="2" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>238</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_focus">
+ <property name="text">
+ <string>Focus</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QLabel" name="label_banks_sel">
+ <property name="text">
+ <string>Banks:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>298</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>18</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <widget class="QCheckBox" name="checkBox_focus_bank1">
+ <property name="text">
+ <string>1</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkBox_focus_bank2">
+ <property name="text">
+ <string>2</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
<item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QCheckBox" name="checkBox_FocusedWS">
+ <widget class="QLabel" name="label_run_num">
<property name="text">
- <string>Plot Focused Workspace</string>
+ <string>Run #:</string>
</property>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_4">
+ <spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -42,12 +135,22 @@
</property>
</spacer>
</item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit_run_num">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="readOnly">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
</widget>
</item>
- <item row="2" column="0">
+ <item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Focus Cropped</string>
@@ -148,147 +251,96 @@
</layout>
</widget>
</item>
- <item row="4" column="0">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>388</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="0">
- <widget class="QGroupBox" name="groupBox_focus">
+ <item>
+ <widget class="QGroupBox" name="groupBox_2">
<property name="title">
- <string>Focus run</string>
+ <string>Focus Texture</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="2" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
- <spacer name="horizontalSpacer_3">
+ <widget class="QLabel" name="label_texture_run_num">
+ <property name="text">
+ <string>Run #:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>238</width>
+ <width>98</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
- <widget class="QPushButton" name="pushButton_focus">
+ <widget class="QLineEdit" name="lineEdit_texture_run_num">
<property name="text">
- <string>Focus</string>
+ <string/>
+ </property>
+ <property name="readOnly">
+ <bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QLabel" name="label_banks_sel">
- <property name="text">
- <string>Banks:</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_5">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>298</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>18</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Detector Grouping File:</string>
+ </property>
+ </widget>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <widget class="QCheckBox" name="checkBox_focus_bank1">
- <property name="text">
- <string>1</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBox_focus_bank2">
- <property name="text">
- <string>2</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QLineEdit" name="lineEdit_texture_grouping_file">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
</item>
- </layout>
- </item>
- <item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QLabel" name="label_run_num">
+ <widget class="QPushButton" name="pushButton_texture_browse_grouping_file">
<property name="text">
- <string>Run #:</string>
+ <string>Browse</string>
</property>
</widget>
</item>
+ </layout>
+ </item>
+ <item row="2" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
- <spacer name="horizontalSpacer">
+ <spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>98</width>
+ <width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
- <widget class="QLineEdit" name="lineEdit_run_num">
+ <widget class="QPushButton" name="pushButton_focus_texture">
<property name="text">
- <string/>
- </property>
- <property name="readOnly">
- <bool>false</bool>
+ <string>Focus</string>
</property>
</widget>
</item>
@@ -297,23 +349,42 @@
</layout>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QGroupBox" name="groupBox_2">
+ <item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_focus_3">
+ <property name="minimumSize">
+ <size>
+ <width>596</width>
+ <height>111</height>
+ </size>
+ </property>
<property name="title">
- <string>Focus Texture</string>
+ <string>Output</string>
</property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_20">
<item>
- <widget class="QLabel" name="label_texture_run_num">
+ <widget class="QCheckBox" name="checkBox_FocusedWS">
<property name="text">
- <string>Run #:</string>
+ <string>Plot Focused Workspace</string>
</property>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_6">
+ <spacer name="horizontalSpacer_18">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -325,77 +396,106 @@
</property>
</spacer>
</item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_21">
<item>
- <widget class="QLineEdit" name="lineEdit_texture_run_num">
- <property name="text">
- <string/>
+ <spacer name="horizontalSpacer_19">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="readOnly">
- <bool>false</bool>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>98</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
- </layout>
- </item>
- <item row="1" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
- <widget class="QLabel" name="label_2">
+ <widget class="QLabel" name="label_4">
<property name="text">
- <string>Detector Grouping File:</string>
+ <string>Plot Data Representation:</string>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="lineEdit_texture_grouping_file">
+ <widget class="QComboBox" name="comboBox_PlotData">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>1</horstretch>
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="readOnly">
- <bool>true</bool>
+ <property name="minimumSize">
+ <size>
+ <width>175</width>
+ <height>10</height>
+ </size>
</property>
+ <property name="sizeIncrement">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="baseSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <item>
+ <property name="text">
+ <string>One Window - Replacing Plots</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>One Window - Waterfall</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Multiple Windows</string>
+ </property>
+ </item>
</widget>
</item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_22">
<item>
- <widget class="QPushButton" name="pushButton_texture_browse_grouping_file">
+ <widget class="QCheckBox" name="checkBox_OutputFiles_">
<property name="text">
- <string>Browse</string>
+ <string>Output Files</string>
</property>
</widget>
</item>
- </layout>
- </item>
- <item row="2" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
- <spacer name="horizontalSpacer_9">
+ <spacer name="horizontalSpacer_20">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
+ <width>98</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
- <item>
- <widget class="QPushButton" name="pushButton_focus_texture">
- <property name="text">
- <string>Focus</string>
- </property>
- </widget>
- </item>
</layout>
</item>
</layout>
</widget>
</item>
- <item row="5" column="0">
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout_13">
<item>
<spacer name="horizontalSpacer_11">
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h
index baed981c8f1..ef099e71625 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h
@@ -121,6 +121,12 @@ public:
virtual void plotFocusedSpectrum(const std::string &wsName);
+ virtual void plotWaterfallSpectrum(const std::string &wsName);
+
+ virtual void plotReplacingWindow(const std::string &wsName);
+
+ int currentPlotType() const { return m_currentType; }
+
private slots:
/// for buttons, do calibrate, focus and similar
void loadCalibrationClicked();
@@ -145,6 +151,12 @@ private slots:
// slots of the general part of the interface
void instrumentChanged(int idx);
+ // slots of the focus part of the interface
+ void plotRepChanged(int idx);
+
+ // slots of plot spectrum check box status
+ void plotFocusStatus();
+
// show the standard Mantid help window with this interface's help
void openHelpWin();
@@ -183,6 +195,10 @@ private:
/// instrument selected (ENGIN-X, etc.)
std::string m_currentInst;
+
+ // plot data representation type selected
+ int m_currentType;
+
/// current calibration produced in the 'Calibration' tab
std::string m_currentCalibFilename;
/// calibration settings - from/to the 'settings' tab
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h
index a2c0240d4ce..1e95a472209 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h
@@ -38,16 +38,17 @@ public:
/// These are user actions, triggered from the (passive) view, that need
/// handling by the presenter
enum Notification {
- Start, ///< Start and setup interface
- LoadExistingCalib, ///< Load a calibration already availble on disk
- CalcCalib, ///< Calculate a (new) calibration
- FocusRun, ///< Focus one or more run files
- FocusCropped, ///< Focus one or more run files, cropped variant
- FocusTexture, ///< Focus one or more run files, texture variant
- ResetFocus, ///< Re-set / clear all focus inputs and options
- LogMsg, ///< need to send a message to the Mantid log system
- InstrumentChange, ///< Instrument selection updated
- ShutDown ///< closing the interface
+ Start, ///< Start and setup interface
+ LoadExistingCalib, ///< Load a calibration already availble on disk
+ CalcCalib, ///< Calculate a (new) calibration
+ FocusRun, ///< Focus one or more run files
+ FocusCropped, ///< Focus one or more run files, cropped variant
+ FocusTexture, ///< Focus one or more run files, texture variant
+ ResetFocus, ///< Re-set / clear all focus inputs and options
+ LogMsg, ///< need to send a message to the Mantid log system
+ InstrumentChange, ///< Instrument selection updated
+ PlotRepChange, ///< Data Plot representation selection updated
+ ShutDown ///< closing the interface
};
/**
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionView.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionView.h
index e701764dac3..dda719b7a2c 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionView.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionView.h
@@ -269,6 +269,30 @@ public:
* @param wsName name of the workspace to plot (must be in the ADS)
*/
virtual void plotFocusedSpectrum(const std::string &wsName) = 0;
+
+ /**
+ * Produces a waterfall spectrum graph for focused output. Runs
+ * plotSpectrum function via python.
+ *
+ * @param wsName name of the workspace to plot (must be in the ADS)
+ */
+ virtual void plotWaterfallSpectrum(const std::string &wsName) = 0;
+
+ /**
+ * Produces a replaceable spectrum graph for focused output. Runs
+ * plotSpectrum function via python.
+ *
+ * @param wsName name of the workspace to plot (must be in the ADS)
+ */
+ virtual void plotReplacingWindow(const std::string &wsName) = 0;
+
+ /*
+ * Selected plot data representation will be applied, which will
+ * ran through python script
+ *
+ * @return which format should to applied for plotting data
+ */
+ virtual int currentPlotType() const = 0;
};
} // namespace CustomInterfaces
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp
index 0b0be67c9f4..0c2681fb510 100644
--- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp
+++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp
@@ -57,7 +57,8 @@ void EnggDiffractionPresenter::cleanup() {
if (m_workerThread) {
if (m_workerThread->isRunning()) {
g_log.notice() << "A calibration process is currently running, shutting "
- "it down immediately..." << std::endl;
+ "it down immediately..."
+ << std::endl;
m_workerThread->wait(10);
}
delete m_workerThread;
@@ -109,6 +110,10 @@ void EnggDiffractionPresenter::notify(
case IEnggDiffractionPresenter::ShutDown:
processShutDown();
break;
+
+ case IEnggDiffractionPresenter::PlotRepChange:
+ processPlotRepChange();
+ break;
}
}
@@ -146,7 +151,8 @@ void EnggDiffractionPresenter::processCalcCalib() {
return;
}
g_log.notice() << "EnggDiffraction GUI: starting new calibration. This may "
- "take a few seconds... " << std::endl;
+ "take a few seconds... "
+ << std::endl;
const std::string outFilename = outputCalibFilename(vanNo, ceriaNo);
@@ -265,6 +271,11 @@ void EnggDiffractionPresenter::processShutDown() {
cleanup();
}
+void EnggDiffractionPresenter::processPlotRepChange() {
+ m_view->saveSettings();
+ cleanup();
+}
+
/**
* Does several checks on the current inputs and settings. This should
* be done before starting any calibration work. The message return
@@ -414,10 +425,9 @@ void EnggDiffractionPresenter::parseCalibrateFilename(const std::string &path,
* @param vanNo vanadium run number
* @param ceriaNo ceria run number
*/
-void
-EnggDiffractionPresenter::startAsyncCalibWorker(const std::string &outFilename,
- const std::string &vanNo,
- const std::string &ceriaNo) {
+void EnggDiffractionPresenter::startAsyncCalibWorker(
+ const std::string &outFilename, const std::string &vanNo,
+ const std::string &ceriaNo) {
delete m_workerThread;
m_workerThread = new QThread(this);
EnggDiffWorker *worker =
@@ -466,11 +476,13 @@ void EnggDiffractionPresenter::doNewCalibration(const std::string &outFilename,
} catch (std::runtime_error &) {
g_log.error() << "The calibration calculations failed. One of the "
"algorithms did not execute correctly. See log messages "
- "for details. " << std::endl;
+ "for details. "
+ << std::endl;
} catch (std::invalid_argument &) {
g_log.error()
<< "The calibration calculations failed. Some input properties "
- "were not valid. See log messages for details. " << std::endl;
+ "were not valid. See log messages for details. "
+ << std::endl;
}
// restore normal data search paths
conf.setDataSearchDirs(tmpDirs);
@@ -710,8 +722,8 @@ void EnggDiffractionPresenter::inputChecksBeforeFocusTexture(
inputChecksBeforeFocus();
}
-void
-EnggDiffractionPresenter::inputChecksBanks(const std::vector<bool> &banks) {
+void EnggDiffractionPresenter::inputChecksBanks(
+ const std::vector<bool> &banks) {
if (0 == banks.size()) {
const std::string msg =
"Error in specification of banks found when starting the "
@@ -848,7 +860,8 @@ void EnggDiffractionPresenter::doFocusRun(
const std::string &specNos, const std::string &dgFile) {
g_log.notice() << "Generating new focusing workspace(s) and file(s) into "
- "this directory: " << dir << std::endl;
+ "this directory: "
+ << dir << std::endl;
// TODO: this is almost 100% common with doNewCalibrate() - refactor
EnggDiffCalibSettings cs = m_view->currentCalibSettings();
@@ -887,7 +900,8 @@ void EnggDiffractionPresenter::doFocusRun(
loadDetectorGroupingCSV(dgFile, bankIDs, specs);
} catch (std::runtime_error &re) {
g_log.error() << "Error loading detector grouping file: " + dgFile +
- ". Detailed error: " + re.what() << std::endl;
+ ". Detailed error: " + re.what()
+ << std::endl;
bankIDs.clear();
specs.clear();
}
@@ -903,8 +917,8 @@ void EnggDiffractionPresenter::doFocusRun(
fpath.append(effectiveFilenames[idx]).toString();
g_log.notice() << "Generating new focused file (bank " +
boost::lexical_cast<std::string>(bankIDs[idx]) +
- ") for run " + runNo +
- " into: " << effectiveFilenames[idx] << std::endl;
+ ") for run " + runNo + " into: "
+ << effectiveFilenames[idx] << std::endl;
try {
doFocusing(cs, fullFilename, runNo, bankIDs[idx], specs[idx], dgFile);
m_focusFinishedOK = true;
@@ -916,7 +930,8 @@ void EnggDiffractionPresenter::doFocusRun(
} catch (std::invalid_argument &ia) {
g_log.error()
<< "The focusing failed. Some input properties were not valid. "
- "See log messages for details. Error: " << ia.what() << std::endl;
+ "See log messages for details. Error: "
+ << ia.what() << std::endl;
}
}
@@ -1084,7 +1099,31 @@ void EnggDiffractionPresenter::doFocusing(const EnggDiffCalibSettings &cs,
alg->execute();
const bool plotFocusedWS = m_view->focusedOutWorkspace();
- if (plotFocusedWS == true) {
+ int plotType = m_view->currentPlotType();
+ g_log.debug() << "...Plot Type return: " << plotType << std::endl;
+
+ // Qt comboBox returns absurd number for index of 0
+ if (plotType > 3) {
+ plotType = 1;
+ } else {
+ plotType += 1;
+ }
+
+ if (plotFocusedWS == true && 1 == plotType) {
+ if (outWSName == "engggui_focusing_output_ws_bank_1")
+ m_view->plotFocusedSpectrum(outWSName);
+ if (outWSName == "engggui_focusing_output_ws_bank_2")
+ m_view->plotReplacingWindow(outWSName);
+ }
+
+ else if (plotFocusedWS == true && 2 == plotType) {
+ if (outWSName == "engggui_focusing_output_ws_bank_1")
+ m_view->plotFocusedSpectrum(outWSName);
+ if (outWSName == "engggui_focusing_output_ws_bank_2")
+ m_view->plotWaterfallSpectrum(outWSName);
+ }
+
+ else if (plotFocusedWS == true && 3 == plotType) {
m_view->plotFocusedSpectrum(outWSName);
}
@@ -1160,7 +1199,8 @@ void EnggDiffractionPresenter::loadOrCalcVanadiumWorkspaces(
"This is possibly because some of the settings are not "
"consistent. Please check the log messages for "
"details. Details: " +
- std::string(ia.what()) << std::endl;
+ std::string(ia.what())
+ << std::endl;
throw;
} catch (std::runtime_error &re) {
g_log.error() << "Failed to calculate Vanadium corrections. "
@@ -1169,7 +1209,8 @@ void EnggDiffractionPresenter::loadOrCalcVanadiumWorkspaces(
"There was no obvious error in the input properties "
"but the algorithm failed. Please check the log "
"messages for details." +
- std::string(re.what()) << std::endl;
+ std::string(re.what())
+ << std::endl;
throw;
}
} else {
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
index c594b5b2732..e6978ccc6e4 100644
--- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
+++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
@@ -149,6 +149,8 @@ void EnggDiffractionViewQtGUI::doSetupTabSettings() {
}
void EnggDiffractionViewQtGUI::doSetupTabFocus() {
+ m_uiTabFocus.comboBox_PlotData->setCurrentIndex(0);
+
connect(m_uiTabFocus.pushButton_focus, SIGNAL(released()), this,
SLOT(focusClicked()));
@@ -163,6 +165,12 @@ void EnggDiffractionViewQtGUI::doSetupTabFocus() {
connect(m_uiTabFocus.pushButton_reset, SIGNAL(released()), this,
SLOT(focusResetClicked()));
+
+ connect(m_uiTabFocus.comboBox_PlotData, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(plotRepChanged(int)));
+
+ connect(m_uiTabFocus.checkBox_FocusedWS, SIGNAL(clicked()), this,
+ SLOT(plotFocusStatus()));
}
void EnggDiffractionViewQtGUI::doSetupGeneralWidgets() {
@@ -209,9 +217,11 @@ void EnggDiffractionViewQtGUI::readSettings() {
qs.beginReadArray("user-params-focus-bank_i");
qs.setArrayIndex(0);
- m_uiTabFocus.checkBox_focus_bank1->setChecked(qs.value("value", true).toBool());
+ m_uiTabFocus.checkBox_focus_bank1->setChecked(
+ qs.value("value", true).toBool());
qs.setArrayIndex(1);
- m_uiTabFocus.checkBox_focus_bank2->setChecked(qs.value("value", true).toBool());
+ m_uiTabFocus.checkBox_focus_bank2->setChecked(
+ qs.value("value", true).toBool());
qs.endArray();
m_uiTabFocus.lineEdit_cropped_run_num->setText(
@@ -421,10 +431,33 @@ void EnggDiffractionViewQtGUI::enableCalibrateAndFocusActions(bool enable) {
}
void EnggDiffractionViewQtGUI::plotFocusedSpectrum(const std::string &wsName) {
- std::string pyCode = "plotSpectrum('" + wsName + "', 0)";
+ std::string pyCode = "win = plotSpectrum('" + wsName + "', 0)";
+
+ std::string status =
+ runPythonCode(QString::fromStdString(pyCode), false).toStdString();
+ m_logMsgs.push_back("Plotted output focused data, with status string " +
+ status);
+ m_presenter->notify(IEnggDiffractionPresenter::LogMsg);
+}
+
+void EnggDiffractionViewQtGUI::plotWaterfallSpectrum(
+ const std::string &wsName) {
+ // parameter of list ?
+ std::string pyCode =
+ "plotSpectrum('" + wsName + "', 0, waterfall = True, window = win)";
+ std::string status =
+ runPythonCode(QString::fromStdString(pyCode), false).toStdString();
+ m_logMsgs.push_back("Plotted output focused data, with status string " +
+ status);
+ m_presenter->notify(IEnggDiffractionPresenter::LogMsg);
+}
+void EnggDiffractionViewQtGUI::plotReplacingWindow(const std::string &wsName) {
+ std::string pyCode =
+ "plotSpectrum('" + wsName + "', 0, window = win, clearWindow = True)";
std::string status =
runPythonCode(QString::fromStdString(pyCode), false).toStdString();
+
m_logMsgs.push_back("Plotted output focused data, with status string " +
status);
m_presenter->notify(IEnggDiffractionPresenter::LogMsg);
@@ -442,10 +475,9 @@ void EnggDiffractionViewQtGUI::resetFocus() {
m_uiTabFocus.lineEdit_texture_grouping_file->setText("");
}
-void
-EnggDiffractionViewQtGUI::writeOutCalibFile(const std::string &outFilename,
- const std::vector<double> &difc,
- const std::vector<double> &tzero) {
+void EnggDiffractionViewQtGUI::writeOutCalibFile(
+ const std::string &outFilename, const std::vector<double> &difc,
+ const std::vector<double> &tzero) {
// TODO: this is horrible and should not last much here.
// Avoid running Python code
// Update this as soon as we have a more stable way of generating IPARM
@@ -677,6 +709,22 @@ bool EnggDiffractionViewQtGUI::focusedOutWorkspace() const {
return m_uiTabFocus.checkBox_FocusedWS->checkState();
}
+void EnggDiffractionViewQtGUI::plotFocusStatus() {
+ if (focusedOutWorkspace()) {
+ m_uiTabFocus.comboBox_PlotData->setEnabled(true);
+ } else {
+ m_uiTabFocus.comboBox_PlotData->setEnabled(false);
+ }
+}
+
+void EnggDiffractionViewQtGUI::plotRepChanged(int /*idx*/) {
+ QComboBox *inst = m_uiTabFocus.comboBox_PlotData;
+ if (!inst)
+ return;
+ m_currentType = inst->currentIndex();
+ m_presenter->notify(IEnggDiffractionPresenter::PlotRepChange);
+}
+
void EnggDiffractionViewQtGUI::instrumentChanged(int /*idx*/) {
QComboBox *inst = m_ui.comboBox_instrument;
if (!inst)
diff --git a/MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h b/MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h
index 36c5bdd0a65..01b8d4db8e8 100644
--- a/MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h
+++ b/MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h
@@ -105,7 +105,19 @@ public:
MOCK_CONST_METHOD0(saveSettings, void());
// virtual void plotFocusedSpectrum();
- MOCK_METHOD1(plotFocusedSpectrum, void(const std::string&));
+ MOCK_METHOD1(plotFocusedSpectrum, void(const std::string &));
+
+ // void plotFocusStatus();
+ MOCK_METHOD0(plotFocusStatus, void());
+
+ // void plotRepChanged();
+ MOCK_METHOD1(plotRepChanged, void(int idx));
+
+ // virtual void plotWaterfallSpectrum
+ MOCK_METHOD1(plotWaterfallSpectrum, void(const std::string &wsName));
+
+ // std::string currentPlotType
+ MOCK_CONST_METHOD0(currentPlotType, int());
};
#endif // MANTID_CUSTOMINTERFACES_ENGGDIFFRACTIONVIEWMOCK_H
--
GitLab
From d2349132ef1c752d02ab3258c39169c3bc8501ee Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 16:23:25 +0100
Subject: [PATCH 085/223] include <string> for rhel6, re #13140
---
Framework/API/inc/MantidAPI/ITransformScale.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/Framework/API/inc/MantidAPI/ITransformScale.h b/Framework/API/inc/MantidAPI/ITransformScale.h
index d13af449f04..18832392062 100644
--- a/Framework/API/inc/MantidAPI/ITransformScale.h
+++ b/Framework/API/inc/MantidAPI/ITransformScale.h
@@ -8,6 +8,7 @@
#include <boost/shared_ptr.hpp>
#endif
+#include <string>
#include <vector>
#include "MantidAPI/DllConfig.h"
--
GitLab
From c83d13c03af2701803076cfad89d114b2825af61 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 16:26:05 +0100
Subject: [PATCH 086/223] Revert "include <string> for rhel6, re #13140"
This reverts commit d2349132ef1c752d02ab3258c39169c3bc8501ee. which doesn't belong in here
---
Framework/API/inc/MantidAPI/ITransformScale.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/Framework/API/inc/MantidAPI/ITransformScale.h b/Framework/API/inc/MantidAPI/ITransformScale.h
index 18832392062..d13af449f04 100644
--- a/Framework/API/inc/MantidAPI/ITransformScale.h
+++ b/Framework/API/inc/MantidAPI/ITransformScale.h
@@ -8,7 +8,6 @@
#include <boost/shared_ptr.hpp>
#endif
-#include <string>
#include <vector>
#include "MantidAPI/DllConfig.h"
--
GitLab
From 3312b4d915f2a473f6656a17d0f6c700d093f531 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Thu, 8 Oct 2015 16:30:30 +0100
Subject: [PATCH 087/223] fixed comparison between min and max when min larger
Refs #13508
---
Framework/MDAlgorithms/src/CompactMD.cpp | 2 +-
Framework/MDAlgorithms/test/CompactMDTest.h | 32 +++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/Framework/MDAlgorithms/src/CompactMD.cpp b/Framework/MDAlgorithms/src/CompactMD.cpp
index a999f14dc89..e4ce3f86d3d 100644
--- a/Framework/MDAlgorithms/src/CompactMD.cpp
+++ b/Framework/MDAlgorithms/src/CompactMD.cpp
@@ -17,7 +17,7 @@ createPBinStringVector(std::vector<Mantid::coord_t> minVector,
std::vector<std::string> pBinStrVector;
for (size_t iter = 0; iter < numDims; iter++) {
// creating pbin string using Min and Max Centre positions
- if (minVector[iter] > maxVector[iter]) {
+ if (minVector[iter] >= maxVector[iter]) {
throw std::invalid_argument(
"Minimum extents MUST be less than Maximum extents");
}
diff --git a/Framework/MDAlgorithms/test/CompactMDTest.h b/Framework/MDAlgorithms/test/CompactMDTest.h
index 57f5d98cc60..fffb284b7a1 100644
--- a/Framework/MDAlgorithms/test/CompactMDTest.h
+++ b/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -240,4 +240,36 @@ public:
// Performance Tests
//===================
// TODO:
+using namespace Mantid::DataObjects;
+class CompactMDTestPerformance : public CxxTest::TestSuite {
+
+private:
+ MDHistoWorkspace_sptr m_ws;
+
+public:
+ // This pair of boilerplate methods prevent the suite being created statically
+ // This means the constructor isn't called when running other tests
+ static CompactMDTestPerformance *createSuite() {
+ return new CompactMDTestPerformance();
+ }
+ static void destroySuite(CompactMDTestPerformance *suite) { delete suite; }
+
+ CompactMDTestPerformance() {
+ // Create a 4D workspace.
+ m_ws = MDEventsTestHelper::makeFakeMDHistoWorkspace(
+ 1.0 /*signal*/, 4 /*nd*/, 100 /*nbins*/, 10 /*max*/, 1.0 /*error sq*/);
+ }
+ void test_execute_4d() {
+ CompactMD alg;
+ alg.setChild(true);
+ alg.setRethrows(true);
+ alg.initialize();
+ alg.setProperty("InputWorkspace", m_ws);
+ alg.setProperty("OutputWorkspace", "out");
+ alg.execute();
+ IMDHistoWorkspace_sptr outWS = alg.getProperty("OutputWorkspace");
+ TS_ASSERT(outWS);
+ }
+};
+
#endif // !MANTID_MDALGORITHMS_COMPACTMDTEST_H_
--
GitLab
From 5b83e21f5bc3881808da419ffde2b24e784733e2 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Thu, 8 Oct 2015 16:43:15 +0100
Subject: [PATCH 088/223] Move contraints to subdirectory, also solved a few
more errors
re #13347
---
Framework/CurveFitting/CMakeLists.txt | 90 +--
.../{ => Constraints}/BoundaryConstraint.h | 2 +
.../Functions/BivariateNormal.h | 2 +-
.../RefinePowderInstrumentParameters3.h | 2 +-
.../{ => Constraints}/BoundaryConstraint.cpp | 4 +-
.../CurveFitting/src/DampingMinimizer.cpp | 125 ----
Framework/CurveFitting/src/DerivMinimizer.cpp | 177 -----
.../CurveFitting/src/FABADAMinimizer.cpp | 645 ------------------
.../CurveFitting/src/FitPowderDiffPeaks.cpp | 7 +-
.../src/FuncMinimizers/FABADAMinimizer.cpp | 4 +-
.../src/Functions/BivariateNormal.cpp | 5 +-
.../src/Functions/DiffRotDiscreteCircle.cpp | 5 +-
.../CurveFitting/src/Functions/DiffSphere.cpp | 5 +-
.../src/Functions/IkedaCarpenterPV.cpp | 3 +-
.../src/Functions/PawleyFunction.cpp | 5 +-
.../src/Functions/PseudoVoigt.cpp | 5 +-
Framework/CurveFitting/src/LeBailFunction.cpp | 4 +-
.../src/LevenbergMarquardtMDMinimizer.cpp | 291 --------
.../src/LevenbergMarquardtMinimizer.cpp | 145 ----
.../src/RefinePowderInstrumentParameters3.cpp | 2 +-
.../BoundaryConstraintTest.h | 5 +-
.../CurveFitting/test/ConvertToYSpaceTest.h | 2 +-
.../FuncMinimizers/DampingMinimizerTest.h | 3 +-
.../FuncMinimizers/LevenbergMarquardtMDTest.h | 3 +-
.../FuncMinimizers/LevenbergMarquardtTest.h | 3 +-
.../CurveFitting/test/Functions/AbragamTest.h | 2 +-
.../CurveFitting/test/Functions/EndErfcTest.h | 3 -
.../test/Functions/ExpDecayMuonTest.h | 2 +-
.../test/Functions/ExpDecayOscTest.h | 3 +-
.../test/Functions/ExpDecayTest.h | 2 +-
.../test/Functions/GausDecayTest.h | 2 +-
.../CurveFitting/test/Functions/GausOscTest.h | 2 +-
.../test/Functions/GaussianTest.h | 3 +-
.../test/Functions/LogNormalTest.h | 2 +-
.../test/Functions/MuonFInteractionTest.h | 3 -
.../test/Functions/StaticKuboToyabeTest.h | 2 +-
.../test/Functions/StretchExpMuonTest.h | 2 +-
.../test/Functions/StretchExpTest.h | 2 +-
Framework/SINQ/test/PoldiFitPeaks1D2Test.h | 4 +-
Framework/SINQ/test/PoldiFitPeaks1DTest.h | 4 +-
40 files changed, 105 insertions(+), 1477 deletions(-)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Constraints}/BoundaryConstraint.h (98%)
rename Framework/CurveFitting/src/{ => Constraints}/BoundaryConstraint.cpp (98%)
delete mode 100644 Framework/CurveFitting/src/DampingMinimizer.cpp
delete mode 100644 Framework/CurveFitting/src/DerivMinimizer.cpp
delete mode 100644 Framework/CurveFitting/src/FABADAMinimizer.cpp
delete mode 100644 Framework/CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp
delete mode 100644 Framework/CurveFitting/src/LevenbergMarquardtMinimizer.cpp
rename Framework/CurveFitting/test/{ => Constraints}/BoundaryConstraintTest.h (97%)
diff --git a/Framework/CurveFitting/CMakeLists.txt b/Framework/CurveFitting/CMakeLists.txt
index 366cbcc0e3e..65770666d1e 100644
--- a/Framework/CurveFitting/CMakeLists.txt
+++ b/Framework/CurveFitting/CMakeLists.txt
@@ -4,10 +4,10 @@ set ( SRC_FILES
# src/ChebyshevPolynomialBackground.cpp
#src/RefinePowderInstrumentParameters.cpp
src/AugmentedLagrangianOptimizer.cpp
- src/BoundaryConstraint.cpp
src/CalculateChiSquared.cpp
src/CalculateGammaBackground.cpp
src/CalculateMSVesuvio.cpp
+ src/Constraints/BoundaryConstraint.cpp
src/ConvertToYSpace.cpp
src/ConvolveWorkspaces.cpp
src/CostFunctions/CostFuncFitting.cpp
@@ -125,10 +125,10 @@ set ( INC_FILES
# inc/MantidCurveFitting/ChebyshevPolynomialBackground.h
#inc/MantidCurveFitting/RefinePowderInstrumentParameters.h
inc/MantidCurveFitting/AugmentedLagrangianOptimizer.h
- inc/MantidCurveFitting/BoundaryConstraint.h
inc/MantidCurveFitting/CalculateChiSquared.h
inc/MantidCurveFitting/CalculateGammaBackground.h
inc/MantidCurveFitting/CalculateMSVesuvio.h
+ inc/MantidCurveFitting/Constraints/BoundaryConstraint.h
inc/MantidCurveFitting/ConvertToYSpace.h
inc/MantidCurveFitting/ConvolveWorkspaces.h
inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
@@ -246,43 +246,21 @@ set ( TEST_FILES
# ChebyshevPolynomialBackgroundTest.h
# RefinePowderInstrumentParametersTest.h
#SCDPanelErrorsTest.h
- Functions/AbragamTest.h
AugmentedLagrangianOptimizerTest.h
- Functions/BSplineTest.h
- Functions/BackToBackExponentialTest.h
- Functions/BivariateNormalTest.h
- Functions/Bk2BkExpConvPVTest.h
- BoundaryConstraintTest.h
+ Constraints/BoundaryConstraintTest.h
CalculateChiSquaredTest.h
CalculateGammaBackgroundTest.h
CalculateMSVesuvioTest.h
- Functions/ChebfunBaseTest.h
- Functions/ChebyshevTest.h
CompositeFunctionTest.h
- Functions/ComptonPeakProfileTest.h
- Functions/ComptonProfileTest.h
- Functions/ComptonScatteringCountRateTest.h
ConvertToYSpaceTest.h
- Functions/ConvolutionTest.h
ConvolveWorkspacesTest.h
CostFunctions/CostFuncUnweightedLeastSquaresTest.h
CostFunctions/LeastSquaresTest.h
- Functions/CubicSplineTest.h
- Functions/DeltaFunctionTest.h
- Functions/DiffRotDiscreteCircleTest.h
- Functions/DiffSphereTest.h
- Functions/DynamicKuboToyabeTest.h
- Functions/EndErfcTest.h
EstimatePeakErrorsTest.h
EvaluateFunctionTest.h
- Functions/ExpDecayMuonTest.h
- Functions/ExpDecayOscTest.h
- Functions/ExpDecayTest.h
FitMWTest.h
FitPowderDiffPeaksTest.h
FitTest.h
- Functions/FlatBackgroundTest.h
- Functions/FullprofPolynomialTest.h
FuncMinimizers/BFGSTest.h
FuncMinimizers/DampingMinimizerTest.h
FuncMinimizers/FABADAMinimizerTest.h
@@ -294,34 +272,42 @@ set ( TEST_FILES
FunctionDomain1DSpectrumCreatorTest.h
FunctionFactoryConstraintTest.h
FunctionParameterDecoratorFitTest.h
- GSLMatrixTest.h
- GSLVectorTest.h
+ Functions/AbragamTest.h
+ Functions/BSplineTest.h
+ Functions/BackToBackExponentialTest.h
+ Functions/BivariateNormalTest.h
+ Functions/Bk2BkExpConvPVTest.h
+ Functions/ChebfunBaseTest.h
+ Functions/ChebyshevTest.h
+ Functions/ComptonPeakProfileTest.h
+ Functions/ComptonProfileTest.h
+ Functions/ComptonScatteringCountRateTest.h
+ Functions/ConvolutionTest.h
+ Functions/CubicSplineTest.h
+ Functions/DeltaFunctionTest.h
+ Functions/DiffRotDiscreteCircleTest.h
+ Functions/DiffSphereTest.h
+ Functions/DynamicKuboToyabeTest.h
+ Functions/EndErfcTest.h
+ Functions/ExpDecayMuonTest.h
+ Functions/ExpDecayOscTest.h
+ Functions/ExpDecayTest.h
+ Functions/FlatBackgroundTest.h
+ Functions/FullprofPolynomialTest.h
Functions/GausDecayTest.h
Functions/GausOscTest.h
Functions/GaussianComptonProfileTest.h
Functions/GaussianTest.h
Functions/GramCharlierComptonProfileTest.h
- IPeakFunctionCentreParameterNameTest.h
- IPeakFunctionIntensityTest.h
Functions/IkedaCarpenterPVTest.h
- LatticeDomainCreatorTest.h
- LatticeFunctionTest.h
- LeBailFitTest.h
- LeBailFunctionTest.h
Functions/LinearBackgroundTest.h
Functions/LogNormalTest.h
Functions/Lorentzian1DTest.h
Functions/LorentzianTest.h
- MultiDomainCreatorTest.h
- MultiDomainFunctionTest.h
Functions/MuonFInteractionTest.h
Functions/NeutronBk2BkExpConvPVoigtTest.h
- NormaliseByPeakAreaTest.h
- ParameterEstimatorTest.h
- PawleyFitTest.h
Functions/PawleyFunctionTest.h
Functions/PeakParameterFunctionTest.h
- PlotPeakByLogValueTest.h
Functions/PolynomialTest.h
Functions/ProcessBackgroundTest.h
Functions/ProductFunctionTest.h
@@ -329,15 +315,9 @@ set ( TEST_FILES
Functions/ProductQuadraticExpTest.h
Functions/PseudoVoigtTest.h
Functions/QuadraticTest.h
- RefinePowderInstrumentParameters3Test.h
Functions/ReflectivityMulfTest.h
Functions/ResolutionTest.h
- SeqDomainSpectrumCreatorTest.h
Functions/SimpleChebfunTest.h
- SpecialFunctionSupportTest.h
- SplineBackgroundTest.h
- SplineInterpolationTest.h
- SplineSmoothingTest.h
Functions/StaticKuboToyabeTest.h
Functions/StaticKuboToyabeTimesExpDecayTest.h
Functions/StaticKuboToyabeTimesGausDecayTest.h
@@ -353,6 +333,26 @@ set ( TEST_FILES
Functions/UserFunctionTest.h
Functions/VesuvioResolutionTest.h
Functions/VoigtTest.h
+ GSLMatrixTest.h
+ GSLVectorTest.h
+ IPeakFunctionCentreParameterNameTest.h
+ IPeakFunctionIntensityTest.h
+ LatticeDomainCreatorTest.h
+ LatticeFunctionTest.h
+ LeBailFitTest.h
+ LeBailFunctionTest.h
+ MultiDomainCreatorTest.h
+ MultiDomainFunctionTest.h
+ NormaliseByPeakAreaTest.h
+ ParameterEstimatorTest.h
+ PawleyFitTest.h
+ PlotPeakByLogValueTest.h
+ RefinePowderInstrumentParameters3Test.h
+ SeqDomainSpectrumCreatorTest.h
+ SpecialFunctionSupportTest.h
+ SplineBackgroundTest.h
+ SplineInterpolationTest.h
+ SplineSmoothingTest.h
)
if (COVERALLS)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/BoundaryConstraint.h b/Framework/CurveFitting/inc/MantidCurveFitting/Constraints/BoundaryConstraint.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/BoundaryConstraint.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Constraints/BoundaryConstraint.h
index 2b3301fa8ea..ef798c50e1a 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/BoundaryConstraint.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Constraints/BoundaryConstraint.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Constraints {
//----------------------------------------------------------------------
// Forward Declaration
//----------------------------------------------------------------------
@@ -142,6 +143,7 @@ private:
double m_upperBound;
};
+} // namespace Constraints
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h
index 821eb0f3bbf..59fd0db9723 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h
@@ -9,7 +9,7 @@
#include "MantidAPI/IFunction1D.h"
#include "MantidAPI/ParamFunction.h"
#include "MantidKernel/cow_ptr.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h b/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
index f60697f3585..46cbed993a5 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
@@ -10,7 +10,7 @@
#include "MantidCurveFitting/LeBailFit.h"
#include "MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/src/BoundaryConstraint.cpp b/Framework/CurveFitting/src/Constraints/BoundaryConstraint.cpp
similarity index 98%
rename from Framework/CurveFitting/src/BoundaryConstraint.cpp
rename to Framework/CurveFitting/src/Constraints/BoundaryConstraint.cpp
index 6ecbe020e78..86f3f52be2a 100644
--- a/Framework/CurveFitting/src/BoundaryConstraint.cpp
+++ b/Framework/CurveFitting/src/Constraints/BoundaryConstraint.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidAPI/Expression.h"
#include "MantidAPI/ConstraintFactory.h"
#include "MantidKernel/Logger.h"
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Constraints {
namespace {
/// static logger
Kernel::Logger g_log("BoundaryConstraint");
@@ -247,5 +248,6 @@ std::string BoundaryConstraint::asString() const {
return ostr.str();
}
+} // namespace Constraints
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/DampingMinimizer.cpp b/Framework/CurveFitting/src/DampingMinimizer.cpp
deleted file mode 100644
index 01e3169ebba..00000000000
--- a/Framework/CurveFitting/src/DampingMinimizer.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
-#include "MantidCurveFitting/DampingMinimizer.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
-
-#include "MantidAPI/CostFunctionFactory.h"
-#include "MantidAPI/FuncMinimizerFactory.h"
-#include "MantidAPI/IFunction.h"
-
-#include "MantidKernel/Logger.h"
-
-#include <boost/lexical_cast.hpp>
-#include <gsl/gsl_blas.h>
-#include <iostream>
-#include <cmath>
-
-namespace Mantid {
-namespace CurveFitting {
-namespace {
-/// static logger
-Kernel::Logger g_log("DampingMinimizer");
-}
-
-DECLARE_FUNCMINIMIZER(DampingMinimizer, Damping)
-
-/// Constructor
-DampingMinimizer::DampingMinimizer(double relTol)
- : IFuncMinimizer(), m_relTol(relTol) {
- declareProperty("Damping", 0.0, "The damping parameter.");
-}
-
-/// Initialize minimizer, i.e. pass a function to minimize.
-void DampingMinimizer::initialize(API::ICostFunction_sptr function, size_t) {
- m_leastSquares = boost::dynamic_pointer_cast<CostFuncLeastSquares>(function);
- if (!m_leastSquares) {
- throw std::invalid_argument("Damping minimizer works only with least "
- "squares. Different function was given.");
- }
-}
-
-/// Do one iteration.
-bool DampingMinimizer::iterate(size_t) {
- const bool debug = false;
-
- const double damping = getProperty("Damping");
-
- if (!m_leastSquares) {
- throw std::runtime_error("Cost function isn't set up.");
- }
- size_t n = m_leastSquares->nParams();
-
- if (n == 0) {
- m_errorString = "No parameters to fit";
- return false;
- }
-
- // calculate the first and second derivatives of the cost function.
- m_leastSquares->valDerivHessian();
-
- // copy the hessian
- GSLMatrix H(m_leastSquares->getHessian());
- GSLVector dd(m_leastSquares->getDeriv());
-
- for (size_t i = 0; i < n; ++i) {
- double tmp = H.get(i, i) + damping;
- H.set(i, i, tmp);
- }
-
- if (debug) {
- std::cerr << "H:\n" << H;
- std::cerr << "-----------------------------\n";
- for (size_t j = 0; j < n; ++j) {
- std::cerr << dd.get(j) << ' ';
- }
- std::cerr << std::endl;
- }
-
- /// Parameter corrections
- GSLVector dx(n);
- // To find dx solve the system of linear equations H * dx == -m_der
- dd *= -1.0;
- H.solve(dd, dx);
-
- if (debug) {
- for (size_t j = 0; j < n; ++j) {
- std::cerr << dx.get(j) << ' ';
- }
- std::cerr << std::endl
- << std::endl;
- }
-
- // Update the parameters of the cost function.
- for (size_t i = 0; i < n; ++i) {
- double d = m_leastSquares->getParameter(i) + dx.get(i);
- m_leastSquares->setParameter(i, d);
- if (debug) {
- std::cerr << "P" << i << ' ' << d << std::endl;
- }
- }
- m_leastSquares->getFittingFunction()->applyTies();
-
- // --- prepare for the next iteration --- //
-
- // Try the stop condition
- GSLVector p(n);
- m_leastSquares->getParameters(p);
- double dx_norm = gsl_blas_dnrm2(dx.gsl());
- if (dx_norm < m_relTol) {
- return false;
- }
-
- return true;
-}
-
-/// Return current value of the cost function
-double DampingMinimizer::costFunctionVal() {
- if (!m_leastSquares) {
- throw std::runtime_error("Cost function isn't set up.");
- }
- return m_leastSquares->val();
-}
-
-} // namespace CurveFitting
-} // namespace Mantid
diff --git a/Framework/CurveFitting/src/DerivMinimizer.cpp b/Framework/CurveFitting/src/DerivMinimizer.cpp
deleted file mode 100644
index 57cbc5a122f..00000000000
--- a/Framework/CurveFitting/src/DerivMinimizer.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
-#include "MantidCurveFitting/DerivMinimizer.h"
-#include "MantidCurveFitting/CostFuncFitting.h"
-
-namespace Mantid {
-namespace CurveFitting {
-
-/** Used by the GSL to calculate the cost function.
- * @param x :: Vector with parameters
- * @param params :: Pointer to a DerivMinimizer
- */
-double DerivMinimizer::fun(const gsl_vector *x, void *params) {
- DerivMinimizer &minimizer = *static_cast<DerivMinimizer *>(params);
- size_t n = minimizer.m_costFunction->nParams();
- for (size_t i = 0; i < n; ++i) {
- minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
- }
- boost::shared_ptr<CostFuncFitting> fitting =
- boost::dynamic_pointer_cast<CostFuncFitting>(minimizer.m_costFunction);
- if (fitting) {
- fitting->getFittingFunction()->applyTies();
- }
- return minimizer.m_costFunction->val();
-}
-
-/** Used by the GSL to calculate the derivatives.
- * @param x :: Vector with parameters
- * @param params :: Pointer to a DerivMinimizer
- * @param g :: Buffer for the derivatives
- */
-void DerivMinimizer::dfun(const gsl_vector *x, void *params, gsl_vector *g) {
- DerivMinimizer &minimizer = *static_cast<DerivMinimizer *>(params);
- size_t n = minimizer.m_costFunction->nParams();
- for (size_t i = 0; i < n; ++i) {
- minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
- }
- boost::shared_ptr<CostFuncFitting> fitting =
- boost::dynamic_pointer_cast<CostFuncFitting>(minimizer.m_costFunction);
- if (fitting) {
- fitting->getFittingFunction()->applyTies();
- }
- std::vector<double> der(n);
- minimizer.m_costFunction->deriv(der);
- for (size_t i = 0; i < n; ++i) {
- gsl_vector_set(g, i, der[i]);
- }
-}
-
-/** Used by the GSL to calculate the cost function and the derivatives.
- * @param x :: Vector with parameters
- * @param params :: Pointer to a DerivMinimizer
- * @param f :: Buffer for the fanction value
- * @param g :: Buffer for the derivatives
- */
-void DerivMinimizer::fundfun(const gsl_vector *x, void *params, double *f,
- gsl_vector *g) {
- DerivMinimizer &minimizer = *static_cast<DerivMinimizer *>(params);
- size_t n = minimizer.m_costFunction->nParams();
- for (size_t i = 0; i < n; ++i) {
- minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
- }
- boost::shared_ptr<CostFuncFitting> fitting =
- boost::dynamic_pointer_cast<CostFuncFitting>(minimizer.m_costFunction);
- if (fitting) {
- fitting->getFittingFunction()->applyTies();
- }
- std::vector<double> der(n);
- *f = minimizer.m_costFunction->valAndDeriv(der);
- for (size_t i = 0; i < n; ++i) {
- gsl_vector_set(g, i, der[i]);
- }
-}
-
-/// Constructor
-DerivMinimizer::DerivMinimizer()
- : m_gslSolver(NULL), m_x(NULL), m_stopGradient(1e-3), m_stepSize(0.1),
- m_tolerance(0.0001) {
- initGSLMMin();
-}
-
-/**
- * Constructor.
- * @param stepSize :: Initial step size.
- * @param tolerance :: Tolerance.
- */
-DerivMinimizer::DerivMinimizer(const double stepSize, const double tolerance)
- : m_gslSolver(NULL), m_x(NULL), m_stopGradient(1e-3), m_stepSize(stepSize),
- m_tolerance(tolerance) {
- initGSLMMin();
-}
-
-void DerivMinimizer::initGSLMMin() {
- m_gslMultiminContainer.f = NULL;
- m_gslMultiminContainer.df = NULL;
- m_gslMultiminContainer.fdf = NULL;
- m_gslMultiminContainer.n = 0;
- m_gslMultiminContainer.params = NULL;
-}
-
-/**
- * Destructor.
- */
-DerivMinimizer::~DerivMinimizer() {
- if (m_gslSolver != NULL) {
- gsl_multimin_fdfminimizer_free(m_gslSolver);
- gsl_vector_free(m_x);
- }
-}
-
-/**
- * Initialize the minimizer.
- * @param function :: A cost function to minimize.
- * @param maxIterations :: Maximum number of iterations.
- */
-void DerivMinimizer::initialize(API::ICostFunction_sptr function,
- size_t maxIterations) {
- UNUSED_ARG(maxIterations);
- m_costFunction = function;
- m_gslMultiminContainer.n = m_costFunction->nParams();
- m_gslMultiminContainer.f = &fun;
- m_gslMultiminContainer.df = &dfun;
- m_gslMultiminContainer.fdf = &fundfun;
- m_gslMultiminContainer.params = this;
-
- m_gslSolver = gsl_multimin_fdfminimizer_alloc(getGSLMinimizerType(),
- m_gslMultiminContainer.n);
-
- size_t nParams = m_costFunction->nParams();
- // Starting point
- m_x = gsl_vector_alloc(nParams);
- for (size_t i = 0; i < nParams; ++i) {
- gsl_vector_set(m_x, i, m_costFunction->getParameter(i));
- }
-
- gsl_multimin_fdfminimizer_set(m_gslSolver, &m_gslMultiminContainer, m_x,
- m_stepSize, m_tolerance);
-}
-
-/**
- * Perform one iteration.
- * @return :: true to continue, false to stop.
- */
-bool DerivMinimizer::iterate(size_t) {
- if (m_gslSolver == NULL) {
- throw std::runtime_error("Minimizer " + this->name() +
- " was not initialized.");
- }
- int status = gsl_multimin_fdfminimizer_iterate(m_gslSolver);
- if (status) {
- m_errorString = gsl_strerror(status);
- return false;
- }
- status = gsl_multimin_test_gradient(m_gslSolver->gradient, m_stopGradient);
- if (status != GSL_CONTINUE) {
- m_errorString = gsl_strerror(status);
- return false;
- }
- return true;
-}
-
-/**
- * Set maximum value of the gradient at which iterations can stop
- * @param value :: New value for the gradient, must be positive.
- */
-void DerivMinimizer::setStopGradient(const double value) {
- if (value <= 0) {
- throw std::invalid_argument("Gradient norm must be a positive number");
- }
- m_stopGradient = value;
-}
-
-double DerivMinimizer::costFunctionVal() { return m_gslSolver->f; }
-
-} // namespace CurveFitting
-} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FABADAMinimizer.cpp b/Framework/CurveFitting/src/FABADAMinimizer.cpp
deleted file mode 100644
index 8e8f7e3d708..00000000000
--- a/Framework/CurveFitting/src/FABADAMinimizer.cpp
+++ /dev/null
@@ -1,645 +0,0 @@
-#include "MantidCurveFitting/FABADAMinimizer.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
-#include "MantidAPI/CostFunctionFactory.h"
-#include "MantidAPI/FuncMinimizerFactory.h"
-#include "MantidAPI/IFunction.h"
-#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/WorkspaceProperty.h"
-#include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/ITableWorkspace.h"
-#include "MantidAPI/TableRow.h"
-#include "MantidKernel/MersenneTwister.h"
-#include "MantidKernel/PseudoRandomNumberGenerator.h"
-
-#include "MantidKernel/Logger.h"
-
-#include <boost/random/normal_distribution.hpp>
-#include <boost/random/uniform_real.hpp>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/version.hpp>
-#include <boost/math/special_functions/fpclassify.hpp>
-
-#include <iostream>
-#include <ctime>
-
-namespace Mantid {
-namespace CurveFitting {
-
-namespace {
-// static logger object
-Kernel::Logger g_log("FABADAMinimizer");
-// absolute maximum number of iterations when fit must converge
-const size_t convergenceMaxIterations = 50000;
-// number of iterations when convergence isn't expected
-const size_t lowerIterationLimit = 350;
-// very large number
-const double largeNumber = 1e100;
-// jump checking rate
-const size_t jumpCheckingRate = 200;
-// low jump limit
-const double lowJumpLimit = 1e-25;
-}
-
-DECLARE_FUNCMINIMIZER(FABADAMinimizer, FABADA)
-
-//----------------------------------------------------------------------------------------------
-/// Constructor
-FABADAMinimizer::FABADAMinimizer()
- : m_counter(0), m_numberIterations(0), m_changes(), m_jump(),
- m_parameters(), m_chain(), m_chi2(0.), m_converged(false),
- m_conv_point(0), m_par_converged(), m_lower(), m_upper(), m_bound(),
- m_criteria(), m_max_iter(0) {
- declareProperty("ChainLength", static_cast<size_t>(10000),
- "Length of the converged chain.");
- declareProperty("StepsBetweenValues", static_cast<size_t>(10),
- "Steps realized between keeping each result.");
- declareProperty(
- "ConvergenceCriteria", 0.01,
- "Variance in Cost Function for considering convergence reached.");
- declareProperty("JumpAcceptanceRate", 0.6666666,
- "Desired jumping acceptance rate");
- declareProperty(
- new API::WorkspaceProperty<>("PDF", "PDF", Kernel::Direction::Output),
- "The name to give the output workspace");
- declareProperty(
- new API::WorkspaceProperty<>("Chains", "", Kernel::Direction::Output),
- "The name to give the output workspace");
- declareProperty(new API::WorkspaceProperty<>("ConvergedChain", "",
- Kernel::Direction::Output,
- API::PropertyMode::Optional),
- "The name to give the output workspace");
- declareProperty(new API::WorkspaceProperty<API::ITableWorkspace>(
- "CostFunctionTable", "", Kernel::Direction::Output),
- "The name to give the output workspace");
- declareProperty(new API::WorkspaceProperty<API::ITableWorkspace>(
- "Parameters", "", Kernel::Direction::Output),
- "The name to give the output workspace");
-}
-
-//----------------------------------------------------------------------------------------------
-
-/// Destructor
-FABADAMinimizer::~FABADAMinimizer() {}
-
-/// Initialize minimizer. Set initial values for all private members.
-void FABADAMinimizer::initialize(API::ICostFunction_sptr function,
- size_t maxIterations) {
-
- m_leastSquares = boost::dynamic_pointer_cast<CostFuncLeastSquares>(function);
- if (!m_leastSquares) {
- throw std::invalid_argument(
- "FABADA works only with least squares. Different function was given.");
- }
-
- m_counter = 0;
- m_leastSquares->getParameters(m_parameters);
- API::IFunction_sptr fun = m_leastSquares->getFittingFunction();
-
- if (fun->nParams() == 0) {
- throw std::invalid_argument("Function has 0 fitting parameters.");
- }
-
- size_t n = getProperty("ChainLength");
- m_numberIterations = n / fun->nParams();
-
- if (m_numberIterations > maxIterations) {
- g_log.warning()
- << "MaxIterations property reduces the required number of iterations ("
- << m_numberIterations << ")." << std::endl;
- m_numberIterations = maxIterations;
- }
-
- for (size_t i = 0; i < m_leastSquares->nParams(); ++i) {
- double p = m_parameters.get(i);
- m_bound.push_back(false);
- API::IConstraint *iconstr = fun->getConstraint(i);
- if (iconstr) {
- BoundaryConstraint *bcon = dynamic_cast<BoundaryConstraint *>(iconstr);
- if (bcon) {
- m_bound[i] = true;
- if (bcon->hasLower()) {
- m_lower.push_back(bcon->lower());
- } else {
- m_lower.push_back(-largeNumber);
- }
- if (bcon->hasUpper()) {
- m_upper.push_back(bcon->upper());
- } else {
- m_upper.push_back(largeNumber);
- }
- if (p < m_lower[i]) {
- p = m_lower[i];
- m_parameters.set(i, p);
- }
- if (p > m_upper[i]) {
- p = m_upper[i];
- m_parameters.set(i, p);
- }
- }
- } else {
- m_lower.push_back(-largeNumber);
- m_upper.push_back(largeNumber);
- }
- std::vector<double> v;
- v.push_back(p);
- m_chain.push_back(v);
- m_max_iter = maxIterations;
- m_changes.push_back(0);
- m_par_converged.push_back(false);
- m_criteria.push_back(getProperty("ConvergenceCriteria"));
- if (p != 0.0) {
- m_jump.push_back(std::abs(p / 10));
- } else {
- m_jump.push_back(0.01);
- }
- }
- m_chi2 = m_leastSquares->val();
- std::vector<double> v;
- v.push_back(m_chi2);
- m_chain.push_back(v);
- m_converged = false;
- m_max_iter = maxIterations;
-}
-
-/// Do one iteration. Returns true if iterations to be continued, false if they
-/// must stop.
-bool FABADAMinimizer::iterate(size_t) {
-
- if (!m_leastSquares) {
- throw std::runtime_error("Cost function isn't set up.");
- }
-
- size_t nParams = m_leastSquares->nParams();
- size_t m = nParams;
-
- // Just for the last iteration. For doing exactly the indicated number of
- // iterations.
- if (m_converged && m_counter == m_numberIterations) {
- size_t t = getProperty("ChainLength");
- m = t % nParams;
- }
-
- // Do one iteration of FABADA's algorithm for each parameter.
- for (size_t i = 0; i < m; i++) {
- GSLVector new_parameters = m_parameters;
-
- // Calculate the step, depending on convergence reached or not
- double step;
- if (m_converged || m_bound[i]) {
- boost::mt19937 mt;
- mt.seed(123 * (int(m_counter) +
- 45 * int(i))); // Numeros inventados para la seed
- boost::normal_distribution<double> distr(0.0, std::abs(m_jump[i]));
- boost::variate_generator<boost::mt19937,
- boost::normal_distribution<double>> gen(mt,
- distr);
- step = gen();
- } else {
- step = m_jump[i];
- }
-
- // Calculate the new value of the parameter
- double new_value = m_parameters.get(i) + step;
-
- // Comproves if it is inside the boundary constrinctions. If not, changes
- // it.
- if (m_bound[i]) {
- while (new_value < m_lower[i]) {
- if (std::abs(step) > m_upper[i] - m_lower[i]) {
- new_value = m_parameters.get(i) + step / 10.0;
- step = step / 10;
- m_jump[i] = m_jump[i] / 10;
- } else {
- new_value =
- m_lower[i] + std::abs(step) - (m_parameters.get(i) - m_lower[i]);
- }
- }
- while (new_value > m_upper[i]) {
- if (std::abs(step) > m_upper[i] - m_lower[i]) {
- new_value = m_parameters.get(i) + step / 10.0;
- step = step / 10;
- m_jump[i] = m_jump[i] / 10;
- } else {
- new_value =
- m_upper[i] - (std::abs(step) + m_parameters.get(i) - m_upper[i]);
- }
- }
- }
-
- // Set the new value in order to calculate the new Chi square value
- if (boost::math::isnan(new_value)) {
- throw std::runtime_error("Parameter value is NaN.");
- }
- new_parameters.set(i, new_value);
- m_leastSquares->setParameter(i, new_value);
- double chi2_new = m_leastSquares->val();
-
- // If new Chi square value is lower, jumping directly to new parameter
- if (chi2_new < m_chi2) {
- for (size_t j = 0; j < nParams; j++) {
- m_chain[j].push_back(new_parameters.get(j));
- }
- m_chain[nParams].push_back(chi2_new);
- m_parameters = new_parameters;
- m_chi2 = chi2_new;
- m_changes[i] += 1;
-
- }
-
- // If new Chi square value is higher, it depends on the probability
- else {
- // Calculate probability of change
- double prob = exp((m_chi2 / 2.0) - (chi2_new / 2.0));
-
- // Decide if changing or not
- boost::mt19937 mt;
- mt.seed(int(time_t()) + 48 * (int(m_counter) + 76 * int(i)));
- boost::uniform_real<> distr(0.0, 1.0);
- double p = distr(mt);
- if (p <= prob) {
- for (size_t j = 0; j < nParams; j++) {
- m_chain[j].push_back(new_parameters.get(j));
- }
- m_chain[nParams].push_back(chi2_new);
- m_parameters = new_parameters;
- m_chi2 = chi2_new;
- m_changes[i] += 1;
- } else {
- for (size_t j = 0; j < nParams; j++) {
- m_chain[j].push_back(m_parameters.get(j));
- }
- m_chain[nParams].push_back(m_chi2);
- m_leastSquares->setParameter(i, new_value - m_jump[i]);
- m_jump[i] = -m_jump[i];
- }
- }
-
- const double jumpAR = getProperty("JumpAcceptanceRate");
-
- // Update the jump once each jumpCheckingRate iterations
- if (m_counter % jumpCheckingRate == 150) // JUMP CHECKING RATE IS 200, BUT
- // IS NOT CHECKED AT FIRST STEP, IT
- // IS AT 150
- {
- double jnew;
- if (m_changes[i] == 0.0) {
- jnew = m_jump[i] /
- 10.0; // JUST FOR THE CASE THERE HAS NOT BEEN ANY CHANGE.
- } else {
- double f = m_changes[i] / double(m_counter);
- jnew = m_jump[i] * f / jumpAR;
- }
-
- m_jump[i] = jnew;
-
- // Check if the new jump is too small. It means that it has been a wrong
- // convergence.
- if (std::abs(m_jump[i]) < lowJumpLimit) {
- API::IFunction_sptr fun = m_leastSquares->getFittingFunction();
- g_log.warning()
- << "Wrong convergence for parameter " + fun->parameterName(i) +
- ". Try to set a proper initial value for this parameter"
- << std::endl;
- }
- }
-
- // Check if the Chi square value has converged for parameter i.
- const size_t startingPoint =
- 350; // The iteration since it starts to check if convergence is reached
- if (!m_par_converged[i] && m_counter > startingPoint) {
- if (chi2_new != m_chi2) {
- double chi2_quotient = std::abs(chi2_new - m_chi2) / m_chi2;
- if (chi2_quotient < m_criteria[i]) {
- m_par_converged[i] = true;
- }
- }
- }
- } // for i
-
- // Update the counter, after finishing the iteration for each parameter
- m_counter += 1;
-
- // Check if Chi square has converged for all the parameters.
- if (m_counter > lowerIterationLimit && !m_converged) {
- size_t t = 0;
- for (size_t i = 0; i < nParams; i++) {
- if (m_par_converged[i]) {
- t += 1;
- }
- }
- // If all parameters have converged:
- // It set up both the counter and the changes' vector to 0, in order to
- // consider only the data of the converged part of the chain, when updating
- // the jump.
- if (t == nParams) {
- m_converged = true;
- m_conv_point = m_counter * nParams + 1;
- m_counter = 0;
- for (size_t i = 0; i < nParams; ++i) {
- m_changes[i] = 0;
- }
- }
- }
-
- if (!m_converged) {
- // If there is not convergence continue the iterations.
- if (m_counter <= convergenceMaxIterations &&
- m_counter < m_numberIterations - 1) {
- return true;
- }
- // If there is not convergence, but it has been made
- // convergenceMaxIterations iterations, stop and throw the error.
- else {
- API::IFunction_sptr fun = m_leastSquares->getFittingFunction();
- std::string failed = "";
- for (size_t i = 0; i < nParams; ++i) {
- if (!m_par_converged[i]) {
- failed = failed + fun->parameterName(i) + ", ";
- }
- }
- failed.replace(failed.end() - 2, failed.end(), ".");
- throw std::runtime_error(
- "Convegence NOT reached after " +
- boost::lexical_cast<std::string>(m_max_iter) +
- " iterations.\n Try to set better initial values for parameters: " +
- failed);
- }
- } else {
- // If convergence has been reached, continue untill complete the chain
- // length.
- if (m_counter <= m_numberIterations) {
- return true;
- }
- // If convergence has been reached, but the maximum of iterations have been
- // reached before finishing the chain, stop and throw the error.
- if (m_counter >= m_max_iter) {
- throw std::length_error("Convegence reached but Max Iterations parameter "
- "insufficient for creating the whole chain.\n "
- "Increase Max Iterations");
- }
- // nothing else to do, stop interations
- return false;
- }
- // can we even get here?
- return true;
-}
-
-double FABADAMinimizer::costFunctionVal() { return m_chi2; }
-
-/// When the all the iterations have been done, calculate and show all the
-/// results.
-void FABADAMinimizer::finalize() {
- // Creating the reduced chain (considering only one each "Steps between
- // values" values)
- size_t cl = getProperty("ChainLength");
- size_t n_steps = getProperty("StepsBetweenValues");
- size_t conv_length = size_t(double(cl) / double(n_steps));
- std::vector<std::vector<double>> red_conv_chain;
- size_t nParams = m_leastSquares->nParams();
- for (size_t e = 0; e <= nParams; ++e) {
- std::vector<double> v;
- v.push_back(m_chain[e][m_conv_point]);
- red_conv_chain.push_back(v);
- }
-
- // Calculate the red_conv_chain for the cost fuction.
- auto first = m_chain[nParams].begin() + m_conv_point;
- auto last = m_chain[nParams].end();
- std::vector<double> conv_chain(first, last);
- for (size_t k = 1; k < conv_length; ++k) {
- red_conv_chain[nParams].push_back(conv_chain[n_steps * k]);
- }
-
- // Calculate the position of the minimum Chi square value
- auto pos_min = std::min_element(red_conv_chain[nParams].begin(),
- red_conv_chain[nParams].end());
- m_chi2 = *pos_min;
-
- std::vector<double> par_def(nParams);
- std::vector<double> error_left(nParams);
- std::vector<double> error_rigth(nParams);
- API::IFunction_sptr fun = m_leastSquares->getFittingFunction();
-
- // Do one iteration for each parameter.
- for (size_t j = 0; j < nParams; ++j) {
- // Calculate the parameter value and the errors
- auto first = m_chain[j].begin() + m_conv_point;
- auto last = m_chain[j].end();
- std::vector<double> conv_chain(first, last);
- auto &rc_chain_j = red_conv_chain[j];
- for (size_t k = 0; k < conv_length; ++k) {
- rc_chain_j.push_back(conv_chain[n_steps * k]);
- }
- par_def[j] = rc_chain_j[pos_min - red_conv_chain[nParams].begin()];
- std::sort(rc_chain_j.begin(), rc_chain_j.end());
- auto pos_par = std::find(rc_chain_j.begin(), rc_chain_j.end(), par_def[j]);
- auto pos_left = rc_chain_j.begin();
- auto pos_right = rc_chain_j.end() - 1;
- size_t sigma = static_cast<size_t>(0.34 * double(conv_length));
- if (pos_par == rc_chain_j.end()) {
- error_left[j] = *(pos_right - sigma);
- error_rigth[j] = *pos_right;
- } else {
-
- if (sigma < static_cast<size_t>(std::distance(pos_left, pos_par))) {
- pos_left = pos_par - sigma;
- }
- // make sure the iterator is valid in any case
- if (sigma < static_cast<size_t>(std::distance(pos_par, pos_right))) {
- pos_right = pos_par + sigma;
- }
- error_left[j] = *pos_left - *pos_par;
- error_rigth[j] = *pos_right - *pos_par;
- }
- }
-
- const bool outputParametersTable = !getPropertyValue("Parameters").empty();
-
- if (outputParametersTable) {
-
- // Create the workspace for the parameters' value and errors.
- API::ITableWorkspace_sptr wsPdfE =
- API::WorkspaceFactory::Instance().createTable("TableWorkspace");
- wsPdfE->addColumn("str", "Name");
- wsPdfE->addColumn("double", "Value");
- wsPdfE->addColumn("double", "Left's error");
- wsPdfE->addColumn("double", "Rigth's error");
-
- for (size_t j = 0; j < nParams; ++j) {
- API::TableRow row = wsPdfE->appendRow();
- row << fun->parameterName(j) << par_def[j] << error_left[j]
- << error_rigth[j];
- }
- // Set and name the Parameter Errors workspace.
- setProperty("Parameters", wsPdfE);
- }
-
- // Set the best parameter values
- for (size_t j = 0; j < nParams; ++j) {
- m_leastSquares->setParameter(j, par_def[j]);
- }
-
- double mostPchi2;
-
- // Create the workspace for the Probability Density Functions
- size_t pdf_length = 20; // histogram length for the PDF output workspace
- API::MatrixWorkspace_sptr ws = API::WorkspaceFactory::Instance().create(
- "Workspace2D", nParams + 1, pdf_length + 1, pdf_length);
-
- // Calculate the cost function Probability Density Function
- std::sort(red_conv_chain[nParams].begin(), red_conv_chain[nParams].end());
- std::vector<double> pdf_y(pdf_length, 0);
- double start = red_conv_chain[nParams][0];
- double bin =
- (red_conv_chain[nParams][conv_length - 1] - start) / double(pdf_length);
- size_t step = 0;
- MantidVec &X = ws->dataX(nParams);
- MantidVec &Y = ws->dataY(nParams);
- X[0] = start;
- for (size_t i = 1; i < pdf_length + 1; i++) {
- double bin_end = start + double(i) * bin;
- X[i] = bin_end;
- while (step < conv_length && red_conv_chain[nParams][step] <= bin_end) {
- pdf_y[i - 1] += 1;
- ++step;
- }
- Y[i - 1] = pdf_y[i - 1] / (double(conv_length) * bin);
- }
-
- std::vector<double>::iterator pos_MPchi2 =
- std::max_element(pdf_y.begin(), pdf_y.end());
-
- if (pos_MPchi2 - pdf_y.begin() == 0) {
- // mostPchi2 = X[pos_MPchi2-pdf_y.begin()];
- mostPchi2 = *pos_min;
- } else {
- mostPchi2 = X[pos_MPchi2 - pdf_y.begin()] + (bin / 2.0);
- }
-
- // Do one iteration for each parameter.
- for (size_t j = 0; j < nParams; ++j) {
- // Calculate the Probability Density Function
- std::vector<double> pdf_y(pdf_length, 0);
- double start = red_conv_chain[j][0];
- double bin =
- (red_conv_chain[j][conv_length - 1] - start) / double(pdf_length);
- size_t step = 0;
- MantidVec &X = ws->dataX(j);
- MantidVec &Y = ws->dataY(j);
- X[0] = start;
- for (size_t i = 1; i < pdf_length + 1; i++) {
- double bin_end = start + double(i) * bin;
- X[i] = bin_end;
- while (step < conv_length && red_conv_chain[j][step] <= bin_end) {
- pdf_y[i - 1] += 1;
- ++step;
- }
- Y[i - 1] = pdf_y[i - 1] / (double(conv_length) * bin);
- }
-
- // Calculate the most probable value, from the PDF.
- std::vector<double>::iterator pos_MP =
- std::max_element(pdf_y.begin(), pdf_y.end());
- double mostP = X[pos_MP - pdf_y.begin()] + (bin / 2.0);
- m_leastSquares->setParameter(j, mostP);
- }
-
- // Set and name the PDF workspace.
- setProperty("PDF", ws);
-
- const bool outputChains = !getPropertyValue("Chains").empty();
-
- if (outputChains) {
-
- // Create the workspace for the complete parameters' chain (the last
- // histogram is for the Chi square).
- size_t chain_length = m_chain[0].size();
- API::MatrixWorkspace_sptr wsC = API::WorkspaceFactory::Instance().create(
- "Workspace2D", nParams + 1, chain_length, chain_length);
-
- // Do one iteration for each parameter plus one for Chi square.
- for (size_t j = 0; j < nParams + 1; ++j) {
- MantidVec &X = wsC->dataX(j);
- MantidVec &Y = wsC->dataY(j);
- for (size_t k = 0; k < chain_length; ++k) {
- X[k] = double(k);
- Y[k] = m_chain[j][k];
- }
- }
-
- // Set and name the workspace for the complete chain
- setProperty("Chains", wsC);
- }
-
- // Read if necessary to show the workspace for the converged part of the
- // chain.
- const bool outputConvergedChains =
- !getPropertyValue("ConvergedChain").empty();
-
- if (outputConvergedChains) {
- // Create the workspace for the converged part of the chain.
- API::MatrixWorkspace_sptr wsConv = API::WorkspaceFactory::Instance().create(
- "Workspace2D", nParams + 1, conv_length, conv_length);
-
- // Do one iteration for each parameter plus one for Chi square.
- for (size_t j = 0; j < nParams + 1; ++j) {
- std::vector<double>::const_iterator first =
- m_chain[j].begin() + m_conv_point;
- std::vector<double>::const_iterator last = m_chain[j].end();
- std::vector<double> conv_chain(first, last);
- MantidVec &X = wsConv->dataX(j);
- MantidVec &Y = wsConv->dataY(j);
- for (size_t k = 0; k < conv_length; ++k) {
- X[k] = double(k);
- Y[k] = conv_chain[n_steps * k];
- }
- }
-
- // Set and name the workspace for the converged part of the chain.
- setProperty("ConvergedChain", wsConv);
- }
-
- // Read if necessary to show the workspace for the Chi square values.
- const bool outputCostFunctionTable =
- !getPropertyValue("CostFunctionTable").empty();
-
- if (outputCostFunctionTable) {
-
- // Create the workspace for the Chi square values.
- API::ITableWorkspace_sptr wsChi2 =
- API::WorkspaceFactory::Instance().createTable("TableWorkspace");
- wsChi2->addColumn("double", "Chi2min");
- wsChi2->addColumn("double", "Chi2MP");
- wsChi2->addColumn("double", "Chi2min_red");
- wsChi2->addColumn("double", "Chi2MP_red");
-
- // Obtain the quantity of the initial data.
- API::FunctionDomain_sptr domain = m_leastSquares->getDomain();
- size_t data_number = domain->size();
-
- // Calculate the value for the reduced Chi square.
- double Chi2min_red =
- m_chi2 / (double(data_number - nParams)); // For de minimum value.
- double mostPchi2_red = mostPchi2 / (double(data_number - nParams));
-
- // Add the information to the workspace and name it.
- API::TableRow row = wsChi2->appendRow();
- row << m_chi2 << mostPchi2 << Chi2min_red << mostPchi2_red;
- setProperty("CostFunctionTable", wsChi2);
- }
-
- // Set the best parameter values
- for (size_t j = 0; j < nParams; ++j) {
- m_leastSquares->setParameter(j, par_def[j]);
- }
-}
-
-} // namespace CurveFitting
-} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
index e5ba3d3ff3a..4506e6acd5b 100644
--- a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
+++ b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
@@ -17,7 +17,7 @@
#include "MantidAPI/TextAxis.h"
#include "MantidCurveFitting/Fit.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Functions/BackgroundFunction.h"
#include "MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h"
#include "MantidCurveFitting/Functions/Polynomial.h"
@@ -52,6 +52,7 @@ using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Constraints;
using namespace std;
@@ -1855,8 +1856,8 @@ bool FitPowderDiffPeaks::doFitGaussianPeak(DataObjects::Workspace2D_sptr dataws,
// b) Constraint
double centerleftend = in_center - leftfwhm * 0.5;
double centerrightend = in_center + rightfwhm * 0.5;
- CurveFitting::BoundaryConstraint *centerbound =
- new CurveFitting::BoundaryConstraint(gaussianpeak.get(), "PeakCentre",
+ Constraints::BoundaryConstraint *centerbound =
+ new Constraints::BoundaryConstraint(gaussianpeak.get(), "PeakCentre",
centerleftend, centerrightend,
false);
gaussianpeak->addConstraint(centerbound);
diff --git a/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
index e1dbc421376..6e76be4520f 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
@@ -1,6 +1,6 @@
#include "MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h"
#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting//Constraints/BoundaryConstraint.h"
#include <stdio.h>
#include <stdlib.h>
@@ -122,7 +122,7 @@ void FABADAMinimizer::initialize(API::ICostFunction_sptr function,
m_bound.push_back(false);
API::IConstraint *iconstr = fun->getConstraint(i);
if (iconstr) {
- BoundaryConstraint *bcon = dynamic_cast<BoundaryConstraint *>(iconstr);
+ Constraints::BoundaryConstraint *bcon = dynamic_cast<Constraints::BoundaryConstraint *>(iconstr);
if (bcon) {
m_bound[i] = true;
if (bcon->hasLower()) {
diff --git a/Framework/CurveFitting/src/Functions/BivariateNormal.cpp b/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
index 3e290bbcae5..95749a228b7 100644
--- a/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
+++ b/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
@@ -1,5 +1,5 @@
#include "MantidCurveFitting/Functions/BivariateNormal.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidKernel/PhysicalConstants.h"
#include "MantidAPI/ParameterTie.h"
@@ -20,8 +20,9 @@ using namespace Mantid::API;
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace CurveFitting;
+using namespace Constraints;
namespace {
/// static logger
diff --git a/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp b/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp
index 80377a015d5..ab2f2402bd9 100644
--- a/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp
+++ b/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp
@@ -6,7 +6,7 @@
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/ParameterTie.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidGeometry/IDetector.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/UnitConversion.h"
@@ -21,8 +21,9 @@ Mantid::Kernel::Logger g_log("DiffSphere");
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace CurveFitting;
+using namespace Constraints;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/DiffSphere.cpp b/Framework/CurveFitting/src/Functions/DiffSphere.cpp
index 17e975a3796..7cf48ca1c0e 100644
--- a/Framework/CurveFitting/src/Functions/DiffSphere.cpp
+++ b/Framework/CurveFitting/src/Functions/DiffSphere.cpp
@@ -6,7 +6,7 @@
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/ParameterTie.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidGeometry/IDetector.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/UnitConversion.h"
@@ -23,8 +23,9 @@ Mantid::Kernel::Logger g_log("DiffSphere");
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace CurveFitting;
+using namespace Constraints;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp b/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
index 72a22b1a576..b74d920b0ea 100644
--- a/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
+++ b/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
@@ -2,7 +2,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/Functions/IkedaCarpenterPV.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/SpecialFunctionSupport.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/FunctionFactory.h"
@@ -36,6 +36,7 @@ using namespace Kernel;
using namespace SpecialFunctionSupport;
using namespace Geometry;
+using namespace Constraints;
DECLARE_FUNCTION(IkedaCarpenterPV)
diff --git a/Framework/CurveFitting/src/Functions/PawleyFunction.cpp b/Framework/CurveFitting/src/Functions/PawleyFunction.cpp
index be3bb4fb202..d1ee189b9d1 100644
--- a/Framework/CurveFitting/src/Functions/PawleyFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/PawleyFunction.cpp
@@ -3,7 +3,7 @@
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidKernel/UnitConversion.h"
#include "MantidKernel/UnitFactory.h"
@@ -14,8 +14,9 @@
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace CurveFitting;
+using namespace Constraints;
DECLARE_FUNCTION(PawleyParameterFunction)
diff --git a/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp b/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp
index 1992434d583..86c80a03481 100644
--- a/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp
+++ b/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp
@@ -1,14 +1,15 @@
#include "MantidCurveFitting/Functions/PseudoVoigt.h"
#include "MantidAPI/FunctionFactory.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include <cmath>
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace CurveFitting;
+using namespace Constraints;
using namespace API;
diff --git a/Framework/CurveFitting/src/LeBailFunction.cpp b/Framework/CurveFitting/src/LeBailFunction.cpp
index 7a47d8a0127..6835b74fea4 100644
--- a/Framework/CurveFitting/src/LeBailFunction.cpp
+++ b/Framework/CurveFitting/src/LeBailFunction.cpp
@@ -2,7 +2,7 @@
#include "MantidCurveFitting/LeBailFunction.h"
#include "MantidKernel/System.h"
#include "MantidAPI/FunctionFactory.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include <sstream>
@@ -946,7 +946,7 @@ void LeBailFunction::setFitProfileParameter(string paramname, double minvalue,
std::stringstream parss;
parss << "f0." << paramname;
string parnamef0 = parss.str();
- CurveFitting::BoundaryConstraint *bc = new BoundaryConstraint(
+ Constraints::BoundaryConstraint *bc = new Constraints::BoundaryConstraint(
m_compsiteFunction.get(), parnamef0, minvalue, maxvalue);
m_compsiteFunction->addConstraint(bc);
diff --git a/Framework/CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp b/Framework/CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp
deleted file mode 100644
index 11793321b58..00000000000
--- a/Framework/CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
-#include "MantidCurveFitting/LevenbergMarquardtMDMinimizer.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
-
-#include "MantidAPI/CostFunctionFactory.h"
-#include "MantidAPI/FuncMinimizerFactory.h"
-#include "MantidAPI/IFunction.h"
-
-#include "MantidKernel/Logger.h"
-
-#include <boost/lexical_cast.hpp>
-#include <gsl/gsl_blas.h>
-#include <iostream>
-#include <cmath>
-
-namespace Mantid {
-namespace CurveFitting {
-namespace {
-/// static logger object
-Kernel::Logger g_log("LevenbergMarquardMD");
-}
-
-// clang-format off
-DECLARE_FUNCMINIMIZER(LevenbergMarquardtMDMinimizer, Levenberg-MarquardtMD)
-// clang-format on
-
-/// Constructor
-LevenbergMarquardtMDMinimizer::LevenbergMarquardtMDMinimizer()
- : IFuncMinimizer(), m_tau(1e-6), m_mu(1e-6), m_nu(2.0), m_rho(1.0),
- m_F(0.0) {
- declareProperty("MuMax", 1e6,
- "Maximum value of mu - a stopping parameter in failure.");
- declareProperty("AbsError", 0.0001, "Absolute error allowed for parameters - "
- "a stopping parameter in success.");
- declareProperty("Debug", false, "Turn on the debug output.");
-}
-
-/// Initialize minimizer, i.e. pass a function to minimize.
-void LevenbergMarquardtMDMinimizer::initialize(API::ICostFunction_sptr function,
- size_t) {
- m_leastSquares = boost::dynamic_pointer_cast<CostFuncLeastSquares>(function);
- if (!m_leastSquares) {
- throw std::invalid_argument("Levenberg-Marquardt minimizer works only with "
- "least squares. Different function was given.");
- }
- m_mu = 0;
- m_nu = 2.0;
- m_rho = 1.0;
-}
-
-/// Do one iteration.
-bool LevenbergMarquardtMDMinimizer::iterate(size_t) {
- const bool debug = getProperty("Debug");
- const double muMax = getProperty("MuMax");
- const double absError = getProperty("AbsError");
-
- if (!m_leastSquares) {
- throw std::runtime_error("Cost function isn't set up.");
- }
- size_t n = m_leastSquares->nParams();
-
- if (n == 0) {
- m_errorString = "No parameters to fit.";
- g_log.information(m_errorString);
- return false;
- }
-
- if (m_mu > muMax) {
- // m_errorString = "Failed to converge, maximum mu reached";
- // g_log.warning() << m_errorString << std::endl;
- return false;
- }
-
- // calculate the first and second derivatives of the cost function.
- if (m_mu == 0.0 || m_rho > 0) {
- // calculate everything first time or
- // if last iteration was good
- m_F = m_leastSquares->valDerivHessian();
- }
- // else if m_rho < 0 last iteration was bad: reuse m_der and m_hessian
-
- // Calculate damping to hessian
- if (m_mu == 0) // first iteration or accidental zero
- {
- m_mu = m_tau;
- m_nu = 2.0;
- }
-
- if (debug) {
- g_log.warning()
- << "==========================================================="
- << std::endl;
- g_log.warning() << "mu=" << m_mu << std::endl
- << std::endl;
- }
-
- if (m_D.empty()) {
- m_D.resize(n);
- }
-
- // copy the hessian
- GSLMatrix H(m_leastSquares->getHessian());
- GSLVector dd(m_leastSquares->getDeriv());
-
- // scaling factors
- std::vector<double> sf(n);
-
- for (size_t i = 0; i < n; ++i) {
- double d = fabs(dd.get(i));
- if (m_D[i] > d)
- d = m_D[i];
- m_D[i] = d;
- double tmp = H.get(i, i) + m_mu * d;
- H.set(i, i, tmp);
- sf[i] = sqrt(tmp);
- if (tmp == 0.0) {
- m_errorString = "Singular matrix.";
- g_log.information(m_errorString);
- return false;
- }
- }
-
- // apply scaling
- for (size_t i = 0; i < n; ++i) {
- double d = dd.get(i);
- dd.set(i, d / sf[i]);
- for (size_t j = i; j < n; ++j) {
- const double f = sf[i] * sf[j];
- double tmp = H.get(i, j);
- H.set(i, j, tmp / f);
- if (i != j) {
- tmp = H.get(j, i);
- H.set(j, i, tmp / f);
- }
- }
- }
-
- if (debug && m_rho > 0) {
- g_log.warning() << "Hessian:\n" << H;
- g_log.warning() << "Right-hand side:\n";
- for (size_t j = 0; j < n; ++j) {
- g_log.warning() << dd.get(j) << ' ';
- }
- g_log.warning() << std::endl;
- g_log.warning() << "Determinant=" << H.det() << std::endl;
- }
-
- // Parameter corrections
- GSLVector dx(n);
- // To find dx solve the system of linear equations H * dx == -m_der
- dd *= -1.0;
- H.solve(dd, dx);
-
- if (debug) {
- g_log.warning() << "\nScaling factors:" << std::endl;
- for (size_t j = 0; j < n; ++j) {
- g_log.warning() << sf[j] << ' ';
- }
- g_log.warning() << std::endl;
- g_log.warning() << "Corrections:" << std::endl;
- for (size_t j = 0; j < n; ++j) {
- g_log.warning() << dx.get(j) << ' ';
- }
- g_log.warning() << std::endl
- << std::endl;
- }
-
- // restore scaling
- for (size_t i = 0; i < n; ++i) {
- double d = dx.get(i);
- dx.set(i, d / sf[i]);
- d = dd.get(i);
- dd.set(i, d * sf[i]);
- }
-
- // save previous state
- m_leastSquares->push();
- // Update the parameters of the cost function.
- for (size_t i = 0; i < n; ++i) {
- double d = m_leastSquares->getParameter(i) + dx.get(i);
- m_leastSquares->setParameter(i, d);
- if (debug) {
- g_log.warning() << "Parameter(" << i << ")=" << d << std::endl;
- }
- }
- m_leastSquares->getFittingFunction()->applyTies();
-
- // --- prepare for the next iteration --- //
-
- double dL;
- // der -> - der - 0.5 * hessian * dx
- gsl_blas_dgemv(CblasNoTrans, -0.5, m_leastSquares->getHessian().gsl(),
- dx.gsl(), 1., dd.gsl());
- // calculate the linear part of the change in cost function
- // dL = - der * dx - 0.5 * dx * hessian * dx
- gsl_blas_ddot(dd.gsl(), dx.gsl(), &dL);
-
- double F1 = m_leastSquares->val();
- if (debug) {
- g_log.warning() << std::endl;
- g_log.warning() << "Old cost function " << m_F << std::endl;
- g_log.warning() << "New cost function " << F1 << std::endl;
- g_log.warning() << "Linear part " << dL << std::endl;
- }
-
- // Try the stop condition
- if (m_rho >= 0) {
- GSLVector p(n);
- m_leastSquares->getParameters(p);
- double dx_norm = gsl_blas_dnrm2(dx.gsl());
- if (dx_norm < absError) {
- if (debug) {
- g_log.warning() << "Successful fit, parameters changed by less than "
- << absError << std::endl;
- }
- return false;
- }
- if (m_rho == 0) {
- if (m_F != F1) {
- this->m_errorString = "Failed to converge, rho == 0";
- g_log.warning() << m_errorString << std::endl;
- }
- if (debug) {
- g_log.warning() << "Successful fit, cost function didn't change."
- << std::endl;
- }
- return false;
- }
- }
-
- if (fabs(dL) == 0.0) {
- if (m_F == F1)
- m_rho = 1.0;
- else
- m_rho = 0;
- } else {
- m_rho = (m_F - F1) / dL;
- if (m_rho == 0) {
- return false;
- }
- }
- if (debug) {
- g_log.warning() << "rho=" << m_rho << std::endl;
- }
-
- if (m_rho > 0) { // good progress, decrease m_mu but no more than by 1/3
- // rho = 1 - (2*rho - 1)^3
- m_rho = 2.0 * m_rho - 1.0;
- m_rho = 1.0 - m_rho * m_rho * m_rho;
- const double I3 = 1.0 / 3.0;
- if (m_rho > I3)
- m_rho = I3;
- if (m_rho < 0.0001)
- m_rho = 0.1;
- m_mu *= m_rho;
- m_nu = 2.0;
- m_F = F1;
- if (debug) {
- g_log.warning() << "Good iteration, accept new parameters." << std::endl;
- g_log.warning() << "rho=" << m_rho << std::endl;
- }
- // drop saved state, accept new parameters
- m_leastSquares->drop();
- } else { // bad iteration. increase m_mu and revert changes to parameters
- m_mu *= m_nu;
- m_nu *= 2.0;
- // undo parameter update
- m_leastSquares->pop();
- m_F = m_leastSquares->val();
- if (debug) {
- g_log.warning()
- << "Bad iteration, increase mu and revert changes to parameters."
- << std::endl;
- }
- }
-
- return true;
-}
-
-/// Return current value of the cost function
-double LevenbergMarquardtMDMinimizer::costFunctionVal() {
- if (!m_leastSquares) {
- throw std::runtime_error("Cost function isn't set up.");
- }
- return m_leastSquares->val();
-}
-
-} // namespace CurveFitting
-} // namespace Mantid
diff --git a/Framework/CurveFitting/src/LevenbergMarquardtMinimizer.cpp b/Framework/CurveFitting/src/LevenbergMarquardtMinimizer.cpp
deleted file mode 100644
index 7e561468929..00000000000
--- a/Framework/CurveFitting/src/LevenbergMarquardtMinimizer.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
-#include "MantidCurveFitting/LevenbergMarquardtMinimizer.h"
-#include "MantidCurveFitting/CostFuncLeastSquares.h"
-
-#include "MantidAPI/CostFunctionFactory.h"
-#include "MantidAPI/FuncMinimizerFactory.h"
-
-#include "MantidKernel/Exception.h"
-#include "MantidKernel/Logger.h"
-#include "MantidKernel/System.h"
-
-#include <boost/lexical_cast.hpp>
-#include <gsl/gsl_blas.h>
-#include <iostream>
-
-namespace Mantid {
-namespace CurveFitting {
-namespace {
-// Get a reference to the logger
-Kernel::Logger g_log("LevenbergMarquardtMinimizer");
-}
-
-// clang-format off
-DECLARE_FUNCMINIMIZER(LevenbergMarquardtMinimizer, Levenberg-Marquardt)
-// clang-format on
-
-LevenbergMarquardtMinimizer::LevenbergMarquardtMinimizer()
- : m_data(NULL), gslContainer(), m_gslSolver(NULL), m_function(),
- m_absError(1e-4), m_relError(1e-4) {
- declareProperty("AbsError", m_absError, "Absolute error allowed for "
- "parameters - a stopping parameter "
- "in success.");
- declareProperty("RelError", m_relError, "Relative error allowed for "
- "parameters - a stopping parameter "
- "in success.");
-}
-
-void LevenbergMarquardtMinimizer::initialize(
- API::ICostFunction_sptr costFunction, size_t) {
- // set-up GSL container to be used with GSL simplex algorithm
- auto leastSquares =
- boost::dynamic_pointer_cast<CostFuncLeastSquares>(costFunction);
- if (leastSquares) {
- m_data = new GSL_FitData(leastSquares);
- } else {
- throw std::runtime_error("LevenbergMarquardt can only be used with Least "
- "squares cost function.");
- }
-
- // specify the type of GSL solver to use
- const gsl_multifit_fdfsolver_type *T = gsl_multifit_fdfsolver_lmsder;
-
- // setup GSL container
- gslContainer.f = &gsl_f;
- gslContainer.df = &gsl_df;
- gslContainer.fdf = &gsl_fdf;
- gslContainer.n = m_data->n;
- gslContainer.p = m_data->p;
- gslContainer.params = m_data;
-
- // setup GSL solver
- m_gslSolver = gsl_multifit_fdfsolver_alloc(T, m_data->n, m_data->p);
- if (!m_gslSolver) {
- throw std::runtime_error(
- "Levenberg-Marquardt minimizer failed to initialize. \n" +
- boost::lexical_cast<std::string>(m_data->n) + " data points, " +
- boost::lexical_cast<std::string>(m_data->p) + " fitting parameters. ");
- }
- gsl_multifit_fdfsolver_set(m_gslSolver, &gslContainer,
- m_data->initFuncParams);
-
- m_function = leastSquares->getFittingFunction();
-}
-
-LevenbergMarquardtMinimizer::~LevenbergMarquardtMinimizer() {
- if (m_data) {
- delete m_data;
- }
- if (m_gslSolver) {
- gsl_multifit_fdfsolver_free(m_gslSolver);
- }
-}
-
-bool LevenbergMarquardtMinimizer::iterate(size_t) {
- m_absError = getProperty("AbsError");
- m_relError = getProperty("RelError");
-
- int retVal = gsl_multifit_fdfsolver_iterate(m_gslSolver);
-
- // From experience it is found that gsl_multifit_fdfsolver_iterate
- // occasionally get
- // stock - even after having achieved a sensible fit. This seem in particular
- // to be a
- // problem on Linux. However, to force GSL not to return ga ga have to do
- // stuff in the
- // if statement below
- // GSL 1.14 changed return value from GSL_CONTINUE->GSL_ENOPROG for
- // non-converging fits at 10 iterations
- if (retVal == GSL_CONTINUE || retVal == GSL_ENOPROG) {
- size_t ia = 0;
- for (size_t i = 0; i < m_function->nParams(); i++) {
- if (m_function->isActive(i)) {
- m_function->setActiveParameter(i, gsl_vector_get(m_gslSolver->x, ia));
- ++ia;
- }
- }
- m_function->applyTies();
- retVal = GSL_CONTINUE;
- }
-
- if (retVal && retVal != GSL_CONTINUE) {
- m_errorString = gsl_strerror(retVal);
- return false;
- }
-
- retVal = hasConverged();
- m_errorString = gsl_strerror(retVal);
-
- return retVal != GSL_SUCCESS;
-}
-
-int LevenbergMarquardtMinimizer::hasConverged() {
- return gsl_multifit_test_delta(m_gslSolver->dx, m_gslSolver->x, m_absError,
- m_relError);
-}
-
-double LevenbergMarquardtMinimizer::costFunctionVal() {
- double chi = gsl_blas_dnrm2(m_gslSolver->f);
- return chi * chi;
-}
-
-/* Calculates covariance matrix
- *
- * @param epsrel :: Is used to remove linear-dependent columns
- * @param covar :: Returned covariance matrix, here as
- */
-void LevenbergMarquardtMinimizer::calCovarianceMatrix(double epsrel,
- gsl_matrix *covar) {
- gsl_multifit_covar(m_gslSolver->J, epsrel, covar);
-}
-
-} // namespace CurveFitting
-} // namespace Mantid
diff --git a/Framework/CurveFitting/src/RefinePowderInstrumentParameters3.cpp b/Framework/CurveFitting/src/RefinePowderInstrumentParameters3.cpp
index bfc7bc09849..22c96159ba9 100644
--- a/Framework/CurveFitting/src/RefinePowderInstrumentParameters3.cpp
+++ b/Framework/CurveFitting/src/RefinePowderInstrumentParameters3.cpp
@@ -1267,7 +1267,7 @@ void RefinePowderInstrumentParameters3::setFunctionParameterFitSetups(
double upperbound = param.maxvalue;
if (lowerbound >= -DBL_MAX * 0.1 || upperbound <= DBL_MAX * 0.1) {
// If there is a boundary
- BoundaryConstraint *bc = new BoundaryConstraint(
+ Constraints::BoundaryConstraint *bc = new Constraints::BoundaryConstraint(
function.get(), parname, lowerbound, upperbound, false);
function->addConstraint(bc);
}
diff --git a/Framework/CurveFitting/test/BoundaryConstraintTest.h b/Framework/CurveFitting/test/Constraints/BoundaryConstraintTest.h
similarity index 97%
rename from Framework/CurveFitting/test/BoundaryConstraintTest.h
rename to Framework/CurveFitting/test/Constraints/BoundaryConstraintTest.h
index b4fe9bb2d01..d4d479b94a6 100644
--- a/Framework/CurveFitting/test/BoundaryConstraintTest.h
+++ b/Framework/CurveFitting/test/Constraints/BoundaryConstraintTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Functions/Gaussian.h"
#include "MantidCurveFitting/Functions/Lorentzian.h"
#include "MantidKernel/UnitFactory.h"
@@ -16,6 +16,7 @@
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Constraints;
class BoundaryConstraintTest : public CxxTest::TestSuite {
public:
@@ -40,7 +41,7 @@ public:
TS_ASSERT(bc.hasUpper());
BoundaryConstraint bc2;
- ;
+
bc2.reset(&gaus, 2);
bc2.setBounds(10, 20);
diff --git a/Framework/CurveFitting/test/ConvertToYSpaceTest.h b/Framework/CurveFitting/test/ConvertToYSpaceTest.h
index a3fed78b8ba..c439658b075 100644
--- a/Framework/CurveFitting/test/ConvertToYSpaceTest.h
+++ b/Framework/CurveFitting/test/ConvertToYSpaceTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/ConvertToYSpace.h"
-#include "ComptonProfileTestHelpers.h"
+#include "Functions/ComptonProfileTestHelpers.h"
using Mantid::CurveFitting::ConvertToYSpace;
diff --git a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
index 8e1ec30d01a..1e8d08c13f5 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
@@ -8,7 +8,7 @@
#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include <sstream>
@@ -16,6 +16,7 @@ using namespace Mantid;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::CurveFitting::CostFunctions;
+using namespace Mantid::CurveFitting::Constraints;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
index 49a24f2a9a0..edaeec639e0 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
@@ -8,7 +8,7 @@
#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include <sstream>
@@ -16,6 +16,7 @@ using namespace Mantid;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::CurveFitting::CostFunctions;
+using namespace Mantid::CurveFitting::Constraints;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
index 7537ee88047..359712feb5f 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
@@ -8,7 +8,7 @@
#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionValues.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include <sstream>
@@ -16,6 +16,7 @@ using namespace Mantid;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::CurveFitting::CostFunctions;
+using namespace Mantid::CurveFitting::Constraints;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
diff --git a/Framework/CurveFitting/test/Functions/AbragamTest.h b/Framework/CurveFitting/test/Functions/AbragamTest.h
index 1bea6f89482..d103dfa360e 100644
--- a/Framework/CurveFitting/test/Functions/AbragamTest.h
+++ b/Framework/CurveFitting/test/Functions/AbragamTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/Abragam.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/CurveFitting/test/Functions/EndErfcTest.h b/Framework/CurveFitting/test/Functions/EndErfcTest.h
index 7c9ad2d9ecd..5fe20acfd8e 100644
--- a/Framework/CurveFitting/test/Functions/EndErfcTest.h
+++ b/Framework/CurveFitting/test/Functions/EndErfcTest.h
@@ -4,9 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/Functions/EndErfc.h"
-#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/Functions/LinearBackground.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
diff --git a/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h b/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h
index 7171baaba31..45561fcc3d1 100644
--- a/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h
+++ b/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/ExpDecayMuon.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
diff --git a/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h b/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h
index 67025d69e22..cc87d09f6b5 100644
--- a/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h
+++ b/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/ExpDecayOsc.h"
#include "MantidCurveFitting/Fit.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidDataObjects/Workspace2D.h"
@@ -15,6 +15,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Constraints;
using namespace Mantid::DataObjects;
class ExpDecayOscTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/ExpDecayTest.h b/Framework/CurveFitting/test/Functions/ExpDecayTest.h
index 243a2dd2ebe..e5b3ff434c8 100644
--- a/Framework/CurveFitting/test/Functions/ExpDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/ExpDecayTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/ExpDecay.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/CurveFitting/test/Functions/GausDecayTest.h b/Framework/CurveFitting/test/Functions/GausDecayTest.h
index 248fdd6cfb8..59df2188d75 100644
--- a/Framework/CurveFitting/test/Functions/GausDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/GausDecayTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/GausDecay.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/CurveFitting/test/Functions/GausOscTest.h b/Framework/CurveFitting/test/Functions/GausOscTest.h
index abdc63650ff..fdd9b91bf36 100644
--- a/Framework/CurveFitting/test/Functions/GausOscTest.h
+++ b/Framework/CurveFitting/test/Functions/GausOscTest.h
@@ -7,7 +7,7 @@
#include "MantidCurveFitting/Functions/GausOsc.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/CurveFitting/test/Functions/GaussianTest.h b/Framework/CurveFitting/test/Functions/GaussianTest.h
index 903fdeb96ef..79c76ab0836 100644
--- a/Framework/CurveFitting/test/Functions/GaussianTest.h
+++ b/Framework/CurveFitting/test/Functions/GaussianTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/Gaussian.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/InstrumentDataService.h"
@@ -33,6 +33,7 @@ using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::CurveFitting::CostFunctions;
+using namespace Mantid::CurveFitting::Constraints;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
diff --git a/Framework/CurveFitting/test/Functions/LogNormalTest.h b/Framework/CurveFitting/test/Functions/LogNormalTest.h
index 2d950578e8a..de8055bfb53 100644
--- a/Framework/CurveFitting/test/Functions/LogNormalTest.h
+++ b/Framework/CurveFitting/test/Functions/LogNormalTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/LogNormal.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h b/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h
index 61e05b91013..3e3e3ac7b52 100644
--- a/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h
+++ b/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h
@@ -4,9 +4,6 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/Functions/MuonFInteraction.h"
-#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/Functions/LinearBackground.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h
index 220de48b325..7cf2b5b478e 100644
--- a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h
+++ b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/StaticKuboToyabe.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h b/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h
index d86db44ec7a..47c85a7e681 100644
--- a/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h
+++ b/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/StretchExpMuon.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/CurveFitting/test/Functions/StretchExpTest.h b/Framework/CurveFitting/test/Functions/StretchExpTest.h
index d25b966d7d2..b90876d0e5b 100644
--- a/Framework/CurveFitting/test/Functions/StretchExpTest.h
+++ b/Framework/CurveFitting/test/Functions/StretchExpTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/StretchExp.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/SINQ/test/PoldiFitPeaks1D2Test.h b/Framework/SINQ/test/PoldiFitPeaks1D2Test.h
index 4ced3e46bad..35fbec1cc24 100644
--- a/Framework/SINQ/test/PoldiFitPeaks1D2Test.h
+++ b/Framework/SINQ/test/PoldiFitPeaks1D2Test.h
@@ -9,8 +9,7 @@
#include "MantidAPI/CompositeFunction.h"
#include "MantidAPI/IPeakFunction.h"
-#include "MantidCurveFitting/Gaussian.h"
-#include "MantidCurveFitting/FlatBackground.h"
+#include "MantidCurveFitting/Functions/FlatBackground.h"
#include "MantidSINQ/PoldiUtilities/PoldiPeak.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
@@ -21,6 +20,7 @@ using Mantid::Poldi::PoldiFitPeaks1D2;
using namespace Mantid::Poldi;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::Kernel;
using namespace Mantid::DataObjects;
diff --git a/Framework/SINQ/test/PoldiFitPeaks1DTest.h b/Framework/SINQ/test/PoldiFitPeaks1DTest.h
index a2158802104..452d6472c39 100644
--- a/Framework/SINQ/test/PoldiFitPeaks1DTest.h
+++ b/Framework/SINQ/test/PoldiFitPeaks1DTest.h
@@ -9,8 +9,7 @@
#include "MantidAPI/CompositeFunction.h"
#include "MantidAPI/IPeakFunction.h"
-#include "MantidCurveFitting/Gaussian.h"
-#include "MantidCurveFitting/FlatBackground.h"
+#include "MantidCurveFitting/Functions/FlatBackground.h"
#include "MantidSINQ/PoldiUtilities/PoldiPeak.h"
@@ -18,6 +17,7 @@ using Mantid::Poldi::PoldiFitPeaks1D;
using namespace Mantid::Poldi;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::Kernel;
class TestablePoldiFitPeaks1D : public Mantid::Poldi::PoldiFitPeaks1D {
--
GitLab
From 979767d7a3d9daf3d831e36350f07286e5db2bb2 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 16:51:33 +0100
Subject: [PATCH 089/223] include <string> for rhel6, re #13689
---
Framework/API/inc/MantidAPI/ITransformScale.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/Framework/API/inc/MantidAPI/ITransformScale.h b/Framework/API/inc/MantidAPI/ITransformScale.h
index d13af449f04..18832392062 100644
--- a/Framework/API/inc/MantidAPI/ITransformScale.h
+++ b/Framework/API/inc/MantidAPI/ITransformScale.h
@@ -8,6 +8,7 @@
#include <boost/shared_ptr.hpp>
#endif
+#include <string>
#include <vector>
#include "MantidAPI/DllConfig.h"
--
GitLab
From b5de473e805c2faec5c55f7c1d8e9e971b7bfd58 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 18:02:05 +0100
Subject: [PATCH 090/223] document MD normalization options more explicitly, re
#12551
---
MantidPlot/pymantidplot/__init__.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/MantidPlot/pymantidplot/__init__.py b/MantidPlot/pymantidplot/__init__.py
index f77ce7c983d..3ea6a0189f5 100644
--- a/MantidPlot/pymantidplot/__init__.py
+++ b/MantidPlot/pymantidplot/__init__.py
@@ -300,7 +300,9 @@ def plotMD(source, plot_axis=-2, normalization=DEFAULT_MD_NORMALIZATION, error_b
Args:
source: Workspace(s) to plot
plot_axis: Index of the plot axis (defaults to auto-select)
- normalization: Type of normalization required (defaults to volume)
+ normalization: Type of normalization required (defaults to volume, options available:
+ MDNormalization.NoNormalization, MDNormalization.NumEventsNormalization, and
+ MDNormalization.VolumeNormalization).
error_bars: Flag for error bar plotting.
window: window used for plotting. If None a new one will be created
clearWindow: if is True, the window specified will be cleared before adding new curve
--
GitLab
From 27ff0e1bf11ae3f1710c770c0cb8020adea2416f Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 18:02:34 +0100
Subject: [PATCH 091/223] add menu actions for MD normalization on plotMD, re
#12551
---
MantidPlot/src/ApplicationWindow.cpp | 22 ++++++++++
MantidPlot/src/Graph.cpp | 64 ++++++++++++++++++++++++++++
MantidPlot/src/Graph.h | 20 +++++++++
MantidPlot/src/Mantid/MantidUI.cpp | 3 ++
4 files changed, 109 insertions(+)
diff --git a/MantidPlot/src/ApplicationWindow.cpp b/MantidPlot/src/ApplicationWindow.cpp
index d9455438c81..3fa69dd633f 100644
--- a/MantidPlot/src/ApplicationWindow.cpp
+++ b/MantidPlot/src/ApplicationWindow.cpp
@@ -10153,6 +10153,7 @@ void ApplicationWindow::showGraphContextMenu() {
QMenu axes(this);
QMenu colour(this);
QMenu normalization(this);
+ QMenu normMD(this);
QMenu exports(this);
QMenu copy(this);
QMenu prints(this);
@@ -10218,6 +10219,27 @@ void ApplicationWindow::showGraphContextMenu() {
noNorm->setChecked(!ag->isDistribution());
binNorm->setChecked(ag->isDistribution());
cm.insertItem(tr("&Normalization"), &normalization);
+ } else if (ag->normalizableMD()) {
+ QAction *noNormMD = new QAction(tr("N&one"), &normMD);
+ noNormMD->setCheckable(true);
+ connect(noNormMD, SIGNAL(activated()), ag, SLOT(noNormalizationMD()));
+ normMD.addAction(noNormMD);
+
+ QAction *volNormMD = new QAction(tr("&Volume"), &normMD);
+ volNormMD->setCheckable(true);
+ connect(volNormMD, SIGNAL(activated()), ag, SLOT(volumeNormalizationMD()));
+ normMD.addAction(volNormMD);
+
+ QAction *eventsNormMD = new QAction(tr("&Events"), &normMD);
+ eventsNormMD->setCheckable(true);
+ connect(eventsNormMD, SIGNAL(activated()), ag, SLOT(numEventsNormalizationMD()));
+ normMD.addAction(eventsNormMD);
+
+ int normalization = ag->normalizationMD();
+ noNormMD->setChecked(0 == normalization);
+ volNormMD->setChecked(1 == normalization);
+ eventsNormMD->setChecked(2 == normalization);
+ cm.insertItem("MD &Normalization", &normMD);
}
QMenu plotType(this);
diff --git a/MantidPlot/src/Graph.cpp b/MantidPlot/src/Graph.cpp
index 4896dda0ac8..f4d4c946070 100644
--- a/MantidPlot/src/Graph.cpp
+++ b/MantidPlot/src/Graph.cpp
@@ -60,6 +60,7 @@
#include "MantidAPI/AnalysisDataService.h"
#include "Mantid/MantidMatrixCurve.h"
+#include "Mantid/MantidMDCurve.h"
#include "MantidQtAPI/PlotAxis.h"
#include "MantidQtAPI/QwtRasterDataMD.h"
#include "MantidQtAPI/QwtWorkspaceSpectrumData.h"
@@ -210,6 +211,9 @@ Graph::Graph(int x, int y, int width, int height, QWidget* parent, Qt::WFlags f)
m_isDistribution = false;
m_normalizable = false;
+
+ m_normalizableMD = false;
+ m_normalizationMD = 0;
}
void Graph::notifyChanges()
@@ -5541,6 +5545,57 @@ void Graph::binWidthNormalization()
notifyChanges();
}
+/**
+ * Set 'None' normalization for MD plots
+ */
+void Graph::noNormalizationMD()
+{
+ if (!normalizableMD())
+ return;
+
+ setNormalizationMD(0);
+
+ updateDataCurves();
+ d_plot->updateAxes();
+ setYAxisTitle(yAxisTitleFromFirstCurve());
+
+ notifyChanges();
+}
+
+/**
+ * Set volume normalization for MD plots
+ */
+void Graph::volumeNormalizationMD()
+{
+ if (!normalizableMD())
+ return;
+
+ setNormalizationMD(1);
+
+ updateDataCurves();
+ d_plot->updateAxes();
+ setYAxisTitle(yAxisTitleFromFirstCurve());
+
+ notifyChanges();
+}
+
+/**
+ * Set number of events normalization for MD plots
+ */
+void Graph::numEventsNormalizationMD()
+{
+ if (!normalizableMD())
+ return;
+
+ setNormalizationMD(2);
+
+ updateDataCurves();
+ d_plot->updateAxes();
+ setYAxisTitle(yAxisTitleFromFirstCurve());
+
+ notifyChanges();
+}
+
void Graph::setWaterfallXOffset(int offset)
{
if (offset == d_waterfall_offset_x)
@@ -5654,6 +5709,15 @@ void Graph::updateDataCurves()
mc->invalidateBoundingRect();
mc->loadData();
}
+ else if (MantidMDCurve *mdc = dynamic_cast<MantidMDCurve*>(pc))
+ {
+ //mdc->setDrawAsDistribution(m_isDistribution);
+ // yes, using int in Graph and ApplicationWindow instead of the proper enum, just so that
+ // IMDWorkspace.h does not need to be included in more places in MantidPlot
+ mdc->mantidData()->setNormalization(static_cast<Mantid::API::MDNormalization>(m_normalizationMD));
+ mdc->invalidateBoundingRect();
+ }
+
}
QApplication::restoreOverrideCursor();
}
diff --git a/MantidPlot/src/Graph.h b/MantidPlot/src/Graph.h
index 95121394049..2905093a844 100644
--- a/MantidPlot/src/Graph.h
+++ b/MantidPlot/src/Graph.h
@@ -209,6 +209,20 @@ public slots:
bool isDistribution() const { return m_isDistribution; }
void setDistribution(const bool on) { m_isDistribution = on; }
+ void noNormalizationMD();
+ void numEventsNormalizationMD();
+ void volumeNormalizationMD();
+
+ /// normalizable in the MD sense, don't confuse with (bin width) normalizable(),
+ /// True if this is a plot MD
+ bool normalizableMD() const { return m_normalizableMD; }
+ void setNormalizableMD(const bool on) { m_normalizableMD = on; }
+
+ /// when using MD curves (true == normalizbleMD()), what type of normalization
+ int normalizationMD() const { return m_normalizationMD; }
+ void setNormalizationMD(const int normalization) { m_normalizationMD = normalization; }
+
+
//! Accessor method for #d_plot.
Plot* plotWidget(){return d_plot;};
@@ -877,6 +891,12 @@ private:
bool m_isDistribution;
// True, if the graph can be plotted as distribution
bool m_normalizable;
+
+ // True if the graph is an MD plot and can be normalized (none, volume, events)
+ bool m_normalizableMD;
+ /// type of normalization for MD curves
+ int m_normalizationMD;
+
// x and y units of MantidCurves
boost::shared_ptr<Mantid::Kernel::Unit> m_xUnits;
boost::shared_ptr<Mantid::Kernel::Unit> m_yUnits;
diff --git a/MantidPlot/src/Mantid/MantidUI.cpp b/MantidPlot/src/Mantid/MantidUI.cpp
index 57ff719e17b..8d68b625bf2 100644
--- a/MantidPlot/src/Mantid/MantidUI.cpp
+++ b/MantidPlot/src/Mantid/MantidUI.cpp
@@ -618,6 +618,9 @@ MultiLayer* MantidUI::plotMDList(const QStringList& wsNames, const int plotAxis,
data->setPlotAxisChoice(plotAxis);
data->setNormalization(normalization);
+ g->setNormalizableMD(true);
+ g->setNormalizationMD(normalization);
+
// Using information from the first graph
if( i == 0 && isGraphNew )
g->setAutoScale();
--
GitLab
From 6b5a379d7407c9ef3e106c92456ddf8a4322fdc8 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 20:59:16 +0100
Subject: [PATCH 092/223] header needed for osx, re #13689
---
MantidQt/SpectrumViewer/src/EModeHandler.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/MantidQt/SpectrumViewer/src/EModeHandler.cpp b/MantidQt/SpectrumViewer/src/EModeHandler.cpp
index 784ff1ce791..3ec420a5f46 100644
--- a/MantidQt/SpectrumViewer/src/EModeHandler.cpp
+++ b/MantidQt/SpectrumViewer/src/EModeHandler.cpp
@@ -1,9 +1,10 @@
-#include <QLineEdit>
+#include <iostream>
#include "MantidQtSpectrumViewer/EModeHandler.h"
#include "MantidQtSpectrumViewer/QtUtils.h"
#include "MantidKernel/Logger.h"
+#include <QLineEdit>
namespace
{
--
GitLab
From 04fdf46b648b88c44e0fed867bf67ac5e8822e56 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 21:55:58 +0100
Subject: [PATCH 093/223] one more iostream include needed for osx, re #13689
---
MantidPlot/src/Mantid/MantidApplication.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MantidPlot/src/Mantid/MantidApplication.cpp b/MantidPlot/src/Mantid/MantidApplication.cpp
index dead6d262b4..00d38187960 100644
--- a/MantidPlot/src/Mantid/MantidApplication.cpp
+++ b/MantidPlot/src/Mantid/MantidApplication.cpp
@@ -9,6 +9,8 @@
#include <QMessageBox>
#include <QPushButton>
+#include <iostream>
+
namespace
{
/// static logger
--
GitLab
From b13cc3318b4a9a066d01fc06d8258f7834d20103 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 22:40:10 +0100
Subject: [PATCH 094/223] one more iostream include needed for osx (QtGui
qpolygon), re #13689
---
MantidPlot/src/Mantid/InstrumentWidget/RectF.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/RectF.cpp b/MantidPlot/src/Mantid/InstrumentWidget/RectF.cpp
index 8204c70743d..857f2469951 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/RectF.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/RectF.cpp
@@ -1,3 +1,5 @@
+#include <iostream>
+
#include "RectF.h"
--
GitLab
From 15dcbb5d92da9bad1d7b2b34681773b5f20520e0 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 23:38:55 +0100
Subject: [PATCH 095/223] iosfwd not quite enough on osx, iostream back
(qpolygon), re #13689
---
MantidPlot/src/Mantid/InstrumentWidget/RectF.cpp | 2 --
MantidPlot/src/Mantid/InstrumentWidget/RectF.h | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/RectF.cpp b/MantidPlot/src/Mantid/InstrumentWidget/RectF.cpp
index 857f2469951..8204c70743d 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/RectF.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/RectF.cpp
@@ -1,5 +1,3 @@
-#include <iostream>
-
#include "RectF.h"
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/RectF.h b/MantidPlot/src/Mantid/InstrumentWidget/RectF.h
index 2a2bbc99e6a..570edc68c82 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/RectF.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/RectF.h
@@ -7,7 +7,7 @@
#include <QTransform>
#include <algorithm>
-#include <iosfwd>
+#include <iostream>
#include <stdexcept>
#include <cmath>
--
GitLab
From 28c7ea4b88934c05b81400acafc071fd15c65e5f Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 23:48:27 +0100
Subject: [PATCH 096/223] iostream actually needed for logs on osx, re #13689
---
Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp b/Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp
index 4e456176744..93c1e5d511c 100644
--- a/Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp
+++ b/Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp
@@ -7,6 +7,7 @@
#include <QPushButton>
#include <exception>
+#include <iostream>
namespace
{
--
GitLab
From f34b01f4a960ff8181c4f254cbd3204fa72c1e77 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Fri, 9 Oct 2015 09:09:58 +0100
Subject: [PATCH 097/223] Fix of empty workspace test
Refs #13508
---
.../MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h | 1 -
Framework/MDAlgorithms/src/CompactMD.cpp | 10 +++++-----
Framework/MDAlgorithms/test/CompactMDTest.h | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
index c89da905aa9..8548e5ae10e 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
@@ -53,7 +53,6 @@ public:
const std::string category() const { return "MDAlgorithms"; }
/// Algorithm's version for identification
int version() const { return 1; }
-
void
findFirstNonZeroMinMaxExtents(Mantid::API::IMDHistoWorkspace_sptr inputWs,
std::vector<Mantid::coord_t> &minVec,
diff --git a/Framework/MDAlgorithms/src/CompactMD.cpp b/Framework/MDAlgorithms/src/CompactMD.cpp
index e4ce3f86d3d..2f5c2029152 100644
--- a/Framework/MDAlgorithms/src/CompactMD.cpp
+++ b/Framework/MDAlgorithms/src/CompactMD.cpp
@@ -16,11 +16,13 @@ createPBinStringVector(std::vector<Mantid::coord_t> minVector,
size_t numDims = inputWs->getNumDims();
std::vector<std::string> pBinStrVector;
for (size_t iter = 0; iter < numDims; iter++) {
- // creating pbin string using Min and Max Centre positions
if (minVector[iter] >= maxVector[iter]) {
- throw std::invalid_argument(
- "Minimum extents MUST be less than Maximum extents");
+ std::cerr << "Minimum extent of non-zero signal must be LESS than the "
+ "maximum extent with non-zero signal"
+ << std::endl;
+ // break;
}
+ // creating pbin string using Min and Max Centre positions
auto pBinStr = boost::lexical_cast<std::string>(
minVector[iter] -
(inputWs->getDimension(iter)->getBinWidth() * 0.5)) +
@@ -91,9 +93,7 @@ void CompactMD::exec() {
}
// start our search for the first non-zero signal index.
findFirstNonZeroMinMaxExtents(input_ws, minVector, maxVector);
-
auto pBinStrings = createPBinStringVector(minVector, maxVector, input_ws);
-
// creating IntegrateMDHistoWorkspace algorithm to crop our workspace.
auto cut_alg = this->createChildAlgorithm("IntegrateMDHistoWorkspace");
cut_alg->setProperty("InputWorkspace", input_ws);
diff --git a/Framework/MDAlgorithms/test/CompactMDTest.h b/Framework/MDAlgorithms/test/CompactMDTest.h
index fffb284b7a1..8f1a968300f 100644
--- a/Framework/MDAlgorithms/test/CompactMDTest.h
+++ b/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -233,7 +233,7 @@ public:
alg.initialize();
alg.setProperty("InputWorkspace", inWS);
alg.setProperty("OutputWorkspace", "out");
- TS_ASSERT_THROWS(alg.execute(), std::invalid_argument);
+ TS_ASSERT_THROWS_ANYTHING(alg.execute());
}
};
//===================
--
GitLab
From aceecd285984eb62a77ba4fe18152972ae64bab9 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Fri, 9 Oct 2015 09:18:47 +0100
Subject: [PATCH 098/223] Clang format for CompactMD source
Refs #13508
---
Framework/MDAlgorithms/src/CompactMD.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Framework/MDAlgorithms/src/CompactMD.cpp b/Framework/MDAlgorithms/src/CompactMD.cpp
index 2f5c2029152..9ea2877978b 100644
--- a/Framework/MDAlgorithms/src/CompactMD.cpp
+++ b/Framework/MDAlgorithms/src/CompactMD.cpp
@@ -18,9 +18,7 @@ createPBinStringVector(std::vector<Mantid::coord_t> minVector,
for (size_t iter = 0; iter < numDims; iter++) {
if (minVector[iter] >= maxVector[iter]) {
std::cerr << "Minimum extent of non-zero signal must be LESS than the "
- "maximum extent with non-zero signal"
- << std::endl;
- // break;
+ "maximum extent with non-zero signal" << std::endl;
}
// creating pbin string using Min and Max Centre positions
auto pBinStr = boost::lexical_cast<std::string>(
--
GitLab
From 87004758a9a23dd2b16e1d144dfbe369c5eac2fa Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Fri, 9 Oct 2015 09:28:09 +0100
Subject: [PATCH 099/223] Fixing throws in empty workspace test
Refs #13508
---
Framework/MDAlgorithms/test/CompactMDTest.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Framework/MDAlgorithms/test/CompactMDTest.h b/Framework/MDAlgorithms/test/CompactMDTest.h
index 8f1a968300f..8ca2b6b6ac0 100644
--- a/Framework/MDAlgorithms/test/CompactMDTest.h
+++ b/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -233,7 +233,7 @@ public:
alg.initialize();
alg.setProperty("InputWorkspace", inWS);
alg.setProperty("OutputWorkspace", "out");
- TS_ASSERT_THROWS_ANYTHING(alg.execute());
+ TS_ASSERT_THROWS(alg.execute(), std::runtime_error &);
}
};
//===================
--
GitLab
From 224106bc5bce82e18882eeb07e563f39c80dd159 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Fri, 9 Oct 2015 09:42:03 +0100
Subject: [PATCH 100/223] Move Algorithms to their own directory and namespace
re #13347
---
Framework/API/inc/MantidAPI/IFunction1D.h | 6 +-
Framework/CurveFitting/CMakeLists.txt | 119 +++++++++---------
.../{ => Algorithms}/CalculateChiSquared.h | 2 +
.../CalculateGammaBackground.h | 13 +-
.../{ => Algorithms}/CalculateMSVesuvio.h | 14 ++-
.../{ => Algorithms}/ConvertToYSpace.h | 2 +
.../{ => Algorithms}/ConvolveWorkspaces.h | 2 +
.../{ => Algorithms}/EstimatePeakErrors.h | 2 +
.../{ => Algorithms}/EvaluateFunction.h | 2 +
.../MantidCurveFitting/{ => Algorithms}/Fit.h | 2 +
.../{ => Algorithms}/Fit1D.h | 2 +
.../{ => Algorithms}/FitPowderDiffPeaks.h | 2 +
.../{ => Algorithms}/LeBailFit.h | 4 +-
.../{ => Algorithms}/LeBailFunction.h | 4 +
.../{ => Algorithms}/NormaliseByPeakArea.h | 2 +
.../{ => Algorithms}/PawleyFit.h | 2 +
.../{ => Algorithms}/PlotPeakByLogValue.h | 2 +
.../RefinePowderInstrumentParameters.h | 14 ++-
.../RefinePowderInstrumentParameters3.h | 4 +-
.../{ => Algorithms}/SplineBackground.h | 2 +
.../{ => Algorithms}/SplineInterpolation.h | 2 +
.../{ => Algorithms}/SplineSmoothing.h | 2 +
.../Functions/ComptonProfile.h | 6 +-
.../Functions/GramCharlierComptonProfile.h | 2 +-
.../Functions/Lorentzian1D.h | 4 +-
.../Functions/UserFunction1D.h | 4 +-
.../Functions/VesuvioResolution.h | 4 +-
.../{ => Algorithms}/CalculateChiSquared.cpp | 4 +-
.../CalculateGammaBackground.cpp | 23 ++--
.../{ => Algorithms}/CalculateMSVesuvio.cpp | 27 ++--
.../src/{ => Algorithms}/ConvertToYSpace.cpp | 4 +-
.../{ => Algorithms}/ConvolveWorkspaces.cpp | 4 +-
.../{ => Algorithms}/EstimatePeakErrors.cpp | 4 +-
.../src/{ => Algorithms}/EvaluateFunction.cpp | 4 +-
.../CurveFitting/src/{ => Algorithms}/Fit.cpp | 6 +-
.../src/{ => Algorithms}/Fit1D.cpp | 6 +-
.../{ => Algorithms}/FitPowderDiffPeaks.cpp | 6 +-
.../src/{ => Algorithms}/LeBailFit.cpp | 6 +-
.../src/{ => Algorithms}/LeBailFunction.cpp | 6 +-
.../{ => Algorithms}/NormaliseByPeakArea.cpp | 4 +-
.../src/{ => Algorithms}/PawleyFit.cpp | 4 +-
.../{ => Algorithms}/PlotPeakByLogValue.cpp | 4 +-
.../RefinePowderInstrumentParameters.cpp | 31 +++--
.../RefinePowderInstrumentParameters3.cpp | 4 +-
.../src/{ => Algorithms}/SplineBackground.cpp | 6 +-
.../{ => Algorithms}/SplineInterpolation.cpp | 4 +-
.../src/{ => Algorithms}/SplineSmoothing.cpp | 4 +-
.../src/Functions/ComptonPeakProfile.cpp | 5 +-
.../src/Functions/ComptonProfile.cpp | 11 +-
.../Functions/GramCharlierComptonProfile.cpp | 2 +-
.../src/Functions/IkedaCarpenterPV.cpp | 2 +-
.../src/Functions/VesuvioResolution.cpp | 10 +-
.../CurveFitting/src/LatticeDomainCreator.cpp | 3 +-
.../CalculateChiSquaredTest.h | 4 +-
.../CalculateGammaBackgroundTest.h | 6 +-
.../{ => Algorithms}/CalculateMSVesuvioTest.h | 6 +-
.../{ => Algorithms}/ConvertToYSpaceTest.h | 6 +-
.../{ => Algorithms}/ConvolveWorkspacesTest.h | 5 +-
.../{ => Algorithms}/EstimatePeakErrorsTest.h | 3 +-
.../{ => Algorithms}/EvaluateFunctionTest.h | 4 +-
.../{ => Algorithms}/FitPowderDiffPeaksTest.h | 6 +-
.../test/{ => Algorithms}/FitTest.h | 3 +-
.../test/{ => Algorithms}/FitTestHelpers.h | 0
.../test/{ => Algorithms}/LeBailFitTest.h | 4 +-
.../{ => Algorithms}/LeBailFunctionTest.h | 3 +-
.../NormaliseByPeakAreaTest.h | 6 +-
.../test/{ => Algorithms}/PawleyFitTest.h | 6 +-
.../{ => Algorithms}/PlotPeakByLogValueTest.h | 3 +-
.../RefinePowderInstrumentParameters3Test.h | 4 +-
.../RefinePowderInstrumentParametersTest.h | 8 +-
.../SeqDomainSpectrumCreatorTest.h | 3 +-
.../{ => Algorithms}/SplineBackgroundTest.h | 2 +-
.../SplineInterpolationTest.h | 4 +-
.../{ => Algorithms}/SplineSmoothingTest.h | 4 +-
.../CurveFitting/test/CompositeFunctionTest.h | 3 +-
Framework/CurveFitting/test/FitMWTest.h | 7 +-
.../test/FuncMinimizers/FABADAMinimizerTest.h | 7 +-
.../test/FunctionParameterDecoratorFitTest.h | 3 +-
.../CurveFitting/test/Functions/AbragamTest.h | 5 +-
.../test/Functions/Bk2BkExpConvPVTest.h | 5 +-
.../test/Functions/ChebyshevTest.h | 7 +-
.../test/Functions/ConvolutionTest.h | 7 +-
.../test/Functions/CubicSplineTest.h | 3 +-
.../test/Functions/DeltaFunctionTest.h | 3 +-
.../Functions/DiffRotDiscreteCircleTest.h | 11 +-
.../test/Functions/DiffSphereTest.h | 11 +-
.../CurveFitting/test/Functions/EndErfcTest.h | 5 +-
.../test/Functions/ExpDecayMuonTest.h | 5 +-
.../test/Functions/ExpDecayOscTest.h | 5 +-
.../test/Functions/ExpDecayTest.h | 5 +-
.../test/Functions/FullprofPolynomialTest.h | 5 +-
.../test/Functions/GausDecayTest.h | 5 +-
.../CurveFitting/test/Functions/GausOscTest.h | 5 +-
.../test/Functions/GaussianTest.h | 11 +-
.../test/Functions/IkedaCarpenterPVTest.h | 4 +-
.../test/Functions/LinearBackgroundTest.h | 4 +-
.../test/Functions/LogNormalTest.h | 5 +-
.../test/Functions/MuonFInteractionTest.h | 5 +-
.../test/Functions/PolynomialTest.h | 5 +-
.../test/Functions/ProductFunctionTest.h | 5 +-
.../test/Functions/QuadraticTest.h | 4 +-
.../test/Functions/ResolutionTest.h | 4 +-
.../test/Functions/StaticKuboToyabeTest.h | 4 +-
.../StaticKuboToyabeTimesExpDecayTest.h | 5 +-
.../StaticKuboToyabeTimesGausDecayTest.h | 5 +-
.../test/Functions/StretchExpMuonTest.h | 5 +-
.../test/Functions/StretchExpTest.h | 5 +-
.../test/MultiDomainFunctionTest.h | 5 +-
108 files changed, 416 insertions(+), 277 deletions(-)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/CalculateChiSquared.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/CalculateGammaBackground.h (95%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/CalculateMSVesuvio.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/ConvertToYSpace.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/ConvolveWorkspaces.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/EstimatePeakErrors.h (96%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/EvaluateFunction.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/Fit.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/Fit1D.h (99%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/FitPowderDiffPeaks.h (99%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/LeBailFit.h (99%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/LeBailFunction.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/NormaliseByPeakArea.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/PawleyFit.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/PlotPeakByLogValue.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/RefinePowderInstrumentParameters.h (94%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/RefinePowderInstrumentParameters3.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/SplineBackground.h (97%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/SplineInterpolation.h (98%)
rename Framework/CurveFitting/inc/MantidCurveFitting/{ => Algorithms}/SplineSmoothing.h (98%)
rename Framework/CurveFitting/src/{ => Algorithms}/CalculateChiSquared.cpp (99%)
rename Framework/CurveFitting/src/{ => Algorithms}/CalculateGammaBackground.cpp (96%)
rename Framework/CurveFitting/src/{ => Algorithms}/CalculateMSVesuvio.cpp (96%)
rename Framework/CurveFitting/src/{ => Algorithms}/ConvertToYSpace.cpp (98%)
rename Framework/CurveFitting/src/{ => Algorithms}/ConvolveWorkspaces.cpp (96%)
rename Framework/CurveFitting/src/{ => Algorithms}/EstimatePeakErrors.cpp (98%)
rename Framework/CurveFitting/src/{ => Algorithms}/EvaluateFunction.cpp (94%)
rename Framework/CurveFitting/src/{ => Algorithms}/Fit.cpp (99%)
rename Framework/CurveFitting/src/{ => Algorithms}/Fit1D.cpp (99%)
rename Framework/CurveFitting/src/{ => Algorithms}/FitPowderDiffPeaks.cpp (99%)
rename Framework/CurveFitting/src/{ => Algorithms}/LeBailFit.cpp (99%)
rename Framework/CurveFitting/src/{ => Algorithms}/LeBailFunction.cpp (99%)
rename Framework/CurveFitting/src/{ => Algorithms}/NormaliseByPeakArea.cpp (99%)
rename Framework/CurveFitting/src/{ => Algorithms}/PawleyFit.cpp (99%)
rename Framework/CurveFitting/src/{ => Algorithms}/PlotPeakByLogValue.cpp (99%)
rename Framework/CurveFitting/src/{ => Algorithms}/RefinePowderInstrumentParameters.cpp (97%)
rename Framework/CurveFitting/src/{ => Algorithms}/RefinePowderInstrumentParameters3.cpp (99%)
rename Framework/CurveFitting/src/{ => Algorithms}/SplineBackground.cpp (97%)
rename Framework/CurveFitting/src/{ => Algorithms}/SplineInterpolation.cpp (98%)
rename Framework/CurveFitting/src/{ => Algorithms}/SplineSmoothing.cpp (99%)
rename Framework/CurveFitting/test/{ => Algorithms}/CalculateChiSquaredTest.h (99%)
rename Framework/CurveFitting/test/{ => Algorithms}/CalculateGammaBackgroundTest.h (98%)
rename Framework/CurveFitting/test/{ => Algorithms}/CalculateMSVesuvioTest.h (98%)
rename Framework/CurveFitting/test/{ => Algorithms}/ConvertToYSpaceTest.h (96%)
rename Framework/CurveFitting/test/{ => Algorithms}/ConvolveWorkspacesTest.h (94%)
rename Framework/CurveFitting/test/{ => Algorithms}/EstimatePeakErrorsTest.h (98%)
rename Framework/CurveFitting/test/{ => Algorithms}/EvaluateFunctionTest.h (98%)
rename Framework/CurveFitting/test/{ => Algorithms}/FitPowderDiffPeaksTest.h (99%)
rename Framework/CurveFitting/test/{ => Algorithms}/FitTest.h (98%)
rename Framework/CurveFitting/test/{ => Algorithms}/FitTestHelpers.h (100%)
rename Framework/CurveFitting/test/{ => Algorithms}/LeBailFitTest.h (99%)
rename Framework/CurveFitting/test/{ => Algorithms}/LeBailFunctionTest.h (99%)
rename Framework/CurveFitting/test/{ => Algorithms}/NormaliseByPeakAreaTest.h (98%)
rename Framework/CurveFitting/test/{ => Algorithms}/PawleyFitTest.h (98%)
rename Framework/CurveFitting/test/{ => Algorithms}/PlotPeakByLogValueTest.h (99%)
rename Framework/CurveFitting/test/{ => Algorithms}/RefinePowderInstrumentParameters3Test.h (99%)
rename Framework/CurveFitting/test/{ => Algorithms}/RefinePowderInstrumentParametersTest.h (98%)
rename Framework/CurveFitting/test/{ => Algorithms}/SeqDomainSpectrumCreatorTest.h (99%)
rename Framework/CurveFitting/test/{ => Algorithms}/SplineBackgroundTest.h (96%)
rename Framework/CurveFitting/test/{ => Algorithms}/SplineInterpolationTest.h (97%)
rename Framework/CurveFitting/test/{ => Algorithms}/SplineSmoothingTest.h (96%)
diff --git a/Framework/API/inc/MantidAPI/IFunction1D.h b/Framework/API/inc/MantidAPI/IFunction1D.h
index 61f9ea1d1b7..be43c377419 100644
--- a/Framework/API/inc/MantidAPI/IFunction1D.h
+++ b/Framework/API/inc/MantidAPI/IFunction1D.h
@@ -12,9 +12,11 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms
+{
class Fit;
}
-
+}
namespace API {
//----------------------------------------------------------------------
@@ -88,7 +90,7 @@ protected:
static Kernel::Logger g_log;
/// Making a friend
- friend class CurveFitting::Fit;
+ friend class CurveFitting::Algorithms::Fit;
};
typedef boost::shared_ptr<IFunction1D> IFunction1D_sptr;
diff --git a/Framework/CurveFitting/CMakeLists.txt b/Framework/CurveFitting/CMakeLists.txt
index 65770666d1e..dfbff31c86c 100644
--- a/Framework/CurveFitting/CMakeLists.txt
+++ b/Framework/CurveFitting/CMakeLists.txt
@@ -3,23 +3,33 @@ set ( SRC_FILES
# src/SCDPanelErrors.cpp
# src/ChebyshevPolynomialBackground.cpp
#src/RefinePowderInstrumentParameters.cpp
+ src/Algorithms/CalculateChiSquared.cpp
+ src/Algorithms/CalculateGammaBackground.cpp
+ src/Algorithms/CalculateMSVesuvio.cpp
+ src/Algorithms/ConvertToYSpace.cpp
+ src/Algorithms/ConvolveWorkspaces.cpp
+ src/Algorithms/EstimatePeakErrors.cpp
+ src/Algorithms/EvaluateFunction.cpp
+ src/Algorithms/Fit.cpp
+ src/Algorithms/Fit1D.cpp
+ src/Algorithms/FitPowderDiffPeaks.cpp
+ src/Algorithms/LeBailFit.cpp
+ src/Algorithms/LeBailFunction.cpp
+ src/Algorithms/NormaliseByPeakArea.cpp
+ src/Algorithms/PawleyFit.cpp
+ src/Algorithms/PlotPeakByLogValue.cpp
+ src/Algorithms/RefinePowderInstrumentParameters.cpp
+ src/Algorithms/RefinePowderInstrumentParameters3.cpp
+ src/Algorithms/SplineBackground.cpp
+ src/Algorithms/SplineInterpolation.cpp
+ src/Algorithms/SplineSmoothing.cpp
src/AugmentedLagrangianOptimizer.cpp
- src/CalculateChiSquared.cpp
- src/CalculateGammaBackground.cpp
- src/CalculateMSVesuvio.cpp
src/Constraints/BoundaryConstraint.cpp
- src/ConvertToYSpace.cpp
- src/ConvolveWorkspaces.cpp
src/CostFunctions/CostFuncFitting.cpp
src/CostFunctions/CostFuncLeastSquares.cpp
src/CostFunctions/CostFuncRwp.cpp
src/CostFunctions/CostFuncUnweightedLeastSquares.cpp
- src/EstimatePeakErrors.cpp
- src/EvaluateFunction.cpp
- src/Fit.cpp
- src/Fit1D.cpp
src/FitMW.cpp
- src/FitPowderDiffPeaks.cpp
src/FuncMinimizers/BFGS_Minimizer.cpp
src/FuncMinimizers/DampingMinimizer.cpp
src/FuncMinimizers/DerivMinimizer.cpp
@@ -99,22 +109,13 @@ set ( SRC_FILES
src/IFittingAlgorithm.cpp
src/LatticeDomainCreator.cpp
src/LatticeFunction.cpp
- src/LeBailFit.cpp
- src/LeBailFunction.cpp
src/MSVesuvioHelpers.cpp
src/MultiDomainCreator.cpp
- src/NormaliseByPeakArea.cpp
src/ParDomain.cpp
src/ParameterEstimator.cpp
- src/PawleyFit.cpp
- src/PlotPeakByLogValue.cpp
- src/RefinePowderInstrumentParameters3.cpp
src/SeqDomain.cpp
src/SeqDomainSpectrumCreator.cpp
src/SpecialFunctionHelper.cpp
- src/SplineBackground.cpp
- src/SplineInterpolation.cpp
- src/SplineSmoothing.cpp
)
set ( SRC_UNITY_IGNORE_FILES src/Fit1D.cpp src/GSLFunctions.cpp )
@@ -124,24 +125,34 @@ set ( INC_FILES
# inc/MantidCurveFitting/SCDPanelErrors.h
# inc/MantidCurveFitting/ChebyshevPolynomialBackground.h
#inc/MantidCurveFitting/RefinePowderInstrumentParameters.h
+ inc/MantidCurveFitting/Algorithms/CalculateChiSquared.h
+ inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
+ inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h
+ inc/MantidCurveFitting/Algorithms/ConvertToYSpace.h
+ inc/MantidCurveFitting/Algorithms/ConvolveWorkspaces.h
+ inc/MantidCurveFitting/Algorithms/EstimatePeakErrors.h
+ inc/MantidCurveFitting/Algorithms/EvaluateFunction.h
+ inc/MantidCurveFitting/Algorithms/Fit.h
+ inc/MantidCurveFitting/Algorithms/Fit1D.h
+ inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
+ inc/MantidCurveFitting/Algorithms/LeBailFit.h
+ inc/MantidCurveFitting/Algorithms/LeBailFunction.h
+ inc/MantidCurveFitting/Algorithms/NormaliseByPeakArea.h
+ inc/MantidCurveFitting/Algorithms/PawleyFit.h
+ inc/MantidCurveFitting/Algorithms/PlotPeakByLogValue.h
+ inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters.h
+ inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters3.h
+ inc/MantidCurveFitting/Algorithms/SplineBackground.h
+ inc/MantidCurveFitting/Algorithms/SplineInterpolation.h
+ inc/MantidCurveFitting/Algorithms/SplineSmoothing.h
inc/MantidCurveFitting/AugmentedLagrangianOptimizer.h
- inc/MantidCurveFitting/CalculateChiSquared.h
- inc/MantidCurveFitting/CalculateGammaBackground.h
- inc/MantidCurveFitting/CalculateMSVesuvio.h
inc/MantidCurveFitting/Constraints/BoundaryConstraint.h
- inc/MantidCurveFitting/ConvertToYSpace.h
- inc/MantidCurveFitting/ConvolveWorkspaces.h
inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
inc/MantidCurveFitting/DllConfig.h
- inc/MantidCurveFitting/EstimatePeakErrors.h
- inc/MantidCurveFitting/EvaluateFunction.h
- inc/MantidCurveFitting/Fit.h
- inc/MantidCurveFitting/Fit1D.h
inc/MantidCurveFitting/FitMW.h
- inc/MantidCurveFitting/FitPowderDiffPeaks.h
inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
@@ -224,43 +235,45 @@ set ( INC_FILES
inc/MantidCurveFitting/Jacobian.h
inc/MantidCurveFitting/LatticeDomainCreator.h
inc/MantidCurveFitting/LatticeFunction.h
- inc/MantidCurveFitting/LeBailFit.h
- inc/MantidCurveFitting/LeBailFunction.h
inc/MantidCurveFitting/MSVesuvioHelpers.h
inc/MantidCurveFitting/MultiDomainCreator.h
- inc/MantidCurveFitting/NormaliseByPeakArea.h
inc/MantidCurveFitting/ParDomain.h
inc/MantidCurveFitting/ParameterEstimator.h
- inc/MantidCurveFitting/PawleyFit.h
- inc/MantidCurveFitting/PlotPeakByLogValue.h
- inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
inc/MantidCurveFitting/SeqDomain.h
inc/MantidCurveFitting/SeqDomainSpectrumCreator.h
inc/MantidCurveFitting/SpecialFunctionSupport.h
- inc/MantidCurveFitting/SplineBackground.h
- inc/MantidCurveFitting/SplineInterpolation.h
- inc/MantidCurveFitting/SplineSmoothing.h
)
set ( TEST_FILES
# ChebyshevPolynomialBackgroundTest.h
# RefinePowderInstrumentParametersTest.h
#SCDPanelErrorsTest.h
+ Algorithms/CalculateChiSquaredTest.h
+ Algorithms/CalculateGammaBackgroundTest.h
+ Algorithms/CalculateMSVesuvioTest.h
+ Algorithms/ConvertToYSpaceTest.h
+ Algorithms/ConvolveWorkspacesTest.h
+ Algorithms/EstimatePeakErrorsTest.h
+ Algorithms/EvaluateFunctionTest.h
+ Algorithms/FitPowderDiffPeaksTest.h
+ Algorithms/FitTest.h
+ Algorithms/LeBailFitTest.h
+ Algorithms/LeBailFunctionTest.h
+ Algorithms/NormaliseByPeakAreaTest.h
+ Algorithms/PawleyFitTest.h
+ Algorithms/PlotPeakByLogValueTest.h
+ Algorithms/RefinePowderInstrumentParameters3Test.h
+ Algorithms/RefinePowderInstrumentParametersTest.h
+ Algorithms/SeqDomainSpectrumCreatorTest.h
+ Algorithms/SplineBackgroundTest.h
+ Algorithms/SplineInterpolationTest.h
+ Algorithms/SplineSmoothingTest.h
AugmentedLagrangianOptimizerTest.h
- Constraints/BoundaryConstraintTest.h
- CalculateChiSquaredTest.h
- CalculateGammaBackgroundTest.h
- CalculateMSVesuvioTest.h
CompositeFunctionTest.h
- ConvertToYSpaceTest.h
- ConvolveWorkspacesTest.h
+ Constraints/BoundaryConstraintTest.h
CostFunctions/CostFuncUnweightedLeastSquaresTest.h
CostFunctions/LeastSquaresTest.h
- EstimatePeakErrorsTest.h
- EvaluateFunctionTest.h
FitMWTest.h
- FitPowderDiffPeaksTest.h
- FitTest.h
FuncMinimizers/BFGSTest.h
FuncMinimizers/DampingMinimizerTest.h
FuncMinimizers/FABADAMinimizerTest.h
@@ -339,20 +352,10 @@ set ( TEST_FILES
IPeakFunctionIntensityTest.h
LatticeDomainCreatorTest.h
LatticeFunctionTest.h
- LeBailFitTest.h
- LeBailFunctionTest.h
MultiDomainCreatorTest.h
MultiDomainFunctionTest.h
- NormaliseByPeakAreaTest.h
ParameterEstimatorTest.h
- PawleyFitTest.h
- PlotPeakByLogValueTest.h
- RefinePowderInstrumentParameters3Test.h
- SeqDomainSpectrumCreatorTest.h
SpecialFunctionSupportTest.h
- SplineBackgroundTest.h
- SplineInterpolationTest.h
- SplineSmoothingTest.h
)
if (COVERALLS)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CalculateChiSquared.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateChiSquared.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/CalculateChiSquared.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateChiSquared.h
index 34d50d67839..867ec832b32 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CalculateChiSquared.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateChiSquared.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/**
@@ -51,6 +52,7 @@ private:
std::vector<size_t> m_fixedParameters;
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CalculateGammaBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
similarity index 95%
rename from Framework/CurveFitting/inc/MantidCurveFitting/CalculateGammaBackground.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
index a7c97b9d8c0..74a42ea1fe6 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CalculateGammaBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
@@ -7,13 +7,15 @@
namespace Mantid {
namespace CurveFitting {
+namespace Functions {
+struct ResolutionParams;
+}
+namespace Algorithms {
//---------------------------------------------------------------------------
// Forward declarations
//---------------------------------------------------------------------------
struct DetectorParams;
-namespace Functions {
-struct ResolutionParams;
-}
+
/**
@@ -82,12 +84,12 @@ private:
const FoilInfo &foilInfo,
const Kernel::V3D &detPos,
const DetectorParams &detPar,
- const Functions::ResolutionParams &detRes);
+ const CurveFitting::Functions::ResolutionParams &detRes);
/// Compute a TOF spectrum for the given inputs & spectrum
void calculateTofSpectrum(std::vector<double> &result,
std::vector<double> &tmpWork, const size_t wsIndex,
const DetectorParams &detpar,
- const Functions::ResolutionParams &respar);
+ const CurveFitting::Functions::ResolutionParams &respar);
/// Check and store appropriate input data
void retrieveInputs();
@@ -135,6 +137,7 @@ private:
API::Progress *m_progress;
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h
index 49691f5f00d..70bc7eced89 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h
@@ -9,15 +9,18 @@
namespace Mantid {
namespace CurveFitting {
-struct DetectorParams;
-namespace Functions{
-struct ResolutionParams;
-}
namespace MSVesuvioHelper {
class RandomNumberGenerator;
struct Simulation;
struct SimulationWithErrors;
}
+namespace Functions{
+struct ResolutionParams;
+}
+namespace Algorithms {
+struct DetectorParams;
+
+
/**
Calculates the multiple scattering & total scattering contributions
@@ -115,7 +118,7 @@ private:
const double e1res) const;
// Member Variables
- MSVesuvioHelper::RandomNumberGenerator *m_randgen; // random number generator
+ CurveFitting::MSVesuvioHelper::RandomNumberGenerator *m_randgen; // random number generator
size_t m_acrossIdx, m_upIdx, m_beamIdx; // indices of each direction
Kernel::V3D m_beamDir; // Directional vector for beam
@@ -135,6 +138,7 @@ private:
API::MatrixWorkspace_sptr m_inputWS;
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ConvertToYSpace.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvertToYSpace.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ConvertToYSpace.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvertToYSpace.h
index c548e60ad36..6ed4648408a 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/ConvertToYSpace.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvertToYSpace.h
@@ -5,6 +5,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/// Simple data structure to store nominal detector values
/// It avoids some functions taking a huge number of arguments
@@ -101,6 +102,7 @@ private:
API::MatrixWorkspace_sptr m_qOutputWS;
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ConvolveWorkspaces.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvolveWorkspaces.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/ConvolveWorkspaces.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvolveWorkspaces.h
index 6ddf94ef02f..19fa08127b0 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/ConvolveWorkspaces.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvolveWorkspaces.h
@@ -15,6 +15,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/** Convolution of two workspaces
Copyright © 2012 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
@@ -65,6 +66,7 @@ private:
API::Progress *prog;
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/EstimatePeakErrors.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EstimatePeakErrors.h
similarity index 96%
rename from Framework/CurveFitting/inc/MantidCurveFitting/EstimatePeakErrors.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EstimatePeakErrors.h
index fa886873c50..c16a6b03795 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/EstimatePeakErrors.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EstimatePeakErrors.h
@@ -5,6 +5,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
//---------------------------------------------------------------------------
/**
@@ -44,6 +45,7 @@ private:
void exec();
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/EvaluateFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EvaluateFunction.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/EvaluateFunction.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EvaluateFunction.h
index 48bfd7abe57..55be4b63901 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/EvaluateFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EvaluateFunction.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/**
@@ -44,6 +45,7 @@ private:
void execConcrete();
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Fit.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Fit.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit.h
index baaf264d06d..20c76810d8a 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Fit.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit.h
@@ -20,6 +20,7 @@ class IFuncMinimizer;
}
namespace CurveFitting {
+namespace Algorithms {
/**
A generic fitting algorithm. It fits a function to some data in a workspace.
@@ -114,6 +115,7 @@ protected:
void copyMinimizerOutput(const API::IFuncMinimizer &minimizer);
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Fit1D.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit1D.h
similarity index 99%
rename from Framework/CurveFitting/inc/MantidCurveFitting/Fit1D.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit1D.h
index 132ce49ede9..9cfc546a20c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Fit1D.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit1D.h
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/**
Deprecation notice: instead of using this algorithm please use the Fit algorithm
instead.
@@ -140,6 +141,7 @@ protected:
friend struct FitData;
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FitPowderDiffPeaks.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
similarity index 99%
rename from Framework/CurveFitting/inc/MantidCurveFitting/FitPowderDiffPeaks.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
index 99b67e7fa3f..452946ce661 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FitPowderDiffPeaks.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
@@ -15,6 +15,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/** FitPowderDiffPeaks : Fit peaks in powder diffraction pattern.
@@ -434,6 +435,7 @@ size_t findMaxValue(API::MatrixWorkspace_sptr dataws, size_t wsindex,
/// Get function parameter name, value and etc information in string
std::string getFunctionInfo(API::IFunction_sptr function);
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFit.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h
similarity index 99%
rename from Framework/CurveFitting/inc/MantidCurveFitting/LeBailFit.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h
index ac2377fab9b..852642ba42c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFit.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h
@@ -3,7 +3,7 @@
#include "MantidKernel/System.h"
#include "MantidAPI/Algorithm.h"
-#include "MantidCurveFitting/LeBailFunction.h"
+#include "MantidCurveFitting/Algorithms/LeBailFunction.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -16,6 +16,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/** LeBailFit : Algorithm to do Le Bail Fit.
The workflow and architecture of this algorithm is different from LeBailFit,
@@ -474,6 +475,7 @@ void convertTableWorkspaceToMaps(
std::vector<std::map<std::string, std::string>> strmaps,
std::vector<std::map<std::string, double>> dblmaps);
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFunction.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/LeBailFunction.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFunction.h
index 5133b660fb0..081e9f5e844 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/LeBailFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFunction.h
@@ -9,10 +9,13 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/** LeBailFunction : LeBailFunction is to calculate peak intensities in a
composite
* function including neutron peak and background functions.
+ * Note: This is not a Mantid Fit Function, just a helper
+ * class to the algorithm
@date 2013-04-26 : original LeBailFunction is not used by any other functions.
And thus
@@ -212,6 +215,7 @@ private:
typedef boost::shared_ptr<LeBailFunction> LeBailFunction_sptr;
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/NormaliseByPeakArea.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/NormaliseByPeakArea.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/NormaliseByPeakArea.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/NormaliseByPeakArea.h
index 56ae1b98d34..4cfac079922 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/NormaliseByPeakArea.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/NormaliseByPeakArea.h
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/**
@@ -87,6 +88,7 @@ private:
API::Progress *m_progress;
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/PawleyFit.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/PawleyFit.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h
index e7a45729d87..6b83f391c2a 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/PawleyFit.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/** @class V3DFromHKLColumnExtractor
@@ -95,6 +96,7 @@ protected:
Kernel::Unit_sptr m_dUnit;
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/PlotPeakByLogValue.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PlotPeakByLogValue.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/PlotPeakByLogValue.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PlotPeakByLogValue.h
index 891f455c6e7..0c0acc74d34 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/PlotPeakByLogValue.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PlotPeakByLogValue.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/**
Takes a workspace group and fits the same spectrum in all workspaces with
@@ -119,6 +120,7 @@ private:
std::map<std::string, std::vector<std::string>> m_minimizerWorkspaces;
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters.h
similarity index 94%
rename from Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters.h
index debe7054a8b..ae51ee6bc54 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters.h
@@ -8,15 +8,16 @@
#include "MantidAPI/ITableWorkspace_fwd.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidDataObjects/Workspace2D.h"
-#include "MantidCurveFitting/BackgroundFunction.h"
-#include "MantidCurveFitting/Polynomial.h"
-#include "MantidCurveFitting/BackToBackExponential.h"
-#include "MantidCurveFitting/ThermalNeutronDtoTOFFunction.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/Polynomial.h"
+#include "MantidCurveFitting/Functions/BackToBackExponential.h"
+#include "MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h"
#include "MantidAPI/FunctionDomain.h"
#include "MantidAPI/FunctionValues.h"
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/** RefinePowderInstrumentParameters : Algorithm to refine instrument geometry
parameters only.
@@ -154,7 +155,7 @@ private:
DataObjects::Workspace2D_sptr dataWS;
/// Map for all peaks to fit individually
- std::map<std::vector<int>, CurveFitting::BackToBackExponential_sptr> mPeaks;
+ std::map<std::vector<int>, Functions::BackToBackExponential_sptr> mPeaks;
/// Map for all peaks' error (fitted vs. experimental): [HKL]: Chi^2
std::map<std::vector<int>, double> mPeakErrors;
@@ -187,7 +188,7 @@ private:
size_t mMaxNumberStoredParameters;
/// Modelling function
- CurveFitting::ThermalNeutronDtoTOFFunction_sptr mFunction;
+ Functions::ThermalNeutronDtoTOFFunction_sptr mFunction;
};
/** Formular for linear iterpolation: X = [(xf-x0)*Y - (xf*y0-x0*yf)]/(yf-y0)
@@ -206,6 +207,7 @@ inline double linearInterpolateY(double x0, double xf, double y0, double yf,
return y;
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters3.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters3.h
index 46cbed993a5..56875c6c885 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters3.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters3.h
@@ -8,12 +8,13 @@
#include "MantidDataObjects/Workspace2D.h"
#include "MantidDataObjects/TableWorkspace.h"
-#include "MantidCurveFitting/LeBailFit.h"
+#include "MantidCurveFitting/Algorithms/LeBailFit.h"
#include "MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/** RefinePowderInstrumentParameters3 :
@@ -226,6 +227,7 @@ double calculateFunctionChiSquare(const std::vector<double> &modelY,
const std::vector<double> &dataY,
const std::vector<double> &dataE);
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SplineBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineBackground.h
similarity index 97%
rename from Framework/CurveFitting/inc/MantidCurveFitting/SplineBackground.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineBackground.h
index 53d877e613b..9aa91c96228 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SplineBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineBackground.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/** SplineBackground
@@ -61,6 +62,7 @@ private:
void exec();
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SplineInterpolation.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineInterpolation.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/SplineInterpolation.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineInterpolation.h
index f74ba662a3c..fbb797729d6 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SplineInterpolation.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineInterpolation.h
@@ -7,6 +7,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/** Takes two workspaces as input. One contain a set of points which define a
spline,
@@ -91,6 +92,7 @@ private:
int order) const;
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SplineSmoothing.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineSmoothing.h
similarity index 98%
rename from Framework/CurveFitting/inc/MantidCurveFitting/SplineSmoothing.h
rename to Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineSmoothing.h
index 86692dee31c..ee17aa3dca0 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SplineSmoothing.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineSmoothing.h
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/** Takes a 2D workspace and produces an output workspace containing a smoothed
version of the data by selecting
@@ -117,6 +118,7 @@ private:
API::MatrixWorkspace_sptr m_outputWorkspace;
};
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
index 5190737dc2d..3fcc850f8a0 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
@@ -9,10 +9,12 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
//---------------------------------------------------------------------------
// Forward declarations
//---------------------------------------------------------------------------
struct DetectorParams;
+}
namespace Functions {
/**
@@ -60,13 +62,13 @@ public:
/// Pre-calculate the Y-space values with specified resolution parameters
void cacheYSpaceValues(const std::vector<double> &tseconds,
- const bool isHistogram, const CurveFitting::DetectorParams &detpar,
+ const bool isHistogram, const Algorithms::DetectorParams &detpar,
const ResolutionParams &respar);
/// Pre-calculate the Y-space values
virtual void cacheYSpaceValues(const std::vector<double> &tseconds,
const bool isHistogram,
- const CurveFitting::DetectorParams &detpar);
+ const Algorithms::DetectorParams &detpar);
/// Turn off logger
void disableLogging() { m_log.setEnabled(false); }
///@}
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
index 5a28323ba55..8425949c143 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
@@ -76,7 +76,7 @@ private:
size_t wi, double startX, double endX);
/// Pre-calculate the Y-space values
void cacheYSpaceValues(const std::vector<double> &tseconds,
- const bool isHistogram, const DetectorParams &detpar);
+ const bool isHistogram, const Algorithms::DetectorParams &detpar);
/// The active hermite coefficents
std::vector<short> m_hermite;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h
index 0977728612c..6211f2d053b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h
@@ -4,7 +4,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/Fit1D.h"
+#include "MantidCurveFitting/Algorithms/Fit1D.h"
namespace Mantid {
namespace CurveFitting {
@@ -51,7 +51,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DLLExport Lorentzian1D : public Fit1D {
+class DLLExport Lorentzian1D : public Algorithms::Fit1D {
public:
/// Destructor
virtual ~Lorentzian1D(){};
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h
index e8d09262245..fefde7f6549 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h
@@ -4,7 +4,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/Fit1D.h"
+#include "MantidCurveFitting/Algorithms/Fit1D.h"
#include "MantidGeometry/muParser_Silent.h"
#include <boost/shared_array.hpp>
@@ -71,7 +71,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class UserFunction1D : public Fit1D {
+class UserFunction1D : public Algorithms::Fit1D {
public:
/// Constructor
UserFunction1D()
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
index 0dee35e1066..4d0594a1818 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
@@ -8,10 +8,12 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
//---------------------------------------------------------------------------
// Forward declarations
//---------------------------------------------------------------------------
struct DetectorParams;
+}
namespace Functions {
@@ -83,7 +85,7 @@ public:
setMatrixWorkspace(boost::shared_ptr<const API::MatrixWorkspace> workspace,
size_t wi, double startX, double endX);
/// Pre-calculate the resolution components values
- void cacheResolutionComponents(const DetectorParams &detpar,
+ void cacheResolutionComponents(const Algorithms::DetectorParams &detpar,
const ResolutionParams &respar);
/// Turn off logger
void disableLogging() { m_log.setEnabled(false); }
diff --git a/Framework/CurveFitting/src/CalculateChiSquared.cpp b/Framework/CurveFitting/src/Algorithms/CalculateChiSquared.cpp
similarity index 99%
rename from Framework/CurveFitting/src/CalculateChiSquared.cpp
rename to Framework/CurveFitting/src/Algorithms/CalculateChiSquared.cpp
index 5c6016c6ba0..17104a9e4b2 100644
--- a/Framework/CurveFitting/src/CalculateChiSquared.cpp
+++ b/Framework/CurveFitting/src/Algorithms/CalculateChiSquared.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/CalculateChiSquared.h"
+#include "MantidCurveFitting/Algorithms/CalculateChiSquared.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/Column.h"
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
using namespace Kernel;
using namespace API;
@@ -652,5 +653,6 @@ void CalculateChiSquared::refixParameters() {
}
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/CalculateGammaBackground.cpp b/Framework/CurveFitting/src/Algorithms/CalculateGammaBackground.cpp
similarity index 96%
rename from Framework/CurveFitting/src/CalculateGammaBackground.cpp
rename to Framework/CurveFitting/src/Algorithms/CalculateGammaBackground.cpp
index 35467b55fe1..c86a0fb231e 100644
--- a/Framework/CurveFitting/src/CalculateGammaBackground.cpp
+++ b/Framework/CurveFitting/src/Algorithms/CalculateGammaBackground.cpp
@@ -1,6 +1,6 @@
-#include "MantidCurveFitting/CalculateGammaBackground.h"
+#include "MantidCurveFitting/Algorithms/CalculateGammaBackground.h"
+#include "MantidCurveFitting/Algorithms/ConvertToYSpace.h"
#include "MantidCurveFitting/Functions/ComptonProfile.h"
-#include "MantidCurveFitting/ConvertToYSpace.h"
#include "MantidCurveFitting/Functions/VesuvioResolution.h"
#include "MantidAPI/CompositeFunction.h"
@@ -16,9 +16,11 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
using namespace API;
using namespace Kernel;
-using namespace Functions;
+using namespace CurveFitting;
+using namespace CurveFitting::Functions;
using namespace BOOST_FUNCTION_STD_NS;
using namespace std;
@@ -229,8 +231,8 @@ void CalculateGammaBackground::calculateSpectrumFromDetector(
// -- Setup detector & resolution parameters --
DetectorParams detPar =
ConvertToYSpace::getDetectorParameters(m_inputWS, inputIndex);
- Functions::ResolutionParams detRes =
- Functions::VesuvioResolution::getResolutionParameters(m_inputWS, inputIndex);
+ CurveFitting::Functions::ResolutionParams detRes =
+ CurveFitting::Functions::VesuvioResolution::getResolutionParameters(m_inputWS, inputIndex);
// Compute a time of flight spectrum convolved with a Voigt resolution
// function for each mass
@@ -256,8 +258,8 @@ void CalculateGammaBackground::calculateBackgroundFromFoils(
// -- Setup detector & resolution parameters --
DetectorParams detPar =
ConvertToYSpace::getDetectorParameters(m_inputWS, inputIndex);
- ResolutionParams detRes =
- VesuvioResolution::getResolutionParameters(m_inputWS, inputIndex);
+ CurveFitting::Functions::ResolutionParams detRes =
+ CurveFitting::Functions::VesuvioResolution::getResolutionParameters(m_inputWS, inputIndex);
const size_t nxvalues = m_backgroundWS->blocksize();
std::vector<double> foilSpectrum(nxvalues);
@@ -322,7 +324,7 @@ void CalculateGammaBackground::calculateBackgroundSingleFoil(
// Structs to hold geometry & resolution information
DetectorParams foilPar = detPar; // copy
foilPar.t0 = 0.0;
- ResolutionParams foilRes = detRes; // copy
+ CurveFitting::Functions::ResolutionParams foilRes = detRes; // copy
foilRes.dEnGauss = foilInfo.gaussWidth;
foilRes.dEnLorentz = foilInfo.lorentzWidth;
@@ -390,7 +392,7 @@ void CalculateGammaBackground::calculateTofSpectrum(
FunctionFactory::Instance().createInitialized(m_profileFunction));
for (size_t i = 0; i < m_npeaks; ++i) {
- auto profile = boost::dynamic_pointer_cast<ComptonProfile>(
+ auto profile = boost::dynamic_pointer_cast<CurveFitting::Functions::ComptonProfile>(
profileFunction->getFunction(i));
profile->disableLogging();
profile->setUpForFit();
@@ -424,7 +426,7 @@ void CalculateGammaBackground::retrieveInputs() {
boost::dynamic_pointer_cast<CompositeFunction>(profileFunction)) {
m_npeaks = composite->nFunctions();
for (size_t i = 0; i < m_npeaks; ++i) {
- auto single = boost::dynamic_pointer_cast<ComptonProfile>(
+ auto single = boost::dynamic_pointer_cast<CurveFitting::Functions::ComptonProfile>(
composite->getFunction(i));
if (!single) {
throw std::invalid_argument("Invalid function. Composite must contain "
@@ -597,5 +599,6 @@ std::pair<double, double> CalculateGammaBackground::calculateThetaRange(
return std::make_pair(theta - dtheta, theta + dtheta);
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/CalculateMSVesuvio.cpp b/Framework/CurveFitting/src/Algorithms/CalculateMSVesuvio.cpp
similarity index 96%
rename from Framework/CurveFitting/src/CalculateMSVesuvio.cpp
rename to Framework/CurveFitting/src/Algorithms/CalculateMSVesuvio.cpp
index ff8d17b1f56..48a2acdd375 100644
--- a/Framework/CurveFitting/src/CalculateMSVesuvio.cpp
+++ b/Framework/CurveFitting/src/Algorithms/CalculateMSVesuvio.cpp
@@ -1,9 +1,9 @@
//-----------------------------------------------------------------------------
// Includes
//-----------------------------------------------------------------------------
-#include "MantidCurveFitting/CalculateMSVesuvio.h"
+#include "MantidCurveFitting/Algorithms/CalculateMSVesuvio.h"
// Use helpers for storing detector/resolution parameters
-#include "MantidCurveFitting/ConvertToYSpace.h"
+#include "MantidCurveFitting/Algorithms/ConvertToYSpace.h"
#include "MantidCurveFitting/MSVesuvioHelpers.h"
#include "MantidCurveFitting/Functions/VesuvioResolution.h"
@@ -25,9 +25,11 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
using namespace API;
using namespace Kernel;
-using namespace Functions;
+using namespace CurveFitting;
+using namespace CurveFitting::Functions;
using Geometry::Link;
using Geometry::ParameterMap;
using Geometry::Track;
@@ -138,7 +140,7 @@ void CalculateMSVesuvio::exec() {
MatrixWorkspace_sptr multsc = WorkspaceFactory::Instance().create(m_inputWS);
// Initialize random number generator
- m_randgen = new MSVesuvioHelper::RandomNumberGenerator(getProperty("Seed"));
+ m_randgen = new CurveFitting::MSVesuvioHelper::RandomNumberGenerator(getProperty("Seed"));
// Setup progress
const size_t nhist = m_inputWS->getNumberHistograms();
@@ -324,7 +326,7 @@ void CalculateMSVesuvio::calculateMS(const size_t wsIndex,
Functions::VesuvioResolution::getResolutionParameters(m_inputWS, wsIndex);
// Final counts averaged over all simulations
- MSVesuvioHelper::SimulationAggregator accumulator(m_nruns);
+ CurveFitting::MSVesuvioHelper::SimulationAggregator accumulator(m_nruns);
for (size_t i = 0; i < m_nruns; ++i) {
m_progress->report("MS calculation: idx=" +
boost::lexical_cast<std::string>(wsIndex) + ", run=" +
@@ -339,7 +341,7 @@ void CalculateMSVesuvio::calculateMS(const size_t wsIndex,
}
// Average over all runs and assign to output workspaces
- MSVesuvioHelper::SimulationWithErrors avgCounts = accumulator.average();
+ CurveFitting::MSVesuvioHelper::SimulationWithErrors avgCounts = accumulator.average();
avgCounts.normalise();
assignToOutput(avgCounts, totalsc, multsc);
}
@@ -355,7 +357,7 @@ void CalculateMSVesuvio::calculateMS(const size_t wsIndex,
*/
void CalculateMSVesuvio::simulate(
const DetectorParams &detpar, const ResolutionParams &respar,
- MSVesuvioHelper::Simulation &simulCounts) const {
+ CurveFitting::MSVesuvioHelper::Simulation &simulCounts) const {
for (size_t i = 0; i < m_nevents; ++i) {
calculateCounts(detpar, respar, simulCounts);
}
@@ -370,7 +372,7 @@ void CalculateMSVesuvio::simulate(
* scattering contribution
*/
void CalculateMSVesuvio::assignToOutput(
- const MSVesuvioHelper::SimulationWithErrors &avgCounts,
+ const CurveFitting::MSVesuvioHelper::SimulationWithErrors &avgCounts,
API::ISpectrum &totalsc, API::ISpectrum &multsc) const {
// Sum up all multiple scatter events
auto &msscatY = multsc.dataY();
@@ -405,7 +407,7 @@ void CalculateMSVesuvio::assignToOutput(
*/
double CalculateMSVesuvio::calculateCounts(
const DetectorParams &detpar, const ResolutionParams &respar,
- MSVesuvioHelper::Simulation &simulation) const {
+ CurveFitting::MSVesuvioHelper::Simulation &simulation) const {
double weightSum(0.0);
// moderator coord in lab frame
@@ -786,13 +788,14 @@ double CalculateMSVesuvio::generateE1(const double angle, const double e1nom,
const double randv = m_randgen->flat();
if (e1nom < 5000.0) {
if (angle > 90.0)
- return MSVesuvioHelper::finalEnergyAuDD(randv);
+ return CurveFitting::MSVesuvioHelper::finalEnergyAuDD(randv);
else
- return MSVesuvioHelper::finalEnergyAuYap(randv);
+ return CurveFitting::MSVesuvioHelper::finalEnergyAuYap(randv);
} else {
- return MSVesuvioHelper::finalEnergyUranium(randv);
+ return CurveFitting::MSVesuvioHelper::finalEnergyUranium(randv);
}
}
} // namespace Algorithms
+} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/ConvertToYSpace.cpp b/Framework/CurveFitting/src/Algorithms/ConvertToYSpace.cpp
similarity index 98%
rename from Framework/CurveFitting/src/ConvertToYSpace.cpp
rename to Framework/CurveFitting/src/Algorithms/ConvertToYSpace.cpp
index e7c099c6f5d..1124ff0504e 100644
--- a/Framework/CurveFitting/src/ConvertToYSpace.cpp
+++ b/Framework/CurveFitting/src/Algorithms/ConvertToYSpace.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/ConvertToYSpace.h"
+#include "MantidCurveFitting/Algorithms/ConvertToYSpace.h"
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidGeometry/Instrument/DetectorGroup.h"
@@ -8,6 +8,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
// Register the algorithm into the AlgorithmFactory
DECLARE_ALGORITHM(ConvertToYSpace)
@@ -299,5 +300,6 @@ void ConvertToYSpace::cacheInstrumentGeometry() {
m_samplePos = sample->getPos();
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/ConvolveWorkspaces.cpp b/Framework/CurveFitting/src/Algorithms/ConvolveWorkspaces.cpp
similarity index 96%
rename from Framework/CurveFitting/src/ConvolveWorkspaces.cpp
rename to Framework/CurveFitting/src/Algorithms/ConvolveWorkspaces.cpp
index 3234f14e9ee..860d527201a 100644
--- a/Framework/CurveFitting/src/ConvolveWorkspaces.cpp
+++ b/Framework/CurveFitting/src/Algorithms/ConvolveWorkspaces.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/ConvolveWorkspaces.h"
+#include "MantidCurveFitting/Algorithms/ConvolveWorkspaces.h"
#include "MantidCurveFitting/Functions/Convolution.h"
#include "MantidCurveFitting/Functions/TabulatedFunction.h"
#include <sstream>
@@ -11,6 +11,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
// Register the algorithm into the AlgorithmFactory
DECLARE_ALGORITHM(ConvolveWorkspaces)
@@ -97,4 +98,5 @@ void ConvolveWorkspaces::exec() {
}
} // namespace Algorithms
+} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/EstimatePeakErrors.cpp b/Framework/CurveFitting/src/Algorithms/EstimatePeakErrors.cpp
similarity index 98%
rename from Framework/CurveFitting/src/EstimatePeakErrors.cpp
rename to Framework/CurveFitting/src/Algorithms/EstimatePeakErrors.cpp
index aa69cb5b550..3990ef3fbab 100644
--- a/Framework/CurveFitting/src/EstimatePeakErrors.cpp
+++ b/Framework/CurveFitting/src/Algorithms/EstimatePeakErrors.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/EstimatePeakErrors.h"
+#include "MantidCurveFitting/Algorithms/EstimatePeakErrors.h"
#include "MantidCurveFitting/GSLMatrix.h"
#include "MantidCurveFitting/Functions/PeakParameterFunction.h"
@@ -12,6 +12,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
using namespace API;
using namespace Kernel;
using namespace std;
@@ -164,5 +165,6 @@ void EstimatePeakErrors::exec() {
setProperty("OutputWorkspace", results);
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/EvaluateFunction.cpp b/Framework/CurveFitting/src/Algorithms/EvaluateFunction.cpp
similarity index 94%
rename from Framework/CurveFitting/src/EvaluateFunction.cpp
rename to Framework/CurveFitting/src/Algorithms/EvaluateFunction.cpp
index d5c5e9e7099..9e072bd8887 100644
--- a/Framework/CurveFitting/src/EvaluateFunction.cpp
+++ b/Framework/CurveFitting/src/Algorithms/EvaluateFunction.cpp
@@ -1,7 +1,8 @@
-#include "MantidCurveFitting/EvaluateFunction.h"
+#include "MantidCurveFitting/Algorithms/EvaluateFunction.h"
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
using namespace Mantid::Kernel;
using namespace Mantid::API;
@@ -55,5 +56,6 @@ void EvaluateFunction::execConcrete() {
setProperty("OutputWorkspace", outputWS);
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Fit.cpp b/Framework/CurveFitting/src/Algorithms/Fit.cpp
similarity index 99%
rename from Framework/CurveFitting/src/Fit.cpp
rename to Framework/CurveFitting/src/Algorithms/Fit.cpp
index 95bae234e21..b10b66a8a91 100644
--- a/Framework/CurveFitting/src/Fit.cpp
+++ b/Framework/CurveFitting/src/Algorithms/Fit.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidCurveFitting/CostFunctions/CostFuncFitting.h"
#include "MantidAPI/CostFunctionFactory.h"
@@ -18,6 +18,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
// Register the class into the algorithm factory
DECLARE_ALGORITHM(Fit)
@@ -362,5 +363,6 @@ void Fit::execConcrete() {
progress(1.0);
}
-} // namespace Algorithm
+} // namespace Algorithms
+} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Fit1D.cpp b/Framework/CurveFitting/src/Algorithms/Fit1D.cpp
similarity index 99%
rename from Framework/CurveFitting/src/Fit1D.cpp
rename to Framework/CurveFitting/src/Algorithms/Fit1D.cpp
index f4c054ddc09..3710f49389f 100644
--- a/Framework/CurveFitting/src/Fit1D.cpp
+++ b/Framework/CurveFitting/src/Algorithms/Fit1D.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/Fit1D.h"
+#include "MantidCurveFitting/Algorithms/Fit1D.h"
#include <sstream>
#include <numeric>
#include <cmath>
@@ -21,6 +21,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
using namespace Kernel;
using API::WorkspaceProperty;
@@ -777,5 +778,6 @@ FitData::FitData(Fit1D *fit, const std::string &fixed)
J.m_map[i] = -1;
}
-} // namespace Algorithm
+} // namespace Algorithms
+} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp b/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp
similarity index 99%
rename from Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
rename to Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp
index 4506e6acd5b..72eb9e1db57 100644
--- a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
+++ b/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/FitPowderDiffPeaks.h"
+#include "MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h"
#include "MantidKernel/ListValidator.h"
#include "MantidKernel/ArrayProperty.h"
@@ -16,7 +16,7 @@
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/TextAxis.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidCurveFitting/Functions/BackgroundFunction.h"
#include "MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h"
@@ -58,6 +58,7 @@ using namespace std;
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
DECLARE_ALGORITHM(FitPowderDiffPeaks)
@@ -3450,5 +3451,6 @@ size_t findMaxValue(MatrixWorkspace_sptr dataws, size_t wsindex,
return imax;
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/LeBailFit.cpp b/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
similarity index 99%
rename from Framework/CurveFitting/src/LeBailFit.cpp
rename to Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
index 22e7a9340d1..199a2233541 100644
--- a/Framework/CurveFitting/src/LeBailFit.cpp
+++ b/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
@@ -4,12 +4,12 @@
* COMMIT NOTES */
-#include "MantidCurveFitting/LeBailFit.h"
+#include "MantidCurveFitting/Algorithms/LeBailFit.h"
#include "MantidKernel/ListValidator.h"
#include "MantidAPI/TableRow.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/FuncMinimizerFactory.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/ArrayProperty.h"
#include "MantidKernel/VisibleWhenProperty.h"
#include "MantidCurveFitting/Functions/BackgroundFunction.h"
@@ -44,6 +44,7 @@ using namespace std;
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
const Rfactor badR(DBL_MAX, DBL_MAX);
@@ -2692,5 +2693,6 @@ void writeRfactorsToFile(vector<double> vecX, vector<Rfactor> vecR,
return;
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/LeBailFunction.cpp b/Framework/CurveFitting/src/Algorithms/LeBailFunction.cpp
similarity index 99%
rename from Framework/CurveFitting/src/LeBailFunction.cpp
rename to Framework/CurveFitting/src/Algorithms/LeBailFunction.cpp
index 6835b74fea4..0c01dcc9994 100644
--- a/Framework/CurveFitting/src/LeBailFunction.cpp
+++ b/Framework/CurveFitting/src/Algorithms/LeBailFunction.cpp
@@ -1,9 +1,9 @@
#include "MantidAPI/Algorithm.h"
-#include "MantidCurveFitting/LeBailFunction.h"
+#include "MantidCurveFitting/Algorithms/LeBailFunction.h"
#include "MantidKernel/System.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include <sstream>
@@ -18,6 +18,7 @@ const double NEG_DBL_MAX(-1. * DBL_MAX);
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
namespace {
const double PEAKRANGECONSTANT = 5.0;
@@ -1153,4 +1154,5 @@ double LeBailFunction::getPeakMaximumValue(std::vector<int> hkl,
}
} // namespace Mantid
+} // namespace Algorithms
} // namespace CurveFitting
diff --git a/Framework/CurveFitting/src/NormaliseByPeakArea.cpp b/Framework/CurveFitting/src/Algorithms/NormaliseByPeakArea.cpp
similarity index 99%
rename from Framework/CurveFitting/src/NormaliseByPeakArea.cpp
rename to Framework/CurveFitting/src/Algorithms/NormaliseByPeakArea.cpp
index f3a7522bbfa..780f0feb426 100644
--- a/Framework/CurveFitting/src/NormaliseByPeakArea.cpp
+++ b/Framework/CurveFitting/src/Algorithms/NormaliseByPeakArea.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/NormaliseByPeakArea.h"
+#include "MantidCurveFitting/Algorithms/NormaliseByPeakArea.h"
#include "MantidAPI/IFunction.h"
#include "MantidAPI/FunctionFactory.h"
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
/// Starting value of peak position in y-space for fit
double PEAK_POS_GUESS = -0.1;
@@ -381,5 +382,6 @@ void NormaliseByPeakArea::symmetriseYSpace() {
}
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/PawleyFit.cpp b/Framework/CurveFitting/src/Algorithms/PawleyFit.cpp
similarity index 99%
rename from Framework/CurveFitting/src/PawleyFit.cpp
rename to Framework/CurveFitting/src/Algorithms/PawleyFit.cpp
index 90c55982d74..a8debbfa28d 100644
--- a/Framework/CurveFitting/src/PawleyFit.cpp
+++ b/Framework/CurveFitting/src/Algorithms/PawleyFit.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/PawleyFit.h"
+#include "MantidCurveFitting/Algorithms/PawleyFit.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidCurveFitting/Functions/PawleyFunction.h"
@@ -14,6 +14,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
using namespace API;
using namespace Kernel;
@@ -416,5 +417,6 @@ V3D V3DFromHKLColumnExtractor::getHKLFromString(
return hkl;
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/PlotPeakByLogValue.cpp b/Framework/CurveFitting/src/Algorithms/PlotPeakByLogValue.cpp
similarity index 99%
rename from Framework/CurveFitting/src/PlotPeakByLogValue.cpp
rename to Framework/CurveFitting/src/Algorithms/PlotPeakByLogValue.cpp
index f380f15c43c..11392adee19 100644
--- a/Framework/CurveFitting/src/PlotPeakByLogValue.cpp
+++ b/Framework/CurveFitting/src/Algorithms/PlotPeakByLogValue.cpp
@@ -11,7 +11,7 @@
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string/replace.hpp>
-#include "MantidCurveFitting/PlotPeakByLogValue.h"
+#include "MantidCurveFitting/Algorithms/PlotPeakByLogValue.h"
#include "MantidAPI/IFuncMinimizer.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/FuncMinimizerFactory.h"
@@ -36,6 +36,7 @@ Mantid::Kernel::Logger g_log("PlotPeakByLogValue");
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
using namespace Kernel;
using namespace API;
@@ -619,5 +620,6 @@ PlotPeakByLogValue::getMinimizerString(const std::string &wsName,
return format;
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
similarity index 97%
rename from Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp
rename to Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
index 56a400e3b11..3423ca0b621 100644
--- a/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp
+++ b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/RefinePowderInstrumentParameters.h"
+#include "MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters.h"
#include "MantidKernel/ListValidator.h"
#include "MantidKernel/ArrayProperty.h"
@@ -14,11 +14,11 @@
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/TextAxis.h"
-#include "MantidCurveFitting/Fit.h"
-#include "MantidCurveFitting/BackgroundFunction.h"
-#include "MantidCurveFitting/Polynomial.h"
-#include "MantidCurveFitting/BoundaryConstraint.h"
-#include "MantidCurveFitting/Gaussian.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
+#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
+#include "MantidCurveFitting/Functions/BackgroundFunction.h"
+#include "MantidCurveFitting/Functions/Polynomial.h"
+#include "MantidCurveFitting/Functions/Gaussian.h"
#include "MantidGeometry/Crystal/UnitCell.h"
@@ -34,11 +34,15 @@ using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::DataObjects;
+using namespace Mantid::CurveFitting::Algorithms;
+using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Constraints;
using namespace std;
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
DECLARE_ALGORITHM(RefinePowderInstrumentParameters)
@@ -224,9 +228,9 @@ void RefinePowderInstrumentParameters::fitInstrumentParameters() {
<< endl;
// 1. Initialize the fitting function
- CurveFitting::ThermalNeutronDtoTOFFunction rawfunc;
+ ThermalNeutronDtoTOFFunction rawfunc;
mFunction =
- boost::make_shared<CurveFitting::ThermalNeutronDtoTOFFunction>(rawfunc);
+ boost::make_shared<ThermalNeutronDtoTOFFunction>(rawfunc);
mFunction->initialize();
API::FunctionDomain1DVector domain(dataWS->readX(1));
@@ -803,7 +807,7 @@ void RefinePowderInstrumentParameters::getD2TOFFuncParamNames(
parnames.clear();
// 2. Get the parameter names from function
- CurveFitting::ThermalNeutronDtoTOFFunction d2toffunc;
+ ThermalNeutronDtoTOFFunction d2toffunc;
d2toffunc.initialize();
std::vector<std::string> funparamnames = d2toffunc.getParameterNames();
@@ -879,7 +883,7 @@ void RefinePowderInstrumentParameters::genPeaksFromTable(
for (size_t ir = 0; ir < numrows; ++ir) {
// a) Generate peak
- CurveFitting::BackToBackExponential newpeak;
+ BackToBackExponential newpeak;
newpeak.initialize();
// b) Parse parameters
@@ -930,8 +934,8 @@ void RefinePowderInstrumentParameters::genPeaksFromTable(
newpeak.setParameter("I", height);
// d) Make to share pointer and set to instance data structure (map)
- CurveFitting::BackToBackExponential_sptr newpeakptr =
- boost::make_shared<CurveFitting::BackToBackExponential>(newpeak);
+ BackToBackExponential_sptr newpeakptr =
+ boost::make_shared<BackToBackExponential>(newpeak);
std::vector<int> hkl;
hkl.push_back(h);
@@ -1168,7 +1172,7 @@ void RefinePowderInstrumentParameters::genPeakCentersWorkspace(
throw runtime_error(errss.str());
}
- std::map<std::vector<int>, CurveFitting::BackToBackExponential_sptr>::iterator
+ std::map<std::vector<int>, BackToBackExponential_sptr>::iterator
peakiter;
std::vector<std::pair<double, std::pair<double, double>>>
peakcenters; // d_h [TOF_h, CHI2]
@@ -1300,5 +1304,6 @@ RefinePowderInstrumentParameters::genOutputInstrumentParameterTable() {
return newtablews;
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/RefinePowderInstrumentParameters3.cpp b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters3.cpp
similarity index 99%
rename from Framework/CurveFitting/src/RefinePowderInstrumentParameters3.cpp
rename to Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters3.cpp
index 22c96159ba9..5f146549166 100644
--- a/Framework/CurveFitting/src/RefinePowderInstrumentParameters3.cpp
+++ b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters3.cpp
@@ -1,4 +1,4 @@
-#include "MantidCurveFitting/RefinePowderInstrumentParameters3.h"
+#include "MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters3.h"
#include "MantidAPI/Axis.h"
#include "MantidAPI/TextAxis.h"
@@ -14,6 +14,7 @@ using namespace std;
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
DECLARE_ALGORITHM(RefinePowderInstrumentParameters3)
@@ -1429,5 +1430,6 @@ void restoreFunctionParameterValue(
return;
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/SplineBackground.cpp b/Framework/CurveFitting/src/Algorithms/SplineBackground.cpp
similarity index 97%
rename from Framework/CurveFitting/src/SplineBackground.cpp
rename to Framework/CurveFitting/src/Algorithms/SplineBackground.cpp
index d3eddbab620..93b2e86016a 100644
--- a/Framework/CurveFitting/src/SplineBackground.cpp
+++ b/Framework/CurveFitting/src/Algorithms/SplineBackground.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidCurveFitting/SplineBackground.h"
+#include "MantidCurveFitting/Algorithms/SplineBackground.h"
#include <gsl/gsl_bspline.h>
#include <gsl/gsl_multifit.h>
#include <gsl/gsl_statistics.h>
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
DECLARE_ALGORITHM(SplineBackground)
@@ -170,5 +171,6 @@ void SplineBackground::exec() {
setProperty("OutputWorkspace", outWS);
}
-} // namespace Algorithm
+} // namespace Algorithms
+} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/SplineInterpolation.cpp b/Framework/CurveFitting/src/Algorithms/SplineInterpolation.cpp
similarity index 98%
rename from Framework/CurveFitting/src/SplineInterpolation.cpp
rename to Framework/CurveFitting/src/Algorithms/SplineInterpolation.cpp
index 37a81ceee3c..9d1a1bc531c 100644
--- a/Framework/CurveFitting/src/SplineInterpolation.cpp
+++ b/Framework/CurveFitting/src/Algorithms/SplineInterpolation.cpp
@@ -2,10 +2,11 @@
#include "MantidAPI/NumericAxis.h"
#include "MantidAPI/Progress.h"
#include "MantidKernel/BoundedValidator.h"
-#include "MantidCurveFitting/SplineInterpolation.h"
+#include "MantidCurveFitting/Algorithms/SplineInterpolation.h"
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
// Register the algorithm into the AlgorithmFactory
DECLARE_ALGORITHM(SplineInterpolation)
@@ -254,5 +255,6 @@ void SplineInterpolation::calculateSpline(
m_cspline->function1D(yValues, xValues, nData);
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/SplineSmoothing.cpp b/Framework/CurveFitting/src/Algorithms/SplineSmoothing.cpp
similarity index 99%
rename from Framework/CurveFitting/src/SplineSmoothing.cpp
rename to Framework/CurveFitting/src/Algorithms/SplineSmoothing.cpp
index 9c942956ac0..87fcfb16e36 100644
--- a/Framework/CurveFitting/src/SplineSmoothing.cpp
+++ b/Framework/CurveFitting/src/Algorithms/SplineSmoothing.cpp
@@ -4,12 +4,13 @@
#include "MantidAPI/TextAxis.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidKernel/BoundedValidator.h"
-#include "MantidCurveFitting/SplineSmoothing.h"
+#include "MantidCurveFitting/Algorithms/SplineSmoothing.h"
#include <algorithm>
namespace Mantid {
namespace CurveFitting {
+namespace Algorithms {
// Register the algorithm into the AlgorithmFactory
DECLARE_ALGORITHM(SplineSmoothing)
@@ -370,5 +371,6 @@ void SplineSmoothing::selectSmoothingPoints(
}
}
+} // namespace Algorithms
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp b/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp
index f13a5e20c07..9408c811342 100644
--- a/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp
@@ -2,7 +2,7 @@
// Includes
//-----------------------------------------------------------------------------
#include "MantidCurveFitting/Functions/ComptonPeakProfile.h"
-#include "MantidCurveFitting/ConvertToYSpace.h"
+#include "MantidCurveFitting/Algorithms/ConvertToYSpace.h"
#include "MantidAPI/FunctionFactory.h"
#include <cmath>
@@ -10,8 +10,9 @@
namespace Mantid {
namespace CurveFitting {
namespace Functions {
+
-using namespace CurveFitting;
+using namespace CurveFitting::Algorithms;
DECLARE_FUNCTION(ComptonPeakProfile)
diff --git a/Framework/CurveFitting/src/Functions/ComptonProfile.cpp b/Framework/CurveFitting/src/Functions/ComptonProfile.cpp
index 0810d501baf..a7560b705db 100644
--- a/Framework/CurveFitting/src/Functions/ComptonProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/ComptonProfile.cpp
@@ -2,15 +2,16 @@
// Includes
//-----------------------------------------------------------------------------
#include "MantidCurveFitting/Functions/ComptonProfile.h"
-#include "MantidCurveFitting/ConvertToYSpace.h"
+#include "MantidCurveFitting/Algorithms/ConvertToYSpace.h"
#include "MantidAPI/FunctionFactory.h"
#include <gsl/gsl_poly.h>
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace CurveFitting;
+using namespace CurveFitting::Algorithms;
namespace {
///@cond
@@ -97,7 +98,7 @@ void ComptonProfile::setMatrixWorkspace(
m_resolutionFunction->setAttributeValue("Mass", m_mass);
m_resolutionFunction->setMatrixWorkspace(workspace, wsIndex, startX, endX);
- CurveFitting::DetectorParams detpar =
+ Algorithms::DetectorParams detpar =
ConvertToYSpace::getDetectorParameters(workspace, m_wsIndex);
this->cacheYSpaceValues(workspace->readX(m_wsIndex),
workspace->isHistogramData(), detpar);
@@ -105,7 +106,7 @@ void ComptonProfile::setMatrixWorkspace(
void ComptonProfile::cacheYSpaceValues(const std::vector<double> &tseconds,
const bool isHistogram,
- const CurveFitting::DetectorParams &detpar,
+ const Algorithms::DetectorParams &detpar,
const ResolutionParams &respar) {
m_resolutionFunction->cacheResolutionComponents(detpar, respar);
this->cacheYSpaceValues(tseconds, isHistogram, detpar);
@@ -118,7 +119,7 @@ void ComptonProfile::cacheYSpaceValues(const std::vector<double> &tseconds,
*/
void ComptonProfile::cacheYSpaceValues(const std::vector<double> &tseconds,
const bool isHistogram,
- const CurveFitting::DetectorParams &detpar) {
+ const Algorithms::DetectorParams &detpar) {
// ------ Fixed coefficients related to resolution & Y-space transforms
// ------------------
const double mevToK = PhysicalConstants::E_mev_toNeutronWavenumberSq;
diff --git a/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp b/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp
index 40efd9a5ea2..16960d97dab 100644
--- a/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp
@@ -368,7 +368,7 @@ void GramCharlierComptonProfile::setMatrixWorkspace(
*/
void GramCharlierComptonProfile::cacheYSpaceValues(
const std::vector<double> &tseconds, const bool isHistogram,
- const DetectorParams &detpar) {
+ const Algorithms::DetectorParams &detpar) {
ComptonProfile::cacheYSpaceValues(tseconds, isHistogram,
detpar); // base-class calculations
diff --git a/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp b/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
index b74d920b0ea..20fce38bd90 100644
--- a/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
+++ b/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
@@ -33,7 +33,7 @@ Kernel::Logger g_log("IkedaCarpenterPV");
using namespace Kernel;
-using namespace SpecialFunctionSupport;
+using namespace CurveFitting::SpecialFunctionSupport;
using namespace Geometry;
using namespace Constraints;
diff --git a/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp b/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp
index e1acbb1aba3..0dcf67b8f02 100644
--- a/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp
+++ b/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp
@@ -2,15 +2,17 @@
// Includes
//-----------------------------------------------------------------------------
#include "MantidCurveFitting/Functions/VesuvioResolution.h"
-#include "MantidCurveFitting/ConvertToYSpace.h"
+#include "MantidCurveFitting/Algorithms/ConvertToYSpace.h"
#include "MantidAPI/FunctionFactory.h"
#include <gsl/gsl_poly.h>
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
-using namespace CurveFitting;
+
+using namespace Mantid;
+using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
namespace {
///@cond
const char *MASS_NAME = "Mass";
@@ -112,7 +114,7 @@ void VesuvioResolution::setMatrixWorkspace(
* @param respar Structure containing resolution parameters
*/
void VesuvioResolution::cacheResolutionComponents(
- const DetectorParams &detpar, const ResolutionParams &respar) {
+ const Algorithms::DetectorParams &detpar, const ResolutionParams &respar) {
// geometry
double theta = detpar.theta; // cache for frequent access
double hwhmLorentzE = respar.dEnLorentz;
diff --git a/Framework/CurveFitting/src/LatticeDomainCreator.cpp b/Framework/CurveFitting/src/LatticeDomainCreator.cpp
index 69901d09098..db2ebe4bde9 100644
--- a/Framework/CurveFitting/src/LatticeDomainCreator.cpp
+++ b/Framework/CurveFitting/src/LatticeDomainCreator.cpp
@@ -9,7 +9,7 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidDataObjects/Peak.h"
-#include "MantidCurveFitting/PawleyFit.h"
+#include "MantidCurveFitting/Algorithms/PawleyFit.h"
namespace Mantid {
namespace CurveFitting {
@@ -17,6 +17,7 @@ namespace CurveFitting {
using namespace API;
using namespace Kernel;
using namespace DataObjects;
+using namespace CurveFitting::Algorithms;
/// Constructor
LatticeDomainCreator::LatticeDomainCreator(
diff --git a/Framework/CurveFitting/test/CalculateChiSquaredTest.h b/Framework/CurveFitting/test/Algorithms/CalculateChiSquaredTest.h
similarity index 99%
rename from Framework/CurveFitting/test/CalculateChiSquaredTest.h
rename to Framework/CurveFitting/test/Algorithms/CalculateChiSquaredTest.h
index 39fb96307a2..fb29bda4b80 100644
--- a/Framework/CurveFitting/test/CalculateChiSquaredTest.h
+++ b/Framework/CurveFitting/test/Algorithms/CalculateChiSquaredTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/CalculateChiSquared.h"
+#include "MantidCurveFitting/Algorithms/CalculateChiSquared.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/FunctionValues.h"
@@ -16,7 +16,7 @@
#include <boost/math/special_functions/fpclassify.hpp>
#include <limits>
-using Mantid::CurveFitting::CalculateChiSquared;
+using Mantid::CurveFitting::Algorithms::CalculateChiSquared;
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/CurveFitting/test/CalculateGammaBackgroundTest.h b/Framework/CurveFitting/test/Algorithms/CalculateGammaBackgroundTest.h
similarity index 98%
rename from Framework/CurveFitting/test/CalculateGammaBackgroundTest.h
rename to Framework/CurveFitting/test/Algorithms/CalculateGammaBackgroundTest.h
index 8fdc2508ece..502479b5f36 100644
--- a/Framework/CurveFitting/test/CalculateGammaBackgroundTest.h
+++ b/Framework/CurveFitting/test/Algorithms/CalculateGammaBackgroundTest.h
@@ -3,10 +3,10 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/CalculateGammaBackground.h"
-#include "Functions/ComptonProfileTestHelpers.h"
+#include "MantidCurveFitting/Algorithms/CalculateGammaBackground.h"
+#include "../Functions/ComptonProfileTestHelpers.h"
-using Mantid::CurveFitting::CalculateGammaBackground;
+using Mantid::CurveFitting::Algorithms::CalculateGammaBackground;
class CalculateGammaBackgroundTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/CalculateMSVesuvioTest.h b/Framework/CurveFitting/test/Algorithms/CalculateMSVesuvioTest.h
similarity index 98%
rename from Framework/CurveFitting/test/CalculateMSVesuvioTest.h
rename to Framework/CurveFitting/test/Algorithms/CalculateMSVesuvioTest.h
index b1cd29c4d73..f6eefbb0e35 100644
--- a/Framework/CurveFitting/test/CalculateMSVesuvioTest.h
+++ b/Framework/CurveFitting/test/Algorithms/CalculateMSVesuvioTest.h
@@ -5,7 +5,7 @@
#include "boost/version.hpp"
-#include "MantidCurveFitting/CalculateMSVesuvio.h"
+#include "MantidCurveFitting/Algorithms/CalculateMSVesuvio.h"
#include "MantidGeometry/Instrument/Goniometer.h"
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
@@ -13,9 +13,9 @@
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
-#include "Functions/ComptonProfileTestHelpers.h"
+#include "../Functions/ComptonProfileTestHelpers.h"
-using Mantid::CurveFitting::CalculateMSVesuvio;
+using Mantid::CurveFitting::Algorithms::CalculateMSVesuvio;
class CalculateMSVesuvioTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/ConvertToYSpaceTest.h b/Framework/CurveFitting/test/Algorithms/ConvertToYSpaceTest.h
similarity index 96%
rename from Framework/CurveFitting/test/ConvertToYSpaceTest.h
rename to Framework/CurveFitting/test/Algorithms/ConvertToYSpaceTest.h
index c439658b075..839a9202dcd 100644
--- a/Framework/CurveFitting/test/ConvertToYSpaceTest.h
+++ b/Framework/CurveFitting/test/Algorithms/ConvertToYSpaceTest.h
@@ -3,10 +3,10 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/ConvertToYSpace.h"
-#include "Functions/ComptonProfileTestHelpers.h"
+#include "MantidCurveFitting/Algorithms/ConvertToYSpace.h"
+#include "../Functions/ComptonProfileTestHelpers.h"
-using Mantid::CurveFitting::ConvertToYSpace;
+using Mantid::CurveFitting::Algorithms::ConvertToYSpace;
class ConvertToYSpaceTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/ConvolveWorkspacesTest.h b/Framework/CurveFitting/test/Algorithms/ConvolveWorkspacesTest.h
similarity index 94%
rename from Framework/CurveFitting/test/ConvolveWorkspacesTest.h
rename to Framework/CurveFitting/test/Algorithms/ConvolveWorkspacesTest.h
index 64d07f6281f..fe9dc90f597 100644
--- a/Framework/CurveFitting/test/ConvolveWorkspacesTest.h
+++ b/Framework/CurveFitting/test/Algorithms/ConvolveWorkspacesTest.h
@@ -5,8 +5,8 @@
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/AnalysisDataService.h"
-#include "MantidCurveFitting/ConvolveWorkspaces.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/ConvolveWorkspaces.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidAPI/IPeakFunction.h"
#include "MantidAPI/TableRow.h"
@@ -21,6 +21,7 @@ using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
class ConvolveWorkspacesTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/EstimatePeakErrorsTest.h b/Framework/CurveFitting/test/Algorithms/EstimatePeakErrorsTest.h
similarity index 98%
rename from Framework/CurveFitting/test/EstimatePeakErrorsTest.h
rename to Framework/CurveFitting/test/Algorithms/EstimatePeakErrorsTest.h
index 3ea8b1328cf..04baa92e562 100644
--- a/Framework/CurveFitting/test/EstimatePeakErrorsTest.h
+++ b/Framework/CurveFitting/test/Algorithms/EstimatePeakErrorsTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/EstimatePeakErrors.h"
+#include "MantidCurveFitting/Algorithms/EstimatePeakErrors.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/AnalysisDataService.h"
@@ -19,6 +19,7 @@
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace WorkspaceCreationHelper;
class EstimatePeakErrorsTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/EvaluateFunctionTest.h b/Framework/CurveFitting/test/Algorithms/EvaluateFunctionTest.h
similarity index 98%
rename from Framework/CurveFitting/test/EvaluateFunctionTest.h
rename to Framework/CurveFitting/test/Algorithms/EvaluateFunctionTest.h
index 22e8a5aac07..cf8b80f4d99 100644
--- a/Framework/CurveFitting/test/EvaluateFunctionTest.h
+++ b/Framework/CurveFitting/test/Algorithms/EvaluateFunctionTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/EvaluateFunction.h"
+#include "MantidCurveFitting/Algorithms/EvaluateFunction.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/FunctionFactory.h"
@@ -15,7 +15,7 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidKernel/EmptyValues.h"
-using Mantid::CurveFitting::EvaluateFunction;
+using Mantid::CurveFitting::Algorithms::EvaluateFunction;
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/CurveFitting/test/FitPowderDiffPeaksTest.h b/Framework/CurveFitting/test/Algorithms/FitPowderDiffPeaksTest.h
similarity index 99%
rename from Framework/CurveFitting/test/FitPowderDiffPeaksTest.h
rename to Framework/CurveFitting/test/Algorithms/FitPowderDiffPeaksTest.h
index ffc3aa2b5be..2eea28afa5b 100644
--- a/Framework/CurveFitting/test/FitPowderDiffPeaksTest.h
+++ b/Framework/CurveFitting/test/Algorithms/FitPowderDiffPeaksTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/FitPowderDiffPeaks.h"
+#include "MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h"
#include "MantidDataHandling/LoadAscii.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidDataObjects/Workspace2D.h"
@@ -11,7 +11,7 @@
#include "MantidAPI/TableRow.h"
#include <fstream>
-using Mantid::CurveFitting::FitPowderDiffPeaks;
+using Mantid::CurveFitting::Algorithms::FitPowderDiffPeaks;
using namespace std;
using namespace Mantid;
@@ -32,7 +32,7 @@ public:
/** Test init
*/
void test_Init() {
- CurveFitting::FitPowderDiffPeaks alg;
+ Algorithms::FitPowderDiffPeaks alg;
TS_ASSERT_THROWS_NOTHING(alg.initialize());
TS_ASSERT(alg.isInitialized());
diff --git a/Framework/CurveFitting/test/FitTest.h b/Framework/CurveFitting/test/Algorithms/FitTest.h
similarity index 98%
rename from Framework/CurveFitting/test/FitTest.h
rename to Framework/CurveFitting/test/Algorithms/FitTest.h
index d4ce164b490..94b27088b28 100644
--- a/Framework/CurveFitting/test/FitTest.h
+++ b/Framework/CurveFitting/test/Algorithms/FitTest.h
@@ -7,11 +7,12 @@
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/IFuncMinimizer.h"
#include "MantidAPI/FuncMinimizerFactory.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "FitTestHelpers.h"
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::API;
namespace {
diff --git a/Framework/CurveFitting/test/FitTestHelpers.h b/Framework/CurveFitting/test/Algorithms/FitTestHelpers.h
similarity index 100%
rename from Framework/CurveFitting/test/FitTestHelpers.h
rename to Framework/CurveFitting/test/Algorithms/FitTestHelpers.h
diff --git a/Framework/CurveFitting/test/LeBailFitTest.h b/Framework/CurveFitting/test/Algorithms/LeBailFitTest.h
similarity index 99%
rename from Framework/CurveFitting/test/LeBailFitTest.h
rename to Framework/CurveFitting/test/Algorithms/LeBailFitTest.h
index 367da9173d5..11d3e247d7c 100644
--- a/Framework/CurveFitting/test/LeBailFitTest.h
+++ b/Framework/CurveFitting/test/Algorithms/LeBailFitTest.h
@@ -5,7 +5,7 @@
#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
-#include "MantidCurveFitting/LeBailFit.h"
+#include "MantidCurveFitting/Algorithms/LeBailFit.h"
#include "MantidDataHandling/LoadAscii.h"
#include <iostream>
@@ -30,7 +30,7 @@ using namespace WorkspaceCreationHelper;
using namespace std;
-using Mantid::CurveFitting::LeBailFit;
+using Mantid::CurveFitting::Algorithms::LeBailFit;
class LeBailFitTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/LeBailFunctionTest.h b/Framework/CurveFitting/test/Algorithms/LeBailFunctionTest.h
similarity index 99%
rename from Framework/CurveFitting/test/LeBailFunctionTest.h
rename to Framework/CurveFitting/test/Algorithms/LeBailFunctionTest.h
index af5ecb5b30b..4bf04982b07 100644
--- a/Framework/CurveFitting/test/LeBailFunctionTest.h
+++ b/Framework/CurveFitting/test/Algorithms/LeBailFunctionTest.h
@@ -9,10 +9,11 @@
#include <iomanip>
#include <fstream>
-#include "MantidCurveFitting/LeBailFunction.h"
+#include "MantidCurveFitting/Algorithms/LeBailFunction.h"
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::API;
using namespace std;
diff --git a/Framework/CurveFitting/test/NormaliseByPeakAreaTest.h b/Framework/CurveFitting/test/Algorithms/NormaliseByPeakAreaTest.h
similarity index 98%
rename from Framework/CurveFitting/test/NormaliseByPeakAreaTest.h
rename to Framework/CurveFitting/test/Algorithms/NormaliseByPeakAreaTest.h
index 17dd123a735..30d27a5a9b3 100644
--- a/Framework/CurveFitting/test/NormaliseByPeakAreaTest.h
+++ b/Framework/CurveFitting/test/Algorithms/NormaliseByPeakAreaTest.h
@@ -3,10 +3,10 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/NormaliseByPeakArea.h"
-#include "Functions/ComptonProfileTestHelpers.h"
+#include "MantidCurveFitting/Algorithms/NormaliseByPeakArea.h"
+#include "../Functions/ComptonProfileTestHelpers.h"
-using Mantid::CurveFitting::NormaliseByPeakArea;
+using Mantid::CurveFitting::Algorithms::NormaliseByPeakArea;
class NormaliseByPeakAreaTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/PawleyFitTest.h b/Framework/CurveFitting/test/Algorithms/PawleyFitTest.h
similarity index 98%
rename from Framework/CurveFitting/test/PawleyFitTest.h
rename to Framework/CurveFitting/test/Algorithms/PawleyFitTest.h
index 3c99605f3d8..1766df896cd 100644
--- a/Framework/CurveFitting/test/PawleyFitTest.h
+++ b/Framework/CurveFitting/test/Algorithms/PawleyFitTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/PawleyFit.h"
+#include "MantidCurveFitting/Algorithms/PawleyFit.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/TableRow.h"
@@ -11,8 +11,8 @@
#include "MantidKernel/V3D.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
-using Mantid::CurveFitting::PawleyFit;
-using Mantid::CurveFitting::V3DFromHKLColumnExtractor;
+using Mantid::CurveFitting::Algorithms::PawleyFit;
+using Mantid::CurveFitting::Algorithms::V3DFromHKLColumnExtractor;
using namespace Mantid::API;
using namespace Mantid::Kernel;
diff --git a/Framework/CurveFitting/test/PlotPeakByLogValueTest.h b/Framework/CurveFitting/test/Algorithms/PlotPeakByLogValueTest.h
similarity index 99%
rename from Framework/CurveFitting/test/PlotPeakByLogValueTest.h
rename to Framework/CurveFitting/test/Algorithms/PlotPeakByLogValueTest.h
index 03947a4ae12..9fb02f3eff1 100644
--- a/Framework/CurveFitting/test/PlotPeakByLogValueTest.h
+++ b/Framework/CurveFitting/test/Algorithms/PlotPeakByLogValueTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/PlotPeakByLogValue.h"
+#include "MantidCurveFitting/Algorithms/PlotPeakByLogValue.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidAPI/TableRow.h"
@@ -26,6 +26,7 @@ using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
typedef Mantid::DataObjects::Workspace2D_sptr WS_type;
typedef Mantid::DataObjects::TableWorkspace_sptr TWS_type;
diff --git a/Framework/CurveFitting/test/RefinePowderInstrumentParameters3Test.h b/Framework/CurveFitting/test/Algorithms/RefinePowderInstrumentParameters3Test.h
similarity index 99%
rename from Framework/CurveFitting/test/RefinePowderInstrumentParameters3Test.h
rename to Framework/CurveFitting/test/Algorithms/RefinePowderInstrumentParameters3Test.h
index a77678e9ebc..dedf1a1c02d 100644
--- a/Framework/CurveFitting/test/RefinePowderInstrumentParameters3Test.h
+++ b/Framework/CurveFitting/test/Algorithms/RefinePowderInstrumentParameters3Test.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/RefinePowderInstrumentParameters3.h"
+#include "MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters3.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidDataObjects/Workspace2D.h"
@@ -12,7 +12,7 @@
#include <fstream>
-using Mantid::CurveFitting::RefinePowderInstrumentParameters3;
+using Mantid::CurveFitting::Algorithms::RefinePowderInstrumentParameters3;
using namespace Mantid;
using namespace Mantid::DataObjects;
diff --git a/Framework/CurveFitting/test/RefinePowderInstrumentParametersTest.h b/Framework/CurveFitting/test/Algorithms/RefinePowderInstrumentParametersTest.h
similarity index 98%
rename from Framework/CurveFitting/test/RefinePowderInstrumentParametersTest.h
rename to Framework/CurveFitting/test/Algorithms/RefinePowderInstrumentParametersTest.h
index 421e4728d18..fccdacb20db 100644
--- a/Framework/CurveFitting/test/RefinePowderInstrumentParametersTest.h
+++ b/Framework/CurveFitting/test/Algorithms/RefinePowderInstrumentParametersTest.h
@@ -3,14 +3,14 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/RefinePowderInstrumentParameters.h"
+#include "MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidAPI/TableRow.h"
#include <fstream>
-using Mantid::CurveFitting::RefinePowderInstrumentParameters;
+using Mantid::CurveFitting::Algorithms::RefinePowderInstrumentParameters;
using namespace Mantid;
using namespace Mantid::Kernel;
using namespace Mantid::API;
@@ -153,7 +153,7 @@ public:
geomparamws);
// 2. Set up algorithm parameters
- CurveFitting::RefinePowderInstrumentParameters alg;
+ RefinePowderInstrumentParameters alg;
TS_ASSERT_THROWS_NOTHING(alg.initialize());
TS_ASSERT(alg.isInitialized());
@@ -236,7 +236,7 @@ public:
geomparamws);
// 2. Set up algorithm parameters
- CurveFitting::RefinePowderInstrumentParameters alg;
+ RefinePowderInstrumentParameters alg;
TS_ASSERT_THROWS_NOTHING(alg.initialize());
TS_ASSERT(alg.isInitialized());
diff --git a/Framework/CurveFitting/test/SeqDomainSpectrumCreatorTest.h b/Framework/CurveFitting/test/Algorithms/SeqDomainSpectrumCreatorTest.h
similarity index 99%
rename from Framework/CurveFitting/test/SeqDomainSpectrumCreatorTest.h
rename to Framework/CurveFitting/test/Algorithms/SeqDomainSpectrumCreatorTest.h
index 4cf5c605467..077ca4fd6b7 100644
--- a/Framework/CurveFitting/test/SeqDomainSpectrumCreatorTest.h
+++ b/Framework/CurveFitting/test/Algorithms/SeqDomainSpectrumCreatorTest.h
@@ -10,7 +10,7 @@
#include "MantidAPI/IFunction1DSpectrum.h"
#include "MantidAPI/ParamFunction.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidAPI/TableRow.h"
#include "MantidAPI/FunctionFactory.h"
@@ -20,6 +20,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
class SeqDomainSpectrumCreatorTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/SplineBackgroundTest.h b/Framework/CurveFitting/test/Algorithms/SplineBackgroundTest.h
similarity index 96%
rename from Framework/CurveFitting/test/SplineBackgroundTest.h
rename to Framework/CurveFitting/test/Algorithms/SplineBackgroundTest.h
index 935ed917426..4608bff0880 100644
--- a/Framework/CurveFitting/test/SplineBackgroundTest.h
+++ b/Framework/CurveFitting/test/Algorithms/SplineBackgroundTest.h
@@ -2,7 +2,7 @@
#define SPLINEBACKGROUNDTEST_H_
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/SplineBackground.h"
+#include "MantidCurveFitting/Algorithms/SplineBackground.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/Framework/CurveFitting/test/SplineInterpolationTest.h b/Framework/CurveFitting/test/Algorithms/SplineInterpolationTest.h
similarity index 97%
rename from Framework/CurveFitting/test/SplineInterpolationTest.h
rename to Framework/CurveFitting/test/Algorithms/SplineInterpolationTest.h
index 43b5adc90e7..e55dc97c987 100644
--- a/Framework/CurveFitting/test/SplineInterpolationTest.h
+++ b/Framework/CurveFitting/test/Algorithms/SplineInterpolationTest.h
@@ -3,12 +3,12 @@
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/SplineInterpolation.h"
+#include "MantidCurveFitting/Algorithms/SplineInterpolation.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidAPI/NumericAxis.h"
#include "MantidAPI/TextAxis.h"
-using Mantid::CurveFitting::SplineInterpolation;
+using Mantid::CurveFitting::Algorithms::SplineInterpolation;
using namespace Mantid::API;
class SplineInterpolationTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/SplineSmoothingTest.h b/Framework/CurveFitting/test/Algorithms/SplineSmoothingTest.h
similarity index 96%
rename from Framework/CurveFitting/test/SplineSmoothingTest.h
rename to Framework/CurveFitting/test/Algorithms/SplineSmoothingTest.h
index cc28ba8c436..bc88af1750e 100644
--- a/Framework/CurveFitting/test/SplineSmoothingTest.h
+++ b/Framework/CurveFitting/test/Algorithms/SplineSmoothingTest.h
@@ -4,9 +4,9 @@
#include <cxxtest/TestSuite.h>
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
-#include "MantidCurveFitting/SplineSmoothing.h"
+#include "MantidCurveFitting/Algorithms/SplineSmoothing.h"
-using Mantid::CurveFitting::SplineSmoothing;
+using Mantid::CurveFitting::Algorithms::SplineSmoothing;
class SplineSmoothingTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/test/CompositeFunctionTest.h b/Framework/CurveFitting/test/CompositeFunctionTest.h
index 2c9a053c3a8..62a5cc3a1e5 100644
--- a/Framework/CurveFitting/test/CompositeFunctionTest.h
+++ b/Framework/CurveFitting/test/CompositeFunctionTest.h
@@ -5,7 +5,7 @@
#include "MantidAPI/IPeakFunction.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidAPI/TableRow.h"
@@ -28,6 +28,7 @@
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::CurveFitting::CostFunctions;
diff --git a/Framework/CurveFitting/test/FitMWTest.h b/Framework/CurveFitting/test/FitMWTest.h
index 3065472ccea..00f938a9760 100644
--- a/Framework/CurveFitting/test/FitMWTest.h
+++ b/Framework/CurveFitting/test/FitMWTest.h
@@ -5,7 +5,7 @@
#include "MantidTestHelpers/FakeObjects.h"
#include "MantidCurveFitting/FitMW.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidCurveFitting/SeqDomain.h"
#include "MantidCurveFitting/Functions/UserFunction.h"
#include "MantidCurveFitting/Functions/ExpDecay.h"
@@ -29,6 +29,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
@@ -52,7 +53,7 @@ public:
fun->setParameter("Height", 1.);
fun->setParameter("Lifetime", 1.0);
- Fit fit;
+ Algorithms::Fit fit;
fit.initialize();
fit.setProperty("Function", fun);
@@ -160,7 +161,7 @@ public:
fun->setParameter("Height", 1.);
fun->setParameter("Lifetime", 1.);
- Fit fit;
+ Algorithms::Fit fit;
fit.initialize();
fit.setProperty("Function", fun);
diff --git a/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
index cd59c1aef27..73f6508f427 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
@@ -5,7 +5,7 @@
#include "MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidCurveFitting/Functions/ExpDecay.h"
@@ -17,6 +17,7 @@ using Mantid::CurveFitting::FuncMinimisers::FABADAMinimizer;
using namespace Mantid::API;
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
class FABADAMinimizerTest : public CxxTest::TestSuite {
@@ -35,7 +36,7 @@ public:
fun->setParameter("Height", 8.);
fun->setParameter("Lifetime", 1.0);
- Fit fit;
+ Algorithms::Fit fit;
fit.initialize();
fit.setRethrows(true);
@@ -144,7 +145,7 @@ public:
fun->setParameter("Height", 1.);
fun->setParameter("Lifetime", 1.0);
- Fit fit;
+ Algorithms::Fit fit;
fit.initialize();
fit.setRethrows(true);
diff --git a/Framework/CurveFitting/test/FunctionParameterDecoratorFitTest.h b/Framework/CurveFitting/test/FunctionParameterDecoratorFitTest.h
index c7f60ebf936..699b840af67 100644
--- a/Framework/CurveFitting/test/FunctionParameterDecoratorFitTest.h
+++ b/Framework/CurveFitting/test/FunctionParameterDecoratorFitTest.h
@@ -9,13 +9,14 @@
#include "MantidAPI/FunctionParameterDecorator.h"
#include "MantidDataObjects/Workspace2D.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include <boost/make_shared.hpp>
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
class FunctionParameterDecoratorFitTest;
diff --git a/Framework/CurveFitting/test/Functions/AbragamTest.h b/Framework/CurveFitting/test/Functions/AbragamTest.h
index d103dfa360e..387926477b7 100644
--- a/Framework/CurveFitting/test/Functions/AbragamTest.h
+++ b/Framework/CurveFitting/test/Functions/AbragamTest.h
@@ -7,7 +7,7 @@
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
@@ -19,6 +19,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
@@ -55,7 +56,7 @@ public:
}
void testAgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/Bk2BkExpConvPVTest.h b/Framework/CurveFitting/test/Functions/Bk2BkExpConvPVTest.h
index 81556c847a0..b7630e0f6b8 100644
--- a/Framework/CurveFitting/test/Functions/Bk2BkExpConvPVTest.h
+++ b/Framework/CurveFitting/test/Functions/Bk2BkExpConvPVTest.h
@@ -9,12 +9,13 @@
#include <fstream>
#include "MantidCurveFitting/Functions/Bk2BkExpConvPV.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidDataObjects/Workspace2D.h"
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::API;
@@ -159,7 +160,7 @@ public:
<< std::endl;
// 3. Set fit
- Fit fitalg;
+ Algorithms::Fit fitalg;
fitalg.initialize();
TS_ASSERT(fitalg.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/ChebyshevTest.h b/Framework/CurveFitting/test/Functions/ChebyshevTest.h
index 1e348c7bc88..2602cc30011 100644
--- a/Framework/CurveFitting/test/Functions/ChebyshevTest.h
+++ b/Framework/CurveFitting/test/Functions/ChebyshevTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/Functions/Chebyshev.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/AnalysisDataService.h"
@@ -14,6 +14,7 @@
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
class ChebyshevTest : public CxxTest::TestSuite {
@@ -60,7 +61,7 @@ public:
Chebyshev cheb;
cheb.setAttributeValue("n", 3);
- Fit fit;
+ Algorithms::Fit fit;
fit.initialize();
fit.setPropertyValue("Function", cheb.asString());
@@ -117,7 +118,7 @@ public:
cheb.setAttributeValue("StartX", -10.0);
cheb.setAttributeValue("EndX", 10.0);
- Fit fit;
+ Algorithms::Fit fit;
fit.initialize();
fit.setPropertyValue("Function", cheb.asString());
diff --git a/Framework/CurveFitting/test/Functions/ConvolutionTest.h b/Framework/CurveFitting/test/Functions/ConvolutionTest.h
index e7ee0eecece..21c97b9b390 100644
--- a/Framework/CurveFitting/test/Functions/ConvolutionTest.h
+++ b/Framework/CurveFitting/test/Functions/ConvolutionTest.h
@@ -6,7 +6,7 @@
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidCurveFitting/Functions/Convolution.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidAPI/IPeakFunction.h"
@@ -21,6 +21,7 @@ using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
typedef Mantid::DataObjects::Workspace2D_sptr WS_type;
@@ -407,7 +408,7 @@ public:
conv->setParameter("f1.h", 1);
conv->setParameter("f1.w", 1);
- Fit fit;
+ Algorithms::Fit fit;
fit.initialize();
fit.setPropertyValue("Function", conv->asString());
@@ -425,7 +426,7 @@ public:
0.1, fabs(out->getParameter("f1.w") - conv->getParameter("f1.w")));
conv->setAttributeValue("FixResolution", false);
- Fit fit1;
+ Algorithms::Fit fit1;
fit1.initialize();
fit1.setProperty("Function", boost::dynamic_pointer_cast<IFunction>(conv));
fit1.setProperty("InputWorkspace", data);
diff --git a/Framework/CurveFitting/test/Functions/CubicSplineTest.h b/Framework/CurveFitting/test/Functions/CubicSplineTest.h
index fd9c1d3231c..06760532f47 100644
--- a/Framework/CurveFitting/test/Functions/CubicSplineTest.h
+++ b/Framework/CurveFitting/test/Functions/CubicSplineTest.h
@@ -7,7 +7,7 @@
#include <iostream>
#include "MantidCurveFitting/Functions/CubicSpline.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/AnalysisDataService.h"
@@ -17,6 +17,7 @@
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
class CubicSplineTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/Functions/DeltaFunctionTest.h b/Framework/CurveFitting/test/Functions/DeltaFunctionTest.h
index a29e7043d8b..b7fabe94be6 100644
--- a/Framework/CurveFitting/test/Functions/DeltaFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/DeltaFunctionTest.h
@@ -2,7 +2,7 @@
#define DELTAFUNCTIONTEST_H
#include <cxxtest/TestSuite.h>
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidCurveFitting/Functions/DeltaFunction.h"
#include "MantidCurveFitting/Functions/Convolution.h"
@@ -13,6 +13,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
// same class as ConvolutionTest_Gauss in ConvolutionTest.h
diff --git a/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h b/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h
index 98bcc699040..a2ecbc07f71 100644
--- a/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h
+++ b/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/Convolution.h"
#include "MantidCurveFitting/Functions/DiffRotDiscreteCircle.h"
#include "MantidCurveFitting/Functions/Gaussian.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidGeometry/Instrument/ReferenceFrame.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
@@ -19,6 +19,7 @@
#include <boost/shared_ptr.hpp>
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
class DiffRotDiscreteCircleTest : public CxxTest::TestSuite {
@@ -127,7 +128,7 @@ public:
"9,Intensity=2.9,Radius=2.3,Decay=0.468";
// Do a fit with no iterations
- Fit fitalg;
+ Algorithms::Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
fitalg.setProperty("Function", funtion_string);
@@ -247,7 +248,7 @@ public:
"Radius=1.567,Decay=7.567))";
// Initialize the fit function in the Fit algorithm
- Fit fitalg;
+ Algorithms::Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
fitalg.setProperty("Function", funtion_string);
@@ -345,7 +346,7 @@ private:
<< ",Shift=" << S << ")";
// Initialize the fit function in the Fit algorithm
- Fit fitalg;
+ Algorithms::Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
fitalg.setProperty("Function", function_stream.str());
@@ -528,7 +529,7 @@ private:
// create a data workspace using a Fit algorithm
Mantid::DataObjects::Workspace2D_sptr
- generateWorkspaceFromFitAlgorithm(Fit &fitalg) {
+ generateWorkspaceFromFitAlgorithm(Algorithms::Fit &fitalg) {
using namespace Mantid::Kernel;
using namespace Mantid::Geometry;
diff --git a/Framework/CurveFitting/test/Functions/DiffSphereTest.h b/Framework/CurveFitting/test/Functions/DiffSphereTest.h
index 9a77f604da6..10cbffce46f 100644
--- a/Framework/CurveFitting/test/Functions/DiffSphereTest.h
+++ b/Framework/CurveFitting/test/Functions/DiffSphereTest.h
@@ -15,7 +15,7 @@
#include "MantidCurveFitting/Functions/Gaussian.h"
#include "MantidCurveFitting/Functions/Convolution.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/AlgorithmFactory.h"
@@ -23,6 +23,7 @@
#include "MantidTestHelpers/ComponentCreationHelper.h"
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
class DiffSphereTest : public CxxTest::TestSuite {
@@ -46,7 +47,7 @@ public:
"Sigma=0.002);name=ElasticDiffSphere,Q=0.5,Height=47.014,Radius=3.567)";
// Initialize the fit function in the Fit algorithm
- Fit fitalg;
+ Algorithms::Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
fitalg.setProperty("Function", funtion_string);
@@ -189,7 +190,7 @@ public:
const double Q(0.5);
// Initialize the fit function in the Fit algorithm
- Fit fitalg;
+ Algorithms::Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
std::ostringstream funtion_stream;
@@ -335,7 +336,7 @@ private:
simQ = 0.20092;
// Initialize the fit function in the Fit algorithm
- Fit fitalg;
+ Algorithms::Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
std::ostringstream funtion_stream;
@@ -461,7 +462,7 @@ private:
// create a data workspace using a Fit algorithm
Mantid::DataObjects::Workspace2D_sptr
- generateWorkspaceFromFitAlgorithm(Fit &fitalg) {
+ generateWorkspaceFromFitAlgorithm(Algorithms::Fit &fitalg) {
using namespace Mantid::Kernel;
using namespace Mantid::Geometry;
diff --git a/Framework/CurveFitting/test/Functions/EndErfcTest.h b/Framework/CurveFitting/test/Functions/EndErfcTest.h
index 5fe20acfd8e..dc03dd49687 100644
--- a/Framework/CurveFitting/test/Functions/EndErfcTest.h
+++ b/Framework/CurveFitting/test/Functions/EndErfcTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/Functions/EndErfc.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidDataObjects/Workspace2D.h"
@@ -14,6 +14,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::DataObjects;
class EndErfcTest : public CxxTest::TestSuite {
@@ -39,7 +40,7 @@ public:
}
void testAgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h b/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h
index 45561fcc3d1..02a079776da 100644
--- a/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h
+++ b/Framework/CurveFitting/test/Functions/ExpDecayMuonTest.h
@@ -7,7 +7,7 @@
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidDataObjects/Workspace2D.h"
@@ -16,6 +16,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
@@ -49,7 +50,7 @@ public:
}
void testAgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h b/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h
index cc87d09f6b5..9c91b5e7dcc 100644
--- a/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h
+++ b/Framework/CurveFitting/test/Functions/ExpDecayOscTest.h
@@ -5,7 +5,7 @@
#include <cmath>
#include "MantidCurveFitting/Functions/ExpDecayOsc.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
@@ -14,6 +14,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::CurveFitting::Constraints;
using namespace Mantid::DataObjects;
@@ -50,7 +51,7 @@ public:
}
void testAgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/ExpDecayTest.h b/Framework/CurveFitting/test/Functions/ExpDecayTest.h
index e5b3ff434c8..149edd05e1a 100644
--- a/Framework/CurveFitting/test/Functions/ExpDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/ExpDecayTest.h
@@ -7,7 +7,7 @@
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
@@ -19,6 +19,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
@@ -52,7 +53,7 @@ public:
}
void testAgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/FullprofPolynomialTest.h b/Framework/CurveFitting/test/Functions/FullprofPolynomialTest.h
index fc6b72a1cbc..42b9226a157 100644
--- a/Framework/CurveFitting/test/Functions/FullprofPolynomialTest.h
+++ b/Framework/CurveFitting/test/Functions/FullprofPolynomialTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/FullprofPolynomial.h"
#include "MantidAPI/IFunction.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
using Mantid::CurveFitting::Functions::FullprofPolynomial;
@@ -14,6 +14,7 @@ using Mantid::CurveFitting::Functions::FullprofPolynomial;
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::DataObjects;
using namespace Mantid::Kernel;
@@ -88,7 +89,7 @@ public:
tofbkgd->setParameter("A3", 0.0);
// Set up fit
- CurveFitting::Fit fitalg;
+ CurveFitting::Algorithms::Fit fitalg;
TS_ASSERT_THROWS_NOTHING(fitalg.initialize());
TS_ASSERT(fitalg.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/GausDecayTest.h b/Framework/CurveFitting/test/Functions/GausDecayTest.h
index 59df2188d75..3771d22c694 100644
--- a/Framework/CurveFitting/test/Functions/GausDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/GausDecayTest.h
@@ -7,7 +7,7 @@
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
@@ -22,6 +22,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
@@ -53,7 +54,7 @@ public:
}
void testAgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/GausOscTest.h b/Framework/CurveFitting/test/Functions/GausOscTest.h
index fdd9b91bf36..0e31dc9c702 100644
--- a/Framework/CurveFitting/test/Functions/GausOscTest.h
+++ b/Framework/CurveFitting/test/Functions/GausOscTest.h
@@ -8,7 +8,7 @@
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
@@ -23,6 +23,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
@@ -58,7 +59,7 @@ public:
void testAgainstMockData() // Parts of test disabled because it does not give
// result like that obtained in mantidplot.
{
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/GaussianTest.h b/Framework/CurveFitting/test/Functions/GaussianTest.h
index 79c76ab0836..07929291454 100644
--- a/Framework/CurveFitting/test/Functions/GaussianTest.h
+++ b/Framework/CurveFitting/test/Functions/GaussianTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/Functions/Gaussian.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
#include "MantidKernel/UnitFactory.h"
@@ -34,6 +34,7 @@ using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
using namespace Mantid::CurveFitting::CostFunctions;
using namespace Mantid::CurveFitting::Constraints;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
@@ -239,7 +240,7 @@ public:
TS_ASSERT_THROWS_NOTHING(AnalysisDataService::Instance().add(wsName, ws2D));
// Initialise algorithm
- Fit alg;
+ Algorithms::Fit alg;
TS_ASSERT_THROWS_NOTHING(alg.initialize());
TS_ASSERT(alg.isInitialized());
@@ -308,7 +309,7 @@ public:
Mantid::MantidVec &e = ws2D->dataE(0); // error values of counts
getMockData(y, e);
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
@@ -361,7 +362,7 @@ public:
// put this workspace in the data service
TS_ASSERT_THROWS_NOTHING(AnalysisDataService::Instance().add(wsName, ws2D));
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
@@ -427,7 +428,7 @@ public:
ConfigService::Instance().getString("curvefitting.peakRadius");
ConfigService::Instance().setString("curvefitting.peakRadius", "5");
- Fit alg;
+ Algorithms::Fit alg;
TS_ASSERT_THROWS_NOTHING(alg.initialize());
TS_ASSERT(alg.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h b/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
index 0d6464341d4..b374956ec03 100644
--- a/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
+++ b/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/Functions/IkedaCarpenterPV.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/ConfigService.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
@@ -268,7 +268,7 @@ using namespace Mantid::CurveFitting::Functions;
icpv.tie("Kappa", "46.025921");
icpv.setParameter("X0", 45.0);
- auto alg = boost::shared_ptr<IAlgorithm>(new Fit);
+ auto alg = boost::shared_ptr<IAlgorithm>(new Algorithms::Fit);
alg->initialize();
alg->setPropertyValue("Function", icpv.asString());
// Set general Fit parameters
diff --git a/Framework/CurveFitting/test/Functions/LinearBackgroundTest.h b/Framework/CurveFitting/test/Functions/LinearBackgroundTest.h
index 8e8905a7f86..03f2d8341c2 100644
--- a/Framework/CurveFitting/test/Functions/LinearBackgroundTest.h
+++ b/Framework/CurveFitting/test/Functions/LinearBackgroundTest.h
@@ -5,7 +5,7 @@
#include "MantidCurveFitting/Functions/LinearBackground.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
@@ -18,7 +18,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using Mantid::CurveFitting::Functions::LinearBackground;
-using Mantid::CurveFitting::Fit;
+using Mantid::CurveFitting::Algorithms::Fit;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
diff --git a/Framework/CurveFitting/test/Functions/LogNormalTest.h b/Framework/CurveFitting/test/Functions/LogNormalTest.h
index de8055bfb53..d4391f687f2 100644
--- a/Framework/CurveFitting/test/Functions/LogNormalTest.h
+++ b/Framework/CurveFitting/test/Functions/LogNormalTest.h
@@ -7,7 +7,7 @@
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
@@ -20,6 +20,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::DataObjects;
class LogNormalTest : public CxxTest::TestSuite {
@@ -55,7 +56,7 @@ public:
}
void testAgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h b/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h
index 3e3e3ac7b52..a03d49a1313 100644
--- a/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h
+++ b/Framework/CurveFitting/test/Functions/MuonFInteractionTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/Functions/MuonFInteraction.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
@@ -17,6 +17,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::DataObjects;
class MuonFInteractionTest : public CxxTest::TestSuite {
@@ -52,7 +53,7 @@ public:
}
void testAgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/PolynomialTest.h b/Framework/CurveFitting/test/Functions/PolynomialTest.h
index 8af4cebb7ef..13d0461f676 100644
--- a/Framework/CurveFitting/test/Functions/PolynomialTest.h
+++ b/Framework/CurveFitting/test/Functions/PolynomialTest.h
@@ -6,12 +6,13 @@
#include "MantidCurveFitting/Functions/Polynomial.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
using Mantid::CurveFitting::Functions::Polynomial;
using namespace Mantid;
using namespace API;
using namespace Kernel;
+using namespace Mantid::CurveFitting::Algorithms;
class PolynomialTest : public CxxTest::TestSuite {
public:
@@ -45,7 +46,7 @@ public:
// put this workspace in the data service
TS_ASSERT_THROWS_NOTHING(AnalysisDataService::Instance().add(wsName, ws2D));
- CurveFitting::Fit alg2;
+ CurveFitting::Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/ProductFunctionTest.h b/Framework/CurveFitting/test/Functions/ProductFunctionTest.h
index a87ac082001..41e6db65efb 100644
--- a/Framework/CurveFitting/test/Functions/ProductFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/ProductFunctionTest.h
@@ -6,7 +6,7 @@
#include "MantidCurveFitting/Functions/ProductFunction.h"
#include "MantidCurveFitting/Functions/Gaussian.h"
#include "MantidCurveFitting/Jacobian.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
@@ -21,6 +21,7 @@
typedef Mantid::DataObjects::Workspace2D_sptr WS_type;
using Mantid::CurveFitting::Functions::ProductFunction;
using Mantid::CurveFitting::Functions::Gaussian;
+using Mantid::CurveFitting::Algorithms::Fit;
class ProductFunctionMWTest_Gauss : public Mantid::API::IPeakFunction {
public:
@@ -251,7 +252,7 @@ public:
Mantid::API::AnalysisDataService::Instance().add(wsName, ws);
- Mantid::CurveFitting::Fit fit;
+ Mantid::CurveFitting::Algorithms::Fit fit;
fit.initialize();
f0->tie("PeakCentre", "1.0");
diff --git a/Framework/CurveFitting/test/Functions/QuadraticTest.h b/Framework/CurveFitting/test/Functions/QuadraticTest.h
index 72836c16fd7..293b34a479a 100644
--- a/Framework/CurveFitting/test/Functions/QuadraticTest.h
+++ b/Framework/CurveFitting/test/Functions/QuadraticTest.h
@@ -5,7 +5,7 @@
#include "MantidCurveFitting/Functions/Quadratic.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
@@ -18,7 +18,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
using Mantid::CurveFitting::Functions::Quadratic;
-using Mantid::CurveFitting::Fit;
+using Mantid::CurveFitting::Algorithms::Fit;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
diff --git a/Framework/CurveFitting/test/Functions/ResolutionTest.h b/Framework/CurveFitting/test/Functions/ResolutionTest.h
index c4adc4e2e5e..7ac7e7a642c 100644
--- a/Framework/CurveFitting/test/Functions/ResolutionTest.h
+++ b/Framework/CurveFitting/test/Functions/ResolutionTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidCurveFitting/Functions/Resolution.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidCurveFitting/Functions/Convolution.h"
#include "MantidAPI/IPeakFunction.h"
#include "MantidAPI/FunctionFactory.h"
@@ -170,7 +170,7 @@ public:
conv.addFunction(res);
conv.addFunction(gauss);
- Fit fit;
+ Algorithms::Fit fit;
fit.initialize();
fit.setPropertyValue("Function", conv.asString());
fit.setPropertyValue("InputWorkspace", "ResolutionTest_WS");
diff --git a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h
index 7cf2b5b478e..75aabd12039 100644
--- a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h
+++ b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTest.h
@@ -7,7 +7,7 @@
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
@@ -51,7 +51,7 @@ public:
}
void testAgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesExpDecayTest.h b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesExpDecayTest.h
index a47df64ce63..41872069e5d 100644
--- a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesExpDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesExpDecayTest.h
@@ -5,7 +5,7 @@
#include "MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h"
#include "MantidAPI/FunctionFactory.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
using Mantid::CurveFitting::Functions::StaticKuboToyabeTimesExpDecay;
@@ -14,6 +14,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::DataObjects;
class StaticKuboToyabeTimesExpDecayTest : public CxxTest::TestSuite {
@@ -70,7 +71,7 @@ public:
}
void test_AgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesGausDecayTest.h b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesGausDecayTest.h
index 74ad5d74c8c..f2571820914 100644
--- a/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesGausDecayTest.h
+++ b/Framework/CurveFitting/test/Functions/StaticKuboToyabeTimesGausDecayTest.h
@@ -5,7 +5,7 @@
#include "MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h"
#include "MantidAPI/FunctionFactory.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidDataObjects/Workspace2D.h"
using Mantid::CurveFitting::Functions::StaticKuboToyabeTimesGausDecay;
@@ -13,6 +13,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::DataObjects;
class StaticKuboToyabeTimesGausDecayTest : public CxxTest::TestSuite {
@@ -69,7 +70,7 @@ public:
}
void test_AgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h b/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h
index 47c85a7e681..8bbbfb9041c 100644
--- a/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h
+++ b/Framework/CurveFitting/test/Functions/StretchExpMuonTest.h
@@ -7,7 +7,7 @@
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
@@ -20,6 +20,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::DataObjects;
class StretchExpMuonTest : public CxxTest::TestSuite {
@@ -55,7 +56,7 @@ public:
}
void testAgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/Functions/StretchExpTest.h b/Framework/CurveFitting/test/Functions/StretchExpTest.h
index b90876d0e5b..a17208356f7 100644
--- a/Framework/CurveFitting/test/Functions/StretchExpTest.h
+++ b/Framework/CurveFitting/test/Functions/StretchExpTest.h
@@ -7,7 +7,7 @@
#include "MantidAPI/CompositeFunction.h"
#include "MantidCurveFitting/Functions/LinearBackground.h"
#include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceFactory.h"
@@ -22,6 +22,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Functions;
+using namespace Mantid::CurveFitting::Algorithms;
using namespace Mantid::DataObjects;
class StretchExpTest_Jacobian : public Mantid::API::Jacobian {
@@ -66,7 +67,7 @@ public:
}
void testAgainstMockData() {
- Fit alg2;
+ Algorithms::Fit alg2;
TS_ASSERT_THROWS_NOTHING(alg2.initialize());
TS_ASSERT(alg2.isInitialized());
diff --git a/Framework/CurveFitting/test/MultiDomainFunctionTest.h b/Framework/CurveFitting/test/MultiDomainFunctionTest.h
index 5061940cfea..ee12edfc8fd 100644
--- a/Framework/CurveFitting/test/MultiDomainFunctionTest.h
+++ b/Framework/CurveFitting/test/MultiDomainFunctionTest.h
@@ -11,7 +11,7 @@
#include "MantidAPI/FrameworkManager.h"
#include "MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h"
#include "MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h"
-#include "MantidCurveFitting/Fit.h"
+#include "MantidCurveFitting/Algorithms/Fit.h"
#include "MantidTestHelpers/FakeObjects.h"
@@ -24,6 +24,7 @@ using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::CostFunctions;
+using namespace Mantid::CurveFitting::Algorithms;
class MultiDomainFunctionTest_Function : public virtual IFunction1D,
public virtual ParamFunction {
@@ -187,7 +188,7 @@ public:
multi->getFunction(2)->setParameter("A", 0);
multi->getFunction(2)->setParameter("B", 0);
- Fit fit;
+ Algorithms::Fit fit;
fit.initialize();
fit.setProperty("Function", boost::dynamic_pointer_cast<IFunction>(multi));
fit.setProperty("InputWorkspace", ws1);
--
GitLab
From 516ecf4917f78cffaa4c25dc9d94db718517f734 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 9 Oct 2015 09:42:31 +0100
Subject: [PATCH 101/223] fix axis title, and add convenience update method, re
#12551
---
MantidPlot/src/Graph.cpp | 44 +++++++++++++++++++++++-----------------
MantidPlot/src/Graph.h | 2 ++
2 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/MantidPlot/src/Graph.cpp b/MantidPlot/src/Graph.cpp
index f4d4c946070..57717688bd2 100644
--- a/MantidPlot/src/Graph.cpp
+++ b/MantidPlot/src/Graph.cpp
@@ -3416,12 +3416,15 @@ QString Graph::yAxisTitleFromFirstCurve()
using namespace Mantid::API;
QString wsName = firstCurve->workspaceName();
auto ws = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(wsName.toStdString());
- return MantidQt::API::PlotAxis(m_isDistribution, *ws).title();
- }
- else
- {
- return axisTitle(0);
+ if (ws)
+ return MantidQt::API::PlotAxis(m_isDistribution, *ws).title();
+ } else if (auto *firstCurve = dynamic_cast<MantidMDCurve*>(curve(0))) {
+ MantidQwtIMDWorkspaceData* data = firstCurve->mantidData();
+ if (data)
+ return data->getYAxisLabel();
}
+
+ return axisTitle(0);
}
void Graph::contextMenuEvent(QContextMenuEvent *e)
@@ -5524,9 +5527,9 @@ void Graph::noNormalization()
if(!m_isDistribution) return; // Nothing to do
m_isDistribution = false;
- updateDataCurves();
- d_plot->updateAxes();
- setYAxisTitle(yAxisTitleFromFirstCurve());
+
+ updateCurvesAndAxes();
+
notifyChanges();
}
@@ -5538,9 +5541,8 @@ void Graph::binWidthNormalization()
if(m_isDistribution) return; // Nothing to do
m_isDistribution = true;
- updateDataCurves();
- d_plot->updateAxes();
- setYAxisTitle(yAxisTitleFromFirstCurve());
+
+ updateCurvesAndAxes();
notifyChanges();
}
@@ -5555,9 +5557,7 @@ void Graph::noNormalizationMD()
setNormalizationMD(0);
- updateDataCurves();
- d_plot->updateAxes();
- setYAxisTitle(yAxisTitleFromFirstCurve());
+ updateCurvesAndAxes();
notifyChanges();
}
@@ -5572,9 +5572,7 @@ void Graph::volumeNormalizationMD()
setNormalizationMD(1);
- updateDataCurves();
- d_plot->updateAxes();
- setYAxisTitle(yAxisTitleFromFirstCurve());
+ updateCurvesAndAxes();
notifyChanges();
}
@@ -5589,11 +5587,19 @@ void Graph::numEventsNormalizationMD()
setNormalizationMD(2);
+ updateCurvesAndAxes();
+
+ notifyChanges();
+}
+
+/**
+ * Convenience method to use when updating the normalization types
+ * (whether Matrix or MD data normalizatio).
+ */
+void Graph::updateCurvesAndAxes() {
updateDataCurves();
d_plot->updateAxes();
setYAxisTitle(yAxisTitleFromFirstCurve());
-
- notifyChanges();
}
void Graph::setWaterfallXOffset(int offset)
diff --git a/MantidPlot/src/Graph.h b/MantidPlot/src/Graph.h
index 2905093a844..34ae08f03ca 100644
--- a/MantidPlot/src/Graph.h
+++ b/MantidPlot/src/Graph.h
@@ -827,6 +827,8 @@ private:
QString yAxisTitleFromFirstCurve();
+ void updateCurvesAndAxes();
+
Plot *d_plot;
QwtPlotZoomer *d_zoomer[2];
TitlePicker *titlePicker;
--
GitLab
From 1b99aeb5109fdd43f1011136ecb9aa5e9c6aff6c Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Fri, 9 Oct 2015 09:48:21 +0100
Subject: [PATCH 102/223] Doxygen comments added
Refs #13508
---
.../inc/MantidMDAlgorithms/CompactMD.h | 1 +
Framework/MDAlgorithms/src/CompactMD.cpp | 33 ++++++++++++++++---
2 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
index 8548e5ae10e..c206f73b540 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
@@ -53,6 +53,7 @@ public:
const std::string category() const { return "MDAlgorithms"; }
/// Algorithm's version for identification
int version() const { return 1; }
+ /// Finding the extents of the first non-zero signals.
void
findFirstNonZeroMinMaxExtents(Mantid::API::IMDHistoWorkspace_sptr inputWs,
std::vector<Mantid::coord_t> &minVec,
diff --git a/Framework/MDAlgorithms/src/CompactMD.cpp b/Framework/MDAlgorithms/src/CompactMD.cpp
index 9ea2877978b..7c815d5277f 100644
--- a/Framework/MDAlgorithms/src/CompactMD.cpp
+++ b/Framework/MDAlgorithms/src/CompactMD.cpp
@@ -5,10 +5,19 @@ using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
namespace {
-// helper method to create a string from min and max extents (with non-zero
-// signals)
-// ready to be used as the PBins for IntegrateMDHistoWorkspace algorithm in
-// exec.
+/**
+ * helper method to create a string from min and max extents (with non-zero
+ * signals) ready to be used as the PBins for IntegrateMDHistoWorkspace
+ * algorithm in
+ * exec
+ * @param minVector : Vector containing the minimum extents that we will crop
+ * to.
+ * @param maxVector : Vector containing the maximum extents that we will crop
+ * to.
+ * @param inputWs : Used in the calculation from centre to bin edges
+ * @return : a string vector of binning parameters for IntegrateMDHistoWorkspace
+ * to take as input.
+*/
std::vector<std::string>
createPBinStringVector(std::vector<Mantid::coord_t> minVector,
std::vector<Mantid::coord_t> maxVector,
@@ -39,6 +48,16 @@ namespace MDAlgorithms {
DECLARE_ALGORITHM(CompactMD)
+/**
+* Finding the centre points of Bins with non-zero signal values
+* we then compare this centre to minimum and maximum centres we have
+* to get the minimum and maximum extents of the workspace that has non-zero
+* signal values in the Bins.
+* @param inputWs : The workspace that will be iterated over to find the extents.
+* @param minVec : Vector used to stored the minimum extent in each dimension
+* @param maxVec : Vector used to stored the maximum extents in each dimension
+*/
+
void CompactMD::findFirstNonZeroMinMaxExtents(
IMDHistoWorkspace_sptr inputWs, std::vector<Mantid::coord_t> &minVec,
std::vector<Mantid::coord_t> &maxVec) {
@@ -66,6 +85,9 @@ void CompactMD::findFirstNonZeroMinMaxExtents(
} while (ws_iter->next());
}
+/**
+* Initiliase the algorithm's properties.
+*/
void CompactMD::init() {
// input workspace to compact
declareProperty(new WorkspaceProperty<IMDHistoWorkspace>("InputWorkspace", "",
@@ -76,6 +98,9 @@ void CompactMD::init() {
"OutputWorkspace", "", Direction::Output),
"Output compacted workspace");
}
+/**
+* Execute the algorithm.
+*/
void CompactMD::exec() {
const IMDHistoWorkspace_sptr input_ws = this->getProperty("InputWorkspace");
IMDWorkspace_sptr out_ws;
--
GitLab
From 8068bb0e78c0f2801d7fd26f82cd9bf951a1cae9 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Fri, 9 Oct 2015 09:48:25 +0100
Subject: [PATCH 103/223] Adjustments to make move_class work on windows.
(in a git bash shell)
re #13347
---
buildconfig/move_class.py | 58 +++++++++++++++++++++------------------
1 file changed, 31 insertions(+), 27 deletions(-)
diff --git a/buildconfig/move_class.py b/buildconfig/move_class.py
index e51e53c45c2..09b62d51fee 100755
--- a/buildconfig/move_class.py
+++ b/buildconfig/move_class.py
@@ -15,32 +15,36 @@ def move_one(subproject, classname, newproject, newclassname, oldfilename, newfi
"""Move one file """
# Move the file
- cmd = "mv " + oldfilename + " " + newfilename
- if not args.no_vcs:
- cmd = "git " + cmd
- print "Running:", cmd
- retval = os.system(cmd)
- if retval != 0:
- raise RuntimeError("Error executing cmd '%s'" % cmd)
-
- f = open(newfilename, 'r')
- text = f.read()
- f.close()
-
- # Replace any includes of it
- text = text.replace("Mantid" + subproject + "/" + args.source_subfolder + classname + ".h",
- "Mantid" + newproject + "/" + args.dest_subfolder + newclassname + ".h")
-
- #Replace the guard
- old_guard = "MANTID_%s_%s_H_" % (subproject.upper(), classname.upper())
- new_guard = "MANTID_%s_%s_H_" % (newproject.upper(), newclassname.upper())
- text = text.replace(old_guard, new_guard)
-
- # Replace the namespace declaration
- text = text.replace("namespace " + subproject, "namespace " + newproject)
- # Replace the conents
- f = open(newfilename, 'w')
- f.write(text)
+ try:
+ cmd = "mv " + oldfilename + " " + newfilename
+ cmd = cmd.replace("\\","/")
+ if not args.no_vcs:
+ cmd = "git " + cmd
+ print "Running:", cmd
+ retval = os.system(cmd)
+ if retval != 0:
+ raise RuntimeError("Error executing cmd '%s'" % cmd)
+
+ f = open(newfilename, 'r')
+ text = f.read()
+ f.close()
+
+ # Replace any includes of it
+ text = text.replace("Mantid" + subproject + "/" + args.source_subfolder + classname + ".h",
+ "Mantid" + newproject + "/" + args.dest_subfolder + newclassname + ".h")
+
+ #Replace the guard
+ old_guard = "MANTID_%s_%s_H_" % (subproject.upper(), classname.upper())
+ new_guard = "MANTID_%s_%s_H_" % (newproject.upper(), newclassname.upper())
+ text = text.replace(old_guard, new_guard)
+
+ # Replace the namespace declaration
+ text = text.replace("namespace " + subproject, "namespace " + newproject)
+ # Replace the conents
+ f = open(newfilename, 'w')
+ f.write(text)
+ except RuntimeError as err:
+ print err
@@ -57,7 +61,7 @@ def move_all(subproject, classname, newproject, newclassname, args):
newheaderfile = os.path.join(newbasedir, "inc/" + new_header_folder + "/" + args.dest_subfolder + newclassname + ".h")
newsourcefile = os.path.join(newbasedir, "src/" + args.dest_subfolder + newclassname + ".cpp")
- newtestfile = os.path.join(newbasedir, "test/" + newclassname + "Test.h")
+ newtestfile = os.path.join(newbasedir, "test/" + args.dest_subfolder + newclassname + "Test.h")
if args.header and not overwrite and os.path.exists(newheaderfile):
print "\nError! Header file %s already exists. Use --force to overwrite.\n" % newheaderfile
--
GitLab
From 82895be84056b4bf897c5263d8d74c99c943f985 Mon Sep 17 00:00:00 2001
From: Shahroz Ahmed <shahroz.ahmed@stfc.ac.uk>
Date: Fri, 9 Oct 2015 09:51:05 +0100
Subject: [PATCH 104/223] Missing function in the mock file
Refs #13811
---
MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h b/MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h
index 01b8d4db8e8..90e5fc4a27d 100644
--- a/MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h
+++ b/MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h
@@ -116,6 +116,9 @@ public:
// virtual void plotWaterfallSpectrum
MOCK_METHOD1(plotWaterfallSpectrum, void(const std::string &wsName));
+ // virtual void plotReplacingWindow
+ MOCK_METHOD1(plotReplacingWindow, void(const std::string &wsName));
+
// std::string currentPlotType
MOCK_CONST_METHOD0(currentPlotType, int());
};
--
GitLab
From 2508c2fcc2bbd9f4f5fca38bf0e26293b2ded887 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Fri, 9 Oct 2015 10:16:37 +0100
Subject: [PATCH 105/223] Apply formatting patch
re #13347
---
Framework/API/inc/MantidAPI/IFunction1D.h | 3 +-
.../Algorithms/CalculateGammaBackground.h | 21 +++--
.../Algorithms/CalculateMSVesuvio.h | 10 +--
.../Algorithms/FitPowderDiffPeaks.h | 87 ++++++++++---------
.../MantidCurveFitting/Algorithms/LeBailFit.h | 3 +-
.../Algorithms/LeBailFunction.h | 2 +-
.../MantidCurveFitting/Algorithms/PawleyFit.h | 4 +-
.../CostFunctions/CostFuncFitting.h | 2 +-
.../CostFunctions/CostFuncIgnorePosPeaks.h | 2 +-
.../CostFunctions/CostFuncLeastSquares.h | 2 +-
.../CostFunctions/CostFuncRwp.h | 2 +-
.../CostFuncUnweightedLeastSquares.h | 2 +-
.../FuncMinimizers/BFGS_Minimizer.h | 2 +-
.../FuncMinimizers/DampingMinimizer.h | 6 +-
.../FuncMinimizers/DerivMinimizer.h | 2 +-
.../FuncMinimizers/FABADAMinimizer.h | 2 +-
.../FRConjugateGradientMinimizer.h | 2 +-
.../LevenbergMarquardtMDMinimizer.h | 2 +-
.../LevenbergMarquardtMinimizer.h | 2 +-
.../PRConjugateGradientMinimizer.h | 2 +-
.../FuncMinimizers/SimplexMinimizer.h | 2 +-
.../FuncMinimizers/SteepestDescentMinimizer.h | 2 +-
.../Functions/ComptonProfile.h | 3 +-
.../Functions/GramCharlierComptonProfile.h | 3 +-
.../Functions/VesuvioResolution.h | 1 -
.../inc/MantidCurveFitting/ParDomain.h | 9 +-
.../inc/MantidCurveFitting/SeqDomain.h | 9 +-
.../Algorithms/CalculateGammaBackground.cpp | 16 ++--
.../src/Algorithms/CalculateMSVesuvio.cpp | 6 +-
.../src/Algorithms/FitPowderDiffPeaks.cpp | 3 +-
.../src/Algorithms/LeBailFunction.cpp | 3 +-
.../CurveFitting/src/Algorithms/PawleyFit.cpp | 13 +--
.../RefinePowderInstrumentParameters.cpp | 6 +-
.../RefinePowderInstrumentParameters3.cpp | 5 +-
.../src/CostFunctions/CostFuncFitting.cpp | 2 +-
.../CostFunctions/CostFuncIgnorePosPeaks.cpp | 2 +-
.../CostFunctions/CostFuncLeastSquares.cpp | 2 +-
.../src/CostFunctions/CostFuncRwp.cpp | 2 +-
.../CostFuncUnweightedLeastSquares.cpp | 2 +-
.../src/FuncMinimizers/BFGS_Minimizer.cpp | 2 +-
.../src/FuncMinimizers/DampingMinimizer.cpp | 6 +-
.../src/FuncMinimizers/DerivMinimizer.cpp | 11 ++-
.../src/FuncMinimizers/FABADAMinimizer.cpp | 9 +-
.../FRConjugateGradientMinimizer.cpp | 2 +-
.../LevenbergMarquardtMDMinimizer.cpp | 6 +-
.../LevenbergMarquardtMinimizer.cpp | 5 +-
.../PRConjugateGradientMinimizer.cpp | 2 +-
.../src/FuncMinimizers/SimplexMinimizer.cpp | 5 +-
.../SteepestDescentMinimizer.cpp | 2 +-
.../CurveFitting/src/Functions/Abragam.cpp | 1 -
.../src/Functions/BackToBackExponential.cpp | 1 -
.../src/Functions/BackgroundFunction.cpp | 1 -
.../src/Functions/BivariateNormal.cpp | 3 +-
.../src/Functions/Bk2BkExpConvPV.cpp | 2 -
.../src/Functions/ChebfunBase.cpp | 8 +-
.../CurveFitting/src/Functions/Chebyshev.cpp | 1 -
.../src/Functions/ComptonPeakProfile.cpp | 5 +-
.../src/Functions/ComptonProfile.cpp | 16 ++--
.../src/Functions/Convolution.cpp | 1 -
.../src/Functions/CubicSpline.cpp | 1 -
.../src/Functions/DeltaFunction.cpp | 1 -
.../src/Functions/DiffRotDiscreteCircle.cpp | 3 +-
.../CurveFitting/src/Functions/DiffSphere.cpp | 3 +-
.../src/Functions/DynamicKuboToyabe.cpp | 1 -
.../CurveFitting/src/Functions/EndErfc.cpp | 1 -
.../CurveFitting/src/Functions/ExpDecay.cpp | 1 -
.../src/Functions/ExpDecayMuon.cpp | 1 -
.../src/Functions/ExpDecayOsc.cpp | 1 -
.../src/Functions/FlatBackground.cpp | 1 -
.../CurveFitting/src/Functions/GausDecay.cpp | 1 -
.../CurveFitting/src/Functions/GausOsc.cpp | 1 -
.../CurveFitting/src/Functions/Gaussian.cpp | 1 -
.../Functions/GramCharlierComptonProfile.cpp | 12 +--
.../src/Functions/IkedaCarpenterPV.cpp | 1 -
.../src/Functions/LinearBackground.cpp | 1 -
.../CurveFitting/src/Functions/LogNormal.cpp | 1 -
.../CurveFitting/src/Functions/Lorentzian.cpp | 1 -
.../src/Functions/Lorentzian1D.cpp | 1 -
.../src/Functions/MuonFInteraction.cpp | 1 -
.../Functions/NeutronBk2BkExpConvPVoigt.cpp | 1 -
.../src/Functions/PawleyFunction.cpp | 3 +-
.../src/Functions/PeakParameterFunction.cpp | 1 -
.../CurveFitting/src/Functions/Polynomial.cpp | 2 -
.../src/Functions/ProcessBackground.cpp | 7 +-
.../src/Functions/ProductLinearExp.cpp | 1 -
.../src/Functions/PseudoVoigt.cpp | 3 +-
.../CurveFitting/src/Functions/Quadratic.cpp | 1 -
.../src/Functions/ReflectivityMulf.cpp | 2 -
.../CurveFitting/src/Functions/Resolution.cpp | 1 -
.../src/Functions/StaticKuboToyabe.cpp | 1 -
.../StaticKuboToyabeTimesExpDecay.cpp | 1 -
.../CurveFitting/src/Functions/StretchExp.cpp | 1 -
.../src/Functions/StretchExpMuon.cpp | 1 -
.../Functions/ThermalNeutronBk2BkExpAlpha.cpp | 1 -
.../Functions/ThermalNeutronBk2BkExpBeta.cpp | 1 -
.../ThermalNeutronBk2BkExpConvPVoigt.cpp | 1 -
.../Functions/ThermalNeutronBk2BkExpSigma.cpp | 1 -
.../ThermalNeutronDtoTOFFunction.cpp | 1 -
.../src/Functions/UserFunction.cpp | 1 -
.../src/Functions/UserFunction1D.cpp | 1 -
.../src/Functions/VesuvioResolution.cpp | 6 +-
Framework/CurveFitting/src/GSLFunctions.cpp | 3 +-
Framework/CurveFitting/src/ParDomain.cpp | 3 +-
Framework/CurveFitting/src/SeqDomain.cpp | 7 +-
.../test/Constraints/BoundaryConstraintTest.h | 2 +-
.../ComptonScatteringCountRateTest.h | 1 -
.../Functions/DiffRotDiscreteCircleTest.h | 26 ++----
.../test/Functions/DiffSphereTest.h | 23 ++---
.../Functions/GaussianComptonProfileTest.h | 3 +-
.../GramCharlierComptonProfileTest.h | 6 +-
.../test/Functions/IkedaCarpenterPVTest.h | 6 +-
.../test/Functions/ProductFunctionTest.h | 3 +-
112 files changed, 225 insertions(+), 272 deletions(-)
diff --git a/Framework/API/inc/MantidAPI/IFunction1D.h b/Framework/API/inc/MantidAPI/IFunction1D.h
index be43c377419..f40d2b454d6 100644
--- a/Framework/API/inc/MantidAPI/IFunction1D.h
+++ b/Framework/API/inc/MantidAPI/IFunction1D.h
@@ -12,8 +12,7 @@
namespace Mantid {
namespace CurveFitting {
-namespace Algorithms
-{
+namespace Algorithms {
class Fit;
}
}
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
index 74a42ea1fe6..ac575bb8035 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
@@ -16,7 +16,6 @@ namespace Algorithms {
//---------------------------------------------------------------------------
struct DetectorParams;
-
/**
Copyright © 2013 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
@@ -79,17 +78,17 @@ private:
void calculateBackgroundFromFoils(const size_t inputIndex,
const size_t outputIndex);
/// Compute expected background from single foil for spectrum at wsIndex
- void calculateBackgroundSingleFoil(std::vector<double> &ctfoil,
- const size_t wsIndex,
- const FoilInfo &foilInfo,
- const Kernel::V3D &detPos,
- const DetectorParams &detPar,
- const CurveFitting::Functions::ResolutionParams &detRes);
+ void calculateBackgroundSingleFoil(
+ std::vector<double> &ctfoil, const size_t wsIndex,
+ const FoilInfo &foilInfo, const Kernel::V3D &detPos,
+ const DetectorParams &detPar,
+ const CurveFitting::Functions::ResolutionParams &detRes);
/// Compute a TOF spectrum for the given inputs & spectrum
- void calculateTofSpectrum(std::vector<double> &result,
- std::vector<double> &tmpWork, const size_t wsIndex,
- const DetectorParams &detpar,
- const CurveFitting::Functions::ResolutionParams &respar);
+ void
+ calculateTofSpectrum(std::vector<double> &result,
+ std::vector<double> &tmpWork, const size_t wsIndex,
+ const DetectorParams &detpar,
+ const CurveFitting::Functions::ResolutionParams &respar);
/// Check and store appropriate input data
void retrieveInputs();
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h
index 70bc7eced89..96d84d452da 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h
@@ -14,14 +14,12 @@ class RandomNumberGenerator;
struct Simulation;
struct SimulationWithErrors;
}
-namespace Functions{
+namespace Functions {
struct ResolutionParams;
}
namespace Algorithms {
struct DetectorParams;
-
-
/**
Calculates the multiple scattering & total scattering contributions
for a flat-plate or cylindrical sample.
@@ -90,7 +88,8 @@ private:
void cacheInputs();
void calculateMS(const size_t wsIndex, API::ISpectrum &totalsc,
API::ISpectrum &multsc) const;
- void simulate(const DetectorParams &detpar, const Functions::ResolutionParams &respar,
+ void simulate(const DetectorParams &detpar,
+ const Functions::ResolutionParams &respar,
MSVesuvioHelper::Simulation &simulCounts) const;
void assignToOutput(const MSVesuvioHelper::SimulationWithErrors &avgCounts,
API::ISpectrum &totalsc, API::ISpectrum &multsc) const;
@@ -118,7 +117,8 @@ private:
const double e1res) const;
// Member Variables
- CurveFitting::MSVesuvioHelper::RandomNumberGenerator *m_randgen; // random number generator
+ CurveFitting::MSVesuvioHelper::RandomNumberGenerator *
+ m_randgen; // random number generator
size_t m_acrossIdx, m_upIdx, m_beamIdx; // indices of each direction
Kernel::V3D m_beamDir; // Directional vector for beam
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
index 452946ce661..5c1513137cd 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
@@ -123,23 +123,25 @@ private:
/// Fit single peak in robust mode (no hint)
bool fitSinglePeakRobust(Functions::BackToBackExponential_sptr peak,
- Functions::BackgroundFunction_sptr background, double leftdev,
- double rightdev,
+ Functions::BackgroundFunction_sptr background,
+ double leftdev, double rightdev,
std::map<std::string, double> rightpeakparammap,
double &finalchi2);
/// Fit signle peak by Monte Carlo/simulated annealing
- bool fitSinglePeakSimulatedAnnealing(Functions::BackToBackExponential_sptr peak,
- std::vector<std::string> paramtodomc);
+ bool
+ fitSinglePeakSimulatedAnnealing(Functions::BackToBackExponential_sptr peak,
+ std::vector<std::string> paramtodomc);
/// Fit peak with confidence of the centre
bool fitSinglePeakConfidentX(Functions::BackToBackExponential_sptr peak);
/// Fit peak with trustful peak parameters
- bool fitSinglePeakConfident(Functions::BackToBackExponential_sptr peak,
- Functions::BackgroundFunction_sptr backgroundfunction,
- double leftbound, double rightbound, double &chi2,
- bool &annhilatedpeak);
+ bool
+ fitSinglePeakConfident(Functions::BackToBackExponential_sptr peak,
+ Functions::BackgroundFunction_sptr backgroundfunction,
+ double leftbound, double rightbound, double &chi2,
+ bool &annhilatedpeak);
/// Fit peak with confident parameters
bool fitSinglePeakConfidentY(DataObjects::Workspace2D_sptr dataws,
@@ -147,25 +149,26 @@ private:
double dampingfactor);
/// Fit peaks with confidence in fwhm and etc.
- bool fitOverlappedPeaks(std::vector<Functions::BackToBackExponential_sptr> peaks,
- Functions::BackgroundFunction_sptr backgroundfunction,
- double gfwhm);
+ bool
+ fitOverlappedPeaks(std::vector<Functions::BackToBackExponential_sptr> peaks,
+ Functions::BackgroundFunction_sptr backgroundfunction,
+ double gfwhm);
/// Fit multiple (overlapped) peaks
- bool doFitMultiplePeaks(DataObjects::Workspace2D_sptr dataws, size_t wsindex,
- API::CompositeFunction_sptr peaksfunc,
- std::vector<Functions::BackToBackExponential_sptr> peakfuncs,
- std::vector<bool> &vecfitgood,
- std::vector<double> &vecchi2s);
+ bool doFitMultiplePeaks(
+ DataObjects::Workspace2D_sptr dataws, size_t wsindex,
+ API::CompositeFunction_sptr peaksfunc,
+ std::vector<Functions::BackToBackExponential_sptr> peakfuncs,
+ std::vector<bool> &vecfitgood, std::vector<double> &vecchi2s);
/// Use Le Bail method to estimate and set the peak heights
- void estimatePeakHeightsLeBail(DataObjects::Workspace2D_sptr dataws,
- size_t wsindex,
- std::vector<Functions::BackToBackExponential_sptr> peaks);
+ void estimatePeakHeightsLeBail(
+ DataObjects::Workspace2D_sptr dataws, size_t wsindex,
+ std::vector<Functions::BackToBackExponential_sptr> peaks);
/// Set constraints on a group of overlapped peaks for fitting
- void
- setOverlappedPeaksConstraints(std::vector<Functions::BackToBackExponential_sptr> peaks);
+ void setOverlappedPeaksConstraints(
+ std::vector<Functions::BackToBackExponential_sptr> peaks);
/// Fit 1 peak by 1 minimizer of 1 call of minimzer (simple version)
bool doFit1PeakSimple(DataObjects::Workspace2D_sptr dataws,
@@ -182,10 +185,11 @@ private:
// string minimzername, size_t maxiteration, double &chi2);
/// Fit single peak with background to raw data
- bool doFit1PeakBackground(DataObjects::Workspace2D_sptr dataws,
- size_t wsindex, Functions::BackToBackExponential_sptr peak,
- Functions::BackgroundFunction_sptr backgroundfunction,
- double &chi2);
+ bool
+ doFit1PeakBackground(DataObjects::Workspace2D_sptr dataws, size_t wsindex,
+ Functions::BackToBackExponential_sptr peak,
+ Functions::BackgroundFunction_sptr backgroundfunction,
+ double &chi2);
/// Fit 1 peak by using a sequential of minimizer
bool doFit1PeakSequential(DataObjects::Workspace2D_sptr dataws,
@@ -196,11 +200,11 @@ private:
std::vector<double> dampfactors, double &chi2);
/// Fit N overlapped peaks in a simple manner
- bool doFitNPeaksSimple(DataObjects::Workspace2D_sptr dataws, size_t wsindex,
- API::CompositeFunction_sptr peaksfunc,
- std::vector<Functions::BackToBackExponential_sptr> peakfuncs,
- std::string minimizername, size_t maxiteration,
- double &chi2);
+ bool doFitNPeaksSimple(
+ DataObjects::Workspace2D_sptr dataws, size_t wsindex,
+ API::CompositeFunction_sptr peaksfunc,
+ std::vector<Functions::BackToBackExponential_sptr> peakfuncs,
+ std::string minimizername, size_t maxiteration, double &chi2);
/// Store the function's parameter values to a map
void storeFunctionParameters(API::IFunction_sptr function,
@@ -267,17 +271,19 @@ private:
/// Fit background function by removing the peak properly
bool doFitBackground(DataObjects::Workspace2D_sptr dataws,
- Functions::BackgroundFunction_sptr background, double leftpeakbound,
- double rightpeakbound);
+ Functions::BackgroundFunction_sptr background,
+ double leftpeakbound, double rightpeakbound);
/// Fit single peak without background
- std::pair<bool, double> doFitPeak_Old(DataObjects::Workspace2D_sptr dataws,
- Functions::BackToBackExponential_sptr peak,
- double guessedfwhm, bool calchi2);
+ std::pair<bool, double>
+ doFitPeak_Old(DataObjects::Workspace2D_sptr dataws,
+ Functions::BackToBackExponential_sptr peak, double guessedfwhm,
+ bool calchi2);
- std::pair<bool, double> doFitPeak(DataObjects::Workspace2D_sptr dataws,
- Functions::BackToBackExponential_sptr peakfunction,
- double guessedfwhm);
+ std::pair<bool, double>
+ doFitPeak(DataObjects::Workspace2D_sptr dataws,
+ Functions::BackToBackExponential_sptr peakfunction,
+ double guessedfwhm);
/// Fit background-removed peak by Gaussian
bool doFitGaussianPeak(DataObjects::Workspace2D_sptr dataws, size_t m_wsIndex,
@@ -332,8 +338,9 @@ private:
// CurveFitting::BackToBackExponential_sptr> m_peaksmap;
/// Sorted vector for peaks. double = d_h, vector = (HKL), peak
- std::vector<std::pair<
- double, std::pair<std::vector<int>, Functions::BackToBackExponential_sptr>>>
+ std::vector<
+ std::pair<double, std::pair<std::vector<int>,
+ Functions::BackToBackExponential_sptr>>>
m_vecPeakFunctions;
/// Peak fitting information
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h
index 852642ba42c..dd92a572da7 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h
@@ -168,8 +168,7 @@ private:
/// Calcualate the peak heights of a group of overlapped peaks
bool calculateGroupPeakIntensities(
std::vector<std::pair<
- double, Functions::ThermalNeutronBk2BkExpConvPVoigt_sptr>>
- peakgroup,
+ double, Functions::ThermalNeutronBk2BkExpConvPVoigt_sptr>> peakgroup,
API::MatrixWorkspace_sptr dataws, size_t wsindex, bool zerobackground,
std::vector<double> &allpeaksvalues);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFunction.h
index 081e9f5e844..656bdc5066b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFunction.h
@@ -14,7 +14,7 @@ namespace Algorithms {
/** LeBailFunction : LeBailFunction is to calculate peak intensities in a
composite
* function including neutron peak and background functions.
- * Note: This is not a Mantid Fit Function, just a helper
+ * Note: This is not a Mantid Fit Function, just a helper
* class to the algorithm
@date 2013-04-26 : original LeBailFunction is not used by any other functions.
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h
index 6b83f391c2a..7bddf3ec398 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h
@@ -84,8 +84,8 @@ protected:
API::ITableWorkspace_sptr
getLatticeFromFunction(const Functions::PawleyFunction_sptr &pawleyFn) const;
- API::ITableWorkspace_sptr
- getPeakParametersFromFunction(const Functions::PawleyFunction_sptr &pawleyFn) const;
+ API::ITableWorkspace_sptr getPeakParametersFromFunction(
+ const Functions::PawleyFunction_sptr &pawleyFn) const;
API::IFunction_sptr
getCompositeFunction(const Functions::PawleyFunction_sptr &pawleyFn) const;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
index 10798d98883..41cc8170906 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
@@ -101,7 +101,7 @@ protected:
mutable bool m_dirtyHessian; /// dirty hessian flag
};
-} // namespace CostFunctions
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncIgnorePosPeaks.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncIgnorePosPeaks.h
index 3ff4f734a25..2a38310ecf3 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncIgnorePosPeaks.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncIgnorePosPeaks.h
@@ -62,7 +62,7 @@ private:
const std::string m_name;
};
-} // namespace CostFunctions
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
index bd3f28187f4..9cddfed3e87 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
@@ -108,7 +108,7 @@ protected:
double m_factor;
};
-} // namespace CostFunctions
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
index f8105e11d06..4c5b04e99c2 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
@@ -70,7 +70,7 @@ private:
double calSqrtW(API::FunctionValues_sptr values) const;
};
-} // namespace CostFunctions
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
index 3d0df2b5387..85f979e8876 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
@@ -54,7 +54,7 @@ protected:
double getResidualVariance() const;
};
-} // namespace CostFunctions
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
index d95d370ee8f..137e3f2f08b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
@@ -53,7 +53,7 @@ protected:
static Kernel::Logger &g_log;
};
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
index 882b42634a3..a09325d17a0 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
@@ -10,13 +10,11 @@
namespace Mantid {
namespace CurveFitting {
-namespace CostFunctions
-{
+namespace CostFunctions {
class CostFuncLeastSquares;
} // namespace CostFunctions
namespace FuncMinimisers {
-
/**
Implements a least squares minimization algorithm with damping.
@@ -66,7 +64,7 @@ private:
/// The damping mu parameter in the Levenberg-Marquardt method.
// double m_damping;
};
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
index bc3277e6df2..2da8b40ba41 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
@@ -95,7 +95,7 @@ private:
void initGSLMMin();
};
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
index f7547eb9efe..c2c5b5ebfb7 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
@@ -98,7 +98,7 @@ private:
size_t m_max_iter;
};
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
index 8d516e72aa4..683b3a8c3b0 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
@@ -52,7 +52,7 @@ protected:
virtual const gsl_multimin_fdfminimizer_type *getGSLMinimizerType();
};
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
index 57ce85a7f29..139b82aff02 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
@@ -73,7 +73,7 @@ private:
std::vector<double> m_D;
};
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
index 0431a6327bd..e2c786adb32 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
@@ -80,7 +80,7 @@ private:
double m_relError;
};
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
index 1c3a308127c..99f37e47c2b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
@@ -50,7 +50,7 @@ protected:
virtual const gsl_multimin_fdfminimizer_type *getGSLMinimizerType();
};
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
index b52f4823fd5..14e637fd956 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
@@ -88,7 +88,7 @@ private:
gsl_multimin_function gslContainer;
};
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
index 9c24fb6e34d..a251a9eae3b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
@@ -52,7 +52,7 @@ protected:
static Kernel::Logger &g_log;
};
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
index 3fcc850f8a0..58f9e65ab1f 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
@@ -62,7 +62,8 @@ public:
/// Pre-calculate the Y-space values with specified resolution parameters
void cacheYSpaceValues(const std::vector<double> &tseconds,
- const bool isHistogram, const Algorithms::DetectorParams &detpar,
+ const bool isHistogram,
+ const Algorithms::DetectorParams &detpar,
const ResolutionParams &respar);
/// Pre-calculate the Y-space values
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
index 8425949c143..14cbb33b841 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
@@ -76,7 +76,8 @@ private:
size_t wi, double startX, double endX);
/// Pre-calculate the Y-space values
void cacheYSpaceValues(const std::vector<double> &tseconds,
- const bool isHistogram, const Algorithms::DetectorParams &detpar);
+ const bool isHistogram,
+ const Algorithms::DetectorParams &detpar);
/// The active hermite coefficents
std::vector<short> m_hermite;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
index 4d0594a1818..18576a11ca4 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
@@ -16,7 +16,6 @@ struct DetectorParams;
}
namespace Functions {
-
//---------------------------------------------------------------------------
/// Simple data structure to store resolution parameter values
/// It avoids some functions taking a huge number of arguments
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h b/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h
index 35d36fbdecf..c695e7c06bd 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h
@@ -43,12 +43,13 @@ public:
virtual void getDomainAndValues(size_t i, API::FunctionDomain_sptr &domain,
API::FunctionValues_sptr &values) const;
/// Calculate the value of a least squares cost function
- virtual void leastSquaresVal(const CostFunctions::CostFuncLeastSquares &leastSquares);
+ virtual void
+ leastSquaresVal(const CostFunctions::CostFuncLeastSquares &leastSquares);
/// Calculate the value, first and second derivatives of a least squares cost
/// function
- virtual void
- leastSquaresValDerivHessian(const CostFunctions::CostFuncLeastSquares &leastSquares,
- bool evalDeriv, bool evalHessian);
+ virtual void leastSquaresValDerivHessian(
+ const CostFunctions::CostFuncLeastSquares &leastSquares, bool evalDeriv,
+ bool evalHessian);
};
} // namespace CurveFitting
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h b/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
index a2bf5722f30..7066b276f11 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
@@ -57,12 +57,13 @@ public:
/// Add new domain creator
void addCreator(API::IDomainCreator_sptr creator);
/// Calculate the value of a least squares cost function
- virtual void leastSquaresVal(const CostFunctions::CostFuncLeastSquares &leastSquares);
+ virtual void
+ leastSquaresVal(const CostFunctions::CostFuncLeastSquares &leastSquares);
/// Calculate the value, first and second derivatives of a least squares cost
/// function
- virtual void
- leastSquaresValDerivHessian(const CostFunctions::CostFuncLeastSquares &leastSquares,
- bool evalDeriv, bool evalHessian);
+ virtual void leastSquaresValDerivHessian(
+ const CostFunctions::CostFuncLeastSquares &leastSquares, bool evalDeriv,
+ bool evalHessian);
/// Calculate the value of a Rwp cost function
void rwpVal(const CostFunctions::CostFuncRwp &rwp);
/// Calculate the value, first and second derivatives of a RWP cost function
diff --git a/Framework/CurveFitting/src/Algorithms/CalculateGammaBackground.cpp b/Framework/CurveFitting/src/Algorithms/CalculateGammaBackground.cpp
index c86a0fb231e..a6281e12576 100644
--- a/Framework/CurveFitting/src/Algorithms/CalculateGammaBackground.cpp
+++ b/Framework/CurveFitting/src/Algorithms/CalculateGammaBackground.cpp
@@ -232,7 +232,8 @@ void CalculateGammaBackground::calculateSpectrumFromDetector(
DetectorParams detPar =
ConvertToYSpace::getDetectorParameters(m_inputWS, inputIndex);
CurveFitting::Functions::ResolutionParams detRes =
- CurveFitting::Functions::VesuvioResolution::getResolutionParameters(m_inputWS, inputIndex);
+ CurveFitting::Functions::VesuvioResolution::getResolutionParameters(
+ m_inputWS, inputIndex);
// Compute a time of flight spectrum convolved with a Voigt resolution
// function for each mass
@@ -259,7 +260,8 @@ void CalculateGammaBackground::calculateBackgroundFromFoils(
DetectorParams detPar =
ConvertToYSpace::getDetectorParameters(m_inputWS, inputIndex);
CurveFitting::Functions::ResolutionParams detRes =
- CurveFitting::Functions::VesuvioResolution::getResolutionParameters(m_inputWS, inputIndex);
+ CurveFitting::Functions::VesuvioResolution::getResolutionParameters(
+ m_inputWS, inputIndex);
const size_t nxvalues = m_backgroundWS->blocksize();
std::vector<double> foilSpectrum(nxvalues);
@@ -392,8 +394,9 @@ void CalculateGammaBackground::calculateTofSpectrum(
FunctionFactory::Instance().createInitialized(m_profileFunction));
for (size_t i = 0; i < m_npeaks; ++i) {
- auto profile = boost::dynamic_pointer_cast<CurveFitting::Functions::ComptonProfile>(
- profileFunction->getFunction(i));
+ auto profile =
+ boost::dynamic_pointer_cast<CurveFitting::Functions::ComptonProfile>(
+ profileFunction->getFunction(i));
profile->disableLogging();
profile->setUpForFit();
profile->cacheYSpaceValues(tseconds, false, detpar, respar);
@@ -426,8 +429,9 @@ void CalculateGammaBackground::retrieveInputs() {
boost::dynamic_pointer_cast<CompositeFunction>(profileFunction)) {
m_npeaks = composite->nFunctions();
for (size_t i = 0; i < m_npeaks; ++i) {
- auto single = boost::dynamic_pointer_cast<CurveFitting::Functions::ComptonProfile>(
- composite->getFunction(i));
+ auto single =
+ boost::dynamic_pointer_cast<CurveFitting::Functions::ComptonProfile>(
+ composite->getFunction(i));
if (!single) {
throw std::invalid_argument("Invalid function. Composite must contain "
"only ComptonProfile functions");
diff --git a/Framework/CurveFitting/src/Algorithms/CalculateMSVesuvio.cpp b/Framework/CurveFitting/src/Algorithms/CalculateMSVesuvio.cpp
index 48a2acdd375..c34d6b66b7c 100644
--- a/Framework/CurveFitting/src/Algorithms/CalculateMSVesuvio.cpp
+++ b/Framework/CurveFitting/src/Algorithms/CalculateMSVesuvio.cpp
@@ -140,7 +140,8 @@ void CalculateMSVesuvio::exec() {
MatrixWorkspace_sptr multsc = WorkspaceFactory::Instance().create(m_inputWS);
// Initialize random number generator
- m_randgen = new CurveFitting::MSVesuvioHelper::RandomNumberGenerator(getProperty("Seed"));
+ m_randgen = new CurveFitting::MSVesuvioHelper::RandomNumberGenerator(
+ getProperty("Seed"));
// Setup progress
const size_t nhist = m_inputWS->getNumberHistograms();
@@ -341,7 +342,8 @@ void CalculateMSVesuvio::calculateMS(const size_t wsIndex,
}
// Average over all runs and assign to output workspaces
- CurveFitting::MSVesuvioHelper::SimulationWithErrors avgCounts = accumulator.average();
+ CurveFitting::MSVesuvioHelper::SimulationWithErrors avgCounts =
+ accumulator.average();
avgCounts.normalise();
assignToOutput(avgCounts, totalsc, multsc);
}
diff --git a/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp b/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp
index 46957d36e5a..d83a59efd55 100644
--- a/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp
+++ b/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp
@@ -1858,8 +1858,7 @@ bool FitPowderDiffPeaks::doFitGaussianPeak(DataObjects::Workspace2D_sptr dataws,
double centerrightend = in_center + rightfwhm * 0.5;
Constraints::BoundaryConstraint *centerbound =
new Constraints::BoundaryConstraint(gaussianpeak.get(), "PeakCentre",
- centerleftend, centerrightend,
- false);
+ centerleftend, centerrightend, false);
gaussianpeak->addConstraint(centerbound);
// 3. Fit
diff --git a/Framework/CurveFitting/src/Algorithms/LeBailFunction.cpp b/Framework/CurveFitting/src/Algorithms/LeBailFunction.cpp
index 0c01dcc9994..0d9ee16925a 100644
--- a/Framework/CurveFitting/src/Algorithms/LeBailFunction.cpp
+++ b/Framework/CurveFitting/src/Algorithms/LeBailFunction.cpp
@@ -895,7 +895,8 @@ void LeBailFunction::addBackgroundFunction(
// Create background function from factory
auto background = FunctionFactory::Instance().createFunction(backgroundtype);
- m_background = boost::dynamic_pointer_cast<Functions::BackgroundFunction>(background);
+ m_background =
+ boost::dynamic_pointer_cast<Functions::BackgroundFunction>(background);
// Set order and initialize
m_background->setAttributeValue("n", static_cast<int>(order));
diff --git a/Framework/CurveFitting/src/Algorithms/PawleyFit.cpp b/Framework/CurveFitting/src/Algorithms/PawleyFit.cpp
index a8debbfa28d..22b87ff3efa 100644
--- a/Framework/CurveFitting/src/Algorithms/PawleyFit.cpp
+++ b/Framework/CurveFitting/src/Algorithms/PawleyFit.cpp
@@ -106,8 +106,8 @@ void PawleyFit::addHKLsToFunction(Functions::PawleyFunction_sptr &pawleyFn,
/// Creates a table containing the cell parameters stored in the supplied
/// function.
-ITableWorkspace_sptr
-PawleyFit::getLatticeFromFunction(const Functions::PawleyFunction_sptr &pawleyFn) const {
+ITableWorkspace_sptr PawleyFit::getLatticeFromFunction(
+ const Functions::PawleyFunction_sptr &pawleyFn) const {
if (!pawleyFn) {
throw std::invalid_argument(
"Cannot extract lattice parameters from null function.");
@@ -168,8 +168,8 @@ ITableWorkspace_sptr PawleyFit::getPeakParametersFromFunction(
/// Returns a composite function consisting of the Pawley function and Chebyshev
/// background if enabled in the algorithm.
-IFunction_sptr
-PawleyFit::getCompositeFunction(const Functions::PawleyFunction_sptr &pawleyFn) const {
+IFunction_sptr PawleyFit::getCompositeFunction(
+ const Functions::PawleyFunction_sptr &pawleyFn) const {
CompositeFunction_sptr composite = boost::make_shared<CompositeFunction>();
composite->addFunction(pawleyFn);
@@ -272,8 +272,9 @@ void PawleyFit::init() {
/// Execution of algorithm.
void PawleyFit::exec() {
// Setup PawleyFunction with cell from input parameters
- Functions::PawleyFunction_sptr pawleyFn = boost::dynamic_pointer_cast<Functions::PawleyFunction>(
- FunctionFactory::Instance().createFunction("PawleyFunction"));
+ Functions::PawleyFunction_sptr pawleyFn =
+ boost::dynamic_pointer_cast<Functions::PawleyFunction>(
+ FunctionFactory::Instance().createFunction("PawleyFunction"));
g_log.information() << "Setting up Pawley function..." << std::endl;
std::string profileFunction = getProperty("PeakProfileFunction");
diff --git a/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
index 943a2a4956e..98a64f0b767 100644
--- a/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
+++ b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
@@ -228,8 +228,7 @@ void RefinePowderInstrumentParameters::fitInstrumentParameters() {
// 1. Initialize the fitting function
ThermalNeutronDtoTOFFunction rawfunc;
- mFunction =
- boost::make_shared<ThermalNeutronDtoTOFFunction>(rawfunc);
+ mFunction = boost::make_shared<ThermalNeutronDtoTOFFunction>(rawfunc);
mFunction->initialize();
API::FunctionDomain1DVector domain(dataWS->readX(1));
@@ -1171,8 +1170,7 @@ void RefinePowderInstrumentParameters::genPeakCentersWorkspace(
throw runtime_error(errss.str());
}
- std::map<std::vector<int>, BackToBackExponential_sptr>::iterator
- peakiter;
+ std::map<std::vector<int>, BackToBackExponential_sptr>::iterator peakiter;
std::vector<std::pair<double, std::pair<double, double>>>
peakcenters; // d_h [TOF_h, CHI2]
diff --git a/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters3.cpp b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters3.cpp
index 5f146549166..a5c35c1f331 100644
--- a/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters3.cpp
+++ b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters3.cpp
@@ -1268,8 +1268,9 @@ void RefinePowderInstrumentParameters3::setFunctionParameterFitSetups(
double upperbound = param.maxvalue;
if (lowerbound >= -DBL_MAX * 0.1 || upperbound <= DBL_MAX * 0.1) {
// If there is a boundary
- Constraints::BoundaryConstraint *bc = new Constraints::BoundaryConstraint(
- function.get(), parname, lowerbound, upperbound, false);
+ Constraints::BoundaryConstraint *bc =
+ new Constraints::BoundaryConstraint(
+ function.get(), parname, lowerbound, upperbound, false);
function->addConstraint(bc);
}
} else {
diff --git a/Framework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp
index a33bad40180..021e2ed4db9 100644
--- a/Framework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp
@@ -203,6 +203,6 @@ void CostFuncFitting::calTransformationMatrixNumerically(GSLMatrix &tm) {
}
}
-} // namespace CostFunctions
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/CostFunctions/CostFuncIgnorePosPeaks.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncIgnorePosPeaks.cpp
index 349f294989a..8f5d5ecbb2e 100644
--- a/Framework/CurveFitting/src/CostFunctions/CostFuncIgnorePosPeaks.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncIgnorePosPeaks.cpp
@@ -74,6 +74,6 @@ void CostFuncIgnorePosPeaks::deriv(const double *yData,
}
}
-} // namespace CostFunctions
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/CostFunctions/CostFuncLeastSquares.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncLeastSquares.cpp
index bbef17e010f..025968c21b9 100644
--- a/Framework/CurveFitting/src/CostFunctions/CostFuncLeastSquares.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncLeastSquares.cpp
@@ -437,6 +437,6 @@ void CostFuncLeastSquares::calActiveCovarianceMatrix(GSLMatrix &covar,
}
}
-} // namespace CostFunctions
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/CostFunctions/CostFuncRwp.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncRwp.cpp
index c9b11eeb656..17e783d9f7e 100644
--- a/Framework/CurveFitting/src/CostFunctions/CostFuncRwp.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncRwp.cpp
@@ -64,6 +64,6 @@ double CostFuncRwp::calSqrtW(API::FunctionValues_sptr values) const {
return sqrt(weight);
}
-} // namespace CostFunctions
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/CostFunctions/CostFuncUnweightedLeastSquares.cpp b/Framework/CurveFitting/src/CostFunctions/CostFuncUnweightedLeastSquares.cpp
index 9264680121e..c7eadd62b70 100644
--- a/Framework/CurveFitting/src/CostFunctions/CostFuncUnweightedLeastSquares.cpp
+++ b/Framework/CurveFitting/src/CostFunctions/CostFuncUnweightedLeastSquares.cpp
@@ -80,6 +80,6 @@ double CostFuncUnweightedLeastSquares::getResidualVariance() const {
return residualVariance;
}
-} // namespace CostFunctions
+} // namespace CostFunctions
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp
index 75067d25822..40b817c1028 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp
@@ -24,6 +24,6 @@ const gsl_multimin_fdfminimizer_type *BFGS_Minimizer::getGSLMinimizerType() {
return gsl_multimin_fdfminimizer_vector_bfgs2;
}
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
index b075932deda..08114e04a54 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
@@ -34,7 +34,9 @@ DampingMinimizer::DampingMinimizer(double relTol)
/// Initialize minimizer, i.e. pass a function to minimize.
void DampingMinimizer::initialize(API::ICostFunction_sptr function, size_t) {
- m_leastSquares = boost::dynamic_pointer_cast<CostFunctions::CostFuncLeastSquares>(function);
+ m_leastSquares =
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncLeastSquares>(
+ function);
if (!m_leastSquares) {
throw std::invalid_argument("Damping minimizer works only with least "
"squares. Different function was given.");
@@ -123,6 +125,6 @@ double DampingMinimizer::costFunctionVal() {
return m_leastSquares->val();
}
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
index a04ccc98e54..5f54e75d6d7 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
@@ -19,7 +19,8 @@ double DerivMinimizer::fun(const gsl_vector *x, void *params) {
minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
}
boost::shared_ptr<CostFunctions::CostFuncFitting> fitting =
- boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(minimizer.m_costFunction);
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(
+ minimizer.m_costFunction);
if (fitting) {
fitting->getFittingFunction()->applyTies();
}
@@ -38,7 +39,8 @@ void DerivMinimizer::dfun(const gsl_vector *x, void *params, gsl_vector *g) {
minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
}
boost::shared_ptr<CostFunctions::CostFuncFitting> fitting =
- boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(minimizer.m_costFunction);
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(
+ minimizer.m_costFunction);
if (fitting) {
fitting->getFittingFunction()->applyTies();
}
@@ -63,7 +65,8 @@ void DerivMinimizer::fundfun(const gsl_vector *x, void *params, double *f,
minimizer.m_costFunction->setParameter(i, gsl_vector_get(x, i));
}
boost::shared_ptr<CostFunctions::CostFuncFitting> fitting =
- boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(minimizer.m_costFunction);
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(
+ minimizer.m_costFunction);
if (fitting) {
fitting->getFittingFunction()->applyTies();
}
@@ -174,6 +177,6 @@ void DerivMinimizer::setStopGradient(const double value) {
double DerivMinimizer::costFunctionVal() { return m_gslSolver->f; }
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
index 5b255b7d867..fcdedf14c50 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
@@ -92,7 +92,9 @@ FABADAMinimizer::~FABADAMinimizer() {}
void FABADAMinimizer::initialize(API::ICostFunction_sptr function,
size_t maxIterations) {
- m_leastSquares = boost::dynamic_pointer_cast<CostFunctions::CostFuncLeastSquares>(function);
+ m_leastSquares =
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncLeastSquares>(
+ function);
if (!m_leastSquares) {
throw std::invalid_argument(
"FABADA works only with least squares. Different function was given.");
@@ -121,7 +123,8 @@ void FABADAMinimizer::initialize(API::ICostFunction_sptr function,
m_bound.push_back(false);
API::IConstraint *iconstr = fun->getConstraint(i);
if (iconstr) {
- Constraints::BoundaryConstraint *bcon = dynamic_cast<Constraints::BoundaryConstraint *>(iconstr);
+ Constraints::BoundaryConstraint *bcon =
+ dynamic_cast<Constraints::BoundaryConstraint *>(iconstr);
if (bcon) {
m_bound[i] = true;
if (bcon->hasLower()) {
@@ -641,6 +644,6 @@ void FABADAMinimizer::finalize() {
}
}
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
index f8decf01d8e..d609f35a7cf 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
@@ -29,6 +29,6 @@ FRConjugateGradientMinimizer::getGSLMinimizerType() {
return gsl_multimin_fdfminimizer_conjugate_fr;
}
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
index 45556d2f660..74fe28e69cd 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
@@ -40,7 +40,9 @@ LevenbergMarquardtMDMinimizer::LevenbergMarquardtMDMinimizer()
/// Initialize minimizer, i.e. pass a function to minimize.
void LevenbergMarquardtMDMinimizer::initialize(API::ICostFunction_sptr function,
size_t) {
- m_leastSquares = boost::dynamic_pointer_cast<CostFunctions::CostFuncLeastSquares>(function);
+ m_leastSquares =
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncLeastSquares>(
+ function);
if (!m_leastSquares) {
throw std::invalid_argument("Levenberg-Marquardt minimizer works only with "
"least squares. Different function was given.");
@@ -287,6 +289,6 @@ double LevenbergMarquardtMDMinimizer::costFunctionVal() {
return m_leastSquares->val();
}
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
index 74a99616d1d..df84cfc9f62 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
@@ -41,7 +41,8 @@ void LevenbergMarquardtMinimizer::initialize(
API::ICostFunction_sptr costFunction, size_t) {
// set-up GSL container to be used with GSL simplex algorithm
auto leastSquares =
- boost::dynamic_pointer_cast<CostFunctions::CostFuncLeastSquares>(costFunction);
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncLeastSquares>(
+ costFunction);
if (leastSquares) {
m_data = new GSL_FitData(leastSquares);
} else {
@@ -141,6 +142,6 @@ void LevenbergMarquardtMinimizer::calCovarianceMatrix(double epsrel,
gsl_multifit_covar(m_gslSolver->J, epsrel, covar);
}
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
index 8c4a96f8076..e208d427551 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
@@ -25,6 +25,6 @@ PRConjugateGradientMinimizer::getGSLMinimizerType() {
return gsl_multimin_fdfminimizer_conjugate_pr;
}
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
index 2a0041f43aa..e9399ae13f1 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
@@ -33,7 +33,8 @@ double SimplexMinimizer::fun(const gsl_vector *x, void *params) {
}
}
boost::shared_ptr<CostFunctions::CostFuncFitting> fitting =
- boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(minimizer.m_costFunction);
+ boost::dynamic_pointer_cast<CostFunctions::CostFuncFitting>(
+ minimizer.m_costFunction);
if (fitting) {
fitting->getFittingFunction()->applyTies();
}
@@ -118,6 +119,6 @@ void SimplexMinimizer::clearMemory() {
double SimplexMinimizer::costFunctionVal() { return m_gslSolver->fval; }
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp
index 6bdc8eda40f..810d63841a6 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp
@@ -26,6 +26,6 @@ SteepestDescentMinimizer::getGSLMinimizerType() {
return gsl_multimin_fdfminimizer_steepest_descent;
}
-} // namespace FuncMinimisers
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/Functions/Abragam.cpp b/Framework/CurveFitting/src/Functions/Abragam.cpp
index c0c3af800f9..40ff74e9b61 100644
--- a/Framework/CurveFitting/src/Functions/Abragam.cpp
+++ b/Framework/CurveFitting/src/Functions/Abragam.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/BackToBackExponential.cpp b/Framework/CurveFitting/src/Functions/BackToBackExponential.cpp
index a6fb5d6d32f..64a5d5aae6a 100644
--- a/Framework/CurveFitting/src/Functions/BackToBackExponential.cpp
+++ b/Framework/CurveFitting/src/Functions/BackToBackExponential.cpp
@@ -16,7 +16,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/BackgroundFunction.cpp b/Framework/CurveFitting/src/Functions/BackgroundFunction.cpp
index 3770a40d547..1b243cda6ed 100644
--- a/Framework/CurveFitting/src/Functions/BackgroundFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/BackgroundFunction.cpp
@@ -9,7 +9,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/BivariateNormal.cpp b/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
index 5c070bacb90..59918f5e1e5 100644
--- a/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
+++ b/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
@@ -13,13 +13,12 @@
#include <string>
#include <cstdio>
-
using namespace Mantid::API;
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace CurveFitting;
using namespace Constraints;
diff --git a/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp b/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
index d3d85a16fc5..d3f4fcb35aa 100644
--- a/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
+++ b/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
@@ -6,12 +6,10 @@
#include <gsl/gsl_sf_erf.h>
-
using namespace Mantid::Kernel;
using namespace Mantid::API;
-
using namespace std;
namespace Mantid {
diff --git a/Framework/CurveFitting/src/Functions/ChebfunBase.cpp b/Framework/CurveFitting/src/Functions/ChebfunBase.cpp
index cdfe41b9ac3..4f25c57ba46 100644
--- a/Framework/CurveFitting/src/Functions/ChebfunBase.cpp
+++ b/Framework/CurveFitting/src/Functions/ChebfunBase.cpp
@@ -300,8 +300,8 @@ ChebfunBase::evalVector(const std::vector<double> &x,
*/
void ChebfunBase::derivative(const std::vector<double> &a,
std::vector<double> &aout) const {
-
-using namespace std::placeholders;
+
+ using namespace std::placeholders;
if (a.size() != m_x.size()) {
throw std::invalid_argument(
"Cannot calculate derivative: coeffs vector has wrong size.");
@@ -335,8 +335,8 @@ using namespace std::placeholders;
*/
ChebfunBase_sptr ChebfunBase::integral(const std::vector<double> &a,
std::vector<double> &aout) const {
-
-using namespace std::placeholders;
+
+ using namespace std::placeholders;
if (a.size() != m_x.size()) {
throw std::invalid_argument(
"Cannot calculate integral: coeffs vector has wrong size.");
diff --git a/Framework/CurveFitting/src/Functions/Chebyshev.cpp b/Framework/CurveFitting/src/Functions/Chebyshev.cpp
index a55577ab665..9395ced590d 100644
--- a/Framework/CurveFitting/src/Functions/Chebyshev.cpp
+++ b/Framework/CurveFitting/src/Functions/Chebyshev.cpp
@@ -13,7 +13,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp b/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp
index 9408c811342..c10c9bf5a89 100644
--- a/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/ComptonPeakProfile.cpp
@@ -10,7 +10,6 @@
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
using namespace CurveFitting::Algorithms;
@@ -86,8 +85,8 @@ void ComptonPeakProfile::function1D(double *out, const double *xValues,
*/
void ComptonPeakProfile::setUpForFit() {
// Voigt & Gaussian
-
-using namespace Mantid::API;
+
+ using namespace Mantid::API;
m_gauss = boost::dynamic_pointer_cast<IPeakFunction>(
FunctionFactory::Instance().createFunction("Gaussian"));
m_voigt = boost::dynamic_pointer_cast<IPeakFunction>(
diff --git a/Framework/CurveFitting/src/Functions/ComptonProfile.cpp b/Framework/CurveFitting/src/Functions/ComptonProfile.cpp
index a7560b705db..f93325fcd70 100644
--- a/Framework/CurveFitting/src/Functions/ComptonProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/ComptonProfile.cpp
@@ -9,7 +9,7 @@
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace CurveFitting;
using namespace CurveFitting::Algorithms;
@@ -28,8 +28,8 @@ ComptonProfile::ComptonProfile()
: API::ParamFunction(), API::IFunction1D(), m_log("ComptonProfile"),
m_wsIndex(0), m_mass(0.0), m_voigt(), m_resolutionFunction(), m_yspace(),
m_modQ(), m_e0() {
-
-using namespace Mantid::API;
+
+ using namespace Mantid::API;
m_resolutionFunction = boost::dynamic_pointer_cast<VesuvioResolution>(
FunctionFactory::Instance().createFunction("VesuvioResolution"));
}
@@ -58,8 +58,8 @@ void ComptonProfile::function1D(double *out, const double *xValues,
* Creates the internal caches
*/
void ComptonProfile::setUpForFit() {
-
-using namespace Mantid::API;
+
+ using namespace Mantid::API;
m_voigt = boost::dynamic_pointer_cast<IPeakFunction>(
FunctionFactory::Instance().createFunction("Voigt"));
m_resolutionFunction->setUpForFit();
@@ -117,9 +117,9 @@ void ComptonProfile::cacheYSpaceValues(const std::vector<double> &tseconds,
* @param isHistogram True if histogram tof values have been passed in
* @param detpar Structure containing detector parameters
*/
-void ComptonProfile::cacheYSpaceValues(const std::vector<double> &tseconds,
- const bool isHistogram,
- const Algorithms::DetectorParams &detpar) {
+void ComptonProfile::cacheYSpaceValues(
+ const std::vector<double> &tseconds, const bool isHistogram,
+ const Algorithms::DetectorParams &detpar) {
// ------ Fixed coefficients related to resolution & Y-space transforms
// ------------------
const double mevToK = PhysicalConstants::E_mev_toNeutronWavenumberSq;
diff --git a/Framework/CurveFitting/src/Functions/Convolution.cpp b/Framework/CurveFitting/src/Functions/Convolution.cpp
index c1f9b0f00a3..00ed29d4c13 100644
--- a/Framework/CurveFitting/src/Functions/Convolution.cpp
+++ b/Framework/CurveFitting/src/Functions/Convolution.cpp
@@ -24,7 +24,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/CubicSpline.cpp b/Framework/CurveFitting/src/Functions/CubicSpline.cpp
index d294fca58b8..d13cb126fdd 100644
--- a/Framework/CurveFitting/src/Functions/CubicSpline.cpp
+++ b/Framework/CurveFitting/src/Functions/CubicSpline.cpp
@@ -20,7 +20,6 @@ namespace {
Kernel::Logger g_log("CubicSpline");
}
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/DeltaFunction.cpp b/Framework/CurveFitting/src/Functions/DeltaFunction.cpp
index 75bf6d4a42e..aa26ab1c786 100644
--- a/Framework/CurveFitting/src/Functions/DeltaFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/DeltaFunction.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp b/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp
index ab2f2402bd9..f295573909e 100644
--- a/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp
+++ b/Framework/CurveFitting/src/Functions/DiffRotDiscreteCircle.cpp
@@ -21,11 +21,10 @@ Mantid::Kernel::Logger g_log("DiffSphere");
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace CurveFitting;
using namespace Constraints;
-
using namespace API;
using namespace Geometry;
diff --git a/Framework/CurveFitting/src/Functions/DiffSphere.cpp b/Framework/CurveFitting/src/Functions/DiffSphere.cpp
index 7cf48ca1c0e..19519493021 100644
--- a/Framework/CurveFitting/src/Functions/DiffSphere.cpp
+++ b/Framework/CurveFitting/src/Functions/DiffSphere.cpp
@@ -23,11 +23,10 @@ Mantid::Kernel::Logger g_log("DiffSphere");
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace CurveFitting;
using namespace Constraints;
-
using namespace API;
using namespace Geometry;
diff --git a/Framework/CurveFitting/src/Functions/DynamicKuboToyabe.cpp b/Framework/CurveFitting/src/Functions/DynamicKuboToyabe.cpp
index 53e58e5ee2f..e90d834562d 100644
--- a/Framework/CurveFitting/src/Functions/DynamicKuboToyabe.cpp
+++ b/Framework/CurveFitting/src/Functions/DynamicKuboToyabe.cpp
@@ -13,7 +13,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/EndErfc.cpp b/Framework/CurveFitting/src/Functions/EndErfc.cpp
index 25469d991ff..ed8101f7d9a 100644
--- a/Framework/CurveFitting/src/Functions/EndErfc.cpp
+++ b/Framework/CurveFitting/src/Functions/EndErfc.cpp
@@ -12,7 +12,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/ExpDecay.cpp b/Framework/CurveFitting/src/Functions/ExpDecay.cpp
index c08ae76676b..3f26962c469 100644
--- a/Framework/CurveFitting/src/Functions/ExpDecay.cpp
+++ b/Framework/CurveFitting/src/Functions/ExpDecay.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/ExpDecayMuon.cpp b/Framework/CurveFitting/src/Functions/ExpDecayMuon.cpp
index c1318303c9e..748b7ed6bae 100644
--- a/Framework/CurveFitting/src/Functions/ExpDecayMuon.cpp
+++ b/Framework/CurveFitting/src/Functions/ExpDecayMuon.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/ExpDecayOsc.cpp b/Framework/CurveFitting/src/Functions/ExpDecayOsc.cpp
index f615255fc45..53713374e6a 100644
--- a/Framework/CurveFitting/src/Functions/ExpDecayOsc.cpp
+++ b/Framework/CurveFitting/src/Functions/ExpDecayOsc.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/FlatBackground.cpp b/Framework/CurveFitting/src/Functions/FlatBackground.cpp
index 53246069f04..e73d11ecb56 100644
--- a/Framework/CurveFitting/src/Functions/FlatBackground.cpp
+++ b/Framework/CurveFitting/src/Functions/FlatBackground.cpp
@@ -2,7 +2,6 @@
#include "MantidAPI/FunctionFactory.h"
#include "MantidKernel/System.h"
-
using namespace Mantid::Kernel;
using namespace Mantid::API;
diff --git a/Framework/CurveFitting/src/Functions/GausDecay.cpp b/Framework/CurveFitting/src/Functions/GausDecay.cpp
index dfc79b6c15a..62e7fa7b723 100644
--- a/Framework/CurveFitting/src/Functions/GausDecay.cpp
+++ b/Framework/CurveFitting/src/Functions/GausDecay.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/GausOsc.cpp b/Framework/CurveFitting/src/Functions/GausOsc.cpp
index 8cf906c3ae6..54b17aec67d 100644
--- a/Framework/CurveFitting/src/Functions/GausOsc.cpp
+++ b/Framework/CurveFitting/src/Functions/GausOsc.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/Gaussian.cpp b/Framework/CurveFitting/src/Functions/Gaussian.cpp
index 0f056700e25..eeacee84e14 100644
--- a/Framework/CurveFitting/src/Functions/Gaussian.cpp
+++ b/Framework/CurveFitting/src/Functions/Gaussian.cpp
@@ -13,7 +13,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp b/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp
index 16960d97dab..dcefc759c30 100644
--- a/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp
+++ b/Framework/CurveFitting/src/Functions/GramCharlierComptonProfile.cpp
@@ -250,8 +250,8 @@ size_t GramCharlierComptonProfile::fillConstraintMatrix(
void GramCharlierComptonProfile::massProfile(double *result,
const size_t nData) const {
UNUSED_ARG(nData);
-
-using namespace Mantid::Kernel;
+
+ using namespace Mantid::Kernel;
// Hermite expansion (only even terms) + FSE term
const size_t nhermite(m_hermite.size());
@@ -279,8 +279,8 @@ using namespace Mantid::Kernel;
*/
void GramCharlierComptonProfile::addMassProfile(
double *result, const unsigned int npoly) const {
-
-using namespace Mantid::Kernel;
+
+ using namespace Mantid::Kernel;
const double amp(1.0), wg(getParameter(WIDTH_PARAM));
const double ampNorm = amp / (std::sqrt(2.0 * M_PI) * wg);
@@ -305,8 +305,8 @@ using namespace Mantid::Kernel;
*/
void GramCharlierComptonProfile::addFSETerm(std::vector<double> &lhs) const {
assert(static_cast<size_t>(NFINE_Y) == lhs.size());
-
-using namespace Mantid::Kernel;
+
+ using namespace Mantid::Kernel;
const double amp(1.0), wg(getParameter(WIDTH_PARAM));
const double ampNorm = amp / (std::sqrt(2.0 * M_PI) * wg);
diff --git a/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp b/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
index 20fce38bd90..519f78976bd 100644
--- a/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
+++ b/Framework/CurveFitting/src/Functions/IkedaCarpenterPV.cpp
@@ -30,7 +30,6 @@ namespace {
Kernel::Logger g_log("IkedaCarpenterPV");
}
-
using namespace Kernel;
using namespace CurveFitting::SpecialFunctionSupport;
diff --git a/Framework/CurveFitting/src/Functions/LinearBackground.cpp b/Framework/CurveFitting/src/Functions/LinearBackground.cpp
index 2882a8b3423..de365f0d88c 100644
--- a/Framework/CurveFitting/src/Functions/LinearBackground.cpp
+++ b/Framework/CurveFitting/src/Functions/LinearBackground.cpp
@@ -10,7 +10,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/LogNormal.cpp b/Framework/CurveFitting/src/Functions/LogNormal.cpp
index 5382ba6edd6..85e24ebfcf8 100644
--- a/Framework/CurveFitting/src/Functions/LogNormal.cpp
+++ b/Framework/CurveFitting/src/Functions/LogNormal.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/Lorentzian.cpp b/Framework/CurveFitting/src/Functions/Lorentzian.cpp
index 03f0179039e..0b5d4b53462 100644
--- a/Framework/CurveFitting/src/Functions/Lorentzian.cpp
+++ b/Framework/CurveFitting/src/Functions/Lorentzian.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/Lorentzian1D.cpp b/Framework/CurveFitting/src/Functions/Lorentzian1D.cpp
index 604b77dfbc5..1c19669665c 100644
--- a/Framework/CurveFitting/src/Functions/Lorentzian1D.cpp
+++ b/Framework/CurveFitting/src/Functions/Lorentzian1D.cpp
@@ -16,7 +16,6 @@ using API::Jacobian;
// Register the class into the algorithm factory
DECLARE_ALGORITHM(Lorentzian1D)
-
using namespace Kernel;
void Lorentzian1D::declareParameters() {
diff --git a/Framework/CurveFitting/src/Functions/MuonFInteraction.cpp b/Framework/CurveFitting/src/Functions/MuonFInteraction.cpp
index 095880cbb78..4fcb0672c65 100644
--- a/Framework/CurveFitting/src/Functions/MuonFInteraction.cpp
+++ b/Framework/CurveFitting/src/Functions/MuonFInteraction.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/NeutronBk2BkExpConvPVoigt.cpp b/Framework/CurveFitting/src/Functions/NeutronBk2BkExpConvPVoigt.cpp
index c86a3d3dcff..c451d8d528a 100644
--- a/Framework/CurveFitting/src/Functions/NeutronBk2BkExpConvPVoigt.cpp
+++ b/Framework/CurveFitting/src/Functions/NeutronBk2BkExpConvPVoigt.cpp
@@ -13,7 +13,6 @@
const double PEAKRANGE = 5.0;
const double NEG_DBL_MAX = -1. * DBL_MAX;
-
using namespace std;
namespace Mantid {
diff --git a/Framework/CurveFitting/src/Functions/PawleyFunction.cpp b/Framework/CurveFitting/src/Functions/PawleyFunction.cpp
index d1ee189b9d1..2f4231d00f4 100644
--- a/Framework/CurveFitting/src/Functions/PawleyFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/PawleyFunction.cpp
@@ -14,13 +14,12 @@
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace CurveFitting;
using namespace Constraints;
DECLARE_FUNCTION(PawleyParameterFunction)
-
using namespace API;
using namespace Geometry;
diff --git a/Framework/CurveFitting/src/Functions/PeakParameterFunction.cpp b/Framework/CurveFitting/src/Functions/PeakParameterFunction.cpp
index 8dfbdf29ca3..5991f2ad484 100644
--- a/Framework/CurveFitting/src/Functions/PeakParameterFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/PeakParameterFunction.cpp
@@ -8,7 +8,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace API;
DECLARE_FUNCTION(PeakParameterFunction)
diff --git a/Framework/CurveFitting/src/Functions/Polynomial.cpp b/Framework/CurveFitting/src/Functions/Polynomial.cpp
index 573c7c1d29c..800902e4ffa 100644
--- a/Framework/CurveFitting/src/Functions/Polynomial.cpp
+++ b/Framework/CurveFitting/src/Functions/Polynomial.cpp
@@ -2,12 +2,10 @@
#include "MantidAPI/FunctionFactory.h"
#include <boost/lexical_cast.hpp>
-
using namespace Mantid::Kernel;
using namespace Mantid::API;
-
using namespace std;
namespace Mantid {
diff --git a/Framework/CurveFitting/src/Functions/ProcessBackground.cpp b/Framework/CurveFitting/src/Functions/ProcessBackground.cpp
index 0aed9a4a236..3df0c026c17 100644
--- a/Framework/CurveFitting/src/Functions/ProcessBackground.cpp
+++ b/Framework/CurveFitting/src/Functions/ProcessBackground.cpp
@@ -16,7 +16,6 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/split.hpp>
-
using namespace Mantid;
using namespace Mantid::API;
@@ -27,7 +26,6 @@ using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting;
-
using namespace std;
namespace Mantid {
@@ -689,9 +687,8 @@ ProcessBackground::createBackgroundFunction(const string backgroundtype) {
Functions::BackgroundFunction_sptr bkgdfunction;
if (backgroundtype.compare("Polynomial") == 0) {
- bkgdfunction =
- boost::dynamic_pointer_cast<Functions::BackgroundFunction>(
- boost::make_shared<Functions::Polynomial>());
+ bkgdfunction = boost::dynamic_pointer_cast<Functions::BackgroundFunction>(
+ boost::make_shared<Functions::Polynomial>());
bkgdfunction->initialize();
} else if (backgroundtype.compare("Chebyshev") == 0) {
Chebyshev_sptr cheby = boost::make_shared<Functions::Chebyshev>();
diff --git a/Framework/CurveFitting/src/Functions/ProductLinearExp.cpp b/Framework/CurveFitting/src/Functions/ProductLinearExp.cpp
index 11330cae66e..c4d3758b824 100644
--- a/Framework/CurveFitting/src/Functions/ProductLinearExp.cpp
+++ b/Framework/CurveFitting/src/Functions/ProductLinearExp.cpp
@@ -10,7 +10,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp b/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp
index 86c80a03481..a0ce2def813 100644
--- a/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp
+++ b/Framework/CurveFitting/src/Functions/PseudoVoigt.cpp
@@ -7,11 +7,10 @@
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace CurveFitting;
using namespace Constraints;
-
using namespace API;
DECLARE_FUNCTION(PseudoVoigt)
diff --git a/Framework/CurveFitting/src/Functions/Quadratic.cpp b/Framework/CurveFitting/src/Functions/Quadratic.cpp
index 105b18d1f96..cb6a2b6f661 100644
--- a/Framework/CurveFitting/src/Functions/Quadratic.cpp
+++ b/Framework/CurveFitting/src/Functions/Quadratic.cpp
@@ -10,7 +10,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/ReflectivityMulf.cpp b/Framework/CurveFitting/src/Functions/ReflectivityMulf.cpp
index e1fbe71a230..4d84564dd5a 100644
--- a/Framework/CurveFitting/src/Functions/ReflectivityMulf.cpp
+++ b/Framework/CurveFitting/src/Functions/ReflectivityMulf.cpp
@@ -3,12 +3,10 @@
#include <boost/lexical_cast.hpp>
#include <cmath>
-
using namespace Mantid::Kernel;
using namespace Mantid::API;
-
using namespace std;
namespace Mantid {
diff --git a/Framework/CurveFitting/src/Functions/Resolution.cpp b/Framework/CurveFitting/src/Functions/Resolution.cpp
index cd46e0cb592..fad3353dbfd 100644
--- a/Framework/CurveFitting/src/Functions/Resolution.cpp
+++ b/Framework/CurveFitting/src/Functions/Resolution.cpp
@@ -10,7 +10,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/StaticKuboToyabe.cpp b/Framework/CurveFitting/src/Functions/StaticKuboToyabe.cpp
index cec65d94e65..9875e375005 100644
--- a/Framework/CurveFitting/src/Functions/StaticKuboToyabe.cpp
+++ b/Framework/CurveFitting/src/Functions/StaticKuboToyabe.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesExpDecay.cpp b/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesExpDecay.cpp
index 9afab2aff21..33e32875706 100644
--- a/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesExpDecay.cpp
+++ b/Framework/CurveFitting/src/Functions/StaticKuboToyabeTimesExpDecay.cpp
@@ -8,7 +8,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/StretchExp.cpp b/Framework/CurveFitting/src/Functions/StretchExp.cpp
index 31819073a00..41a8cf8b7ff 100644
--- a/Framework/CurveFitting/src/Functions/StretchExp.cpp
+++ b/Framework/CurveFitting/src/Functions/StretchExp.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/StretchExpMuon.cpp b/Framework/CurveFitting/src/Functions/StretchExpMuon.cpp
index d0e330c6891..c88d045de58 100644
--- a/Framework/CurveFitting/src/Functions/StretchExpMuon.cpp
+++ b/Framework/CurveFitting/src/Functions/StretchExpMuon.cpp
@@ -11,7 +11,6 @@ namespace Functions {
using namespace CurveFitting;
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
index b89938cc5d6..464c73e7fb3 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
@@ -5,7 +5,6 @@
#include <gsl/gsl_sf_erf.h>
#include <cmath>
-
using namespace std;
using namespace Mantid;
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp
index 5b968b8b270..92901743be4 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp
@@ -5,7 +5,6 @@
#include <gsl/gsl_sf_erf.h>
#include <cmath>
-
using namespace std;
using namespace Mantid;
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpConvPVoigt.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpConvPVoigt.cpp
index bdba393886a..8ee59b58177 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpConvPVoigt.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpConvPVoigt.cpp
@@ -13,7 +13,6 @@
const double PEAKRANGE = 5.0;
const double NEG_DBL_MAX = -1. * DBL_MAX;
-
using namespace std;
using namespace Mantid;
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp
index a8fb8aad84b..51c0370b5cf 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp
@@ -5,7 +5,6 @@
#include <gsl/gsl_sf_erf.h>
#include <cmath>
-
using namespace std;
using namespace Mantid;
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp
index 8acbebb7a28..4d3bb672a2d 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp
@@ -5,7 +5,6 @@
#include <gsl/gsl_sf_erf.h>
#include <cmath>
-
using namespace Mantid::API;
using namespace std;
diff --git a/Framework/CurveFitting/src/Functions/UserFunction.cpp b/Framework/CurveFitting/src/Functions/UserFunction.cpp
index 90208658fab..45ec9fc62f4 100644
--- a/Framework/CurveFitting/src/Functions/UserFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/UserFunction.cpp
@@ -15,7 +15,6 @@ using namespace CurveFitting;
// Register the class into the function factory
DECLARE_FUNCTION(UserFunction)
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/UserFunction1D.cpp b/Framework/CurveFitting/src/Functions/UserFunction1D.cpp
index c7e84763dc4..0c0ee89a9d0 100644
--- a/Framework/CurveFitting/src/Functions/UserFunction1D.cpp
+++ b/Framework/CurveFitting/src/Functions/UserFunction1D.cpp
@@ -15,7 +15,6 @@ using namespace CurveFitting;
// Register the class into the algorithm factory
DECLARE_ALGORITHM(UserFunction1D)
-
using namespace Kernel;
using namespace API;
diff --git a/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp b/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp
index 0dcf67b8f02..44c6b1e458e 100644
--- a/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp
+++ b/Framework/CurveFitting/src/Functions/VesuvioResolution.cpp
@@ -9,7 +9,7 @@
namespace Mantid {
namespace CurveFitting {
namespace Functions {
-
+
using namespace Mantid;
using namespace Mantid::CurveFitting;
using namespace Mantid::CurveFitting::Algorithms;
@@ -83,8 +83,8 @@ std::string VesuvioResolution::name() const { return "VesuvioResolution"; }
*/
void VesuvioResolution::setUpForFit() {
// Voigt
-
-using namespace Mantid::API;
+
+ using namespace Mantid::API;
m_voigt = boost::dynamic_pointer_cast<IPeakFunction>(
FunctionFactory::Instance().createFunction("Voigt"));
}
diff --git a/Framework/CurveFitting/src/GSLFunctions.cpp b/Framework/CurveFitting/src/GSLFunctions.cpp
index 90b670cc33c..2ebd26b9ec6 100644
--- a/Framework/CurveFitting/src/GSLFunctions.cpp
+++ b/Framework/CurveFitting/src/GSLFunctions.cpp
@@ -159,7 +159,8 @@ int gsl_fdf(const gsl_vector *x, void *params, gsl_vector *f, gsl_matrix *J) {
* Constructor. Creates declared -> active index map
* @param cf :: ICostFunction
*/
-GSL_FitData::GSL_FitData(boost::shared_ptr<CostFunctions::CostFuncLeastSquares> cf)
+GSL_FitData::GSL_FitData(
+ boost::shared_ptr<CostFunctions::CostFuncLeastSquares> cf)
: function(cf->getFittingFunction()), costFunction(cf) {
gsl_set_error_handler_off();
// number of active parameters
diff --git a/Framework/CurveFitting/src/ParDomain.cpp b/Framework/CurveFitting/src/ParDomain.cpp
index 18f8155704e..01a76765f05 100644
--- a/Framework/CurveFitting/src/ParDomain.cpp
+++ b/Framework/CurveFitting/src/ParDomain.cpp
@@ -28,7 +28,8 @@ void ParDomain::getDomainAndValues(size_t i, API::FunctionDomain_sptr &domain,
* Calculate the value of a least squares cost function
* @param leastSquares :: The least squares cost func to calculate the value for
*/
-void ParDomain::leastSquaresVal(const CostFunctions::CostFuncLeastSquares &leastSquares) {
+void ParDomain::leastSquaresVal(
+ const CostFunctions::CostFuncLeastSquares &leastSquares) {
const int n = static_cast<int>(getNDomains());
PARALLEL_FOR_NO_WSP_CHECK()
for (int i = 0; i < n; ++i) {
diff --git a/Framework/CurveFitting/src/SeqDomain.cpp b/Framework/CurveFitting/src/SeqDomain.cpp
index 6173e279e99..8a704c17456 100644
--- a/Framework/CurveFitting/src/SeqDomain.cpp
+++ b/Framework/CurveFitting/src/SeqDomain.cpp
@@ -68,7 +68,8 @@ SeqDomain *SeqDomain::create(API::IDomainCreator::DomainType type) {
* Calculate the value of a least squares cost function
* @param leastSquares :: The least squares cost func to calculate the value for
*/
-void SeqDomain::leastSquaresVal(const CostFunctions::CostFuncLeastSquares &leastSquares) {
+void SeqDomain::leastSquaresVal(
+ const CostFunctions::CostFuncLeastSquares &leastSquares) {
API::FunctionDomain_sptr domain;
API::FunctionValues_sptr values;
const size_t n = getNDomains();
@@ -131,8 +132,8 @@ void SeqDomain::leastSquaresValDerivHessian(
* @param evalDeriv :: Flag to evaluate the first derivatives
* @param evalHessian :: Flag to evaluate the Hessian (second derivatives)
*/
-void SeqDomain::rwpValDerivHessian(const CostFunctions::CostFuncRwp &rwp, bool evalDeriv,
- bool evalHessian) {
+void SeqDomain::rwpValDerivHessian(const CostFunctions::CostFuncRwp &rwp,
+ bool evalDeriv, bool evalHessian) {
API::FunctionDomain_sptr domain;
API::FunctionValues_sptr values;
const size_t n = getNDomains();
diff --git a/Framework/CurveFitting/test/Constraints/BoundaryConstraintTest.h b/Framework/CurveFitting/test/Constraints/BoundaryConstraintTest.h
index d4d479b94a6..6e340def573 100644
--- a/Framework/CurveFitting/test/Constraints/BoundaryConstraintTest.h
+++ b/Framework/CurveFitting/test/Constraints/BoundaryConstraintTest.h
@@ -41,7 +41,7 @@ public:
TS_ASSERT(bc.hasUpper());
BoundaryConstraint bc2;
-
+
bc2.reset(&gaus, 2);
bc2.setBounds(10, 20);
diff --git a/Framework/CurveFitting/test/Functions/ComptonScatteringCountRateTest.h b/Framework/CurveFitting/test/Functions/ComptonScatteringCountRateTest.h
index fe70cba1fcb..a9fe90bd3ba 100644
--- a/Framework/CurveFitting/test/Functions/ComptonScatteringCountRateTest.h
+++ b/Framework/CurveFitting/test/Functions/ComptonScatteringCountRateTest.h
@@ -313,7 +313,6 @@ private:
func2->setParameter("Width", 10.0);
func2->setParameter("Intensity", 3.0);
-
auto profile = boost::make_shared<ComptonScatteringCountRate>();
profile->initialize();
profile->addFunction(func1);
diff --git a/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h b/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h
index a2ecbc07f71..4b8df7d7a42 100644
--- a/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h
+++ b/Framework/CurveFitting/test/Functions/DiffRotDiscreteCircleTest.h
@@ -38,8 +38,7 @@ public:
const double w0 = random_value(-1.0, 1.0);
const double h = random_value(1.0, 1000.0);
const double fwhm = random_value(1.0, 100.0);
- boost::shared_ptr<Gaussian> resolution(
- new Gaussian());
+ boost::shared_ptr<Gaussian> resolution(new Gaussian());
resolution->initialize(); // declare parameters
resolution->setCentre(w0);
resolution->setHeight(h);
@@ -51,9 +50,8 @@ public:
const double r = random_value(0.3, 9.8);
const double Q = 0.9;
const int N = 6;
- boost::shared_ptr<ElasticDiffRotDiscreteCircle>
- structure_factor(
- new ElasticDiffRotDiscreteCircle());
+ boost::shared_ptr<ElasticDiffRotDiscreteCircle> structure_factor(
+ new ElasticDiffRotDiscreteCircle());
structure_factor->setParameter("Height", I);
structure_factor->setParameter("Radius", r);
structure_factor->setAttributeValue("Q", Q);
@@ -185,8 +183,7 @@ public:
func.setAttributeValue("N", N);
// check values where correctly initialized
- auto ids = boost::dynamic_pointer_cast<
- InelasticDiffRotDiscreteCircle>(
+ auto ids = boost::dynamic_pointer_cast<InelasticDiffRotDiscreteCircle>(
func.getFunction(1));
TS_ASSERT_EQUALS(ids->getParameter("Intensity"), I);
TS_ASSERT_EQUALS(ids->getParameter("Radius"), R);
@@ -196,8 +193,7 @@ public:
// check the ties were applied correctly
func.applyTies(); // elastic parameters are tied to inelastic parameters
- auto eds = boost::dynamic_pointer_cast<
- ElasticDiffRotDiscreteCircle>(
+ auto eds = boost::dynamic_pointer_cast<ElasticDiffRotDiscreteCircle>(
func.getFunction(0));
TS_ASSERT_EQUALS(eds->getParameter("Height"), I);
TS_ASSERT_EQUALS(eds->getParameter("Radius"), R);
@@ -218,8 +214,7 @@ public:
func.setParameter("Decay", tao);
// check the parameter of the inelastic part
- auto ifunc = boost::dynamic_pointer_cast<
- InelasticDiffRotDiscreteCircle>(
+ auto ifunc = boost::dynamic_pointer_cast<InelasticDiffRotDiscreteCircle>(
func.getFunction(1));
TS_ASSERT_EQUALS(ifunc->getParameter("Intensity"), I);
TS_ASSERT_EQUALS(ifunc->getParameter("Radius"), R);
@@ -227,8 +222,7 @@ public:
// check the parameters of the elastic part
func.applyTies(); // elastic parameters are tied to inelastic parameters
- auto efunc = boost::dynamic_pointer_cast<
- ElasticDiffRotDiscreteCircle>(
+ auto efunc = boost::dynamic_pointer_cast<ElasticDiffRotDiscreteCircle>(
func.getFunction(0));
TS_ASSERT_EQUALS(efunc->getParameter("Height"), I);
TS_ASSERT_EQUALS(efunc->getParameter("Radius"), R);
@@ -281,8 +275,7 @@ public:
Mantid::API::IFunction_sptr fitalg_function =
fitalg.getProperty("Function");
auto fitalg_conv =
- boost::dynamic_pointer_cast<Convolution>(
- fitalg_function);
+ boost::dynamic_pointer_cast<Convolution>(fitalg_function);
Mantid::API::IFunction_sptr fitalg_resolution = fitalg_conv->getFunction(0);
TS_ASSERT_DELTA(fitalg_resolution->getParameter("PeakCentre"), 0.0,
0.00001); // allow for a small percent variation
@@ -388,8 +381,7 @@ private:
Mantid::API::IFunction_sptr fitalg_function =
fitalg.getProperty("Function");
auto fitalg_conv =
- boost::dynamic_pointer_cast<Convolution>(
- fitalg_function);
+ boost::dynamic_pointer_cast<Convolution>(fitalg_function);
Mantid::API::IFunction_sptr fitalg_resolution = fitalg_conv->getFunction(0);
TS_ASSERT_DELTA(fitalg_resolution->getParameter("PeakCentre"), 0.0,
0.00001); // allow for a small percent variation
diff --git a/Framework/CurveFitting/test/Functions/DiffSphereTest.h b/Framework/CurveFitting/test/Functions/DiffSphereTest.h
index a61992fea11..06807332917 100644
--- a/Framework/CurveFitting/test/Functions/DiffSphereTest.h
+++ b/Framework/CurveFitting/test/Functions/DiffSphereTest.h
@@ -86,8 +86,7 @@ public:
Mantid::API::IFunction_sptr fitalg_function =
fitalg.getProperty("Function");
auto fitalg_conv =
- boost::dynamic_pointer_cast<Convolution>(
- fitalg_function);
+ boost::dynamic_pointer_cast<Convolution>(fitalg_function);
Mantid::API::IFunction_sptr fitalg_resolution = fitalg_conv->getFunction(0);
TS_ASSERT_DELTA(fitalg_resolution->getParameter("PeakCentre"), 0.0,
0.00001); // allow for a small percent variation
@@ -136,8 +135,7 @@ public:
// of the 99 coefficients to break down
// initialize the elastic part
- boost::shared_ptr<ElasticDiffSphere> elastic_part(
- new ElasticDiffSphere());
+ boost::shared_ptr<ElasticDiffSphere> elastic_part(new ElasticDiffSphere());
elastic_part->setParameter("Height", I);
elastic_part->setParameter("Radius", R);
elastic_part->setAttributeValue("Q", Q);
@@ -209,18 +207,15 @@ public:
Mantid::API::IFunction_sptr fitalg_function =
fitalg.getProperty("Function"); // main function
fitalg_function->initialize();
- auto fitalg_conv =
- boost::dynamic_pointer_cast<Convolution>(
- fitalg_function); // cast to Convolution
+ auto fitalg_conv = boost::dynamic_pointer_cast<Convolution>(
+ fitalg_function); // cast to Convolution
fitalg_function = fitalg_conv->getFunction(1); // DiffSphere
auto fitalg_structure_factor =
- boost::dynamic_pointer_cast<DiffSphere>(
- fitalg_function);
+ boost::dynamic_pointer_cast<DiffSphere>(fitalg_function);
fitalg_function = fitalg_structure_factor->getFunction(0);
auto fitalg_elastic =
- boost::dynamic_pointer_cast<ElasticDiffSphere>(
- fitalg_function);
+ boost::dynamic_pointer_cast<ElasticDiffSphere>(fitalg_function);
TS_ASSERT_DELTA(fitalg_elastic->getParameter("Height"), I_0,
std::numeric_limits<double>::epsilon());
TS_ASSERT_DELTA(fitalg_elastic->getParameter("Radius"), R_0,
@@ -233,8 +228,7 @@ public:
fitalg_function = fitalg_structure_factor->getFunction(1);
auto fitalg_inelastic =
- boost::dynamic_pointer_cast<InelasticDiffSphere>(
- fitalg_function);
+ boost::dynamic_pointer_cast<InelasticDiffSphere>(fitalg_function);
TS_ASSERT_DELTA(fitalg_inelastic->getParameter("Intensity"), I_0,
std::numeric_limits<double>::epsilon());
TS_ASSERT_DELTA(fitalg_inelastic->getParameter("Radius"), R_0,
@@ -402,8 +396,7 @@ private:
Mantid::API::IFunction_sptr fitalg_function =
fitalg.getProperty("Function");
auto fitalg_conv =
- boost::dynamic_pointer_cast<Convolution>(
- fitalg_function);
+ boost::dynamic_pointer_cast<Convolution>(fitalg_function);
Mantid::API::IFunction_sptr fitalg_resolution = fitalg_conv->getFunction(0);
TS_ASSERT_DELTA(fitalg_resolution->getParameter("PeakCentre"), S,
diff --git a/Framework/CurveFitting/test/Functions/GaussianComptonProfileTest.h b/Framework/CurveFitting/test/Functions/GaussianComptonProfileTest.h
index baffaafdcda..dfec3f0af15 100644
--- a/Framework/CurveFitting/test/Functions/GaussianComptonProfileTest.h
+++ b/Framework/CurveFitting/test/Functions/GaussianComptonProfileTest.h
@@ -41,8 +41,7 @@ public:
}
void test_Function_Has_One_Intensity_Coefficient() {
- boost::shared_ptr<ComptonProfile> profile =
- createFunction();
+ boost::shared_ptr<ComptonProfile> profile = createFunction();
auto intensityIndices = profile->intensityParameterIndices();
TS_ASSERT_EQUALS(1, intensityIndices.size());
diff --git a/Framework/CurveFitting/test/Functions/GramCharlierComptonProfileTest.h b/Framework/CurveFitting/test/Functions/GramCharlierComptonProfileTest.h
index 19e8bb1d95c..905278a1917 100644
--- a/Framework/CurveFitting/test/Functions/GramCharlierComptonProfileTest.h
+++ b/Framework/CurveFitting/test/Functions/GramCharlierComptonProfileTest.h
@@ -59,8 +59,7 @@ public:
void
test_Function_Returns_Same_Number_Intensity_Coefficents_As_Active_Hermite_Coefficients_If_KFSE_Is_Fixed() {
- boost::shared_ptr<ComptonProfile> profile =
- createFunction();
+ boost::shared_ptr<ComptonProfile> profile = createFunction();
profile->setAttributeValue("HermiteCoeffs", "1 0 1"); // turn on C_0 & C_4
profile->fix(profile->parameterIndex("FSECoeff"));
@@ -70,8 +69,7 @@ public:
void
test_Function_Returns_Same_Number_Intensity_Coefficents_As_Active_Hermite_Coefficients_Plus_One_If_KFSE_Is_Free() {
- boost::shared_ptr<ComptonProfile> profile =
- createFunction();
+ boost::shared_ptr<ComptonProfile> profile = createFunction();
profile->setAttributeValue("HermiteCoeffs", "1 0 1"); // turn on C_0 & C_4
auto intensityIndices = profile->intensityParameterIndices();
diff --git a/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h b/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
index b374956ec03..df2182987c9 100644
--- a/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
+++ b/Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
@@ -102,7 +102,7 @@ public:
void testAgainstMockData() {
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
-using namespace Mantid::CurveFitting::Functions;
+ using namespace Mantid::CurveFitting::Functions;
/**
* Changing compiler on OS X has yet again caused this (and only this) test to
@@ -173,7 +173,7 @@ using namespace Mantid::CurveFitting::Functions;
void test_Against_Data_In_DeltaE() {
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
-using namespace Mantid::CurveFitting::Functions;
+ using namespace Mantid::CurveFitting::Functions;
#if !(defined __APPLE__)
@@ -255,7 +255,7 @@ private:
Mantid::API::IAlgorithm_sptr runFit(const std::string &wsName) {
using namespace Mantid::API;
using namespace Mantid::CurveFitting;
-using namespace Mantid::CurveFitting::Functions;
+ using namespace Mantid::CurveFitting::Functions;
// set up fitting function and pass to Fit
IkedaCarpenterPV icpv;
diff --git a/Framework/CurveFitting/test/Functions/ProductFunctionTest.h b/Framework/CurveFitting/test/Functions/ProductFunctionTest.h
index 41e6db65efb..a34711c1d98 100644
--- a/Framework/CurveFitting/test/Functions/ProductFunctionTest.h
+++ b/Framework/CurveFitting/test/Functions/ProductFunctionTest.h
@@ -157,8 +157,7 @@ public:
prodF.asString());
TS_ASSERT(fun);
- ProductFunction *prodF1 =
- dynamic_cast<ProductFunction *>(fun.get());
+ ProductFunction *prodF1 = dynamic_cast<ProductFunction *>(fun.get());
TS_ASSERT(prodF1);
TS_ASSERT_EQUALS(prodF1->nFunctions(), 4);
--
GitLab
From 2a2ca3dd2bafed1c7eba79688b5f5108be681bad Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Fri, 9 Oct 2015 10:25:00 +0100
Subject: [PATCH 106/223] Fix Doxygen Error, not mine, but it was found in my
branch
re #13347
---
.../inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h | 2 +-
Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
index 5c1513137cd..dccb211641b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
@@ -123,7 +123,7 @@ private:
/// Fit single peak in robust mode (no hint)
bool fitSinglePeakRobust(Functions::BackToBackExponential_sptr peak,
- Functions::BackgroundFunction_sptr background,
+ Functions::BackgroundFunction_sptr backgroundfunction,
double leftdev, double rightdev,
std::map<std::string, double> rightpeakparammap,
double &finalchi2);
diff --git a/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp b/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp
index d83a59efd55..b69b92fdba2 100644
--- a/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp
+++ b/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp
@@ -593,7 +593,7 @@ void FitPowderDiffPeaks::observePeakRange(BackToBackExponential_sptr thispeak,
* Assumption:
* 1. peak must be in the range of [input peak center - leftdev, + rightdev]
*
- * Prerequisit:
+ * Prerequisites:
* ---- NONE!
*
* Algorithms:
--
GitLab
From 5a3205b4bb56634550dd9b968cdd00eff92e4260 Mon Sep 17 00:00:00 2001
From: Marina Ganeva <m.ganeva@fz-juelich.de>
Date: Fri, 9 Oct 2015 11:26:44 +0200
Subject: [PATCH 107/223] TOFTOF Crop workspace algorithm.
---
.../plugins/algorithms/TOFTOFCropWorkspace.py | 67 +++++++++++++++++++
.../python/plugins/algorithms/CMakeLists.txt | 1 +
.../algorithms/TOFTOFCropWorkspaceTest.py | 59 ++++++++++++++++
.../algorithms/TOFTOFCropWorkspace-v1.rst | 59 ++++++++++++++++
4 files changed, 186 insertions(+)
create mode 100644 Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
create mode 100644 Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFCropWorkspaceTest.py
create mode 100644 docs/source/algorithms/TOFTOFCropWorkspace-v1.rst
diff --git a/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py b/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
new file mode 100644
index 00000000000..2bbf6ffb910
--- /dev/null
+++ b/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
@@ -0,0 +1,67 @@
+from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty # , WorkspaceUnitValidator
+from mantid.kernel import Direction
+from mantid.simpleapi import CropWorkspace
+
+
+class TOFTOFCropWorkspace(PythonAlgorithm):
+ """ Crop empty time channels
+ """
+ def __init__(self):
+ PythonAlgorithm.__init__(self)
+
+ def category(self):
+ """ Return category
+ """
+ return "PythonAlgorithms\\MLZ\\TOFTOF;Utility"
+
+ def name(self):
+ """ Return summary
+ """
+ return "TOFTOFCropWorkspace"
+
+ def summary(self):
+ return "Crop empty time channels."
+
+ def PyInit(self):
+ """ Declare properties
+ """
+ # better would be to use the validator, but it fails if WorkspaceGroup is given as an input
+ # self.declareProperty(WorkspaceProperty("InputWorkspace", "", direction=Direction.Input,
+ # validator=WorkspaceUnitValidator('TOF')),
+ # doc="Input workspace.")
+ self.declareProperty(WorkspaceProperty("InputWorkspace", "", direction=Direction.Input),
+ doc="Input workspace.")
+ self.declareProperty(WorkspaceProperty("OutputWorkspace", "", direction=Direction.Output),
+ doc="Name of the workspace that will contain the results")
+ return
+
+ def PyExec(self):
+ """ Main execution body
+ """
+ inputws = self.getProperty("InputWorkspace").value
+ # check X units, will be not needed if validator will work
+ xunit = inputws.getAxis(0).getUnit().unitID()
+ if xunit != 'TOF':
+ message = "Workspace " + inputws.getName() + " has invalid X axis units " + str(xunit) +\
+ ". X axis units must be TOF."
+ self.log().error(message)
+ raise ValueError(message)
+
+ outputws = self.getProperty("OutputWorkspace").value
+
+ # check for required properties
+ run = inputws.getRun()
+ if run.hasProperty('channel_width') and run.hasProperty('full_channels'):
+ channel_width = float(run.getLogData('channel_width').value)
+ full_channels = float(run.getLogData('full_channels').value)
+ else:
+ message = "Workspace " + inputws.getName() + " does not contain required sample logs. Cannot crop."
+ self.log().error("message")
+ raise RuntimeError(message)
+
+ outputws = CropWorkspace(inputws, XMin=0., XMax=full_channels*channel_width, OutputWorkspace=outputws)
+ self.setProperty("OutputWorkspace", outputws)
+
+
+# Register algorithm with Mantid.
+AlgorithmFactory.subscribe(TOFTOFCropWorkspace)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt b/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
index bb68b040a2e..de4e7b03fe0 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
@@ -75,6 +75,7 @@ set ( TEST_PY_FILES
UpdatePeakParameterTableValueTest.py
SANSSubtractTest.py
TimeSliceTest.py
+ TOFTOFCropWorkspaceTest.py
TOSCABankCorrectionTest.py
TransformToIqtTest.py
ExportSampleLogsToCSVFileTest.py
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFCropWorkspaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFCropWorkspaceTest.py
new file mode 100644
index 00000000000..14651813e29
--- /dev/null
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFCropWorkspaceTest.py
@@ -0,0 +1,59 @@
+import unittest
+from mantid.simpleapi import Load, DeleteWorkspace, GroupWorkspaces, TOFTOFCropWorkspace
+from testhelpers import run_algorithm
+from mantid.api import AnalysisDataService
+
+
+class TOFTOFCropWorkspaceTest(unittest.TestCase):
+
+ _input_ws = None
+ _cropped_ws = None
+
+ def setUp(self):
+ input_ws = Load(Filename="TOFTOFTestdata.nxs")
+ self._input_ws = input_ws
+
+ def test_basicrun(self):
+ OutputWorkspaceName = "cropped_ws"
+ alg_test = run_algorithm("TOFTOFCropWorkspace",
+ InputWorkspace=self._input_ws,
+ OutputWorkspace=OutputWorkspaceName)
+ self.assertTrue(alg_test.isExecuted())
+ self._cropped_ws = AnalysisDataService.retrieve(OutputWorkspaceName)
+
+ run = self._cropped_ws.getRun()
+ # check existence of required entries in logs
+ self.assertTrue('full_channels' in run.keys())
+ self.assertTrue('channel_width' in run.keys())
+ # check their values
+ full_channels = float(run.getLogData('full_channels').value)
+ channel_width = float(run.getLogData('channel_width').value)
+ self.assertTrue(full_channels > 0.)
+ self.assertTrue(channel_width > 0.)
+ # check unit horizontal axis
+ self.assertEqual(self._cropped_ws.getAxis(0).getUnit().unitID(), 'TOF')
+ # check length of cropped ws
+ self.assertEqual(len(self._cropped_ws.readX(0)), int(full_channels))
+
+ def test_inputgroup(self):
+ group = GroupWorkspaces([self._input_ws])
+ OutputWorkspaceName = "cropped_ws"
+ alg_test = run_algorithm("TOFTOFCropWorkspace",
+ InputWorkspace=group,
+ OutputWorkspace=OutputWorkspaceName)
+ self.assertTrue(alg_test.isExecuted())
+
+ def test_invalid_xunits(self):
+ self._input_ws.getAxis(0).setUnit('Wavelength')
+ OutputWorkspaceName = "cropped_ws"
+ self.assertRaises(RuntimeError, TOFTOFCropWorkspace, InputWorkspace=self._input_ws,
+ OutputWorkspace=OutputWorkspaceName)
+
+ def cleanUp(self):
+ if AnalysisDataService.doesExist(self._input_ws):
+ DeleteWorkspace(self._input_ws)
+ if AnalysisDataService.doesExist(self._cropped_ws):
+ DeleteWorkspace(self._cropped_ws)
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/docs/source/algorithms/TOFTOFCropWorkspace-v1.rst b/docs/source/algorithms/TOFTOFCropWorkspace-v1.rst
new file mode 100644
index 00000000000..2a390bc98a7
--- /dev/null
+++ b/docs/source/algorithms/TOFTOFCropWorkspace-v1.rst
@@ -0,0 +1,59 @@
+.. algorithm::
+
+.. summary::
+
+.. alias::
+
+.. properties::
+
+Description
+-----------
+
+Applies algorithm :ref:`algm-Cropworkspace` to an input workspace or a group of workspaces to crop the empty time channels. Boundaries are calculated as follows:
+
+ :math:`X_{min} = 0`
+
+ :math:`X_{max} = N_{fc}\times\Delta t`
+
+where :math:`N_{fc}` is the number of full time channels defined in the *full_channels* sample log and :math:`\Delta t` is the channel width defined in the *channel_width* sample log.
+
+
+Restrictions on the input workspace
+###################################
+
+- The unit of the X-axis must be **Time-of-flight**.
+- Workspace must contain *channel_width* and *full_channels* sample logs.
+
+
+Usage
+-----
+
+**Example**
+
+.. testcode:: ExTOFTOFCropWorkspace
+
+ # Load data
+ ws=Load(Filename='TOFTOFTestdata.nxs')
+
+ print "Input workspace"
+ print "Total number of time channels: ", len(ws.readX(0))
+ print "Number of filled time channels: ", ws.getRun().getLogData('full_channels').value
+
+ wscropped = TOFTOFCropWorkspace(ws)
+
+ print "Output workspace"
+ print "Total number of time channels: ", len(wscropped.readX(0))
+
+Output:
+
+.. testoutput:: ExTOFTOFCropWorkspace
+
+ Input workspace
+ Total number of time channels: 1025
+ Number of filled time channels: 1020.0
+ Output workspace
+ Total number of time channels: 1020
+
+.. categories::
+
+.. sourcelink::
--
GitLab
From 1742bc930ad0d91da09d6763a932e95f589976be Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Fri, 9 Oct 2015 10:40:34 +0100
Subject: [PATCH 108/223] Fix for GCC error with friend class lookup
re #13347
---
.../MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
index 9cddfed3e87..9478d2ab3be 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
@@ -102,8 +102,8 @@ protected:
mutable double m_pushedValue;
mutable GSLVector m_pushedParams;
- friend class SeqDomain;
- friend class ParDomain;
+ friend class CurveFitting::SeqDomain;
+ friend class CurveFitting::ParDomain;
double m_factor;
};
--
GitLab
From 81823c0836c80f178d2a72400eb8aff7366ff788 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Fri, 9 Oct 2015 10:46:07 +0100
Subject: [PATCH 109/223] more clang formatting chnages
re #13347
---
.../Algorithms/FitPowderDiffPeaks.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
index dccb211641b..5436f304f29 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
@@ -122,11 +122,12 @@ private:
//---------------------------------------------------------------------------
/// Fit single peak in robust mode (no hint)
- bool fitSinglePeakRobust(Functions::BackToBackExponential_sptr peak,
- Functions::BackgroundFunction_sptr backgroundfunction,
- double leftdev, double rightdev,
- std::map<std::string, double> rightpeakparammap,
- double &finalchi2);
+ bool
+ fitSinglePeakRobust(Functions::BackToBackExponential_sptr peak,
+ Functions::BackgroundFunction_sptr backgroundfunction,
+ double leftdev, double rightdev,
+ std::map<std::string, double> rightpeakparammap,
+ double &finalchi2);
/// Fit signle peak by Monte Carlo/simulated annealing
bool
--
GitLab
From a21cce60b0b6bb6456e0993a6480c10f1265f805 Mon Sep 17 00:00:00 2001
From: Marina Ganeva <m.ganeva@fz-juelich.de>
Date: Fri, 9 Oct 2015 12:47:08 +0200
Subject: [PATCH 110/223] Pylint warning fixed
---
.../PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py b/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
index 2bbf6ffb910..bdd39f2b2c9 100644
--- a/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
+++ b/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
@@ -1,6 +1,6 @@
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty # , WorkspaceUnitValidator
from mantid.kernel import Direction
-from mantid.simpleapi import CropWorkspace
+import mantid.simpleapi as api
class TOFTOFCropWorkspace(PythonAlgorithm):
@@ -59,7 +59,7 @@ class TOFTOFCropWorkspace(PythonAlgorithm):
self.log().error("message")
raise RuntimeError(message)
- outputws = CropWorkspace(inputws, XMin=0., XMax=full_channels*channel_width, OutputWorkspace=outputws)
+ outputws = api.CropWorkspace(inputws, XMin=0., XMax=full_channels*channel_width, OutputWorkspace=outputws)
self.setProperty("OutputWorkspace", outputws)
--
GitLab
From 83bfd720f86767aad2d5cd6d2d83928e9bc97d1e Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Fri, 9 Oct 2015 11:52:42 +0100
Subject: [PATCH 111/223] Documentation for CompactMD algorithm
Refs #13508
---
docs/source/algorithms/CompactMD-v1.rst | 62 ++++++++++++++++++
.../RebbinedWorkspaceNoCompactMDApplied.JPG | Bin 0 -> 20584 bytes
.../RebbinedWorkspaceWithCompactMDApplied.JPG | Bin 0 -> 32254 bytes
3 files changed, 62 insertions(+)
create mode 100644 docs/source/algorithms/CompactMD-v1.rst
create mode 100644 docs/source/images/RebbinedWorkspaceNoCompactMDApplied.JPG
create mode 100644 docs/source/images/RebbinedWorkspaceWithCompactMDApplied.JPG
diff --git a/docs/source/algorithms/CompactMD-v1.rst b/docs/source/algorithms/CompactMD-v1.rst
new file mode 100644
index 00000000000..388f9ca7a08
--- /dev/null
+++ b/docs/source/algorithms/CompactMD-v1.rst
@@ -0,0 +1,62 @@
+.. algorithm::
+
+.. summary::
+
+.. alias::
+
+.. properties::
+
+Description
+-----------
+Used to crop an n-dimensional :ref:`MDHistoWorkspace <MDHistoWorkspace>` to the first non-zero signal values found in all dimensions.
+
+Cropping
+--------
+The cropping is done by supplying `IntegrateMDHistoWorkspace <http://docs.mantidproject.org/nightly/algorithms/IntegrateMDHistoWorkspace-v1.html>`__ with the minimum and maximum extents associated with the first non-zero
+signal values in the workspace.
+
+
+Usage
+-----
+
+
+**Example - CompactMD on MDHistoWorkspace**
+
+.. testcode:: CompactMDOnMDHistoWorkspace
+
+ import math
+ #create an MDEventWorkspace for Rebinning
+ mdws = CreateMDWorkspace(Dimensions=3, Extents='-10,10,-10,10,-10,10', Names='A,B,C', Units='U,U,U')
+ FakeMDEventData(InputWorkspace=mdws, PeakParams='100000,-5,-5,0,1')
+ FakeMDEventData(InputWorkspace=mdws, PeakParams='100000,0,0,0,1')
+ FakeMDEventData(InputWorkspace=mdws, PeakParams='100000,5,5,0,1')
+ #Rebin mdws to create an MDHistoWorkspace
+ binned_ws = BinMD(InputWorkspace=mdws, AxisAligned=False, BasisVector0='a,unit,1,1,0',BasisVector1='b,unit,-1,1,0',BasisVector2='c,unit,0,0,1',NormalizeBasisVectors=True,Translation=[-10,-10,0], OutputExtents=[0,math.sqrt(2*20*20),-2,2,-10,10], OutputBins=[100, 100, 1] )
+
+ #A visualisation of the rebinned_ws can be found in the 'Input' section below.
+
+ #run CompactMD on the rebinned workspace
+ compact_output = CompactMD(binned_ws)
+
+ #A visualisation of the compacted workspace can be found in the 'Output' section below.
+
+Input:
+
+.. figure:: /images/RebbinedWorkspaceNoCompactMDApplied.jpg
+ :alt: RebbinedWorkspaceNoCompactMDApplied.jpg
+ :width: 400px
+ :align: center
+
+
+Output:
+
+.. figure:: /images/RebbinedWorkspaceWithCompactMDApplied.jpg
+ :alt: RebbinedWorkspaceWithCompactMDApplied.jpg
+ :width: 400px
+ :align: center
+
+
+
+.. categories::
+
+.. sourcelink::
\ No newline at end of file
diff --git a/docs/source/images/RebbinedWorkspaceNoCompactMDApplied.JPG b/docs/source/images/RebbinedWorkspaceNoCompactMDApplied.JPG
new file mode 100644
index 0000000000000000000000000000000000000000..977b23d832c1c10900d09d518dd9e1745776aa92
GIT binary patch
literal 20584
zcmeHt2Ut|ew(ce)Q4}Nx0R_o92NB7VbC%Fz(>AezCJ2H8iUa`xB}<kll9PahCJ0ED
zoO8}W!re|f=Q#83H|M_j=Dz!`yT9sPdv|qJt-sb<_1CI8|8hPFTvV1<k_XVx(15$(
z2RNT1VU|Ne?*V|SD!>K+04{)uCJvy3IXdt`IS>k9f_XGBe?LCq+Z~VqfQysMGyo3x
zjsSd?0uw;941VE$%l){1An*f$9|-(F;0FRf5cuDSfC|*khJ!)X0)e;>absZB){&Rx
z(2}{sp`@*(eFFfnUSRyhFGxWiQThV&w|rYf_)mEZegOc8i1<hTA6x@B`x~A=xW@lR
zt@<JJ4+MT7@B@J#2>d|c9|-XA@Cu6Y@`&+>GJxOwqGEiaz#qK>02KfV*a0>G2fzTR
z0u}%Q{M-j1fE)PC3TOj5fIJ`z{;CDY0C&K<68P?00vQV!CBf&pk3cwxadX=_b6Hs1
zTSB<3?BU!<3kPmqE*@?`LK^8{VFiOA7%U++P&-MMjjCD}2B@_pi@u;LkE(+#<UUl<
z!wI78p{8Ty0kaadW|5X6#FIdZA>j^i2*QE^34dVcEQXY1{Hb;^F#qi}H=~q<ll46@
zt=saylmMS38Gq@Eo0}V#8$Xx5lMOeosHiA64<9!lA17FX)7jk)VS(hdb7uObg4+;h
zD<`M}0%~u^@U21%OM4fDB%_N9)LQJG#XUhwYimJHOACH$PF`MX3r-7beqK&%etv6V
zL0%EQd%Tv6zcg=c^;_!>E=~`AYTMe18}a}Ghu9&UK{R-|8M%M%^k3B`2+?ni{vrIJ
zj9?itStp1E0&*KnQr}d7lb45+M^xumwcz6C7m?upuABt-H!%LGqknDB{}ftM64q8?
zR^R$=@APx?+7QS8yU~6CmHJOf_|Ia4rGCzU?Saa8;lc$8?tkve@3Hym4XBIY|9;b4
z@ShBS!}X()e+%RvaQ%Sm-$LNuD*Qvce!%r_A@FY%{-Is}!{GV{`-Rwnl-CX9w&x=t
zna07w!p6eH!N$VI#lgYFBf$qb1|AvlMFJ8EGAc?6G755PI+m-{wAX0KDHypJud&`>
z=U}H|;O6IM<6~iCXZuzO8V)Wl-UU2Te0)+i8VVY=fBQPG14wYu*wDE#&=>)95;P1F
zwDU%Q9^BK!0(U{bZG`@Ep`l}7VqxRpUckc#3zS?0(9tk3&@nNvurR?bP_&2O?*JwV
z)}^bwGT4_jEpQkeN%?%k-{3OcDy%2d>fU7Lw{-HmfOmzQf|Bambr#keYyyHp!Xlz#
zvbW{r6%>_}wRLp$^bHJ+tgIpTZ0<vCoe?gsZb)~J$4~qN0-rt$iims}6&>^Hb!<v%
zT6#ui*4ym&Ma3nhW#tu>9~&B*no%vSZ9Tnx{R4wvhK8r6XJ+T-7Z#V6x3+h7_x2AC
zkB+~|g$7{!EY@$5eJ2+QC>J^=CI%+XH@VQz-N1xFf{AsN7yFWoCXR*UWkx<<T+&<N
zZwl)#F!5_`l36-+<6U7En7X$0O|+jR`*VW%{g)*BO|XB+H4G47pn-#jK>|nv$LK+<
z$^S@sKAv<5R@eHLKZVa+1y~|*eDbu<MtqJjY$p!!&w;^YLL+weukdqVkub++lKUJm
z3tKBY2a<*I&Vfg@ryf9m%KO^ViL*z;WoPK;z~17IKmP#ihm!oghLJyHDmlx|WH>sU
zUHX|z+rny<KM8dX6x_VRni2&3lyaY&U*y~`5ex}UaF@8UEud|SKlhX=Twd9$llJN4
zrR<w5lr18?<-S~bkg}I8Z`nw#NJFRrc_K<hh}4sd3RVg#zU_yBI<c@0dnHJ)49o)J
z6pS`%WH_&fxj@m#9x9$#ZB<jiTHcel>vIvAINqaDK~kK@+geo<J6E*-{7r-Mr#i>a
zG%hodW(7B~NHza^lB~;FmQRhgj<ET1;MYDhtzTRru|W3;rDw)rY4=pO*0{<;t>x_*
zQ~jsZRqkHR21LZKP>3L02%bc>pBj5<zl10x*Oaqq^f=xw>mt6Y-u#ebgu6kSE=yvX
zO{N51f7UwZRCP)8@H)kUpEYkgX*Q*)V!akICP_VZXf#ev#X=dC?uW2x;>#n$N^Xoo
zQ5mAbZbc@g-rWchsNpLjF^te^Cs_YV8<zl_Uv>-U*;=uwP_LSAaUP$1P!HBK73$~7
z2L50qj^Hcap2yFF`|BY8jdwQcf<4*O<=8is=YWp%crxBgO*w!ROk^rL-NhYF{qT}J
zp<Yd26U9Q)y7yUkaS1Tc`TgV{c0d%S5A!7)=>yl`bOynf#V0n<c{%R!bhDl@O4LVw
zrW0lGA1^Np*d8#3m0KlVc!A>3%7VBsVJS*nRKTPXV;PkQlPm{YAa0~%DeXp#sET3t
z6t_~bD_*(AVaMfbNs1N^@UOD}&jrx2w3e6yQA-XrijEl67&er3qQdE0H?a?Y5t7xZ
z!%d_(c}Zt-(#lO|vmmgfJ-uR}n3G>KK|}ui*bs^x3-d+tI~GdjnbCnf1xI_rx!lr0
z2b9F+tDy$z8g0w+crTC)p|}EwcXXbPsnA&ZrxNP$l%>*G1YtTfLO|~YhqA$_DS9I-
zh6rHuML%corOEx_dx77S^?oHhBLM?yWF115hJPtqnEYlT9?%I;?vpL=0-AE9|1Iff
zL+%&+*{*Mr{p#-6qThnj&1H|kjNlom=;h&-RlX37x{DOpm^PTfUt>{pO#N^#B}nG-
zv1Cn2X{yBMVO7GdXe~{{1||Av^Z*@}zz3JmR#3A4X9#hO|Nn%L-M>$Qe|mz<R^MlM
z{95_ue(?ME#)gYeu6+v1oQqcRyP)MRPHKgT?i{<G(|&eiQA&ESM3n|<IU<*&R@evM
zVA`2=d3{ZFLLlCsmtdQmd+~;g>|%Sv)WTB)>+r%yZ^?m$YRt<xPw$bJ?x01!3we{;
z+H9!in8;qy3#p1zDT&c4Glrp_86h<fa_z%j%enyzv6BKD_{a_2t^MZ($l-;CZkbf(
zvpXIlNr*f)|EtxVb<Xw6V$R`9WTqFE9fw_`rggXCk4uXnX=Ci-vT!k5KJ4OB7JtP%
z6ysm8o_VWN0%*punf_jq`KFwmC2ydy!OMPv(d(U}2CU5fSiT~yEOhfFw&Kr`_MDK?
zssPc+*91;YYytXOJUWl-F&$*mdm2`pyX^jqd)|H?LVf4+iOjSooLsfIHyO@;Cp@Lt
z*HWu_dhyEDo0N4JQXgx~9^p-Uv-z~-fh^lR2jte0uKkTCI_E&R(a2e?{yA{dW23!x
zeCasR%>Haj|MRvHYf7z*G#egk%A>z4iKz!pY)eAVf&JcdKu*vTf=p`IIHD^)2fl(Y
zQ(|l0e-M^D2i(IB_2;`jm)o3nnos*g;03IlYMcWe8CiC<{lo`3^-}R~&CIv7Z*SfU
znOa%XHrSkvt?A73v6E`2oh_u!d664_Qvbo^hTY@M>ovEk2WN6yaUQMFmJmv-S@%sw
zh(AA^cTrI76nYvS>TNbd(dDJnHW4!)6msl-CQtn6<nn3cj4}Sip^o`xn7iCLFbz2e
zE^rT52d5J68HcVe*q1sF*Q8XN*ZGjU_*_N~G$>XLoLqAutbf=I9f<W)`yy}uvdtGq
z&B?=tX0TW<bpJNgA=@Y;Bm)+m1J8q&#s=d}%LT1tMacp;?^2M&U*cbfVYfF&n8Gw<
zuP4!Xz{hrvALf0jxULY(@U`r=2A1rcA{r6Ox2}s;vZ-1)`u&J$1I^~008z^*S@yRS
zY%-I6A`E@I<@>G@`!n*r0@5IH8j<UT3oKGA_cGtlV=#DGSYC<sR0G=q=z3S657MhY
zG4U+|`7G0!CqV-fd&jlM7=v&V^(OTrvb@@rJ)d2i{FAEF^`y6R^XI@i*+b%MDM9SJ
zm$#Esf>?onO{-E=TpO20iH{NXr-bZbw9k-t1Xi+koN|WuYrC`yZ~~797)kBzY+&p5
zhxT>D=0m%u%JxF85m@1G;$ZSBEE(fNGl?Io#3iK$+Ah;36zeS-I~t_oUD&HT)>(X|
zxtob7_>`_y%BYsXs5+7A_I_<!TCc%^)#7fd@(uTw8;ExHwIq14-^@MNqeAwzE)#1{
zydB~zhhl>b!*}#ucRH9Prumqgd33`p*38NVQlcfYy7I&fvJa_(O0JCRZPi4coC8cW
zcIFDys?E?F2-hm}@SP5_HwD4S7;XC91Maf`m{hG!x-?Xcza&3Wn&mB#Qn{-uXivoq
zzs@3HUH~oW($eFz#OZV3bCZppcV~PiY)Hsd#JNMZs<3dfi@*pOwpRNf!uqRpOj+Aq
z{wi1J7d};HIW}p~0c}c-Re0WLeoyzUY{lIcx_(R6t=PD9Z&Pz>bDpdfoodVdko6da
zZhP3Ocg~~s`;$;sc2Sq8+zGp{W{u=R4yMM%!aOJe)sR+3Z0$}Dsu?fc$r>SJ<Ahsd
z-fi$a!zUVyDZCmT5x|Kw-nvJxsZ-{Xp}fm|L9NHOV+jT40FjF&Pq8D9Lk{VgLT8_T
zvX`c6(vbI=+gYobk9peMt5&ObFB+94^7VTTO5%)%TvxsIUs*_{KZ_!=gBcqeBa)IF
zK<(%jx%E#0144DerEr)OL+QJ68-uyA^5&ZsPgu&OqLznQo(SYIGF%$7W4?6sT<{~i
z7#;6p-(V|gqsMhOl5oDzA1|E)sZ^B?<pmu@65dSYLGgmY45RRev~dTe#`}Gz?AO~C
zH5!_8BVMMxEP&@nC%CS&L`zC5F9?QVL&c(E8_0_FAl8KQ#<!oM{CMLL3%mI-0%RTT
z(Juv)N6n)HEA&Fdy61982VYN~G4{-Kmwb)GHBGoW65wS$C+m7V0P&;`OGQ227&)r|
zgBeW)GzFjeB;a@MUD_jyr{~=89OCwb)WRRCe=5o)a4^U>5P$1AVl-&49_1IrTHvq+
ze*aU{gf*Eca_ZnD%*f{ybb;NfW<zEyn_tfq@}$p(eHJqc9u$Oh`HWkgksTH7a#5ZG
z&M}8cvwpvD<+s^CbLUO<Og25?XD6Vi!tIQXsr_<XT2QG;9-cOQv>oi{M%HqKY<{Si
z7dz!bjCWY3(3ih)f-{ZpOxBmjzeF_(=X~F?z_rzqR2}RhjxDdWlz5ra*CN|?oc|D&
zyu43GHCQZ8$k#b9K2!qZE;^d38-5&FMS!-l5wsV()17jnK4=9~CqX{G{du*OdTw)<
zucR^Ci4vou(TgTPLy<w>Ipd2=I@GoDVa60zt_p$Ymm;{PZ-hHbXo>l~iGj7q{d}ir
zI+DJ;lIJ22nE7ggw03#lWYjf#F@;x3UrWR8>f+tAs&en_-VTn3!xHH>o8Q!GZE=OC
zjXjLL{9#3-^w~*P42RRYh-S2;1D`5fms8uYS3q31VxWW_r1Xwd?QUX?=}(ziIc|2M
ziR=qh8rbVQcRn}=rYOz^w$x9qnh#0eJ?rT8>RL@=Z`<+ic8NdovTL63vKp?5s7{$N
z>=o<+-RXi{U!EWZxpFTP6wYF(!&6>)O-W1MK?YS`pr4Fho)na{&2H>7xD2WUv1y5;
zG@10QUMaY8?g#Ciu4;SZpwc@tChi<4*WHzf1{LA6dfWG!fL=u$5K`7yhI5uceGbSf
z&n)J1xKd7U_9mydf6DVTo8Tm>rej(zf2vn<WV%+kt1PAS@WvSI$>u~TqPA%1*n0c{
zAq_sYs!)G0nY!uN7OGDlV&en#yb#ejPyK|jxL6AtIJSNW+Y!~u3ydi$xRTeOW8O9I
zofFXXxk*m>W#l%;ZdQ6E9{-BQ_;R!!wbY0k)`yd|9f;0YXnE@a*}N3@mVeAsfv0)!
ztK|wxjZfOLvC-eHs^^)~T=PQov)#z5nS-StdEYY_Z4SkYdpYd1Sdeql>1Hmv#g*Z+
zv~GS%Fz}F6e_7|v>QXa#O@zYi9!r<7)cTYhsos;{R`U1n<Ir8}B|epGItShab)^*L
z5JS~8YVu>b;*YLp4vijPq2!N^%R??amQaUIb(NmJ7oGj80QyV~$1+#v2<aNoXXY#o
z7E!Ej<mJ<FO&8wDy}4H>wRhy=Md($TnyR%OG_3djp}Bs^TE%fb248AuMn-P>fN+)3
z(uk)?O;7BazqE4b{5HO^YwY~}sb`KAvkuv!C~XtBATMY-%El$Lfyq>`BPYAnu5B^>
zG1rB$Gnw2OwR}e91kACo>?3Cs%Z-*<Q^^Z@N|Z^YNpAb*r=T7Tv3F&q)GD?+IMq#E
z4SZP<Z=aV}We@vs+SRs0U_R)`SJ2+>3H4l!*j@$Kz8);N|FjT7TlGeZq$7T3{;TJ6
zHoH7kqsB?ycxCVaZ;eL047ZNM>4_WDK#lS3E$^tDMm!VF>Hu?2i*grz=Vl&0=lGcw
z^SFCR0{P2iqARSb6=nm<YhSBss*=*Jhtly5kv)-`FSSAnY9a<RPD2Ap{R<UdN%|Nq
zxY$!JQMqJ)D$^WWcc|jDR<NiSWpY!K)-<!Pk#_ZS@>ZzOD-q+J&tZ;vO&*pcMO;h2
z*L4oab0X(#k&)WZ4Y#m5PAe->LZcS|0-i^%EIsd6Hnt@Q@6cW8ryWfa%!8S7ySaH9
z`_!GZi=h;#gBJXHq}C5=;szJKO&FsRcT@hAO<<%QJ_IM@fuwT)F1@R*U#kD?L<*$0
zE9&P!Y0~kHoDudJ=ZS+?=YYTWgH!wfpV7H9mLrCrNn^I{FC?=1@={w==ix-N&^Yeq
zQr|i}qdHniZ+u{Yz%J3Iv#)ijH?oWN*>ok__5>Bue%j{Qg3#tU@R3g7tEmh(2c0&8
zMV)io{~g`}4Gn>lqe`}{vB?*(K%?ZXg(e52b2A-zT!Tl*ET`a8;b$(i9}C7!7Xbns
zk=@-H$$s~!qyVX_wzU_%r1Oy<)d`-f(yvi#tH2(u&7;ah93QvPq9|8P_x5Yjpl;Fo
zv57el8)t+grZD*h>QBzWY!UcQH>Yz_*44F66&xK26LQOhofR-IzKJk|+|3TcR=I=(
zh?E3B2^AD9jq~&(PL<(&^AkGJlM41Qdq!1zsvD5-gtV)uG3_VjubYYUOW#fx5Z`xG
zf#<<0?<I&cfUDc;(CchUXpbz3_;9-l(?35{6Z<nB5G0fXhz@5kl2Xy_!mcWh)l=Lu
zY^*e(OTfkTOiL#`{-WbLd;ecVD8DC|f7$b2r(VCtu$*Ge16(?!o5*8JnoBar@mtk)
zuD_Z_Ji4TX8QC?QU9lP;A8|o6KXH1RTHMgiZax(Esx0&Swt8Jsf@tPVfF{CLIXxRD
zb}!JjOl%+>nt8L6$<S^AWb>H*SWhYISm>HVqlwByU?Dbl1|`77VFI~Uao=52_B$cz
z#R(9NkJF1$*OVyhap<ON%>L|L_8mV#|GS>QBQ?NVIZ_QYIkH<{&3Xi?+C5d(b>A0N
zREqdfKYtQ3FWO9|gjK=dc$0it{Q1)dYmkbnSP=$)f{1o@EFBF#gUC9-Nh#l~w`ou;
zEEJAdp+*|Z#g5OWPcc_-f9%eAur}v6YrWuzLjhbF?3d7;S|eHl<BV>1dNZvrap=2+
zH#R9T@DRu}%TVqMAk@ogT$+nAV2KP{lAX`r8rkx2MP<nM46D7*vT#HwN2CQ$J`Qs<
zD=^b^%w39I07GHUDa(4X!T9OW@Z!?Q+-wRH(@SY@nM4?7M)h+(qx~e<H{t%~q%r1`
zO~0YjPdIq|=4=np`Ng|p#Ha_3)0b{R0xB}0V(^#I;h)m)z6&7;o#XlXh=RQ&@Rql8
z%SMlhiL4EbvtzWo9+TBN+R%V4#W$ic5x|I0RnjR@wYl?oO>e=dFHc~RvJu8Px^gL+
z;YD&Gh6v`&m+qcAhe4{&*ZIiDjR#^}>CmjYO1;<ADp0YuH~vlCY|0V*engT@9yRWA
ze+K6No{0aqorXV*`m_1(7r`>kj7Lo5Jhn|}u9m$^M9|F4BW}GNJbb#BjK4?Q)F|Zo
zesrvZ=HjgYB}kNCHY+8E(j*|tJcyHmEZxxF((3TJo@tY5Vm@kMz}N)eR~qJA3ADR6
ze#frv<XIg}QceGIBGdcs_2}_+LNx_zBEpO)XQ%R3nqtlOk5RXrdqd@Dxv0hew323z
ztk8j~+?3|#n6hMKN#X_(EV5Z6SMZP0eY%iEvC@V8EtK>(28I5mt$z*mWTB`3vd2R+
zSL>GxFX`*Mw7%Ow_9^DY(p>NAmO8`LS%7O>Z9#-XhnyL$S$LgA#n{m9+9kf*{$J#%
z6&uka{WT23l7YxCIxjVQ>IW9$M{P@wQJ|4JLTN|uSL(fbVmhSyVCbt{_Y_3eQgj(x
zY^T0JKcBkMNIhb>xp2Ymt7$@dL1fXoySDO3QKIw048@GS*VgF&b9VeK?t&I6L-xtr
zv=PQ(?Wb8uLlb<)ShSaPMJ3%f+QX$Z%ro26v_W8n_O-t&vno}g6-Sm>+bax~JZQho
zyV6LV$C}6;7kh#i3fE`0(}II%Xo>D9b(x7Q-^buTyG&?v_5|*Hb`BW$Z0qX#&@YoL
zzkqg4);O4&$TDxC<_*1CsTnJ}h8=hyYGOMmS<`ElV+JOzGd0|riaRj-jBy#}xWKk;
z726ixzS-L+yEBO?kHB@#g@B@S;Fb`$miEb&K4QzM4co)rQxsU(G%M%IzZ!v@+2QzL
z9TIM`uqHymmr3hB^CmwcN7BDIHjU~zDlP|U?I$WsAH{5KL$T;&spheT(!NQVwD}4q
zy~_kkIyi1P2O_d-y2AGG#h;6Cd6DNc#}rX;4t{zsJ}SRW($q!IVdvx^g3@A7%N`WE
zG8l8kc@*_Q<wo%ST6svQ6|!}vpq(k0Ce*nP5BPKrJZUflS0&UY=RoZM{YjMWx|dIu
z;izG~^JI-9bIq%IyAP1?@oC`~p<Ku#E9XexX0dS7YkC#$N~_C@66Yni4e!{L!5beq
zQ#Y&AdK=Q*opnx3*1)zoxlYw}iaWe;diL%dn9VM5o;khMIo*k$gthYQ+G;bt%MM5A
z0ZH`}M`u(!b$mP#Z(q<7TS<q1$y`(X0q;gco0Vjh9h23oaX#eAcFPP7Q~VzKBYx>A
zo&ldl`9bN8y})zenyzOO{qhyJD-I@y+$Kug_jrs8UR%4Bhs-iPPn0qkot<<HP19F0
zsGRffm@k~FSWBItjZWJc6`B;fT3jAX=W)`*P}jO3iI$8Fl3|Nna9tac?=!JNe5Raz
zASK<$vCc7B0S;P(*{8c@=6o$1j?^s*<Pu(m6|HqMw2I)MnS3!eGcoLPraR)u;2$ZS
z77`7aVF|6}2<34S?b2ZVy^d9EoxQPfw884~+iQ&2x5BDCidOJ^I(|!}VrDL+Qw@h=
zSq>3pH2-mUd%Dx})j=zSH*u_tr0|nHrG(3owd3RPP7mKdP=<rBJwl-|o0?6t3Q~Ik
z4R-fv1#af&R76~!MOj@k@rmD5Vc^PeRAs#<eH@i4>2lT61{7mUV3@p|$fD!pCg7gW
z_wtWR_X&)+Bp%dz%xYG5-^`mgq^XYJxGz$%-kB<i?SurSH#ac0)my<@^?m>q(9T|G
zBBpuHNGC~2I`gKPm=x{x?+sxBc@Ajw!UsGjuvWt5cjVB^URyhDD;6eCFI0&I?^3o-
zS1LDc>H2r3r`BV=^nUQ{t$|v5IRUeqqvAr6oV>`gqi+Ww{Jq_N05Q!N$vyahKgbv|
zAB1Jk*D^O7ZY9&y<?2GY$RF7RB6|FBM61kz+iJ&3DJ4PQkpekucyVj7C6ktj2boOJ
zb$CZG>6oOX>+7k-Inb(W_7!y;5NB634ysj<a4aiXbvsi`gj@&?x#UovO>(C?S&uGk
z1s|?FcDE+1BjkFJi)o|9Ot`fyDwQ!FAyPm6drf_)09F~5K4vR?26nTg*nc5Wov*c&
z@$Eeka^`pdNi(RVTSAQw*H@|REtuJX+f5-^!W>N(+jIluaa&lzJAOYz$6?^8v#V70
z*`JW-%fX=dT@s0q$Om#-pB%W9M1W0EaENS$t_<hLxMZ56=7+~VZmQEwS9QP4AqXaU
zq0SWhN9MmrPrpp17vqvO@lE!D9`ZzYiT3MXg3@12nnXCDO*(@<@UZRUf-blVk!heX
zKW4gAc2S0IvT7^^q8a&!PjPnZCgJbB%AcrKukQh8i7D5LT5VWINtOR(qGXd>>J2?g
z3MPg`1%W?Or)AJa1@gF7G;2Y<C(BFYme_WWRxKn`;jOD+p2Vn|uT;*<`eJNbX*!VL
zLmvlo!>^a{4BC*_%H`vcmyrnlgE^oN^nOqy(}7f<$r>kiV?{If*&U8JOSWh$UniwH
z9N!K^l(FW!(tbo$p4geR(7-ymAM$`~JUHFJ`fjkFJI&|cdA{#lmfjpGTE`M-T!N-t
zgPQNaj&tUX-jKND9<5SCDSM;70@IqLem?g*bIg+z`#7T9vxZo~J;^av)WT&NHMV5)
z*NlvC0A_de?qkIDR{Laug65}MfE_nBF4sab?{LI;@C9f;cEW98dfZ{~yFpRgg!^|!
zO{(I6h__W1_rgKQ>r2HNvm2NgCLgy<muCH!sx|U(@h^=^A6^<DInpbAk#<p`ytGjl
zFO`LP60LPU_cM-g<~KJ0LTD=A0D70wGKaKHrFlcHT?j!Y_AJQ@1)SKz-}#Q>UC`dx
zRZ4nunYO`Togzb+Bm8MLnY@}(9Y$n_VKR}u8t4YHms~4D0{!+{LHkjfjQsQ-G$2Yf
z!WJfmP+~!=?;Hno33Q2iF)&b#=ZuDLy^x`s9wE_T3yzO`gu@bBbdzR0Vdhj;w`a|T
zniy*(0<@pVdY0GLpaJp4Q@@axp`o)yeK*bZ_U3XH=Wz|Hy$fptZJfbRvZ<6YOP5lV
z1t3xvy!S}7>YI5*RjEV3Q8MU(-o3ZO5kMzOB}_BAZ*7qnNJ*m`_OHH3X9Mqx$x@}n
zrWtBZ@i^*axyrXq$&KSFa!+47G*v`mpdWB{1?@nP-8HctM6)ohr><k(kU+voz)rMc
zwWUFlh)*Pk{$JTcj#~4_5!JH$9I4x>?&%3Jj-u|&P@0|PP82P+gGi15TE~||aESWy
zhCR7K$(tipFoa)Q^K7+rm(MR0F%j&Fv`qg_Ma4nyB{Y`&KCCTdKHAl^5%j@n&Rsd;
zGziMN>2Jes1)`}{23@Tt&sU*R<scY`yl6l%$<M?kehTLQJi`?92cy3FfU|hS)vryO
zO*qzY$nA1WgnW3HRPL(dXB&*5qMH;R<RSSbOMy{S33@#vov}ET6`rQy)oLx1PZE+g
z-kA6^N$k#7Ubqe=C%`e;(#ieLYx^x=`|A-bNBuLdzO}u$rMt$mX-kz+rEwCf_yRo=
z<7U=|7*n^7TDM<{4!cv%l;rDutq*g{Q|GhAjfKz6k{`H+*cmCr(#E+eRby$-DZJ2p
zR$os!X@2R$#HRj|!(wOl_aTV#f-8qfy4@~w{#@|g4i2N-0w3p;(Q$cZE}eh~7P+SY
zT07k-tR&y9F_x&HK*8Axy96sE%F}+|^A#29Qyg@Z26cUt^nJWn%Opv>YkFRDUf&|)
zwKum+O`<U06JQ_EBuZ1c@ZoBWkBeARDE2W1F8~C1549(5>8@pgf!Tm>$CG|KqJ%04
z7Q~n2ZyJp4h|0B*ak2^;zURn@dr30}Vy0xj9*kI^l=OGfK#CpPY|$8vzlFI#3T|9#
zf?0o-P-rs<plO>t36c&hkQ7Ou=sgJvDR>KO82*sMRpOqy(gEe{yYkL7ci@EttJbZR
zBAEDg2LF!Tg2SX$V(2>rG4a^au>U}Mj(LNRk0XKJxb>B0OoP->9XQu)Ay;Gk<W?O@
zykDzi_o{ip-YHK?&<%oLcO%)+QHFgPTOTr0$488sU~n74rlKZx@fO-yEps;T=xq)?
zYu8tl2=!iPee!bm;rNR2L%ohXJI;ua)ttK@<!*Dec{SXiF1p$}<OfjD-d~mqn>zx7
zuu+p6q_&mKX{D8Gb9p60zUgqzUE?^Vm)OmEhSuy1G}hS%wCrX1_NtrX8G<XO#*Ide
zRKfc~UG@(+b3@)yw{5t63abchY8LYCq6tR4Jih8;AxEn9+h%gUwrT&~DY-$>%Z?0{
z%yHX`Lk*Ut+Yi(G>j=*5Uzf4(RG0?Nnbn~5P14RN2kD!gVBs($&x~%`Vsa0wwt?_T
zdxIex4SbS_CZ$C&fYtmGQE*P?VU>2p0LT1mI8kJlt(%xN2{Xs_XDK_<$R2yP`d|*B
zCnk0@@ihA-Z9|8=YbE8^;WEs<aPE73oN%em+ixY_9N4|AAb1^pi<E(hDKgX}Ta3Zy
za@k(aDaWrG@{^Xd9k%NY7UQ#r7=3)mzj~$c&6UWJmYp$0b8JCJ#wVOnx<}@by(KQX
z?XYpG0T=a4!?vy-O~DR^sIxGLXQt#w1!2)w@K}jbB5avq{$T6weu6hy$V|QBt(Vc{
z!mh(=NeeP$#W6;lpK=^bWti6385={&qksdHS=6XLZ}uTfe_-LtablU>u}pcu)SBhH
z8@#+xcm2$H9tGScJixyjUR8tG<@E3SRX_g9JF0(gB|&HlzUC#Fy<A(lW2C~1dz-Sk
z2NKRVil7wex_~TG*~<5eEe+~9y7tLQPV7MhC6128m*CJRVII>bkSSFwox{vbTeoBJ
z!^j4np(s-U^^2j@i8sTiqxy{lB(@z#eB*qusyTBG73v40#ZH61j4EZdi`|Y$d;ZQJ
z@JkDJct~7A(l34v7>#USxW9W=%(hHk8TR~x2zTI`pm-H6eZxSGi&wOBHKz;zWbT7D
z88$Q=x=-R;;Hnf~{q|Ycmg>Zi3o-Y{ombpA(XYcFlbud<wX|%MzT>bX|2R?XnuDD@
zZbEmXFhE7rz{1ENpqK8UW8`6&rU6x;Z?!4Zev3(^=yU9mgpv~%huut-KU2MBlL3DK
zrd{2UgW@udps;tB>gw6oC`ea<%YpGp=iCSOB^Lc|M3pMLURCwL?pz-yV*qP~Ji)C(
zD4_Q-@$17C{Kg3~PC@Q~X9b6DI(@}LRIy*$e2Of}6Im8myQ`kmQ-~5cqRPnx)X@(^
zd#4qAT~tEEA<>ajUseksJ2O%`A4Snju-ly)Uf?d|Iln*Q+4A(_>?`(7^T|}74l6^E
z4_h214`ZKfpr+!#>V<H5B5KdZW9Hu8sPd}aA2<j2!L{F$oyKr4kDASGLv!;bhoz4?
z?|k99?OwGtMC-NOEPg`^>-|}Kgeo6>Xy5eY3sP6r&^PXPaaNOS7uQ-R@)-KrvDk(u
z;?VQ#lA0r(O?#w7eLk8)QoC}XgJSwa%*KXOhF4#Z^g|Gs7gOKtWeLWG9V+?UFCZR*
zE_fjAI$?3(QDHdSnhwk0db|hKD|`B{9_K*V2{y}S``p3O@zOzJ4j5boz20B8H}IPu
z`jd5{N2jJjJ!&IQ^D>4e9wwZ$c=w{W&Xpa+IEYA1=Xd`yf2g4pdIeh7ZF&(aDoS<}
gpUNY~u|hKJyloh~P?4>Bf=<62y8bVm$2}kV53pGBZU6uP
literal 0
HcmV?d00001
diff --git a/docs/source/images/RebbinedWorkspaceWithCompactMDApplied.JPG b/docs/source/images/RebbinedWorkspaceWithCompactMDApplied.JPG
new file mode 100644
index 0000000000000000000000000000000000000000..36a4fbc0a412fce0fbb71bd17b3e0c75414ebce4
GIT binary patch
literal 32254
zcmeFZ2Urx_vM=69lpvBM%AlZR$&wjS0TBTO1qA_-oFz$~Q4mm~fPf$}M9GXwlr)l~
zB3XjKkTWyHfeE~J?-TCZXW#ps^ZxgL?|t91p=Vb2tnRhyx2kGYSFP%!??=<X$?KZh
zngAIY8Snu71CG#40vf&!wg8~33y1&!Km$;aDFesA5-)ggJ=_7H0Lx@x**@*<&u>5l
z08UP?@Bq}{IePF|4cq~q74U=RXX)4W3xQt<{6gRt0>2RWg~0!d2<SMt+KKV$T6%fe
z+xYMa8Q#{sB4(g|LrmLH+fWz)C|{EQW?!&^c0}b%iocb+;^TfRlglaqKz#h)%YU~u
zXbOMg`ODV$f03(x(fkX6UkLm{;1>eF5coR+(vnhgN>Y+al8Subrz}{I1^(<D0O$Y?
zfGc1Jhyi?nE?^0Gfq(XZ4d4SF3jv0}Z9o&a0{&_Mr~@~^Z*B10&mFW_KracMq`jBd
zBP9t5SI-NU)@~1NE?Bv_NcdVll90L}DFLWJeIHp`IoWveJ+!fNa8(uDtVId(IasR-
z8q4WQ>OQ(+WAAXy-^0exU+=b+zmt`swIEcDfmX#=$=BtPi;b5hpRbFvtEZB$>e=7!
zt^}5Uo|ZVPrs833t7LFh^Di~PBh|Bi>5Gq#&jlZu3vM2E5>kqaiV~9264KJ*U=49k
zKUXhHUvXDY{=eMds*R_Whr=T;2RB!~pEtC8=;rOEde+<9!CJ}I(pK)FwY8l1LrWQJ
zaVaTlOL0qU87XmV85wJNIVlBcTd9X<|I)m*)!$lw<n7`7Tie!F5;o2@E;g=So*)`h
z5@#iT@AQ9Gn;=AgYxGay2WbTBC|&WevGlUJ3hrt@SwLJ$Qe0B;_FviJf~<n9io_r4
zsYv_;<KJ}jKey-q6k2L3)>cYZKl|?H@q6=zHtzr5M%&pz?LRcae<vHP^?Lzq4`jyU
z$B(N>{M)YlBR0RC0eKO;?r)q6Udi`gu>ES}Ujq3TT)*J@mk{`uD*xiHUvT|P2>eTx
ze{t9UWpMr7`n7QdO<o_+wmljLjp<`#WIzA^vXN7g|J<l3D99<Psi>)c?li~gj?>W4
z(oj>=GSJe}(SsZH@e_;;^e29nf8ONh<v*_i|LJL{X@1uD*S4e2022+_)nk(6WM_e6
zOl0ItWJfIk1dM4?f>F?)fzZEfWXH%UD5=0M(b9nxDo%pkCnrA!c9xO?41tmbfxiP3
zOq9%Lq|~WcZdp>Fb!U}+8kb4KfB8crn?WB&K<1%G@NwEx>>Qk2=gtcX35&?eU6fZ)
zRJw9iLsRRT_I1PCcZ`hh-ZQbXwz0LdcX0Id@_y{&>*pWxEHo_q`HP77gjb14$*)sV
zv$At?-{s{O6n-o#uc)l5{#4V{+|t_C-qG3BKQK5nJo0^X3_UYDH@~pBw7i1d+TPjS
z+s7Ro{-lcxApf1LzftxFx|l$^j)7x9LH(01vSU8rPR>L@c}9wgS^XBZr8~=6>8CWT
zm*X-&G#=-dF~G1r^ys5KB_NAFhy6*~Z<PIWga!W}QT8{&{!Z5zKu=Bv4jwrZ00oGj
zH(>7~$U3r~&<g!^U(>f78GAx^LI}u8w(^H`MMp2eMS$zVkL5E7`QInQw=yVx{qX-M
zBt=}tgivwRYT*$eb<^4H%E9f!yKQ++M}XNYm?G5^(IbF%ZyGKl#6v4|iS?Go`L$BO
zcbwEWrrMi(#+xigljU3tY(r^rIRbZuL~C^fQ0jibQDa3Q;UqR($~1&*HJxLKpzJ-%
z>D@gpwCN@$u`7Bvwe9QV{74Vf+M!hNlh85+ALW^OX;b1;tp4mm2qvI075-depk=J`
zP5y+Io0DKDL9P&&>Xs@Wuc-1?iF1DIaRG7l!si=0Y45*icwR|6(auwd>=q>sH1Y>~
zhD~D=cGzYSKpiI*GMn6_3u)ECs(MunJu9xvYc@*ey{T<3wY_mrRtAj`?NAei4V!b~
z*71g<9wp6?+`wxCuGzTgApgY{ixYL~=y8LP#>sOAS+h4k1XI6c=ZI2#eDInfza<EY
zr>fi>z0#Doa0DdRxz0V^>%_+UK@B@s9{J`_!3i>XEwP89-ABN)M8pxmruD}Y=07w5
z-`GE%{Z;K3ZhvK&UmWrWUibybe<mQNC<YRPZ*x<+SlIS`T&Upl;!GpRLtU!L)_XA%
zGD^(t981cfYaH_V1E!lWi?2@<ZheMa7wQ#UvCm}tCX^N7WOiI(GZsqWg&N~VANsnP
zR1cP{Sq;g4xvS$KBJe^yk-+{wf3mce%hcwc6fZIAyY<BB0FIF!a@U2~!4Dk3mYy~r
zQ@r1%2G6|5DUGk|B^|SnWXf3TMShA>nd=w2Uouh?k!tWU>b-m8U)2OB6Jn;Yn!f4v
z#(VUN#8)b!yLFHQMb$tw{xU9n#x@Uc4f|@8E{sWjDvP8t4ZJzn7FX!dAYMBpr<{?_
zgcTW2DLy~I7jYUZqfA-z#)|LKeU`JtGk7X@ydX~hyIE|51!Os4pO0nt^Wljn<Rkf6
z5dcW!fB7z4vX7Ej)O%MoNkF{?9_7rxS<z*E?h(0@n{g~cDC1ZZ20l86ho?chA~I*9
zMOMu*!<klgMUEzv^F!s|)C<1Tq^|1wL=}FaNmb0eP_hl%I)5X_FGl_4XI^o<dGJ&@
zWUVwi$?e5{4%rk*sF&5akksf>yQh!I<O##yqws+^r#C#nRbe2l5PGO1bTn++1lNs)
z%&_J5wgg?CaDbgH#}H0Aox%9Lpg}0PCOcgqhzj=dUl@gmEIMiJQm=81qii6wX&s|@
zOG*+J;*8*&+g|N8Z_WUASN>-7{nhyUFZy;0+U!0UDEJN9OFSZJg+xkLvQYC0T9KQQ
zSrH;ngvg=D<>BB*;{h*ecr)V32#t_XGI{wgNx-bVg2HsVK6%zohjZeCORa#f{CeOl
ziTwyz`{*GFa^>71yp?kXj)lBN8WThG2@k_V;p^K+fQ}$C4QdY^T~x<;;%#7G&BX?G
zC3wvo$M#!@w@M!j65L80$E>N~G`Q4zD$!~i>uZ@~UA0%Gv_ANpeJFjCcp6WcM(QN7
z_FC-J5qhS!4xo?ch}r^&={e*hOaBdg`BN7D$eVM0>Z=+TCZ9A#2)+A!fZW65eqinP
zEHOs)Se9o0s%ANiTUc?4wf>2fnse)uWiz$=Z(ok8`>@S1jg@~MZ>4(h$x24*!O2%{
z*0@jDBj7WttT$BL8}(dG8iRP^6;PY_A$Yq*slFlEd7nOJ^;q54f(7U3j!W7tE`!2y
zbMSJ+S}c}-mVI3ijW}%&WmaLd%En#p<&p>sG@K47@#xhbe2q#e<TqWZwA@h1`p{;p
zwe{hAQ<#y}&V`p%!Z~9lyDjqUeNFNDDw5?)Wr=6z?%wU_VpO=i)}5sLWw4rXEV(T(
z9P76C4X2FPfDKNSQAJ|#Gwsd#r=3orn2?)!?=kx?)+%&fyNrM~qGn2Vu#ruaY+S)Z
zNxJ;6*Lnw`?;o|VWuq<d0Y^Z8=W5px;FMnl`v(13eRp2~!75>Ol|wn1bh4Ml`9{)#
zmYW`Hx`u!98nX|qbCUI-O8(GxfwUd;F{nLbF0G$)4Ya+1|CW6iKb5?lXZV*{z;HN%
z(S(i+mj+XTKPR-(nV$R3aZAhg2(aTujehkfX>G~!va8nHGxB8`@&&eDk(#rN2>SLY
zFRJoV=MtG}{^pK?THDiYs&-|6yiW#W{1ISpF{a#n1TaILr$&359{an+o*9ybz8EX0
zO}>rMtH^Wk;k9@cs6!v=mTzvN<?@J5QtG)aTuQ#iMpLWb;{5|rP=o8<t72n!s>Oe=
zOS2nSbsx|5(_i=7CV^Ogoq7Xd+0<?)zDO5D-X?~;yYqAM*p@JD93dg>SjpB{4X;LY
zzinpaWM$btp{TNxL48ZRUVR0sbh9y>TGkA>b?xg(<`#fTFTg-{DaR&xL4jvi*36YW
z|J{qevM`Heq^j_Em_0*qgo8JAiLy61Mm5ocz%9)c`I}@K-1$E)QL?&b|NE!G*5S`@
zEeHuN@ObzwUpkSM;2$yw^P-|xI2)O9Dnip+L*OOADX^C#!$&%|IW<rMC`CA=Xklq@
zPN$cfxgP7&mCh%fxy~aw{q0!aKilZ<UDRb3CY@1_1MhVKq~@Tgy+?66pg)|t9uQ{@
zZQA886;_$=JV=hI`-zF}y~G+xS-(gkS|>%$i~M(GdgVq@+Q;a6zh%woABxL_<)=;Q
z72C1v-grCQEE>_OE02zCf;>}NY>j=MTKR^z$WLITARFh?Y{Yy6bFOuLCm)^G5ik4r
zTT$0CLo+1>!x5mFH(`;1OhHW-Lo1Ui@Jysm-t$=M@IVMww8dmEGiT+bLrv^6f?8^w
z8h4G3Vou~ul<}iDQ_Yp){+gP?Z2HqJMt8WhFOp^*-Ca$19rAG5B-$&}tMkKhNIFux
zxzs>;<GG$1_Ha2}_>CcNdVcxQ^-|<19bfC9+AAHjCsKG)4<+`Li3KQh0gQKrEA$8m
zR=I`QY)xkwoa+m`f<~M)6`64G>88DgZIy-B)KtZtHWz)p^|45lp7|1CHH1WW28-Vd
z0WS;0abL#W!|3n54WI3OQI2BFt%`MnagDX2xocAd%H@rNJ<KV}(l5R$&Z4~ZQ51bK
z2{~MJT);^gF7I)@F!xCyrAvnNlWe#55A{#4mP)xtFC<o?0{pxrJ?>BBL|n`_YfaP~
zvKoB)nJ9ISBwRhXMo`YbZ(r&EIIqNXto!^MhkUd8+>+L=Y>wG@uL!%RobTUVjkzq(
zGXLQwGDCqUsIMu?iu^r+dhyEJxH9>!qNoo`(vP4rcZ*Eb5fH+CtXAu~=Ux`^^#fe^
zbZl4ycb_FL8s@S=fX+s4o-|Wgo!(@o87kS34G{Q#C&x-KwOuINmZK&>@bhN0zuVe2
z9&k_-8!p)_Ew2~+!rbnFUw#pE`Pvh+d9r4O#rbKk(^P`%!O@U)YP@KXuo0A1;u3}T
z5fCBMas<pkm1Y}6I*N_}3ileZ%OUTB0~YUbAPxB&4clz*28ugveSH*JnW`vo1jsbb
z6no!4r618|x!$XnHqTwO%2A2pe+<Qm9RbZ(A@boWzB1qFboAg`4@-T0NVG)Eew!NK
zz|I>+dfdv)5pd^|j*k7<WT$+`oJdqf2f6ZlX+PxG&0up#1vb2GliGeCOU!CF7+xzW
zJv-UipePt~k<);~dl%W?O9O9IA+h72En}`FR_K(>`T^I6HI<$P=FnHz_uk4T59_sZ
zgGM6yrb+Zg^ydQQ9EM6x&CH6nEsuISe891XO_;S$+|!-0zmv`NDBhsXd&G?KdLK+>
z#iT8hLOM_$J5)Gv{fytjo9n(a6w_tvb>i=>7abECXX=m3g^rWn*{;9LMhussKUxZn
z6~*rR7Oj%ejboNAo_^~o<GF34kgKa2Z#?jIZ;+JI-1k-?e>nf$VeL8Gne#)hE@Ist
zwW{+`-t_mPNY5K5pDOW9Lsc9BFX+cjrzP4np%Q2H855lowyp5S3d#Y|pRM?8>#G|P
zU1hFfS2WJ9PtVzrg#}piPLLAYU)yq)Q1jk<S2L-qYS{Po6)~YEbzn=4J(hIh1~IL}
z1`lmfKmTLixcQTqk`>WbnvsXcpIH&9-iMm5MA3N@rN_2<FJp&VD<*Vg^(u{u>N$?(
zF+5^aJYDDqolb(&%tIue1fF6;h<vnv-ifG_&e`%?35XzY65p%H&-9X$hEc5Ls_d=i
zXZv?l`P;Y}5P74G`S-<6CG|~Sd*2ebamTE%nwFX@U>Esa<zz3;GzME8#cTPb<jJ0U
zRJKUs?N^7&_ssFoEAt9vXJ+KW4LhV>dYE*lCk~Z-EUWLGv;!r%H&E85m%!hkMm}gV
z2H(<<gHM+u7;ZlB^=XgZaB-120&>|7Y%nPs5HviTcWcJsoy+;5cS)M(a;#`Qv<0?z
zOZLs8jHzQzI2{_O(LZWw;C+m0KLP-f>=zZ^S^85K-ktD#H%~P*sO(?1gCaq6G2^7r
z-qY}D@w_8I;MNhq_zvfC1YBN>L19h}90Bp7+e#5gTyUM-7#s&7kcX4bLn4oWR0Ih?
z^$?|wfbfC9i$_4FXS)TC&fy5?WQ8{`H*mwheVRoQD9ew4xd_77tk}QZ002im9F&Cx
zu(>A^+t3?u^v)CmYUw_9gmmmD!4S-$TiDdj1>e;pfXoGYa26$#pH1RJGCW3*s6j%Y
zGnP2iLBSC)O-JY*fZ&4Uo81oCRX}-uQi&kMX%W=kpsR><=}MrHXR1%ShU{4pIs%@H
zHk*MhJ_S!Q;$FifNRDvaF;Jv;+W$!ipfj|X5s<!VIEMUxI0SkSj0q$R8H;;I@I$CO
zIP{Wk7%$kU3C+cY4UbV9z{8J#5km<|oP&b{5)UT<vpeB4L^q`X)#W3g5vpTKqLarA
z%ZeWXG*dA+a)Gh22k^O8Gt54L?Fc|00a0}tRylWZcI}3aT)F-C##>z061++;7tWVn
z;uMbwT1D%B??$I5U_<s^W2V9g>Q+Q>CJkG<Z<=BbmA5JGm*@$-`=Hc+WC{8Vgfo4L
zj&N=!8fyFj)AMr5q3V{I=`}ggb|w|))22>0Zf~h7A{zs5wqoq4XOj#~8O?JY3=Jcr
zkldBSHE<upJ+~9Sk+HZu24d#rddllEb3UPO<Mmd14g0+;VwI9U<g3#o7zo~uRm{)L
z{oeJbD?C*Y!@JQrb1IJIV0@96buAws0R<_w)*y>;^@epm%XTb<{+K})Q%JZq=fe1}
zNcXtkdNq?MyQgiTuRLyes2R#R5FG6o;jyxoJpC-$=>Dc@K-k!EKqO?~o%SY<5mqs?
zMfyH@)}U~Tj3gD9P1%yl#Ir~*Rp{E@1v9JtbpMGj(h;w=(U6$pX`Ly+YrZ}T@sjLy
z4%sD&#!B{h-dB!{dKLe}BiDOKFzD+Vw9H@IHBb$O@nBrr>M0zaVqzD6`j*05jpV8@
zXP3v>$upAC4!Xg!aCSoa63q>&HZK{f%PTs26&kC*`Yr1wlaAYAo?SB~orF?pRmT_0
zUK@G^uW#M}($$fRK0eVY>?Bb)w)YcyR7D;gwNF0NEj;izL7jmdt)u%=Z5oqwUa^v@
z)Ix;kh3BAwp$AH?xV$2vY>5yXH&e<x<7(oG?r}b6{X^eD+pSNtH<QSWBAjwV7Z=o$
zn5H0<yQeDQgt!}^is&QAsfS`VV>$fan1aX48ZeW<a}MpzjErw;UtBmx>Z;hbN$i%5
zo)_%V7DSrYuRe;-qo?7|M=mYlq?)DoGrx}DKwg2geL}?YSUqjK(>VB6UP!yBFsQ+9
zIsA_jpZ!OXHeT>%v%pgNI)Um41I1A@5^g}jr)oJUfefB<2!;{<sPjN>_@i25J9w)B
z`TIS{jsO<M)+6AHKB$r`7GSSI3*ZlG5Bdki2D7`RMNl{AT89!CNdUa184KSw1oaX7
z0pcC>k4i80k9y4_We`-(Cym2u!4}CuWe34Z5-bRVAVriUyXDw_1_V}k3mdu=RO+8W
zFsc9NgOCQDE{8H$K(M;FZMES30R-VSvZpKXRwqA0N%@H!aNLf7(s$-`nEw6&i@hU&
zK-Rv@*m^kWwHE*q84OFR`i&j!O-W3s(-<o4igJ+f&WP_gKTu>$Fg~paE)!q)WlU_$
zrnl4H%PYrPtvIcCY&GXM61BR*>jPQvoPjd^FiF?|FE?iDxfr}$_U+9dbdjE-?F(xa
zsTv0_i|E;UO^6&gT|7geB2FKBqP@ig5}w*?^qz6g@5_8o_o*FgS6)qOk@gB0^-PlB
zGX)*4k9OfDDjL@vZ^ruszj_m~Fkn4ffHw{c)M!t;rEPl?sc|#v;QTA+wRqPlzX=D6
z(-mf>H!H&Q!x|JSVpcSw^Qzxmw+_`)vmNzsx9`OisPHoQbFI>{6R&<5Kcj^kqA5;1
zf51QXX*Qzn0jL^GP)yCXiZSOe7+im2a_@pQVRsvv?O?fLKoXcBjOol<+u`!sq?gnn
zgAye>Zw(ET+J0>CmzOgY?>iS>3zhGPFpJe~kx+><za_s8pP_t(BnTm+Xm5K@WjyfS
z8Di8edC8j4ZZ5M{X1eiw`2HSQvqW+=PsrAse^khLKEWwmrbi}C^;(T#q?uua@s=L`
z?RWUYwVaCGDgrbUD`tUlk6k;A4J*SvM_rus()g^F!t%gsL_tBo-3**+g1-@@z3=<N
z+YyrV&^~bwO_|AAXs!Y{O<ibUDF!Q`X)qByX_9??_ly&o>7^@=Z#W%b?x|Q~;T_8}
z8WW1tMs-XfgVTP`TzFz`p9t867Ws;{Oh~jzw!&Q=I6er9JsXjDb@1TRs}h?$@oYHO
z4<gaZBj2)}M_VTs9pY}_x%X<I>UJVRBLMNu32fFD#+7otDm>7)usz<T<dMP-UVUdx
zIRbyImC$|1vf}}bU_Fe60iW#dmhy&n%GX0dZ5KcOF5i^q@uF*Mo70X2Yqi9M4qo;Z
zp2;IXbz`$iyv7d^kCT|8@@zqJ(vRJAjf}WoIQ~iS2*^ou^;|bs#cLB}aEUWh%y(DP
z>2Q6FO+<3tKDoQzI>Lbxc7^AD%zg8FY!cG@=yOY@$9i%%kdt}MgGy#id_Q)$Ze*|f
z8yqc6eAyu45NkKXa9LcZNvWiu;#-Ny_U)P}J0bgZmu5z##}qW*SnZrItZ@<i>r!*Z
zjQf_SG-1SWlE|(_3T_*8C{Y?F=nqW}>*GYPx?+2<@(FkuG4vezZgBzC@K@>693jp0
zwkVJCgR6Tdl{!9(YUY~V<nwN)5Sl(F)$T|r0SD3@-l$iB9Od5Q#5rI_S}Z;+t|y=W
zG)+7sJHFW0aH{+KTki{7ZMWkVqF;BI`iY<N={lHt*}iLXyrJ)yb_(|+ie$55{esgC
ziDR?)qC)~W^08`AR^yio%Ep3EN6shl&+8SVYU6y)Z(O0DRp1}zdrYsbKuz5YwMUHi
zHY3V>Vvw={y$rar76&wuEl_7Ba-Dn4!VZ&^WbI`-j#66SOqZFPK!}W95Eysk_p_Tf
z-oxLcY+<T_rj-eKy`=ZchzcWUK~p|2NyU6vP`cQM5DbK4rdoc;?{yH<Tvaq?Hpy1Z
z84xqDJYr(5gBo*9e}(A{+?AGhkc+z&!WplM)#D;e8b5V-Gv!;uHF543WgTJ`YC0{6
zmuWcZ@ql;iMQx4T_12IDRo#V~AIHlL+T_n-it{)r(zOfl79h)m-T}PWmI5v_0O5wq
zR?#Q%Z?i3-K0M@vT0<G~8McFpsvuars-NFnk(NY>m~5JehfdP1$L@)5Q-iqtGxIfJ
z^VbSAHqr}_dU;O>GT@k8CdlFZu-wguyU)ze<Bh@###b&*x<yrV_SuAK#NCV68Q|WE
zxLEUEWl?U=tR9)f9_zWaKDXUpXma<!hc52x;n<eUfZT!BakNaDi@d2~>rjiXoSlK5
zu6=33?#O~0&qWrxcPFA8@=#*8;S@~t57Yg3b8d^Eh>n`87CEgo4*aS=+Fd)^9HA04
zgXOjQnS{dnv_gUivCXd2e*7LPlH>A3C{(|#K@67*KAwBvw6KCR#?J#a3VdyaD;Q5Y
z`Y44CBF5xD97L;>h*~~OVP)=Vf4}(BA5k48FdMR8bZTR$Zd8&zX>+^;cBk#$Ddo{V
zU)mvI$BpR;lPS0a|8O^UAiJ2WcEIo;mYCNdK)8ex$6qI0#lXV}>I_NYXnp1tf3+0q
z@8WZ(hTog%vP#XhCXMB%#q0AY3=-Ke-3B$oFm4=d>rh{5Z(FY_9o<y88JBHj6$*H0
zFNwCoUCoXuqFkn;C_ilbj^7uEJv;)E>XGO)m~k_lF`sl=`a68?9C8P=9n?gUY?3T7
z(Leh0SjTZWYZcC<tB3lS7>lF_lHVsz3$@*Gls}*N#^s_*p9b5ZJHh<l^UktOl6pXa
zEk}-V&%#2{43@6k`a?Y=`>OitkFQ=&$6LNAnTxq|kZn;jTTn_{-%L8*%%Tmt&_sEw
zP={Ak1EDYCORM#zlek=2Zi^^%D$5?62Ki@sAt*e25UqCp^X05MGe?JarKujqx{m`O
zrm!!d1)_rlpDD_w+RPxWV*=)9%&ut5ypHaTsEAy`3NT;xx#I4HmG9>FSZe3<w77f4
zxwA@ixA4#=L#JXoB=-97mW;*xCf&5>eOt)59Y@NHh_Lc?m(E<9tjFVKwUzJ!+8A#7
zgGaAsbyfYW*w|ouCKft@!Dpfjd(F!uLXD4rl50Plc4(?}1?+08*GD<NXq3%6dIQX`
zRoLz8y#3v}0Yy6^(&ce)JS`i}9|3pi9$z+8r51QVs=&N~H!`U)gwhFyX4>+1KPC+f
zvOn5<a)CN<>l)9F-2Q6QSLL0ZVr_BGD^@(|#F~*g9+&1%k#DJkkw%fx2X7VSz7Q8(
z)~kAUKTb4x`Mu(*-GEC&%lBIl&moj32aD(Fj2Q6I)AHjtg7A!)zSaOAp0X}@Y?!Vf
zD?;V<$MHKX@!E49{)nswPDf*tUXUjyEwmTSCmn{jClv0OZOJ<JJjytstxD;OT<^}%
zl3)LXeexbZd2zTC3R*kj0T#^)1Y{Tqa*Lp3^Zp3v(6Lyt2n#e8>lSUEo-9pNcsJE5
zXj5djCD9-9%ww%gqS@+^S2pLJ{E1W}m-5jn4OZjjcC7s^4OZaKcH;oN4B=Ei%HA#d
zko}olXtfK}Smq#Wa&M-~z$#cf?0i+cqVYmBY&GUxwa7jrPLN(#a2+vS><><D%k;Y#
z()sH(XqB$J4%NCh^JfLt2Id|+>^SA6?D0YjpW)t+(MDjs3*M#HICPrHjjjc`;N^dt
z*CC`{IHwn!-9FAY)SE%z>qB`pkztAKmY3Sce=xKTv`mRbcW3iF{Sstj=W3Pc^O)z5
zw&<M+MXfoF!cK`BzZ}T|Q%Wb-`pvs6>IRmL^=<COx&DExYvo%Tqof=yhR}=y$?{n}
z<uPFm3#U<sAm#(wkW}~8;kcXNnxx$V?vfzlMf8?TK!mAi<!eLQ!3^vES8f}Kt}L$~
zzO~Bo!_BcRQQdDK(!ylM<^*PGN%i?h0f!^aaLhdNndOL2c=pRSn9EoquCrr~OpQ@5
ziUwJqdj5g0s;VfJ>FKC1RiAoSE#k0MCuUY2N|rSa73d^(tuW+@8zDRPqzO&8vxPJ^
z^N?|bs#g4^z+07Od96$x>~7?GRo!GU@-7qlr}YIVQAM><k#|WhQzF}|7G1CWnRuR$
z2QxxK;dh2hUb9Enoe(|Tj8<rR7eKG#xT!6-pML~w38q9$Paw}Gq+6&Pc$<1unYtX5
zy*Le}orfvme45flae}i9^6k+!?7`mR%p1Kej6VL(54fD;lqL?6$r3tayC-hEY3pHm
zN$GuQjxmF68?xRw!x)1&K`^Rm4}o#uOlL=$PTO5`fwZboq%KV94?l4EYExgCG%YLd
z-syHG!c>tqNwTr*g@7D}&3ceMn-I0sy`QvgkqQ+CpG83EKWq|MdZ+i-ifej5v*Rpg
zkP%Y21nuDV%b*0cbl1Di-g~i;=;{(h7bN<8KI&t9L~#ba63aGhe>5+_hWWsjAwRoY
zytW$*4XJ(S$Lt}yd&A-7$&GjkuJ1nrK{r*fCBeGCfp4tK1~b2rjWO23ye($Wug%()
z(@e05PoiOH^W^m?T%?7q5u*{a7qc;o2E!z|cC;C!Wo$2FWSI9f2A@(AD4r*K?ZaIi
z&;8OxZqA&z+kz>g6lBL}S7I>-Do4Ook1qW&;RARI8eXNfHh^Vmg{k3MA<qH@y=RJ`
zu@(#^fyb)8P2Fo`e}?2szIn^rKiQC9u0U4@=3<rZJYKyO-tlE;q=oT`5~LLxUZWo_
z7rA-LWNcZwS>#IwF3%A2W3XR?<?P0%0lQ#N&TWA%DXD~th>hDe>k(_pmqW>)P(gD!
zrs3s}RC~z}V|$FQo3BR~syTSVO*P=_dEnE)sUyI~jgCM=1bM=i!T8D$?7W59{lKfJ
zaw%|O!>RfiQS0cs(=(d3re>E918f4@o=J;TbHB2@_mX%H&)m>EO5Q9MbYXj2#)>Fy
zIrIr?pskiyaIm=dj95V8AlxLDLG2)vIJ+77Cj^aIi4z3<!LLOb%c;cNg}iruYD`#J
z8NWSjhfQR6;t;ogbaA8J@niK<d)J3bcJ#m3HgEsXXDF76eA#~k&E{iqgGzfg{t|Ca
z#8z2h+H2Z@im@ovd8Ud@ai*0=_k|NxeIiD-%htd6?S{9w@Xi`lg?a~x=fvAwRrh+6
z@)~`Kb1wc8`6s!tbHn?qgV--H)6WDA#r{{08m&KEOZt42itzFTMZu*FQ$J~F(`zMz
zf+iyRI*V_wg}X&gfWGst)Gh7rCq4C;t@@*%!4C`NKT|BG8obKS>tZew*sg)s-`!^y
z5p*+~nl*}^j&&Eyygiq;Q_6o6SA<^GHJLds_k~w6^L5M8$cHd3dUXStX7Wbrw2{y5
z$;>sdE+%6aaOJKoJEQQ$tkQmHy8d{`t!qbsi(3?39V4z}H@6+N_pAbRfS$<RZh+Y9
zriBfxcc`IiO%4L~mT+&ZpzBrGh-+?Q=R@n<i#y`QG85a!7ZfRYm|{FcmyypBB4b0<
zIA6LPl)o`}ywe+>g51$*GUqON+BndrD_dw7vqW+@yk|QorKm|2Eqs1fK0x;HG$rdT
zi;s{dOAS^ql=vsR`8;TYjR&DBlY>!{^<a>hbG6xN6g8cGn4<(;e~RXge34aE_3TH=
zxwxh*+pjj9f=`q97!58V!?DuHGPKxN2eU#p_)b_*ayaO7ySKG3US9zvibG0<*{{1A
zE}KMNG_H6w$%Ac6E^sp1!>srR4rsrO%Waa80^$K`L4ak4V#JuO!?q0_h5Z75oyOVX
zQS{8!-94~Z6C6(HV8rB?inY1akE0VcTh{PUNv~YPP<+#?^Vsx;nTGwb0K0-zZRKMp
z9GY(U-+CVl24l4N#T@T`B*~if9XA<^m7YW7TB&x0t9^nDmvUz)NhdwH#JRdtN(qz1
z*&5R~ocT6-Kl+(P%az5r*f$MY3!>ZRGBb91?|3DRYvTvZ^Vb^D^Fj@G0wBE>>y7z2
z@XD$-%1LU1(P97W6#lZwF6dD*IGAEAKmYZL!`>Xk;zvnfJ>Dx&?*n3Q9M>u!pTu%`
zQeoIy`_#>@+4XIn;1e|MiflV0P1>!!O$hpqi-a-Vf&+iM&Ko0#ifD-wMvV^&W^GgN
z2)F!SI+UiY_^-;3k=yJc3K4hS$EIJ9NZI(yIQIIx$hpSMS0(ThghO&gAjzACb#)_?
zo&knTh1b&tT1K<2K=<2l{`eC;zwGqe2oVM@UYkzn^|tu++w%O1Dt6z8+CI@<>zMdF
z?LUI3YI9?-iNJ-cyUkEow05X6PHx5>j4TjrS|-1~<4rYo>2z3$y+RrOD#1bCwS(k(
zqKX&b4zNSy!f&5E0*b%@@tk{ufT>JjNo(oCIn8tC+7u^tiSDKf@oY9CU7t^?cbr9K
zm2Ge$Up2j2Jzt-@?mad|h+D><ce`@BV@X#hX}?VWAb>|7-j?F+RrwexTl}G&W^$9C
z^7gH$2Z(BILGc0FAO^JtRd9~VC4JYy%r=?};;v7D24pO+M2iHC+2|3_q>h>ToNfN0
zpEOuDp6Ex9ok0VP@39pLBXV06g$g+{rE5EzHUSWM4q;_gl`r~X5X^o3QJq=&_HlSv
z0~f9jU9aDkJQm{cIPOircjrx4^7Y$QsQ5E3GCF*8kYrK6&{yX@D1%I*>)9HdCFx}b
z$vZZjFvhcjt?-k9I$+Pv`$G3zK&P4&YOGct_X4dfer{bZ3}@<*>iVX@bfRTnK545s
z9d^J}ifNPVv3t-=e;0;bHf>9E6qs5N6Dp~*{K$Gj>r&9AY2Fl`k^2R?ba}&*HG=T^
z@i`k|ltVXB0_V|sytZ)Kvih8lP{*9)(iO6(AaptJD<gOWLEQ}vVQ^Gxo%4TIS!0tk
zB6BVVaUs+9VKjZrnW`58@ebS^*Rn5fbR7%6Yj-x5lZfQA#H*9KY1!c^Sk2vIi=H3}
ztadLdgTIsq>zhknGw{&VXUD3KlX#ZB#-BQu?$dS4@AdWscq>9pT5)A~W1R79)w&K|
z%0Wpj4lD9?WoqU^X22ONV{-|-c`sg&aAs0K^J?{=v&)P`ve^gzWD$V}lFwrDS|?eC
z>g+&08JD2bw}U5I-FictwD)*ZWgv8D>-yRGSXxu^3~E(|fcx@mM?eLpVQiwIpS@vt
z!59^{MR4PaM-v=#-Xwo4u&!{~s&y&Apw_;YxZ$r7RO2+EGkF8yT^C)Cfa_65fbZfk
z>S0NR{ha*~;0NjXEYv$Eid}(@X3vylY!?%#XIGWG1M67w!r$2iUy_c=%xY6_T=dx~
zEkmP1NzgzQTtWsecwZmaTC$vaA&)B4JFgKf>V9tLX2(Za5w&*6*N)sP>=yOWGY#YI
z7ALR=dlHP1=)&*5ZD|%NidngW-cBanZZZc`pEqP<G{TV~y~4(x1#(@)w7K{yqdn;T
z_(!I$Yf{|dDsihuvk8ujs}@4Oo+MhjQb*Fc_wQ?nZ@{HE>%7BT8=`*5(mFZoz2S&{
zV4&+vL%e3R@q#kbL?|EmC(pH)qya8y;t{~7|D1CUfy<JMLE&hji7@W4uI;FE@;aR1
z?oPQgn+vIK`YA-s?P7{l$E=;QBY?j@J&<bsX~O#L#p<maQTHC_FA9d1f+A&hu8k@j
zOIF2mQiZ)(c*&Py9QKKPvd#fDouM?E;6spUU+1WeWrjD2+7@-Vy^gI&0us_5$mbir
zo%j?+tx#f*w%4vT&8pa`9eFsLHf`WCXtbI=zM=L)X~JlW&<eYJHx2t${l~h+7sxt#
zR>uiC9xyAb$ND<ZtwdAjq96PInU_g(7mmeMrNxM@bdWe<<K5-NSR>tM3RCE?huVD1
zQ&@4nH1fD@`t6Y6Pu#sYf%M$j)7M?xT2R!14*9+bcT<qNZ=RR`xGojobKcyR>`@_?
zmM!|W=e}_UG5j;)xcfbrGLvyk(KoM857C`Mo!hRPJv;p)RaT4Dv8{wWfjq8H4-1~Z
z)p?h#=MxicVJ+CSsIwWCe!Awz0@Xmq%j#w~appzE#s~h3rw<lWrw%UBej3XV>J)t1
z?!Ts@ia!&08S^#7?%fzc9y@WdQu17#FfrVB(&TI?U6O$w(B^q~2Z^)Ue1X`}BY+{<
zU~VKy-s1a?XW++IcNAvMbhFuPw!76G0m`0hDEW3Pkr7}2FV}T*&=*RHF{dInQ0U}_
z^YA`pFc?hZio*SXV7jMRpi6IYpe;lpZ$WUafmTUR9nyr8s3F@b7P~$dkAMsl1damL
zfwnJQC2<DK*b!M!U^qJrydt{q2%xXW%8*`6fzj+MV1L?{NE6-grLzzm54;CDG%-$k
z>Ik1^1{o$atM(r{u0@dEZ|OZ0gn_Z-Muw3ifIA!S3C2Y;p2Mfzj{wOdz}VC6kg@=b
z#^@0KsqV+F_f(OB&wzpGc0x1J><en?R33>;VoSk9wB`s1GsmTX4-uPSDE$n0IO_#(
zmIwsnWm!I8EdAsUIQHLC&-g!!_#Dyswvu*LMgz5wi1j}Xqaxg9>P1Q?&TqEYk{IFx
zj>9U~!LYG{f)0~julE;r?~wv899%wf;jUvU+yg%M7>>~sO$^!V#lVK{{Mc*K{8Eeh
zR;om3L)~%N^-j9e6S=MZgwE3<7PKVGVq3qQN89y-890pE4Ti5vA7Xa4Wbb`;OS)^W
zcKiLp#Z@z{W(oR080hO{Y@Xz67-*1OHF^9Ze|+l4GR9YPl=o1<%-a5rMvhfLRwBKb
z+MYa8o$z!vIqcKBptlA+)s78ZvX;8SS5kz#?)UqfbUQ(Y(`m3n^pV0zrfGdG0oN0`
zV>jl7^0!)@1V7gIj$BPUHC{`viS8BfAL^KE0#%<N?*BmbJpxsqR`TzvPapxDzw|zU
z97v|Mg=~L6YVQ8*-LjSBhPYRq8DT(oc^jIO`}Tprz#Z9jJCasz-89wWMijy^&)Xxv
z*p!}1{j~f2<HQ_UKY4gd><szbtQ+BsN%fkhnv*mAVK8;UsyXxsV89o5t+ek25VOh#
z6)_e0)O=g&H3Gr{JP+gx7tel@5j){&oM<UjxidNZL)`oOSi1WY{2kdH_*@X>`TPRW
z^J_0o(DJbHVZRZnmo2(_(v>S-*`2JMr|?j7-k7M1e>_dTH8;nFUsmISjnh(j5iQB?
zR}l<ytsD9I5(l>K&L$)+X8V+i!>6P7unlmuHtxski>9`33nfyXe)D{CTwv}&z=@DO
z#IZm@U#04<x&Wh?(l<E;UD8!8^WK8lxW{XO`z*eludG#y#O_E*=cfj~THKIL9bUEw
z>V&aNJ3<)hl)d`he&k)6Z{zl}PgeX&M?Rvk*{d>)rLDe=FFY2bJ?%bOdzyUjDlQcL
zmbO=~9Op9IQR4g{W|EcET;~!I!Fu7IwnCc>qQCez!Gvu8uH)!_({Zvg&L3Z~2|fI~
zj#Da|Kq<6aIsU6UuIk_DC@kuilKLN_p<g1CxvF?}RIeSL5Uu<ZWj#+!hMl()L@&mw
zhVL;<fwM)i)8f7R(`YdbWz`W`vk~*$0W@J!BE_=Mf!KKj#DR8wqe7_><2bYtf5+Ho
z{5bc;4RGaE_3Abk@!mj%SM?`a0kctl%1_Al0QhM8%tFGWvSo96TzJluaF4N+ufHFc
z*tC4Nm;^-Rt|zxQ@-i_k7dMZQm^~FagF5MJH)|X%>%#vPuNiBD=DxO2vn@U!`j~~X
zn%hLf>V@G(yoYo&0S@Z9gLI#_24AW@D!F8Z4X@umh)>JO72L?R{*hX7h!~!v!dCDk
zi}@M3YcZ{h+;M?z=t)IJ8GQ^8ogm(gnd7{ibjP)tH_^}L^D3ew5P?SFgf4z6@l9>|
zy1M61%q|ZwUCn=xw71=SQP<73<ZM{#Erzvt>9bpp`PG=7Sfn_O@)L7+o*=d;a8EnI
zMV75h#o#>s`4*uFOSpI^4V^I?n=K^&ao?1{ZFDfX56!W8`@n)wZy_+U<ZspeymzN~
zv{a?i_D54N2g_%qJXUaBHShb9QfMnG3?^XF>*l(p;YJ-?p?`7d*~7E?(v&xQE|L2k
zkC)c)^CLFMy-P7Aac=HK803bTHeZZl=X;9SNq?)hL|}xeG}EQ)<rr~=B&VlZ=q<e3
zzCjyJ%qxv`t6c~pb1%5i8CTg^J1=srUDX$=ZqdDr3vm<Wxq*^l*EABHkN0!6c+bfl
zB)X2q%<g@?#Iam6gN9jxOR9>Bwxgm-UYv_j<csm_T=De+jU<&Tr!Es%utnO{X{9Oo
zrKX5C8&6|AqiBgb;CcmWK}gB%*_440*Ao%XW-k!F8vCmnwZCXdm$3<i()4wG!WtA7
zADmIXJSO@>e8W{ms*_wKYnDRH5q6ba;Xcm^1s>zgutd}v(*YvD{tHYHwN{Je-+u@V
zhbgszVZ|4ei{$g4=VjJ$#_PFRiIq|EW<{w)t9JTkh8Ks)LxsWuh0X(2jrHl_(+DlD
zyMx=uXV3~}jk&TT+w0zQG3Q__V1A3l4~vW})Uov?xc>XB2;nC;pLD=1-XQfY6ArnA
z7DZovyx`;Fs>MO57W0KFa-4Hd1u*cj?L}e++~#fF>`c(I!uoFyXsbi;2h9jD(G_Ld
zcmyOQjC_TZOFW02cZ64Jt<5{kAddU8T*uf{wKCjr;ClCFX1w0eu;w@#!d&txwaG=A
zCUc5K=Dle_r8EU)qqIan<h>o_Bm5aL^gDhYOG<%ykU{S=W-I}!{y(#u{yX;6semn#
z*UE1>Lf@!qQQolN2=)!+w_7?@8Il>8PwT51o^UqVUUtU@rc@~TsyR1i|G7__Ro#dz
zr+1O+lX!Fqy0+}`IbZ5tz<movrX@-iiDlm_#93hAGrWmt$SJ}#3}Yza9+D>JP1XvD
zul&QHH<MVH5aIQ?IO~MKh>qIZ8xJmZa+KnEs)#ZI@_4~?R2-pb8kE|Rb?#}72eEtJ
z*t`~rXOm3W#g-D<5fTg7nJOa^ciD$;{YJ+2l=IDXRq>K<U9wp8=gPWeWAd3?)#`DP
z4l|n^1eLybIIEdn3i~P+S^4AnPA~|fB{gu*_Eb|lD|@BOw#?P887<ui&0(>3N>M@G
z5f+?_Qx&-ObxOS0iN%@FCGx>oD&I7&UAONtKe-?sOk&}m;O<;qV2m_p!?k9T2H_v^
zxFet)ej-pe8+41bG(?D6Fycgx0QGv7SSnlsGj~cw<e&}B#|syQ#kv}Yu81M@VU6%D
zM_x9l;FrC&1F9j;x-^WWr0VmI&4kV?s<8hKHu%}*f5-|yg@|cO-mF;aY)1FBLiIay
z$bCdq+!tDI$i;h~C}s;z`@0{wYtX*w_>pw~SKipa$x-`5-dNGT@sd#HZ%V4xpB#J>
z#B0i%SmOvU)G?gZ&EbkK*PFHa$|LW&A(5M<%#*`ilL8WA{owL^&4}ET*H1E-uN_17
zTRwHEUb=fMGwfPpSNw5$fVz-Sz2bfe!b>nEmaCm0^+7A-*BY}3P}~R1K)XpRvc(BM
z3O+2)1c)1~aC?K<i?`m{Pba2WF$g%`jXJg>6ECyNxW*%e7s45nz+malNB=G4*a8b^
zf|KDz3rlwsW}?>|Gd84SaaUAy%TI}K&F!{#zs#%fNBnuh);H?+e-^;~uQ>O6rq)|s
zxB3IP5`Z@Tsmm@ChYo3lAMa4H-nzscLv67IP6!1r)gETP-jZxpTT(D=Gv%}10n!JB
zC!`grGfy9axm`;tB2~6+jHUj!`lkbv@s~+`lMq}S-j?(g#!@yA=y#$Zlb|=GJ5iGt
z>|LU)Q@ustpSf#o8gzN9U)kx&y{A!EWDZ``4~R&s#S=rwEJmSCj$f+tYt5!6Tjyrg
zMpt8gh<3r9`Vc=ee2;*SZ~dpj31`v;7k43V{gG=No_HZ&<5geimWMyEd-y*ib@Xgd
z<4$glezn@G@>+k^rcb?*T!_dW6qSzr(;X;-Z@7i_Ne!FQ)e$A}gluL3+v?!{<z|tn
z{FCnmVpC*#wKSA1^!0mU@)p2#+xjhVjyi3-tS>XYp}f+uO=>J71W3L^$uv0YE*o>1
z7nSIg-j$sUOg1)3zVU%&&&m3t6N`>ilF`kVuhp<P#0>PbLj&W7PdGRlO6R2XqqRx=
zD`G~1SqF_1FBy~HhWCp*Bj5CBUi+q*&$?;5t#%Xn%@@&Rq8}}rU{&nk@A|=RQQc?H
zY23Ox{7djHG1ptklyO6+^*m_ljlwPxK6RK=e@Um-Yp!y3A4s!}a2=e0)^#Pf1j4ay
ztx)!gBVa6i&oXv~{V9wSXQ!e6d}Qm2H+qw6(y8h^I`H(&<^18Y<x}p3Y<?W5v^my0
zV^=uYm#4l<kaVF<A$XLN;dXMHgdj&JkmmK3`kNP9!&w4HKS|iP`?Jz;w%m?9;>7N#
ziuyZ&3z4k*%nqqxsYVYv@Y!45++k#oUoJ)I2nh|tA1uq0x_DV^zgn|9%kzG!O^XV!
z%B!;Mf69x};QT%1F2T3=)+IU(?x+9T;qO1zB9PZ*{+gX<;KsQk>_h(7!<(kZqQ3o>
zzSldF3#Rm?{+7&FARo2M3Y6cf=K4LiPy8uZ-}bj`zYSQu(3ijF{%P0Q<>yW?{Pj@X
znfCW~e4ys9z|27VA3vMPnUop438w5#|9+TJN%^;SJ{|64%l<8eFdSLI_ecvQ<9CTR
zTTRa%DLJF))_w4eng;PGNZ5g8gE3e9!el6z%q$%La}^T3d|NXLgS2(Mrbv*&;fM8G
zPJ6cUp2GQnc03JlEc%Pp-SRC%{Q)^M16^+2m&Xks#V;tECO<27zWb2<1e$$*qQ%L8
z{&?RTLATReK<D({>Hvx#7Xzp{62X_5I3vak_rh?D(+J2CoQ6a<zSN-b&Dk5zfh37J
zO8sbM7^=~Wl+FuFp~$o*YmyOq@Hk%5sT5o;*N4A-1oR2xn83)J8(3U;SZ~#2erlkO
z4y`M31@z9J=D*hGjDG*&{l}*+>&_2eP`EeKU%%eYb+)ij_zWv0#naSp8I0_IdZ$m2
z=b-!k2v|Rd8E-=|dYOW+(STCfpm5R1ZZuJ<1SYy7&STjA&SFJxdjm5w1LfCCQNL;0
z<2%AlCwXX6wu_{9XgD)i{-$XCV%y=YdL15y5brs5PZl3SKfGY?+2X-*!S(C~wTJN?
z&zzmVQOCDp5qtSe7pB0B39_NPR5#VcSDrlBl7yl;RUTlDf0asin8MUR9TA7;pvRz?
z^%Vr6$G8lsKa!4$E!YL$QxhX>PY$kDM|;7BpgY%L6mazT5cJ@6sTR6@JrZ2<rjLz{
z-3fxC85>_C)p%AvEO901V=Zpo-M9d`F;KyWNyKb^IT>Q`M9Rx}vXqq#K;#xdwJ`6J
z(M0__wI2qGon0$dKLiwfadZ992_{5IelF{|O)eHJ#P`D5mePO?%zS^Mk_3%HRmeI#
zC$SQaOM!HN$W|44)T0*e?zGn{li0P^4MFE;-n16!bUj!~iP(!O3;go7pLvb(p&x(2
z?k=I`)+JtvBY+OX!f-*p3I6o_IX)@Ksfx=oFD2nKZ>Vv}8Ex11e#B_)!HFM^00;ds
z#%XA9U_d5;A1C3Kg&SA@Fj9QB0rvqEn44y%?J7>cGtPY~npSf1^2F945lKN!=eKn}
z9pr)`<48S1?2JMtT7u4Dk`g2~bLlWBCN9Um^3nIZ-|t<j+^dwl8mxd0J9o}1n(59R
z)|U~-f-ijm{Gfyjv156p7y6%L3CjL?V3rXpylIJ82w!?dpaIwVRTaXwrOf*-DGK=9
zJkI+hjj<;fN(&t1&1kK|@!ElMSVS`sauat2W2>|Iyn!#d`Os;MU_59dWEZQ08ho24
zj&5y%X}*;X&S=<+va+;2Z4Ku{IfiN+0g?Kc)9Rc+pve#b{Kg#$;O(D|q%Nr`5Y7%Z
zoDbB)DVI8I-)(mSvrM;F51&`tG3$^oaSf*x9KWgUeleRn(V0&pt_<afxb7DBVJhBp
zaF$bWaO*gKu%18D@8D<ef&T6+LkvH-I$;tl_OwF&f%VFn%KI)sWS6EYwblho1AVcA
zPxx>e7%RL_v;V0C<d5s1fIw}0CGrMmUNE81JSVKFZ&XVk%e*YBaol6tyLncA{dR~0
z&JZK$ftkWS-qqs(bxDf#e(z<iJhoLPUklv|tlVA&?;9IlWWLGx-HEA^8e-wX<fQgo
z7<<B|tb2XW+H*~QzxhYn9#p~6g+(LwbO-LZAZ4$APoiUS_d$uijF4(z0l8C{>^ZKY
zkSXnH2slB0hqlyHNgG$L1!(Yne#`msF?NcNKAq9EUU>`pe42a#3HovN+KIW~8yKFD
zj$=2%F|pJ24Uw}hRPE;PBk(hAS;_9|-fleD;;wWqYv#~L9Q>^GC;E-qM*f5=KKzT^
zW`C195_}H&BX`}8ZGn%0-HHcYm=@tRV9cTk5+XfC&>We^kX{d?*mh6F2+s~k><aqr
z`?|YB;__}}<clw;I7NrP4idk2I1(m1b#lc-cWCd8RgineWDrU}X@N{EHK;Mn$x~Kw
zMv<Ofo{1eIrEPur;zfJ%&WE^O{B4?Kw<h?Lm11%s$f?~+l71WzOjNq0FU2B9uk0qy
z3{s&_WJWxN;2!VllWavtNAgyCE!qbU;~Ev)S<A`5oWOtJBmQjID5O076Lz*G9SA|Q
zH^#0{F)W$rp}d80$b4erbOXXLLO>JLzK;}No|c~Opbe$zV?EdXbf?0u6&-YOq-A7m
z(BI{ie?z8|i<Kv=a&@ohO@N<ZJcqe{U0>V2%*Qhv(Tj<V=Q;phJvABF(6x(*Q0Orq
z35Fwp-R(9y+~OcfKX6CD-(Bk;WSVWA_F^H@EJI?x9lf*O9|2(9v2XSYPH+$eam;<e
z@>Vm$`I`QoKN(21T|I`{WzGXyw!a>WzYhBbC#z$bU8h4s8UupZ+qo#iP?l`_t<f46
zvZ`vTVtj{f^ckd&AL}5ec=)F5r&<!i^_rEA-gGB@)lyZ3?W-KF^`?>9EodqvMpr?1
z^}XrSu1=g4vE;r`?QatEAAJIh)BC%G1ng6qK1G!~->zn?;(p@%gsk^ZIOWd>qi|7B
z)uQmf1&T01i--g@sYKYM94;Vhif{%e12R*K3(SIXIob)FBJ5|<Ri%#r10RG>I6Kn;
zmsb~U@T65+_4j+>_t@LuV;NU#VJrmdI}bQ7;i?MBLOMW~)-!8t$Y()?Hb11vaGlgU
zT)08ME3$l?do`MBd;Ku5O7gh%zy`gHX-Z}<Q^$i()z7OBB6Q9&eJC^j-*|>>_8&CQ
zEpT@DM+Ft2!AiER7Y)9(r{90EJ(k(`7~?YwDri-pe5QjEaWHSDA$!j__%KLMD2|)N
z^m*ZuS9b`X2rK{9o5>fb@BfE<Vg7+VbZ6Xx#lq><a^<a+!_bn7=r4!k$gxtF^||zG
zmVRp6THF&~JDxq1PdBDW=Cc<XE3AL~1eFX4AE>$xVBvq13n6e?1Z7Ehn;Q-NoWT5&
zBR0|`le2>Ziq#Dv=zOy}7vS1n{vVi2aL`-|`Drfk{?%N%2%1Z)G{^=qM`0gUb|Y*r
zS5E=@ow|@QS+LZl&+F&h&3yimxmS6aF_mwpEodG5d1LdwFLP-|+A)MihrXh7bF!ki
z#vjA+(7;IHf0c6O(NOMvT$?3Ju4G?Yl)@;xq?xp7nylF}WkgDeu|y-o*sgtvu0$~^
zC0QoRkSs$Pk|MhXGX@#C4Ksr=cxLYV)O+r^f7E;K`@Z*&-+BJ}J?A{n`7WRD^7-^^
zbF_nt7VOoK82nWTL;CSGZ~uw?^bX+5FrHRysV9YFsH-(5LrRj2k;N51cbSf&QH9I3
z2FLPu-EIjA_$6RL_U`dro|i$4u^-%xARb8!0i96ld9!{L8||<`BqIt$q8*bWk=6kz
z3)VkHbd7npA{v%}aGPS4tq%ea|0&f4nwc<D*G~K3)y(1JqEKl-Q831$#uW0RXU~Gp
zu%<mi8@=ZL`WcOtCaf>qr)v^t8|4a#t@DT8W#$h|H>vV0o_nK+v@~qE`5<hVssU0B
zu!ntR>iNaGpjctu(<|qFf63|}7q!qm=SAJNK6734H}lgfPzS?OP#SK6IhzOaao$&2
zPMunu{28qH_~g_|#2jX_7R?D=Vi^8AJuvvsWmi&J_;GmRDG5t*nQh9HggWnOi(vPR
zUS?yhXU2D={ePGa>U7Evz<n<U@tSfo3cK&g%q=M1v+$}C<bkoAv79ZWu`K16?P;bL
z6X7nC#~mF{XzYwExNUGm&E}_G`-5{kSA!AB0Py9%_!g0(s9UNBmq;M)zFgHfRBg3U
ze1Fnv%$Yp{MhIX1v95Wky_~yY&pxpiV$W@k^Nr-Hv+7{i5}F)&b}SXC1`r~_R&roD
z2ccuy0|0^^euz9MO_|O0!#^Ks3G;o{F8TS@ht20l&ScARBFA<oc|Xch32z7W7%mCT
z5XRIo<DQTX=!!YMcxstpxNd^UzQcX$@`*%03y4t<i~`63q`C1CP+|hDLdQ__W=GO!
z*gj(CQ&QZXoO33nF5>+gQUtImsjO@#L&C~tByPx2;1Q{<IjVlz_4r!M7sR)I@V6%5
z-}P`D!=0I#Gs_uY7F>~T)qcLyb+uv17%%ZR2&Gp!vX|tJ*d?^71k{k72d@_n7>3nj
z{E8}ay<PXtJrwOdg50j3xUIiZMn(9TA`D~twm5I}hL*ZK6^p#M<^b6DlHA9990nS!
zyq;l?;wOmRZ=RW3cs;W80hLRdw9Jm*^rswn>B!mP`?kuwNUP~$P9o$ht^(CclbIFl
z=2eW_Y{f)_qkegmIMy}SsHO_H>48aZYUwMlxB|R4($u}iz;gFUtCBXRJzK>q%Hw??
zpa^bx(0a@bSZCXy>j$CRvB%lvSrcOc07A8^-0)KU$EC|8vltqsu?D|Bv;@=PUt$<^
z(#^<Dt=X>8fQ#YduY>#FOifpZA>zEOPrlZGbzS-Il)jN<=H>a$B#q4D)wQ*?M{c*s
zTG(s6YkN{jzPD&W-cwYb8~%~+(8TdEt>-NBQC~b8Q_WxYU-56=&R&pej}$o^lor0)
zS1kM4qRpU7FTM9}g|pphWXxZ>vVTg8Q3CpCD_}S4i;3j@O5?@uYeKGjH8<fXYb0hs
zK1|Ac^QkV=E`#}_L+&H~kD`ac&xKa|DYj#o?W7`51W2}wa0j>-Sj1KnpWKo_g|Zlc
z?3HHdwmYq^4tOc79bGa4nBh_^lDLQJ;ni6(oi}=G@972XIFV#pGZnuOVV{o}M<=7U
zHmODo*WB7qPM5}dv$*LKc!k+pS7I_%VXsY~n+M0!4l*jLuGB^?`GhJ__o;+-OED74
zIZ%r^D2$&`$X;gJ&~Zr!Hb_d$2%{@s{i?HwFf|M+6xBR%xZhr}RO6M`1Ih`KZ?hLi
za56c>3IgNqtiC@f_l=~8J<iLTOjeipUA}2MixF>b5qwei4t=CELto5;<9o60-Z6<~
z>E>)_nbLi`=r=b8=ely>Tpz}Jv&!>#EniAM4<U@9vLa%lR&PaA+kU9KKOcP9ItU=y
zZXp;tA_6SkA0>g(y+1u#kJ&pPg?2Obz>?H~B{M6BlO@7p&0z6U;b+~3babjao@BmL
z@VcD(q#rT|p(l!q<>bpv7)0l208d!;lZ-Z-bf_xNV0<lI36tLJTAS1WnLuspp74Pv
zTgNyJ8uHCnsY3_@<k%;K@74=Q8gk4!SwcreC|Y{6I>=7Dj{2n5$tAOllON8y9bm`D
zUSB-yA?a@%TcfZ0P)G3qIarceHfkcR5#QxPk=dA3mhwz<OB?D%tH89^5I!$}0M;lK
zOt6tS5~k2D6{GgzI$`6{FcFu<`4{}W6lv8j*Y-F?ZGQJS06Y1iQ#({(O-qgAn&F2Z
zPo_OwLkQlYBm~=MKT=wrV>;hBDG_Ipy2Emz1(tU@mG6ta%zGTr+}uI1DTT$MqzrK}
zG$})MF<!_(DHcZ0gGy>!)m(LTs;!ALO4HD3t&&bE$b@TvKmId1At1|H3nxWlNzhrp
z%G#Zi_*11&t1asfp&bbH>MZHK<E@G(xVQErf>(qE*>&fj<E!?)-vil&#&zJOGyh=F
zR-`Jh;Yg({;3?^oA_-7oK<j=hRP7_6S;9}FBki+WsrzgsW>&3kJB6a>&}R(3p5h7x
zY(1dBOj=psZU85%&EBM%ZswuM?%1<mBIJo|o9G+EL>D4KnD@c_9KA8HrS)RI@?zZB
z-QysgSGnauai>%?j;GTOY^`dgvFvcs`5Sux$a74{A&_*>YwIS<cvE*>_3UY|kT?j3
zFfg83Lwo1e>Al>M6QVM29mWOmXLJPM$btde(kC>TijxGMQ?6g)Buc~;6EbAM8Y~J8
zHO|mLd7<{d&+Qt9tBs(SimTQ|a?<pj<a3SA7qP}jK(<ZejE*A(jxL%e@Xk+y{FsKO
z9Rq@cm@05NC;LVo!u}&j8KlUQOPlt+>if-dUyqJ?Npgb2IPm@w^?>OC_s=fzOCJt#
zTUelSAlRkaw3T;mO__(Fm&Jh%o3qUvA7iDmv_eQhuSe_{;gfy;kv1#ZWh$!cB!AjP
z1`f3XuT1m=r$@VK^6|K9s{0ZB#7@|!WpcV^B2$OMv3x|^X%X!Ixa9h9Nv2++zW<}6
z^(aN0*Zyr0y<ib%O90_kjb?Krj!sBzfO(FO<Owru2A6#Dpj7T4&YWySY?Z4G&2XLb
zrDy0({VG{^ukd2{FgbWS3*gg&1=@@t*9Voqp{yOzfH)P9F&}EhvjRncU9^fgB0Cxu
z-R*xPJsHA!eOL)5R~mR;i_#IqCE~w&`W<C*6i?>|?Fn+rDaW-q645e%8^54Qn72S@
zE=OUJ<LYtF5k{3wELzHknE@TE@@2=D#{P|2??Ty|ypr5AS5m}8n{IZlwgbvz>`t&D
z5FIl6hmhDb+xc~l`MDCTKQ3{4?od6iy3d1xyX~PhSpGZgUf?duyLH>&`&)$@v7H5C
z7uXxxVJy4(RJ{DxCH$s#IxbONxLlxib+C_m0kUYqX-6w$UP1<zpzn2z5_Wm=wpbYL
zT1&PJgJb!5Bt_c1mc3gK3f)J!fSam;%JE2RSFkRyikn|0C-%oj=<sr`cuuCPT1id`
zG<f(>T&Yhl?%Hp1W_hE=b~@amxp+O3Y-Q0_{f$%_h^ktGu)8PFQLxQT3W8zSaK1Y0
zW*a)%ZFg;qee#=E4V1E{#f3KhzEdy4ihav2Whr{u9&3&|(fStZcC7|1`!<^K^3;K?
zkGbwFT|5B`%bv*o%9t2nA5E^WC-)fLFsU4c3)Q(u^Z-v~#A;__-5Ewc0`Ww)0a?A8
z@fuu0uk>`8xrJ-9Nu};2W;^#bz{<KyDc(w|d2g(jd(Xpte0L;>dZMWo>SGVq3+zH>
z%M_j`9uq`FsLhe^9SVH|2W|XL;su~R3h@v15>1!Nbg7)3(}$kjb<~A>h;F=;zvNNk
zO*wx{EyKrCezo58?j{xBp^)uCMv5o?bd}xNiM6+ngRL|hvjm^P)S-p=F=PLkxqtHf
zE2?dCE4_;1$bw5h<s|@F$m#n`=KIM0zkz6f2jNb&8K*y#*^n=yo{nmM;1JTMoN!ZG
zL?a--U3KPBq{jDj_mzL&CNqFogWIrIi>965h>P_XRmDv8oDf=XV=}$mPKB&yT7ly>
bki_%99hY9x)IMKOf8BWn97=Eb<I}$Y^ugL4
literal 0
HcmV?d00001
--
GitLab
From 827286eb9d62193445924bfc65be61455afab56b Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Fri, 9 Oct 2015 12:01:11 +0100
Subject: [PATCH 112/223] Correct a hard coded sourcelink directive
re #13347
---
docs/source/algorithms/Fit-v1.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/source/algorithms/Fit-v1.rst b/docs/source/algorithms/Fit-v1.rst
index 55baf7dfbf7..691219743c2 100644
--- a/docs/source/algorithms/Fit-v1.rst
+++ b/docs/source/algorithms/Fit-v1.rst
@@ -355,5 +355,5 @@ Output:
.. categories::
.. sourcelink::
- :h: Framework/CurveFitting/inc/MantidCurveFitting/Fit.h
- :cpp: Framework/CurveFitting/src/Fit.cpp
\ No newline at end of file
+ :h: Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit.h
+ :cpp: Framework/CurveFitting/src/Algorithms/Fit.cpp
\ No newline at end of file
--
GitLab
From cf1d6a8dbd35e64b18ce12ad20cd197f66ac3460 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Fri, 9 Oct 2015 12:03:08 +0100
Subject: [PATCH 113/223] And another of those sourcelink directives
re #13347
---
docs/source/fitfunctions/Convolution.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/source/fitfunctions/Convolution.rst b/docs/source/fitfunctions/Convolution.rst
index 4131d38a6c0..2d1effda494 100644
--- a/docs/source/fitfunctions/Convolution.rst
+++ b/docs/source/fitfunctions/Convolution.rst
@@ -45,5 +45,5 @@ Note that the box function is defined on interval [-5, 5]:
.. categories::
.. sourcelink::
- :h: Framework/CurveFitting/inc/MantidCurveFitting/Convolution.h
- :cpp: Framework/CurveFitting/src/Convolution.cpp
\ No newline at end of file
+ :h: Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h
+ :cpp: Framework/CurveFitting/src/Functions/Convolution.cpp
\ No newline at end of file
--
GitLab
From 8a47dfe64f78e49dcc9652702c607431c523ac49 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Fri, 9 Oct 2015 12:15:23 +0100
Subject: [PATCH 114/223] Another couple of sourcelinks
re #13347
---
docs/source/fitfunctions/Quadratic.rst | 4 ++--
docs/source/fitfunctions/UserFunction.rst | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/source/fitfunctions/Quadratic.rst b/docs/source/fitfunctions/Quadratic.rst
index ec969de22b9..8ff860a4182 100644
--- a/docs/source/fitfunctions/Quadratic.rst
+++ b/docs/source/fitfunctions/Quadratic.rst
@@ -26,5 +26,5 @@ where
.. categories::
.. sourcelink::
- :h: Framework/CurveFitting/inc/MantidCurveFitting/Quadratic.h
- :cpp: Framework/CurveFitting/src/Quadratic.cpp
\ No newline at end of file
+ :h: Framework/CurveFitting/inc/MantidCurveFitting/Functions/Quadratic.h
+ :cpp: Framework/CurveFitting/src/Functions/Quadratic.cpp
\ No newline at end of file
diff --git a/docs/source/fitfunctions/UserFunction.rst b/docs/source/fitfunctions/UserFunction.rst
index 9cda7f413fd..9a8201cec13 100644
--- a/docs/source/fitfunctions/UserFunction.rst
+++ b/docs/source/fitfunctions/UserFunction.rst
@@ -25,5 +25,5 @@ go first in UserFunction definition.
.. categories::
.. sourcelink::
- :h: Framework/CurveFitting/inc/MantidCurveFitting/UserFunction.h
- :cpp: Framework/CurveFitting/src/UserFunction.cpp
\ No newline at end of file
+ :h: Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h
+ :cpp: Framework/CurveFitting/src/Functions/UserFunction.cpp
\ No newline at end of file
--
GitLab
From faec9b26c0c93437557c176f00143cce81eeb716 Mon Sep 17 00:00:00 2001
From: Marina Ganeva <m.ganeva@fz-juelich.de>
Date: Fri, 9 Oct 2015 14:27:39 +0200
Subject: [PATCH 115/223] Member wsNames removed.
---
.../plugins/algorithms/TOFTOFMergeRuns.py | 29 ++++++++++---------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py b/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py
index 8a78f121f11..443a8249b46 100644
--- a/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py
+++ b/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py
@@ -20,7 +20,6 @@ class TOFTOFMergeRuns(PythonAlgorithm):
Init
"""
PythonAlgorithm.__init__(self)
- self.wsNames = []
def category(self):
""" Return category
@@ -54,6 +53,7 @@ class TOFTOFMergeRuns(PythonAlgorithm):
"""
workspaces = self.getProperty("InputWorkspaces").value
mlzutils.ws_exist(workspaces, self.log())
+ input_workspaces = []
if len(workspaces) < 1:
message = "List of workspaces is empty. Nothing to merge."
self.log().error(message)
@@ -61,23 +61,24 @@ class TOFTOFMergeRuns(PythonAlgorithm):
for wsname in workspaces:
wks = api.AnalysisDataService.retrieve(wsname)
if isinstance(wks, WorkspaceGroup):
- self.wsNames.extend(wks.getNames())
+ input_workspaces.extend(wks.getNames())
else:
- self.wsNames.append(wsname)
+ input_workspaces.append(wsname)
+ return input_workspaces
- def _can_merge(self):
+ def _can_merge(self, wsnames):
"""
Checks whether given workspaces can be merged
"""
# mandatory properties must be identical
- mlzutils.compare_mandatory(self.wsNames, self.mandatory_properties, self.log())
+ mlzutils.compare_mandatory(wsnames, self.mandatory_properties, self.log())
# timing (x-axis binning) must match
# is it possible to use WorkspaceHelpers::matchingBins from python?
- self.timingsMatch(self.wsNames)
+ self.timingsMatch(wsnames)
# Check sample logs for must have properties
- for wsname in self.wsNames:
+ for wsname in wsnames:
wks = api.AnalysisDataService.retrieve(wsname)
run = wks.getRun()
for prop in self.must_have_properties:
@@ -88,9 +89,9 @@ class TOFTOFMergeRuns(PythonAlgorithm):
raise RuntimeError(message)
# warnig if optional properties are not identical must be given
- ws1 = api.AnalysisDataService.retrieve(self.wsNames[0])
+ ws1 = api.AnalysisDataService.retrieve(wsnames[0])
run1 = ws1.getRun()
- for wsname in self.wsNames[1:]:
+ for wsname in wsnames[1:]:
wks = api.AnalysisDataService.retrieve(wsname)
run = wks.getRun()
mlzutils.compare_properties(run1, run, self.optional_properties, self.log(), tolerance=0.01)
@@ -100,8 +101,8 @@ class TOFTOFMergeRuns(PythonAlgorithm):
""" Main execution body
"""
# get list of input workspaces
- self._validate_input()
- workspaceCount = len(self.wsNames)
+ input_workspace_list = self._validate_input()
+ workspaceCount = len(input_workspace_list)
self.log().information("Workspaces to merge " + str(workspaceCount))
wsOutput = self.getPropertyValue("OutputWorkspace")
@@ -111,14 +112,14 @@ class TOFTOFMergeRuns(PythonAlgorithm):
return
# check whether given workspaces can be merged
- self._can_merge()
+ self._can_merge(input_workspace_list)
# delete output workspace if it exists
if api.mtd.doesExist(wsOutput):
api.DeleteWorkspace(Workspace=wsOutput)
# Merge runs
- api.MergeRuns(InputWorkspaces=self.wsNames, OutputWorkspace=wsOutput)
+ api.MergeRuns(InputWorkspaces=input_workspace_list, OutputWorkspace=wsOutput)
# Merge logs
# MergeRuns by default copies all logs from the first workspace
@@ -126,7 +127,7 @@ class TOFTOFMergeRuns(PythonAlgorithm):
for prop in self.properties_to_merge:
pdict[prop] = []
- for wsname in self.wsNames:
+ for wsname in input_workspace_list:
wks = api.AnalysisDataService.retrieve(wsname)
run = wks.getRun()
for prop in self.properties_to_merge:
--
GitLab
From 9aa23e4d55bc9000db50d1975f9134b903fb7b0f Mon Sep 17 00:00:00 2001
From: Elliot Oram <Elliot.Oram@stfc.ac.uk>
Date: Fri, 9 Oct 2015 13:55:41 +0100
Subject: [PATCH 116/223] Added container run number in Indirect corrections
Refs #13915
---
.../src/Indirect/ApplyPaalmanPings.cpp | 11 ++++++++++-
.../src/Indirect/CalculatePaalmanPings.cpp | 11 ++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp b/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
index 42270faab77..31673e95536 100644
--- a/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
+++ b/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
@@ -175,9 +175,18 @@ void ApplyPaalmanPings::run() {
correctionType = "cyl";
break;
}
- const QString outputWsName =
+ QString outputWsName =
sampleWsName.left(nameCutIndex) + +"_" + correctionType + "_Corrected";
+ if (useCan) {
+ auto containerWsName = m_uiForm.dsContainer->getCurrentDataName();
+ int cutIndex = containerWsName.indexOf("_");
+ if (cutIndex == -1) {
+ cutIndex = containerWsName.length();
+ }
+ outputWsName += "_Subtract_" + containerWsName.left(cutIndex);
+ }
+
applyCorrAlg->setProperty("OutputWorkspace", outputWsName.toStdString());
// Add corrections algorithm to queue
diff --git a/MantidQt/CustomInterfaces/src/Indirect/CalculatePaalmanPings.cpp b/MantidQt/CustomInterfaces/src/Indirect/CalculatePaalmanPings.cpp
index 81277fad6d9..49584757883 100644
--- a/MantidQt/CustomInterfaces/src/Indirect/CalculatePaalmanPings.cpp
+++ b/MantidQt/CustomInterfaces/src/Indirect/CalculatePaalmanPings.cpp
@@ -122,8 +122,17 @@ void CalculatePaalmanPings::run() {
break;
}
- const QString outputWsName =
+ QString outputWsName =
sampleWsName.left(nameCutIndex) + "_" + correctionType + "_abs";
+ if (useCan) {
+ auto containerWsName = m_uiForm.dsContainer->getCurrentDataName();
+ int cutIndex = containerWsName.indexOf("_");
+ if (cutIndex == -1) {
+ cutIndex = containerWsName.length();
+ }
+ outputWsName += "_Subtract_" + containerWsName.left(cutIndex);
+ }
+
absCorAlgo->setProperty("OutputWorkspace", outputWsName.toStdString());
// Add corrections algorithm to queue
--
GitLab
From ca5643d0cff92aaf12c03af38f6899ce68bf100f Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 9 Oct 2015 14:04:26 +0100
Subject: [PATCH 117/223] coverity - code maintainability 1304565, re #13689
---
Framework/ICat/src/GSoap/stdsoap2.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Framework/ICat/src/GSoap/stdsoap2.cpp b/Framework/ICat/src/GSoap/stdsoap2.cpp
index ec26daa1e2e..e6d4b80af1a 100644
--- a/Framework/ICat/src/GSoap/stdsoap2.cpp
+++ b/Framework/ICat/src/GSoap/stdsoap2.cpp
@@ -2386,7 +2386,7 @@ int SOAP_FMAC2 soap_resolve(struct soap *soap) {
"location=%p level=%u,%u id='%s'\n",
ip->type, p, ip->level, fp->level, ip->id));
while (ip->level < k) {
- void **q = (void **)soap_malloc(soap, sizeof(q));
+ void **q = (void **)soap_malloc(soap, sizeof(*q));
if (!q)
return soap->error;
*q = p;
--
GitLab
From a4c5c9c4aa90a9b4cbae457ba86bf865a5eead05 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Fri, 9 Oct 2015 15:17:33 +0100
Subject: [PATCH 118/223] Added progress report to ConvertToReflectometryQ
Refs #13508
---
.../src/ConvertToReflectometryQ.cpp | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/Framework/MDAlgorithms/src/ConvertToReflectometryQ.cpp b/Framework/MDAlgorithms/src/ConvertToReflectometryQ.cpp
index 1431b38ae0e..fe2dfbcc3e2 100644
--- a/Framework/MDAlgorithms/src/ConvertToReflectometryQ.cpp
+++ b/Framework/MDAlgorithms/src/ConvertToReflectometryQ.cpp
@@ -353,40 +353,54 @@ void ConvertToReflectometryQ::exec() {
TableWorkspace_sptr vertexes =
boost::make_shared<Mantid::DataObjects::TableWorkspace>();
-
+ Progress transSelectionProg(this, 0.0, 0.1, 2);
if (outputAsMDWorkspace) {
+ transSelectionProg.report("Choosing Transformation");
if (transMethod == centerTransform()) {
auto outputMDWS = transform->executeMD(inputWs, bc);
+ Progress transPerformProg(this, 0.1, 0.7, 5);
+ transPerformProg.report("Performed transformation");
// Copy ExperimentInfo (instrument, run, sample) to the output WS
ExperimentInfo_sptr ei(inputWs->cloneExperimentInfo());
outputMDWS->addExperimentInfo(ei);
outputWS = outputMDWS;
} else if (transMethod == normPolyTransform()) {
+ Progress transPerformProg(this, 0.1, 0.7, 5);
const bool dumpVertexes = this->getProperty("DumpVertexes");
auto vertexesTable = vertexes;
// perform the normalised polygon transformation
+ transPerformProg.report("Performing Transformation");
auto normPolyTrans = transform->executeNormPoly(
inputWs, vertexesTable, dumpVertexes, outputDimensions);
// copy any experiment info from input workspace
normPolyTrans->copyExperimentInfoFrom(inputWs.get());
// produce MDHistoWorkspace from normPolyTrans workspace.
+ Progress outputToMDProg(this, 0.7, 0.75, 10);
auto outputMDWS = transform->executeMDNormPoly(normPolyTrans);
ExperimentInfo_sptr ei(normPolyTrans->cloneExperimentInfo());
outputMDWS->addExperimentInfo(ei);
outputWS = outputMDWS;
+ outputToMDProg.report("Successfully output to MD");
} else {
throw std::runtime_error("Unknown rebinning method: " + transMethod);
}
} else if (transMethod == normPolyTransform()) {
+ transSelectionProg.report("Choosing Transformation");
+ Progress transPerformProg(this, 0.1, 0.7, 5);
const bool dumpVertexes = this->getProperty("DumpVertexes");
auto vertexesTable = vertexes;
// perform the normalised polygon transformation
+ transPerformProg.report("Performing Transformation");
auto output2DWS = transform->executeNormPoly(
inputWs, vertexesTable, dumpVertexes, outputDimensions);
// copy any experiment info from input workspace
output2DWS->copyExperimentInfoFrom(inputWs.get());
outputWS = output2DWS;
+ transPerformProg.report("Transformation Complete");
} else if (transMethod == centerTransform()) {
+ transSelectionProg.report("Choosing Transformation");
+ Progress transPerformProg(this, 0.1, 0.7, 5);
+ transPerformProg.report("Performing Transformation");
auto output2DWS = transform->execute(inputWs);
output2DWS->copyExperimentInfoFrom(inputWs.get());
outputWS = output2DWS;
@@ -397,6 +411,8 @@ void ConvertToReflectometryQ::exec() {
// Execute the transform and bind to the output.
setProperty("OutputWorkspace", outputWS);
setProperty("OutputVertexes", vertexes);
+ Progress setPropertyProg(this, 0.8, 1.0, 2);
+ setPropertyProg.report("Success");
}
} // namespace Mantid
--
GitLab
From 122bc517479068e5281ca944209baba2a2bb6a01 Mon Sep 17 00:00:00 2001
From: Marina Ganeva <m.ganeva@fz-juelich.de>
Date: Fri, 9 Oct 2015 16:52:22 +0200
Subject: [PATCH 119/223] Checking code has been moved to the validateInputs.
---
.../plugins/algorithms/TOFTOFCropWorkspace.py | 35 ++++++++++---------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py b/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
index bdd39f2b2c9..c7c6f387adb 100644
--- a/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
+++ b/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
@@ -35,29 +35,32 @@ class TOFTOFCropWorkspace(PythonAlgorithm):
doc="Name of the workspace that will contain the results")
return
+ def validateInputs(self):
+ issues = dict()
+ input_workspace = self.getProperty("InputWorkspace").value
+
+ xunit = input_workspace.getAxis(0).getUnit().unitID()
+ if xunit != 'TOF':
+ issues['InputWorkspace'] = "X axis units must be TOF. "
+
+ # check for required properties
+ run = input_workspace.getRun()
+ if not run.hasProperty('channel_width'):
+ issues['InputWorkspace'] = "Input workpsace must have sample log channel_width."
+ if not run.hasProperty('full_channels'):
+ issues['InputWorkspace'] = "Input workpsace must have sample log full_channels."
+
+ return issues
+
def PyExec(self):
""" Main execution body
"""
inputws = self.getProperty("InputWorkspace").value
- # check X units, will be not needed if validator will work
- xunit = inputws.getAxis(0).getUnit().unitID()
- if xunit != 'TOF':
- message = "Workspace " + inputws.getName() + " has invalid X axis units " + str(xunit) +\
- ". X axis units must be TOF."
- self.log().error(message)
- raise ValueError(message)
-
outputws = self.getProperty("OutputWorkspace").value
- # check for required properties
run = inputws.getRun()
- if run.hasProperty('channel_width') and run.hasProperty('full_channels'):
- channel_width = float(run.getLogData('channel_width').value)
- full_channels = float(run.getLogData('full_channels').value)
- else:
- message = "Workspace " + inputws.getName() + " does not contain required sample logs. Cannot crop."
- self.log().error("message")
- raise RuntimeError(message)
+ channel_width = float(run.getLogData('channel_width').value)
+ full_channels = float(run.getLogData('full_channels').value)
outputws = api.CropWorkspace(inputws, XMin=0., XMax=full_channels*channel_width, OutputWorkspace=outputws)
self.setProperty("OutputWorkspace", outputws)
--
GitLab
From a06a720be5d96cc1ba289edf5956fe13874bfc22 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 9 Oct 2015 15:57:21 +0100
Subject: [PATCH 120/223] coverity - memory illegal access, 1292896 and
1010337, re #13689
---
.../inc/MantidDataObjects/MDGridBox.tcc | 51 +++++++++----------
Framework/ICat/src/GSoap/stdsoap2.cpp | 2 +-
2 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.tcc b/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.tcc
index d03eb54542a..4de12171123 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.tcc
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.tcc
@@ -40,10 +40,10 @@ namespace DataObjects {
*/
TMDE(MDGridBox)::MDGridBox(
BoxController *const bc, const uint32_t depth,
- const std::vector<
- Mantid::Geometry::MDDimensionExtents<coord_t>> &extentsVector)
- : MDBoxBase<MDE, nd>(bc, depth, UNDEF_SIZET, extentsVector),
- numBoxes(0), m_Children(), diagonalSquared(0.f), nPoints(0) {
+ const std::vector<Mantid::Geometry::MDDimensionExtents<coord_t>> &
+ extentsVector)
+ : MDBoxBase<MDE, nd>(bc, depth, UNDEF_SIZET, extentsVector), numBoxes(0),
+ m_Children(), diagonalSquared(0.f), nPoints(0) {
initGridBox();
}
@@ -55,8 +55,8 @@ TMDE(MDGridBox)::MDGridBox(
*/
TMDE(MDGridBox)::MDGridBox(
boost::shared_ptr<API::BoxController> &bc, const uint32_t depth,
- const std::vector<
- Mantid::Geometry::MDDimensionExtents<coord_t>> &extentsVector)
+ const std::vector<Mantid::Geometry::MDDimensionExtents<coord_t>> &
+ extentsVector)
: MDBoxBase<MDE, nd>(bc.get(), depth, UNDEF_SIZET, extentsVector),
numBoxes(0), m_Children(), diagonalSquared(0.f), nPoints(0) {
initGridBox();
@@ -68,17 +68,16 @@ template <typename MDE, size_t nd> size_t MDGridBox<MDE, nd>::initGridBox() {
"MDGridBox::ctor(): No BoxController specified in box.");
// How many is it split?
- // If we are at the top level and we have a specific top level split, then set it.
- boost::optional<std::vector<size_t>> splitTopInto = this->m_BoxController->getSplitTopInto();
- if (this->getDepth() == 0 && splitTopInto)
- {
+ // If we are at the top level and we have a specific top level split, then set
+ // it.
+ boost::optional<std::vector<size_t>> splitTopInto =
+ this->m_BoxController->getSplitTopInto();
+ if (this->getDepth() == 0 && splitTopInto) {
for (size_t d = 0; d < nd; d++)
split[d] = splitTopInto.get()[d];
- }
- else
- {
- for (size_t d = 0; d < nd; d++)
- split[d] = this->m_BoxController->getSplitInto(d);
+ } else {
+ for (size_t d = 0; d < nd; d++)
+ split[d] = this->m_BoxController->getSplitInto(d);
}
// Compute sizes etc.
@@ -94,10 +93,9 @@ template <typename MDE, size_t nd> size_t MDGridBox<MDE, nd>::initGridBox() {
* @param box :: MDBox containing the events to split
*/
TMDE(MDGridBox)::MDGridBox(MDBox<MDE, nd> *box)
- : MDBoxBase<MDE, nd>(*box, box->getBoxController()), split(),
- splitCumul(), m_SubBoxSize(), numBoxes(0), m_Children(),
- diagonalSquared(0.f), nPoints(0)
-{
+ : MDBoxBase<MDE, nd>(*box, box->getBoxController()), split(), splitCumul(),
+ m_SubBoxSize(), numBoxes(0), m_Children(), diagonalSquared(0.f),
+ nPoints(0) {
size_t totalSize = initGridBox();
double ChildVol(1);
@@ -188,10 +186,10 @@ void MDGridBox<MDE, nd>::fillBoxShell(const size_t tot,
*/
TMDE(MDGridBox)::MDGridBox(const MDGridBox<MDE, nd> &other,
Mantid::API::BoxController *const otherBC)
- : MDBoxBase<MDE, nd>(other, otherBC), numBoxes(other.numBoxes), m_Children(),
- diagonalSquared(other.diagonalSquared), nPoints(other.nPoints) {
- for (size_t d = 0; d < nd; d++)
- {
+ : MDBoxBase<MDE, nd>(other, otherBC), numBoxes(other.numBoxes),
+ m_Children(), diagonalSquared(other.diagonalSquared),
+ nPoints(other.nPoints) {
+ for (size_t d = 0; d < nd; d++) {
split[d] = other.split[d];
splitCumul[d] = other.splitCumul[d];
m_SubBoxSize[d] = other.m_SubBoxSize[d];
@@ -415,7 +413,7 @@ TMDE(std::vector<MDE> *MDGridBox)::getEventsCopy() {
*/
TMDE(void MDGridBox)::getBoxes(std::vector<API::IMDNode *> &outBoxes,
size_t maxDepth, bool leafOnly) {
- //Add this box, unless we only want the leaves
+ // Add this box, unless we only want the leaves
if (!leafOnly)
outBoxes.push_back(this);
@@ -1465,8 +1463,9 @@ TMDE(void MDGridBox)::integrateCylinder(
coord_t out[nd];
radiusTransform.apply(boxCenter, out);
if (out[0] < std::sqrt(diagonalSquared * 0.72 + radius * radius) &&
- std::fabs(out[1]) <
- std::sqrt(diagonalSquared * 0.72 + 0.25 * length * length)) {
+ (nd >= 1 &&
+ std::fabs(out[1]) <
+ std::sqrt(diagonalSquared * 0.72 + 0.25 * length * length))) {
// If the center is closer than the size of the box, then it MIGHT be
// touching.
// (We multiply by 0.72 (about sqrt(2)) to look for half the diagonal).
diff --git a/Framework/ICat/src/GSoap/stdsoap2.cpp b/Framework/ICat/src/GSoap/stdsoap2.cpp
index e6d4b80af1a..fcef2db1c46 100644
--- a/Framework/ICat/src/GSoap/stdsoap2.cpp
+++ b/Framework/ICat/src/GSoap/stdsoap2.cpp
@@ -11048,7 +11048,7 @@ int SOAP_FMAC2 soap_peek_element(struct soap *soap) {
soap->arraySize[sizeof(soap->arrayType) - 1] = '\0';
soap->arrayType[sizeof(soap->arrayType) - 1] = '\0';
} else if (!soap_match_tag(soap, tp->name, "SOAP-ENC:offset"))
- strncpy(soap->arrayOffset, tp->value, sizeof(soap->arrayOffset));
+ strncpy(soap->arrayOffset, tp->value, sizeof(soap->arrayOffset) - 1);
else if (!soap_match_tag(soap, tp->name, "SOAP-ENC:position"))
soap->position = soap_getposition(tp->value, soap->positions);
else if (!soap_match_tag(soap, tp->name, "SOAP-ENC:root"))
--
GitLab
From ac367e0f08fed4bbe80ac9e659a987d4d4720bd2 Mon Sep 17 00:00:00 2001
From: Wenduo Zhou <zhouw@ornl.gov>
Date: Fri, 9 Oct 2015 11:10:13 -0400
Subject: [PATCH 121/223] Refs #13692. Filled in arguments for Sample.cpp.
---
.../PythonInterface/mantid/api/src/Exports/Sample.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp
index cbf45afe13a..435e4040dc4 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp
@@ -17,21 +17,28 @@ void export_Sample() {
class_<Sample, boost::noncopyable>("Sample", no_init)
.def("getName", &Sample::getName,
return_value_policy<copy_const_reference>(),
+ arg("self"),
"Returns the string name of the sample")
.def("getOrientedLattice", (const OrientedLattice &(Sample::*)() const) &
Sample::getOrientedLattice,
+ arg("self"),
return_value_policy<reference_existing_object>(),
"Get the oriented lattice for this sample")
.def("hasOrientedLattice", &Sample::hasOrientedLattice,
+ arg("self"),
"Returns True if this sample has an oriented lattice, false "
"otherwise")
.def("size", &Sample::size,
+ arg("self"),
"Return the number of samples contained within this sample")
// Required for ISIS SANS reduction until the full sample geometry is
// defined on loading
.def("getGeometryFlag", &Sample::getGeometryFlag,
+ arg("self"),
"Return the geometry flag.")
- .def("getThickness", &Sample::getThickness, "Return the thickness in mm")
+ .def("getThickness", &Sample::getThickness,
+ arg("self"),
+ "Return the thickness in mm")
.def("getHeight", &Sample::getHeight, "Return the height in mm")
.def("getWidth", &Sample::getWidth, "Return the width in mm")
.def("getMaterial",
--
GitLab
From 933fb68aa703a1ae5a8c2a8c15a97d3ab8eb21a8 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 9 Oct 2015 16:26:36 +0100
Subject: [PATCH 122/223] coverity - memory corruptions, 1324913, re #13689
---
.../inc/MantidQtSpectrumViewer/GraphDisplay.h | 2 +-
MantidQt/SpectrumViewer/src/GraphDisplay.cpp | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/MantidQt/SpectrumViewer/inc/MantidQtSpectrumViewer/GraphDisplay.h b/MantidQt/SpectrumViewer/inc/MantidQtSpectrumViewer/GraphDisplay.h
index b3cd39f36e9..a7cdd630803 100644
--- a/MantidQt/SpectrumViewer/inc/MantidQtSpectrumViewer/GraphDisplay.h
+++ b/MantidQt/SpectrumViewer/inc/MantidQtSpectrumViewer/GraphDisplay.h
@@ -96,7 +96,7 @@ class EXPORT_OPT_MANTIDQT_SPECTRUMVIEWER GraphDisplay
double m_minY;
double m_maxY;
- static QColor g_curveColors[];
+ static std::vector<QColor> g_curveColors;
};
diff --git a/MantidQt/SpectrumViewer/src/GraphDisplay.cpp b/MantidQt/SpectrumViewer/src/GraphDisplay.cpp
index fb458c40088..3b3f3f25de4 100644
--- a/MantidQt/SpectrumViewer/src/GraphDisplay.cpp
+++ b/MantidQt/SpectrumViewer/src/GraphDisplay.cpp
@@ -12,7 +12,7 @@ namespace MantidQt
namespace SpectrumView
{
-QColor GraphDisplay::g_curveColors[] = {Qt::black, Qt::red, Qt::green, Qt::blue};
+std::vector<QColor> GraphDisplay::g_curveColors;
/**
* Construct a GraphDisplay to display selected graph on the specifed plot
@@ -40,6 +40,11 @@ GraphDisplay::GraphDisplay( QwtPlot* graphPlot,
{
if(isVertical)
graphPlot->setAxisMaxMajor( QwtPlot::xBottom, 3 );
+
+ g_curveColors.push_back(Qt::black);
+ g_curveColors.push_back(Qt::red);
+ g_curveColors.push_back(Qt::green);
+ g_curveColors.push_back(Qt::blue);
}
@@ -130,7 +135,7 @@ void GraphDisplay::setData(const QVector<double> & xData,
auto curve = new QwtPlotCurve;
curve->setData( xData, yData );
curve->attach( m_graphPlot );
- auto colorIndex = m_curves.size() % sizeof(g_curveColors);
+ auto colorIndex = m_curves.size() % g_curveColors.size();
curve->setPen(QPen(g_curveColors[colorIndex]));
m_curves.append(curve);
--
GitLab
From 2b6b22b76512f27634737024e129804fff9036dc Mon Sep 17 00:00:00 2001
From: Shahroz Ahmed <shahroz.ahmed@stfc.ac.uk>
Date: Fri, 9 Oct 2015 16:33:22 +0100
Subject: [PATCH 123/223] updates and fixes and code clean up
Refs #13811
---
.../EnggDiffractionPresenter.h | 3 +-
.../IEnggDiffractionPresenter.h | 1 -
.../EnggDiffractionPresenter.cpp | 66 ++++++++-----------
.../EnggDiffractionViewQtGUI.cpp | 4 +-
.../test/EnggDiffractionPresenterTest.h | 2 +
5 files changed, 33 insertions(+), 43 deletions(-)
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h
index ab21b8c925e..fd4858acdea 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h
@@ -85,7 +85,6 @@ protected:
void processLogMsg();
void processInstChange();
void processShutDown();
- void processPlotRepChange();
protected slots:
void calibrationFinished();
@@ -177,6 +176,8 @@ private:
Mantid::API::ITableWorkspace_sptr &vanIntegWS,
Mantid::API::MatrixWorkspace_sptr &vanCurvesWS);
+ void plotFocusedWorkspace(std::string outWSName);
+
/// string to use for ENGINX file names (as a prefix, etc.)
const static std::string g_enginxStr;
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h
index 1e95a472209..01fcbcaa76d 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h
@@ -47,7 +47,6 @@ public:
ResetFocus, ///< Re-set / clear all focus inputs and options
LogMsg, ///< need to send a message to the Mantid log system
InstrumentChange, ///< Instrument selection updated
- PlotRepChange, ///< Data Plot representation selection updated
ShutDown ///< closing the interface
};
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp
index 0c2681fb510..26d09c98c94 100644
--- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp
+++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp
@@ -110,10 +110,6 @@ void EnggDiffractionPresenter::notify(
case IEnggDiffractionPresenter::ShutDown:
processShutDown();
break;
-
- case IEnggDiffractionPresenter::PlotRepChange:
- processPlotRepChange();
- break;
}
}
@@ -271,11 +267,6 @@ void EnggDiffractionPresenter::processShutDown() {
cleanup();
}
-void EnggDiffractionPresenter::processPlotRepChange() {
- m_view->saveSettings();
- cleanup();
-}
-
/**
* Does several checks on the current inputs and settings. This should
* be done before starting any calibration work. The message return
@@ -1097,36 +1088,8 @@ void EnggDiffractionPresenter::doFocusing(const EnggDiffCalibSettings &cs,
// TODO: use detector positions (from calibrate full) when available
// alg->setProperty(DetectorPositions, TableWorkspace)
alg->execute();
-
- const bool plotFocusedWS = m_view->focusedOutWorkspace();
- int plotType = m_view->currentPlotType();
- g_log.debug() << "...Plot Type return: " << plotType << std::endl;
-
- // Qt comboBox returns absurd number for index of 0
- if (plotType > 3) {
- plotType = 1;
- } else {
- plotType += 1;
- }
-
- if (plotFocusedWS == true && 1 == plotType) {
- if (outWSName == "engggui_focusing_output_ws_bank_1")
- m_view->plotFocusedSpectrum(outWSName);
- if (outWSName == "engggui_focusing_output_ws_bank_2")
- m_view->plotReplacingWindow(outWSName);
- }
-
- else if (plotFocusedWS == true && 2 == plotType) {
- if (outWSName == "engggui_focusing_output_ws_bank_1")
- m_view->plotFocusedSpectrum(outWSName);
- if (outWSName == "engggui_focusing_output_ws_bank_2")
- m_view->plotWaterfallSpectrum(outWSName);
- }
-
- else if (plotFocusedWS == true && 3 == plotType) {
- m_view->plotFocusedSpectrum(outWSName);
- }
-
+ // plot Focused workspace according to the data type selected
+ plotFocusedWorkspace(outWSName);
} catch (std::runtime_error &re) {
g_log.error() << "Error in calibration. ",
"Could not run the algorithm EnggCalibrate succesfully for bank " +
@@ -1366,5 +1329,30 @@ void EnggDiffractionPresenter::calcVanadiumWorkspaces(
vanCurvesWS = ADS.retrieveWS<MatrixWorkspace>(curvesName);
}
+/**
+ * Checks the plot type selected and applies the appropriate
+ * python function to apply during first bank and second bank
+ *
+ * @param std::string outWSName; title of focused workspace
+ */
+void EnggDiffractionPresenter::plotFocusedWorkspace(std::string outWSName) {
+ const bool plotFocusedWS = m_view->focusedOutWorkspace();
+ int plotType = m_view->currentPlotType();
+
+ if (plotFocusedWS == true && 0 == plotType) {
+ if (outWSName == "engggui_focusing_output_ws_bank_1")
+ m_view->plotFocusedSpectrum(outWSName);
+ if (outWSName == "engggui_focusing_output_ws_bank_2")
+ m_view->plotReplacingWindow(outWSName);
+ } else if (plotFocusedWS == true && 1 == plotType) {
+ if (outWSName == "engggui_focusing_output_ws_bank_1")
+ m_view->plotFocusedSpectrum(outWSName);
+ if (outWSName == "engggui_focusing_output_ws_bank_2")
+ m_view->plotWaterfallSpectrum(outWSName);
+ } else if (plotFocusedWS == true && 2 == plotType) {
+ m_view->plotFocusedSpectrum(outWSName);
+ }
+}
+
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
index e6978ccc6e4..281afa85eaf 100644
--- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
+++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
@@ -149,7 +149,6 @@ void EnggDiffractionViewQtGUI::doSetupTabSettings() {
}
void EnggDiffractionViewQtGUI::doSetupTabFocus() {
- m_uiTabFocus.comboBox_PlotData->setCurrentIndex(0);
connect(m_uiTabFocus.pushButton_focus, SIGNAL(released()), this,
SLOT(focusClicked()));
@@ -240,6 +239,8 @@ void EnggDiffractionViewQtGUI::readSettings() {
m_uiTabFocus.checkBox_FocusedWS->setChecked(
qs.value("user-params-focus-plot-ws", true).toBool());
+ m_uiTabFocus.comboBox_PlotData->setCurrentIndex(0);
+
QString lastPath =
MantidQt::API::AlgorithmInputHistory::Instance().getPreviousDirectory();
// TODO: this should become << >> operators on
@@ -722,7 +723,6 @@ void EnggDiffractionViewQtGUI::plotRepChanged(int /*idx*/) {
if (!inst)
return;
m_currentType = inst->currentIndex();
- m_presenter->notify(IEnggDiffractionPresenter::PlotRepChange);
}
void EnggDiffractionViewQtGUI::instrumentChanged(int /*idx*/) {
diff --git a/MantidQt/CustomInterfaces/test/EnggDiffractionPresenterTest.h b/MantidQt/CustomInterfaces/test/EnggDiffractionPresenterTest.h
index 043aba68ed9..6a83147a706 100644
--- a/MantidQt/CustomInterfaces/test/EnggDiffractionPresenterTest.h
+++ b/MantidQt/CustomInterfaces/test/EnggDiffractionPresenterTest.h
@@ -385,6 +385,8 @@ public:
// check automatic plotting
EXPECT_CALL(mockView, focusedOutWorkspace()).Times(1).WillOnce(Return(true));
EXPECT_CALL(mockView, plotFocusedSpectrum(testing::_)).Times(1);
+ // There are two/three other tests that have the disabled_ prefix so they
+ // normally run
// Should not try to use options for other types of focusing
EXPECT_CALL(mockView, focusingCroppedRunNo()).Times(0);
--
GitLab
From fed3593f13322c5c5097580338869866d8b5f6b1 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 9 Oct 2015 16:41:56 +0100
Subject: [PATCH 124/223] coverity - uninit vars, 1306273 and 1306272, re
#13689
---
Framework/Kernel/src/DateValidator.cpp | 3 +++
MantidQt/SliceViewer/src/PeaksViewer.cpp | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Framework/Kernel/src/DateValidator.cpp b/Framework/Kernel/src/DateValidator.cpp
index 2ff99628903..5362fb247e2 100644
--- a/Framework/Kernel/src/DateValidator.cpp
+++ b/Framework/Kernel/src/DateValidator.cpp
@@ -28,6 +28,9 @@ struct tm getTimeValue(const std::string &sDate, std::string &error) {
timeinfo.tm_wday = 0;
timeinfo.tm_yday = 0;
timeinfo.tm_isdst = -1;
+#ifndef _WIN32
+ timeinfo.tm_gmtoff = 0;
+#endif
std::basic_string<char>::size_type index, off = 0;
int day, month, year;
diff --git a/MantidQt/SliceViewer/src/PeaksViewer.cpp b/MantidQt/SliceViewer/src/PeaksViewer.cpp
index 8034a80c790..ac8fb544ccf 100644
--- a/MantidQt/SliceViewer/src/PeaksViewer.cpp
+++ b/MantidQt/SliceViewer/src/PeaksViewer.cpp
@@ -122,9 +122,9 @@ PeaksViewer::~PeaksViewer() {}
*/
bool PeaksViewer::hasThingsToShow() const { return m_presenter->size() >= 1; }
-void PeaksViewer:: clearPeaksModeRequest(
+void PeaksViewer::clearPeaksModeRequest(
const PeaksWorkspaceWidget *const originWidget, const bool on) {
- EditMode mode;
+ EditMode mode = None;
if (on) {
QList<PeaksWorkspaceWidget *> children =
qFindChildren<PeaksWorkspaceWidget *>(this);
@@ -149,7 +149,7 @@ void PeaksViewer:: clearPeaksModeRequest(
void PeaksViewer::addPeaksModeRequest(const PeaksWorkspaceWidget * const originWidget, const bool on)
{
- EditMode mode;
+ EditMode mode = None;
if(on) {
QList<PeaksWorkspaceWidget *> children =
qFindChildren<PeaksWorkspaceWidget *>(this);
--
GitLab
From fc81cccaf75f18ab882cfaab9e20e603871d097a Mon Sep 17 00:00:00 2001
From: Wenduo Zhou <zhouw@ornl.gov>
Date: Fri, 9 Oct 2015 12:02:44 -0400
Subject: [PATCH 125/223] Refs #13692. Checkpointing progress.
---
.../mantid/api/src/Exports/Algorithm.cpp | 19 ++++++-------------
.../mantid/api/src/Exports/IAlgorithm.cpp | 7 ++++---
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index 0aa43a5125c..d3798d6efde 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -77,24 +77,20 @@ void export_leaf_classes() {
.def("fromString", &Algorithm::fromString,
"Initialize the algorithm from a string representation")
.staticmethod("fromString")
-
.def("createChildAlgorithm", &Algorithm::createChildAlgorithm,
(arg("name"), arg("startProgress") = -1.0, arg("endProgress") = -1.0,
arg("enableLogging") = true, arg("version") = -1),
"Creates and intializes a named child algorithm. Output workspaces "
"are given a dummy name.")
-
.def("declareProperty",
- (declarePropertyType1)&PythonAlgorithm::declarePyAlgProperty,
+ (declarePropertyType1) & PythonAlgorithm::declarePyAlgProperty,
declarePropertyType1_Overload(
(arg("self"), arg("prop"), arg("doc") = "")))
-
.def("enableHistoryRecordingForChild",
&Algorithm::enableHistoryRecordingForChild, (args("on")),
"Turns history recording on or off for an algorithm.")
-
.def("declareProperty",
- (declarePropertyType2)&PythonAlgorithm::declarePyAlgProperty,
+ (declarePropertyType2) & PythonAlgorithm::declarePyAlgProperty,
declarePropertyType2_Overload(
(arg("self"), arg("name"), arg("defaultValue"),
arg("validator") = object(), arg("doc") = "",
@@ -102,27 +98,24 @@ void export_leaf_classes() {
"Declares a named property where the type is taken from "
"the type of the defaultValue and mapped to an appropriate C++ "
"type"))
-
.def("declareProperty",
- (declarePropertyType3)&PythonAlgorithm::declarePyAlgProperty,
+ (declarePropertyType3) & PythonAlgorithm::declarePyAlgProperty,
declarePropertyType3_Overload(
(arg("self"), arg("name"), arg("defaultValue"), arg("doc") = "",
arg("direction") = Direction::Input),
"Declares a named property where the type is taken from the "
"type "
"of the defaultValue and mapped to an appropriate C++ type"))
-
.def("declareProperty",
- (declarePropertyType4)&PythonAlgorithm::declarePyAlgProperty,
+ (declarePropertyType4) & PythonAlgorithm::declarePyAlgProperty,
(arg("self"), arg("name"), arg("defaultValue"),
arg("direction") = Direction::Input),
"Declares a named property where the type is taken from the type "
"of the defaultValue and mapped to an appropriate C++ type")
-
- .def("getLogger", &PythonAlgorithm::getLogger,
+ .def("getLogger", &PythonAlgorithm::getLogger, arg("self"),
return_value_policy<reference_existing_object>(),
"Returns a reference to this algorithm's logger")
- .def("log", &PythonAlgorithm::getLogger,
+ .def("log", &PythonAlgorithm::getLogger, arg("self"),
return_value_policy<reference_existing_object>(),
"Returns a reference to this algorithm's logger") // Traditional name
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
index e2be117bf9a..7028fd156da 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
@@ -344,9 +344,10 @@ void export_ialgorithm() {
.def("isExecuted", &IAlgorithm::isExecuted,
"Returns True if the algorithm has been executed successfully, "
"False otherwise")
- .def("isLogging", &IAlgorithm::isLogging, "Returns True if the "
- "algorithm's logger is turned "
- "on, False otherwise")
+ .def("isLogging", &IAlgorithm::isLogging, arg("self"),
+ "Returns True if the "
+ "algorithm's logger is turned "
+ "on, False otherwise")
.def("isRunning", &IAlgorithm::isRunning, "Returns True if the algorithm "
"is considered to be running, "
"False otherwise")
--
GitLab
From 00bbd9a41729286d6a623ac0184cae5e3e34e273 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Fri, 9 Oct 2015 17:05:58 +0100
Subject: [PATCH 126/223] coverity - resource leak, 1324912, re #13918
---
.../MantidMDAlgorithms/Integrate3DEvents.h | 8 ++---
.../MDAlgorithms/src/Integrate3DEvents.cpp | 32 +++++++++++--------
2 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h
index 2d2b6398fcb..d5a3c71fc66 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h
@@ -127,10 +127,10 @@ private:
double detectorQ(std::vector<Kernel::V3D> E1Vec,
const Mantid::Kernel::V3D QLabFrame, std::vector<double> &r);
// Private data members
- PeakQMap peak_qs; // hashtable with peak Q-vectors
- EventListMap event_lists; // hashtable with lists of events for each peak
- Kernel::DblMatrix UBinv; // matrix mapping from Q to h,k,l
- double radius; // size of sphere to use for events around a peak
+ PeakQMap m_peak_qs; // hashtable with peak Q-vectors
+ EventListMap m_event_lists; // hashtable with lists of events for each peak
+ Kernel::DblMatrix m_UBinv; // matrix mapping from Q to h,k,l
+ double m_radius; // size of sphere to use for events around a peak
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
index f3db57b5fd7..81f3c32b3b9 100644
--- a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
+++ b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
@@ -35,14 +35,14 @@ using Mantid::Kernel::V3D;
Integrate3DEvents::Integrate3DEvents(
std::vector<std::pair<double, V3D>> const &peak_q_list,
DblMatrix const &UBinv, double radius) {
- this->UBinv = UBinv;
- this->radius = radius;
+ m_UBinv = UBinv;
+ m_radius = radius;
int64_t hkl_key;
for (size_t it = 0; it != peak_q_list.size(); ++it) {
hkl_key = getHklKey(peak_q_list[it].second);
if (hkl_key != 0) // only save if hkl != (0,0,0)
- peak_qs[hkl_key] = peak_q_list[it].second;
+ m_peak_qs[hkl_key] = peak_q_list[it].second;
}
}
@@ -124,7 +124,11 @@ Integrate3DEvents::ellipseIntegrateEvents(
return boost::make_shared<NoShape>();
}
- std::vector<std::pair<double, V3D>> &some_events = event_lists[hkl_key];
+ auto pos = m_event_lists.find(hkl_key);
+ if (m_event_lists.end() == pos)
+ return;
+
+ std::vector<std::pair<double, V3D>> &some_events = pos->second;
if (some_events.size() < 3) // if there are not enough events to
{ // find covariance matrix, return
@@ -132,14 +136,14 @@ Integrate3DEvents::ellipseIntegrateEvents(
}
DblMatrix cov_matrix(3, 3);
- makeCovarianceMatrix(some_events, cov_matrix, radius);
+ makeCovarianceMatrix(some_events, cov_matrix, m_radius);
std::vector<V3D> eigen_vectors;
getEigenVectors(cov_matrix, eigen_vectors);
std::vector<double> sigmas;
for (int i = 0; i < 3; i++) {
- sigmas.push_back(stdDev(some_events, eigen_vectors[i], radius));
+ sigmas.push_back(stdDev(some_events, eigen_vectors[i], m_radius));
}
bool invalid_peak = false;
@@ -392,7 +396,7 @@ int64_t Integrate3DEvents::getHklKey2(V3D const &hkl) {
* @param q_vector The q_vector to be mapped to h,k,l
*/
int64_t Integrate3DEvents::getHklKey(V3D const &q_vector) {
- V3D hkl = UBinv * q_vector;
+ V3D hkl = m_UBinv * q_vector;
int h = boost::math::iround<double>(hkl[0]);
int k = boost::math::iround<double>(hkl[1]);
int l = boost::math::iround<double>(hkl[2]);
@@ -424,15 +428,15 @@ void Integrate3DEvents::addEvent(std::pair<double, V3D> event_Q,
if (hkl_key == 0) // don't keep events associated with 0,0,0
return;
- auto peak_it = peak_qs.find(hkl_key);
- if (peak_it != peak_qs.end()) {
+ auto peak_it = m_peak_qs.find(hkl_key);
+ if (peak_it != m_peak_qs.end()) {
if (!peak_it->second.nullVector()) {
if (hkl_integ)
- event_Q.second = event_Q.second - UBinv * peak_it->second;
+ event_Q.second = event_Q.second - m_UBinv * peak_it->second;
else
event_Q.second = event_Q.second - peak_it->second;
- if (event_Q.second.norm() < radius) {
- event_lists[hkl_key].push_back(event_Q);
+ if (event_Q.second.norm() < m_radius) {
+ m_event_lists[hkl_key].push_back(event_Q);
}
}
}
@@ -511,8 +515,8 @@ PeakShapeEllipsoid_const_sptr Integrate3DEvents::ellipseIntegrateEvents(
// if necessary restrict the background ellipsoid
// to lie within the specified sphere, and adjust
// the other sizes, proportionally
- if (r3 * max_sigma > radius) {
- r3 = radius / max_sigma;
+ if (r3 * max_sigma > m_radius) {
+ r3 = m_radius / max_sigma;
r1 = r3 * 0.79370053f; // This value for r1 and r2 makes the background
r2 = r1; // shell volume equal to the peak region volume.
}
--
GitLab
From b11e735692dab9e24b580f4f45fe2837982a2d89 Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Mon, 5 Oct 2015 11:11:45 -0400
Subject: [PATCH 127/223] Adding algorithm to create PDFgetN input file from
raw data
---
.../plugins/algorithms/PDToPDFgetN.py | 129 ++++++++++++++++++
1 file changed, 129 insertions(+)
create mode 100644 Code/Mantid/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
new file mode 100644
index 00000000000..9b37a92268a
--- /dev/null
+++ b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
@@ -0,0 +1,129 @@
+from mantid.simpleapi import *
+from mantid.api import *
+from mantid.kernel import Direction, FloatArrayProperty
+import mantid
+
+COMPRESS_TOL_TOF = .01
+
+
+class PDToPDFgetN(DataProcessorAlgorithm):
+
+ def category(self):
+ return "Workflow\\Diffraction;PythonAlgorithms"
+
+ def name(self):
+ return "PDToPDFgetN"
+
+ def summary(self):
+ return "The algorithm used converting raw data to pdfgetn input files"
+
+ def PyInit(self):
+ self.declareProperty(FileProperty(name="Filename",
+ defaultValue="", action=FileAction.Load,
+ extensions=["_event.nxs", ".nxs.h5"]),
+ "Event file")
+ self.declareProperty("MaxChunkSize", 0.0,
+ "Specify maximum Gbytes of file to read in one chunk. Default is whole file.")
+ self.declareProperty("FilterBadPulses", 95.,
+ doc="Filter out events measured while proton " +
+ "charge is more than 5% below average")
+
+ self.declareProperty(MatrixWorkspaceProperty("InputWorkspace", "",
+ direction=Direction.Input,
+ optional=PropertyMode.Optional),
+ doc="Handle to reduced workspace")
+
+ self.declareProperty(FileProperty(name="CalibrationFile",
+ defaultValue="", action=FileAction.OptionalLoad,
+ extensions=[".h5", ".hd5", ".hdf", ".cal"]))
+ self.declareProperty(FileProperty(name="CharacterizationRunsFile", defaultValue="",
+ action=FileAction.OptionalLoad,
+ extensions=["txt"]),
+ "File with characterization runs denoted")
+
+ self.declareProperty("RemovePromptPulseWidth", 0.0,
+ "Width of events (in microseconds) near the prompt pulse to remove. 0 disables")
+ self.declareProperty("CropWavelengthMin", 0.,
+ "Crop the data at this minimum wavelength.")
+ self.declareProperty("CropWavelengthMax", 0.,
+ "Crop the data at this maximum wavelength.")
+
+ self.declareProperty(FloatArrayProperty("Binning", values=[0., 0., 0.],
+ direction=Direction.Input), "Positive is linear bins, negative is logorithmic")
+ self.declareProperty("ResampleX", 0,
+ "Number of bins in x-axis. Non-zero value overrides \"Params\" property. " +
+ "Negative value means logorithmic binning.")
+
+ self.declareProperty(MatrixWorkspaceProperty("OutputWorkspace", "",
+ direction=Direction.Output),
+ doc="Handle to reduced workspace")
+ self.declareProperty(FileProperty(name="PDFgetNFile", defaultValue="", action=FileAction.Save,
+ extensions=[".getn"]), "Output filename")
+
+ def _loadCharacterizations(self):
+ self._focusPos = {}
+ self._iparmFile = None
+
+ charFilename = self.getProperty("CharacterizationRunsFile").value
+
+ if charFilename is None or len(charFilename) <= 0:
+ return
+
+ results = PDLoadCharacterizations(Filename=charFilename,
+ OutputWorkspace="characterizations")
+ self._iparmFile = results[1]
+ self._focusPos['PrimaryFlightPath'] = results[2]
+ self._focusPos['SpectrumIDs'] = results[3]
+ self._focusPos['L2'] = results[4]
+ self._focusPos['Polar'] = results[5]
+ self._focusPos['Azimuthal'] = results[6]
+
+ def PyExec(self):
+ filename = self.getProperty("Filename").value
+
+ self._loadCharacterizations()
+
+ wksp = LoadEventAndCompress(Filename=self.getProperty("Filename").value,
+ OutputWorkspace=self.getPropertyValue("OutputWorkspace"),
+ MaxChunkSize=self.getProperty("MaxChunkSize").value,
+ FilterBadPulses=self.getProperty("FilterBadPulses").value,
+ CompressTOFTolerance=COMPRESS_TOL_TOF)
+
+ charac = ""
+ if mtd.doesExist("characterizations"):
+ charac = "characterizations"
+
+ # get the correct row of the table
+ PDDetermineCharacterizations(InputWorkspace=wksp,
+ Characterizations=charac,
+ ReductionProperties="__snspowderreduction")
+
+ wksp = AlignAndFocusPowder(InputWorkspace=wksp, OutputWorkspace=wksp,
+ CalFileName=self.getProperty("CalibrationFile").value,
+ Params=self.getProperty("Binning").value,
+ ResampleX=self.getProperty("ResampleX").value, Dspacing=True,
+ PreserveEvents=False,
+ RemovePromptPulseWidth=self.getProperty("RemovePromptPulseWidth").value,
+ CompressTolerance=COMPRESS_TOL_TOF,
+ CropWavelengthMin=self.getProperty("CropWavelengthMin").value,
+ CropWavelengthMax=self.getProperty("CropWavelengthMax").value,
+ ReductionProperties="__snspowderreduction",
+ **(self._focusPos))
+ wksp = NormaliseByCurrent(InputWorkspace=wksp, OutputWorkspace=wksp)
+ wksp.getRun()['gsas_monitor'] = 1
+ if self._iparmFile is not None:
+ wksp.getRun()['iparm_file'] = self._iparmFile
+
+ wksp = SetUncertainties(InputWorkspace=wksp, OutputWorkspace=wksp,
+ SetError="sqrt")
+ SaveGSS(InputWorkspace=wksp,
+ Filename=self.getProperty("PDFgetNFile").value,
+ SplitFiles=False, Append=False,
+ MultiplyByBinWidth=False,
+ Bank=mantid.pmds["__snspowderreduction"]["bank"].value,
+ Format="SLOG", ExtendedHeader=True)
+
+ self.setProperty("OutputWorkspace", wksp)
+
+# Register algorithm with Mantid.
+AlgorithmFactory.subscribe(PDToPDFgetN)
--
GitLab
From 870aeae0bc75babf1f4800ab4ad1235d306652d1 Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Tue, 6 Oct 2015 15:15:44 -0400
Subject: [PATCH 128/223] Moving algorithm into the correct place
---
.../PythonInterface/plugins/algorithms/PDToPDFgetN.py | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename {Code/Mantid/Framework => Framework}/PythonInterface/plugins/algorithms/PDToPDFgetN.py (100%)
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py b/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
similarity index 100%
rename from Code/Mantid/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
rename to Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
--
GitLab
From b40f34b2311e0d0382b7a8e04f86611b64235b8e Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Sat, 10 Oct 2015 15:02:59 +0100
Subject: [PATCH 129/223] coverity - control flow issue 1075961, re #13918
---
Framework/Algorithms/src/RemovePromptPulse.cpp | 2 +-
Framework/MDAlgorithms/src/Integrate3DEvents.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Framework/Algorithms/src/RemovePromptPulse.cpp b/Framework/Algorithms/src/RemovePromptPulse.cpp
index ceaecb85d47..a5f338a5942 100644
--- a/Framework/Algorithms/src/RemovePromptPulse.cpp
+++ b/Framework/Algorithms/src/RemovePromptPulse.cpp
@@ -72,7 +72,7 @@ void getTofRange(MatrixWorkspace_const_sptr wksp, double &tmin, double &tmax) {
DataObjects::EventWorkspace_const_sptr eventWksp =
boost::dynamic_pointer_cast<const DataObjects::EventWorkspace>(wksp);
- bool isEvent = false;
+ const bool isEvent = false;
if (isEvent) {
eventWksp->getEventXMinMax(tmin, tmax);
} else {
diff --git a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
index 81f3c32b3b9..a81ed00b7ac 100644
--- a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
+++ b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
@@ -126,7 +126,7 @@ Integrate3DEvents::ellipseIntegrateEvents(
auto pos = m_event_lists.find(hkl_key);
if (m_event_lists.end() == pos)
- return;
+ return boost::make_shared<NoShape>();;
std::vector<std::pair<double, V3D>> &some_events = pos->second;
--
GitLab
From f79c54602f4d45eb3808035f0d959d3a8ab6ab3c Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Sat, 10 Oct 2015 15:03:23 +0100
Subject: [PATCH 130/223] coverity - control flow issue 1075965, re #13918
---
Framework/Algorithms/src/FFT.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Framework/Algorithms/src/FFT.cpp b/Framework/Algorithms/src/FFT.cpp
index f8e6db3c743..1d6f94e2bf3 100644
--- a/Framework/Algorithms/src/FFT.cpp
+++ b/Framework/Algorithms/src/FFT.cpp
@@ -172,7 +172,7 @@ void FFT::exec() {
// centerShift == true means that the zero on the x axis is assumed to be in
// the data centre
// at point with index i = ySize/2. If shift == false the zero is at i = 0
- bool centerShift = true;
+ const bool centerShift = true;
API::TextAxis *tAxis = new API::TextAxis(nOut);
int iRe = 0;
--
GitLab
From 3d56eaf289ff921d7ac24a4581a6fe8590388c3e Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Sat, 10 Oct 2015 15:04:20 +0100
Subject: [PATCH 131/223] coverity - control flow issue 1306777, re #13918
---
Framework/Algorithms/src/CreateDummyCalFile.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Framework/Algorithms/src/CreateDummyCalFile.cpp b/Framework/Algorithms/src/CreateDummyCalFile.cpp
index d7c9020aaf9..a13e9ba5626 100644
--- a/Framework/Algorithms/src/CreateDummyCalFile.cpp
+++ b/Framework/Algorithms/src/CreateDummyCalFile.cpp
@@ -111,7 +111,7 @@ void CreateDummyCalFile::exec() {
std::string filename = getProperty("CalFilename");
// Plan to overwrite file, so do not check if it exists
- bool overwrite = false;
+ const bool overwrite = false;
int number = 0;
Progress prog(this, 0.0, 0.8, assemblies.size());
--
GitLab
From 7b3653e7ee032534cf0faecf3331df46534cd931 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Sat, 10 Oct 2015 15:04:49 +0100
Subject: [PATCH 132/223] coverity - control flow issue 1325231, re #13918
---
Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp b/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp
index 67c0bd24fdb..70eabbe72e4 100644
--- a/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp
+++ b/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp
@@ -202,7 +202,7 @@ void ConvertCWSDExpToMomentum::addMDEvents(bool usevirtual) {
std::string sep("");
if (m_dataDir.size() > 0) {
// Determine system
- bool isWindows(false);
+ const bool isWindows(false);
#if _WIN64
isWindows = true;
#elif _WIND32
--
GitLab
From c8b0e873572eb752aa9ffce3e73b4c6574b799df Mon Sep 17 00:00:00 2001
From: Michael Wedel <michael.wedel@esss.se>
Date: Sun, 11 Oct 2015 11:53:15 +0200
Subject: [PATCH 133/223] Refs #13924. Getting the correct crystal system for
PawleyFunction
---
.../SINQ/inc/MantidSINQ/PoldiFitPeaks2D.h | 4 ++
Framework/SINQ/src/PoldiFitPeaks2D.cpp | 32 +++++++++++++-
Framework/SINQ/test/PoldiFitPeaks2DTest.h | 43 ++++++++++++++++---
3 files changed, 72 insertions(+), 7 deletions(-)
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks2D.h b/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks2D.h
index 973c128b27b..1a7c1005d68 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks2D.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks2D.h
@@ -6,6 +6,7 @@
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/IFunction.h"
#include "MantidAPI/IPeakFunction.h"
+#include "MantidGeometry/Crystal/PointGroup.h"
#include "MantidKernel/Matrix.h"
@@ -104,6 +105,9 @@ protected:
getFunctionPawley(std::string profileFunctionName,
const PoldiPeakCollection_sptr &peakCollection);
+ std::string getCrystalSystemFromPointGroup(
+ const Geometry::PointGroup_sptr &pointGroup) const;
+
std::string
getRefinedStartingCell(const std::string &initialCell,
const std::string &crystalSystem,
diff --git a/Framework/SINQ/src/PoldiFitPeaks2D.cpp b/Framework/SINQ/src/PoldiFitPeaks2D.cpp
index 5ace6536c53..dc9755d28fb 100644
--- a/Framework/SINQ/src/PoldiFitPeaks2D.cpp
+++ b/Framework/SINQ/src/PoldiFitPeaks2D.cpp
@@ -546,8 +546,7 @@ Poldi2DFunction_sptr PoldiFitPeaks2D::getFunctionPawley(
"peaks do not have point group.");
}
- std::string crystalSystem =
- getCrystalSystemAsString(pointGroup->crystalSystem());
+ std::string crystalSystem = getCrystalSystemFromPointGroup(pointGroup);
pawleyFunction->setCrystalSystem(crystalSystem);
UnitCell cell = peakCollection->unitCell();
@@ -575,6 +574,35 @@ Poldi2DFunction_sptr PoldiFitPeaks2D::getFunctionPawley(
return mdFunction;
}
+/**
+ * Returns the crystal system for the specified point group
+ *
+ * This function simply uses Geometry::getCrystalSystemAsString(), except when
+ * the crystal system is trigonal but the point group uses hexagonal axes. In
+ * that case this function returns the string for PointGroup::Hexagonal.
+ *
+ * @param pointGroup :: The point group for which to find the crystal system
+ * @return The crystal system for the point group
+ */
+std::string PoldiFitPeaks2D::getCrystalSystemFromPointGroup(
+ const PointGroup_sptr &pointGroup) const {
+ if (!pointGroup) {
+ throw std::invalid_argument(
+ "Cannot return crystal system for null PointGroup.");
+ }
+
+ PointGroup::CrystalSystem crystalSystem = pointGroup->crystalSystem();
+
+ if (crystalSystem == PointGroup::Trigonal) {
+ if (pointGroup->getCoordinateSystem() ==
+ Group::CoordinateSystem::Hexagonal) {
+ return getCrystalSystemAsString(PointGroup::Hexagonal);
+ }
+ }
+
+ return getCrystalSystemAsString(crystalSystem);
+}
+
/**
* Tries to refine the initial cell using the supplied peaks
*
diff --git a/Framework/SINQ/test/PoldiFitPeaks2DTest.h b/Framework/SINQ/test/PoldiFitPeaks2DTest.h
index da95dd91414..724daf8254a 100644
--- a/Framework/SINQ/test/PoldiFitPeaks2DTest.h
+++ b/Framework/SINQ/test/PoldiFitPeaks2DTest.h
@@ -433,6 +433,40 @@ public:
TS_ASSERT_EQUALS(refinedCell, "5 5 5 90 90 90");
}
+ void testGetCrystalSystemFromPointGroup() {
+ TestablePoldiFitPeaks2D alg;
+
+ auto pgCubic = PointGroupFactory::Instance().createPointGroup("m-3m");
+ TS_ASSERT_EQUALS(alg.getCrystalSystemFromPointGroup(pgCubic), "Cubic");
+
+ auto pgTetra = PointGroupFactory::Instance().createPointGroup("4/mmm");
+ TS_ASSERT_EQUALS(alg.getCrystalSystemFromPointGroup(pgTetra), "Tetragonal");
+
+ auto pgOrtho = PointGroupFactory::Instance().createPointGroup("mmm");
+ TS_ASSERT_EQUALS(alg.getCrystalSystemFromPointGroup(pgOrtho),
+ "Orthorhombic");
+
+ auto pgMono = PointGroupFactory::Instance().createPointGroup("2/m");
+ TS_ASSERT_EQUALS(alg.getCrystalSystemFromPointGroup(pgMono), "Monoclinic");
+
+ auto pgTric = PointGroupFactory::Instance().createPointGroup("-1");
+ TS_ASSERT_EQUALS(alg.getCrystalSystemFromPointGroup(pgTric), "Triclinic");
+
+ auto pgHex = PointGroupFactory::Instance().createPointGroup("6/mmm");
+ TS_ASSERT_EQUALS(alg.getCrystalSystemFromPointGroup(pgHex), "Hexagonal");
+
+ auto pgTrigRh = PointGroupFactory::Instance().createPointGroup("-3m r");
+ TS_ASSERT_EQUALS(alg.getCrystalSystemFromPointGroup(pgTrigRh), "Trigonal");
+
+ auto pgTrigHex = PointGroupFactory::Instance().createPointGroup("-3m");
+ TS_ASSERT_EQUALS(alg.getCrystalSystemFromPointGroup(pgTrigHex),
+ "Hexagonal");
+
+ PointGroup_sptr invalid;
+ TS_ASSERT_THROWS(alg.getCrystalSystemFromPointGroup(invalid),
+ std::invalid_argument);
+ }
+
private:
PoldiInstrumentAdapter_sptr m_instrument;
PoldiTimeTransformer_sptr m_timeTransformer;
@@ -449,11 +483,10 @@ private:
strm << "Error in Peak " << i << ": " << peak->intensity().value()
<< " != " << referencePeak->intensity().value();
- TSM_ASSERT_DELTA(
- strm.str().c_str(),
- fabs(1.0 -
- peak->intensity().value() / referencePeak->intensity().value()),
- 0.0, relativePrecision);
+ TSM_ASSERT_DELTA(strm.str().c_str(),
+ fabs(1.0 - peak->intensity().value() /
+ referencePeak->intensity().value()),
+ 0.0, relativePrecision);
}
}
--
GitLab
From b798c5050b5d47dbc9914374a71d1872adfe329d Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Sun, 11 Oct 2015 17:59:42 +0100
Subject: [PATCH 134/223] <0 integer error code handling issue, 1301226, re
#13918
---
MantidPlot/src/importOPJ.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MantidPlot/src/importOPJ.cpp b/MantidPlot/src/importOPJ.cpp
index f5d393e96b4..458e67fe47d 100644
--- a/MantidPlot/src/importOPJ.cpp
+++ b/MantidPlot/src/importOPJ.cpp
@@ -702,6 +702,8 @@ bool ImportOPJ::importGraphs(const OPJFile& opj)
break;
case 'F':
s=opj.functionIndex(data.right(data.length()-2).toStdString().c_str());
+ if (s<0)
+ break;
int type;
if(opj.functionType(s)==1)//Polar
{
--
GitLab
From 7ab2b5ecac0d816e3ebf3b7c4cbca7791af6466b Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Sun, 11 Oct 2015 18:05:29 +0100
Subject: [PATCH 135/223] <0 divide-by-zero issue, 1292905, re #13918
---
Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp b/Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp
index 9bb7c6d1a17..8aab04ee8db 100644
--- a/Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp
@@ -266,7 +266,13 @@ void ImportMDEventWorkspace::exec() {
m_nDimensions + 4; // signal, error, run_no, detector_no
m_IsFullDataObjects = (nActualColumns == columnsForFullEvents);
- m_nDataObjects = posDiffMDEvent / nActualColumns;
+ if (0 == nActualColumns) {
+ m_nDataObjects = 0;
+ g_log.warning() << "The number of actual columns found in the file "
+ "(exlcuding comments) is zero" << std::endl;
+ } else {
+ m_nDataObjects = posDiffMDEvent / nActualColumns;
+ }
// Get the min and max extents in each dimension.
std::vector<double> extentMins(m_nDimensions);
--
GitLab
From f520fbc61fb3c702aa175c79fd298e6ce16942f5 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Sun, 11 Oct 2015 18:08:42 +0100
Subject: [PATCH 136/223] <0 divide-by-zero issue, 1075939, re #13918
---
.../Geometry/src/Instrument/InstrumentDefinitionParser.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp b/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
index cdc50169d55..5f07fbededa 100644
--- a/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
+++ b/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
@@ -1554,6 +1554,13 @@ void InstrumentDefinitionParser::populateIdList(Poco::XML::Element *pE,
increment = atoi((pIDElem->getAttribute("step")).c_str());
// check the start end and increment values are sensible
+ if (increment <= 0) {
+ std::stringstream ss;
+ ss << "The step element must be strictly positive, found step: "
+ << increment;
+ throw Kernel::Exception::InstrumentDefinitionError(ss.str(),
+ filename);
+ }
if (((endID - startID) / increment) < 0) {
std::stringstream ss;
ss << "The start, end, and step elements do not allow a single id "
--
GitLab
From 0377c26d9ef5038cfe0561e23e49eb1d86090ec4 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Sun, 11 Oct 2015 18:25:49 +0100
Subject: [PATCH 137/223] integar handling issues: <0 array index, 1301209,
1301219, re #13918
---
.../src/PoldiUtilities/PoldiAutoCorrelationCore.cpp | 12 ++++++++++++
.../PoldiUtilities/PoldiResidualCorrelationCore.cpp | 9 +++++++++
2 files changed, 21 insertions(+)
diff --git a/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp b/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp
index 4a3ec4167a2..48b5317b0ea 100644
--- a/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp
+++ b/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp
@@ -385,6 +385,18 @@ UncertainValue PoldiAutoCorrelationCore::getCMessAndCSigma(
case 2: {
int middleIndex = cleanIndex((locator.icmin + 1), m_timeBinCount);
+ if (middleIndex < 0) {
+ m_logger.warning() << "Inconsistency foun while calculating correlation "
+ "intensity and error for d-value: "
+ << boost::lexical_cast<std::string>(dValue)
+ << ", with detector index: "
+ << boost::lexical_cast<std::string>(index)
+ << ", got middle index: "
+ << boost::lexical_cast<std::string>(middleIndex)
+ << ", ignoring it." << std::endl;
+ break;
+ }
+
double counts = getCounts(locator.detectorElement, middleIndex);
double normCounts = getNormCounts(locator.detectorElement, middleIndex);
diff --git a/Framework/SINQ/src/PoldiUtilities/PoldiResidualCorrelationCore.cpp b/Framework/SINQ/src/PoldiUtilities/PoldiResidualCorrelationCore.cpp
index 02f23178125..665b2f1eefa 100644
--- a/Framework/SINQ/src/PoldiUtilities/PoldiResidualCorrelationCore.cpp
+++ b/Framework/SINQ/src/PoldiUtilities/PoldiResidualCorrelationCore.cpp
@@ -99,6 +99,15 @@ void PoldiResidualCorrelationCore::distributeCorrelationCounts(
case 2: {
int middleIndex = cleanIndex((locator.icmin + 1), m_timeBinCount);
+ if (middleIndex < 0) {
+ m_logger.warning()
+ << "Inconsistency foun while calculating distribute "
+ "correlation counts for d-value with index "
+ << boost::lexical_cast<std::string>(k) << ", got middle index: "
+ << boost::lexical_cast<std::string>(middleIndex)
+ << ", ignoring it." << std::endl;
+ break;
+ }
addToCountData(locator.detectorElement, middleIndex, deltaForD);
}
case 1: {
--
GitLab
From 7c7f0ec624e4c5936c1f3616e6eaa91e7dd1ffab Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 08:47:56 +0100
Subject: [PATCH 138/223] coverity - restore ostream format - 1075548, 1312707,
re #13918
---
Framework/CurveFitting/inc/MantidCurveFitting/GSLMatrix.h | 2 ++
Framework/CurveFitting/src/GSLVector.cpp | 2 ++
2 files changed, 4 insertions(+)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/GSLMatrix.h b/Framework/CurveFitting/inc/MantidCurveFitting/GSLMatrix.h
index e9e35f7ac6e..9add0ff7f66 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/GSLMatrix.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/GSLMatrix.h
@@ -241,6 +241,7 @@ inline GSLMatrixMult3 operator*(const GSLMatrixMult2 &mm, const Tr &m) {
/// The << operator. Prints a matrix in rows.
inline std::ostream &operator<<(std::ostream &ostr, const GSLMatrix &m) {
+ std::ios::fmtflags fflags(ostr.flags());
ostr << std::scientific << std::setprecision(6);
for (size_t i = 0; i < m.size1(); ++i) {
for (size_t j = 0; j < m.size2(); ++j) {
@@ -248,6 +249,7 @@ inline std::ostream &operator<<(std::ostream &ostr, const GSLMatrix &m) {
}
ostr << std::endl;
}
+ ostr.flags(fflags);
return ostr;
}
diff --git a/Framework/CurveFitting/src/GSLVector.cpp b/Framework/CurveFitting/src/GSLVector.cpp
index 6c7c341cf7d..cdbc2a12db0 100644
--- a/Framework/CurveFitting/src/GSLVector.cpp
+++ b/Framework/CurveFitting/src/GSLVector.cpp
@@ -157,10 +157,12 @@ double GSLVector::dot(const GSLVector &v) const {
/// The << operator.
std::ostream &operator<<(std::ostream &ostr, const GSLVector &v) {
+ std::ios::fmtflags fflags(ostr.flags());
ostr << std::scientific << std::setprecision(6);
for (size_t j = 0; j < v.size(); ++j) {
ostr << std::setw(13) << v[j] << ' ';
}
+ ostr.flags(fflags);
return ostr;
}
--
GitLab
From 3f11f4325dbfb974bf8549ba4aafda63ff758438 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 08:58:48 +0100
Subject: [PATCH 139/223] coverity - arguments in wrong order - 1301212, re
#13918
---
Framework/Geometry/src/Crystal/ScalarUtils.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Framework/Geometry/src/Crystal/ScalarUtils.cpp b/Framework/Geometry/src/Crystal/ScalarUtils.cpp
index 096cbabf474..e92b977edef 100644
--- a/Framework/Geometry/src/Crystal/ScalarUtils.cpp
+++ b/Framework/Geometry/src/Crystal/ScalarUtils.cpp
@@ -229,7 +229,7 @@ ConventionalCell ScalarUtils::GetCellForForm(const DblMatrix &UB,
if (allowPermutations) {
double angle_tolerance = 2.0;
double length_factor = 1.05;
- UB_list = GetRelatedUBs(UB, angle_tolerance, length_factor);
+ UB_list = GetRelatedUBs(UB, length_factor, angle_tolerance);
} else {
// Get exact form requested and not permutations
UB_list.push_back(UB);
--
GitLab
From 10f86aab3894b01cd5761f07a4d8d78607422813 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 09:08:59 +0100
Subject: [PATCH 140/223] coverity issues - restore ostream format, 1229553-4,
re #13918
---
Framework/DataHandling/src/SaveGSS.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Framework/DataHandling/src/SaveGSS.cpp b/Framework/DataHandling/src/SaveGSS.cpp
index 460f326f800..3eaa53e20d4 100644
--- a/Framework/DataHandling/src/SaveGSS.cpp
+++ b/Framework/DataHandling/src/SaveGSS.cpp
@@ -410,6 +410,7 @@ void writeLogValue(std::ostream &os, const Run &runinfo,
void SaveGSS::writeHeaders(const std::string &format, std::stringstream &os,
double primaryflightpath) const {
const Run &runinfo = inputWS->run();
+ std::ios::fmtflags fflags(os.flags());
// Run number
if (format.compare(SLOG) == 0) {
@@ -483,6 +484,8 @@ void SaveGSS::writeHeaders(const std::string &format, std::stringstream &os,
os << "\n";
}
+ os.flags(fflags);
+
return;
}
@@ -491,10 +494,12 @@ void SaveGSS::writeHeaders(const std::string &format, std::stringstream &os,
*/
inline void writeBankLine(std::stringstream &out, const std::string &bintype,
const int banknum, const size_t datasize) {
+ std::ios::fmtflags fflags(out.flags());
out << "BANK " << std::fixed << std::setprecision(0)
<< banknum // First bank should be 1 for GSAS; this can be changed
<< std::fixed << " " << datasize << std::fixed << " " << datasize
<< std::fixed << " " << bintype;
+ out.flags(fflags);
}
//----------------------------------------------------------------------------------------------
--
GitLab
From bb90099bc2b7f56ff8bddf435172310bba720c43 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 09:28:14 +0100
Subject: [PATCH 141/223] coverity issues - erase in loop, 1238615, re #13918
---
Framework/API/src/NumericAxis.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Framework/API/src/NumericAxis.cpp b/Framework/API/src/NumericAxis.cpp
index 819ad1a5445..d609325a239 100644
--- a/Framework/API/src/NumericAxis.cpp
+++ b/Framework/API/src/NumericAxis.cpp
@@ -191,9 +191,9 @@ std::string NumericAxis::label(const std::size_t &index) const {
auto it = numberLabel.end() - 1;
for (; it != numberLabel.begin(); --it) {
if (*it == '0') {
- numberLabel.erase(it);
+ it = numberLabel.erase(it);
} else if (*it == '.') {
- numberLabel.erase(it);
+ it = numberLabel.erase(it);
break;
} else {
break;
--
GitLab
From 05ff60d89ca7a6520da90c17d0448030a45d8bdb Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 09:42:45 +0100
Subject: [PATCH 142/223] API issues - prevent deref past the end iterator,
1238615, re #13918
---
Framework/Geometry/src/Math/Acomp.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Framework/Geometry/src/Math/Acomp.cpp b/Framework/Geometry/src/Math/Acomp.cpp
index 0788103182b..b84413e8f77 100644
--- a/Framework/Geometry/src/Math/Acomp.cpp
+++ b/Framework/Geometry/src/Math/Acomp.cpp
@@ -981,6 +981,9 @@ It is set on exit (to the EPI)
break;
}
+ if (PIactive.end() == px)
+ continue;
+
EPI.push_back(PIform[*px]);
// remove all minterm that the EPI covered
for (ddx = DNFactive.begin(); ddx != DNFactive.end(); ++ddx)
--
GitLab
From 7ca60d62fc573a7ed7b564d8f19b3b8eb6b34919 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 09:49:10 +0100
Subject: [PATCH 143/223] API issues - prevent deref past the iterator end,
1075705, re #13918
---
Framework/Geometry/src/Math/Acomp.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Framework/Geometry/src/Math/Acomp.cpp b/Framework/Geometry/src/Math/Acomp.cpp
index b84413e8f77..75c5fb5fe2b 100644
--- a/Framework/Geometry/src/Math/Acomp.cpp
+++ b/Framework/Geometry/src/Math/Acomp.cpp
@@ -366,7 +366,8 @@ Assumes that the component is sorted and inserts appropiately.
for (acp = AX.Comp.begin(); acp != AX.Comp.end(); ++acp) {
std::vector<Acomp>::iterator cpt;
cpt = std::lower_bound(Comp.begin(), Comp.end(), *acp);
- if (cpt == Comp.end() || *cpt != *aup) // Only insert if new
+ if (cpt == Comp.end() ||
+ (AX.Units.end() != aup && *cpt != *aup)) // Only insert if new
Comp.insert(cpt, *acp);
}
return;
--
GitLab
From 17b0a894b060c944370f2e6ec39d21a43b5afbbc Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 09:52:37 +0100
Subject: [PATCH 144/223] restore ostream format, 1075545, re #13918
---
Framework/DataObjects/src/PeakColumn.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Framework/DataObjects/src/PeakColumn.cpp b/Framework/DataObjects/src/PeakColumn.cpp
index b3d7e129cc9..f8ffb4af096 100644
--- a/Framework/DataObjects/src/PeakColumn.cpp
+++ b/Framework/DataObjects/src/PeakColumn.cpp
@@ -134,6 +134,7 @@ const std::type_info &PeakColumn::get_pointer_type_info() const {
void PeakColumn::print(size_t index, std::ostream &s) const {
Peak &peak = m_peaks[index];
+ std::ios::fmtflags fflags(s.flags());
if (m_name == "RunNumber")
s << peak.getRunNumber();
else if (m_name == "DetID")
@@ -152,6 +153,7 @@ void PeakColumn::print(size_t index, std::ostream &s) const {
s << std::fixed << std::setprecision(m_hklPrec) << peak.getL();
} else
s << peak.getValueByColName(m_name);
+ s.flags(fflags);
}
//-------------------------------------------------------------------------------------
--
GitLab
From 17cccb7d9cb90799e0ca083296102f5ab492e74a Mon Sep 17 00:00:00 2001
From: Raquel Alvarez Banos <raquel.alvarez.banos@gmail.com>
Date: Mon, 12 Oct 2015 10:36:31 +0100
Subject: [PATCH 145/223] Re #13898 Replace algorithm proxy by normal algorithm
---
.../src/MuonSequentialFitDialog.cpp | 29 ++++++++-----------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/MantidQt/MantidWidgets/src/MuonSequentialFitDialog.cpp b/MantidQt/MantidWidgets/src/MuonSequentialFitDialog.cpp
index 49ba9501a90..2169429a18d 100644
--- a/MantidQt/MantidWidgets/src/MuonSequentialFitDialog.cpp
+++ b/MantidQt/MantidWidgets/src/MuonSequentialFitDialog.cpp
@@ -368,28 +368,23 @@ namespace MantidWidgets
MatrixWorkspace_sptr ws;
- auto load = boost::dynamic_pointer_cast<AlgorithmProxy>( AlgorithmManager::Instance().create("MuonLoad") );
- load->setChild(true);
- load->setRethrows(true);
- load->copyPropertiesFrom(*m_loadAlg);
-
- try
- {
+ try {
+ auto load = AlgorithmManager::Instance().create("MuonLoad");
load->initialize();
-
- load->setPropertyValue( "Filename", fileIt->toStdString() );
- load->setPropertyValue( "OutputWorkspace", "__YouDontSeeMeIAmNinja" ); // Is not used
-
- if ( m_fitPropBrowser->rawData() ) // TODO: or vice verca?
- load->setPropertyValue( "RebinParams", "" );
+ load->setChild(true);
+ load->setRethrows(true);
+ load->updatePropertyValues(*m_loadAlg);
+ load->setPropertyValue("Filename", fileIt->toStdString());
+ load->setPropertyValue("OutputWorkspace", "__YouDontSeeMeIAmNinja");
+ if (m_fitPropBrowser->rawData()) // TODO: or vice verca?
+ load->setPropertyValue("RebinParams", "");
load->execute();
ws = load->getProperty("OutputWorkspace");
- }
- catch(...)
- {
- QMessageBox::critical(this, "Loading failed",
+ } catch (...) {
+ QMessageBox::critical(
+ this, "Loading failed",
"Unable to load one of the files.\n\nCheck log for details");
break;
}
--
GitLab
From 1f88038700a134fea359e919857c9141cb41b2c4 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 10:54:31 +0100
Subject: [PATCH 146/223] uninit members, coverity IDs between 1075353 and
1325889, re #13918
---
Framework/Algorithms/src/AlignDetectors.cpp | 4 +-
.../src/MonitorEfficiencyCorUser.cpp | 3 +-
.../RefinePowderInstrumentParameters.h | 28 +-
.../src/RefinePowderInstrumentParameters.cpp | 258 +++++++++---------
Framework/DataHandling/src/SaveDiffCal.cpp | 3 +-
.../CalculateReflectometryQxQz.h | 3 +-
Framework/LiveData/src/ADARA/ADARAParser.cpp | 2 +-
.../src/ConvertCWSDExpToMomentum.cpp | 3 +-
.../GetNegMuMuonicXRDDialog.h | 21 +-
.../src/GetNegMuMuonicXRDDialog.cpp | 83 +++---
.../src/Muon/ALCInterface.cpp | 1 +
.../src/Tomography/ImageStackPreParams.cpp | 4 +-
12 files changed, 211 insertions(+), 202 deletions(-)
diff --git a/Framework/Algorithms/src/AlignDetectors.cpp b/Framework/Algorithms/src/AlignDetectors.cpp
index de941aea91c..b45eade4460 100644
--- a/Framework/Algorithms/src/AlignDetectors.cpp
+++ b/Framework/Algorithms/src/AlignDetectors.cpp
@@ -151,7 +151,9 @@ const std::string AlignDetectors::summary() const {
}
/// (Empty) Constructor
-AlignDetectors::AlignDetectors() { this->tofToDmap = NULL; }
+AlignDetectors::AlignDetectors() : m_numberOfSpectra(0) {
+ this->tofToDmap = NULL;
+}
/// Destructor
AlignDetectors::~AlignDetectors() { delete this->tofToDmap; }
diff --git a/Framework/Algorithms/src/MonitorEfficiencyCorUser.cpp b/Framework/Algorithms/src/MonitorEfficiencyCorUser.cpp
index 6b04c6163b6..cd05823acf6 100644
--- a/Framework/Algorithms/src/MonitorEfficiencyCorUser.cpp
+++ b/Framework/Algorithms/src/MonitorEfficiencyCorUser.cpp
@@ -19,7 +19,8 @@ DECLARE_ALGORITHM(MonitorEfficiencyCorUser)
//----------------------------------------------------------------------------------------------
/** Constructor
*/
-MonitorEfficiencyCorUser::MonitorEfficiencyCorUser() {}
+MonitorEfficiencyCorUser::MonitorEfficiencyCorUser()
+ : m_inputWS(), m_outputWS(), m_Ei(.0), m_monitorCounts(0) {}
//----------------------------------------------------------------------------------------------
/** Destructor
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters.h b/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters.h
index debe7054a8b..eb79e0eaf89 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/RefinePowderInstrumentParameters.h
@@ -151,43 +151,43 @@ private:
//--------------- Class Variables -------------------
/// Output Workspace containing the dspacing ~ TOF peak positions
- DataObjects::Workspace2D_sptr dataWS;
+ DataObjects::Workspace2D_sptr m_dataWS;
/// Map for all peaks to fit individually
- std::map<std::vector<int>, CurveFitting::BackToBackExponential_sptr> mPeaks;
+ std::map<std::vector<int>, CurveFitting::BackToBackExponential_sptr> m_Peaks;
/// Map for all peaks' error (fitted vs. experimental): [HKL]: Chi^2
- std::map<std::vector<int>, double> mPeakErrors;
+ std::map<std::vector<int>, double> m_PeakErrors;
/// Map for function (instrument parameter)
- std::map<std::string, double> mFuncParameters;
+ std::map<std::string, double> m_FuncParameters;
/// Map to store the original (input) parameters
- std::map<std::string, double> mOrigParameters;
+ std::map<std::string, double> m_OrigParameters;
/// Peak function parameter names
- std::vector<std::string> mPeakFunctionParameterNames;
+ std::vector<std::string> m_PeakFunctionParameterNames;
/// N sets of the peak parameter values for the best N chi2 for MC. It is
/// paired with mPeakFunctionParameterNames
- std::vector<std::pair<double, std::vector<double>>> mBestMCParameters;
+ std::vector<std::pair<double, std::vector<double>>> m_BestMCParameters;
/// N sets of the peak parameter values for the best N chi2 for MC. It is
/// paired with mPeakFunctionParameterNames
- std::vector<std::pair<double, std::vector<double>>> mBestFitParameters;
+ std::vector<std::pair<double, std::vector<double>>> m_BestFitParameters;
/// N sets of the homemade chi2 and gsl chi2
- std::vector<std::pair<double, double>> mBestFitChi2s;
+ std::vector<std::pair<double, double>> m_BestFitChi2s;
/// Best Chi2 ever
- double mBestGSLChi2;
+ double m_BestGSLChi2;
/// Minimum allowed sigma of a peak
- double mMinSigma;
+ double m_MinSigma;
/// Minimum number of fitted peaks for refinement
- size_t mMinNumFittedPeaks;
+ size_t m_MinNumFittedPeaks;
/// Maximum number of data stored
- size_t mMaxNumberStoredParameters;
+ size_t m_MaxNumberStoredParameters;
/// Modelling function
- CurveFitting::ThermalNeutronDtoTOFFunction_sptr mFunction;
+ CurveFitting::ThermalNeutronDtoTOFFunction_sptr m_Function;
};
/** Formular for linear iterpolation: X = [(xf-x0)*Y - (xf*y0-x0*yf)]/(yf-y0)
diff --git a/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp b/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp
index f47bdf5eac1..36283c03f21 100644
--- a/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp
+++ b/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp
@@ -44,7 +44,9 @@ DECLARE_ALGORITHM(RefinePowderInstrumentParameters)
//----------------------------------------------------------------------------------------------
/** Constructor
*/
-RefinePowderInstrumentParameters::RefinePowderInstrumentParameters() {}
+RefinePowderInstrumentParameters::RefinePowderInstrumentParameters()
+ : m_BestGSLChi2(0.0), m_MinSigma(0.0), m_MinNumFittedm_Peaks(0),
+ m_MaxNumberStoredParameters(0) {}
//----------------------------------------------------------------------------------------------
/** Destructor
@@ -87,7 +89,7 @@ void RefinePowderInstrumentParameters::init() {
// Lower limit on number of peaks for fitting
declareProperty(
- "MinNumberFittedPeaks", 5,
+ "MinNumberFittedm_Peaks", 5,
"Minimum number of fitted peaks for refining instrument parameters.");
// Refinement algorithm
@@ -141,21 +143,21 @@ void RefinePowderInstrumentParameters::exec() {
DataObjects::TableWorkspace_sptr parameterWS =
this->getProperty("InstrumentParameterWorkspace");
- mMinSigma = getProperty("MinSigma");
+ m_MinSigma = getProperty("MinSigma");
- int tempint = getProperty("MinNumberFittedPeaks");
+ int tempint = getProperty("MinNumberFittedm_Peaks");
if (tempint <= 1) {
- g_log.error() << "Input MinNumberFittedPeaks = " << tempint
+ g_log.error() << "Input MinNumberFittedm_Peaks = " << tempint
<< " is too small. " << endl;
- throw std::invalid_argument("Input MinNumberFittedPeaks is too small.");
+ throw std::invalid_argument("Input MinNumberFittedm_Peaks is too small.");
}
- mMinNumFittedPeaks = static_cast<size_t>(tempint);
+ m_MinNumFittedm_Peaks = static_cast<size_t>(tempint);
tempint = getProperty("NumberBestFitRecorded");
if (tempint <= 0)
throw runtime_error(
"Input NumberBestFitRecorded cannot be less and equal to 0. ");
- mMaxNumberStoredParameters = static_cast<size_t>(tempint);
+ m_MaxNumberStoredParameters = static_cast<size_t>(tempint);
string algoption = getProperty("RefinementAlgorithm");
if (algoption.compare("DirectFit") == 0)
@@ -167,15 +169,15 @@ void RefinePowderInstrumentParameters::exec() {
"MonteCarlo are not supported.");
// 2. Parse input table workspace
- genPeaksFromTable(peakWS);
- importParametersFromTable(parameterWS, mFuncParameters);
- mOrigParameters = mFuncParameters;
+ genm_PeaksFromTable(peakWS);
+ importParametersFromTable(parameterWS, m_FuncParameters);
+ m_OrigParameters = m_FuncParameters;
// 3. Generate a cener workspace as function of d-spacing.
bool usemc = false;
if (refinealgorithm == MonteCarlo)
usemc = true;
- genPeakCentersWorkspace(usemc, mMaxNumberStoredParameters);
+ genPeakCentersWorkspace(usemc, m_MaxNumberStoredParameters);
// 4. Fit instrument geometry function
stringstream errss;
@@ -204,7 +206,7 @@ void RefinePowderInstrumentParameters::exec() {
}
// 5. Set output workspace
- this->setProperty("OutputWorkspace", dataWS);
+ this->setProperty("OutputWorkspace", m_dataWS);
// 6. Output new instrument parameters
DataObjects::TableWorkspace_sptr fitparamws =
@@ -224,17 +226,17 @@ void RefinePowderInstrumentParameters::fitInstrumentParameters() {
// 1. Initialize the fitting function
CurveFitting::ThermalNeutronDtoTOFFunction rawfunc;
- mFunction =
+ m_Function =
boost::make_shared<CurveFitting::ThermalNeutronDtoTOFFunction>(rawfunc);
- mFunction->initialize();
+ m_Function->initialize();
- API::FunctionDomain1DVector domain(dataWS->readX(1));
+ API::FunctionDomain1DVector domain(m_dataWS->readX(1));
API::FunctionValues values(domain);
- const MantidVec &rawY = dataWS->readY(0);
- const MantidVec &rawE = dataWS->readE(0);
+ const MantidVec &rawY = m_dataWS->readY(0);
+ const MantidVec &rawE = m_dataWS->readE(0);
// 2. Set up parameters values
- std::vector<std::string> funparamnames = mFunction->getParameterNames();
+ std::vector<std::string> funparamnames = m_Function->getParameterNames();
std::vector<std::string> paramtofit = getProperty("ParametersToFit");
std::sort(paramtofit.begin(), paramtofit.end());
@@ -244,22 +246,22 @@ void RefinePowderInstrumentParameters::fitInstrumentParameters() {
std::map<std::string, double>::iterator paramiter;
for (size_t i = 0; i < funparamnames.size(); ++i) {
string parname = funparamnames[i];
- paramiter = mFuncParameters.find(parname);
- if (paramiter == mFuncParameters.end()) {
+ paramiter = m_FuncParameters.find(parname);
+ if (paramiter == m_FuncParameters.end()) {
// Not found and thus skip
continue;
}
double parvalue = paramiter->second;
- mFunction->setParameter(parname, parvalue);
+ m_Function->setParameter(parname, parvalue);
msgss << setw(10) << parname << " = " << parvalue << endl;
}
cout << msgss.str();
// 2b. Calculate the statistic of the starting values
- double gslchi2 = calculateFunctionStatistic(mFunction, dataWS, 0);
+ double gslchi2 = calculateFunctionStatistic(m_Function, m_dataWS, 0);
double homchi2 =
- calculateD2TOFFunction(mFunction, domain, values, rawY, rawE);
+ calculateD2TOFFunction(m_Function, domain, values, rawY, rawE);
cout << "Fit Starting Value: Chi^2 (GSL) = " << gslchi2
<< ", Chi2^2 (Home) = " << homchi2 << endl;
@@ -271,9 +273,9 @@ void RefinePowderInstrumentParameters::fitInstrumentParameters() {
vsiter = std::find(paramtofit.begin(), paramtofit.end(), parname);
if (vsiter == paramtofit.end())
- mFunction->fix(i);
+ m_Function->fix(i);
else
- mFunction->unfix(i);
+ m_Function->unfix(i);
}
// 4. Select minimizer. Use Simplex for more than 1 parameters to fit.
@@ -285,13 +287,13 @@ void RefinePowderInstrumentParameters::fitInstrumentParameters() {
g_log.information() << "Fit use minizer: " << minimizer << endl;
// 5. Create and setup fit algorithm
- g_log.information() << "Fit instrument geometry: " << mFunction->asString()
+ g_log.information() << "Fit instrument geometry: " << m_Function->asString()
<< std::endl;
stringstream outss;
- for (size_t i = 0; i < dataWS->readX(0).size(); ++i)
- outss << dataWS->readX(0)[i] << "\t\t" << dataWS->readY(0)[i] << "\t\t"
- << dataWS->readE(0)[i] << endl;
+ for (size_t i = 0; i < m_dataWS->readX(0).size(); ++i)
+ outss << m_dataWS->readX(0)[i] << "\t\t" << m_dataWS->readY(0)[i] << "\t\t"
+ << m_dataWS->readE(0)[i] << endl;
cout << "Input Peak Position Workspace To Fit: " << endl
<< outss.str() << endl;
@@ -299,8 +301,8 @@ void RefinePowderInstrumentParameters::fitInstrumentParameters() {
fitalg->initialize();
fitalg->setProperty("Function",
- boost::dynamic_pointer_cast<API::IFunction>(mFunction));
- fitalg->setProperty("InputWorkspace", dataWS);
+ boost::dynamic_pointer_cast<API::IFunction>(m_Function));
+ fitalg->setProperty("InputWorkspace", m_dataWS);
fitalg->setProperty("WorkspaceIndex", 0);
fitalg->setProperty("Minimizer", minimizer);
fitalg->setProperty("CostFunction", "Least squares");
@@ -323,31 +325,31 @@ void RefinePowderInstrumentParameters::fitInstrumentParameters() {
API::IFunction_sptr fitfunc = fitalg->getProperty("Function");
// 4. Set the output data (model and diff)
- mFunction->function(domain, values);
+ m_Function->function(domain, values);
for (size_t i = 0; i < domain.size(); ++i) {
- dataWS->dataY(1)[i] = values[i];
- dataWS->dataY(2)[i] = dataWS->readY(0)[i] - values[i];
+ m_dataWS->dataY(1)[i] = values[i];
+ m_dataWS->dataY(2)[i] = m_dataWS->readY(0)[i] - values[i];
}
double selfchi2 =
- calculateD2TOFFunction(mFunction, domain, values, rawY, rawE);
+ calculateD2TOFFunction(m_Function, domain, values, rawY, rawE);
cout << "Homemade Chi^2 = " << selfchi2 << endl;
// 5. Update fitted parameters
for (size_t i = 0; i < funparamnames.size(); ++i) {
std::string parname = funparamnames[i];
double parvalue = fitfunc->getParameter(parname);
- mFuncParameters[parname] = parvalue;
+ m_FuncParameters[parname] = parvalue;
}
// 6. Pretty screen output
stringstream dbss;
dbss << "************ Fit Parameter Result *************" << std::endl;
- for (paramiter = mFuncParameters.begin(); paramiter != mFuncParameters.end();
+ for (paramiter = m_FuncParameters.begin(); paramiter != m_FuncParameters.end();
++paramiter) {
std::string parname = paramiter->first;
- double inpparvalue = mOrigParameters[parname];
+ double inpparvalue = m_OrigParameters[parname];
double parvalue = paramiter->second;
dbss << setw(20) << parname << " = " << setw(15) << setprecision(6)
<< parvalue << "\t\tFrom " << setw(15) << setprecision(6)
@@ -359,18 +361,18 @@ void RefinePowderInstrumentParameters::fitInstrumentParameters() {
// 7. Play with Zscore: template<typename TYPE>
// std::vector<double> getZscore(const std::vector<TYPE>& data, const bool
// sorted=false);
- vector<double> z0 = Kernel::getZscore(dataWS->readY(0));
- vector<double> z1 = Kernel::getZscore(dataWS->readY(1));
- vector<double> z2 = Kernel::getZscore(dataWS->readY(2));
+ vector<double> z0 = Kernel::getZscore(m_dataWS->readY(0));
+ vector<double> z1 = Kernel::getZscore(m_dataWS->readY(1));
+ vector<double> z2 = Kernel::getZscore(m_dataWS->readY(2));
stringstream zss;
zss << setw(20) << "d_h" << setw(20) << "Z DataY" << setw(20) << "Z ModelY"
<< setw(20) << "Z DiffY" << setw(20) << "DiffY" << endl;
for (size_t i = 0; i < z0.size(); ++i) {
- double d_h = dataWS->readX(0)[i];
+ double d_h = m_dataWS->readX(0)[i];
double zdatay = z0[i];
double zmodely = z1[i];
double zdiffy = z2[i];
- double diffy = dataWS->readY(2)[i];
+ double diffy = m_dataWS->readY(2)[i];
zss << setw(20) << d_h << setw(20) << zdatay << setw(20) << zmodely
<< setw(20) << zdiffy << setw(20) << diffy << endl;
}
@@ -389,7 +391,7 @@ bool RefinePowderInstrumentParameters::fitFunction(IFunction_sptr func,
fitalg->setProperty("Function",
boost::dynamic_pointer_cast<API::IFunction>(func));
- fitalg->setProperty("InputWorkspace", dataWS);
+ fitalg->setProperty("InputWorkspace", m_dataWS);
fitalg->setProperty("WorkspaceIndex", 0);
fitalg->setProperty("Minimizer", "Simplex");
fitalg->setProperty("CostFunction", "Least squares");
@@ -459,16 +461,16 @@ double RefinePowderInstrumentParameters::calculateFunctionStatistic(
void RefinePowderInstrumentParameters::refineInstrumentParametersMC(
TableWorkspace_sptr parameterWS, bool fit2) {
// 1. Get function's parameter names
- getD2TOFFuncParamNames(mPeakFunctionParameterNames);
+ getD2TOFFuncParamNames(m_PeakFunctionParameterNames);
// 2. Parse parameter (table) workspace
vector<double> stepsizes, lowerbounds, upperbounds;
- importMonteCarloParametersFromTable(parameterWS, mPeakFunctionParameterNames,
+ importMonteCarloParametersFromTable(parameterWS, m_PeakFunctionParameterNames,
stepsizes, lowerbounds, upperbounds);
stringstream dbss;
- for (size_t i = 0; i < mPeakFunctionParameterNames.size(); ++i) {
- dbss << setw(20) << mPeakFunctionParameterNames[i] << ": Min = " << setw(15)
+ for (size_t i = 0; i < m_PeakFunctionParameterNames.size(); ++i) {
+ dbss << setw(20) << m_PeakFunctionParameterNames[i] << ": Min = " << setw(15)
<< setprecision(6) << lowerbounds[i] << ", Max = " << setw(15)
<< setprecision(6) << upperbounds[i] << ", Step Size = " << setw(15)
<< setprecision(6) << stepsizes[i] << endl;
@@ -491,33 +493,33 @@ void RefinePowderInstrumentParameters::refineInstrumentParametersMC(
double stepsizescalefactor = 1.1;
// 5. Monte Carlo simulation
- doParameterSpaceRandomWalk(mPeakFunctionParameterNames, lowerbounds,
+ doParameterSpaceRandomWalk(m_PeakFunctionParameterNames, lowerbounds,
upperbounds, stepsizes, maxsteps,
stepsizescalefactor, fit2);
// 6. Record the result
- const MantidVec &X = dataWS->readX(0);
- const MantidVec &Y = dataWS->readY(0);
- const MantidVec &E = dataWS->readE(0);
+ const MantidVec &X = m_dataWS->readX(0);
+ const MantidVec &Y = m_dataWS->readY(0);
+ const MantidVec &E = m_dataWS->readE(0);
FunctionDomain1DVector domain(X);
FunctionValues values(domain);
- for (size_t i = 0; i < mBestFitParameters.size(); ++i) {
+ for (size_t i = 0; i < m_BestFitParameters.size(); ++i) {
// a. Set the function with the
- for (size_t j = 0; j < mPeakFunctionParameterNames.size(); ++j) {
- mFunction->setParameter(mPeakFunctionParameterNames[j],
- mBestFitParameters[i].second[j]);
+ for (size_t j = 0; j < m_PeakFunctionParameterNames.size(); ++j) {
+ m_Function->setParameter(m_PeakFunctionParameterNames[j],
+ m_BestFitParameters[i].second[j]);
}
// b. Calculate
- calculateD2TOFFunction(mFunction, domain, values, Y, E);
+ calculateD2TOFFunction(m_Function, domain, values, Y, E);
vector<double> vec_n;
- calculateThermalNeutronSpecial(mFunction, X, vec_n);
+ calculateThermalNeutronSpecial(m_Function, X, vec_n);
// c. Put the data to output workspace
- MantidVec &newY = dataWS->dataY(3 * i + 1);
- MantidVec &newD = dataWS->dataY(3 * i + 2);
- MantidVec &newN = dataWS->dataY(3 * i + 3);
+ MantidVec &newY = m_dataWS->dataY(3 * i + 1);
+ MantidVec &newD = m_dataWS->dataY(3 * i + 2);
+ MantidVec &newN = m_dataWS->dataY(3 * i + 3);
for (size_t j = 0; j < newY.size(); ++j) {
newY[j] = values[j];
newD[j] = Y[j] - values[j];
@@ -545,30 +547,30 @@ void RefinePowderInstrumentParameters::doParameterSpaceRandomWalk(
<< setw(20) << "Upper Boundary" << setw(20) << "Step Size" << endl;
for (size_t i = 0; i < parnames.size(); ++i)
inpinfo << setw(20) << parnames[i] << setw(20) <<
- mFuncParameters[parnames[i]]
+ m_FuncParameters[parnames[i]]
<< setw(20) << lowerbounds[i]
<< setw(20) << upperbounds[i] << setw(20) << stepsizes[i] << endl;
cout << inpinfo.str();
------------*/
- // 1. Set up starting values, esp. to mFunction
+ // 1. Set up starting values, esp. to m_Function
size_t numparameters = parnames.size();
vector<double> paramvalues;
for (size_t i = 0; i < numparameters; ++i) {
string parname = parnames[i];
- double parvalue = mFuncParameters[parname];
+ double parvalue = m_FuncParameters[parname];
paramvalues.push_back(parvalue);
- mFunction->setParameter(parname, parvalue);
+ m_Function->setParameter(parname, parvalue);
}
// Calcualte the function's initial statistic
- mBestGSLChi2 = calculateFunctionStatistic(mFunction, dataWS, 0);
- cout << "Function with starting values has Chi2 = " << mBestGSLChi2
+ m_BestGSLChi2 = calculateFunctionStatistic(m_Function, m_dataWS, 0);
+ cout << "Function with starting values has Chi2 = " << m_BestGSLChi2
<< " (GSL L.M) " << endl;
- const MantidVec &X = dataWS->readX(0);
- const MantidVec &rawY = dataWS->readY(0);
- const MantidVec &rawE = dataWS->readE(0);
+ const MantidVec &X = m_dataWS->readX(0);
+ const MantidVec &rawY = m_dataWS->readY(0);
+ const MantidVec &rawE = m_dataWS->readE(0);
FunctionDomain1DVector domain(X);
FunctionValues values(domain);
@@ -620,7 +622,7 @@ void RefinePowderInstrumentParameters::doParameterSpaceRandomWalk(
// 4. Do MC loops
double curchi2 =
- calculateD2TOFFunction(mFunction, domain, values, rawY, rawE);
+ calculateD2TOFFunction(m_Function, domain, values, rawY, rawE);
g_log.notice() << "Monte Carlo Random Walk Starting Chi^2 = " << curchi2
<< endl;
@@ -653,7 +655,7 @@ void RefinePowderInstrumentParameters::doParameterSpaceRandomWalk(
}
try {
- mFunction->setParameter(parnames[paramindex], newvalue);
+ m_Function->setParameter(parnames[paramindex], newvalue);
} catch (runtime_error &) {
stringstream errss;
errss << "New Value = " << newvalue
@@ -666,13 +668,13 @@ void RefinePowderInstrumentParameters::doParameterSpaceRandomWalk(
// b. Calcualte the new
double newchi2 =
- calculateD2TOFFunction(mFunction, domain, values, rawY, rawE);
+ calculateD2TOFFunction(m_Function, domain, values, rawY, rawE);
// Optionally fit
if (fit2) {
// i. Copy the parameters
for (size_t i = 0; i < numparameters; ++i) {
- double parvalue = mFunction->getParameter(i);
+ double parvalue = m_Function->getParameter(i);
func4fit->setParameter(i, parvalue);
}
@@ -685,8 +687,8 @@ void RefinePowderInstrumentParameters::doParameterSpaceRandomWalk(
double homchi2 =
calculateD2TOFFunction(func4fit, domain, values, rawY, rawE);
- if (gslchi2 < mBestGSLChi2)
- mBestGSLChi2 = gslchi2;
+ if (gslchi2 < m_BestGSLChi2)
+ m_BestGSLChi2 = gslchi2;
// iv. Archive
vector<double> newparvalues;
@@ -694,15 +696,15 @@ void RefinePowderInstrumentParameters::doParameterSpaceRandomWalk(
double parvalue = func4fit->getParameter(i);
newparvalues.push_back(parvalue);
}
- mBestFitParameters.push_back(make_pair(homchi2, newparvalues));
- mBestFitChi2s.push_back(make_pair(homchi2, gslchi2));
+ m_BestFitParameters.push_back(make_pair(homchi2, newparvalues));
+ m_BestFitChi2s.push_back(make_pair(homchi2, gslchi2));
// v. Sort and keep in size
- sort(mBestFitParameters.begin(), mBestFitParameters.end());
- sort(mBestFitChi2s.begin(), mBestFitChi2s.end());
- if (mBestFitParameters.size() > mMaxNumberStoredParameters) {
- mBestFitParameters.pop_back();
- mBestFitChi2s.pop_back();
+ sort(m_BestFitParameters.begin(), m_BestFitParameters.end());
+ sort(m_BestFitChi2s.begin(), m_BestFitChi2s.end());
+ if (m_BestFitParameters.size() > m_MaxNumberStoredParameters) {
+ m_BestFitParameters.pop_back();
+ m_BestFitChi2s.pop_back();
}
// cout << "\tHomemade Chi^2 = " << homchi2 << endl;
@@ -749,12 +751,12 @@ void RefinePowderInstrumentParameters::doParameterSpaceRandomWalk(
// ii. Add the new values to vector
vector<double> parametervalues = paramvalues;
- mBestMCParameters.push_back(make_pair(newchi2, parametervalues));
+ m_BestMCParameters.push_back(make_pair(newchi2, parametervalues));
// iii. Sort and delete the last if necessary
- sort(mBestMCParameters.begin(), mBestMCParameters.end());
- if (mBestMCParameters.size() > mMaxNumberStoredParameters)
- mBestMCParameters.pop_back();
+ sort(m_BestMCParameters.begin(), m_BestMCParameters.end());
+ if (m_BestMCParameters.size() > m_MaxNumberStoredParameters)
+ m_BestMCParameters.pop_back();
// iv. Update chi2 and ...
curchi2 = newchi2;
@@ -770,24 +772,24 @@ void RefinePowderInstrumentParameters::doParameterSpaceRandomWalk(
// 3. Debug output
stringstream mcresult;
- mcresult << "Monte Carlo Result for " << mBestMCParameters.size()
+ mcresult << "Monte Carlo Result for " << m_BestMCParameters.size()
<< " Best Results" << endl;
mcresult << "Number of acceptance = " << numacceptance << ", out of "
<< maxsteps << " MC steps."
<< "Accept ratio = "
<< static_cast<double>(numacceptance) / static_cast<double>(maxsteps)
<< endl;
- mcresult << "Best " << mBestMCParameters.size()
+ mcresult << "Best " << m_BestMCParameters.size()
<< " Monte Carlo (no fit) results: " << endl;
- for (size_t i = 0; i < mBestMCParameters.size(); ++i) {
- mcresult << setw(3) << i << ": Chi^2 = " << mBestMCParameters[i].first
+ for (size_t i = 0; i < m_BestMCParameters.size(); ++i) {
+ mcresult << setw(3) << i << ": Chi^2 = " << m_BestMCParameters[i].first
<< endl;
}
- mcresult << "Best " << mBestMCParameters.size()
- << " fitting results. Best Chi^2 = " << mBestGSLChi2 << endl;
- for (size_t i = 0; i < mBestFitParameters.size(); ++i) {
- mcresult << setw(3) << i << ": Chi^2 = " << mBestFitParameters[i].first
- << ", GSL Chi^2 = " << mBestFitChi2s[i].second << endl;
+ mcresult << "Best " << m_BestMCParameters.size()
+ << " fitting results. Best Chi^2 = " << m_BestGSLChi2 << endl;
+ for (size_t i = 0; i < m_BestFitParameters.size(); ++i) {
+ mcresult << setw(3) << i << ": Chi^2 = " << m_BestFitParameters[i].first
+ << ", GSL Chi^2 = " << m_BestFitChi2s[i].second << endl;
}
g_log.notice() << mcresult.str();
@@ -806,7 +808,7 @@ void RefinePowderInstrumentParameters::getD2TOFFuncParamNames(
d2toffunc.initialize();
std::vector<std::string> funparamnames = d2toffunc.getParameterNames();
- mFunction = boost::make_shared<ThermalNeutronDtoTOFFunction>(d2toffunc);
+ m_Function = boost::make_shared<ThermalNeutronDtoTOFFunction>(d2toffunc);
// 3. Copy
parnames = funparamnames;
@@ -821,14 +823,14 @@ double RefinePowderInstrumentParameters::calculateD2TOFFunction(
const MantidVec &rawY, const MantidVec &rawE) {
// 1. Check validity
if (!func) {
- throw std::runtime_error("mFunction has not been initialized!");
+ throw std::runtime_error("m_Function has not been initialized!");
} else {
/*
- vector<string> parnames = mFunction->getParameterNames();
+ vector<string> parnames = m_Function->getParameterNames();
for (size_t i = 0; i < parnames.size(); ++i)
{
cout << "DBx1125 " << parnames[i] << " = " <<
- mFunction->getParameter(parnames[i]) << endl;
+ m_Function->getParameter(parnames[i]) << endl;
}
*/
;
@@ -858,9 +860,9 @@ double RefinePowderInstrumentParameters::calculateD2TOFFunction(
//------------------------------- Processing Inputs
//----------------------------------------
/** Genearte peaks from input workspace
- * Peaks are stored in a map. (HKL) is the key
+ * m_Peaks are stored in a map. (HKL) is the key
*/
-void RefinePowderInstrumentParameters::genPeaksFromTable(
+void RefinePowderInstrumentParameters::genm_PeaksFromTable(
DataObjects::TableWorkspace_sptr peakparamws) {
// 1. Check and clear input and output
if (!peakparamws) {
@@ -870,7 +872,7 @@ void RefinePowderInstrumentParameters::genPeaksFromTable(
"Invalid input table workspace for peak parameters");
}
- mPeaks.clear();
+ mm_Peaks.clear();
// 2. Parse table workspace rows to generate peaks
vector<string> colnames = peakparamws->getColumnNames();
@@ -937,11 +939,11 @@ void RefinePowderInstrumentParameters::genPeaksFromTable(
hkl.push_back(k);
hkl.push_back(l);
- mPeaks.insert(std::make_pair(hkl, newpeakptr));
+ mm_Peaks.insert(std::make_pair(hkl, newpeakptr));
- mPeakErrors.insert(make_pair(hkl, chi2));
+ m_PeakErrors.insert(make_pair(hkl, chi2));
- g_log.information() << "[GeneratePeaks] Peak " << ir << " HKL = [" << hkl[0]
+ g_log.information() << "[Generatem_Peaks] Peak " << ir << " HKL = [" << hkl[0]
<< ", " << hkl[1] << ", " << hkl[2]
<< "], Input Center = " << setw(10) << setprecision(6)
<< newpeak.centre() << endl;
@@ -1115,17 +1117,17 @@ hkl, double lattice)
/** Calcualte value n for thermal neutron peak profile
*/
void RefinePowderInstrumentParameters::calculateThermalNeutronSpecial(
- IFunction_sptr mFunction, vector<double> vec_d, vector<double> &vec_n) {
- if (mFunction->name().compare("ThermalNeutronDtoTOFFunction") != 0) {
- g_log.warning() << "Function (" << mFunction->name()
+ IFunction_sptr m_Function, vector<double> vec_d, vector<double> &vec_n) {
+ if (m_Function->name().compare("ThermalNeutronDtoTOFFunction") != 0) {
+ g_log.warning() << "Function (" << m_Function->name()
<< " is not ThermalNeutronDtoTOFFunction. And it is not "
"required to calculate n." << endl;
for (size_t i = 0; i < vec_d.size(); ++i)
vec_n.push_back(0);
}
- double width = mFunction->getParameter("Width");
- double tcross = mFunction->getParameter("Tcross");
+ double width = m_Function->getParameter("Width");
+ double tcross = m_Function->getParameter("Tcross");
for (size_t i = 0; i < vec_d.size(); ++i) {
double dh = vec_d[i];
@@ -1146,7 +1148,7 @@ void RefinePowderInstrumentParameters::calculateThermalNeutronSpecial(
void RefinePowderInstrumentParameters::genPeakCentersWorkspace(
bool montecarlo, size_t numbestfit) {
// 1. Collect values in a vector for sorting
- double lattice = mFuncParameters["LatticeConstant"];
+ double lattice = m_FuncParameters["LatticeConstant"];
if (lattice < 1.0E-5) {
std::stringstream errmsg;
errmsg << "Input Lattice constant = " << lattice
@@ -1174,12 +1176,12 @@ void RefinePowderInstrumentParameters::genPeakCentersWorkspace(
Geometry::UnitCell unitcell(lattice, lattice, lattice, 90.0, 90.0, 90.0);
- for (peakiter = mPeaks.begin(); peakiter != mPeaks.end(); ++peakiter) {
+ for (peakiter = mm_Peaks.begin(); peakiter != mm_Peaks.end(); ++peakiter) {
vector<int> hkl = peakiter->first;
BackToBackExponential_sptr peak = peakiter->second;
double sigma = peak->getParameter("S");
- if (sigma < mMinSigma) {
+ if (sigma < m_MinSigma) {
g_log.information() << "Peak (" << hkl[0] << ", " << hkl[1] << ", "
<< hkl[2]
<< ") has unphysically small Sigma = " << sigma
@@ -1220,18 +1222,18 @@ void RefinePowderInstrumentParameters::genPeakCentersWorkspace(
nspec = 1 + 3;
}
- dataWS = boost::dynamic_pointer_cast<DataObjects::Workspace2D>(
+ m_dataWS = boost::dynamic_pointer_cast<DataObjects::Workspace2D>(
API::WorkspaceFactory::Instance().create("Workspace2D", nspec, size,
size));
- dataWS->getAxis(0)->setUnit("dSpacing");
+ m_dataWS->getAxis(0)->setUnit("dSpacing");
// 4. Put data to output workspace
for (size_t i = 0; i < peakcenters.size(); ++i) {
for (size_t j = 0; j < nspec; ++j) {
- dataWS->dataX(j)[i] = peakcenters[i].first;
+ m_dataWS->dataX(j)[i] = peakcenters[i].first;
}
- dataWS->dataY(0)[i] = peakcenters[i].second.first;
- dataWS->dataE(0)[i] = peakcenters[i].second.second;
+ m_dataWS->dataY(0)[i] = peakcenters[i].second.first;
+ m_dataWS->dataE(0)[i] = peakcenters[i].second.second;
}
return;
@@ -1248,18 +1250,18 @@ RefinePowderInstrumentParameters::genMCResultTable() {
tablews->addColumn("double", "Chi2");
tablews->addColumn("double", "GSLChi2");
- for (size_t i = 0; i < mPeakFunctionParameterNames.size(); ++i) {
- tablews->addColumn("double", mPeakFunctionParameterNames[i]);
+ for (size_t i = 0; i < m_PeakFunctionParameterNames.size(); ++i) {
+ tablews->addColumn("double", m_PeakFunctionParameterNames[i]);
}
// 2. Put values in
- for (size_t ib = 0; ib < mBestFitParameters.size(); ++ib) {
+ for (size_t ib = 0; ib < m_BestFitParameters.size(); ++ib) {
TableRow newrow = tablews->appendRow();
- double chi2 = mBestFitParameters[ib].first;
- double gslchi2 = mBestFitChi2s[ib].second;
+ double chi2 = m_BestFitParameters[ib].first;
+ double gslchi2 = m_BestFitChi2s[ib].second;
newrow << chi2 << gslchi2;
- for (size_t ip = 0; ip < mPeakFunctionParameterNames.size(); ++ip) {
- double tempdbl = mBestFitParameters[ib].second[ip];
+ for (size_t ip = 0; ip < m_PeakFunctionParameterNames.size(); ++ip) {
+ double tempdbl = m_BestFitParameters[ib].second[ip];
newrow << tempdbl;
}
} // ENDFOR 1 Best Answer
@@ -1288,7 +1290,7 @@ RefinePowderInstrumentParameters::genOutputInstrumentParameterTable() {
std::map<std::string, double>::iterator pariter;
- for (pariter = mFuncParameters.begin(); pariter != mFuncParameters.end();
+ for (pariter = m_FuncParameters.begin(); pariter != m_FuncParameters.end();
++pariter) {
API::TableRow newrow = newtablews->appendRow();
std::string parname = pariter->first;
diff --git a/Framework/DataHandling/src/SaveDiffCal.cpp b/Framework/DataHandling/src/SaveDiffCal.cpp
index 66259ba0ad2..96c2cbe0774 100644
--- a/Framework/DataHandling/src/SaveDiffCal.cpp
+++ b/Framework/DataHandling/src/SaveDiffCal.cpp
@@ -30,7 +30,8 @@ DECLARE_ALGORITHM(SaveDiffCal)
//----------------------------------------------------------------------------------------------
/** Constructor
*/
-SaveDiffCal::SaveDiffCal() {}
+SaveDiffCal::SaveDiffCal()
+ : m_numValues(0), m_calibrationWS(), m_detidToIndex() {}
//----------------------------------------------------------------------------------------------
/** Destructor
diff --git a/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryQxQz.h b/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryQxQz.h
index 2656b0085f6..7256f47e3bb 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryQxQz.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryQxQz.h
@@ -22,7 +22,8 @@ public:
/**
Constructor
*/
- CalculateReflectometryQxQz() : m_dirQx(0.0), m_dirQz(0.0) {}
+ CalculateReflectometryQxQz()
+ : m_cos_theta_i(0.0), m_sin_theta_i(0.0), m_dirQx(0.0), m_dirQz(0.0) {}
/**
Setter for the incident theta value require for the calculation. Internally
diff --git a/Framework/LiveData/src/ADARA/ADARAParser.cpp b/Framework/LiveData/src/ADARA/ADARAParser.cpp
index 8fe1652ecb6..1fe48e4b00b 100644
--- a/Framework/LiveData/src/ADARA/ADARAParser.cpp
+++ b/Framework/LiveData/src/ADARA/ADARAParser.cpp
@@ -9,7 +9,7 @@ using namespace ADARA;
Parser::Parser(unsigned int initial_buffer_size, unsigned int max_pkt_size)
: m_size(initial_buffer_size), m_max_size(max_pkt_size), m_len(0),
- m_restart_offset(0), m_oversize_len(0) {
+ m_restart_offset(0), m_oversize_len(0), m_oversize_offset(0) {
m_buffer = new uint8_t[initial_buffer_size];
m_discarded_packets.clear();
}
diff --git a/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp b/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp
index 70eabbe72e4..9ac61977a66 100644
--- a/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp
+++ b/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp
@@ -24,7 +24,8 @@ DECLARE_ALGORITHM(ConvertCWSDExpToMomentum)
/** Constructor
*/
ConvertCWSDExpToMomentum::ConvertCWSDExpToMomentum()
- : m_iColFilename(2), m_iColStartDetID(3), m_setQRange(true) {}
+ : m_iColFilename(2), m_iColStartDetID(3), m_setQRange(true),
+ m_isBaseName(false) {}
//----------------------------------------------------------------------------------------------
/** Destructor
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/GetNegMuMuonicXRDDialog.h b/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/GetNegMuMuonicXRDDialog.h
index 85fa109a451..4d375e8cdc1 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/GetNegMuMuonicXRDDialog.h
+++ b/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/GetNegMuMuonicXRDDialog.h
@@ -36,19 +36,20 @@ namespace CustomDialogs {
class GetNegMuMuonicXRDDialog : public API::AlgorithmDialog {
Q_OBJECT
- public:
+public:
/// Constructor
GetNegMuMuonicXRDDialog(QWidget *parent = 0);
- private:
+private:
/// Periodic Table widget used for selection of elements property
- PeriodicTableWidget *periodicTable;
+ PeriodicTableWidget *m_periodicTable;
/// QLineEdit used for input of y-position property
- QLineEdit *yPosition;
+ QLineEdit *m_yPosition;
/// QLineEdit used for input of GroupWorkspaceSpace
- QLineEdit *groupWorkspaceNameInput;
- //Check box for showing or hiding the Legend for PeriodicTableWidget
- QCheckBox *showLegendCheck;
+ QLineEdit *m_groupWorkspaceNameInput;
+ // Check box for showing or hiding the Legend for PeriodicTableWidget
+ QCheckBox *m_showLegendCheck;
+
/// Validate that the input is not empty before running algorithm
bool validateDialogInput(QString input);
/** Enables a the buttons corresponding to the elements
@@ -56,15 +57,15 @@ class GetNegMuMuonicXRDDialog : public API::AlgorithmDialog {
*/
void enableElementsForGetNegMuMuonicXRD();
- private slots:
+private slots:
/// When the "Run" button is clicked, the algorithm is executed with inputs
void runClicked();
void showLegend();
- protected:
+protected:
// create the initial layout
void initLayout();
- signals:
+signals:
/// signal emitted when validateDialogInput passes
void validInput();
};
diff --git a/MantidQt/CustomDialogs/src/GetNegMuMuonicXRDDialog.cpp b/MantidQt/CustomDialogs/src/GetNegMuMuonicXRDDialog.cpp
index 963da0325e8..463fae15e31 100644
--- a/MantidQt/CustomDialogs/src/GetNegMuMuonicXRDDialog.cpp
+++ b/MantidQt/CustomDialogs/src/GetNegMuMuonicXRDDialog.cpp
@@ -7,7 +7,6 @@
#include <QValidator>
#include <QFormLayout>
-
namespace MantidQt {
namespace CustomDialogs {
DECLARE_DIALOG(GetNegMuMuonicXRDDialog)
@@ -18,7 +17,8 @@ DECLARE_DIALOG(GetNegMuMuonicXRDDialog)
*/
GetNegMuMuonicXRDDialog::GetNegMuMuonicXRDDialog(QWidget *parent)
- : API::AlgorithmDialog(parent) {}
+ : API::AlgorithmDialog(parent), m_periodicTable(NULL), m_yPosition(NULL),
+ m_groupWorkspaceNameInput(NULL), m_showLegendCheck(NULL) {}
/// Initialise the layout
void GetNegMuMuonicXRDDialog::initLayout() {
@@ -26,18 +26,18 @@ void GetNegMuMuonicXRDDialog::initLayout() {
this->setMaximumHeight(400);
this->setMaximumWidth(675);
// assign periodicTable member to a new periodicTable
- periodicTable = new PeriodicTableWidget();
+ m_periodicTable = new PeriodicTableWidget();
- // assign yPosition member to a new QLineEdit
- yPosition = new QLineEdit();
- //assign GroupWorkspaceName member to a new QLineEdit
- groupWorkspaceNameInput = new QLineEdit();
+ // assign m_yPosition member to a new QLineEdit
+ m_yPosition = new QLineEdit();
+ // assign GroupWorkspaceName member to a new QLineEdit
+ m_groupWorkspaceNameInput = new QLineEdit();
auto *groupWsInputLabel = new QLabel("OutputWorkspace");
- groupWorkspaceNameInput->setMaximumWidth(250);
+ m_groupWorkspaceNameInput->setMaximumWidth(250);
// Disable all buttons on the periodicTable
// as we only have a select few that need to be
// enabled.
- periodicTable->disableAllElementButtons();
+ m_periodicTable->disableAllElementButtons();
/*Elements Enabled Correspond to those for which we
* have data for in the dictionary found in
@@ -51,44 +51,44 @@ void GetNegMuMuonicXRDDialog::initLayout() {
// run button for executing the algorithm
auto *runButton = new QPushButton("Run");
- // label for the QLineEdit for yPosition property
- auto *yPositionLabel = new QLabel("Y Position");
+ // label for the QLineEdit for m_yPosition property
+ auto *m_yPositionLabel = new QLabel("Y Position");
- /*validator allows only numeric input for yPosition
+ /*validator allows only numeric input for m_yPosition
*this helps with validating the input.
*Does not detect empty string as invalid input.
*/
- auto yPositionNumericValidator = new QDoubleValidator();
+ auto m_yPositionNumericValidator = new QDoubleValidator();
// YPosition LineEdit Attributes
- yPosition->setMaximumWidth(250);
- yPosition->setPlaceholderText("-0.01");
- yPosition->setValidator(yPositionNumericValidator);
+ m_yPosition->setMaximumWidth(250);
+ m_yPosition->setPlaceholderText("-0.01");
+ m_yPosition->setValidator(m_yPositionNumericValidator);
// Run Button Attributes and signal/slot assignment
runButton->setMaximumWidth(100);
connect(runButton, SIGNAL(clicked()), this, SLOT(runClicked()));
connect(this, SIGNAL(validInput()), this, SLOT(accept()));
- //Show Legend button attributes and signal/slot asssignment
- showLegendCheck = new QCheckBox("Show Legend");
- connect(showLegendCheck, SIGNAL(clicked()), this, SLOT(showLegend()));
+ // Show Legend button attributes and signal/slot asssignment
+ m_showLegendCheck = new QCheckBox("Show Legend");
+ connect(m_showLegendCheck, SIGNAL(clicked()), this, SLOT(showLegend()));
// Adding Widgets to Layout
- main_layout->addWidget(periodicTable);
- main_layout->addWidget(showLegendCheck);
- main_layout->addWidget(yPositionLabel);
- main_layout->addWidget(yPosition);
+ main_layout->addWidget(m_periodicTable);
+ main_layout->addWidget(m_showLegendCheck);
+ main_layout->addWidget(m_yPositionLabel);
+ main_layout->addWidget(m_yPosition);
main_layout->addWidget(groupWsInputLabel);
- main_layout->addWidget(groupWorkspaceNameInput);
+ main_layout->addWidget(m_groupWorkspaceNameInput);
main_layout->addWidget(runButton);
}
/**
*
*/
-void GetNegMuMuonicXRDDialog::showLegend(){
- bool checked = showLegendCheck->isChecked();
- periodicTable->showGroupLegend(checked);
+void GetNegMuMuonicXRDDialog::showLegend() {
+ bool checked = m_showLegendCheck->isChecked();
+ m_periodicTable->showGroupLegend(checked);
}
/**
@@ -102,13 +102,13 @@ void GetNegMuMuonicXRDDialog::enableElementsForGetNegMuMuonicXRD() {
* for the algorithm, and the button for that element can be enabled
* the same as the elements are below.
*/
- periodicTable->enableButtonByName("Au");
- periodicTable->enableButtonByName("Ag");
- periodicTable->enableButtonByName("Cu");
- periodicTable->enableButtonByName("Zn");
- periodicTable->enableButtonByName("Pb");
- periodicTable->enableButtonByName("As");
- periodicTable->enableButtonByName("Sn");
+ m_periodicTable->enableButtonByName("Au");
+ m_periodicTable->enableButtonByName("Ag");
+ m_periodicTable->enableButtonByName("Cu");
+ m_periodicTable->enableButtonByName("Zn");
+ m_periodicTable->enableButtonByName("Pb");
+ m_periodicTable->enableButtonByName("As");
+ m_periodicTable->enableButtonByName("Sn");
}
/**
@@ -128,7 +128,7 @@ bool GetNegMuMuonicXRDDialog::validateDialogInput(QString input) {
*/
void GetNegMuMuonicXRDDialog::runClicked() {
// getting a list of strings of elements selected from periodicTableWidget
- QString elementsSelectedStr = periodicTable->getAllCheckedElementsStr();
+ QString elementsSelectedStr = m_periodicTable->getAllCheckedElementsStr();
// if no elements are selected from the PeriodicTableWidget, a pop-up appears
// to the user.
if (!validateDialogInput(elementsSelectedStr)) {
@@ -141,15 +141,16 @@ void GetNegMuMuonicXRDDialog::runClicked() {
// signal.
if (validateDialogInput(elementsSelectedStr)) {
storePropertyValue("Elements", elementsSelectedStr);
- if (validateDialogInput(yPosition->text())) {
- storePropertyValue("YAxisPosition", yPosition->text());
+ if (validateDialogInput(m_yPosition->text())) {
+ storePropertyValue("YAxisPosition", m_yPosition->text());
} else {
- // used as default value for yPosition property if the user does not input
+ // used as default value for m_yPosition property if the user does not
+ // input
// one.
- storePropertyValue("YAxisPosition", yPosition->placeholderText());
+ storePropertyValue("YAxisPosition", m_yPosition->placeholderText());
}
- if (validateDialogInput(groupWorkspaceNameInput->text())){
- storePropertyValue("OutputWorkspace", groupWorkspaceNameInput->text());
+ if (validateDialogInput(m_groupWorkspaceNameInput->text())) {
+ storePropertyValue("OutputWorkspace", m_groupWorkspaceNameInput->text());
}
emit validInput();
}
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCInterface.cpp b/MantidQt/CustomInterfaces/src/Muon/ALCInterface.cpp
index a52e8a9ea46..f70fe204e98 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCInterface.cpp
+++ b/MantidQt/CustomInterfaces/src/Muon/ALCInterface.cpp
@@ -31,6 +31,7 @@ namespace CustomInterfaces
ALCInterface::ALCInterface(QWidget* parent)
: UserSubWindow(parent), m_ui(),
+ m_baselineModellingView(NULL), m_peakFittingView(NULL),
m_dataLoading(NULL), m_baselineModelling(NULL), m_peakFitting(NULL),
m_baselineModellingModel(new ALCBaselineModellingModel()),
m_peakFittingModel(new ALCPeakFittingModel())
diff --git a/MantidQt/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp b/MantidQt/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp
index 60d8a1e2bd0..b343d7c2087 100644
--- a/MantidQt/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp
+++ b/MantidQt/CustomInterfaces/src/Tomography/ImageStackPreParams.cpp
@@ -5,9 +5,7 @@ using namespace MantidQt::CustomInterfaces;
namespace MantidQt {
namespace CustomInterfaces {
-ImageStackPreParams::ImageStackPreParams()
-{
+ImageStackPreParams::ImageStackPreParams() : medianFilter(false) {}
-}
} // namespace CustomInterfaces
} // namespace MantidQt
--
GitLab
From d78f9183dfc21c735218151b1b5a423ff124bcb5 Mon Sep 17 00:00:00 2001
From: Owen Arnold <owen.arnold@stfc.ac.uk>
Date: Mon, 12 Oct 2015 11:42:41 +0100
Subject: [PATCH 147/223] refs #13660. Filter out WorkspaceGroups.
---
scripts/Interface/ui/reflectometer/refl_save.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/scripts/Interface/ui/reflectometer/refl_save.py b/scripts/Interface/ui/reflectometer/refl_save.py
index 6dabce7fe2a..80a2ecc4475 100644
--- a/scripts/Interface/ui/reflectometer/refl_save.py
+++ b/scripts/Interface/ui/reflectometer/refl_save.py
@@ -2,7 +2,7 @@
from PyQt4 import QtCore, QtGui
import os
from mantid.simpleapi import *
-from mantid.api import WorkspaceGroup
+from mantid.api import WorkspaceGroup, AnalysisDataService
import xml.etree.ElementTree as xml
from isis_reflectometry.quick import *
from isis_reflectometry.procedures import *
@@ -239,9 +239,15 @@ class Ui_SaveWindow(object):
self.pushButton.setText(QtGui.QApplication.translate("SaveWindow", "SAVE", None, QtGui.QApplication.UnicodeUTF8))
self.pushButton_2.setText(QtGui.QApplication.translate("SaveWindow", "Refresh", None, QtGui.QApplication.UnicodeUTF8))
+ def _get_saveable_workspace_names(self):
+ names = mtd.getObjectNames()
+ # Exclude WorkspaceGroups from our list. We cannot save them to ASCII.
+ names = [i for i in names if not isinstance(AnalysisDataService.retrieve(i), WorkspaceGroup)]
+ return names
+
def filterWksp(self):
self.listWidget.clear()
- names = mtd.getObjectNames()
+ names = self._get_saveable_workspace_names()
if self.regExCheckBox.isChecked():
regex=re.compile(self.filterEdit.text())
filtered = list()
@@ -268,7 +274,7 @@ class Ui_SaveWindow(object):
def populateList(self):
self.listWidget.clear()
- names = mtd.getObjectNames()
+ names = self._get_saveable_workspace_names()
if len(names):
RB_Number=groupGet(names[0],'samp','rb_proposal')
for ws in names:
--
GitLab
From 0f7191ccc87a5900e472205588c15f286e71506e Mon Sep 17 00:00:00 2001
From: Dan Nixon <dan@dan-nixon.com>
Date: Mon, 12 Oct 2015 12:01:36 +0100
Subject: [PATCH 148/223] Add additional property validation to LoadVesuvio
Re #13928
---
.../plugins/algorithms/LoadVesuvio.py | 70 ++++++++++++++-----
.../tests/analysis/LoadVesuvioTest.py | 4 ++
2 files changed, 55 insertions(+), 19 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py b/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
index e587a1bfdef..477cf697057 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
@@ -132,6 +132,20 @@ class LoadVesuvio(LoadEmptyVesuvio):
else:
self._exec_single_foil_state_mode()
+#----------------------------------------------------------------------------------------
+
+ def validateInputs(self):
+ issues = {}
+
+ # Validtae run number ranges
+ run_str = self.getProperty(RUN_PROP).value
+ if "-" in run_str:
+ lower, upper = run_str.split("-")
+ if upper < lower:
+ issues[RUN_PROP] = "Range must be in format lower-upper"
+
+ return issues
+
#----------------------------------------------------------------------------------------
def _exec_difference_mode(self):
@@ -346,24 +360,42 @@ class LoadVesuvio(LoadEmptyVesuvio):
if index == 0:
out_name, out_mon = SUMMED_WS, SUMMED_MON
else:
- out_name, out_mon = SUMMED_WS+'tmp', SUMMED_MON + 'tmp'
+ out_name, out_mon = SUMMED_WS + 'tmp', SUMMED_MON + 'tmp'
+
# Load data
- ms.LoadRaw(Filename=run, SpectrumList=spectra,
- OutputWorkspace=out_name, LoadMonitors='Exclude',EnableLogging=_LOGGING_)
- ms.LoadRaw(Filename=run,SpectrumList=self._mon_spectra,
- OutputWorkspace=out_mon,EnableLogging=_LOGGING_)
- if index > 0: # sum
- ms.Plus(LHSWorkspace=SUMMED_WS, RHSWorkspace=out_name,
- OutputWorkspace=SUMMED_WS,EnableLogging=_LOGGING_)
- ms.Plus(LHSWorkspace=SUMMED_MON, RHSWorkspace=out_mon,
- OutputWorkspace=SUMMED_MON,EnableLogging=_LOGGING_)
- ms.DeleteWorkspace(out_name,EnableLogging=_LOGGING_)
- ms.DeleteWorkspace(out_mon,EnableLogging=_LOGGING_)
-
- ms.CropWorkspace(Inputworkspace= SUMMED_WS, OutputWorkspace= SUMMED_WS,
- XMax=self._tof_max,EnableLogging=_LOGGING_)
- ms.CropWorkspace(Inputworkspace= SUMMED_MON, OutputWorkspace= SUMMED_MON,
- XMax=self._mon_tof_max, EnableLogging=_LOGGING_)
+ ms.LoadRaw(Filename=run,
+ SpectrumList=spectra,
+ OutputWorkspace=out_name,
+ LoadMonitors='Exclude',
+ EnableLogging=_LOGGING_)
+ ms.LoadRaw(Filename=run,
+ SpectrumList=self._mon_spectra,
+ OutputWorkspace=out_mon,
+ EnableLogging=_LOGGING_)
+
+ # Sum
+ if index > 0:
+ ms.Plus(LHSWorkspace=SUMMED_WS,
+ RHSWorkspace=out_name,
+ OutputWorkspace=SUMMED_WS,
+ EnableLogging=_LOGGING_)
+ ms.Plus(LHSWorkspace=SUMMED_MON,
+ RHSWorkspace=out_mon,
+ OutputWorkspace=SUMMED_MON,
+ EnableLogging=_LOGGING_)
+
+ ms.DeleteWorkspace(out_name, EnableLogging=_LOGGING_)
+ ms.DeleteWorkspace(out_mon, EnableLogging=_LOGGING_)
+
+ ms.CropWorkspace(Inputworkspace= SUMMED_WS,
+ OutputWorkspace=SUMMED_WS,
+ XMax=self._tof_max,
+ EnableLogging=_LOGGING_)
+ ms.CropWorkspace(Inputworkspace= SUMMED_MON,
+ OutputWorkspace=SUMMED_MON,
+ XMax=self._mon_tof_max,
+ EnableLogging=_LOGGING_)
+
return mtd[SUMMED_WS], mtd[SUMMED_MON]
#----------------------------------------------------------------------------------------
@@ -375,9 +407,9 @@ class LoadVesuvio(LoadEmptyVesuvio):
run_str = self.getProperty(RUN_PROP).value
# Load is not doing the right thing when summing. The numbers don't look correct
if "-" in run_str:
- lower,upper = run_str.split("-")
+ lower, upper = run_str.split("-")
# Range goes lower to up-1 but we want to include the last number
- runs = range(int(lower),int(upper)+1)
+ runs = range(int(lower), int(upper)+1)
elif "," in run_str:
runs = run_str.split(",")
diff --git a/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py b/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
index d0fbaa674ef..11fa3b62ea0 100644
--- a/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
+++ b/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
@@ -238,6 +238,10 @@ class VesuvioTests(unittest.TestCase):
#================== Failure cases ================================
+ def test_run_range_bad_order_raises_error(self):
+ self.assertRaises(RuntimeError, ms.LoadVesuvio, Filename="14188-14187",
+ OutputWorkspace=self.ws_name)
+
def test_missing_spectra_property_raises_error(self):
self.assertRaises(RuntimeError, ms.LoadVesuvio, Filename="14188",
OutputWorkspace=self.ws_name)
--
GitLab
From 11e13e525905dd878452edfbc6d2a7041e30c279 Mon Sep 17 00:00:00 2001
From: Wenduo Zhou <zhouw@ornl.gov>
Date: Mon, 12 Oct 2015 07:22:17 -0400
Subject: [PATCH 149/223] Refs #13692. Added docs for these classes.
---
.../api/src/Exports/MatrixWorkspace.cpp | 66 ++++++++++++-------
.../mantid/api/src/Exports/Projection.cpp | 21 ++++--
.../mantid/api/src/Exports/Run.cpp | 42 +++++++++---
.../mantid/api/src/Exports/Sample.cpp | 26 ++++++--
.../api/src/Exports/ScriptRepository.cpp | 28 ++++++--
.../mantid/api/src/Exports/Workspace.cpp | 21 ++++--
.../mantid/api/src/Exports/WorkspaceGroup.cpp | 14 +++-
.../api/src/Exports/WorkspaceHistory.cpp | 12 +++-
8 files changed, 165 insertions(+), 65 deletions(-)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
index 0047015ad1c..ce09525b9b9 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -150,10 +150,12 @@ void export_MatrixWorkspace() {
boost::noncopyable>("MatrixWorkspace", no_init)
//--------------------------------------- Meta information
//-----------------------------------------------------------------------
- .def("blocksize", &MatrixWorkspace::blocksize, args("self"),
+ .def("blocksize", &MatrixWorkspace::blocksize,
+ arg("self"),
"Returns size of the Y data array")
.def("getNumberHistograms", &MatrixWorkspace::getNumberHistograms,
- args("self"), "Returns the number of spectra in the workspace")
+ arg("self"),
+ "Returns the number of spectra in the workspace")
.def("binIndexOf", &MatrixWorkspace::binIndexOf,
MatrixWorkspace_binIndexOfOverloads(
(arg("self"), arg("xvalue"), arg("workspaceIndex")),
@@ -161,71 +163,85 @@ void export_MatrixWorkspace() {
"workspace_index is optional [default=0]"))
.def("detectorTwoTheta",
(getDetectorSignature)&MatrixWorkspace::detectorTwoTheta,
- args("self", "det"),
+ (arg("self"), arg("det")),
"Returns the two theta value for a given detector")
.def("detectorSignedTwoTheta",
(getDetectorSignature)&MatrixWorkspace::detectorSignedTwoTheta,
- args("self", "det"),
+ (arg("self"), arg("det")),
"Returns the signed two theta value for given detector")
.def("getSpectrum", (ISpectrum * (MatrixWorkspace::*)(const size_t)) &
MatrixWorkspace::getSpectrum,
- return_internal_reference<>(), args("self", "workspaceIndex"),
+ (arg("self"), arg("workspaceIndex")),
+ return_internal_reference<>(),
"Return the spectra at the given workspace index.")
.def("getIndexFromSpectrumNumber",
- &MatrixWorkspace::getIndexFromSpectrumNumber, args("self"),
+ &MatrixWorkspace::getIndexFromSpectrumNumber,
+ arg("self"),
"Returns workspace index correspondent to the given spectrum "
"number. Throws if no such spectrum is present in the workspace")
.def("getDetector", &MatrixWorkspace::getDetector,
return_value_policy<RemoveConstSharedPtr>(),
- args("self", "workspaceIndex"), "Return the Detector or "
- "DetectorGroup that is linked to "
- "the given workspace index")
+ (arg("self"), arg("workspaceIndex")),
+ "Return the Detector or "
+ "DetectorGroup that is linked to "
+ "the given workspace index")
.def("getRun", &MatrixWorkspace::mutableRun,
- return_internal_reference<>(), args("self"),
+ arg("self"),
+ return_internal_reference<>(),
"Return the Run object for this workspace")
- .def("axes", &MatrixWorkspace::axes, args("self"),
+ .def("axes", &MatrixWorkspace::axes,
+ arg("self"),
"Returns the number of axes attached to the workspace")
- .def("getAxis", &MatrixWorkspace::getAxis, return_internal_reference<>(),
- args("self", "axis_index"))
- .def("isHistogramData", &MatrixWorkspace::isHistogramData, args("self"),
+ .def("getAxis", &MatrixWorkspace::getAxis,
+ (arg("self"), arg("axis_index")),
+ return_internal_reference<>(),
+ "Get a pointer to a workspace axis")
+ .def("isHistogramData", &MatrixWorkspace::isHistogramData, arg("self"),
"Returns True if this is considered to be binned data.")
.def("isDistribution", (const bool &(MatrixWorkspace::*)() const) &
MatrixWorkspace::isDistribution,
- return_value_policy<copy_const_reference>(), args("self"),
+ arg("self"),
+ return_value_policy<copy_const_reference>(),
"Returns the status of the distribution flag")
- .def("YUnit", &MatrixWorkspace::YUnit, args("self"),
+ .def("YUnit", &MatrixWorkspace::YUnit, arg("self"),
"Returns the current Y unit for the data (Y axis) in the workspace")
- .def("YUnitLabel", &MatrixWorkspace::YUnitLabel, args("self"),
+ .def("YUnitLabel", &MatrixWorkspace::YUnitLabel, arg("self"),
"Returns the caption for the Y axis")
// Deprecated
- .def("getNumberBins", &getNumberBinsDeprecated, args("self"),
+ .def("getNumberBins", &getNumberBinsDeprecated, arg("self"),
"Returns size of the Y data array (deprecated, use blocksize "
"instead)")
.def("getSampleDetails", &getSampleDetailsDeprecated,
- return_internal_reference<>(), args("self"),
+ arg("self"),
+ return_internal_reference<>(),
"Return the Run object for this workspace (deprecated, use getRun "
"instead)")
//--------------------------------------- Setters
//------------------------------------
.def("setYUnitLabel", &MatrixWorkspace::setYUnitLabel,
- args("self", "newLabel"),
+ (arg("self"), arg("newLabel")),
"Sets a new caption for the data (Y axis) in the workspace")
- .def("setYUnit", &MatrixWorkspace::setYUnit, args("self", "newUnit"),
+ .def("setYUnit", &MatrixWorkspace::setYUnit,
+ (arg("self"), arg("newUnit")),
"Sets a new unit for the data (Y axis) in the workspace")
.def("setDistribution", (bool &(MatrixWorkspace::*)(const bool)) &
MatrixWorkspace::isDistribution,
- return_value_policy<return_by_value>(), args("self", "newVal"),
+ (arg("self"), arg("newVal")),
+ return_value_policy<return_by_value>(),
"Set distribution flag. If True the workspace has been divided by "
"the bin-width.")
.def("replaceAxis", &MatrixWorkspace::replaceAxis,
- args("self", "axisIndex", "newAxis"))
+ (arg("self"), arg("axisIndex"), arg("newAxis")),
+ "Replaces one of the workspace's axes with the new one provided.")
//--------------------------------------- Read spectrum data
//-------------------------
- .def("readX", &MatrixWorkspace::readX, return_readonly_numpy(),
- args("self", "workspaceIndex"), "Creates a read-only numpy wrapper "
+ .def("readX", &MatrixWorkspace::readX,
+ (arg("self"), arg("workspaceIndex")),
+ return_readonly_numpy(),
+ "Creates a read-only numpy wrapper "
"around the original X data at the "
"given index")
.def("readY", &MatrixWorkspace::readY, return_readonly_numpy(),
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
index 080bed5db9c..40f96646efb 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
@@ -115,20 +115,27 @@ void export_Projection() {
.def("__init__", make_constructor(&projCtor3),
"Constructs a 3 dimensional projection")
.def("getOffset", &Projection::getOffset,
+ (arg("self"), arg("nd")),
"Returns the offset for the given dimension", args("dimension"))
.def("getAxis", &Projection::getAxis,
+ (arg("self"), arg("nd")),
"Returns the axis for the given dimension", args("dimension"))
- .def("getType", &getUnit, "Returns the unit for the given dimension",
- args("dimension"))
+ .def("getType", &getUnit,
+ (arg("self"), arg("dimension")),
+ "Returns the unit for the given dimension")
.def("setOffset", &Projection::setOffset,
+ (arg("self"), arg("nd"), arg("offset")),
"Sets the offset for the given dimension",
args("dimension", "offset"))
.def("setAxis", &Projection::setAxis,
- "Sets the axis for the given dimension", args("dimension", "axis"))
- .def("setAxis", &projSetAxis, "Sets the axis for the given dimension",
- args("dimension", "axis"))
- .def("setType", &setUnit, "Sets the unit for the given dimension",
- args("dimension", "unit"))
+ (arg("self"), arg("dimension"), arg("axis")),
+ "Sets the axis for the given dimension")
+ .def("setAxis", &projSetAxis,
+ (arg("self"), arg("nd"), arg("data")),
+ "Sets the axis for the given dimension")
+ .def("setType", &setUnit,
+ (arg("self"), arg("dimension"), arg("unit")),
+ "Sets the unit for the given dimension")
.add_property(
"u", make_function(&Projection::U, return_internal_reference<>(),
boost::mpl::vector2<V3D &, Projection &>()),
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
index 8f8548bbcc5..7c8767a982f 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
@@ -117,62 +117,84 @@ void export_Run() {
// Run class
class_<Run, boost::noncopyable>("Run", no_init)
.def("getProtonCharge", &Run::getProtonCharge,
+ arg("self"),
"Return the total good proton charge for the run")
.def("integrateProtonCharge", &Run::integrateProtonCharge,
+ arg("self"),
"Return the total good proton charge for the run")
.def("hasProperty", &Run::hasProperty,
+ (arg("self"), arg("name")),
"Returns True if the given log value is contained within the run")
.def("getProperty", &Run::getProperty,
- return_value_policy<return_by_value>(), "Returns the named property "
- "(log value). Use '.value' "
- "to return the value.")
+ (arg("self"), arg("name")),
+ return_value_policy<return_by_value>(),
+ "Returns the named property "
+ "(log value). Use '.value' "
+ "to return the value.")
- .def("getProperties", &Run::getProperties, return_internal_reference<>(),
+ .def("getProperties", &Run::getProperties,
+ arg("self"),
+ return_internal_reference<>(),
"Return the list of run properties managed by this object.")
.def("getLogData",
(Property * (Run::*)(const std::string &) const) & Run::getLogData,
+ (arg("self"), arg("name")),
return_value_policy<return_by_value>(),
"Returns the named log. Use '.value' to return the value. The same "
"as getProperty.")
.def("getLogData",
(const std::vector<Property *> &(Run::*)() const) & Run::getLogData,
+ arg("self"),
return_internal_reference<>(),
"Return the list of logs for this run. The same as getProperties.")
.def("getGoniometer",
(const Mantid::Geometry::Goniometer &(Run::*)() const) &
Run::getGoniometer,
+ arg("self"),
return_value_policy<reference_existing_object>(),
"Get the oriented lattice for this sample")
- .def("addProperty", &addProperty, "Adds a property with the given name "
- "and value. If replace=True then an "
- "existing property is overwritten")
+ .def("addProperty", &addProperty,
+ (arg("self"), arg("name"), arg("value"), arg("replace")),
+ "Adds a property with the given name "
+ "and value. If replace=True then an "
+ "existing property is overwritten")
.def("addProperty", &addPropertyWithUnit,
+ (arg("self"), arg("name"), arg("value"), arg("units"), arg("replace")),
"Adds a property with the given name, value and unit. If "
"replace=True then an existing property is overwritten")
.def("setStartAndEndTime", &Run::setStartAndEndTime,
+ (arg("self"), arg("start"), arg("end")),
"Set the start and end time of the run")
.def("startTime", &Run::startTime,
+ arg("self"),
"Return the total starting time of the run.")
- .def("endTime", &Run::endTime, "Return the total ending time of the run.")
+ .def("endTime", &Run::endTime,
+ arg("self"),
+ "Return the total ending time of the run.")
//--------------------------- Dictionary
// access----------------------------
- .def("get", &getWithDefault, "Returns the value pointed to by the key or "
+ .def("get", &getWithDefault,
+ (arg("self"), arg("key"), arg("default")),
+ "Returns the value pointed to by the key or "
"None if it does not exist")
.def("get", &get,
+ (arg("self"), arg("key")),
"Returns the value pointed to by the key or the default value given")
- .def("keys", &keys, "Returns the names of the properties as list")
+ .def("keys", &keys,
+ arg("self"),
+ "Returns the names of the properties as list")
.def("__contains__", &Run::hasProperty)
.def("__getitem__", &Run::getProperty,
return_value_policy<return_by_value>())
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp
index 435e4040dc4..61c76c586bf 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp
@@ -39,19 +39,33 @@ void export_Sample() {
.def("getThickness", &Sample::getThickness,
arg("self"),
"Return the thickness in mm")
- .def("getHeight", &Sample::getHeight, "Return the height in mm")
- .def("getWidth", &Sample::getWidth, "Return the width in mm")
+ .def("getHeight", &Sample::getHeight,
+ arg("self"),
+ "Return the height in mm")
+ .def("getWidth", &Sample::getWidth,
+ arg("self"),
+ "Return the width in mm")
.def("getMaterial",
(const Material &(Sample::*)() const)(&Sample::getMaterial),
+ arg("self"),
return_value_policy<reference_existing_object>(),
"The material the sample is composed of")
.def("setGeometryFlag", &Sample::setGeometryFlag,
+ (arg("self"), arg("geom_id")),
"Set the geometry flag.")
- .def("setThickness", &Sample::setThickness, "Set the thickness in mm.")
- .def("setHeight", &Sample::setHeight, "Set the height in mm.")
- .def("setWidth", &Sample::setWidth, "Set the width in mm.")
+ .def("setThickness", &Sample::setThickness,
+ (arg("self"), arg("thick")),
+ "Set the thickness in mm.")
+ .def("setHeight", &Sample::setHeight,
+ (arg("self"), arg("height")),
+ "Set the height in mm.")
+ .def("setWidth", &Sample::setWidth,
+ (arg("self"), arg("width")),
+ "Set the width in mm.")
// -------------------------Operators
// -------------------------------------
- .def("__len__", &Sample::size)
+ .def("__len__", &Sample::size,
+ arg("self"),
+ "Gets the number of samples in this collection")
.def("__getitem__", &Sample::operator[], return_internal_reference<>());
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepository.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepository.cpp
index 91979d2a498..39d04431763 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepository.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepository.cpp
@@ -196,11 +196,25 @@ Arguments:\n\
///@todo better description
class_<ScriptRepository, boost::noncopyable>("ScriptRepository", repo_desc,
no_init)
- .def("install", &ScriptRepository::install, install_desc)
- .def("listFiles", &getListFiles, list_files_desc)
- .def("fileInfo", &getInfo, file_info_desc)
- .def("description", &getDescription, file_description_desc)
- .def("fileStatus", &getStatus, file_status_desc)
- .def("download", &ScriptRepository::download, download_desc)
- .def("update", &ScriptRepository::check4Update, update_desc);
+ .def("install", &ScriptRepository::install,
+ (arg("self"), arg("local_path")),
+ install_desc)
+ .def("listFiles", &getListFiles,
+ arg("self"),
+ list_files_desc)
+ .def("fileInfo", &getInfo,
+ (arg("self"), arg("path")),
+ file_info_desc)
+ .def("description", &getDescription,
+ (arg("self"), arg("path")),
+ file_description_desc)
+ .def("fileStatus", &getStatus,
+ (arg("self"), arg("path")),
+ file_status_desc)
+ .def("download", &ScriptRepository::download,
+ (arg("self"), arg("file_path")),
+ download_desc)
+ .def("update", &ScriptRepository::check4Update,
+ arg("self"),
+ update_desc);
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
index 04e52cc2d12..adda6989111 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
@@ -22,24 +22,33 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Workspace_isDirtyOverloads,
void export_Workspace() {
class_<Workspace, bases<DataItem>, boost::noncopyable>("Workspace", no_init)
.def("getName", &Workspace::getName,
- return_value_policy<copy_const_reference>(), args("self"),
+ return_value_policy<copy_const_reference>(),
+ arg("self"),
"Returns the name of the workspace. This could be an empty string")
- .def("getTitle", &Workspace::getTitle, args("self"),
+ .def("getTitle", &Workspace::getTitle,
+ arg("self"),
"Returns the title of the workspace")
- .def("setTitle", &Workspace::setTitle, args("self", "title"))
+ .def("setTitle", &Workspace::setTitle,
+ (arg("self"), arg("title")),
+ "Set the title of the workspace")
.def("getComment", &Workspace::getComment,
+ arg("self"),
return_value_policy<copy_const_reference>(),
"Returns the comment field on the workspace")
- .def("setComment", &Workspace::setComment, args("self", "comment"))
+ .def("setComment", &Workspace::setComment,
+ (arg("self"), arg("comment")),
+ "Set the comment field of the workspace")
.def("isDirty", &Workspace::isDirty,
Workspace_isDirtyOverloads(arg("n"), "True if the workspace has run "
"more than n algorithms "
"(Default=1)"))
- .def("getMemorySize", &Workspace::getMemorySize, args("self"),
+ .def("getMemorySize", &Workspace::getMemorySize,
+ arg("self"),
"Returns the memory footprint of the workspace in KB")
.def("getHistory", (const WorkspaceHistory &(Workspace::*)() const) &
Workspace::getHistory,
- return_value_policy<reference_existing_object>(), args("self"),
+ arg("self"),
+ return_value_policy<reference_existing_object>(),
"Return read-only access to the workspace history");
// register pointers
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp
index 702a7fe490a..7f587468bf7 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp
@@ -13,22 +13,32 @@ void export_WorkspaceGroup() {
class_<WorkspaceGroup, bases<Workspace>, boost::noncopyable>("WorkspaceGroup",
no_init)
.def("getNumberOfEntries", &WorkspaceGroup::getNumberOfEntries,
+ arg("self"),
"Returns the number of entries in the group")
.def("getNames", &WorkspaceGroup::getNames,
+ arg("self"),
"Returns the names of the entries in the group")
.def("contains",
(bool (WorkspaceGroup::*)(const std::string &wsName) const) &
WorkspaceGroup::contains,
+ (arg("self"), arg("workspace")),
"Returns true if the given name is in the group")
- .def("add", &WorkspaceGroup::add, "Add a name to the group")
+ .def("add", &WorkspaceGroup::add,
+ (arg("self"), arg("workspace_name")),
+ "Add a name to the group")
.def("size", &WorkspaceGroup::size,
+ arg("self"),
"Returns the number of workspaces contained in the group")
- .def("remove", &WorkspaceGroup::remove, "Remove a name from the group")
+ .def("remove", &WorkspaceGroup::remove,
+ (arg("self"), arg("workspace_name")),
+ "Remove a name from the group")
.def("getItem", (Workspace_sptr (WorkspaceGroup::*)(const size_t) const) &
WorkspaceGroup::getItem,
+ (arg("self"), arg("workspace_name")),
return_value_policy<Policies::ToWeakPtr>(),
"Returns the item at the given index")
.def("isMultiPeriod", &WorkspaceGroup::isMultiperiod,
+ arg("self"),
"Retuns true if the workspace group is multi-period")
// ------------ Operators --------------------------------
.def("__len__", &WorkspaceGroup::getNumberOfEntries)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp
index ad3133315cf..a7f06384b81 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp
@@ -39,26 +39,34 @@ void export_WorkspaceHistory() {
class_<WorkspaceHistory, boost::noncopyable>("WorkspaceHistory", no_init)
.def("getAlgorithmHistories", &getHistoriesAsList,
+ arg("self"),
"Returns a list of algorithm histories for this workspace history.")
.def("getAlgorithmHistory", &WorkspaceHistory::getAlgorithmHistory,
- arg("index"), return_value_policy<Policies::RemoveConstSharedPtr>(),
+ (arg("self"), arg("index")),
+ return_value_policy<Policies::RemoveConstSharedPtr>(),
"Returns the algorithm history at the given index in the history")
.def("size", &WorkspaceHistory::size,
+ arg("self"),
"Returns the number of algorithms in the immediate history")
.def("empty", &WorkspaceHistory::empty,
+ arg("self"),
"Returns whether the history has any entries")
.def("lastAlgorithm", &WorkspaceHistory::lastAlgorithm,
+ arg("self"),
"Returns the last algorithm run on this workspace so that its "
"properties can be accessed")
.def("getAlgorithm", &WorkspaceHistory::getAlgorithm,
+ (arg("self"), arg("index")),
"Returns the algorithm at the given index in the history")
// ----------------- Operators --------------------------------------
- .def("__getitem__", &WorkspaceHistory::getAlgorithm)
+ .def("__getitem__", &WorkspaceHistory::getAlgorithm,
+ (arg("self"), arg("index")),
+ "Create an algorithm from a history record at a given index")
.def(self_ns::str(self));
}
--
GitLab
From de028ee5537c0197e2fdaf3c4824615d3f90e1fd Mon Sep 17 00:00:00 2001
From: Shahroz Ahmed <shahroz.ahmed@stfc.ac.uk>
Date: Mon, 12 Oct 2015 12:52:16 +0100
Subject: [PATCH 150/223] Doxygen warning fixes
Refs #13811
---
.../src/EnggDiffraction/EnggDiffractionPresenter.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp
index 26d09c98c94..3eaf4ab45a9 100644
--- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp
+++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp
@@ -1333,12 +1333,11 @@ void EnggDiffractionPresenter::calcVanadiumWorkspaces(
* Checks the plot type selected and applies the appropriate
* python function to apply during first bank and second bank
*
- * @param std::string outWSName; title of focused workspace
+ * @param outWSName; title of the focused workspace
*/
void EnggDiffractionPresenter::plotFocusedWorkspace(std::string outWSName) {
const bool plotFocusedWS = m_view->focusedOutWorkspace();
int plotType = m_view->currentPlotType();
-
if (plotFocusedWS == true && 0 == plotType) {
if (outWSName == "engggui_focusing_output_ws_bank_1")
m_view->plotFocusedSpectrum(outWSName);
--
GitLab
From 6080712ba5de68415bf01e2e1e5851ff7f85438d Mon Sep 17 00:00:00 2001
From: Owen Arnold <owen.arnold@stfc.ac.uk>
Date: Mon, 12 Oct 2015 13:04:33 +0100
Subject: [PATCH 151/223] refs #13659. Fix layout.
---
scripts/Interface/ui/reflectometer/refl_save.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/scripts/Interface/ui/reflectometer/refl_save.py b/scripts/Interface/ui/reflectometer/refl_save.py
index 6dabce7fe2a..0f841f98d15 100644
--- a/scripts/Interface/ui/reflectometer/refl_save.py
+++ b/scripts/Interface/ui/reflectometer/refl_save.py
@@ -32,10 +32,12 @@ class Ui_SaveWindow(object):
def setupUi(self, SaveWindow):
self.SavePath=""
SaveWindow.setObjectName(_fromUtf8("SaveWindow"))
- SaveWindow.resize(700, 450)
+ SaveWindow.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding))
SaveWindow.setAcceptDrops(True)
-
+ main_layout = QtGui.QHBoxLayout()
+ SaveWindow.setLayout(main_layout)
self.centralWidget = QtGui.QWidget(SaveWindow)
+ main_layout.addWidget(self.centralWidget)
self.centralWidget.setObjectName(_fromUtf8("centralWidget"))
self.gridLayout_2 = QtGui.QGridLayout(self.centralWidget)
self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
@@ -236,7 +238,7 @@ class Ui_SaveWindow(object):
def retranslateUi(self, SaveWindow):
SaveWindow.setWindowTitle(QtGui.QApplication.translate("SaveWindow", "SaveWindow", None, QtGui.QApplication.UnicodeUTF8))
- self.pushButton.setText(QtGui.QApplication.translate("SaveWindow", "SAVE", None, QtGui.QApplication.UnicodeUTF8))
+ self.pushButton.setText(QtGui.QApplication.translate("SaveWindow", "Save", None, QtGui.QApplication.UnicodeUTF8))
self.pushButton_2.setText(QtGui.QApplication.translate("SaveWindow", "Refresh", None, QtGui.QApplication.UnicodeUTF8))
def filterWksp(self):
--
GitLab
From ed3bc866dd4abf49f28e41eb062135cc12801b41 Mon Sep 17 00:00:00 2001
From: Owen Arnold <owen.arnold@stfc.ac.uk>
Date: Mon, 12 Oct 2015 13:15:30 +0100
Subject: [PATCH 152/223] refs #13660. Disable pylint
This is basically (or supposed to be!) an automatically generated file. Ignore pylint warnings from here.
---
scripts/Interface/ui/reflectometer/refl_save.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/Interface/ui/reflectometer/refl_save.py b/scripts/Interface/ui/reflectometer/refl_save.py
index 80a2ecc4475..fb6a8ab5c83 100644
--- a/scripts/Interface/ui/reflectometer/refl_save.py
+++ b/scripts/Interface/ui/reflectometer/refl_save.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable-all
from PyQt4 import QtCore, QtGui
import os
from mantid.simpleapi import *
--
GitLab
From c8bbaf740644b2255ce001e936b2789da2852347 Mon Sep 17 00:00:00 2001
From: Owen Arnold <owen.arnold@stfc.ac.uk>
Date: Mon, 12 Oct 2015 13:16:34 +0100
Subject: [PATCH 153/223] refs #13659. Disable pylint.
---
scripts/Interface/ui/reflectometer/refl_save.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/Interface/ui/reflectometer/refl_save.py b/scripts/Interface/ui/reflectometer/refl_save.py
index 0f841f98d15..9f3a8b88c2a 100644
--- a/scripts/Interface/ui/reflectometer/refl_save.py
+++ b/scripts/Interface/ui/reflectometer/refl_save.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable-all
from PyQt4 import QtCore, QtGui
import os
from mantid.simpleapi import *
--
GitLab
From fe3bdf8d26a44b5c4263b9268290a0b9752cf01a Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 13:22:02 +0100
Subject: [PATCH 154/223] incorrect expression, coverty IDs 1010353 -- 1215228,
re #13918
---
.../Algorithms/src/FindPeakBackground.cpp | 2 +-
Framework/ICat/src/GSoap/stdsoap2.cpp | 8 +-
MantidPlot/src/Graph.cpp | 3 +-
MantidPlot/src/ImportASCIIDialog.cpp | 103 +++++++++---------
4 files changed, 62 insertions(+), 54 deletions(-)
diff --git a/Framework/Algorithms/src/FindPeakBackground.cpp b/Framework/Algorithms/src/FindPeakBackground.cpp
index f5de226028b..8884e017d58 100644
--- a/Framework/Algorithms/src/FindPeakBackground.cpp
+++ b/Framework/Algorithms/src/FindPeakBackground.cpp
@@ -157,7 +157,7 @@ void FindPeakBackground::exec() {
Statistics stats = getStatistics(maskedY);
Ymean = stats.mean;
Yvariance = stats.standard_deviation * stats.standard_deviation;
- Ysigma = std::sqrt((moment4(maskedY, n - l0, Ymean) -
+ Ysigma = std::sqrt((moment4(maskedY, xn, Ymean) -
(xn - 3.0) / (xn - 1.0) * Yvariance) /
xn);
MantidVec::const_iterator it =
diff --git a/Framework/ICat/src/GSoap/stdsoap2.cpp b/Framework/ICat/src/GSoap/stdsoap2.cpp
index fcef2db1c46..78c5d975fe5 100644
--- a/Framework/ICat/src/GSoap/stdsoap2.cpp
+++ b/Framework/ICat/src/GSoap/stdsoap2.cpp
@@ -8188,9 +8188,11 @@ void *SOAP_FMAC2 soap_id_lookup(struct soap *soap, const char *id, void **p,
void *s, **r = &ip->link;
q = (void **)ip->link;
while (q) {
- *r = (void *)soap_malloc(soap, sizeof(void *));
- if (!*r)
+ void **tmp = (void **)soap_malloc(soap, sizeof(void *));
+ if (!tmp)
return NULL;
+ *r = (void*)tmp;
+
s = *q;
*q = *r;
r = (void **)*r;
@@ -10040,7 +10042,7 @@ int SOAP_FMAC2 soap_element_start_end_out(struct soap *soap, const char *tag) {
if (soap->mode & SOAP_XML_CANONICAL) {
struct soap_nlist *np;
for (tp = soap->attributes; tp; tp = tp->next) {
- if (tp->visible && tp->name)
+ if (tp->visible && tp->name[0])
soap_utilize_ns(soap, tp->name);
}
for (np = soap->nlist; np; np = np->next) {
diff --git a/MantidPlot/src/Graph.cpp b/MantidPlot/src/Graph.cpp
index db3b3e6fcd2..f147c078e4a 100644
--- a/MantidPlot/src/Graph.cpp
+++ b/MantidPlot/src/Graph.cpp
@@ -1436,7 +1436,8 @@ void Graph::setAxisScale(int axis, double start, double end, int type, double st
QwtScaleWidget *rightAxis = d_plot->axisWidget(QwtPlot::yRight);
if(rightAxis)
{
- if (type == ScaleTransformation::Log10 && (start <= 0 || start == DBL_MAX))
+ //if (type == ScaleTransformation::Log10 && (start <= 0 || start == DBL_MAX))
+ if (type == GraphOptions::Log10 && (start <= 0 || start == DBL_MAX))
{
start = sp->getMinPositiveValue();
}
diff --git a/MantidPlot/src/ImportASCIIDialog.cpp b/MantidPlot/src/ImportASCIIDialog.cpp
index 44c2ff0105b..075910ef35f 100644
--- a/MantidPlot/src/ImportASCIIDialog.cpp
+++ b/MantidPlot/src/ImportASCIIDialog.cpp
@@ -450,62 +450,67 @@ void ImportASCIIDialog::preview()
void ImportASCIIDialog::previewTable()
{
- if (!d_preview_table)
- return;
+ if (!d_preview_table)
+ return;
- if (!d_preview_table->isVisible())
- d_preview_table->show();
+ if (!d_preview_table->isVisible())
+ d_preview_table->show();
- if (d_current_path.trimmed().isEmpty()){
- d_preview_table->clear();
- d_preview_table->resetHeader();
- return;
- }
+ if (d_current_path.trimmed().isEmpty()){
+ d_preview_table->clear();
+ d_preview_table->resetHeader();
+ return;
+ }
- int importMode = d_import_mode->currentIndex();
- if (importMode == NewTables)
- importMode = Table::Overwrite;
- else
- importMode -= 2;
-
- d_preview_table->resetHeader();
- d_preview_table->importASCII(d_current_path, columnSeparator(), d_ignored_lines->value(),
- d_rename_columns->isChecked(), d_strip_spaces->isChecked(),
- d_simplify_spaces->isChecked(), d_import_comments->isChecked(),
- d_comment_string->text(), (Table::ImportMode)importMode,
- boxEndLine->currentIndex(), d_preview_lines_box->value());
-
- if (d_import_dec_separators->isChecked())
- d_preview_table->updateDecimalSeparators(decimalSeparators());
- if (!d_preview_table->isVisible())
- d_preview_table->show();
+ int importMode = d_import_mode->currentIndex();
+ if (importMode == NewTables) {
+ importMode = (ImportASCIIDialog::ImportMode)Table::Overwrite;
+ } else {
+ importMode -= 2;
+ }
+
+ d_preview_table->resetHeader();
+ d_preview_table->importASCII(d_current_path, columnSeparator(), d_ignored_lines->value(),
+ d_rename_columns->isChecked(), d_strip_spaces->isChecked(),
+ d_simplify_spaces->isChecked(), d_import_comments->isChecked(),
+ d_comment_string->text(), (Table::ImportMode)importMode,
+ boxEndLine->currentIndex(), d_preview_lines_box->value());
+
+ if (d_import_dec_separators->isChecked())
+ d_preview_table->updateDecimalSeparators(decimalSeparators());
+
+ if (!d_preview_table->isVisible())
+ d_preview_table->show();
}
-void ImportASCIIDialog::previewMatrix()
-{
- if (!d_preview_matrix)
- return;
+void ImportASCIIDialog::previewMatrix() {
+ if (!d_preview_matrix)
+ return;
- if (d_current_path.trimmed().isEmpty()){
- d_preview_matrix->clear();
- return;
- }
+ if (d_current_path.trimmed().isEmpty()) {
+ d_preview_matrix->clear();
+ return;
+ }
- int importMode = d_import_mode->currentIndex();
- if (importMode == NewMatrices)
- importMode = Matrix::Overwrite;
- else
- importMode -= 2;
+ int importMode = d_import_mode->currentIndex();
+ if (importMode == NewMatrices) {
+ importMode = (ImportASCIIDialog::ImportMode)Matrix::Overwrite;
+ } else {
+ // Overwrite-2 => NewColumns (in both Matrix::importMode and
+ // ImportASCIIDialog::importMode)
+ importMode -= 2;
+ }
- QLocale locale = d_preview_matrix->locale();
- if(d_import_dec_separators->isChecked())
- locale = decimalSeparators();
+ QLocale locale = d_preview_matrix->locale();
+ if (d_import_dec_separators->isChecked())
+ locale = decimalSeparators();
- d_preview_matrix->importASCII(d_current_path, columnSeparator(), d_ignored_lines->value(),
- d_strip_spaces->isChecked(), d_simplify_spaces->isChecked(),
- d_comment_string->text(), importMode, locale,
- boxEndLine->currentIndex(), d_preview_lines_box->value());
- d_preview_matrix->resizeColumnsToContents();
+ d_preview_matrix->importASCII(
+ d_current_path, columnSeparator(), d_ignored_lines->value(),
+ d_strip_spaces->isChecked(), d_simplify_spaces->isChecked(),
+ d_comment_string->text(), importMode, locale, boxEndLine->currentIndex(),
+ d_preview_lines_box->value());
+ d_preview_matrix->resizeColumnsToContents();
}
void ImportASCIIDialog::changePreviewFile(const QString& path)
@@ -542,8 +547,8 @@ void ImportASCIIDialog::setNewWindowsOnly(bool on)
if (on){
d_import_mode->clear();
d_import_mode->addItem(tr("New Table"));
- d_import_mode->addItem(tr("New Matrice"));
- d_import_mode->addItem(tr("New Workspace"));
+ d_import_mode->addItem(tr("New Matrix"));
+ d_import_mode->addItem(tr("New Workspace"));
}
d_preview_button->setChecked(false);
--
GitLab
From ca2ca76922fe90865a4ae51675132e9cf29789a6 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Mon, 12 Oct 2015 14:05:29 +0100
Subject: [PATCH 155/223] Fix typo in Deprecated Algorithm
re #11707
---
Framework/API/inc/MantidAPI/DeprecatedAlgorithm.h | 2 +-
Framework/API/src/DeprecatedAlgorithm.cpp | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Framework/API/inc/MantidAPI/DeprecatedAlgorithm.h b/Framework/API/inc/MantidAPI/DeprecatedAlgorithm.h
index 68c8250521e..f48837d236c 100644
--- a/Framework/API/inc/MantidAPI/DeprecatedAlgorithm.h
+++ b/Framework/API/inc/MantidAPI/DeprecatedAlgorithm.h
@@ -52,7 +52,7 @@ private:
/// Replacement version, -1 indicates latest
int m_replacementVersion;
/// The date that the algorithm was first deprecated.
- std::string m_deprecatdDate;
+ std::string m_deprecatedDate;
};
} // namespace API
diff --git a/Framework/API/src/DeprecatedAlgorithm.cpp b/Framework/API/src/DeprecatedAlgorithm.cpp
index 095b870de6d..804e2e0ca5c 100644
--- a/Framework/API/src/DeprecatedAlgorithm.cpp
+++ b/Framework/API/src/DeprecatedAlgorithm.cpp
@@ -13,7 +13,7 @@ Kernel::Logger g_log("DeprecatedAlgorithm");
/// Does nothing other than make the compiler happy.
DeprecatedAlgorithm::DeprecatedAlgorithm()
- : m_replacementAlgorithm(), m_replacementVersion(-1), m_deprecatdDate() {}
+ : m_replacementAlgorithm(), m_replacementVersion(-1), m_deprecatedDate() {}
/// Does nothing other than make the compiler happy.
DeprecatedAlgorithm::~DeprecatedAlgorithm() {}
@@ -37,7 +37,7 @@ void DeprecatedAlgorithm::useAlgorithm(const std::string &replacement,
/// The date the algorithm was deprecated on
void DeprecatedAlgorithm::deprecatedDate(const std::string &date) {
- this->m_deprecatdDate = "";
+ this->m_deprecatedDate = "";
if (date.empty()) {
// TODO warn people that it wasn't set
return;
@@ -46,7 +46,7 @@ void DeprecatedAlgorithm::deprecatedDate(const std::string &date) {
// TODO warn people that it wasn't set
return;
}
- this->m_deprecatdDate = date;
+ this->m_deprecatedDate = date;
}
/// This merely prints the deprecation error for people to see.
@@ -57,8 +57,8 @@ const std::string DeprecatedAlgorithm::deprecationMsg(const IAlgorithm *algo) {
msg << "deprecated";
- if (!this->m_deprecatdDate.empty())
- msg << " (on " << this->m_deprecatdDate << ")";
+ if (!this->m_deprecatedDate.empty())
+ msg << " (on " << this->m_deprecatedDate << ")";
if (this->m_replacementAlgorithm.empty()) {
msg << " and has no replacement.";
--
GitLab
From 438c3f64cd2dcf9196d105710992f15016b94830 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Mon, 12 Oct 2015 14:15:57 +0100
Subject: [PATCH 156/223] Deprecate LoadAscii v1 and LoadEventPreNexus v1
Also move examples from LoadMuonNexusV1 to V2
re #11707
---
.../inc/MantidDataHandling/LoadAscii.h | 5 +-
.../MantidDataHandling/LoadEventPreNexus.h | 4 +-
Framework/DataHandling/src/LoadAscii.cpp | 5 +-
.../DataHandling/src/LoadEventPreNexus.cpp | 5 +-
docs/source/algorithms/LoadMuonNexus-v1.rst | 71 -------------------
docs/source/algorithms/LoadMuonNexus-v2.rst | 71 +++++++++++++++++++
6 files changed, 86 insertions(+), 75 deletions(-)
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h b/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h
index 44e695b5bcd..027664fc433 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h
@@ -5,6 +5,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/IFileLoader.h"
+#include "MantidAPI/DeprecatedAlgorithm.h"
namespace Mantid {
namespace DataHandling {
@@ -45,7 +46,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DLLExport LoadAscii : public API::IFileLoader<Kernel::FileDescriptor> {
+class DLLExport LoadAscii : public API::IFileLoader<Kernel::FileDescriptor>,
+ public API::DeprecatedAlgorithm
+{
public:
/// Default constructor
LoadAscii();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h
index c3f14b23381..ba84a24b902 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h
@@ -5,6 +5,7 @@
#include <string>
#include <vector>
#include "MantidAPI/IFileLoader.h"
+#include "MantidAPI/DeprecatedAlgorithm.h"
#include "MantidKernel/BinaryFile.h"
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/Events.h"
@@ -88,7 +89,8 @@ struct Pulse {
#pragma pack(pop)
class DLLExport LoadEventPreNexus
- : public API::IFileLoader<Kernel::FileDescriptor> {
+ : public API::IFileLoader<Kernel::FileDescriptor>,
+ public API::DeprecatedAlgorithm {
public:
/// Constructor
LoadEventPreNexus();
diff --git a/Framework/DataHandling/src/LoadAscii.cpp b/Framework/DataHandling/src/LoadAscii.cpp
index 747bd5422b9..035a529990d 100644
--- a/Framework/DataHandling/src/LoadAscii.cpp
+++ b/Framework/DataHandling/src/LoadAscii.cpp
@@ -24,7 +24,10 @@ using namespace Kernel;
using namespace API;
/// Empty constructor
-LoadAscii::LoadAscii() : m_columnSep(), m_separatorIndex() {}
+LoadAscii::LoadAscii() : m_columnSep(), m_separatorIndex()
+{
+ this->useAlgorithm("LoadAscii", 2);
+}
/**
* Return the confidence with with this algorithm can load the file
diff --git a/Framework/DataHandling/src/LoadEventPreNexus.cpp b/Framework/DataHandling/src/LoadEventPreNexus.cpp
index 43f73c8f10a..2d02648e3b3 100644
--- a/Framework/DataHandling/src/LoadEventPreNexus.cpp
+++ b/Framework/DataHandling/src/LoadEventPreNexus.cpp
@@ -84,7 +84,10 @@ LoadEventPreNexus::LoadEventPreNexus()
num_good_events(0), num_error_events(0), num_ignored_events(0),
first_event(0), max_events(0), using_mapping_file(false),
loadOnlySomeSpectra(false), spectraLoadMap(), longest_tof(0),
- shortest_tof(0), parallelProcessing(false) {}
+ shortest_tof(0), parallelProcessing(false)
+{
+ this->useAlgorithm("LoadEventPreNexus", 2);
+}
LoadEventPreNexus::~LoadEventPreNexus() { delete this->eventfile; }
diff --git a/docs/source/algorithms/LoadMuonNexus-v1.rst b/docs/source/algorithms/LoadMuonNexus-v1.rst
index acd6e582bb3..5f8aaf88a3c 100644
--- a/docs/source/algorithms/LoadMuonNexus-v1.rst
+++ b/docs/source/algorithms/LoadMuonNexus-v1.rst
@@ -79,77 +79,6 @@ The ChildAlgorithms used by LoadMuonNexus are:
LoadInstrument fails. As the Nexus file has limited instrument data,
this only populates a few fields.
-Usage
------
-
-.. include:: ../usagedata-note.txt
-
-**Example - Load ISIS muon MUSR dataset:**
-
-.. testcode:: LoadMuonNexusOnePeriod
-
- # Load MUSR dataset
- ws = LoadMuonNexus(Filename="MUSR00015189.nxs",EntryNumber=1)
- print "Workspace has ", ws[0].getNumberHistograms(), " spectra"
-
-Output:
-
-.. testoutput:: LoadMuonNexusOnePeriod
-
- Workspace has 64 spectra
-
-**Example - Load event nexus file with time filtering:**
-
-.. testcode:: ExLoadMuonNexusSomeSpectra
-
- # Load some spectra
- ws = LoadMuonNexus(Filename="MUSR00015189.nxs",SpectrumMin=5,SpectrumMax=10,EntryNumber=1)
- print "Workspace has ", ws[0].getNumberHistograms(), " spectra"
-
-Output:
-
-.. testoutput:: ExLoadMuonNexusSomeSpectra
-
- Workspace has 6 spectra
-
-**Example - Load dead times into table:**
-
-.. testcode:: ExLoadDeadTimeTable
-
- # Load some spectra
- ws = LoadMuonNexus(Filename="emu00006473.nxs",SpectrumMin=5,SpectrumMax=10,DeadTimeTable="deadTimeTable")
- tab = mtd['deadTimeTable']
- for i in range(0,tab.rowCount()):
- print tab.cell(i,0), tab.cell(i,1)
-
-Output:
-
-.. testoutput:: ExLoadDeadTimeTable
-
- 5 0.00161112251226
- 6 0.00215016817674
- 7 0.0102171599865
- 8 0.00431686220691
- 9 0.00743605662137
- 10 0.00421147653833
-
-**Example - Load detector grouping into table:**
-
-.. testcode:: ExLoadDetectorGrouping
-
- # Load some spectra
- ws = LoadMuonNexus(Filename="emu00006473.nxs",SpectrumList="1,16,17,32",DetectorGroupingTable="detectorTable")
- tab = mtd['detectorTable']
- for i in range(0,tab.rowCount()):
- print tab.cell(i,0)
-
-Output:
-
-.. testoutput:: ExLoadDetectorGrouping
-
- [ 1 16]
- [17 32]
-
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/LoadMuonNexus-v2.rst b/docs/source/algorithms/LoadMuonNexus-v2.rst
index 0ca954061e4..2e0732e98a4 100644
--- a/docs/source/algorithms/LoadMuonNexus-v2.rst
+++ b/docs/source/algorithms/LoadMuonNexus-v2.rst
@@ -80,6 +80,77 @@ detects that it has been asked to load a previous version muon nexus
file it will call the previous version of the algorithm to perform the
task.
+Usage
+-----
+
+.. include:: ../usagedata-note.txt
+
+**Example - Load ISIS muon MUSR dataset:**
+
+.. testcode:: LoadMuonNexusOnePeriod
+
+ # Load MUSR dataset
+ ws = LoadMuonNexus(Filename="MUSR00015189.nxs",EntryNumber=1)
+ print "Workspace has ", ws[0].getNumberHistograms(), " spectra"
+
+Output:
+
+.. testoutput:: LoadMuonNexusOnePeriod
+
+ Workspace has 64 spectra
+
+**Example - Load event nexus file with time filtering:**
+
+.. testcode:: ExLoadMuonNexusSomeSpectra
+
+ # Load some spectra
+ ws = LoadMuonNexus(Filename="MUSR00015189.nxs",SpectrumMin=5,SpectrumMax=10,EntryNumber=1)
+ print "Workspace has ", ws[0].getNumberHistograms(), " spectra"
+
+Output:
+
+.. testoutput:: ExLoadMuonNexusSomeSpectra
+
+ Workspace has 6 spectra
+
+**Example - Load dead times into table:**
+
+.. testcode:: ExLoadDeadTimeTable
+
+ # Load some spectra
+ ws = LoadMuonNexus(Filename="emu00006473.nxs",SpectrumMin=5,SpectrumMax=10,DeadTimeTable="deadTimeTable")
+ tab = mtd['deadTimeTable']
+ for i in range(0,tab.rowCount()):
+ print tab.cell(i,0), tab.cell(i,1)
+
+Output:
+
+.. testoutput:: ExLoadDeadTimeTable
+
+ 5 0.00161112251226
+ 6 0.00215016817674
+ 7 0.0102171599865
+ 8 0.00431686220691
+ 9 0.00743605662137
+ 10 0.00421147653833
+
+**Example - Load detector grouping into table:**
+
+.. testcode:: ExLoadDetectorGrouping
+
+ # Load some spectra
+ ws = LoadMuonNexus(Filename="emu00006473.nxs",SpectrumList="1,16,17,32",DetectorGroupingTable="detectorTable")
+ tab = mtd['detectorTable']
+ for i in range(0,tab.rowCount()):
+ print tab.cell(i,0)
+
+Output:
+
+.. testoutput:: ExLoadDetectorGrouping
+
+ [ 1 16]
+ [17 32]
+
.. categories::
.. sourcelink::
--
GitLab
From 04bd1d301d0306835cd3c891e3b7382c9b665216 Mon Sep 17 00:00:00 2001
From: Matthew D Jones <matthew.d.jones@tessella.com>
Date: Mon, 12 Oct 2015 15:39:12 +0100
Subject: [PATCH 157/223] Re #13932 Break hard coupling between UI and
presenter code
---
.../inc/MantidQtCustomInterfaces/QtReflMainView.h | 1 +
.../inc/MantidQtCustomInterfaces/ReflMainView.h | 1 +
MantidQt/CustomInterfaces/src/QtReflMainView.cpp | 11 +++++++++++
.../CustomInterfaces/src/ReflMainViewPresenter.cpp | 13 ++++++-------
4 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/QtReflMainView.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/QtReflMainView.h
index 5423d7311d7..1306417ed5c 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/QtReflMainView.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/QtReflMainView.h
@@ -62,6 +62,7 @@ namespace MantidQt
virtual void giveUserWarning(std::string prompt, std::string title);
virtual void giveUserCritical(std::string prompt, std::string title);
virtual void showAlgorithmDialog(const std::string& algorithm);
+ virtual std::string requestNotebookPath();
//Plotting
virtual void plotWorkspaces(const std::set<std::string>& workspaces);
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainView.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainView.h
index ba7cfe632c3..bfcca663b78 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainView.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainView.h
@@ -57,6 +57,7 @@ namespace MantidQt
virtual void giveUserWarning(std::string prompt, std::string title) = 0;
virtual void giveUserCritical(std::string prompt, std::string title) = 0;
virtual void showAlgorithmDialog(const std::string& algorithm) = 0;
+ virtual std::string requestNotebookPath() = 0;
//Plotting
virtual void plotWorkspaces(const std::set<std::string>& workspaces) = 0;
diff --git a/MantidQt/CustomInterfaces/src/QtReflMainView.cpp b/MantidQt/CustomInterfaces/src/QtReflMainView.cpp
index a2c94562df9..6f599771e4f 100644
--- a/MantidQt/CustomInterfaces/src/QtReflMainView.cpp
+++ b/MantidQt/CustomInterfaces/src/QtReflMainView.cpp
@@ -434,6 +434,17 @@ namespace MantidQt
runPythonCode(QString::fromStdString(pythonSrc.str()));
}
+ /**
+ Show the user file dialog to choose save location of notebook
+ */
+ std::string QtReflMainView::requestNotebookPath()
+ {
+ QString qfilename = QFileDialog::getSaveFileName(0, "Save notebook file", QDir::currentPath(),
+ "IPython Notebook files (*.ipynb);;All files (*.*)",
+ new QString("IPython Notebook files (*.ipynb)"));
+ return qfilename.toStdString();
+ }
+
/**
Plot a workspace
*/
diff --git a/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp b/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp
index 8b813d6392f..2aedd280cf8 100644
--- a/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp
+++ b/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp
@@ -295,16 +295,15 @@ namespace MantidQt
*/
void ReflMainViewPresenter::saveNotebook(std::map<int,std::set<int>> groups, std::set<int> rows)
{
- std::unique_ptr<ReflGenerateNotebook> notebook(new ReflGenerateNotebook(
- m_wsName, m_model, m_view->getProcessInstrument(), COL_RUNS, COL_TRANSMISSION, COL_OPTIONS, COL_ANGLE,
- COL_QMIN, COL_QMAX, COL_DQQ, COL_SCALE, COL_GROUP));
- QString qfilename = QFileDialog::getSaveFileName(0, "Save notebook file", QDir::currentPath(),
- "IPython Notebook files (*.ipynb);;All files (*.*)",
- new QString("IPython Notebook files (*.ipynb)"));
- std::string filename = qfilename.toStdString();
+
+ std::string filename = m_view->requestNotebookPath();
if (filename == "") {
return;
}
+
+ std::unique_ptr<ReflGenerateNotebook> notebook(new ReflGenerateNotebook(
+ m_wsName, m_model, m_view->getProcessInstrument(), COL_RUNS, COL_TRANSMISSION, COL_OPTIONS, COL_ANGLE,
+ COL_QMIN, COL_QMAX, COL_DQQ, COL_SCALE, COL_GROUP));
std::string generatedNotebook = notebook->generateNotebook(groups, rows);
std::ofstream file(filename.c_str(), std::ofstream::trunc);
--
GitLab
From d55a0ef48adc2c6fe3edc2a54eff80ff33c94e33 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Mon, 12 Oct 2015 16:15:07 +0100
Subject: [PATCH 158/223] Ensure AlgorithmProxy keeps everything up to date
with CopyPropertiesfrom
re #13925
---
Framework/API/inc/MantidAPI/AlgorithmProxy.h | 2 ++
Framework/API/src/AlgorithmProxy.cpp | 14 ++++++++++-
Framework/API/test/AlgorithmProxyTest.h | 24 +++++++++++++++++++
.../inc/MantidKernel/PropertyManagerOwner.h | 2 +-
4 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/Framework/API/inc/MantidAPI/AlgorithmProxy.h b/Framework/API/inc/MantidAPI/AlgorithmProxy.h
index ef45cafbbf5..cc2c0627204 100644
--- a/Framework/API/inc/MantidAPI/AlgorithmProxy.h
+++ b/Framework/API/inc/MantidAPI/AlgorithmProxy.h
@@ -116,6 +116,8 @@ public:
void setPropertyValue(const std::string &name, const std::string &value);
/// Do something after a property was set
void afterPropertySet(const std::string &);
+ /// Make m_properties point to the same PropertyManager as po.
+ void copyPropertiesFrom(const PropertyManagerOwner &po);
//@}
void cancel();
diff --git a/Framework/API/src/AlgorithmProxy.cpp b/Framework/API/src/AlgorithmProxy.cpp
index a400d76b394..e911da5ef3c 100644
--- a/Framework/API/src/AlgorithmProxy.cpp
+++ b/Framework/API/src/AlgorithmProxy.cpp
@@ -218,7 +218,19 @@ void AlgorithmProxy::afterPropertySet(const std::string &name) {
copyPropertiesFrom(*m_alg);
}
-//----------------------------------------------------------------------
+/**
+ * Copy properties from another property manager
+ * Making sure that the concrete alg is kept in sync
+ * @param po :: The property manager to copy
+ */
+void AlgorithmProxy::copyPropertiesFrom(const PropertyManagerOwner& po)
+{
+ PropertyManagerOwner::copyPropertiesFrom(po);
+ createConcreteAlg(true);
+ m_alg->copyPropertiesFrom(*this);
+}
+
+ //----------------------------------------------------------------------
// Private methods
//----------------------------------------------------------------------
diff --git a/Framework/API/test/AlgorithmProxyTest.h b/Framework/API/test/AlgorithmProxyTest.h
index 8c50e2e0dcd..25b2f27d24d 100644
--- a/Framework/API/test/AlgorithmProxyTest.h
+++ b/Framework/API/test/AlgorithmProxyTest.h
@@ -212,6 +212,30 @@ public:
}
TS_ASSERT_EQUALS("InputWorkspace", alg->workspaceMethodInputProperty());
}
+
+ void test_copyPropertiesFrom() {
+ IAlgorithm_sptr alg =
+ AlgorithmManager::Instance().create("ToyAlgorithmProxy");
+ alg->initialize();
+ alg->setPropertyValue( "prop1", "string" );
+ alg->setPropertyValue("prop2","1");
+ IAlgorithm_sptr algCopy =
+ AlgorithmManager::Instance().create("ToyAlgorithmProxy");
+
+ auto algProxy = boost::dynamic_pointer_cast<AlgorithmProxy>(alg);
+ auto algCopyProxy = boost::dynamic_pointer_cast<AlgorithmProxy>(algCopy);
+ algCopyProxy->copyPropertiesFrom(*algProxy);
+
+ int val = boost::lexical_cast<int>(algCopy->getPropertyValue("prop2"));
+
+ TS_ASSERT_EQUALS(val,1);
+
+ //set another value and check the other value is unaffected
+ algCopy->setPropertyValue( "prop1", "A difference" );
+ int val2 = boost::lexical_cast<int>(algCopy->getPropertyValue("prop2"));
+
+ TS_ASSERT_EQUALS(val,val2);
+ }
};
#endif /*ALGORITHMPROXYTEST_H_*/
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h b/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h
index 7a095862e9c..87a4de60f33 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h
@@ -65,7 +65,7 @@ public:
void setPropertyOrdinal(const int &index, const std::string &value);
/// Make m_properties point to the same PropertyManager as po.
- void copyPropertiesFrom(const PropertyManagerOwner &po) { *this = po; }
+ virtual void copyPropertiesFrom(const PropertyManagerOwner &po) { *this = po; }
bool existsProperty(const std::string &name) const;
bool validateProperties() const;
--
GitLab
From 968921cf7337d3c044ddec61b871c0282dd70e8d Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Mon, 12 Oct 2015 11:15:54 -0400
Subject: [PATCH 159/223] Adding documentation for PDToPDFgetN
---
docs/source/algorithms/PDToPDFgetN-v1.rst | 32 +++++++++++++++++
docs/source/diagrams/PDToPDFgetN-v1_wkflw.dot | 34 +++++++++++++++++++
2 files changed, 66 insertions(+)
create mode 100644 docs/source/algorithms/PDToPDFgetN-v1.rst
create mode 100644 docs/source/diagrams/PDToPDFgetN-v1_wkflw.dot
diff --git a/docs/source/algorithms/PDToPDFgetN-v1.rst b/docs/source/algorithms/PDToPDFgetN-v1.rst
new file mode 100644
index 00000000000..f37aae644e2
--- /dev/null
+++ b/docs/source/algorithms/PDToPDFgetN-v1.rst
@@ -0,0 +1,32 @@
+.. algorithm::
+
+.. summary::
+
+.. alias::
+
+.. properties::
+
+Description
+-----------
+
+This is a workflow algorithm that creates files suitable as input
+into `PDFgetN <http://pdfgetn.sourceforge.net/>`_.
+
+#. :ref:`algm-PDLoadCharacterizations`
+#. :ref:`algm-LoadEventAndCompress` if ``InputWorkspace`` is not
+ provided
+#. :ref:`algm-PDDetermineCharacterizations` to determine information
+ from the characterization file
+#. :ref:`algm-AlignAndFocusPowder`
+#. :ref:`algm-NormaliseByCurrent`
+#. :ref:`algm-SetUncertainties` (``SetError="sqrt"``)
+#. :ref:`algm-SaveGSS`
+
+Workflow
+########
+
+.. diagram:: PDToPDFgetN-v1_wkflw.dot
+
+.. categories::
+
+.. sourcelink::
diff --git a/docs/source/diagrams/PDToPDFgetN-v1_wkflw.dot b/docs/source/diagrams/PDToPDFgetN-v1_wkflw.dot
new file mode 100644
index 00000000000..23d7d3128f5
--- /dev/null
+++ b/docs/source/diagrams/PDToPDFgetN-v1_wkflw.dot
@@ -0,0 +1,34 @@
+digraph AlignAndFocusPowder {
+ label="AlignAndFocusPowder Flowchart"
+ $global_style
+
+ subgraph params {
+ $param_style
+ InputWorkspace
+ }
+
+ subgraph algoritms {
+ $algorithm_style
+ loadChar [label="PDLoadCharacterizations v1"]
+ loadEvent [label="LoadEventAndCompress v1"]
+ determineChar [label="PDDetermineCharacterizations v1"]
+ alignAndFocus [label="AlignAndFocusPowder v1"]
+ norm [label="NormaliseByCurrent v1"]
+ setUncert [label="SetUncertainties v1"]
+ saveGSS [label="SaveGSS v1"]
+ }
+
+ subgraph decisions {
+ $decision_style
+ }
+
+
+ loadChar -> determineChar
+ loadEvent -> InputWorkspace
+ InputWorkspace -> determineChar
+ InputWorkspace -> alignAndFocus
+ determineChar -> alignAndFocus
+ alignAndFocus -> norm
+ norm -> setUncert
+ setUncert -> saveGSS
+}
--
GitLab
From 926d9b9523973ece715664104696429b3b012316 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Mon, 12 Oct 2015 16:21:01 +0100
Subject: [PATCH 160/223] Apply clang format patch
re #11707
---
Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h | 3 +--
.../DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h | 2 +-
Framework/DataHandling/src/LoadAscii.cpp | 3 +--
Framework/DataHandling/src/LoadEventPreNexus.cpp | 3 +--
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h b/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h
index 027664fc433..cf495c009be 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h
@@ -47,8 +47,7 @@ File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class DLLExport LoadAscii : public API::IFileLoader<Kernel::FileDescriptor>,
- public API::DeprecatedAlgorithm
-{
+ public API::DeprecatedAlgorithm {
public:
/// Default constructor
LoadAscii();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h
index ba84a24b902..328be8a1889 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h
@@ -90,7 +90,7 @@ struct Pulse {
class DLLExport LoadEventPreNexus
: public API::IFileLoader<Kernel::FileDescriptor>,
- public API::DeprecatedAlgorithm {
+ public API::DeprecatedAlgorithm {
public:
/// Constructor
LoadEventPreNexus();
diff --git a/Framework/DataHandling/src/LoadAscii.cpp b/Framework/DataHandling/src/LoadAscii.cpp
index 035a529990d..74dda663af5 100644
--- a/Framework/DataHandling/src/LoadAscii.cpp
+++ b/Framework/DataHandling/src/LoadAscii.cpp
@@ -24,8 +24,7 @@ using namespace Kernel;
using namespace API;
/// Empty constructor
-LoadAscii::LoadAscii() : m_columnSep(), m_separatorIndex()
-{
+LoadAscii::LoadAscii() : m_columnSep(), m_separatorIndex() {
this->useAlgorithm("LoadAscii", 2);
}
diff --git a/Framework/DataHandling/src/LoadEventPreNexus.cpp b/Framework/DataHandling/src/LoadEventPreNexus.cpp
index 2d02648e3b3..e6687146f3f 100644
--- a/Framework/DataHandling/src/LoadEventPreNexus.cpp
+++ b/Framework/DataHandling/src/LoadEventPreNexus.cpp
@@ -84,8 +84,7 @@ LoadEventPreNexus::LoadEventPreNexus()
num_good_events(0), num_error_events(0), num_ignored_events(0),
first_event(0), max_events(0), using_mapping_file(false),
loadOnlySomeSpectra(false), spectraLoadMap(), longest_tof(0),
- shortest_tof(0), parallelProcessing(false)
-{
+ shortest_tof(0), parallelProcessing(false) {
this->useAlgorithm("LoadEventPreNexus", 2);
}
--
GitLab
From 2a2c31807814962c45b920e08afc5143dbab8709 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Mon, 12 Oct 2015 16:23:00 +0100
Subject: [PATCH 161/223] apply clang format patch
re #13925
---
Framework/API/src/AlgorithmProxy.cpp | 5 ++--
Framework/API/test/AlgorithmProxyTest.h | 28 +++++++++----------
.../inc/MantidKernel/PropertyManagerOwner.h | 4 ++-
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/Framework/API/src/AlgorithmProxy.cpp b/Framework/API/src/AlgorithmProxy.cpp
index e911da5ef3c..c1a77746b23 100644
--- a/Framework/API/src/AlgorithmProxy.cpp
+++ b/Framework/API/src/AlgorithmProxy.cpp
@@ -223,14 +223,13 @@ void AlgorithmProxy::afterPropertySet(const std::string &name) {
* Making sure that the concrete alg is kept in sync
* @param po :: The property manager to copy
*/
-void AlgorithmProxy::copyPropertiesFrom(const PropertyManagerOwner& po)
-{
+void AlgorithmProxy::copyPropertiesFrom(const PropertyManagerOwner &po) {
PropertyManagerOwner::copyPropertiesFrom(po);
createConcreteAlg(true);
m_alg->copyPropertiesFrom(*this);
}
- //----------------------------------------------------------------------
+//----------------------------------------------------------------------
// Private methods
//----------------------------------------------------------------------
diff --git a/Framework/API/test/AlgorithmProxyTest.h b/Framework/API/test/AlgorithmProxyTest.h
index 25b2f27d24d..6e8cafd7800 100644
--- a/Framework/API/test/AlgorithmProxyTest.h
+++ b/Framework/API/test/AlgorithmProxyTest.h
@@ -214,27 +214,27 @@ public:
}
void test_copyPropertiesFrom() {
- IAlgorithm_sptr alg =
+ IAlgorithm_sptr alg =
AlgorithmManager::Instance().create("ToyAlgorithmProxy");
- alg->initialize();
- alg->setPropertyValue( "prop1", "string" );
- alg->setPropertyValue("prop2","1");
- IAlgorithm_sptr algCopy =
+ alg->initialize();
+ alg->setPropertyValue("prop1", "string");
+ alg->setPropertyValue("prop2", "1");
+ IAlgorithm_sptr algCopy =
AlgorithmManager::Instance().create("ToyAlgorithmProxy");
- auto algProxy = boost::dynamic_pointer_cast<AlgorithmProxy>(alg);
- auto algCopyProxy = boost::dynamic_pointer_cast<AlgorithmProxy>(algCopy);
- algCopyProxy->copyPropertiesFrom(*algProxy);
+ auto algProxy = boost::dynamic_pointer_cast<AlgorithmProxy>(alg);
+ auto algCopyProxy = boost::dynamic_pointer_cast<AlgorithmProxy>(algCopy);
+ algCopyProxy->copyPropertiesFrom(*algProxy);
- int val = boost::lexical_cast<int>(algCopy->getPropertyValue("prop2"));
+ int val = boost::lexical_cast<int>(algCopy->getPropertyValue("prop2"));
- TS_ASSERT_EQUALS(val,1);
+ TS_ASSERT_EQUALS(val, 1);
- //set another value and check the other value is unaffected
- algCopy->setPropertyValue( "prop1", "A difference" );
- int val2 = boost::lexical_cast<int>(algCopy->getPropertyValue("prop2"));
+ // set another value and check the other value is unaffected
+ algCopy->setPropertyValue("prop1", "A difference");
+ int val2 = boost::lexical_cast<int>(algCopy->getPropertyValue("prop2"));
- TS_ASSERT_EQUALS(val,val2);
+ TS_ASSERT_EQUALS(val, val2);
}
};
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h b/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h
index 87a4de60f33..ada32918cb1 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h
@@ -65,7 +65,9 @@ public:
void setPropertyOrdinal(const int &index, const std::string &value);
/// Make m_properties point to the same PropertyManager as po.
- virtual void copyPropertiesFrom(const PropertyManagerOwner &po) { *this = po; }
+ virtual void copyPropertiesFrom(const PropertyManagerOwner &po) {
+ *this = po;
+ }
bool existsProperty(const std::string &name) const;
bool validateProperties() const;
--
GitLab
From 6ff86a4f436549b9f943a4e5199088f18348ec32 Mon Sep 17 00:00:00 2001
From: Pete Peterson <peterfpeterson@gmail.com>
Date: Mon, 12 Oct 2015 13:05:38 -0400
Subject: [PATCH 162/223] Fixing for directory restructure
---
.gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 8f718aea18f..5a12c9f6778 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,7 +166,7 @@ Desktop.ini
.tags
.tags_sorted_by_file
-Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/LibHelper.h
+Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/LibHelper.h
# Make sure Third_Party doesn't get checked into the main repository
--
GitLab
From b484d7f22e4d998d6802605ca2fca96d5190a485 Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Mon, 12 Oct 2015 13:21:44 -0400
Subject: [PATCH 163/223] Grouping properties and checking InputWorkspace
---
.../plugins/algorithms/PDToPDFgetN.py | 35 +++++++++++++------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py b/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
index 9b37a92268a..c44a2d40929 100644
--- a/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
+++ b/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
@@ -18,6 +18,7 @@ class PDToPDFgetN(DataProcessorAlgorithm):
return "The algorithm used converting raw data to pdfgetn input files"
def PyInit(self):
+ group = "Input"
self.declareProperty(FileProperty(name="Filename",
defaultValue="", action=FileAction.Load,
extensions=["_event.nxs", ".nxs.h5"]),
@@ -32,6 +33,19 @@ class PDToPDFgetN(DataProcessorAlgorithm):
direction=Direction.Input,
optional=PropertyMode.Optional),
doc="Handle to reduced workspace")
+ self.setPropertyGroup("Filename", group)
+ self.setPropertyGroup("MaxChunkSize", group)
+ self.setPropertyGroup("FilterBadPulses", group)
+ self.setPropertyGroup("InputWorkspace", group)
+
+ group = "Output"
+ self.declareProperty(MatrixWorkspaceProperty("OutputWorkspace", "",
+ direction=Direction.Output),
+ doc="Handle to reduced workspace")
+ self.declareProperty(FileProperty(name="PDFgetNFile", defaultValue="", action=FileAction.Save,
+ extensions=[".getn"]), "Output filename")
+ self.setPropertyGroup("OutputWorkspace", group)
+ self.setPropertyGroup("PDFgetNFile", group)
self.declareProperty(FileProperty(name="CalibrationFile",
defaultValue="", action=FileAction.OptionalLoad,
@@ -54,12 +68,6 @@ class PDToPDFgetN(DataProcessorAlgorithm):
"Number of bins in x-axis. Non-zero value overrides \"Params\" property. " +
"Negative value means logorithmic binning.")
- self.declareProperty(MatrixWorkspaceProperty("OutputWorkspace", "",
- direction=Direction.Output),
- doc="Handle to reduced workspace")
- self.declareProperty(FileProperty(name="PDFgetNFile", defaultValue="", action=FileAction.Save,
- extensions=[".getn"]), "Output filename")
-
def _loadCharacterizations(self):
self._focusPos = {}
self._iparmFile = None
@@ -83,11 +91,16 @@ class PDToPDFgetN(DataProcessorAlgorithm):
self._loadCharacterizations()
- wksp = LoadEventAndCompress(Filename=self.getProperty("Filename").value,
- OutputWorkspace=self.getPropertyValue("OutputWorkspace"),
- MaxChunkSize=self.getProperty("MaxChunkSize").value,
- FilterBadPulses=self.getProperty("FilterBadPulses").value,
- CompressTOFTolerance=COMPRESS_TOL_TOF)
+ wksp = self.getProperty("InputWorkspace").value
+ if wksp is None:
+ wksp = LoadEventAndCompress(Filename=self.getProperty("Filename").value,
+ OutputWorkspace=self.getPropertyValue("OutputWorkspace"),
+ MaxChunkSize=self.getProperty("MaxChunkSize").value,
+ FilterBadPulses=self.getProperty("FilterBadPulses").value,
+ CompressTOFTolerance=COMPRESS_TOL_TOF)
+ else:
+ self.log().information("Using input workspace. Ignoring properties 'Filename', " +
+ "'OutputWorkspace', 'MaxChunkSize', and 'FilterBadPulses'")
charac = ""
if mtd.doesExist("characterizations"):
--
GitLab
From c7a284e062d41d58de6870ebd0b74718ba0089f0 Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Mon, 12 Oct 2015 13:33:06 -0400
Subject: [PATCH 164/223] Getting rid of pylint warnings
---
Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py b/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
index c44a2d40929..db6819bf1d0 100644
--- a/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
+++ b/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
@@ -1,3 +1,4 @@
+#pylint: disable=no-init
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import Direction, FloatArrayProperty
@@ -7,6 +8,8 @@ COMPRESS_TOL_TOF = .01
class PDToPDFgetN(DataProcessorAlgorithm):
+ _focusPos = {}
+ _iparmFile = None
def category(self):
return "Workflow\\Diffraction;PythonAlgorithms"
@@ -87,8 +90,6 @@ class PDToPDFgetN(DataProcessorAlgorithm):
self._focusPos['Azimuthal'] = results[6]
def PyExec(self):
- filename = self.getProperty("Filename").value
-
self._loadCharacterizations()
wksp = self.getProperty("InputWorkspace").value
--
GitLab
From 310aaa10260381b023684fec27a4e2d8738583d0 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 20:05:10 +0100
Subject: [PATCH 165/223] fix clang formatting, re #13918
---
.../Algorithms/src/FindPeakBackground.cpp | 6 +++---
.../RefinePowderInstrumentParameters.cpp | 19 ++++++++++---------
Framework/ICat/src/GSoap/stdsoap2.cpp | 2 +-
.../MDAlgorithms/src/Integrate3DEvents.cpp | 3 ++-
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/Framework/Algorithms/src/FindPeakBackground.cpp b/Framework/Algorithms/src/FindPeakBackground.cpp
index 8884e017d58..04408b05d9d 100644
--- a/Framework/Algorithms/src/FindPeakBackground.cpp
+++ b/Framework/Algorithms/src/FindPeakBackground.cpp
@@ -157,9 +157,9 @@ void FindPeakBackground::exec() {
Statistics stats = getStatistics(maskedY);
Ymean = stats.mean;
Yvariance = stats.standard_deviation * stats.standard_deviation;
- Ysigma = std::sqrt((moment4(maskedY, xn, Ymean) -
- (xn - 3.0) / (xn - 1.0) * Yvariance) /
- xn);
+ Ysigma = std::sqrt(
+ (moment4(maskedY, xn, Ymean) - (xn - 3.0) / (xn - 1.0) * Yvariance) /
+ xn);
MantidVec::const_iterator it =
std::max_element(maskedY.begin(), maskedY.end());
const size_t pos = it - maskedY.begin();
diff --git a/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
index 4ccf36c1817..2fe6fdbe508 100644
--- a/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
+++ b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
@@ -349,8 +349,8 @@ void RefinePowderInstrumentParameters::fitInstrumentParameters() {
// 6. Pretty screen output
stringstream dbss;
dbss << "************ Fit Parameter Result *************" << std::endl;
- for (paramiter = m_FuncParameters.begin(); paramiter != m_FuncParameters.end();
- ++paramiter) {
+ for (paramiter = m_FuncParameters.begin();
+ paramiter != m_FuncParameters.end(); ++paramiter) {
std::string parname = paramiter->first;
double inpparvalue = m_OrigParameters[parname];
double parvalue = paramiter->second;
@@ -473,10 +473,11 @@ void RefinePowderInstrumentParameters::refineInstrumentParametersMC(
stringstream dbss;
for (size_t i = 0; i < m_PeakFunctionParameterNames.size(); ++i) {
- dbss << setw(20) << m_PeakFunctionParameterNames[i] << ": Min = " << setw(15)
- << setprecision(6) << lowerbounds[i] << ", Max = " << setw(15)
- << setprecision(6) << upperbounds[i] << ", Step Size = " << setw(15)
- << setprecision(6) << stepsizes[i] << endl;
+ dbss << setw(20) << m_PeakFunctionParameterNames[i]
+ << ": Min = " << setw(15) << setprecision(6) << lowerbounds[i]
+ << ", Max = " << setw(15) << setprecision(6) << upperbounds[i]
+ << ", Step Size = " << setw(15) << setprecision(6) << stepsizes[i]
+ << endl;
}
g_log.notice() << "Monte Carlo Parameters: " << endl
<< dbss.str();
@@ -510,7 +511,7 @@ void RefinePowderInstrumentParameters::refineInstrumentParametersMC(
// a. Set the function with the
for (size_t j = 0; j < m_PeakFunctionParameterNames.size(); ++j) {
m_Function->setParameter(m_PeakFunctionParameterNames[j],
- m_BestFitParameters[i].second[j]);
+ m_BestFitParameters[i].second[j]);
}
// b. Calculate
@@ -946,8 +947,8 @@ void RefinePowderInstrumentParameters::genPeaksFromTable(
m_PeakErrors.insert(make_pair(hkl, chi2));
- g_log.information() << "[Generatem_Peaks] Peak " << ir << " HKL = [" << hkl[0]
- << ", " << hkl[1] << ", " << hkl[2]
+ g_log.information() << "[Generatem_Peaks] Peak " << ir << " HKL = ["
+ << hkl[0] << ", " << hkl[1] << ", " << hkl[2]
<< "], Input Center = " << setw(10) << setprecision(6)
<< newpeak.centre() << endl;
diff --git a/Framework/ICat/src/GSoap/stdsoap2.cpp b/Framework/ICat/src/GSoap/stdsoap2.cpp
index 78c5d975fe5..7a966fb7a43 100644
--- a/Framework/ICat/src/GSoap/stdsoap2.cpp
+++ b/Framework/ICat/src/GSoap/stdsoap2.cpp
@@ -8191,7 +8191,7 @@ void *SOAP_FMAC2 soap_id_lookup(struct soap *soap, const char *id, void **p,
void **tmp = (void **)soap_malloc(soap, sizeof(void *));
if (!tmp)
return NULL;
- *r = (void*)tmp;
+ *r = (void *)tmp;
s = *q;
*q = *r;
diff --git a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
index a81ed00b7ac..372e9b1ad95 100644
--- a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
+++ b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
@@ -126,7 +126,8 @@ Integrate3DEvents::ellipseIntegrateEvents(
auto pos = m_event_lists.find(hkl_key);
if (m_event_lists.end() == pos)
- return boost::make_shared<NoShape>();;
+ return boost::make_shared<NoShape>();
+ ;
std::vector<std::pair<double, V3D>> &some_events = pos->second;
--
GitLab
From c9f8281ae4cf05a3b06023b98969d3f4edb353d9 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 20:13:55 +0100
Subject: [PATCH 166/223] fix windows build / ifdef, re #13918
---
Framework/Algorithms/src/FindPeakBackground.cpp | 6 +++---
Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp | 9 +++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Framework/Algorithms/src/FindPeakBackground.cpp b/Framework/Algorithms/src/FindPeakBackground.cpp
index 04408b05d9d..047bb0748a2 100644
--- a/Framework/Algorithms/src/FindPeakBackground.cpp
+++ b/Framework/Algorithms/src/FindPeakBackground.cpp
@@ -157,9 +157,9 @@ void FindPeakBackground::exec() {
Statistics stats = getStatistics(maskedY);
Ymean = stats.mean;
Yvariance = stats.standard_deviation * stats.standard_deviation;
- Ysigma = std::sqrt(
- (moment4(maskedY, xn, Ymean) - (xn - 3.0) / (xn - 1.0) * Yvariance) /
- xn);
+ Ysigma = std::sqrt((moment4(maskedY, static_cast<size_t>(xn), Ymean) -
+ (xn - 3.0) / (xn - 1.0) * Yvariance) /
+ xn);
MantidVec::const_iterator it =
std::max_element(maskedY.begin(), maskedY.end());
const size_t pos = it - maskedY.begin();
diff --git a/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp b/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp
index 9ac61977a66..3e208518d50 100644
--- a/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp
+++ b/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp
@@ -203,11 +203,12 @@ void ConvertCWSDExpToMomentum::addMDEvents(bool usevirtual) {
std::string sep("");
if (m_dataDir.size() > 0) {
// Determine system
- const bool isWindows(false);
#if _WIN64
- isWindows = true;
-#elif _WIND32
- isWindows = true;
+ const bool isWindows = true;
+#elif _WIN32
+ const bool isWindows = true;
+#else
+ const bool isWindows = false;
#endif
if (isWindows && *m_dataDir.rbegin() != '\\') {
sep = "\\";
--
GitLab
From 7608db6f4a7683295f58da62e8f9807508da28d9 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Mon, 12 Oct 2015 15:25:00 -0400
Subject: [PATCH 167/223] Fixes or suppresses warnings with XCode 7.
---
.../CurveFitting/src/IFittingAlgorithm.cpp | 5 ++-
.../mantid/api/src/Exports/Algorithm.cpp | 37 +++++++++++--------
.../api/src/Exports/AlgorithmFactory.cpp | 8 +++-
.../api/src/Exports/AlgorithmManager.cpp | 7 ++++
.../mantid/api/src/Exports/Axis.cpp | 9 +++++
.../mantid/api/src/Exports/ExperimentInfo.cpp | 7 ++++
.../mantid/api/src/Exports/FileFinder.cpp | 7 ++++
.../mantid/api/src/Exports/IFunction.cpp | 18 ++++++---
.../api/src/Exports/MatrixWorkspace.cpp | 8 +++-
.../mantid/api/src/Exports/Workspace.cpp | 7 ++++
.../api/src/Exports/WorkspaceFactory.cpp | 7 ++++
.../mantid/geometry/src/Exports/Component.cpp | 7 ++++
.../geometry/src/Exports/Goniometer.cpp | 7 ++++
.../kernel/src/Exports/ConfigService.cpp | 10 ++++-
.../mantid/kernel/src/Exports/Statistics.cpp | 34 +++++++++++++++--
.../WorkspaceCreationHelperModule.cpp | 8 ++++
16 files changed, 157 insertions(+), 29 deletions(-)
diff --git a/Framework/CurveFitting/src/IFittingAlgorithm.cpp b/Framework/CurveFitting/src/IFittingAlgorithm.cpp
index de562d920cb..339e719b8fd 100644
--- a/Framework/CurveFitting/src/IFittingAlgorithm.cpp
+++ b/Framework/CurveFitting/src/IFittingAlgorithm.cpp
@@ -217,8 +217,9 @@ void IFittingAlgorithm::addWorkspace(const std::string &workspacePropertyName,
boost::dynamic_pointer_cast<MultiDomainCreator>(m_domainCreator);
if (!multiCreator) {
throw std::runtime_error(
+ auto &reference = *m_domainCreator.get();
std::string("MultiDomainCreator expected, found ") +
- typeid(*m_domainCreator.get()).name());
+ typeid(reference).name());
}
if (!multiCreator->hasCreator(index)) {
creator->declareDatasetProperties(suffix, addProperties);
@@ -283,4 +284,4 @@ void IFittingAlgorithm::exec() {
}
} // namespace CurveFitting
-} // namespace Mantid
\ No newline at end of file
+} // namespace Mantid
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index 0aa43a5125c..bd30d34b373 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -42,21 +42,28 @@ typedef void (*declarePropertyType3)(boost::python::object &self,
typedef void (*declarePropertyType4)(boost::python::object &self,
const std::string &,
const boost::python::object &, const int);
-
-// Overload types
-BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType1_Overload,
- PythonAlgorithm::declarePyAlgProperty, 2, 3)
-BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType2_Overload,
- PythonAlgorithm::declarePyAlgProperty, 3, 6)
-BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType3_Overload,
- PythonAlgorithm::declarePyAlgProperty, 4, 5)
-
-/**
- * Map a CancelException to a Python KeyboardInterupt
- * @param exc A cancel exception to translate. Unused here as the message is
- * ignored
- */
-void translateCancel(const Algorithm::CancelException &exc) {
+fdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
+ // Overload types
+ BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType1_Overload,
+ PythonAlgorithm::declarePyAlgProperty, 2, 3)
+ BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType2_Overload,
+ PythonAlgorithm::declarePyAlgProperty,
+ 3, 6)
+ BOOST_PYTHON_FUNCTION_OVERLOADS(
+ declarePropertyType3_Overload,
+ PythonAlgorithm::declarePyAlgProperty, 4, 5)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+ /**
+ * Map a CancelException to a Python KeyboardInterupt
+ * @param exc A cancel exception to translate. Unused here as the message is
+ * ignored
+ */
+ void translateCancel(const Algorithm::CancelException &exc) {
UNUSED_ARG(exc);
PyErr_SetString(PyExc_KeyboardInterrupt, "");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
index 48b38115527..9a8b9a56ecc 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
@@ -99,8 +99,14 @@ void subscribe(AlgorithmFactoryImpl &self, const boost::python::object &obj) {
// from the FileLoaderRegistry
FileLoaderRegistry::Instance().unsubscribe(descr.first, descr.second);
}
-
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(existsOverloader, exists, 1, 2)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
///@endcond
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
index f827fd3728b..a280b6b4f18 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
@@ -57,12 +57,19 @@ boost::python::list runningInstancesOf(AlgorithmManagerImpl &self,
///@cond
//------------------------------------------------------------------------------------------------------
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
/// Define overload generators
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(create_overloads,
AlgorithmManagerImpl::create, 1, 2)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createUnmanaged_overloads,
AlgorithmManagerImpl::createUnmanaged, 1,
2)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
///@endcond
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
index 0df0e6417b4..131d3619283 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
@@ -25,9 +25,18 @@ namespace {
namespace bpl = boost::python;
//------------------------------- Overload macros ---------------------------
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
+
// Overloads for operator() function which has 1 optional argument
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Axis_getValue, Axis::getValue, 1, 2)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
/**
* Extract the axis values as a sequence. A numpy array is used if the
* data is numerical or a simple python list is used if the data is a string
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
index 758c1c8e2a9..db5e854e4d1 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
@@ -10,9 +10,16 @@ using Mantid::API::ExperimentInfo;
using Mantid::PythonInterface::Policies::RemoveConstSharedPtr;
using namespace boost::python;
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
/// Overload generator for getInstrumentFilename
BOOST_PYTHON_FUNCTION_OVERLOADS(getInstrumentFilename_Overload,
ExperimentInfo::getInstrumentFilename, 1, 2)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
void export_ExperimentInfo() {
register_ptr_to_python<boost::shared_ptr<ExperimentInfo>>();
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp b/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
index f762919cdf1..63c0cdea791 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
@@ -8,7 +8,14 @@ using Mantid::API::FileFinderImpl;
using namespace boost::python;
namespace {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getFullPathOverloader, getFullPath, 1, 2)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
}
void export_FileFinder() {
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index 77761eb9393..98439a7cfdf 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -34,14 +34,20 @@ PyObject *getCategories(IFunction &self) {
// -- Set property overloads --
// setProperty(index,value,explicit)
typedef void (IFunction::*setParameterType1)(size_t, const double &value, bool);
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType1_Overloads,
- setParameter, 2, 3)
-// setProperty(index,value,explicit)
-typedef void (IFunction::*setParameterType2)(const std::string &,
- const double &value, bool);
+fdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
+ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType1_Overloads,
+ setParameter, 2, 3)
+ // setProperty(index,value,explicit)
+ typedef void (IFunction::*setParameterType2)(const std::string &,
+ const double &value, bool);
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType2_Overloads,
setParameter, 2, 3)
-
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
///@endcond
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
index 0047015ad1c..95cbce21335 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -34,10 +34,16 @@ typedef return_value_policy<VectorRefToNumpy<WrapReadWrite>>
return_readwrite_numpy;
//------------------------------- Overload macros ---------------------------
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
// Overloads for binIndexOf function which has 1 optional argument
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(MatrixWorkspace_binIndexOfOverloads,
MatrixWorkspace::binIndexOf, 1, 2)
-
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
/**
* Set the values from an python array-style object into the given spectrum in
* the workspace
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
index 04e52cc2d12..8cd1926d6cd 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
@@ -14,8 +14,15 @@ using namespace boost::python;
namespace {
///@cond
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Workspace_isDirtyOverloads,
Workspace::isDirty, 0, 1)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
///@endcond
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
index b77d3cc8a15..0f1dc2f8e61 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
@@ -40,10 +40,17 @@ Workspace_sptr createFromParentPtr(WorkspaceFactoryImpl &self,
}
/// Overload generator for create
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
BOOST_PYTHON_FUNCTION_OVERLOADS(createFromParent_Overload, createFromParentPtr,
2, 5)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createTable_Overload, createTable, 0, 1)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createPeaks_Overload, createPeaks, 0, 1)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
}
void export_WorkspaceFactory() {
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
index 5ad6c63e6d0..268245abcb4 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
@@ -7,6 +7,10 @@ using Mantid::Geometry::IComponent;
using namespace boost::python;
namespace {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
// Default parameter function overloads
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParameterNames,
Component::getParameterNames, 0, 1)
@@ -36,6 +40,9 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParamShortDescription,
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParamDescription,
Component::getParamDescription, 1, 2)
}
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
void export_Component() {
class_<Component, bases<IComponent>, boost::noncopyable>("Component", no_init)
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
index 184ca40caf1..71bf1e31799 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
@@ -13,9 +13,16 @@ using namespace boost::python;
namespace //<unnamed>
{
///@cond
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
// define overloaded functions
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getEulerAngles_overloads,
Goniometer::getEulerAngles, 0, 1)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
///@endcond
/// Set the U vector via a numpy array
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
index 61163771c9d..cdf0a041dd4 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
@@ -28,11 +28,19 @@ std::string getStringUsingCache(ConfigServiceImpl &self,
return self.getString(key, true);
}
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
+
/// Overload generator for getInstrument
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getInstrument_Overload, getInstrument, 0,
- 1)
+
/// Overload generator for getString
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getString_Overload, getString, 1, 2)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
}
void export_ConfigService() {
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
index 3cfaf72e9ec..b595a89821a 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
@@ -93,11 +93,18 @@ Statistics getStatisticsNumpy(const numeric::array &data,
throw UnknownDataType();
}
}
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
// Define an overload to handle the default argument
BOOST_PYTHON_FUNCTION_OVERLOADS(getStatisticsOverloads, getStatisticsNumpy, 1,
2)
-
-//============================ Z score
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+///============================ Z score
//============================================
/**
@@ -145,9 +152,16 @@ std::vector<double> getModifiedZscoreNumpy(const numeric::array &data,
}
}
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
// Define an overload to handle the default argument
BOOST_PYTHON_FUNCTION_OVERLOADS(getModifiedZscoreOverloads,
getModifiedZscoreNumpy, 1, 2)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
//============================ getMoments
//============================================
@@ -198,10 +212,16 @@ std::vector<double> getMomentsAboutOriginNumpy(const numeric::array &indep,
return getMomentsNumpyImpl(&getMomentsAboutOrigin, indep, depend, maxMoment);
}
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
// Define an overload to handle the default argument
BOOST_PYTHON_FUNCTION_OVERLOADS(getMomentsAboutOriginOverloads,
getMomentsAboutOriginNumpy, 2, 3)
-
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
/**
* Proxy for @see Mantid::Kernel::getMomentsAboutMean so that it can accept
* numpy arrays
@@ -213,9 +233,17 @@ std::vector<double> getMomentsAboutMeanNumpy(const numeric::array &indep,
return getMomentsNumpyImpl(&getMomentsAboutMean, indep, depend, maxMoment);
}
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
// Define an overload to handle the default argument
BOOST_PYTHON_FUNCTION_OVERLOADS(getMomentsAboutMeanOverloads,
getMomentsAboutMeanNumpy, 2, 3)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
///@endcond
}
diff --git a/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp b/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
index 810d3fe4179..73cdc0f7d19 100644
--- a/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
+++ b/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
@@ -21,6 +21,10 @@ using namespace Mantid::DataObjects::MDEventsTestHelper;
using namespace Mantid::PythonInterface::Policies;
using namespace WorkspaceCreationHelper;
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif
BOOST_PYTHON_FUNCTION_OVERLOADS(create2DWorkspaceWithFullInstrument_overloads,
create2DWorkspaceWithFullInstrument, 2, 4)
@@ -31,6 +35,10 @@ BOOST_PYTHON_FUNCTION_OVERLOADS(
create2DWorkspaceWithRectangularInstrument_overloads,
create2DWorkspaceWithRectangularInstrument, 3, 3)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
BOOST_PYTHON_MODULE(WorkspaceCreationHelper) {
using namespace boost::python;
--
GitLab
From eb7fbc34e05819be7784e5a12b94362a3c000200 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Mon, 12 Oct 2015 15:30:29 -0400
Subject: [PATCH 168/223] Fixes to get Mantid to compile again.
---
Framework/CurveFitting/src/IFittingAlgorithm.cpp | 2 +-
Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp | 2 +-
Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp | 2 +-
.../PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Framework/CurveFitting/src/IFittingAlgorithm.cpp b/Framework/CurveFitting/src/IFittingAlgorithm.cpp
index 339e719b8fd..4984b1edc74 100644
--- a/Framework/CurveFitting/src/IFittingAlgorithm.cpp
+++ b/Framework/CurveFitting/src/IFittingAlgorithm.cpp
@@ -216,8 +216,8 @@ void IFittingAlgorithm::addWorkspace(const std::string &workspacePropertyName,
boost::shared_ptr<MultiDomainCreator> multiCreator =
boost::dynamic_pointer_cast<MultiDomainCreator>(m_domainCreator);
if (!multiCreator) {
+ auto &reference = *m_domainCreator.get();
throw std::runtime_error(
- auto &reference = *m_domainCreator.get();
std::string("MultiDomainCreator expected, found ") +
typeid(reference).name());
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index bd30d34b373..980969c6c18 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -42,7 +42,7 @@ typedef void (*declarePropertyType3)(boost::python::object &self,
typedef void (*declarePropertyType4)(boost::python::object &self,
const std::string &,
const boost::python::object &, const int);
-fdef __clang__
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index 98439a7cfdf..31a8e6a9c7d 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -34,7 +34,7 @@ PyObject *getCategories(IFunction &self) {
// -- Set property overloads --
// setProperty(index,value,explicit)
typedef void (IFunction::*setParameterType1)(size_t, const double &value, bool);
-fdef __clang__
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
index cdf0a041dd4..2a29d8d1411 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
@@ -35,7 +35,7 @@ std::string getStringUsingCache(ConfigServiceImpl &self,
/// Overload generator for getInstrument
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getInstrument_Overload, getInstrument, 0,
-
+ 1)
/// Overload generator for getString
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getString_Overload, getString, 1, 2)
#ifdef __clang__
--
GitLab
From c6bb0b544cea34a9d6f56c1e34114449610f9948 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Mon, 12 Oct 2015 15:37:45 -0400
Subject: [PATCH 169/223] Remove accidental change to comment.
---
.../PythonInterface/mantid/kernel/src/Exports/Statistics.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
index b595a89821a..086feee3bc4 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
@@ -104,7 +104,7 @@ BOOST_PYTHON_FUNCTION_OVERLOADS(getStatisticsOverloads, getStatisticsNumpy, 1,
#ifdef __clang__
#pragma clang diagnostic pop
#endif
-///============================ Z score
+//============================ Z score
//============================================
/**
--
GitLab
From f0a915d17a0f58e583751b8ced567b3ee123c473 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Mon, 12 Oct 2015 15:40:18 -0400
Subject: [PATCH 170/223] clang-format 3.6 changes.
---
.../mantid/api/src/Exports/Algorithm.cpp | 28 +++++++++----------
.../mantid/api/src/Exports/IFunction.cpp | 10 +++----
2 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index 980969c6c18..2498440c985 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -46,24 +46,22 @@ typedef void (*declarePropertyType4)(boost::python::object &self,
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
- // Overload types
- BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType1_Overload,
- PythonAlgorithm::declarePyAlgProperty, 2, 3)
- BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType2_Overload,
- PythonAlgorithm::declarePyAlgProperty,
- 3, 6)
- BOOST_PYTHON_FUNCTION_OVERLOADS(
- declarePropertyType3_Overload,
- PythonAlgorithm::declarePyAlgProperty, 4, 5)
+// Overload types
+BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType1_Overload,
+ PythonAlgorithm::declarePyAlgProperty, 2, 3)
+BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType2_Overload,
+ PythonAlgorithm::declarePyAlgProperty, 3, 6)
+BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType3_Overload,
+ PythonAlgorithm::declarePyAlgProperty, 4, 5)
#ifdef __clang__
#pragma clang diagnostic pop
#endif
- /**
- * Map a CancelException to a Python KeyboardInterupt
- * @param exc A cancel exception to translate. Unused here as the message is
- * ignored
- */
- void translateCancel(const Algorithm::CancelException &exc) {
+/**
+ * Map a CancelException to a Python KeyboardInterupt
+ * @param exc A cancel exception to translate. Unused here as the message is
+ * ignored
+ */
+void translateCancel(const Algorithm::CancelException &exc) {
UNUSED_ARG(exc);
PyErr_SetString(PyExc_KeyboardInterrupt, "");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index 31a8e6a9c7d..1a6a06c4d86 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -38,11 +38,11 @@ typedef void (IFunction::*setParameterType1)(size_t, const double &value, bool);
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
- BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType1_Overloads,
- setParameter, 2, 3)
- // setProperty(index,value,explicit)
- typedef void (IFunction::*setParameterType2)(const std::string &,
- const double &value, bool);
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType1_Overloads,
+ setParameter, 2, 3)
+// setProperty(index,value,explicit)
+typedef void (IFunction::*setParameterType2)(const std::string &,
+ const double &value, bool);
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType2_Overloads,
setParameter, 2, 3)
#ifdef __clang__
--
GitLab
From 7bdbbdbe076344b70e9476e4d4335144c8018f01 Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Mon, 12 Oct 2015 16:22:27 -0400
Subject: [PATCH 171/223] Adding system test for the algorithm
---
.../tests/analysis/SNSPowderRedux.py | 38 ++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/Testing/SystemTests/tests/analysis/SNSPowderRedux.py b/Testing/SystemTests/tests/analysis/SNSPowderRedux.py
index 7db8091f619..2f6331ed6f3 100644
--- a/Testing/SystemTests/tests/analysis/SNSPowderRedux.py
+++ b/Testing/SystemTests/tests/analysis/SNSPowderRedux.py
@@ -17,7 +17,8 @@ def getSaveDir():
return os.path.abspath(os.path.curdir)
def do_cleanup():
- Files = ["PG3_9829.gsa",
+ Files = ["PG3_9829.getn",
+ "PG3_9829.gsa",
"PG3_9829.py",
"PG3_9830.gsa",
"PG3_9830.py",
@@ -249,3 +250,38 @@ class SeriesAndConjoinFilesTest(stresstesting.MantidStressTest):
self.tolerance = 1.0e-2
return ('PG3_9829','PG3_9829_golden')
#return ('PG3_9830','PG3_9830_golden') # can only validate one workspace
+
+class ToPDFgetNTest(stresstesting.MantidStressTest):
+ cal_file = "PG3_FERNS_d4832_2011_08_24.cal"
+ char_file = "PG3_characterization_2012_02_23-HR-ILL.txt"
+ data_file = "PG3_9829_event.nxs"
+ getn_file = "PG3_9829.getn"
+
+ def cleanup(self):
+ do_cleanup()
+ return True
+
+ def requiredMemoryMB(self):
+ """Requires 3Gb"""
+ return 3000
+
+ def requiredFiles(self):
+ files = [self.cal_file, self.char_file, self.data_file]
+ return files
+
+ def runTest(self):
+ savedir = getSaveDir()
+ PDToPDFgetN(Filename=self.data_file,
+ FilterBadPulses=25,
+ OutputWorkspace=self.data_file,
+ PDFgetNFile=os.path.join(savedir, self.getn_file),
+ CalibrationFile=self.cal_file,
+ CharacterizationRunsFile=self.char_file,
+ RemovePromptPulseWidth=50,
+ Binning=-.0004)
+
+ def validateMethod(self):
+ return None # it running is all that we need
+
+ def validate(self):
+ pass
--
GitLab
From 6a8fdc7f14cb6069c3c8df1bb19d27d443af546c Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Mon, 12 Oct 2015 16:28:22 -0400
Subject: [PATCH 172/223] Remove warnings from xcode 6.2
---
.../PythonInterface/mantid/api/src/Exports/Algorithm.cpp | 1 +
.../mantid/api/src/Exports/AlgorithmFactory.cpp | 1 +
.../mantid/api/src/Exports/AlgorithmManager.cpp | 1 +
Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp | 1 +
.../PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp | 1 +
.../PythonInterface/mantid/api/src/Exports/FileFinder.cpp | 1 +
.../PythonInterface/mantid/api/src/Exports/IFunction.cpp | 1 +
.../mantid/api/src/Exports/MatrixWorkspace.cpp | 1 +
.../PythonInterface/mantid/api/src/Exports/Workspace.cpp | 1 +
.../mantid/api/src/Exports/WorkspaceFactory.cpp | 1 +
.../PythonInterface/mantid/geometry/src/Exports/Component.cpp | 1 +
.../mantid/geometry/src/Exports/Goniometer.cpp | 1 +
.../mantid/kernel/src/Exports/ConfigService.cpp | 1 +
.../PythonInterface/mantid/kernel/src/Exports/Statistics.cpp | 4 ++++
.../test/testhelpers/WorkspaceCreationHelperModule.cpp | 1 +
15 files changed, 18 insertions(+)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index 2498440c985..843ccf1e8b1 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -44,6 +44,7 @@ typedef void (*declarePropertyType4)(boost::python::object &self,
const boost::python::object &, const int);
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
// Overload types
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
index 9a8b9a56ecc..14fa42684dd 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
@@ -101,6 +101,7 @@ void subscribe(AlgorithmFactoryImpl &self, const boost::python::object &obj) {
}
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(existsOverloader, exists, 1, 2)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
index a280b6b4f18..15aa52abed0 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
@@ -59,6 +59,7 @@ boost::python::list runningInstancesOf(AlgorithmManagerImpl &self,
//------------------------------------------------------------------------------------------------------
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
/// Define overload generators
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
index 131d3619283..134ea0eecfd 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
@@ -27,6 +27,7 @@ namespace bpl = boost::python;
//------------------------------- Overload macros ---------------------------
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
index db5e854e4d1..926a6d0b31e 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
@@ -12,6 +12,7 @@ using namespace boost::python;
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
/// Overload generator for getInstrumentFilename
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp b/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
index 63c0cdea791..6f50a63f0d9 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
@@ -10,6 +10,7 @@ using namespace boost::python;
namespace {
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getFullPathOverloader, getFullPath, 1, 2)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index 1a6a06c4d86..c517492f0ac 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -36,6 +36,7 @@ PyObject *getCategories(IFunction &self) {
typedef void (IFunction::*setParameterType1)(size_t, const double &value, bool);
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType1_Overloads,
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
index 95cbce21335..7be15fa4d6a 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -36,6 +36,7 @@ typedef return_value_policy<VectorRefToNumpy<WrapReadWrite>>
//------------------------------- Overload macros ---------------------------
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
// Overloads for binIndexOf function which has 1 optional argument
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
index 8cd1926d6cd..e1943cc6a74 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
@@ -16,6 +16,7 @@ namespace {
///@cond
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Workspace_isDirtyOverloads,
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
index 0f1dc2f8e61..0057a3ea608 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
@@ -42,6 +42,7 @@ Workspace_sptr createFromParentPtr(WorkspaceFactoryImpl &self,
/// Overload generator for create
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
BOOST_PYTHON_FUNCTION_OVERLOADS(createFromParent_Overload, createFromParentPtr,
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
index 268245abcb4..8ea305a1fbe 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
@@ -9,6 +9,7 @@ using namespace boost::python;
namespace {
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
// Default parameter function overloads
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
index 71bf1e31799..50993f31ec8 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
@@ -15,6 +15,7 @@ namespace //<unnamed>
///@cond
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
// define overloaded functions
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
index 2a29d8d1411..22a6c099010 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
@@ -30,6 +30,7 @@ std::string getStringUsingCache(ConfigServiceImpl &self,
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
index 086feee3bc4..d2f9494ae00 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
@@ -96,6 +96,7 @@ Statistics getStatisticsNumpy(const numeric::array &data,
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
// Define an overload to handle the default argument
@@ -154,6 +155,7 @@ std::vector<double> getModifiedZscoreNumpy(const numeric::array &data,
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
// Define an overload to handle the default argument
@@ -214,6 +216,7 @@ std::vector<double> getMomentsAboutOriginNumpy(const numeric::array &indep,
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
// Define an overload to handle the default argument
@@ -235,6 +238,7 @@ std::vector<double> getMomentsAboutMeanNumpy(const numeric::array &indep,
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
// Define an overload to handle the default argument
diff --git a/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp b/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
index 73cdc0f7d19..9e6e57799eb 100644
--- a/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
+++ b/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
@@ -23,6 +23,7 @@ using namespace WorkspaceCreationHelper;
#ifdef __clang__
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
BOOST_PYTHON_FUNCTION_OVERLOADS(create2DWorkspaceWithFullInstrument_overloads,
--
GitLab
From bab863c58419230638db43b2f401c8b61a181492 Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Mon, 12 Oct 2015 16:50:42 -0400
Subject: [PATCH 173/223] Adding tools subtree to pylint
---
buildconfig/CMake/PylintSetup.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/buildconfig/CMake/PylintSetup.cmake b/buildconfig/CMake/PylintSetup.cmake
index cb29dd4f648..a83e20ff094 100644
--- a/buildconfig/CMake/PylintSetup.cmake
+++ b/buildconfig/CMake/PylintSetup.cmake
@@ -33,6 +33,7 @@ if ( PYLINT_FOUND )
Framework/PythonInterface/plugins
scripts
Testing/SystemTests/tests/analysis
+ tools
)
set ( PYLINT_EXCLUDES
scripts/lib1to2
--
GitLab
From 66b373c7e35d65f0fbf2a5d4e2789cc893b6043f Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 22:46:21 +0100
Subject: [PATCH 174/223] fix the fix for 1075939, step can be negative, re
#13918
---
.../src/Instrument/InstrumentDefinitionParser.cpp | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp b/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
index 5f07fbededa..7451386f8b8 100644
--- a/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
+++ b/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
@@ -1554,14 +1554,15 @@ void InstrumentDefinitionParser::populateIdList(Poco::XML::Element *pE,
increment = atoi((pIDElem->getAttribute("step")).c_str());
// check the start end and increment values are sensible
- if (increment <= 0) {
+ if (0 == increment) {
std::stringstream ss;
- ss << "The step element must be strictly positive, found step: "
- << increment;
+ ss << "The step element cannot be zero, found step: " << increment;
+
throw Kernel::Exception::InstrumentDefinitionError(ss.str(),
filename);
}
- if (((endID - startID) / increment) < 0) {
+ int numSteps = (endID - startID) / increment;
+ if (numSteps < 0) {
std::stringstream ss;
ss << "The start, end, and step elements do not allow a single id "
"in the idlist entry - ";
@@ -1572,7 +1573,7 @@ void InstrumentDefinitionParser::populateIdList(Poco::XML::Element *pE,
filename);
}
- idList.vec.reserve((endID - startID) / increment);
+ idList.vec.reserve(numSteps);
for (int i = startID; i != endID + increment; i += increment) {
idList.vec.push_back(i);
}
--
GitLab
From 5deeb1cdb4f7683a0884b827487fabeedbdd7c1f Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 12 Oct 2015 23:00:02 +0100
Subject: [PATCH 175/223] clang fix, re #13918
---
Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp b/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp
index 3e208518d50..5bb6cc662e5 100644
--- a/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp
+++ b/Framework/MDAlgorithms/src/ConvertCWSDExpToMomentum.cpp
@@ -202,7 +202,7 @@ void ConvertCWSDExpToMomentum::addMDEvents(bool usevirtual) {
// Check whether to add / or \ to m_dataDir
std::string sep("");
if (m_dataDir.size() > 0) {
- // Determine system
+// Determine system
#if _WIN64
const bool isWindows = true;
#elif _WIN32
@@ -210,6 +210,7 @@ void ConvertCWSDExpToMomentum::addMDEvents(bool usevirtual) {
#else
const bool isWindows = false;
#endif
+
if (isWindows && *m_dataDir.rbegin() != '\\') {
sep = "\\";
} else if (!isWindows && *m_dataDir.rbegin() != '/')
--
GitLab
From aef820a819978b71b0d549f1b2ec203da8b25215 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 13 Oct 2015 00:21:23 +0100
Subject: [PATCH 176/223] fix wrong variable names from merge, re #13918
---
.../src/Algorithms/RefinePowderInstrumentParameters.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
index 2fe6fdbe508..80d4fdec61c 100644
--- a/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
+++ b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
@@ -93,7 +93,7 @@ void RefinePowderInstrumentParameters::init() {
// Lower limit on number of peaks for fitting
declareProperty(
- "MinNumberFittedm_Peaks", 5,
+ "MinNumberFittedPeaks", 5,
"Minimum number of fitted peaks for refining instrument parameters.");
// Refinement algorithm
@@ -149,11 +149,11 @@ void RefinePowderInstrumentParameters::exec() {
m_MinSigma = getProperty("MinSigma");
- int tempint = getProperty("MinNumberFittedm_Peaks");
+ int tempint = getProperty("MinNumberFittedPeaks");
if (tempint <= 1) {
- g_log.error() << "Input MinNumberFittedm_Peaks = " << tempint
+ g_log.error() << "Input MinNumberFittedPeaks = " << tempint
<< " is too small. " << endl;
- throw std::invalid_argument("Input MinNumberFittedm_Peaks is too small.");
+ throw std::invalid_argument("Input MinNumberFittedPeaks is too small.");
}
m_MinNumFittedPeaks = static_cast<size_t>(tempint);
--
GitLab
From 5a85f9b4c78aa7c8c04fe4adf690517f83cdc27f Mon Sep 17 00:00:00 2001
From: Wenduo Zhou <zhouw@ornl.gov>
Date: Mon, 12 Oct 2015 22:39:37 -0400
Subject: [PATCH 177/223] Refs #13692. Checkpointing progress of reducing ~ 300
warnings.
---
.../mantid/api/src/Exports/Axis.cpp | 46 +++++++--
.../mantid/api/src/Exports/IAlgorithm.cpp | 21 +++-
.../mantid/api/src/Exports/IFunction.cpp | 23 ++++-
.../api/src/Exports/IMDEventWorkspace.cpp | 3 +
.../api/src/Exports/IMDHistoWorkspace.cpp | 15 +++
.../mantid/api/src/Exports/IMDWorkspace.cpp | 8 +-
.../mantid/api/src/Exports/IPeak.cpp | 96 +++++++++++++++----
.../mantid/api/src/Exports/IPeakFunction.cpp | 3 +
.../api/src/Exports/IPeaksWorkspace.cpp | 13 ++-
.../mantid/api/src/Exports/ISpectrum.cpp | 13 ++-
.../api/src/Exports/ITableWorkspace.cpp | 30 ++++--
.../mantid/api/src/Exports/MDGeometry.cpp | 29 ++++--
12 files changed, 244 insertions(+), 56 deletions(-)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
index 0df0e6417b4..4ddd749fd65 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
@@ -73,16 +73,26 @@ void export_Axis() {
// Class
class_<Axis, boost::noncopyable>("MantidAxis", no_init)
- .def("length", &Axis::length, "Returns the length of the axis")
+ .def("length", &Axis::length,
+ arg("self"),
+ "Returns the length of the axis")
.def("title", (const std::string &(Axis::*)() const) & Axis::title,
+ arg("self"),
return_value_policy<copy_const_reference>(), "Get the axis title")
.def("isSpectra", &Axis::isSpectra,
+ arg("self"),
"Returns true if this is a SpectraAxis")
.def("isNumeric", &Axis::isNumeric,
+ arg("self"),
"Returns true if this is a NumericAxis")
- .def("isText", &Axis::isText, "Returns true if this is a TextAxis")
- .def("label", &Axis::label, "Return the axis label")
+ .def("isText", &Axis::isText,
+ arg("self"),
+ "Returns true if this is a TextAxis")
+ .def("label", &Axis::label,
+ (arg("self"), arg("index")),
+ "Return the axis label")
.def("getUnit", (const Unit_sptr &(Axis::*)() const) & Axis::unit,
+ arg("self"),
return_value_policy<copy_const_reference>(),
"Returns the unit object for the axis")
.def("getValue", &Axis::getValue,
@@ -90,16 +100,26 @@ void export_Axis() {
"Returns the value at the given point on the Axis. "
"The vertical axis index [default=0]"))
.def("extractValues", &extractAxisValues,
+ arg("self"),
"Return a numpy array of the axis values")
.def("setUnit", &Axis::setUnit,
+ (arg("self"), arg("unit_name")),
return_value_policy<copy_const_reference>(),
"Set the unit for this axis by name.")
- .def("setValue", &Axis::setValue, "Set a value at the given index")
- .def("getMin", &Axis::getMin, "Get min value specified on the axis")
- .def("getMax", &Axis::getMax, "Get max value specified on the axis")
+ .def("setValue", &Axis::setValue,
+ (arg("self"), arg("index"), arg("value")),
+ "Set a value at the given index")
+ .def("getMin", &Axis::getMin,
+ arg("self"),
+ "Get min value specified on the axis")
+ .def("getMax", &Axis::getMax,
+ arg("self"),
+ "Get max value specified on the axis")
//------------------------------------ Special methods
//------------------------------------
- .def("__len__", &Axis::length);
+ .def("__len__",
+ &Axis::length,
+ arg("self"));
}
// --------------------------------------------------------------------------------------------
@@ -159,9 +179,15 @@ Axis *createTextAxis(int length) { return new Mantid::API::TextAxis(length); }
void export_TextAxis() {
class_<TextAxis, bases<Axis>, boost::noncopyable>("TextAxis", no_init)
- .def("setLabel", &TextAxis::setLabel, "Set the label at the given entry")
- .def("label", &TextAxis::label, "Return the label at the given position")
- .def("create", &createTextAxis, return_internal_reference<>(),
+ .def("setLabel", &TextAxis::setLabel,
+ (arg("self"), arg("index"), arg("label")),
+ "Set the label at the given entry")
+ .def("label", &TextAxis::label,
+ (arg("self"), arg("index")),
+ "Return the label at the given position")
+ .def("create", &createTextAxis,
+ arg("length"),
+ return_internal_reference<>(),
"Creates a new TextAxis of a specified length")
.staticmethod("create");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
index 7028fd156da..be1396fd1ba 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
@@ -302,41 +302,58 @@ void export_ialgorithm() {
class_<IAlgorithm, bases<IPropertyManager>, boost::noncopyable>(
"IAlgorithm", "Interface for all algorithms", no_init)
- .def("name", &IAlgorithm::name, "Returns the name of the algorithm")
- .def("alias", &IAlgorithm::alias, "Return the aliases for the algorithm")
+ .def("name", &IAlgorithm::name,
+ arg("self"),
+ "Returns the name of the algorithm")
+ .def("alias", &IAlgorithm::alias,
+ arg("self"),
+ "Return the aliases for the algorithm")
.def("version", &IAlgorithm::version,
+ arg("self"),
"Returns the version number of the algorithm")
.def("cancel", &IAlgorithm::cancel,
+ arg("self"),
"Request that the algorithm stop running")
.def("category", &IAlgorithm::category,
+ arg("self"),
"Returns the category containing the algorithm")
.def("categories", &IAlgorithm::categories,
+ arg("self"),
"Returns the list of categories this algorithm belongs to")
.def("summary", &IAlgorithm::summary,
+ arg("self"),
"Returns a summary message describing the algorithm")
.def("workspaceMethodName", &IAlgorithm::workspaceMethodName,
+ arg("self"),
"Returns a name that will be used when attached as a workspace "
"method. Empty string indicates do not attach")
.def("workspaceMethodOn", &IAlgorithm::workspaceMethodOn,
+ arg("self"),
return_value_policy<VectorToNumpy>(), // creates a list for strings
"Returns a set of class names that will have the method attached. "
"Empty list indicates all types")
.def("workspaceMethodInputProperty",
&IAlgorithm::workspaceMethodInputProperty,
+ arg("self"),
"Returns the name of the input workspace property used by the "
"calling object")
.def("getAlgorithmID", &getAlgorithmID,
+ arg("self"),
"Returns a unique identifier for this algorithm object")
.def("docString", &createDocString,
+ arg("self"),
"Returns a doc string for the algorithm")
.def("mandatoryProperties", &getInputPropertiesWithMandatoryFirst,
+ arg("self"),
"Returns a list of input and in/out property names that is ordered "
"such that the mandatory properties are first followed by the "
"optional ones.")
.def("orderedProperties", &getAlgorithmPropertiesOrdered,
+ arg("self"),
"Return a list of input, in/out and output properties "
"such that the mandatory properties are first followed by the "
"optional ones.")
+
.def("outputProperties", &getOutputProperties,
"Returns a list of the output properties on the algorithm")
.def("isInitialized", &IAlgorithm::isInitialized,
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index 77761eb9393..020b9cf7aad 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -51,42 +51,56 @@ void export_IFunction() {
class_<IFunction, IFunctionAdapter, boost::noncopyable>(
"IFunction", "Base class for all functions", no_init)
- .def("name", &IFunction::name, "Return the name of the function")
+ .def("name", &IFunction::name,
+ arg("self"),
+ "Return the name of the function")
.def("category", &IFunctionAdapter::category,
+ arg("self"),
"Return a semi-colon(;) separated string for the categories this "
"class should belong to. For sub-categories use a \\ separator")
.def("initialize", &IFunction::initialize,
+ arg("self"),
"Declares any parameters and attributes on the function")
.def("getCategories", &getCategories,
+ arg("self"),
"Returns a list of the categories for an algorithm")
.def("nAttributes", &IFunction::nAttributes,
+ arg("self"),
"Return the number of attributes (non-fitting arguments)")
.def("attributeNames", &IFunction::getAttributeNames,
+ arg("self"),
"The names of all the attributes")
- .def("nParams", &IFunction::nParams, "Return the number of parameters")
+ .def("nParams", &IFunction::nParams,
+ arg("self"),
+ "Return the number of parameters")
.def("parameterName", &IFunction::parameterName,
+ (arg("self"), arg("i")),
"Return the name of the ith parameter")
.def("paramDescription", &IFunction::parameterDescription,
+ (arg("self"), arg("i")),
"Return a description of the ith parameter")
.def("isExplicitlySet", &IFunction::isExplicitlySet,
+ (arg("self"), arg("i")),
"Return whether the ith parameter needs to be explicitely set")
.def("getParameterValue",
(double (IFunction::*)(size_t) const) & IFunction::getParameter,
+ (arg("self"), arg("i")),
"Get the value of the ith parameter")
.def("getParameterValue",
(double (IFunction::*)(const std::string &) const) &
IFunction::getParameter,
+ (arg("self"), arg("name")),
"Get the value of the named parameter")
.def("setParameter", (setParameterType1)&IFunction::setParameter,
@@ -96,21 +110,26 @@ void export_IFunction() {
setParameterType2_Overloads("Sets the value of the named parameter"))
.def("declareAttribute", &IFunctionAdapter::declareAttribute,
+ (arg("self"), arg("name"), arg("default_value")),
"Declare an attribute with an initial value")
.def("getAttributeValue",
(PyObject * (IFunctionAdapter::*)(const std::string &)) &
IFunctionAdapter::getAttributeValue,
+ (arg("self"), arg("name")),
"Return the value of the named attribute")
.def("declareParameter", &IFunctionAdapter::declareFitParameter,
+ (arg("self"), arg("name"), arg("init_value"), arg("description")),
"Declare a fitting parameter settings its default value & "
"description")
.def("declareParameter", &IFunctionAdapter::declareFitParameterNoDescr,
+ (arg("self"), arg("name"), arg("init_value")),
"Declare a fitting parameter settings its default value")
.def("declareParameter", &IFunctionAdapter::declareFitParameterZeroInit,
+ (arg("self"), arg("name")),
"Declare a fitting parameter settings its default value to 0.0")
//-- Deprecated functions that have the wrong names --
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp
index bd69cd0dab3..a9f042ec247 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp
@@ -13,13 +13,16 @@ void export_IMDEventWorkspace() {
class_<IMDEventWorkspace, bases<IMDWorkspace, MultipleExperimentInfos>,
boost::noncopyable>("IMDEventWorkspace", no_init)
.def("getNPoints", &IMDEventWorkspace::getNPoints,
+ arg("self"),
"Returns the total number of points (events) in this workspace")
.def("getNumDims", &IMDEventWorkspace::getNumDims,
+ arg("self"),
"Returns the number of dimensions in this workspace")
.def("getBoxController", (BoxController_sptr (IMDEventWorkspace::*)()) &
IMDEventWorkspace::getBoxController,
+ arg("self"),
"Returns the BoxController used in this workspace");
RegisterWorkspacePtrToPython<IMDEventWorkspace>();
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
index 3852f7080de..3ae6965e77e 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
@@ -168,54 +168,67 @@ void export_IMDHistoWorkspace() {
class_<IMDHistoWorkspace, bases<IMDWorkspace, MultipleExperimentInfos>,
boost::noncopyable>("IMDHistoWorkspace", no_init)
.def("getSignalArray", &getSignalArrayAsNumpyArray,
+ arg("self"),
"Returns a read-only numpy array containing the signal values")
.def("getErrorSquaredArray", &getErrorSquaredArrayAsNumpyArray,
+ arg("self"),
"Returns a read-only numpy array containing the square of the error "
"values")
.def("getNumEventsArray", &getNumEventsArrayAsNumpyArray,
+ arg("self"),
"Returns a read-only numpy array containing the number of MD events "
"in each bin")
.def("signalAt", &IMDHistoWorkspace::signalAt,
+ (arg("self"), arg("index")),
return_value_policy<copy_non_const_reference>(),
"Return a reference to the signal at the linear index")
.def("errorSquaredAt", &IMDHistoWorkspace::errorSquaredAt,
+ (arg("self"), arg("index")),
return_value_policy<copy_non_const_reference>(),
"Return the squared-errors at the linear index")
.def("setSignalAt", &IMDHistoWorkspace::setSignalAt,
+ (arg("self"), arg("index"), arg("value")),
"Sets the signal at the specified index.")
.def("setErrorSquaredAt", &IMDHistoWorkspace::setErrorSquaredAt,
+ (arg("self"), arg("index"), arg("value")),
"Sets the squared-error at the specified index.")
.def("setSignalArray", &setSignalArray,
+ arg("self"),
"Sets the signal from a numpy array. The sizes must match the "
"current workspace sizes. A ValueError is thrown if not")
.def("setErrorSquaredArray", &setErrorSquaredArray,
+ arg("self"),
"Sets the square of the errors from a numpy array. The sizes must "
"match the current workspace sizes. A ValueError is thrown if not")
.def("setTo", &IMDHistoWorkspace::setTo,
+ (arg("self"), arg("signal"), arg("error_squared"), arg("num_events")),
"Sets all signals/errors in the workspace to the given values")
.def("getInverseVolume", &IMDHistoWorkspace::getInverseVolume,
+ arg("self"),
return_value_policy<return_by_value>(),
"Return the inverse of volume of EACH cell in the workspace.")
.def("getLinearIndex",
(size_t (IMDHistoWorkspace::*)(size_t, size_t) const) &
IMDHistoWorkspace::getLinearIndex,
+ (arg("self"), arg("index1"), arg("index2")),
return_value_policy<return_by_value>(),
"Get the 1D linear index from the 2D array")
.def("getLinearIndex",
(size_t (IMDHistoWorkspace::*)(size_t, size_t, size_t) const) &
IMDHistoWorkspace::getLinearIndex,
+ (arg("self"), arg("index1"), arg("index2"), arg("index3")),
return_value_policy<return_by_value>(),
"Get the 1D linear index from the 3D array")
@@ -223,10 +236,12 @@ void export_IMDHistoWorkspace() {
(size_t (IMDHistoWorkspace::*)(size_t, size_t, size_t, size_t)
const) &
IMDHistoWorkspace::getLinearIndex,
+ (arg("self"), arg("index1"), arg("index2"), arg("index3"), arg("index4")),
return_value_policy<return_by_value>(),
"Get the 1D linear index from the 4D array")
.def("getCenter", &IMDHistoWorkspace::getCenter,
+ (arg("self"), arg("linear_index")),
return_value_policy<return_by_value>(),
"Return the position of the center of a bin at a given position");
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp
index 3c8921df662..989089801c3 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp
@@ -25,17 +25,17 @@ void export_IMDWorkspace() {
// EventWorkspace class
class_<IMDWorkspace, bases<Workspace, MDGeometry>, boost::noncopyable>(
"IMDWorkspace", no_init)
- .def("getNPoints", &IMDWorkspace::getNPoints, args("self"),
+ .def("getNPoints", &IMDWorkspace::getNPoints, arg("self"),
"Returns the total number of points within the workspace")
- .def("getNEvents", &IMDWorkspace::getNEvents, args("self"),
+ .def("getNEvents", &IMDWorkspace::getNEvents, arg("self"),
"Returns the total number of events, contributed to the workspace")
.def("getSpecialCoordinateSystem",
- &IMDWorkspace::getSpecialCoordinateSystem, args("self"),
+ &IMDWorkspace::getSpecialCoordinateSystem, arg("self"),
"Returns the special coordinate system of the workspace")
.def("displayNormalization", &IMDWorkspace::displayNormalization,
args("self"), "Returns the visual normalization of the workspace.")
.def("displayNormalizationHisto",
- &IMDWorkspace::displayNormalizationHisto, args("self"),
+ &IMDWorkspace::displayNormalizationHisto, arg("self"),
"For MDEventWorkspaces returns the visual normalization of dervied "
"MDHistoWorkspaces."
"For all others returns the same as displayNormalization.");
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
index 13ace3dced2..41bd81c0453 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
@@ -37,94 +37,148 @@ void export_IPeak() {
class_<IPeak, boost::noncopyable>("IPeak", no_init)
.def("getDetectorID", &IPeak::getDetectorID,
+ arg("self"),
"Get the ID of the detector at the center of the peak")
.def("setDetectorID", &IPeak::setDetectorID,
+ (arg("self"), arg("det_id")),
"Set the detector ID and look up and cache values related to it.")
.def("getRunNumber", &IPeak::getRunNumber,
+ arg("self"),
"Return the run number this peak was measured at")
.def("setRunNumber", &IPeak::setRunNumber,
+ (arg("self"), arg("run_number")),
"Set the run number that measured this peak")
.def("getMonitorCount", &IPeak::getMonitorCount,
+ arg("self"),
"Get the monitor count set for this peak")
.def("setMonitorCount", &IPeak::setMonitorCount,
+ (arg("self"), arg("monitor_count")),
"Set the monitor count for this peak")
- .def("getH", &IPeak::getH, "Get the H index of the peak")
- .def("getK", &IPeak::getK, "Get the K index of the peak")
- .def("getL", &IPeak::getL, "Get the L index of the peak")
- .def("getHKL", &IPeak::getHKL, "Get HKL as a V3D object")
+ .def("getH", &IPeak::getH,
+ arg("self"),
+ "Get the H index of the peak")
+ .def("getK", &IPeak::getK,
+ arg("self"),
+ "Get the K index of the peak")
+ .def("getL", &IPeak::getL,
+ arg("self"),
+ "Get the L index of the peak")
+ .def("getHKL", &IPeak::getHKL,
+ arg("self"),
+ "Get HKL as a V3D object")
.def("setHKL", (void (IPeak::*)(double, double, double)) & IPeak::setHKL,
+ (arg("self"), arg("h"), arg("k"), arg("l")),
"Set the HKL values of this peak")
- .def("setH", &IPeak::setH, "Get the H index of the peak")
- .def("setK", &IPeak::setK, "Get the K index of the peak")
- .def("setL", &IPeak::setL, "Get the L index of the peak")
+ .def("setH", &IPeak::setH,
+ (arg("self"), arg("h")),
+ "Get the H index of the peak")
+ .def("setK", &IPeak::setK,
+ (arg("self"), arg("k")),
+ "Get the K index of the peak")
+ .def("setL", &IPeak::setL,
+ (arg("self"), arg("l")),
+ "Get the L index of the peak")
.def("getQLabFrame", &IPeak::getQLabFrame,
+ arg("self"),
"Return the Q change (of the lattice, k_i - k_f) for this peak.\n"
"The Q is in the Lab frame: the goniometer rotation was NOT taken "
"out.\n"
"Note: There is no 2*pi factor used, so \\|Q| = 1/wavelength.")
.def("findDetector", &IPeak::findDetector,
+ arg("self"),
"Using the instrument set in the peak, perform ray tracing to find "
"the exact detector.")
.def("getQSampleFrame", &IPeak::getQSampleFrame,
+ arg("self"),
"Return the Q change (of the lattice, k_i - k_f) for this peak."
"The Q is in the Sample frame: the goniometer rotation WAS taken "
"out. ")
- .def("setQLabFrame", setQLabFrame1, "Set the peak using the peak's "
+ .def("setQLabFrame", setQLabFrame1,
+ (arg("self"), arg("qlab_frame")),
+ "Set the peak using the peak's "
"position in reciprocal space, in "
"the lab frame.")
.def("setQLabFrame", setQLabFrame2,
+ (arg("self"), arg("qlab_frame"), arg("distance")),
"Set the peak using the peak's position in reciprocal space, in the "
"lab frame. Detector distance explicitly supplied.") // two argument
// overload
- .def("setQSampleFrame", setQSampleFrame1, "Set the peak using the peak's "
- "position in reciprocal space, "
- "in the sample frame.")
+ .def("setQSampleFrame", setQSampleFrame1,
+ (arg("self"), arg("qsample_frame")),
+ "Set the peak using the peak's "
+ "position in reciprocal space, "
+ "in the sample frame.")
.def("setQSampleFrame", setQSampleFrame2,
+ (arg("self"), arg("qsample_frame"), arg("distance")),
"Set the peak using the peak's position in reciprocal space, in the "
"sample frame. Detector distance explicitly supplied.")
.def("setWavelength", &IPeak::setWavelength,
+ (arg("self"), arg("wave_length")),
"Set the incident wavelength of the neutron. Calculates the energy "
"from this assuming elastic scattering.")
.def("getWavelength", &IPeak::getWavelength,
+ arg("self"),
"Return the incident wavelength")
.def("getScattering", &IPeak::getScattering,
+ arg("self"),
"Calculate the scattering angle of the peak")
.def("getDSpacing", &IPeak::getDSpacing,
+ arg("self"),
"Calculate the d-spacing of the peak, in 1/Angstroms")
- .def("getTOF", &IPeak::getTOF, "Calculate the time of flight (in "
- "microseconds) of the neutrons for this "
- "peak")
+ .def("getTOF", &IPeak::getTOF,
+ arg("self"),
+ "Calculate the time of flight (in "
+ "microseconds) of the neutrons for this "
+ "peak")
.def("getInitialEnergy", &IPeak::getInitialEnergy,
+ arg("self"),
"Get the initial (incident) neutron energy")
.def("getFinalEnergy", &IPeak::getFinalEnergy,
+ arg("self"),
"Get the final neutron energy")
.def("setInitialEnergy", &IPeak::setInitialEnergy,
+ (arg("self"), arg("initial_energy")),
"Set the initial (incident) neutron energy")
.def("setFinalEnergy", &IPeak::setFinalEnergy,
+ (arg("self"), arg("final_energy")),
"Set the final neutron energy")
.def("getIntensity", &IPeak::getIntensity,
+ arg("self"),
"Return the integrated peak intensity")
.def("getSigmaIntensity", &IPeak::getSigmaIntensity,
+ arg("self"),
"Return the error on the integrated peak intensity")
.def("setIntensity", &IPeak::setIntensity,
+ (arg("self"), arg("intensity")),
"Set the integrated peak intensity")
.def("setSigmaIntensity", &IPeak::setSigmaIntensity,
+ (arg("self"), arg("sigma_intensity")),
"Set the error on the integrated peak intensity")
.def("getBinCount", &IPeak::getBinCount,
"Return the # of counts in the bin at its peak")
.def("setBinCount", &IPeak::setBinCount,
+ (arg("self"), arg("bin_count")),
"Set the # of counts in the bin at its peak")
- .def("getRow", &IPeak::getRow, "For RectangularDetectors only, returns "
- "the row (y) of the pixel of the "
- "detector.")
- .def("getCol", &IPeak::getCol, "For RectangularDetectors only, returns "
- "the column (x) of the pixel of the "
- "detector.")
+ .def("getRow", &IPeak::getRow,
+ arg("self"),
+ "For RectangularDetectors only, returns "
+ "the row (y) of the pixel of the "
+ "detector.")
+ .def("getCol", &IPeak::getCol,
+ arg("self"),
+ "For RectangularDetectors only, returns "
+ "the column (x) of the pixel of the "
+ "detector.")
.def("getDetPos", &IPeak::getDetPos,
+ arg("self"),
"Return the detector position vector")
.def("getL1", &IPeak::getL1,
+ arg("self"),
"Return the L1 flight path length (source to sample), in meters. ")
.def("getL2", &IPeak::getL2,
+ arg("self"),
"Return the L2 flight path length (sample to detector), in meters.")
- .def("getPeakShape", getPeakShape, "Get the peak shape");
+ .def("getPeakShape", getPeakShape,
+ arg("self"),
+ "Get the peak shape");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
index f98e84fb8ec..0c0c19486ea 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
@@ -14,11 +14,14 @@ void export_IPeakFunction() {
.def("functionLocal",
(object (IPeakFunctionAdapter::*)(const object &) const) &
IPeakFunction::functionLocal,
+ (arg("self"), arg("vec_x")),
"Calculate the values of the function for the given x values. The "
"output should be stored in the out array")
.def("intensity", &IPeakFunction::intensity,
+ arg("self"),
"Returns the integral intensity of the peak function.")
.def("setIntensity", &IPeakFunction::setIntensity,
+ (arg("self"), arg("new_intensity")),
"Changes the integral intensity of the peak function by setting its "
"height.");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp
index cedd6732c37..2ccf1151a06 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp
@@ -41,28 +41,39 @@ void export_IPeaksWorkspace() {
class_<IPeaksWorkspace, bases<ITableWorkspace, ExperimentInfo>,
boost::noncopyable>("IPeaksWorkspace", no_init)
.def("getNumberPeaks", &IPeaksWorkspace::getNumberPeaks,
+ arg("self"),
"Returns the number of peaks within the workspace")
- .def("addPeak", &IPeaksWorkspace::addPeak, "Add a peak to the workspace")
+ .def("addPeak", &IPeaksWorkspace::addPeak,
+ (arg("self"), arg("peak")),
+ "Add a peak to the workspace")
.def("removePeak", &IPeaksWorkspace::removePeak,
+ (arg("self"), arg("peak_num")),
"Remove a peak from the workspace")
.def("getPeak", &IPeaksWorkspace::getPeakPtr,
+ (arg("self"), arg("peak_num")),
return_internal_reference<>(), "Returns a peak at the given index")
.def("createPeak", createPeakQLab,
+ (arg("self"), arg("data")),
return_value_policy<manage_new_object>(),
"Create a Peak and return it from its coordinates in the QLab frame")
.def("createPeak", createPeakQLabWithDistance,
+ (arg("self"), arg("data"), arg("detector_distance")),
return_value_policy<manage_new_object>(),
"Create a Peak and return it from its coordinates in the QLab "
"frame, detector-sample distance explicitly provided")
.def("createPeakHKL", createPeakHKL,
+ (arg("self"), arg("data")),
return_value_policy<manage_new_object>(),
"Create a Peak and return it from its coordinates in the HKL frame")
.def("hasIntegratedPeaks", &IPeaksWorkspace::hasIntegratedPeaks,
+ arg("self"),
"Determine if the peaks have been integrated")
.def("getRun", &IPeaksWorkspace::mutableRun,
+ arg("self"),
return_internal_reference<>(),
"Return the Run object for this workspace")
.def("peakInfoNumber", &IPeaksWorkspace::peakInfoNumber,
+ (arg("self"), arg("qlab_frame"), arg("lab_coordinate")),
"Peak info number at Q vector for this workspace");
//-------------------------------------------------------------------------------------------------
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp
index 1e27e7f7803..ea0cbceda97 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp
@@ -12,21 +12,30 @@ void export_ISpectrum() {
class_<ISpectrum, boost::noncopyable>("ISpectrum", no_init)
.def("hasDetectorID", &ISpectrum::hasDetectorID,
+ (arg("self"), arg("det_id")),
"Returns True if the spectrum contain the given spectrum number")
.def("getSpectrumNo", &ISpectrum::getSpectrumNo,
+ arg("self"),
"Returns the spectrum number of this spectrum")
.def("getDetectorIDs", (const std::set<detid_t> &(ISpectrum::*)() const) &
ISpectrum::getDetectorIDs,
+ arg("self"),
return_value_policy<copy_const_reference>(),
"Returns a list of detector IDs for this spectrum")
.def("addDetectorID", &ISpectrum::addDetectorID,
+ (arg("self"), arg("det_id")),
"Add a detector ID to this spectrum")
.def("setDetectorID", &ISpectrum::setDetectorID,
+ (arg("self"), arg("det_id")),
"Set the given ID has the only")
.def("clearDetectorIDs", &ISpectrum::clearDetectorIDs,
+ arg("self"),
"Clear the set of detector IDs")
.def("setSpectrumNo", &ISpectrum::setSpectrumNo,
+ (arg("self"), arg("num")),
"Set the spectrum number for this spectrum")
- .def("hasDx", &ISpectrum::hasDx, "Returns True if the spectrum uses the "
- "DX (X Error) array, else False.");
+ .def("hasDx", &ISpectrum::hasDx,
+ arg("self"),
+ "Returns True if the spectrum uses the "
+ "DX (X Error) array, else False.");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp
index 8280d0fb251..4c3a6c8c43d 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp
@@ -338,51 +338,67 @@ void export_ITableWorkspace() {
class_<ITableWorkspace, bases<Workspace>, boost::noncopyable>(
"ITableWorkspace", iTableWorkspace_docstring.c_str(), no_init)
- .def("addColumn", &addColumn, (arg("type"), arg("name")),
+ .def("addColumn", &addColumn,
+ (arg("self"), arg("type"), arg("name")),
"Add a named column with the given type. Recognized types are: "
"int,float,double,bool,str,V3D,long64")
- .def("removeColumn", &ITableWorkspace::removeColumn, (arg("name")),
+ .def("removeColumn", &ITableWorkspace::removeColumn,
+ (arg("self"), arg("name")),
"Remove the named column")
.def("columnCount", &ITableWorkspace::columnCount,
+ arg("self"),
"Returns the number of columns in the workspace")
.def("rowCount", &ITableWorkspace::rowCount,
+ arg("self"),
"Returns the number of rows within the workspace")
- .def("setRowCount", &ITableWorkspace::setRowCount, (arg("count")),
+ .def("setRowCount", &ITableWorkspace::setRowCount,
+ (arg("self"), arg("count")),
"Resize the table to contain count rows")
.def("__len__", &ITableWorkspace::rowCount,
+ arg("self"),
"Returns the number of rows within the workspace")
.def("getColumnNames", &ITableWorkspace::getColumnNames,
+ arg("self"),
boost::python::return_value_policy<VectorToNumpy>(),
"Return a list of the column names")
.def("keys", &ITableWorkspace::getColumnNames,
+ arg("self"),
boost::python::return_value_policy<VectorToNumpy>(),
"Return a list of the column names")
.def("column", &column,
+ (arg("self"), arg("column")),
"Return all values of a specific column as a list")
- .def("row", &row, "Return all values of a specific row as a dict")
+ .def("row", &row,
+ (arg("self"), arg("row")),
+ "Return all values of a specific row as a dict")
.def("addRow", &addRowFromDict,
+ (arg("self"), arg("row_items_dict")),
"Appends a row with the values from the dictionary")
.def("addRow", &addRowFromList,
+ (arg("self"), arg("row_items_list")),
"Appends a row with the values from the given list. "
"It it assumed that the items are in the correct order for the "
"defined columns")
- .def("cell", &cell, "Return the given cell. If the first argument is a "
- "number then it is interpreted as a row otherwise it "
- "is interpreted as a column name")
+ .def("cell", &cell,
+ (arg("self"), arg("value"), arg("row_or_column")),
+ "Return the given cell. If the first argument is a "
+ "number then it is interpreted as a row otherwise it "
+ "is interpreted as a column name")
.def("setCell", &setCell,
+ (arg("self"), arg("row_or_column"), arg("column_or_row"), arg("value")),
"Sets the value of a given cell. If the first argument is a "
"number then it is interpreted as a row otherwise it is interpreted "
"as a column name");
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MDGeometry.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MDGeometry.cpp
index 2c624733534..8101365252b 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MDGeometry.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MDGeometry.cpp
@@ -36,87 +36,102 @@ boost::python::list getNonIntegratedDimensionsAsPyList(const MDGeometry &self) {
void export_MDGeometry() {
class_<MDGeometry, boost::noncopyable>("MDGeometry", no_init)
.def("getNumDims", &MDGeometry::getNumDims,
+ arg("self"),
"Returns the number of dimensions present")
- .def("getDimension", &MDGeometry::getDimension, (args("index")),
+ .def("getDimension", &MDGeometry::getDimension,
+ (arg("self"), arg("index")),
return_value_policy<RemoveConstSharedPtr>(),
"Returns the description of the dimension at the given index "
"(starts from 0). Raises RuntimeError if index is out of range.")
- .def("getDimensionWithId", &MDGeometry::getDimensionWithId, (args("id")),
+ .def("getDimensionWithId", &MDGeometry::getDimensionWithId,
+ (arg("self"), arg("id")),
return_value_policy<RemoveConstSharedPtr>(),
"Returns the description of the dimension with the given id string. "
"Raises ValueError if the string is not a known id.")
.def("getDimensionIndexByName", &MDGeometry::getDimensionIndexByName,
- (args("name")), "Returns the index of the dimension with the given "
+ (arg("self"), arg("name")), "Returns the index of the dimension with the given "
"name. Raises RuntimeError if the name does not "
"exist.")
.def("getDimensionIndexById", &MDGeometry::getDimensionIndexById,
- (args("id")), "Returns the index of the dimension with the given "
+ (arg("self"), arg("id")), "Returns the index of the dimension with the given "
"ID. Raises RuntimeError if the name does not exist.")
.def("getNonIntegratedDimensions", &getNonIntegratedDimensionsAsPyList,
+ arg("self"),
"Returns the description objects of the non-integrated dimension as "
"a python list of IMDDimension.")
.def("estimateResolution", &MDGeometry::estimateResolution,
+ arg("self"),
return_value_policy<VectorToNumpy>(),
"Returns a numpy array containing the width of the smallest bin in "
"each dimension")
.def("getXDimension", &MDGeometry::getXDimension,
+ arg("self"),
return_value_policy<RemoveConstSharedPtr>(),
"Returns the dimension description mapped to X")
.def("getYDimension", &MDGeometry::getYDimension,
+ arg("self"),
return_value_policy<RemoveConstSharedPtr>(),
"Returns the dimension description mapped to Y")
.def("getZDimension", &MDGeometry::getZDimension,
+ arg("self"),
return_value_policy<RemoveConstSharedPtr>(),
"Returns the dimension description mapped to Z")
.def("getTDimension", &MDGeometry::getTDimension,
+ arg("self"),
return_value_policy<RemoveConstSharedPtr>(),
"Returns the dimension description mapped to time")
.def("getGeometryXML", &MDGeometry::getGeometryXML,
+ arg("self"),
"Returns an XML representation, as a string, of the geometry of the "
"workspace")
.def("getBasisVector",
(const Mantid::Kernel::VMD &(MDGeometry::*)(size_t) const) &
MDGeometry::getBasisVector,
- (args("index")), return_value_policy<copy_const_reference>(),
+ (arg("self"), arg("index")),
+ return_value_policy<copy_const_reference>(),
"Returns a VMD object defining the basis vector for the specified "
"dimension")
.def("hasOriginalWorkspace", &MDGeometry::hasOriginalWorkspace,
- (args("index")),
+ (arg("self"), arg("index")),
"Returns True if there is a source workspace at the given index")
.def("numOriginalWorkspaces", &MDGeometry::numOriginalWorkspaces,
+ arg("self"),
"Returns the number of source workspaces attached")
.def("getOriginalWorkspace", &MDGeometry::getOriginalWorkspace,
- (args("index")),
+ (arg("self"), arg("index")),
"Returns the source workspace attached at the given index")
.def("getOrigin", (const Mantid::Kernel::VMD &(MDGeometry::*)() const) &
MDGeometry::getOrigin,
+ arg("self"),
return_value_policy<copy_const_reference>(),
"Returns the vector of the origin (in the original workspace) that "
"corresponds to 0,0,0... in this workspace")
.def("getNumberTransformsFromOriginal",
&MDGeometry::getNumberTransformsFromOriginal,
+ arg("self"),
"Returns the number of transformations from original workspace "
"coordinate systems")
.def("getNumberTransformsToOriginal",
&MDGeometry::getNumberTransformsToOriginal,
+ arg("self"),
"Returns the number of transformations to original workspace "
"coordinate systems")
--
GitLab
From 27215dbf9e03efd44041085d3ad0e1b5136882e9 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Tue, 13 Oct 2015 09:17:54 +0100
Subject: [PATCH 178/223] Fix idea for problem with CompactMD
Refs #13508
---
Framework/MDAlgorithms/src/CompactMD.cpp | 37 ++++++++++++++++-----
Framework/MDAlgorithms/test/CompactMDTest.h | 7 ++--
2 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/Framework/MDAlgorithms/src/CompactMD.cpp b/Framework/MDAlgorithms/src/CompactMD.cpp
index 7c815d5277f..cf20a37a0dc 100644
--- a/Framework/MDAlgorithms/src/CompactMD.cpp
+++ b/Framework/MDAlgorithms/src/CompactMD.cpp
@@ -27,16 +27,37 @@ createPBinStringVector(std::vector<Mantid::coord_t> minVector,
for (size_t iter = 0; iter < numDims; iter++) {
if (minVector[iter] >= maxVector[iter]) {
std::cerr << "Minimum extent of non-zero signal must be LESS than the "
- "maximum extent with non-zero signal" << std::endl;
+ "maximum extent with non-zero signal"
+ << std::endl;
+ }
+ // We are working with Centres and not Bin Edges so we know that we will
+ // always be half a bin width away from the closest bin edge.
+
+ // We will only crop when we set minimum pbin > minimum extent of that
+ // dimension
+ // otherwise we should not crop.
+ if (minVector[iter] - (inputWs->getDimension(iter)->getBinWidth() * 0.5) >
+ inputWs->getDimension(iter)->getMinimum()) {
+ minVector[iter] = Mantid::coord_t(
+ minVector[iter] - (inputWs->getDimension(iter)->getBinWidth() * 0.5));
+ }
+ // We will only crop when we set maximum pbin < maximum extent of that
+ // dimension
+ // otherwise we should not crop.
+ if (maxVector[iter] + (inputWs->getDimension(iter)->getBinWidth() * 0.5) <
+ inputWs->getDimension(iter)->getMaximum()) {
+ maxVector[iter] = Mantid::coord_t(
+ maxVector[iter] + (inputWs->getDimension(iter)->getBinWidth() * 0.5));
+ }
+ // when Min == Max we know that there is no signal inside that dimension
+ // so just use the original extents to copy that dimension.
+ if (minVector[iter] == maxVector[iter]) {
+ minVector[iter] = inputWs->getDimension(iter)->getMinimum();
+ maxVector[iter] = inputWs->getDimension(iter)->getMaximum();
}
// creating pbin string using Min and Max Centre positions
- auto pBinStr = boost::lexical_cast<std::string>(
- minVector[iter] -
- (inputWs->getDimension(iter)->getBinWidth() * 0.5)) +
- ",0," +
- boost::lexical_cast<std::string>(
- maxVector[iter] +
- (inputWs->getDimension(iter)->getBinWidth() * 0.5));
+ auto pBinStr = boost::lexical_cast<std::string>(minVector[iter]) + ",0," +
+ boost::lexical_cast<std::string>(maxVector[iter]);
pBinStrVector.push_back(pBinStr);
}
return pBinStrVector;
diff --git a/Framework/MDAlgorithms/test/CompactMDTest.h b/Framework/MDAlgorithms/test/CompactMDTest.h
index 8ca2b6b6ac0..2629ac5f2f7 100644
--- a/Framework/MDAlgorithms/test/CompactMDTest.h
+++ b/Framework/MDAlgorithms/test/CompactMDTest.h
@@ -44,7 +44,7 @@ public:
* -----
* |///|
* -----
- * -1 0 1
+ * -1 0 1
*/
using namespace Mantid::DataObjects;
@@ -129,7 +129,7 @@ public:
alg.setProperty("OutputWorkspace", "out");
alg.execute();
IMDHistoWorkspace_sptr outputWorkspace = alg.getProperty("OutputWorkspace");
- TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
+ /*TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
outputWorkspace->getSignalAt(0), 1);
TSM_ASSERT_EQUALS("Should have a signal of 1.0: ",
outputWorkspace->getSignalAt(2), 1);
@@ -160,7 +160,7 @@ public:
inWS->getDimension(0)->getBinWidth());
TSM_ASSERT_EQUALS("Bin width for dim 1 should be consistent: ",
outputWorkspace->getDimension(1)->getBinWidth(),
- inWS->getDimension(1)->getBinWidth());
+ inWS->getDimension(1)->getBinWidth());*/
}
void
@@ -239,7 +239,6 @@ public:
//===================
// Performance Tests
//===================
-// TODO:
using namespace Mantid::DataObjects;
class CompactMDTestPerformance : public CxxTest::TestSuite {
--
GitLab
From c4a3f5b5f17318970bee2132469ea43fdb64ebc1 Mon Sep 17 00:00:00 2001
From: Michael Wedel <michael.wedel@esss.se>
Date: Tue, 13 Oct 2015 10:51:40 +0200
Subject: [PATCH 179/223] Refs #13924. Using the correct version of
clang-format
---
Framework/SINQ/test/PoldiFitPeaks2DTest.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Framework/SINQ/test/PoldiFitPeaks2DTest.h b/Framework/SINQ/test/PoldiFitPeaks2DTest.h
index 724daf8254a..a9f11eb2d9a 100644
--- a/Framework/SINQ/test/PoldiFitPeaks2DTest.h
+++ b/Framework/SINQ/test/PoldiFitPeaks2DTest.h
@@ -483,10 +483,11 @@ private:
strm << "Error in Peak " << i << ": " << peak->intensity().value()
<< " != " << referencePeak->intensity().value();
- TSM_ASSERT_DELTA(strm.str().c_str(),
- fabs(1.0 - peak->intensity().value() /
- referencePeak->intensity().value()),
- 0.0, relativePrecision);
+ TSM_ASSERT_DELTA(
+ strm.str().c_str(),
+ fabs(1.0 -
+ peak->intensity().value() / referencePeak->intensity().value()),
+ 0.0, relativePrecision);
}
}
--
GitLab
From a7a6049e41c870da5697f253cb2a0061712c76b2 Mon Sep 17 00:00:00 2001
From: Matthew D Jones <matthew.d.jones@tessella.com>
Date: Tue, 13 Oct 2015 10:12:05 +0100
Subject: [PATCH 180/223] Re #13932 Unit test covering user prompt for notebook
save path
---
.../test/ReflMainViewMockObjects.h | 3 +-
.../test/ReflMainViewPresenterTest.h | 118 ++++++++++++++++++
2 files changed, 120 insertions(+), 1 deletion(-)
diff --git a/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h b/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h
index 2d7f91d24a4..026b49d21b3 100644
--- a/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h
+++ b/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h
@@ -33,6 +33,7 @@ public:
MOCK_METHOD2(giveUserCritical, void(std::string, std::string));
MOCK_METHOD2(giveUserInfo, void(std::string, std::string));
MOCK_METHOD2(giveUserWarning, void(std::string, std::string));
+ MOCK_METHOD0(requestNotebookPath, std::string());
MOCK_METHOD1(showAlgorithmDialog, void(const std::string&));
MOCK_METHOD1(plotWorkspaces, void(const std::set<std::string>&));
@@ -46,6 +47,7 @@ public:
MOCK_CONST_METHOD0(getClipboard, std::string());
MOCK_CONST_METHOD0(getSearchString, std::string());
MOCK_CONST_METHOD0(getSearchInstrument, std::string());
+ MOCK_METHOD0(getEnableNotebook, bool());
//Calls we don't care about
virtual void showTable(QReflTableModel_sptr) {};
@@ -53,7 +55,6 @@ public:
virtual void setOptionsHintStrategy(MantidQt::MantidWidgets::HintStrategy*) {};
virtual void setProgressRange(int,int) {};
virtual void setProgress(int) {};
- virtual bool getEnableNotebook() {return false;};
virtual void setTableList(const std::set<std::string>&) {};
virtual void setInstrumentList(const std::vector<std::string>&, const std::string&) {};
virtual std::string getProcessInstrument() const {return "FAKE";}
diff --git a/MantidQt/CustomInterfaces/test/ReflMainViewPresenterTest.h b/MantidQt/CustomInterfaces/test/ReflMainViewPresenterTest.h
index 4c53fb56bf6..36d043f921e 100644
--- a/MantidQt/CustomInterfaces/test/ReflMainViewPresenterTest.h
+++ b/MantidQt/CustomInterfaces/test/ReflMainViewPresenterTest.h
@@ -13,6 +13,7 @@
#include "MantidQtCustomInterfaces/ReflMainViewPresenter.h"
#include "ReflMainViewMockObjects.h"
+#include "../inc/MantidQtCustomInterfaces/IReflPresenter.h"
using namespace MantidQt::CustomInterfaces;
using namespace Mantid::API;
@@ -136,6 +137,8 @@ public:
TS_ASSERT(AnalysisDataService::Instance().doesExist("TestWorkspace"));
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testSaveExisting() {
@@ -152,6 +155,8 @@ public:
presenter.notify(IReflPresenter::SaveFlag);
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testSaveAs() {
@@ -180,6 +185,8 @@ public:
AnalysisDataService::Instance().remove("TestWorkspace");
AnalysisDataService::Instance().remove("Workspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testAppendRow() {
@@ -220,6 +227,8 @@ public:
// Tidy up
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testAppendRowSpecify() {
@@ -263,6 +272,8 @@ public:
// Tidy up
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testAppendRowSpecifyPlural() {
@@ -305,6 +316,8 @@ public:
// Tidy up
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPrependRow() {
@@ -344,6 +357,8 @@ public:
// Tidy up
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPrependRowSpecify() {
@@ -386,6 +401,8 @@ public:
// Tidy up
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPrependRowSpecifyPlural() {
@@ -429,6 +446,8 @@ public:
// Tidy up
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testDeleteRowNone() {
@@ -460,6 +479,8 @@ public:
// Tidy up
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testDeleteRowSingle() {
@@ -495,6 +516,8 @@ public:
// Tidy up
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testDeleteRowPlural() {
@@ -533,6 +556,8 @@ public:
// Tidy up
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testProcess() {
@@ -559,6 +584,11 @@ public:
EXPECT_CALL(mockView, getSelectedRows())
.Times(1)
.WillRepeatedly(Return(rowlist));
+ EXPECT_CALL(mockView, getEnableNotebook())
+ .Times(1)
+ .WillRepeatedly(Return(false));
+ EXPECT_CALL(mockView, requestNotebookPath())
+ .Times(0);
presenter.notify(IReflPresenter::ProcessFlag);
// Check output workspaces were created as expected
@@ -579,6 +609,52 @@ public:
AnalysisDataService::Instance().remove("IvsLam_12346");
AnalysisDataService::Instance().remove("TOF_12346");
AnalysisDataService::Instance().remove("IvsQ_12345_12346");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
+ }
+
+ void testProcessWithNotebook() {
+ MockView mockView;
+ ReflMainViewPresenter presenter(&mockView);
+
+ createPrefilledWorkspace("TestWorkspace");
+ EXPECT_CALL(mockView, getWorkspaceToOpen())
+ .Times(1)
+ .WillRepeatedly(Return("TestWorkspace"));
+ presenter.notify(IReflPresenter::OpenTableFlag);
+
+ std::set<int> rowlist;
+ rowlist.insert(0);
+ rowlist.insert(1);
+
+ createTOFWorkspace("TOF_12345", "12345");
+ createTOFWorkspace("TOF_12346", "12346");
+
+ // We should not receive any errors
+ EXPECT_CALL(mockView, giveUserCritical(_, _)).Times(0);
+
+ // The user hits the "process" button with the first two rows selected
+ EXPECT_CALL(mockView, getSelectedRows())
+ .Times(1)
+ .WillRepeatedly(Return(rowlist));
+ EXPECT_CALL(mockView, getEnableNotebook())
+ .Times(1)
+ .WillRepeatedly(Return(true));
+ EXPECT_CALL(mockView, requestNotebookPath())
+ .Times(1);
+ presenter.notify(IReflPresenter::ProcessFlag);
+
+ // Tidy up
+ AnalysisDataService::Instance().remove("TestWorkspace");
+ AnalysisDataService::Instance().remove("IvsQ_12345");
+ AnalysisDataService::Instance().remove("IvsLam_12345");
+ AnalysisDataService::Instance().remove("TOF_12345");
+ AnalysisDataService::Instance().remove("IvsQ_12346");
+ AnalysisDataService::Instance().remove("IvsLam_12346");
+ AnalysisDataService::Instance().remove("TOF_12346");
+ AnalysisDataService::Instance().remove("IvsQ_12345_12346");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
/*
@@ -641,6 +717,8 @@ public:
AnalysisDataService::Instance().remove("IvsQ_12346");
AnalysisDataService::Instance().remove("IvsLam_12346");
AnalysisDataService::Instance().remove("IvsQ_dataA_12346");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testBadWorkspaceType() {
@@ -671,6 +749,8 @@ public:
presenter.notify(IReflPresenter::OpenTableFlag);
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testBadWorkspaceLength() {
@@ -705,6 +785,8 @@ public:
presenter.notify(IReflPresenter::OpenTableFlag);
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPromptSaveAfterAppendRow() {
@@ -732,6 +814,8 @@ public:
// The user tries to create a new table again, and does not get bothered
EXPECT_CALL(mockView, askUserYesNo(_, _)).Times(0);
presenter.notify(IReflPresenter::NewTableFlag);
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPromptSaveAfterDeleteRow() {
@@ -771,6 +855,8 @@ public:
// The user tries to create a new table again, and does not get bothered
EXPECT_CALL(mockView, askUserYesNo(_, _)).Times(0);
presenter.notify(IReflPresenter::NewTableFlag);
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPromptSaveAndDiscard() {
@@ -791,6 +877,8 @@ public:
// These next two times they don't get prompted - they have a new table
presenter.notify(IReflPresenter::NewTableFlag);
presenter.notify(IReflPresenter::NewTableFlag);
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPromptSaveOnOpen() {
@@ -823,6 +911,8 @@ public:
.WillRepeatedly(Return("TestWorkspace"));
EXPECT_CALL(mockView, askUserYesNo(_, _)).Times(0);
presenter.notify(IReflPresenter::OpenTableFlag);
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testExpandSelection() {
@@ -984,6 +1074,8 @@ public:
// Tidy up
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testClearRows() {
@@ -1043,6 +1135,8 @@ public:
// Tidy up
AnalysisDataService::Instance().remove("TestWorkspace");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testCopyRow() {
@@ -1066,6 +1160,8 @@ public:
.Times(1)
.WillRepeatedly(Return(rowlist));
presenter.notify(IReflPresenter::CopySelectedFlag);
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testCopyRows() {
@@ -1095,6 +1191,8 @@ public:
.Times(1)
.WillRepeatedly(Return(rowlist));
presenter.notify(IReflPresenter::CopySelectedFlag);
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testCutRow() {
@@ -1129,6 +1227,8 @@ public:
TS_ASSERT_EQUALS(ws->String(0, RunCol), "12345");
TS_ASSERT_EQUALS(ws->String(1, RunCol), "24681");
TS_ASSERT_EQUALS(ws->String(2, RunCol), "24682");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testCutRows() {
@@ -1165,6 +1265,8 @@ public:
TS_ASSERT_EQUALS(ws->rowCount(), 1);
// Check the only unselected row is left behind
TS_ASSERT_EQUALS(ws->String(0, RunCol), "24682");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPasteRow() {
@@ -1212,6 +1314,8 @@ public:
TS_ASSERT_EQUALS(ws->Double(1, ScaleCol), 5.0);
TS_ASSERT_EQUALS(ws->Int(1, GroupCol), 6);
TS_ASSERT_EQUALS(ws->String(1, OptionsCol), "abc");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPasteNewRow() {
@@ -1257,6 +1361,8 @@ public:
TS_ASSERT_EQUALS(ws->Double(4, ScaleCol), 5.0);
TS_ASSERT_EQUALS(ws->Int(4, GroupCol), 6);
TS_ASSERT_EQUALS(ws->String(4, OptionsCol), "abc");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPasteRows() {
@@ -1315,6 +1421,8 @@ public:
TS_ASSERT_EQUALS(ws->Double(2, ScaleCol), 3.0);
TS_ASSERT_EQUALS(ws->Int(2, GroupCol), 2);
TS_ASSERT_EQUALS(ws->String(2, OptionsCol), "def");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPasteNewRows() {
@@ -1371,6 +1479,8 @@ public:
TS_ASSERT_EQUALS(ws->Double(5, ScaleCol), 3.0);
TS_ASSERT_EQUALS(ws->Int(5, GroupCol), 2);
TS_ASSERT_EQUALS(ws->String(5, OptionsCol), "def");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testImportTable() {
@@ -1378,6 +1488,8 @@ public:
ReflMainViewPresenter presenter(&mockView);
EXPECT_CALL(mockView, showAlgorithmDialog("LoadReflTBL"));
presenter.notify(IReflPresenter::ImportTableFlag);
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testExportTable() {
@@ -1385,6 +1497,8 @@ public:
ReflMainViewPresenter presenter(&mockView);
EXPECT_CALL(mockView, showAlgorithmDialog("SaveReflTBL"));
presenter.notify(IReflPresenter::ExportTableFlag);
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPlotRowWarn() {
@@ -1416,6 +1530,8 @@ public:
// Tidy up
AnalysisDataService::Instance().remove("TestWorkspace");
AnalysisDataService::Instance().remove("TOF_12345");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
void testPlotGroupWarn() {
@@ -1447,6 +1563,8 @@ public:
AnalysisDataService::Instance().remove("TestWorkspace");
AnalysisDataService::Instance().remove("TOF_12345");
AnalysisDataService::Instance().remove("TOF_12346");
+
+ TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
}
};
--
GitLab
From 3a6c8e1acd71eb4e14e76b2878558c19aa010a55 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Tue, 13 Oct 2015 11:13:43 +0100
Subject: [PATCH 181/223] Fix various Coverity control flow issues
re #13938
---
Framework/API/src/ExperimentInfo.cpp | 5 +-
Framework/API/src/WorkspaceOpOverloads.cpp | 51 ++++++++-----------
Framework/Crystal/src/LoadIsawSpectrum.cpp | 48 +++++++----------
Framework/Crystal/src/SaveHKL.cpp | 44 ++++++----------
.../src/Algorithms/FitPowderDiffPeaks.cpp | 3 +-
.../CurveFitting/src/Algorithms/LeBailFit.cpp | 2 +-
.../src/Algorithms/SplineBackground.cpp | 3 +-
.../DataHandling/src/GroupDetectors2.cpp | 4 +-
Framework/DataObjects/src/EventList.cpp | 4 +-
.../InstrumentWidget/UnwrappedSurface.cpp | 4 +-
.../src/Indirect/ApplyPaalmanPings.cpp | 1 +
.../src/Tomography/TomographyIfaceModel.cpp | 1 -
12 files changed, 65 insertions(+), 105 deletions(-)
diff --git a/Framework/API/src/ExperimentInfo.cpp b/Framework/API/src/ExperimentInfo.cpp
index 26a61864f6b..7f5f9dc9597 100644
--- a/Framework/API/src/ExperimentInfo.cpp
+++ b/Framework/API/src/ExperimentInfo.cpp
@@ -1149,7 +1149,7 @@ void ExperimentInfo::readParameterMap(const std::string ¶meterStr) {
// if( comp_name == prev_name ) continue; this blocks reading in different
// parameters of the same component. RNT
// prev_name = comp_name;
- const Geometry::IComponent *comp = 0;
+ const Geometry::IComponent *comp = nullptr;
if (comp_name.find("detID:") != std::string::npos) {
int detID = atoi(comp_name.substr(6).c_str());
comp = instr->getDetector(detID).get();
@@ -1164,8 +1164,7 @@ void ExperimentInfo::readParameterMap(const std::string ¶meterStr) {
continue;
}
}
- if (!comp)
- continue;
+
// create parameter's value as a sum of all tokens with index 3 or larger
// this allow a parameter's value to contain ";"
std::string paramValue = tokens[3];
diff --git a/Framework/API/src/WorkspaceOpOverloads.cpp b/Framework/API/src/WorkspaceOpOverloads.cpp
index cfd3595724a..b333686ed2b 100644
--- a/Framework/API/src/WorkspaceOpOverloads.cpp
+++ b/Framework/API/src/WorkspaceOpOverloads.cpp
@@ -5,11 +5,11 @@
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidKernel/Property.h"
-#include "MantidKernel/Exception.h"
+//#include "MantidKernel/Exception.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/IWorkspaceProperty.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidAPI/SpectraAxis.h"
+//#include "MantidAPI/SpectraAxis.h"
#include "MantidAPI/IMDWorkspace.h"
#include "MantidAPI/IMDHistoWorkspace.h"
#include "MantidAPI/WorkspaceGroup_fwd.h"
@@ -67,30 +67,21 @@ ResultType executeBinaryOperation(const std::string &algorithmName,
alg->execute();
- if (alg->isExecuted()) {
- // Get the output workspace property
- if (child) {
- return alg->getProperty("OutputWorkspace");
- } else {
- API::Workspace_sptr result =
- API::AnalysisDataService::Instance().retrieve(
- alg->getPropertyValue("OutputWorkspace"));
- return boost::dynamic_pointer_cast<typename ResultType::element_type>(
- result);
- }
- } else {
+ if (!alg->isExecuted()) {
std::string message = "Error while executing operation: " + algorithmName;
throw std::runtime_error(message);
}
- throw Kernel::Exception::NotFoundError(
- "Required output workspace property not found on Child Algorithm",
- "OutputWorkspace");
-
- // Horendous code inclusion to satisfy compilers that all code paths return a
- // value
- // in reality the above code should either throw or return successfully.
- return ResultType();
+ // Get the output workspace property
+ if (child) {
+ return alg->getProperty("OutputWorkspace");
+ } else {
+ API::Workspace_sptr result =
+ API::AnalysisDataService::Instance().retrieve(
+ alg->getPropertyValue("OutputWorkspace"));
+ return boost::dynamic_pointer_cast<typename ResultType::element_type>(
+ result);
+ }
}
template DLLExport MatrixWorkspace_sptr
@@ -169,14 +160,12 @@ bool equals(const MatrixWorkspace_sptr lhs, const MatrixWorkspace_sptr rhs,
// Rest: use default
alg->execute();
- if (alg->isExecuted()) {
- return (alg->getPropertyValue("Result") == "Success!");
- } else {
+ if (!alg->isExecuted()) {
std::string message =
"Error while executing operation: CheckWorkspacesMatch";
throw std::runtime_error(message);
}
- return false;
+ return (alg->getPropertyValue("Result") == "Success!");
}
/** Creates a temporary single value workspace the error is set to zero
@@ -512,17 +501,17 @@ bool WorkspaceHelpers::matchingBins(const MatrixWorkspace_const_sptr ws1,
if (!step)
step = 1;
for (size_t i = step; i < numHist; i += step) {
- const double firstWS =
+ const double firstWSLoop =
std::accumulate(ws1->readX(i).begin(), ws1->readX(i).end(), 0.);
- const double secondWS =
+ const double secondWSLoop =
std::accumulate(ws2->readX(i).begin(), ws2->readX(i).end(), 0.);
- if (std::abs(firstWS) < 1.0E-7 && std::abs(secondWS) < 1.0E-7) {
+ if (std::abs(firstWSLoop) < 1.0E-7 && std::abs(secondWSLoop) < 1.0E-7) {
for (size_t j = 0; j < ws1->readX(i).size(); j++) {
if (std::abs(ws1->readX(i)[j] - ws2->readX(i)[j]) > 1.0E-7)
return false;
}
- } else if (std::abs(firstWS - secondWS) /
- std::max<double>(std::abs(firstWS), std::abs(secondWS)) >
+ } else if (std::abs(firstWSLoop - secondWSLoop) /
+ std::max<double>(std::abs(firstWSLoop), std::abs(secondWSLoop)) >
1.0E-7)
return false;
}
diff --git a/Framework/Crystal/src/LoadIsawSpectrum.cpp b/Framework/Crystal/src/LoadIsawSpectrum.cpp
index 1020210a59d..20e26e01cda 100644
--- a/Framework/Crystal/src/LoadIsawSpectrum.cpp
+++ b/Framework/Crystal/src/LoadIsawSpectrum.cpp
@@ -69,38 +69,24 @@ void LoadIsawSpectrum::exec() {
std::vector<std::vector<double>> spectra;
std::vector<std::vector<double>> time;
int iSpec = 0;
- if (iSpec == 1) {
- while (!infile.eof()) // To get you all the lines.
- {
- // Set up sizes. (HEIGHT x WIDTH)
- spectra.resize(a + 1);
- getline(infile, STRING); // Saves the line in STRING.
- infile >> spec[0] >> spec[1] >> spec[2] >> spec[3] >> spec[4] >>
- spec[5] >> spec[6] >> spec[7] >> spec[8] >> spec[9] >> spec[10];
- for (int i = 0; i < 11; i++)
- spectra[a].push_back(spec[i]);
- a++;
- }
- } else {
- for (int wi = 0; wi < 8; wi++)
- getline(infile, STRING); // Saves the line in STRING.
- while (!infile.eof()) // To get you all the lines.
- {
- time.resize(a + 1);
- spectra.resize(a + 1);
- getline(infile, STRING); // Saves the line in STRING.
- if (infile.eof())
- break;
- std::stringstream ss(STRING);
- if (STRING.find("Bank") == std::string::npos) {
- double time0, spectra0;
- ss >> time0 >> spectra0;
- time[a].push_back(time0);
- spectra[a].push_back(spectra0);
+ for (int wi = 0; wi < 8; wi++)
+ getline(infile, STRING); // Saves the line in STRING.
+ while (!infile.eof()) // To get you all the lines.
+ {
+ time.resize(a + 1);
+ spectra.resize(a + 1);
+ getline(infile, STRING); // Saves the line in STRING.
+ if (infile.eof())
+ break;
+ std::stringstream ss(STRING);
+ if (STRING.find("Bank") == std::string::npos) {
+ double time0, spectra0;
+ ss >> time0 >> spectra0;
+ time[a].push_back(time0);
+ spectra[a].push_back(spectra0);
- } else {
- a++;
- }
+ } else {
+ a++;
}
}
infile.close();
diff --git a/Framework/Crystal/src/SaveHKL.cpp b/Framework/Crystal/src/SaveHKL.cpp
index 531893ebf51..3129a148080 100644
--- a/Framework/Crystal/src/SaveHKL.cpp
+++ b/Framework/Crystal/src/SaveHKL.cpp
@@ -230,37 +230,23 @@ void SaveHKL::exec() {
infile.open(spectraFile.c_str());
if (infile.is_open()) {
size_t a = 0;
- if (iSpec == 1) {
- while (!infile.eof()) // To get you all the lines.
- {
- // Set up sizes. (HEIGHT x WIDTH)
- spectra.resize(a + 1);
- getline(infile, STRING); // Saves the line in STRING.
- infile >> spec[0] >> spec[1] >> spec[2] >> spec[3] >> spec[4] >>
- spec[5] >> spec[6] >> spec[7] >> spec[8] >> spec[9] >> spec[10];
- for (int i = 0; i < 11; i++)
- spectra[a].push_back(spec[i]);
+ for (int wi = 0; wi < 8; wi++)
+ getline(infile, STRING); // Saves the line in STRING.
+ while (!infile.eof()) // To get you all the lines.
+ {
+ time.resize(a + 1);
+ spectra.resize(a + 1);
+ getline(infile, STRING); // Saves the line in STRING.
+ std::stringstream ss(STRING);
+ if (STRING.find("Bank") == std::string::npos) {
+ double time0, spectra0;
+ ss >> time0 >> spectra0;
+ time[a].push_back(time0);
+ spectra[a].push_back(spectra0);
+
+ } else {
a++;
}
- } else {
- for (int wi = 0; wi < 8; wi++)
- getline(infile, STRING); // Saves the line in STRING.
- while (!infile.eof()) // To get you all the lines.
- {
- time.resize(a + 1);
- spectra.resize(a + 1);
- getline(infile, STRING); // Saves the line in STRING.
- std::stringstream ss(STRING);
- if (STRING.find("Bank") == std::string::npos) {
- double time0, spectra0;
- ss >> time0 >> spectra0;
- time[a].push_back(time0);
- spectra[a].push_back(spectra0);
-
- } else {
- a++;
- }
- }
}
infile.close();
}
diff --git a/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp b/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp
index b69b92fdba2..87801460543 100644
--- a/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp
+++ b/Framework/CurveFitting/src/Algorithms/FitPowderDiffPeaks.cpp
@@ -2021,7 +2021,6 @@ bool FitPowderDiffPeaks::doFitMultiplePeaks(
// 1. Fit peaks intensities first
const size_t numpeaks = peakfuncs.size();
map<string, double> peaksfuncparams;
- bool evergood = true;
// a) Set up fit/fix
vector<string> peakparnames = peakfuncs[0]->getParameterNames();
@@ -2045,7 +2044,7 @@ bool FitPowderDiffPeaks::doFitMultiplePeaks(
double chi2;
bool fitgood = doFitNPeaksSimple(dataws, wsindex, peaksfunc, peakfuncs,
"Levenberg-MarquardtMD", 1000, chi2);
- evergood = evergood || fitgood;
+ bool evergood = fitgood;
// c) Process result
if (!fitgood) {
diff --git a/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp b/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
index 60e3d731b21..2977bb77d42 100644
--- a/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
+++ b/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
@@ -341,7 +341,7 @@ void LeBailFit::exec() {
case FIT:
// LeBail Fit
g_log.notice() << "Function: Do LeBail Fit ==> Monte Carlo.\n";
-
+ //fall through
case MONTECARLO:
// Monte carlo Le Bail refinement
g_log.notice("Function: Do LeBail Fit By Monte Carlo Random Walk.");
diff --git a/Framework/CurveFitting/src/Algorithms/SplineBackground.cpp b/Framework/CurveFitting/src/Algorithms/SplineBackground.cpp
index 93b2e86016a..a19fa510610 100644
--- a/Framework/CurveFitting/src/Algorithms/SplineBackground.cpp
+++ b/Framework/CurveFitting/src/Algorithms/SplineBackground.cpp
@@ -66,8 +66,7 @@ void SplineBackground::exec() {
bool isMasked = inWS->hasMaskedBins(spec);
std::vector<int> masked(Y.size());
if (isMasked) {
- for (API::MatrixWorkspace::MaskList::const_iterator it =
- inWS->maskedBins(spec).begin();
+ for (auto it = inWS->maskedBins(spec).begin();
it != inWS->maskedBins(spec).end(); ++it)
masked[it->first] = 1;
n -= static_cast<int>(inWS->maskedBins(spec).size());
diff --git a/Framework/DataHandling/src/GroupDetectors2.cpp b/Framework/DataHandling/src/GroupDetectors2.cpp
index 060f54bee77..4bfba12fc4a 100644
--- a/Framework/DataHandling/src/GroupDetectors2.cpp
+++ b/Framework/DataHandling/src/GroupDetectors2.cpp
@@ -353,7 +353,7 @@ void GroupDetectors2::getGroups(API::MatrixWorkspace_const_sptr workspace,
}
// check we don't have an index that is too high for the workspace
size_t maxIn = static_cast<size_t>(workspace->getNumberHistograms() - 1);
- std::vector<size_t>::const_iterator it = m_GroupSpecInds[0].begin();
+ auto it = m_GroupSpecInds[0].begin();
for (; it != m_GroupSpecInds[0].end(); ++it) {
if (*it > maxIn) {
g_log.error() << "Spectra index " << *it
@@ -375,7 +375,7 @@ void GroupDetectors2::getGroups(API::MatrixWorkspace_const_sptr workspace,
// up date unUsedSpec, this is used to find duplicates and when the user has
// set KeepUngroupedSpectra
- std::vector<size_t>::const_iterator index = m_GroupSpecInds[0].begin();
+ auto index = m_GroupSpecInds[0].begin();
for (; index != m_GroupSpecInds[0].end();
++index) { // the vector<int> m_GroupSpecInds[0] must not index contain
// numbers that don't exist in the workspaace
diff --git a/Framework/DataObjects/src/EventList.cpp b/Framework/DataObjects/src/EventList.cpp
index efb6e74c713..0afb9419bd2 100644
--- a/Framework/DataObjects/src/EventList.cpp
+++ b/Framework/DataObjects/src/EventList.cpp
@@ -528,7 +528,7 @@ EventList &EventList::operator-=(const EventList &more_events) {
this->clearData();
return *this;
}
-
+
// We'll let the -= operator for the given vector of event lists handle it
switch (this->getEventType()) {
case TOF:
@@ -548,6 +548,7 @@ EventList &EventList::operator-=(const EventList &more_events) {
minusHelper(this->weightedEvents, more_events.weightedEventsNoTime);
break;
}
+ break;
case WEIGHTED_NOTIME:
switch (more_events.getEventType()) {
@@ -561,6 +562,7 @@ EventList &EventList::operator-=(const EventList &more_events) {
minusHelper(this->weightedEventsNoTime, more_events.weightedEventsNoTime);
break;
}
+ break;
}
// No guaranteed order
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/UnwrappedSurface.cpp b/MantidPlot/src/Mantid/InstrumentWidget/UnwrappedSurface.cpp
index d83662b41b3..77766f8eff2 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/UnwrappedSurface.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/UnwrappedSurface.cpp
@@ -581,8 +581,8 @@ void UnwrappedSurface::drawSimpleToImage(QImage* image,bool picking)const
if ( iw < 4 ) iw = 4;
if ( ih < 4 ) ih = 4;
- double w = (iw == 0)? dw : udet.width/2;
- double h = (ih == 0)? dh : udet.height/2;
+ double w = udet.width/2;
+ double h = udet.height/2;
if (!(m_viewRect.contains(udet.u-w, udet.v-h) || m_viewRect.contains(udet.u+w, udet.v+h))) continue;
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp b/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
index 42270faab77..737204a16b7 100644
--- a/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
+++ b/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
@@ -145,6 +145,7 @@ void ApplyPaalmanPings::run() {
switch (result) {
case QMessageBox::YesToAll:
interpolateAll = true;
+ //fall through
case QMessageBox::Yes:
addInterpolationStep(factorWs, absCorProps["SampleWorkspace"]);
break;
diff --git a/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceModel.cpp b/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceModel.cpp
index 15c9f4550e6..5aaaaccde66 100644
--- a/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceModel.cpp
+++ b/MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceModel.cpp
@@ -582,7 +582,6 @@ TomographyIfaceModel::loadFITSImage(const std::string &path) {
"Failed to load image. Could not load this file as a "
"FITS image: " +
std::string(e.what()));
- return WorkspaceGroup_sptr();
}
if (!alg->isExecuted()) {
throw std::runtime_error(
--
GitLab
From f60d476b2af5e7842ad92b5bd0fcb44a502d149c Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Tue, 13 Oct 2015 11:34:14 +0100
Subject: [PATCH 182/223] First pass of null pointer derefs
re #13938
---
Framework/Algorithms/src/CorelliCrossCorrelate.cpp | 6 ++++++
Framework/MDAlgorithms/src/FindPeaksMD.cpp | 7 +++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Framework/Algorithms/src/CorelliCrossCorrelate.cpp b/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
index a6e0cb33adf..d65a6070081 100644
--- a/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
+++ b/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
@@ -168,6 +168,12 @@ void CorelliCrossCorrelate::exec() {
// Determine period from chopper frequency.
auto motorSpeed = dynamic_cast<TimeSeriesProperty<double> *>(
inputWS->run().getProperty("BL9:Chop:Skf4:MotorSpeed"));
+ if (!motorSpeed)
+ {
+ throw Exception::NotFoundError(
+ "Could not find a log value for the motor speed",
+ "BL9:Chop:Skf4:MotorSpeed");
+ }
double period = 1e9 / static_cast<double>(motorSpeed->timeAverageValue());
g_log.information() << "Frequency = " << 1e9 / period
<< "Hz Period = " << period << "ns\n";
diff --git a/Framework/MDAlgorithms/src/FindPeaksMD.cpp b/Framework/MDAlgorithms/src/FindPeaksMD.cpp
index 1e94707a155..988f5b7f297 100644
--- a/Framework/MDAlgorithms/src/FindPeaksMD.cpp
+++ b/Framework/MDAlgorithms/src/FindPeaksMD.cpp
@@ -215,12 +215,15 @@ FindPeaksMD::createPeak(const Mantid::Kernel::V3D &Q, const double binCount) {
boost::shared_ptr<DataObjects::Peak> p;
if (dimType == QLAB) {
// Build using the Q-lab-frame constructor
- p = boost::shared_ptr<DataObjects::Peak>(new Peak(inst, Q));
+ p = boost::make_shared<Peak>(inst, Q);
// Save gonio matrix for later
p->setGoniometerMatrix(m_goniometer);
} else if (dimType == QSAMPLE) {
// Build using the Q-sample-frame constructor
- p = boost::shared_ptr<DataObjects::Peak>(new Peak(inst, Q, m_goniometer));
+ p = boost::make_shared<Peak>(inst, Q, m_goniometer);
+ } else {
+ throw std::invalid_argument(
+ "Cannot Integrate peaks unless the dimension is QLAB or QSAMPLE");
}
try { // Look for a detector
--
GitLab
From 595d3e0cf3334dc9967d971cd17bfdfdb99f8ba7 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 13 Oct 2015 11:58:05 +0100
Subject: [PATCH 183/223] fix unchecked copy into fixed size buffer
strncpy/strncat, re #13951
---
MantidPlot/src/zlib123/minigzip.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/MantidPlot/src/zlib123/minigzip.c b/MantidPlot/src/zlib123/minigzip.c
index 6f12762c8ec..5263508908d 100644
--- a/MantidPlot/src/zlib123/minigzip.c
+++ b/MantidPlot/src/zlib123/minigzip.c
@@ -209,8 +209,9 @@ void file_compress(file, mode)
FILE *in;
gzFile out;
- strcpy(outfile, file);
- strcat(outfile, GZ_SUFFIX);
+ strncpy(outfile, file, MAX_NAME_LEN-1);
+ outfile[MAX_NAME_LEN-1] = '\0';
+ strncat(outfile, GZ_SUFFIX, MAX_NAME_LEN - strlen(outfile) - 1);
in = fopen(file, "rb");
if (in == NULL) {
--
GitLab
From c29dd916e8c6391ddb78113a9a60ac70bb06b7da Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Tue, 13 Oct 2015 12:05:07 +0100
Subject: [PATCH 184/223] Increased tolerance value to fix precision issue
Refs #13508
---
Framework/MDAlgorithms/src/CompactMD.cpp | 34 ++++---------------
.../src/IntegrateMDHistoWorkspace.cpp | 2 +-
2 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/Framework/MDAlgorithms/src/CompactMD.cpp b/Framework/MDAlgorithms/src/CompactMD.cpp
index cf20a37a0dc..6970b3d2475 100644
--- a/Framework/MDAlgorithms/src/CompactMD.cpp
+++ b/Framework/MDAlgorithms/src/CompactMD.cpp
@@ -30,34 +30,14 @@ createPBinStringVector(std::vector<Mantid::coord_t> minVector,
"maximum extent with non-zero signal"
<< std::endl;
}
- // We are working with Centres and not Bin Edges so we know that we will
- // always be half a bin width away from the closest bin edge.
-
- // We will only crop when we set minimum pbin > minimum extent of that
- // dimension
- // otherwise we should not crop.
- if (minVector[iter] - (inputWs->getDimension(iter)->getBinWidth() * 0.5) >
- inputWs->getDimension(iter)->getMinimum()) {
- minVector[iter] = Mantid::coord_t(
- minVector[iter] - (inputWs->getDimension(iter)->getBinWidth() * 0.5));
- }
- // We will only crop when we set maximum pbin < maximum extent of that
- // dimension
- // otherwise we should not crop.
- if (maxVector[iter] + (inputWs->getDimension(iter)->getBinWidth() * 0.5) <
- inputWs->getDimension(iter)->getMaximum()) {
- maxVector[iter] = Mantid::coord_t(
- maxVector[iter] + (inputWs->getDimension(iter)->getBinWidth() * 0.5));
- }
- // when Min == Max we know that there is no signal inside that dimension
- // so just use the original extents to copy that dimension.
- if (minVector[iter] == maxVector[iter]) {
- minVector[iter] = inputWs->getDimension(iter)->getMinimum();
- maxVector[iter] = inputWs->getDimension(iter)->getMaximum();
- }
// creating pbin string using Min and Max Centre positions
- auto pBinStr = boost::lexical_cast<std::string>(minVector[iter]) + ",0," +
- boost::lexical_cast<std::string>(maxVector[iter]);
+ auto pBinStr = boost::lexical_cast<std::string>(
+ minVector[iter] -
+ (inputWs->getDimension(iter)->getBinWidth() * 0.5)) +
+ ",0," +
+ boost::lexical_cast<std::string>(
+ maxVector[iter] +
+ (inputWs->getDimension(iter)->getBinWidth() * 0.5));
pBinStrVector.push_back(pBinStr);
}
return pBinStrVector;
diff --git a/Framework/MDAlgorithms/src/IntegrateMDHistoWorkspace.cpp b/Framework/MDAlgorithms/src/IntegrateMDHistoWorkspace.cpp
index 764ccdf652c..230e2e75f33 100644
--- a/Framework/MDAlgorithms/src/IntegrateMDHistoWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/IntegrateMDHistoWorkspace.cpp
@@ -104,7 +104,7 @@ Mantid::coord_t getPrecisionCorrectedCoordinate(Mantid::coord_t position,
// Check if the relative deviation is larger than 1e-6
const auto deviation = fabs((nearest - position) / binWidth);
- const auto tolerance = 1e-6;
+ const auto tolerance = 1e-5;
Mantid::coord_t coordinate(position);
if (deviation < tolerance) {
coordinate = nearest;
--
GitLab
From 287e29e3ee7cd14e05527bef6d2d4ed236c171a4 Mon Sep 17 00:00:00 2001
From: Matt King <matthew.king@stfc.ac.uk>
Date: Tue, 13 Oct 2015 12:09:12 +0100
Subject: [PATCH 185/223] Fixed clang formatting issue
Refs #13508
---
Framework/MDAlgorithms/src/CompactMD.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Framework/MDAlgorithms/src/CompactMD.cpp b/Framework/MDAlgorithms/src/CompactMD.cpp
index 6970b3d2475..7c815d5277f 100644
--- a/Framework/MDAlgorithms/src/CompactMD.cpp
+++ b/Framework/MDAlgorithms/src/CompactMD.cpp
@@ -27,8 +27,7 @@ createPBinStringVector(std::vector<Mantid::coord_t> minVector,
for (size_t iter = 0; iter < numDims; iter++) {
if (minVector[iter] >= maxVector[iter]) {
std::cerr << "Minimum extent of non-zero signal must be LESS than the "
- "maximum extent with non-zero signal"
- << std::endl;
+ "maximum extent with non-zero signal" << std::endl;
}
// creating pbin string using Min and Max Centre positions
auto pBinStr = boost::lexical_cast<std::string>(
--
GitLab
From ff76afd548bf5297c5de98557674a37505778299 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 13 Oct 2015 12:30:08 +0100
Subject: [PATCH 186/223] fix unchecked strcpy/strcat, IDs 1010345-50 +
1075542, re #13951
---
Framework/ICat/src/GSoap/stdsoap2.cpp | 31 ++++++++++++++++-----------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/Framework/ICat/src/GSoap/stdsoap2.cpp b/Framework/ICat/src/GSoap/stdsoap2.cpp
index ec26daa1e2e..642794f1e67 100644
--- a/Framework/ICat/src/GSoap/stdsoap2.cpp
+++ b/Framework/ICat/src/GSoap/stdsoap2.cpp
@@ -2348,7 +2348,7 @@ int SOAP_FMAC2 soap_resolve(struct soap *soap) {
} else if (*ip->id == '#') {
DBGLOG(TEST,
SOAP_MESSAGE(fdebug, "Missing data for id='%s'\n", ip->id));
- strcpy(soap->id, ip->id + 1);
+ strncpy(soap->id, ip->id + 1, sizeof(soap->id));
return soap->error = SOAP_MISSING_ID;
}
}
@@ -3207,7 +3207,7 @@ const char *SOAP_FMAC2 soap_ssl_error(struct soap *soap, int ret) {
int err = SSL_get_error(soap->ssl, ret);
const char *msg = soap_code_str(h_ssl_error_codes, err);
if (msg)
- strcpy(soap->msgbuf, msg);
+ strncpy(soap->msgbuf, msg, sizeof(soap->msgbuf));
else
return ERR_error_string(err, soap->msgbuf);
if (ERR_peek_error()) {
@@ -6049,7 +6049,7 @@ static int http_post(struct soap *soap, const char *endpoint, const char *host,
sprintf(soap->tmpbuf, "[%s]", host); /* RFC 2732 */
else
#endif
- strcpy(soap->tmpbuf, host);
+ strncpy(soap->tmpbuf, host, sizeof(soap->tmpbuf));
}
if ((err = soap->fposthdr(soap, "Host", soap->tmpbuf)))
return err;
@@ -8161,7 +8161,7 @@ void *SOAP_FMAC2 soap_id_lookup(struct soap *soap, const char *id, void **p,
"Resolved href='%s' type=%d location=%p (%u bytes)\n",
id, t, ip->ptr, (unsigned int)n));
if (ip->type != t) {
- strcpy(soap->id, id);
+ strncpy(soap->id, id, sizeof(soap->id));
soap->error = SOAP_HREF;
DBGLOG(TEST,
SOAP_MESSAGE(
@@ -8263,7 +8263,7 @@ void *SOAP_FMAC2 soap_id_forward(struct soap *soap, const char *href, void *p,
"size=%lu level=%u got type=%d size=%lu\n",
href, ip->type, (unsigned long)ip->size, k, st,
(unsigned long)n));
- strcpy(soap->id, href);
+ strncpy(soap->id, href, sizeof(soap->id));
soap->error = SOAP_HREF;
return NULL;
}
@@ -8355,12 +8355,12 @@ soap_id_enter(struct soap *soap, const char *id, void *p, int t, size_t n,
"size=%lu level=%u got type=%d size=%lu\n",
id, ip->type, (unsigned long)ip->size, k, t,
(unsigned long)n));
- strcpy(soap->id, id);
+ strncpy(soap->id, id, sizeof(soap->id));
soap->error = SOAP_HREF;
return NULL;
} else if (ip->ptr) {
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Multiply defined id='%s'\n", id));
- strcpy(soap->id, id);
+ strncpy(soap->id, id, sizeof(soap->id));
soap->error = SOAP_DUPLICATE_ID;
return NULL;
} else {
@@ -16060,18 +16060,23 @@ int SOAP_FMAC2 soap_puthttphdr(struct soap *soap, int status, size_t count) {
} else
strcat(soap->tmpbuf, s);
if (soap->mime.start) {
- strcat(soap->tmpbuf, "\"; start=\"");
- strcat(soap->tmpbuf, soap->mime.start);
+ const char startStr[] = "\"; start=\"";
+ strcat(soap->tmpbuf, startStr);
+ strncat(soap->tmpbuf, soap->mime.start, sizeof(soap->tmpbuf)-sizeof(startStr));
}
strcat(soap->tmpbuf, "\"");
if (r) {
- strcat(soap->tmpbuf, "; start-info=\"");
- strcat(soap->tmpbuf, r);
- strcat(soap->tmpbuf, "\"");
+ const char startInfoStr[] = "; start-info=\"";
+ size_t lenStart = sizeof(soap->tmpbuf)-sizeof(startInfoStr);
+ strncat(soap->tmpbuf, startInfoStr, lenStart);
+ size_t lenR = lenStart - strnlen(r, lenStart);
+ strncat(soap->tmpbuf, r, lenR);
+ size_t lenEnd = lenR - 1;
+ strncat(soap->tmpbuf, "\"", lenEnd);
}
s = soap->tmpbuf;
} else
- s = strcpy(soap->tmpbuf, s);
+ s = strncpy(soap->tmpbuf, s, sizeof(soap->tmpbuf));
if (status == SOAP_OK && soap->version == 2 && soap->action &&
strlen(soap->action) + strlen(s) < sizeof(soap->tmpbuf) - 80)
sprintf(soap->tmpbuf + strlen(s), "; action=\"%s\"", soap->action);
--
GitLab
From 601f01d30bbc1127e5d981ab78cf4231099bfb2f Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Tue, 13 Oct 2015 13:37:23 +0100
Subject: [PATCH 187/223] clang format patch and a rh6 error
re #13938
---
Framework/API/src/ExperimentInfo.cpp | 2 +-
Framework/API/src/WorkspaceOpOverloads.cpp | 8 ++++----
Framework/Algorithms/src/CorelliCrossCorrelate.cpp | 7 +++----
Framework/CurveFitting/src/Algorithms/LeBailFit.cpp | 2 +-
Framework/DataObjects/src/EventList.cpp | 2 +-
Framework/MDAlgorithms/src/FindPeaksMD.cpp | 4 ++--
6 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/Framework/API/src/ExperimentInfo.cpp b/Framework/API/src/ExperimentInfo.cpp
index 7f5f9dc9597..3ddd52bfdf0 100644
--- a/Framework/API/src/ExperimentInfo.cpp
+++ b/Framework/API/src/ExperimentInfo.cpp
@@ -1149,7 +1149,7 @@ void ExperimentInfo::readParameterMap(const std::string ¶meterStr) {
// if( comp_name == prev_name ) continue; this blocks reading in different
// parameters of the same component. RNT
// prev_name = comp_name;
- const Geometry::IComponent *comp = nullptr;
+ const Geometry::IComponent *comp = NULL;
if (comp_name.find("detID:") != std::string::npos) {
int detID = atoi(comp_name.substr(6).c_str());
comp = instr->getDetector(detID).get();
diff --git a/Framework/API/src/WorkspaceOpOverloads.cpp b/Framework/API/src/WorkspaceOpOverloads.cpp
index b333686ed2b..f29bca1ca5f 100644
--- a/Framework/API/src/WorkspaceOpOverloads.cpp
+++ b/Framework/API/src/WorkspaceOpOverloads.cpp
@@ -76,9 +76,8 @@ ResultType executeBinaryOperation(const std::string &algorithmName,
if (child) {
return alg->getProperty("OutputWorkspace");
} else {
- API::Workspace_sptr result =
- API::AnalysisDataService::Instance().retrieve(
- alg->getPropertyValue("OutputWorkspace"));
+ API::Workspace_sptr result = API::AnalysisDataService::Instance().retrieve(
+ alg->getPropertyValue("OutputWorkspace"));
return boost::dynamic_pointer_cast<typename ResultType::element_type>(
result);
}
@@ -511,7 +510,8 @@ bool WorkspaceHelpers::matchingBins(const MatrixWorkspace_const_sptr ws1,
return false;
}
} else if (std::abs(firstWSLoop - secondWSLoop) /
- std::max<double>(std::abs(firstWSLoop), std::abs(secondWSLoop)) >
+ std::max<double>(std::abs(firstWSLoop),
+ std::abs(secondWSLoop)) >
1.0E-7)
return false;
}
diff --git a/Framework/Algorithms/src/CorelliCrossCorrelate.cpp b/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
index d65a6070081..8a499988135 100644
--- a/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
+++ b/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
@@ -168,11 +168,10 @@ void CorelliCrossCorrelate::exec() {
// Determine period from chopper frequency.
auto motorSpeed = dynamic_cast<TimeSeriesProperty<double> *>(
inputWS->run().getProperty("BL9:Chop:Skf4:MotorSpeed"));
- if (!motorSpeed)
- {
+ if (!motorSpeed) {
throw Exception::NotFoundError(
- "Could not find a log value for the motor speed",
- "BL9:Chop:Skf4:MotorSpeed");
+ "Could not find a log value for the motor speed",
+ "BL9:Chop:Skf4:MotorSpeed");
}
double period = 1e9 / static_cast<double>(motorSpeed->timeAverageValue());
g_log.information() << "Frequency = " << 1e9 / period
diff --git a/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp b/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
index 2977bb77d42..21d6e9af3d6 100644
--- a/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
+++ b/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
@@ -341,7 +341,7 @@ void LeBailFit::exec() {
case FIT:
// LeBail Fit
g_log.notice() << "Function: Do LeBail Fit ==> Monte Carlo.\n";
- //fall through
+ // fall through
case MONTECARLO:
// Monte carlo Le Bail refinement
g_log.notice("Function: Do LeBail Fit By Monte Carlo Random Walk.");
diff --git a/Framework/DataObjects/src/EventList.cpp b/Framework/DataObjects/src/EventList.cpp
index 0afb9419bd2..8dfbd6d9421 100644
--- a/Framework/DataObjects/src/EventList.cpp
+++ b/Framework/DataObjects/src/EventList.cpp
@@ -528,7 +528,7 @@ EventList &EventList::operator-=(const EventList &more_events) {
this->clearData();
return *this;
}
-
+
// We'll let the -= operator for the given vector of event lists handle it
switch (this->getEventType()) {
case TOF:
diff --git a/Framework/MDAlgorithms/src/FindPeaksMD.cpp b/Framework/MDAlgorithms/src/FindPeaksMD.cpp
index 988f5b7f297..ba70dd4bedd 100644
--- a/Framework/MDAlgorithms/src/FindPeaksMD.cpp
+++ b/Framework/MDAlgorithms/src/FindPeaksMD.cpp
@@ -221,9 +221,9 @@ FindPeaksMD::createPeak(const Mantid::Kernel::V3D &Q, const double binCount) {
} else if (dimType == QSAMPLE) {
// Build using the Q-sample-frame constructor
p = boost::make_shared<Peak>(inst, Q, m_goniometer);
- } else {
+ } else {
throw std::invalid_argument(
- "Cannot Integrate peaks unless the dimension is QLAB or QSAMPLE");
+ "Cannot Integrate peaks unless the dimension is QLAB or QSAMPLE");
}
try { // Look for a detector
--
GitLab
From 86724d970561509fa7d7ac2e9c1e25a4686a6f4a Mon Sep 17 00:00:00 2001
From: Elliot Oram <Elliot.Oram@stfc.ac.uk>
Date: Tue, 13 Oct 2015 14:43:28 +0100
Subject: [PATCH 188/223] Added check to ensure Start/End is in data range
Refs #13897
---
.../Indirect/ISISEnergyTransfer.h | 122 +++++++++---------
.../src/Indirect/ISISEnergyTransfer.cpp | 50 ++++---
2 files changed, 95 insertions(+), 77 deletions(-)
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h
index d164fa8aa6a..49090162ee6 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h
@@ -6,68 +6,66 @@
#include "MantidKernel/System.h"
#include "MantidQtCustomInterfaces/Background.h"
-namespace MantidQt
-{
-namespace CustomInterfaces
-{
- /** ISISEnergyTransfer
- Handles an energy transfer reduction for ISIS instruments.
-
- @author Dan Nixon
- @date 23/07/2014
-
- Copyright © 2013 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge National Laboratory & European Spallation Source
-
- This file is part of Mantid.
-
- Mantid is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- Mantid is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- File change history is stored at: <https://github.com/mantidproject/mantid>
- Code Documentation is available at: <http://doxygen.mantidproject.org>
- */
- class DLLExport ISISEnergyTransfer : public IndirectDataReductionTab
- {
- Q_OBJECT
-
- public:
- ISISEnergyTransfer(IndirectDataReduction * idrUI, QWidget * parent = 0);
- virtual ~ISISEnergyTransfer();
-
- virtual void setup();
- virtual void run();
-
- public slots:
- virtual bool validate();
-
- private slots:
- void algorithmComplete(bool error);
- void setInstrumentDefault(); ///< Sets default parameters for current instrument
- void mappingOptionSelected(const QString& groupType); ///< change ui to display appropriate options
- void plotRaw(); ///< plot raw data from instrument
- void pbRunEditing(); //< Called when a user starts to type / edit the runs to load.
- void pbRunFinding(); //< Called when the FileFinder starts finding the files.
- void pbRunFinished(); //< Called when the FileFinder has finished finding the files.
- void plotRawComplete(bool error); //< Called when the Plot Raw algorithmm chain completes
-
- private:
- Ui::ISISEnergyTransfer m_uiForm;
-
- QPair<QString, QString> createMapFile(const QString& groupType); ///< create the mapping file with which to group results
- std::vector<std::string> getSaveFormats(); ///< get a vector of save formats
-
- };
+namespace MantidQt {
+namespace CustomInterfaces {
+/** ISISEnergyTransfer
+ Handles an energy transfer reduction for ISIS instruments.
+
+ @author Dan Nixon
+ @date 23/07/2014
+
+ Copyright © 2013 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
+ National Laboratory & European Spallation Source
+
+ This file is part of Mantid.
+
+ Mantid is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ Mantid is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ File change history is stored at: <https://github.com/mantidproject/mantid>
+ Code Documentation is available at: <http://doxygen.mantidproject.org>
+*/
+class DLLExport ISISEnergyTransfer : public IndirectDataReductionTab {
+ Q_OBJECT
+
+public:
+ ISISEnergyTransfer(IndirectDataReduction *idrUI, QWidget *parent = 0);
+ virtual ~ISISEnergyTransfer();
+
+ virtual void setup();
+ virtual void run();
+
+public slots:
+ virtual bool validate();
+
+private slots:
+ void algorithmComplete(bool error);
+ void
+ setInstrumentDefault(); ///< Sets default parameters for current instrument
+ void mappingOptionSelected(const QString &groupType); ///< change ui to display appropriate options
+ void plotRaw(); ///< plot raw data from instrument
+ void pbRunEditing(); //< Called when a user starts to type / edit the runs to load.
+ void pbRunFinding(); //< Called when the FileFinder starts finding the files.
+ void pbRunFinished(); //< Called when the FileFinder has finished finding the files.
+ void plotRawComplete(bool error); //< Called when the Plot Raw algorithmm chain completes
+
+private:
+ Ui::ISISEnergyTransfer m_uiForm;
+
+ QPair<QString, QString> createMapFile(const QString &groupType); ///< create the mapping file with which to group results
+ std::vector<std::string> getSaveFormats(); ///< get a vector of save formats
+};
} // namespace CustomInterfaces
} // namespace Mantid
-#endif //MANTIDQTCUSTOMINTERFACES_ISISENERGYTRANSFER_H_
+#endif // MANTIDQTCUSTOMINTERFACES_ISISENERGYTRANSFER_H_
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp b/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
index 9839ec88af9..1c0638d6561 100644
--- a/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
+++ b/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
@@ -69,19 +69,19 @@ bool ISISEnergyTransfer::validate() {
UserInputValidator uiv;
// Run files input
- if (!m_uiForm.dsRunFiles->isValid()){
+ if (!m_uiForm.dsRunFiles->isValid()) {
uiv.addErrorMessage("Run file range is invalid.");
}
// Calibration file input
if (m_uiForm.ckUseCalib->isChecked() &&
- !m_uiForm.dsCalibrationFile->isValid()){
+ !m_uiForm.dsCalibrationFile->isValid()) {
uiv.addErrorMessage("Calibration file/workspace is invalid.");
}
// Mapping file
if ((m_uiForm.cbGroupingOptions->currentText() == "File") &&
- (!m_uiForm.dsMapFile->isValid())){
+ (!m_uiForm.dsMapFile->isValid())) {
uiv.addErrorMessage("Mapping file is invalid.");
}
@@ -115,17 +115,17 @@ bool ISISEnergyTransfer::validate() {
// Spectra Number check
const int specMin = m_uiForm.spSpectraMin->value();
const int specMax = m_uiForm.spSpectraMax->value();
- if(specMin > specMax){
- uiv.addErrorMessage("Spectra Min must be less than Spectra Max");
+ if (specMin > specMax) {
+ uiv.addErrorMessage("Spectra Min must be less than Spectra Max");
}
// Background Removal (TOF)
- if(m_uiForm.ckBackgroundRemoval->isChecked()){
- const int start = m_uiForm.spBackgroundStart->value();
- const int end = m_uiForm.spBackgroundEnd->value();
- if(start > end){
- uiv.addErrorMessage("Background Start must be less than Background End");
- }
+ if (m_uiForm.ckBackgroundRemoval->isChecked()) {
+ const int start = m_uiForm.spBackgroundStart->value();
+ const int end = m_uiForm.spBackgroundEnd->value();
+ if (start > end) {
+ uiv.addErrorMessage("Background Start must be less than Background End");
+ }
}
QString error = uiv.generateErrorMessage();
@@ -446,10 +446,10 @@ void ISISEnergyTransfer::plotRaw() {
"Minimum spectra must be less than or equal to maximum spectra.");
return;
}
+ const int startBack = m_uiForm.spBackgroundStart->value();
+ const int endBack = m_uiForm.spBackgroundEnd->value();
if (m_uiForm.ckBackgroundRemoval->isChecked() == true) {
- int startBack = m_uiForm.spBackgroundStart->value();
- int endBack = m_uiForm.spBackgroundEnd->value();
if (startBack > endBack) {
emit showMessageBox("Background Start must be less than Background End");
return;
@@ -462,7 +462,7 @@ void ISISEnergyTransfer::plotRaw() {
QFileInfo rawFileInfo(rawFile);
std::string name = rawFileInfo.baseName().toStdString();
- IAlgorithm_sptr loadAlg = AlgorithmManager::Instance().create("Load");
+ IAlgorithm_sptr loadAlg = AlgorithmManager::Instance().create("Load");
loadAlg->initialize();
loadAlg->setProperty("Filename", rawFile.toStdString());
loadAlg->setProperty("OutputWorkspace", name);
@@ -477,7 +477,27 @@ void ISISEnergyTransfer::plotRaw() {
loadAlg->setProperty("SpectrumMin", detectorMin);
loadAlg->setProperty("SpectrumMax", detectorMax);
}
- m_batchAlgoRunner->addAlgorithm(loadAlg);
+
+ loadAlg->execute();
+
+ if (m_uiForm.ckBackgroundRemoval->isChecked()) {
+ MatrixWorkspace_sptr tempWs =
+ AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(name);
+ const int minBack = tempWs->readX(0)[0];
+ const int maxBack = tempWs->readX(0)[tempWs->blocksize()];
+
+ if (startBack < minBack) {
+ emit showMessageBox("The Start of Background Removal is less than the "
+ "minimum of the data range");
+ return;
+ }
+
+ if (endBack > maxBack) {
+ emit showMessageBox("The End of Background Removal is more than the "
+ "maximum of the data range");
+ return;
+ }
+ }
// Rebin the workspace to its self to ensure constant binning
BatchAlgorithmRunner::AlgorithmRuntimeProps inputToRebin;
--
GitLab
From 243238f382db54a74639e05058c314133255746c Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Tue, 13 Oct 2015 14:49:54 +0100
Subject: [PATCH 189/223] coverity fixes Null pointer dereferences
re #13938
---
Framework/API/src/Algorithm.cpp | 12 ++++++-----
Framework/API/src/FunctionFactory.cpp | 3 +++
Framework/Crystal/src/FilterPeaks.cpp | 3 +++
.../Instrument/InstrumentDefinitionParser.cpp | 4 +++-
Framework/Kernel/src/Matrix.cpp | 21 +++++++++++--------
.../src/IntegrateMDHistoWorkspace.cpp | 4 ++++
.../WorkflowAlgorithms/src/RefReduction.cpp | 2 ++
MantidPlot/src/ConfigDialog.cpp | 7 +++++--
MantidPlot/src/ContourLinesEditor.cpp | 10 ++++++---
MantidPlot/src/CustomActionDialog.cpp | 5 ++++-
MantidPlot/src/ScaleDetails.cpp | 4 ++++
Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp | 6 +++++-
12 files changed, 59 insertions(+), 22 deletions(-)
diff --git a/Framework/API/src/Algorithm.cpp b/Framework/API/src/Algorithm.cpp
index e95b083c084..860a17a3d66 100644
--- a/Framework/API/src/Algorithm.cpp
+++ b/Framework/API/src/Algorithm.cpp
@@ -1278,11 +1278,13 @@ bool Algorithm::processGroups() {
// ---------- Create all the output workspaces ----------------------------
for (size_t owp = 0; owp < m_pureOutputWorkspaceProps.size(); owp++) {
Property *prop = dynamic_cast<Property *>(m_pureOutputWorkspaceProps[owp]);
- WorkspaceGroup_sptr outWSGrp = WorkspaceGroup_sptr(new WorkspaceGroup());
- outGroups.push_back(outWSGrp);
- // Put the GROUP in the ADS
- AnalysisDataService::Instance().addOrReplace(prop->value(), outWSGrp);
- outWSGrp->observeADSNotifications(false);
+ if (prop) {
+ WorkspaceGroup_sptr outWSGrp = WorkspaceGroup_sptr(new WorkspaceGroup());
+ outGroups.push_back(outWSGrp);
+ // Put the GROUP in the ADS
+ AnalysisDataService::Instance().addOrReplace(prop->value(), outWSGrp);
+ outWSGrp->observeADSNotifications(false);
+ }
}
// Go through each entry in the input group(s)
diff --git a/Framework/API/src/FunctionFactory.cpp b/Framework/API/src/FunctionFactory.cpp
index 5d2a0a1aad4..29a5ec54767 100644
--- a/Framework/API/src/FunctionFactory.cpp
+++ b/Framework/API/src/FunctionFactory.cpp
@@ -192,6 +192,9 @@ CompositeFunction_sptr FunctionFactoryImpl::createComposite(
inputError(expr.str());
}
+ if (!cfun)
+ inputError(expr.str());
+
for (; it != terms.end(); ++it) {
const Expression &term = it->bracketsRemoved();
IFunction_sptr fun;
diff --git a/Framework/Crystal/src/FilterPeaks.cpp b/Framework/Crystal/src/FilterPeaks.cpp
index 8e398c2b0de..2c92154e77e 100644
--- a/Framework/Crystal/src/FilterPeaks.cpp
+++ b/Framework/Crystal/src/FilterPeaks.cpp
@@ -98,6 +98,9 @@ void FilterPeaks::exec() {
filterFunction = &intensity;
else if (FilterVariable == "Signal/Noise")
filterFunction = &SN;
+ else
+ throw std::invalid_argument(
+ "Unknown FilterVariable: " + FilterVariable);
const double FilterValue = getProperty("FilterValue");
const std::string Operator = getProperty("Operator");
diff --git a/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp b/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
index cdc50169d55..223a17b6028 100644
--- a/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
+++ b/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
@@ -2301,7 +2301,9 @@ void InstrumentDefinitionParser::createNeutronicInstrument() {
mapTypeNameToShape.find(shapeName);
if (shapeIt != mapTypeNameToShape.end()) {
// Change the shape on the current component to the one requested
- dynamic_cast<ObjComponent *>(it->first)->setShape(shapeIt->second);
+ auto objCmpt = dynamic_cast<ObjComponent *>(it->first);
+ if (objCmpt)
+ objCmpt->setShape(shapeIt->second);
} else {
throw Exception::InstrumentDefinitionError(
"Requested type " + shapeName + " not defined in IDF");
diff --git a/Framework/Kernel/src/Matrix.cpp b/Framework/Kernel/src/Matrix.cpp
index f4e1adc1319..c8edd12b2ce 100644
--- a/Framework/Kernel/src/Matrix.cpp
+++ b/Framework/Kernel/src/Matrix.cpp
@@ -158,17 +158,20 @@ Matrix<T>::Matrix(const Matrix<T> &A, const size_t nrow, const size_t ncol)
throw Kernel::Exception::IndexError(ncol, A.ny,
"Matrix::Constructor without col");
setMem(nx, ny);
- size_t iR(0);
- for (size_t i = 0; i <= nx; i++) {
- if (i != nrow) {
- size_t jR(0);
- for (size_t j = 0; j <= ny; j++) {
- if (j != ncol) {
- V[iR][jR] = A.V[i][j];
- jR++;
+ if (!V) {
+ size_t iR(0);
+ for (size_t i = 0; i <= nx; i++) {
+ if (i != nrow) {
+ size_t jR(0);
+ for (size_t j = 0; j <= ny; j++) {
+ if (j != ncol) {
+
+ V[iR][jR] = A.V[i][j];
+ jR++;
+ }
}
+ iR++;
}
- iR++;
}
}
}
diff --git a/Framework/MDAlgorithms/src/IntegrateMDHistoWorkspace.cpp b/Framework/MDAlgorithms/src/IntegrateMDHistoWorkspace.cpp
index 711de48f4bf..1468a6001c3 100644
--- a/Framework/MDAlgorithms/src/IntegrateMDHistoWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/IntegrateMDHistoWorkspace.cpp
@@ -386,6 +386,10 @@ void IntegrateMDHistoWorkspace::exec() {
// Create a thread-local input iterator.
boost::scoped_ptr<MDHistoWorkspaceIterator> inIterator(
dynamic_cast<MDHistoWorkspaceIterator *>(inWS->createIterator()));
+ if (!inIterator) {
+ throw std::runtime_error(
+ "Could not convert IMDIterator to a MDHistoWorkspaceIterator");
+ }
/*
We jump to the iterator position which is closest in the model
diff --git a/Framework/WorkflowAlgorithms/src/RefReduction.cpp b/Framework/WorkflowAlgorithms/src/RefReduction.cpp
index 4ece40c1ee5..9b111d80d45 100644
--- a/Framework/WorkflowAlgorithms/src/RefReduction.cpp
+++ b/Framework/WorkflowAlgorithms/src/RefReduction.cpp
@@ -629,6 +629,8 @@ double RefReduction::calculateAngleREFM(MatrixWorkspace_sptr workspace) {
Mantid::Kernel::Property *prop = workspace->run().getProperty("SampleDetDis");
Mantid::Kernel::TimeSeriesProperty<double> *dp =
dynamic_cast<Mantid::Kernel::TimeSeriesProperty<double> *>(prop);
+ if (!dp) throw std::runtime_error(
+ "SampleDetDis was not a TimeSeriesProperty");
const double det_distance = dp->getStatistics().mean / 1000.0;
double direct_beam_pix = getProperty("DirectPixel");
diff --git a/MantidPlot/src/ConfigDialog.cpp b/MantidPlot/src/ConfigDialog.cpp
index 6344d67d31c..87e74e4ea83 100644
--- a/MantidPlot/src/ConfigDialog.cpp
+++ b/MantidPlot/src/ConfigDialog.cpp
@@ -2341,8 +2341,11 @@ void ConfigDialog::apply()
QList<MdiSubWindow*> windows = app->windowsList();
foreach(MdiSubWindow *w, windows){
if (w->isA("MultiLayer")){
- (dynamic_cast<MultiLayer*>(w))->setScaleLayersOnPrint(boxScaleLayersOnPrint->isChecked());
- (dynamic_cast<MultiLayer*>(w))->printCropmarks(boxPrintCropmarks->isChecked());
+ MultiLayer* multiLayer = dynamic_cast<MultiLayer*>(w);
+ if (multiLayer) {
+ multiLayer->setScaleLayersOnPrint(boxScaleLayersOnPrint->isChecked());
+ multiLayer->printCropmarks(boxPrintCropmarks->isChecked());
+ }
}
}
// general page: application tab
diff --git a/MantidPlot/src/ContourLinesEditor.cpp b/MantidPlot/src/ContourLinesEditor.cpp
index 19ff48b3bf2..144b2c7f245 100644
--- a/MantidPlot/src/ContourLinesEditor.cpp
+++ b/MantidPlot/src/ContourLinesEditor.cpp
@@ -108,10 +108,14 @@ void ContourLinesEditor::updateContourLevels()
int rows = table->rowCount();
QwtValueList levels;
- for (int i = 0; i < rows; i++)
- levels << dynamic_cast<DoubleSpinBox*>(table->cellWidget(i, 0))->value();
+ for (int i = 0; i < rows; i++) {
+ DoubleSpinBox *spinBox =
+ dynamic_cast<DoubleSpinBox *>(table->cellWidget(i, 0));
+ if (spinBox)
+ levels << spinBox->value();
+ }
- d_spectrogram->setContourLevels(levels);
+ d_spectrogram->setContourLevels(levels);
}
void ContourLinesEditor::updateContourPens()
diff --git a/MantidPlot/src/CustomActionDialog.cpp b/MantidPlot/src/CustomActionDialog.cpp
index 0ffe7922476..8b779deb8ec 100644
--- a/MantidPlot/src/CustomActionDialog.cpp
+++ b/MantidPlot/src/CustomActionDialog.cpp
@@ -514,7 +514,10 @@ void CustomActionDialog::chooseFolder()
QAction * CustomActionDialog::actionAt(int row)
{
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(parent());
- QList<QAction *>actions = app->customActionsList();
+ if (!app)
+ throw std::runtime_error(
+ "The parent of this dialog was not the Application Window");
+ QList<QAction *>actions = app->customActionsList();
if (actions.isEmpty() || row < 0 || row >= actions.count())
return 0;
diff --git a/MantidPlot/src/ScaleDetails.cpp b/MantidPlot/src/ScaleDetails.cpp
index 71190376094..e6ef88b1031 100644
--- a/MantidPlot/src/ScaleDetails.cpp
+++ b/MantidPlot/src/ScaleDetails.cpp
@@ -272,6 +272,10 @@ void ScaleDetails::initWidgets()
if (type == ScaleDraw::Date)
{
ScaleDraw *sclDraw = dynamic_cast<ScaleDraw *>(d_plot->axisScaleDraw(m_mappedaxis));
+ if (!sclDraw) {
+ throw std::runtime_error("Could not convert the axis Scale Draw object "
+ "to a ScaleDraw object");
+ }
QDateTime origin = sclDraw->dateTimeOrigin();
m_dspnStart->hide();
diff --git a/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp b/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp
index 748722813c5..11af3df2b5b 100644
--- a/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp
+++ b/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp
@@ -120,7 +120,11 @@ namespace Mantid
double progressFactor = 0.5/double(nBinsX);
double progressOffset = 0.5;
boost::scoped_ptr<MDHistoWorkspaceIterator> iterator(dynamic_cast<MDHistoWorkspaceIterator*>(createIteratorWithNormalization(m_normalizationOption, m_workspace.get())));
-
+ if (!iterator) {
+ throw std::runtime_error(
+ "Could not convert IMDIterator to a MDHistoWorkspaceIterator");
+ }
+
size_t index = 0;
for (int i = 0; i < nBinsX; i++)
{
--
GitLab
From c481d6e58fbf685d3546ce3b13a2d4b729cede1a Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Tue, 13 Oct 2015 14:53:14 +0100
Subject: [PATCH 190/223] re #13928 clang format
---
Framework/Crystal/src/FilterPeaks.cpp | 3 +--
Framework/Kernel/src/Matrix.cpp | 4 ++--
Framework/WorkflowAlgorithms/src/RefReduction.cpp | 4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Framework/Crystal/src/FilterPeaks.cpp b/Framework/Crystal/src/FilterPeaks.cpp
index 2c92154e77e..f60acecea95 100644
--- a/Framework/Crystal/src/FilterPeaks.cpp
+++ b/Framework/Crystal/src/FilterPeaks.cpp
@@ -99,8 +99,7 @@ void FilterPeaks::exec() {
else if (FilterVariable == "Signal/Noise")
filterFunction = &SN;
else
- throw std::invalid_argument(
- "Unknown FilterVariable: " + FilterVariable);
+ throw std::invalid_argument("Unknown FilterVariable: " + FilterVariable);
const double FilterValue = getProperty("FilterValue");
const std::string Operator = getProperty("Operator");
diff --git a/Framework/Kernel/src/Matrix.cpp b/Framework/Kernel/src/Matrix.cpp
index c8edd12b2ce..b61a69823ee 100644
--- a/Framework/Kernel/src/Matrix.cpp
+++ b/Framework/Kernel/src/Matrix.cpp
@@ -166,8 +166,8 @@ Matrix<T>::Matrix(const Matrix<T> &A, const size_t nrow, const size_t ncol)
for (size_t j = 0; j <= ny; j++) {
if (j != ncol) {
- V[iR][jR] = A.V[i][j];
- jR++;
+ V[iR][jR] = A.V[i][j];
+ jR++;
}
}
iR++;
diff --git a/Framework/WorkflowAlgorithms/src/RefReduction.cpp b/Framework/WorkflowAlgorithms/src/RefReduction.cpp
index 9b111d80d45..c65be0ce528 100644
--- a/Framework/WorkflowAlgorithms/src/RefReduction.cpp
+++ b/Framework/WorkflowAlgorithms/src/RefReduction.cpp
@@ -629,8 +629,8 @@ double RefReduction::calculateAngleREFM(MatrixWorkspace_sptr workspace) {
Mantid::Kernel::Property *prop = workspace->run().getProperty("SampleDetDis");
Mantid::Kernel::TimeSeriesProperty<double> *dp =
dynamic_cast<Mantid::Kernel::TimeSeriesProperty<double> *>(prop);
- if (!dp) throw std::runtime_error(
- "SampleDetDis was not a TimeSeriesProperty");
+ if (!dp)
+ throw std::runtime_error("SampleDetDis was not a TimeSeriesProperty");
const double det_distance = dp->getStatistics().mean / 1000.0;
double direct_beam_pix = getProperty("DirectPixel");
--
GitLab
From bfcb08b866cd3a6c6fbf798b2eaacb9546ae0167 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Tue, 13 Oct 2015 15:06:40 +0100
Subject: [PATCH 191/223] re #13928 move code to aviod possible memory leak
---
Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp b/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp
index 11af3df2b5b..5413e173b24 100644
--- a/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp
+++ b/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp
@@ -92,6 +92,12 @@ namespace Mantid
coord_t incrementX = (maxX - minX) / static_cast<coord_t>(nBinsX);
coord_t incrementY = (maxY - minY) / static_cast<coord_t>(nBinsY);
+ boost::scoped_ptr<MDHistoWorkspaceIterator> iterator(dynamic_cast<MDHistoWorkspaceIterator*>(createIteratorWithNormalization(m_normalizationOption, m_workspace.get())));
+ if (!iterator) {
+ throw std::runtime_error(
+ "Could not convert IMDIterator to a MDHistoWorkspaceIterator");
+ }
+
const int imageSize = (nBinsX ) * (nBinsY );
vtkPoints *points = vtkPoints::New();
points->Allocate(static_cast<int>(imageSize));
@@ -119,11 +125,6 @@ namespace Mantid
double progressFactor = 0.5/double(nBinsX);
double progressOffset = 0.5;
- boost::scoped_ptr<MDHistoWorkspaceIterator> iterator(dynamic_cast<MDHistoWorkspaceIterator*>(createIteratorWithNormalization(m_normalizationOption, m_workspace.get())));
- if (!iterator) {
- throw std::runtime_error(
- "Could not convert IMDIterator to a MDHistoWorkspaceIterator");
- }
size_t index = 0;
for (int i = 0; i < nBinsX; i++)
--
GitLab
From a6d3290958b293c360a7ac31c5564e5bfcd16b21 Mon Sep 17 00:00:00 2001
From: Elliot Oram <Elliot.Oram@stfc.ac.uk>
Date: Tue, 13 Oct 2015 15:11:47 +0100
Subject: [PATCH 192/223] Added Check on Run not just Plot Time validation
Refs #13897
---
.../src/Indirect/ISISEnergyTransfer.cpp | 46 +++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp b/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
index 1c0638d6561..29ce74e569f 100644
--- a/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
+++ b/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
@@ -128,6 +128,52 @@ bool ISISEnergyTransfer::validate() {
}
}
+ if (m_uiForm.dsRunFiles->isValid()) {
+ int detectorMin = m_uiForm.spPlotTimeSpecMin->value();
+ int detectorMax = m_uiForm.spPlotTimeSpecMax->value();
+
+ QString rawFile = m_uiForm.dsRunFiles->getFirstFilename();
+ auto pos = rawFile.lastIndexOf(".");
+ auto extension = rawFile.right(rawFile.length() - pos);
+ QFileInfo rawFileInfo(rawFile);
+ std::string name = rawFileInfo.baseName().toStdString();
+
+ IAlgorithm_sptr loadAlg = AlgorithmManager::Instance().create("Load");
+ loadAlg->initialize();
+ loadAlg->setProperty("Filename", rawFile.toStdString());
+ loadAlg->setProperty("OutputWorkspace", name);
+ if (extension.compare(".nxs") == 0) {
+ int64_t detectorMin =
+ static_cast<int64_t>(m_uiForm.spPlotTimeSpecMin->value());
+ int64_t detectorMax =
+ static_cast<int64_t>(m_uiForm.spPlotTimeSpecMax->value());
+ loadAlg->setProperty("SpectrumMin", detectorMin);
+ loadAlg->setProperty("SpectrumMax", detectorMax);
+ } else {
+ loadAlg->setProperty("SpectrumMin", detectorMin);
+ loadAlg->setProperty("SpectrumMax", detectorMax);
+ }
+
+ loadAlg->execute();
+
+ if (m_uiForm.ckBackgroundRemoval->isChecked()) {
+ MatrixWorkspace_sptr tempWs =
+ AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(name);
+ const int minBack = tempWs->readX(0)[0];
+ const int maxBack = tempWs->readX(0)[tempWs->blocksize()];
+
+ if (m_uiForm.spBackgroundStart->value() < minBack) {
+ uiv.addErrorMessage("The Start of Background Removal is less than the "
+ "minimum of the data range");
+ }
+
+ if (m_uiForm.spBackgroundEnd->value() > maxBack) {
+ uiv.addErrorMessage("The End of Background Removal is more than the "
+ "maximum of the data range");
+ }
+ }
+ }
+
QString error = uiv.generateErrorMessage();
showMessageBox(error);
--
GitLab
From 73e3203529affb67fbf83f8867a8bae13170d734 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 13 Oct 2015 15:48:03 +0100
Subject: [PATCH 193/223] fix integer overflow before mem allocation, IDs
1075711-14, re #13951
---
MantidPlot/src/origin/OPJFile.cpp | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/MantidPlot/src/origin/OPJFile.cpp b/MantidPlot/src/origin/OPJFile.cpp
index c0eaf257564..73c397f65f2 100644
--- a/MantidPlot/src/origin/OPJFile.cpp
+++ b/MantidPlot/src/origin/OPJFile.cpp
@@ -52,6 +52,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <limits.h>
#include <math.h>
#include <cstring>
#include <algorithm> //required for std::swap
@@ -1327,6 +1328,12 @@ void OPJFile::readSpreadInfo(FILE *f, FILE *debug)
fread(&sec_size,4,1,f);
if(IsBigEndian()) SwapBytes(sec_size);
+ if (INT_MAX == sec_size) {
+ // this would end in an overflow and it's obviously wrong
+ fprintf(debug, "Error: while reading spread info, found section size: %d\n", sec_size);
+ fflush(debug);
+ }
+
//section_body_1
LAYER+=0x5;
fseek(f,LAYER,SEEK_SET);
@@ -1335,6 +1342,9 @@ void OPJFile::readSpreadInfo(FILE *f, FILE *debug)
if(col_index!=-1)
{
char *stmp=new char[sec_size+1];
+ if (!stmp)
+ break;
+
stmp[sec_size]='\0';
fread(stmp,sec_size,1,f);
SPREADSHEET[spread].column[col_index].command=stmp;
@@ -1552,6 +1562,12 @@ void OPJFile::readExcelInfo(FILE *f, FILE *debug)
fread(&sec_size,4,1,f);
if(IsBigEndian()) SwapBytes(sec_size);
+ if (INT_MAX == sec_size) {
+ // this would end in an overflow for new[] below and it's obviously wrong
+ fprintf(debug, "Error: while reading Excel info, found section size: %d\n", sec_size);
+ fflush(debug);
+ }
+
//section_body_1
LAYER+=0x5;
fseek(f,LAYER,SEEK_SET);
@@ -1802,6 +1818,12 @@ void OPJFile::readMatrixInfo(FILE *f, FILE *debug)
fread(&sec_size,4,1,f);
if(IsBigEndian()) SwapBytes(sec_size);
+ if (INT_MAX == sec_size) {
+ // this would end in an overflow for new[] below and it's obviously wrong
+ fprintf(debug, "Error: while reading matrix info, found section size: %d\n", sec_size);
+ fflush(debug);
+ }
+
//section_body_1
LAYER+=0x5;
//check if it is a formula
@@ -2933,11 +2955,17 @@ void OPJFile::readProjectTreeFolder(FILE *f, FILE *debug, tree<projectNode>::ite
fread(&namesize,4,1,f);
if(IsBigEndian()) SwapBytes(namesize);
- POS+=5;
+ if (INT_MAX == namesize) {
+ // this would cause an overflow and it's anyway obviously wrong
+ fprintf(debug, "Error: while reading project tree folder, found project/folder name size: %d\n", namesize);
+ fflush(debug);
+ }
// read folder name
char* name=new char[namesize+1];
name[namesize]='\0';
+
+ POS+=5;
fseek(f,POS,SEEK_SET);
fread(name,namesize,1,f);
tree<projectNode>::iterator current_folder=projectTree.append_child(parent, projectNode(name, 1, creation_date, modification_date));
--
GitLab
From 743753b4f835e0b811cf55eedc97161ede17d4c9 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 13 Oct 2015 15:59:46 +0100
Subject: [PATCH 194/223] fix integer overflow in parameter to new[], IDs
1075715-16, re #13951
---
Framework/Kernel/src/ANN/kd_dump.cpp | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/Framework/Kernel/src/ANN/kd_dump.cpp b/Framework/Kernel/src/ANN/kd_dump.cpp
index 203a443249f..47230ad5a08 100644
--- a/Framework/Kernel/src/ANN/kd_dump.cpp
+++ b/Framework/Kernel/src/ANN/kd_dump.cpp
@@ -34,6 +34,8 @@
#include "kd_tree.h" // kd-tree declarations
#include "bd_tree.h" // bd-tree declarations
+#include <limits>
+
using namespace std; // make std:: available
//----------------------------------------------------------------------
@@ -332,6 +334,13 @@ annReadDump(istream &in, // input stream
for (j = 0; j < the_dim; j++) { // read bounding box low
in >> the_bnd_box_hi[j];
}
+
+ if (std::numeric_limits<int>::max() <= the_n_pts / sizeof(ANNidx)) {
+ annError("Too big number of elements for the point index array. This "
+ "would cause an overflow when allocating memory",
+ ANNabort);
+ }
+
the_pidx = new ANNidx[the_n_pts]; // allocate point index array
int next_idx = 0; // number of indices filled
// read the tree and indices
@@ -429,6 +438,14 @@ static ANNkd_ptr annReadTree(istream &in, // input stream
int n_bnds; // number of bounding sides
in >> n_bnds; // number of bounding sides
// allocate bounds array
+
+ if (std::numeric_limits<int>::max() <= n_bnds / sizeof(ANNorthHalfSpace)) {
+ annError("Too big number of bounding sides, would cause overflow when "
+ "allocating memory",
+ ANNabort);
+ exit(0);
+ }
+
ANNorthHSArray bds = new ANNorthHalfSpace[n_bnds];
for (int i = 0; i < n_bnds; i++) {
int sd; // which side
--
GitLab
From dcd3383136ae40829d36a59105bf24b15bd53fab Mon Sep 17 00:00:00 2001
From: Elliot Oram <Elliot.Oram@stfc.ac.uk>
Date: Tue, 13 Oct 2015 16:02:25 +0100
Subject: [PATCH 195/223] Changed int to double to avoid incorrect cast
Refs #13897
---
.../CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp b/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
index 29ce74e569f..684a600758e 100644
--- a/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
+++ b/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
@@ -159,8 +159,8 @@ bool ISISEnergyTransfer::validate() {
if (m_uiForm.ckBackgroundRemoval->isChecked()) {
MatrixWorkspace_sptr tempWs =
AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(name);
- const int minBack = tempWs->readX(0)[0];
- const int maxBack = tempWs->readX(0)[tempWs->blocksize()];
+ const double minBack = tempWs->readX(0)[0];
+ const double maxBack = tempWs->readX(0)[tempWs->blocksize()];
if (m_uiForm.spBackgroundStart->value() < minBack) {
uiv.addErrorMessage("The Start of Background Removal is less than the "
@@ -529,8 +529,8 @@ void ISISEnergyTransfer::plotRaw() {
if (m_uiForm.ckBackgroundRemoval->isChecked()) {
MatrixWorkspace_sptr tempWs =
AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(name);
- const int minBack = tempWs->readX(0)[0];
- const int maxBack = tempWs->readX(0)[tempWs->blocksize()];
+ const double minBack = tempWs->readX(0)[0];
+ const double maxBack = tempWs->readX(0)[tempWs->blocksize()];
if (startBack < minBack) {
emit showMessageBox("The Start of Background Removal is less than the "
--
GitLab
From 99e73977108a3036a95af25aee24bc50c0bb475d Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 13 Oct 2015 16:13:48 +0100
Subject: [PATCH 196/223] error check, alleviate issue 1304130, probably won't
fix it, re #13951
---
Framework/DataHandling/src/GroupDetectors2.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Framework/DataHandling/src/GroupDetectors2.cpp b/Framework/DataHandling/src/GroupDetectors2.cpp
index 060f54bee77..c0d121a4847 100644
--- a/Framework/DataHandling/src/GroupDetectors2.cpp
+++ b/Framework/DataHandling/src/GroupDetectors2.cpp
@@ -804,6 +804,10 @@ void GroupDetectors2::readFile(spec2index_map &specs2index, std::istream &File,
numberOfSpectra = readInt(thisLine);
} while (numberOfSpectra == EMPTY_LINE);
+ if (numberOfSpectra <= 0) {
+ throw std::invalid_argument("The number of spectra is zero or negative");
+ }
+
// the value of this map is the list of spectra numbers that will be
// combined into a group
m_GroupSpecInds[spectrumNo].reserve(numberOfSpectra);
--
GitLab
From ba671c78a669e3c6938adff67e76fff52ff5e390 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 13 Oct 2015 17:10:24 +0100
Subject: [PATCH 197/223] check size from file used to allocate mem, 1075718,
re #13951
---
Framework/DataHandling/src/LoadRaw/isisraw.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Framework/DataHandling/src/LoadRaw/isisraw.cpp b/Framework/DataHandling/src/LoadRaw/isisraw.cpp
index 6037ec23a60..62812053467 100644
--- a/Framework/DataHandling/src/LoadRaw/isisraw.cpp
+++ b/Framework/DataHandling/src/LoadRaw/isisraw.cpp
@@ -460,7 +460,17 @@ int ISISRAW::ioRAW(FILE *file, bool from_file, bool read_data) {
// ioRAW(file, &u_len, 1, from_file);
if (from_file) {
u_len = add.ad_data - add.ad_user - 2;
+
+ if (u_len < 0 || (add.ad_data < add.ad_user + 2)) {
+ // this will/would be used for memory allocation
+ std::cerr << "Error in u_len value read from file, it would be " << u_len
+ << "; where it is calculated as "
+ "u_len = ad_data - ad_user - 2, where ad_data: "
+ << add.ad_data << ", ad_user: " << add.ad_user << std::endl;
+ return 0;
+ }
}
+
ioRAW(file, &u_dat, u_len, from_file);
ioRAW(file, &ver8, 1, from_file);
fgetpos(file, &dhdr_pos);
--
GitLab
From c06b0a3e248b4b49b3ffd3629be03058ef6356f7 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 13 Oct 2015 17:11:52 +0100
Subject: [PATCH 198/223] check size from file used to allocate mem, 1075717,
re #13951
---
Framework/DataHandling/src/LoadRaw/isisraw2.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Framework/DataHandling/src/LoadRaw/isisraw2.cpp b/Framework/DataHandling/src/LoadRaw/isisraw2.cpp
index f4bbb1f4187..4029ea10496 100644
--- a/Framework/DataHandling/src/LoadRaw/isisraw2.cpp
+++ b/Framework/DataHandling/src/LoadRaw/isisraw2.cpp
@@ -95,7 +95,17 @@ int ISISRAW2::ioRAW(FILE *file, bool from_file, bool read_data) {
// ISISRAW::ioRAW(file, &u_len, 1, from_file);
if (from_file) {
u_len = add.ad_data - add.ad_user - 2;
+
+ if (u_len < 0 || (add.ad_data < add.ad_user + 2)) {
+ // this will/would be used for memory allocation
+ g_log.error() << "Error in u_len value read from file, it would be "
+ << u_len << "; where it is calculated as "
+ "u_len = ad_data - ad_user - 2, where ad_data: "
+ << add.ad_data << ", ad_user: " << add.ad_user << "\n";
+ throw std::runtime_error("Inconsistent value for the field u_len found");
+ }
}
+
ISISRAW::ioRAW(file, &u_dat, u_len, from_file);
ISISRAW::ioRAW(file, &ver8, 1, from_file);
fgetpos(file, &dhdr_pos);
--
GitLab
From 3a088ffb7ef98db627a5a6c4cff7cc5c8ff64639 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 13 Oct 2015 17:24:59 +0100
Subject: [PATCH 199/223] check non-neg return from find before indexing,
1301213, re #13951
---
Framework/Crystal/src/IntegratePeakTimeSlices.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Framework/Crystal/src/IntegratePeakTimeSlices.cpp b/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
index 70e398ef3d6..263ca543401 100644
--- a/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
+++ b/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
@@ -2220,7 +2220,14 @@ bool IntegratePeakTimeSlices::isGoodFit(std::vector<double> const ¶ms,
std::vector<std::string> const &names,
double chisqOverDOF) {
int Ibk = find("Background", names);
+ if (Ibk < 0)
+ throw runtime_error("Irrecoverable inconsistency found. The index for the "
+ "parameter 'Background' is lower than zero.");
+
int IIntensity = find("Intensity", names);
+ if (IIntensity < 0)
+ throw runtime_error("Irrecoverable inconsistency found. The index for the "
+ "parameter 'Intensity' is lower than zero.");
if (chisqOverDOF < 0) {
--
GitLab
From 0b807d5d77fd92287af58940a81df6f13c0e519e Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 13 Oct 2015 17:34:37 +0100
Subject: [PATCH 200/223] check non-neg return from find() before indexing,
1301227, re #13951
---
.../Crystal/src/IntegratePeakTimeSlices.cpp | 25 ++++++++++++++++---
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/Framework/Crystal/src/IntegratePeakTimeSlices.cpp b/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
index 263ca543401..9828bea2f54 100644
--- a/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
+++ b/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
@@ -587,6 +587,12 @@ void IntegratePeakTimeSlices::exec() {
// Now set up the center for this peak
int i = find("Mrow", names);
+ if (i < 0) {
+ throw std::runtime_error("Inconsistency found in algorithm "
+ "execution. The index for the parameter "
+ "Mrow is negative.");
+ }
+
lastRow = (int)(params[i] + .5);
i = find("Mcol", names);
lastCol = (int)(params[i] + .5);
@@ -2221,13 +2227,15 @@ bool IntegratePeakTimeSlices::isGoodFit(std::vector<double> const ¶ms,
double chisqOverDOF) {
int Ibk = find("Background", names);
if (Ibk < 0)
- throw runtime_error("Irrecoverable inconsistency found. The index for the "
- "parameter 'Background' is lower than zero.");
+ throw std::runtime_error(
+ "Irrecoverable inconsistency found. The index for the "
+ "parameter 'Background' is lower than zero.");
int IIntensity = find("Intensity", names);
if (IIntensity < 0)
- throw runtime_error("Irrecoverable inconsistency found. The index for the "
- "parameter 'Intensity' is lower than zero.");
+ throw std::runtime_error(
+ "Irrecoverable inconsistency found. The index for the "
+ "parameter 'Intensity' is lower than zero.");
if (chisqOverDOF < 0) {
@@ -2505,6 +2513,15 @@ int IntegratePeakTimeSlices::UpdateOutputWS(
int Irow = find("Mrow", names);
int Icol = find("Mcol", names);
+ if (Ibk < 0 || IIntensity < 0 || IVx < 0 || IVy < 0 || IVxy < 0 || Irow < 0 ||
+ Icol < 0) {
+ throw std::runtime_error("Inconsistency found when updating output "
+ "workspace. None of the indices for the "
+ "parameters 'Background', 'Intensity', 'SScol', "
+ "'SSrow', 'SSrc', 'Mrow', 'Mcol' can be "
+ "negative.");
+ }
+
int newRowIndex = 0;
if (dir > 0)
--
GitLab
From 4c02d874932c3162e03633ae7d6535b9a92b6be7 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 13 Oct 2015 17:52:45 +0100
Subject: [PATCH 201/223] check retun value from doFitFunction, 1325901, re
#13951
---
.../Algorithms/RefinePowderInstrumentParameters3.cpp | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters3.cpp b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters3.cpp
index a5c35c1f331..f87a83a0013 100644
--- a/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters3.cpp
+++ b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters3.cpp
@@ -870,8 +870,15 @@ double RefinePowderInstrumentParameters3::calculateFunctionError(
// 2. Fit with zero iteration
double chi2;
string fitstatus;
- doFitFunction(function, dataws, wsindex, "Levenberg-MarquardtMD", 0, chi2,
- fitstatus);
+ const std::string minimizer = "Levenberg-MarquardtMD";
+ bool fitOK =
+ doFitFunction(function, dataws, wsindex, minimizer, 0, chi2, fitstatus);
+
+ if (!fitOK) {
+ g_log.warning() << "Fit by " << minimizer
+ << " with 0 iterations failed, with reason: " << fitstatus
+ << "\n";
+ }
// 3. Restore the fit/fix setup
for (size_t i = 0; i < parnames.size(); ++i) {
--
GitLab
From 7898e200b8973cf78b1727ef2e0f730594c03d29 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Tue, 13 Oct 2015 18:03:00 +0100
Subject: [PATCH 202/223] check retval from json parser + fix test example,
1311473, re #13951
---
Framework/DataHandling/src/CheckMantidVersion.cpp | 9 ++++++++-
Framework/DataHandling/test/CheckMantidVersionTest.h | 3 ++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Framework/DataHandling/src/CheckMantidVersion.cpp b/Framework/DataHandling/src/CheckMantidVersion.cpp
index 30a620c6079..2748bf49ba2 100644
--- a/Framework/DataHandling/src/CheckMantidVersion.cpp
+++ b/Framework/DataHandling/src/CheckMantidVersion.cpp
@@ -107,7 +107,14 @@ void CheckMantidVersion::exec() {
if (!json.empty()) {
Json::Reader r;
Json::Value root;
- r.parse(json, root);
+ bool parseOK = r.parse(json, root);
+ if (!parseOK) {
+ g_log.error() << "Error trying to parse this JSON string from GitHub: "
+ << json << std::endl;
+ throw std::runtime_error("Error found when parsing version information "
+ "retrieved from GitHub as a JSON string." +
+ r.getFormattedErrorMessages());
+ }
std::string gitHubVersionTag = root["tag_name"].asString();
mostRecentVersion = cleanVersionTag(gitHubVersionTag);
diff --git a/Framework/DataHandling/test/CheckMantidVersionTest.h b/Framework/DataHandling/test/CheckMantidVersionTest.h
index d6c1e17a95d..d7cf6155fca 100644
--- a/Framework/DataHandling/test/CheckMantidVersionTest.h
+++ b/Framework/DataHandling/test/CheckMantidVersionTest.h
@@ -77,7 +77,8 @@ private:
"\"https://api.github.com/users/peterfpeterson/received_events\",\n"
" \"type\": \"User\",\n"
" \"site_admin\": false\n"
- " }";
+ " }\n"
+ "}";
return outputString;
}
--
GitLab
From 977c7cd1f1591911c80cb7360b82fe5567fe0fb0 Mon Sep 17 00:00:00 2001
From: Wenduo Zhou <zhouw@ornl.gov>
Date: Tue, 13 Oct 2015 13:22:41 -0400
Subject: [PATCH 203/223] Refs #13692. Fixed clang-format issues.
---
.../mantid/api/src/Exports/Algorithm.cpp | 8 +-
.../mantid/api/src/Exports/Axis.cpp | 44 +++----
.../mantid/api/src/Exports/IAlgorithm.cpp | 39 ++----
.../mantid/api/src/Exports/IFunction.cpp | 33 ++----
.../api/src/Exports/IMDEventWorkspace.cpp | 9 +-
.../api/src/Exports/IMDHistoWorkspace.cpp | 21 ++--
.../mantid/api/src/Exports/IPeak.cpp | 112 ++++++------------
.../mantid/api/src/Exports/IPeakFunction.cpp | 3 +-
.../api/src/Exports/IPeaksWorkspace.cpp | 25 ++--
.../mantid/api/src/Exports/ISpectrum.cpp | 18 +--
.../api/src/Exports/ITableWorkspace.cpp | 40 +++----
.../mantid/api/src/Exports/MDGeometry.cpp | 45 +++----
.../api/src/Exports/MatrixWorkspace.cpp | 39 +++---
.../mantid/api/src/Exports/Projection.cpp | 15 +--
.../mantid/api/src/Exports/Run.cpp | 51 +++-----
.../mantid/api/src/Exports/Sample.cpp | 47 +++-----
.../api/src/Exports/ScriptRepository.cpp | 28 ++---
.../mantid/api/src/Exports/Workspace.cpp | 21 ++--
.../mantid/api/src/Exports/WorkspaceGroup.cpp | 20 ++--
.../api/src/Exports/WorkspaceHistory.cpp | 12 +-
20 files changed, 221 insertions(+), 409 deletions(-)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index d3798d6efde..41ef7653cab 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -83,14 +83,14 @@ void export_leaf_classes() {
"Creates and intializes a named child algorithm. Output workspaces "
"are given a dummy name.")
.def("declareProperty",
- (declarePropertyType1) & PythonAlgorithm::declarePyAlgProperty,
+ (declarePropertyType1)&PythonAlgorithm::declarePyAlgProperty,
declarePropertyType1_Overload(
(arg("self"), arg("prop"), arg("doc") = "")))
.def("enableHistoryRecordingForChild",
&Algorithm::enableHistoryRecordingForChild, (args("on")),
"Turns history recording on or off for an algorithm.")
.def("declareProperty",
- (declarePropertyType2) & PythonAlgorithm::declarePyAlgProperty,
+ (declarePropertyType2)&PythonAlgorithm::declarePyAlgProperty,
declarePropertyType2_Overload(
(arg("self"), arg("name"), arg("defaultValue"),
arg("validator") = object(), arg("doc") = "",
@@ -99,7 +99,7 @@ void export_leaf_classes() {
"the type of the defaultValue and mapped to an appropriate C++ "
"type"))
.def("declareProperty",
- (declarePropertyType3) & PythonAlgorithm::declarePyAlgProperty,
+ (declarePropertyType3)&PythonAlgorithm::declarePyAlgProperty,
declarePropertyType3_Overload(
(arg("self"), arg("name"), arg("defaultValue"), arg("doc") = "",
arg("direction") = Direction::Input),
@@ -107,7 +107,7 @@ void export_leaf_classes() {
"type "
"of the defaultValue and mapped to an appropriate C++ type"))
.def("declareProperty",
- (declarePropertyType4) & PythonAlgorithm::declarePyAlgProperty,
+ (declarePropertyType4)&PythonAlgorithm::declarePyAlgProperty,
(arg("self"), arg("name"), arg("defaultValue"),
arg("direction") = Direction::Input),
"Declares a named property where the type is taken from the type "
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
index 4ddd749fd65..2c1705e25f1 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
@@ -73,53 +73,41 @@ void export_Axis() {
// Class
class_<Axis, boost::noncopyable>("MantidAxis", no_init)
- .def("length", &Axis::length,
- arg("self"),
+ .def("length", &Axis::length, arg("self"),
"Returns the length of the axis")
.def("title", (const std::string &(Axis::*)() const) & Axis::title,
- arg("self"),
- return_value_policy<copy_const_reference>(), "Get the axis title")
- .def("isSpectra", &Axis::isSpectra,
- arg("self"),
+ arg("self"), return_value_policy<copy_const_reference>(),
+ "Get the axis title")
+ .def("isSpectra", &Axis::isSpectra, arg("self"),
"Returns true if this is a SpectraAxis")
- .def("isNumeric", &Axis::isNumeric,
- arg("self"),
+ .def("isNumeric", &Axis::isNumeric, arg("self"),
"Returns true if this is a NumericAxis")
- .def("isText", &Axis::isText,
- arg("self"),
+ .def("isText", &Axis::isText, arg("self"),
"Returns true if this is a TextAxis")
- .def("label", &Axis::label,
- (arg("self"), arg("index")),
+ .def("label", &Axis::label, (arg("self"), arg("index")),
"Return the axis label")
.def("getUnit", (const Unit_sptr &(Axis::*)() const) & Axis::unit,
- arg("self"),
- return_value_policy<copy_const_reference>(),
+ arg("self"), return_value_policy<copy_const_reference>(),
"Returns the unit object for the axis")
.def("getValue", &Axis::getValue,
Axis_getValue(args("index", "vertical_index"),
"Returns the value at the given point on the Axis. "
"The vertical axis index [default=0]"))
- .def("extractValues", &extractAxisValues,
- arg("self"),
+ .def("extractValues", &extractAxisValues, arg("self"),
"Return a numpy array of the axis values")
- .def("setUnit", &Axis::setUnit,
- (arg("self"), arg("unit_name")),
+ .def("setUnit", &Axis::setUnit, (arg("self"), arg("unit_name")),
return_value_policy<copy_const_reference>(),
"Set the unit for this axis by name.")
.def("setValue", &Axis::setValue,
(arg("self"), arg("index"), arg("value")),
"Set a value at the given index")
- .def("getMin", &Axis::getMin,
- arg("self"),
+ .def("getMin", &Axis::getMin, arg("self"),
"Get min value specified on the axis")
- .def("getMax", &Axis::getMax,
- arg("self"),
+ .def("getMax", &Axis::getMax, arg("self"),
"Get max value specified on the axis")
//------------------------------------ Special methods
//------------------------------------
- .def("__len__",
- &Axis::length,
- arg("self"));
+ .def("__len__", &Axis::length, arg("self"));
}
// --------------------------------------------------------------------------------------------
@@ -182,11 +170,9 @@ void export_TextAxis() {
.def("setLabel", &TextAxis::setLabel,
(arg("self"), arg("index"), arg("label")),
"Set the label at the given entry")
- .def("label", &TextAxis::label,
- (arg("self"), arg("index")),
+ .def("label", &TextAxis::label, (arg("self"), arg("index")),
"Return the label at the given position")
- .def("create", &createTextAxis,
- arg("length"),
+ .def("create", &createTextAxis, arg("length"),
return_internal_reference<>(),
"Creates a new TextAxis of a specified length")
.staticmethod("create");
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
index be1396fd1ba..f70cc834983 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
@@ -302,54 +302,41 @@ void export_ialgorithm() {
class_<IAlgorithm, bases<IPropertyManager>, boost::noncopyable>(
"IAlgorithm", "Interface for all algorithms", no_init)
- .def("name", &IAlgorithm::name,
- arg("self"),
+ .def("name", &IAlgorithm::name, arg("self"),
"Returns the name of the algorithm")
- .def("alias", &IAlgorithm::alias,
- arg("self"),
+ .def("alias", &IAlgorithm::alias, arg("self"),
"Return the aliases for the algorithm")
- .def("version", &IAlgorithm::version,
- arg("self"),
+ .def("version", &IAlgorithm::version, arg("self"),
"Returns the version number of the algorithm")
- .def("cancel", &IAlgorithm::cancel,
- arg("self"),
+ .def("cancel", &IAlgorithm::cancel, arg("self"),
"Request that the algorithm stop running")
- .def("category", &IAlgorithm::category,
- arg("self"),
+ .def("category", &IAlgorithm::category, arg("self"),
"Returns the category containing the algorithm")
- .def("categories", &IAlgorithm::categories,
- arg("self"),
+ .def("categories", &IAlgorithm::categories, arg("self"),
"Returns the list of categories this algorithm belongs to")
- .def("summary", &IAlgorithm::summary,
- arg("self"),
+ .def("summary", &IAlgorithm::summary, arg("self"),
"Returns a summary message describing the algorithm")
- .def("workspaceMethodName", &IAlgorithm::workspaceMethodName,
- arg("self"),
+ .def("workspaceMethodName", &IAlgorithm::workspaceMethodName, arg("self"),
"Returns a name that will be used when attached as a workspace "
"method. Empty string indicates do not attach")
- .def("workspaceMethodOn", &IAlgorithm::workspaceMethodOn,
- arg("self"),
+ .def("workspaceMethodOn", &IAlgorithm::workspaceMethodOn, arg("self"),
return_value_policy<VectorToNumpy>(), // creates a list for strings
"Returns a set of class names that will have the method attached. "
"Empty list indicates all types")
.def("workspaceMethodInputProperty",
- &IAlgorithm::workspaceMethodInputProperty,
- arg("self"),
+ &IAlgorithm::workspaceMethodInputProperty, arg("self"),
"Returns the name of the input workspace property used by the "
"calling object")
- .def("getAlgorithmID", &getAlgorithmID,
- arg("self"),
+ .def("getAlgorithmID", &getAlgorithmID, arg("self"),
"Returns a unique identifier for this algorithm object")
- .def("docString", &createDocString,
- arg("self"),
+ .def("docString", &createDocString, arg("self"),
"Returns a doc string for the algorithm")
.def("mandatoryProperties", &getInputPropertiesWithMandatoryFirst,
arg("self"),
"Returns a list of input and in/out property names that is ordered "
"such that the mandatory properties are first followed by the "
"optional ones.")
- .def("orderedProperties", &getAlgorithmPropertiesOrdered,
- arg("self"),
+ .def("orderedProperties", &getAlgorithmPropertiesOrdered, arg("self"),
"Return a list of input, in/out and output properties "
"such that the mandatory properties are first followed by the "
"optional ones.")
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index 020b9cf7aad..9e7b21eb69d 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -51,42 +51,33 @@ void export_IFunction() {
class_<IFunction, IFunctionAdapter, boost::noncopyable>(
"IFunction", "Base class for all functions", no_init)
- .def("name", &IFunction::name,
- arg("self"),
+ .def("name", &IFunction::name, arg("self"),
"Return the name of the function")
- .def("category", &IFunctionAdapter::category,
- arg("self"),
+ .def("category", &IFunctionAdapter::category, arg("self"),
"Return a semi-colon(;) separated string for the categories this "
"class should belong to. For sub-categories use a \\ separator")
- .def("initialize", &IFunction::initialize,
- arg("self"),
+ .def("initialize", &IFunction::initialize, arg("self"),
"Declares any parameters and attributes on the function")
- .def("getCategories", &getCategories,
- arg("self"),
+ .def("getCategories", &getCategories, arg("self"),
"Returns a list of the categories for an algorithm")
- .def("nAttributes", &IFunction::nAttributes,
- arg("self"),
+ .def("nAttributes", &IFunction::nAttributes, arg("self"),
"Return the number of attributes (non-fitting arguments)")
- .def("attributeNames", &IFunction::getAttributeNames,
- arg("self"),
+ .def("attributeNames", &IFunction::getAttributeNames, arg("self"),
"The names of all the attributes")
- .def("nParams", &IFunction::nParams,
- arg("self"),
+ .def("nParams", &IFunction::nParams, arg("self"),
"Return the number of parameters")
- .def("parameterName", &IFunction::parameterName,
- (arg("self"), arg("i")),
+ .def("parameterName", &IFunction::parameterName, (arg("self"), arg("i")),
"Return the name of the ith parameter")
.def("paramDescription", &IFunction::parameterDescription,
- (arg("self"), arg("i")),
- "Return a description of the ith parameter")
+ (arg("self"), arg("i")), "Return a description of the ith parameter")
.def("isExplicitlySet", &IFunction::isExplicitlySet,
(arg("self"), arg("i")),
@@ -94,14 +85,12 @@ void export_IFunction() {
.def("getParameterValue",
(double (IFunction::*)(size_t) const) & IFunction::getParameter,
- (arg("self"), arg("i")),
- "Get the value of the ith parameter")
+ (arg("self"), arg("i")), "Get the value of the ith parameter")
.def("getParameterValue",
(double (IFunction::*)(const std::string &) const) &
IFunction::getParameter,
- (arg("self"), arg("name")),
- "Get the value of the named parameter")
+ (arg("self"), arg("name")), "Get the value of the named parameter")
.def("setParameter", (setParameterType1)&IFunction::setParameter,
setParameterType1_Overloads("Sets the value of the ith parameter"))
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp
index a9f042ec247..4bd404f62e4 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp
@@ -12,18 +12,15 @@ void export_IMDEventWorkspace() {
// IMDEventWorkspace class
class_<IMDEventWorkspace, bases<IMDWorkspace, MultipleExperimentInfos>,
boost::noncopyable>("IMDEventWorkspace", no_init)
- .def("getNPoints", &IMDEventWorkspace::getNPoints,
- arg("self"),
+ .def("getNPoints", &IMDEventWorkspace::getNPoints, arg("self"),
"Returns the total number of points (events) in this workspace")
- .def("getNumDims", &IMDEventWorkspace::getNumDims,
- arg("self"),
+ .def("getNumDims", &IMDEventWorkspace::getNumDims, arg("self"),
"Returns the number of dimensions in this workspace")
.def("getBoxController", (BoxController_sptr (IMDEventWorkspace::*)()) &
IMDEventWorkspace::getBoxController,
- arg("self"),
- "Returns the BoxController used in this workspace");
+ arg("self"), "Returns the BoxController used in this workspace");
RegisterWorkspacePtrToPython<IMDEventWorkspace>();
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
index 3ae6965e77e..5ed3e256452 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
@@ -167,8 +167,7 @@ void export_IMDHistoWorkspace() {
// IMDHistoWorkspace class
class_<IMDHistoWorkspace, bases<IMDWorkspace, MultipleExperimentInfos>,
boost::noncopyable>("IMDHistoWorkspace", no_init)
- .def("getSignalArray", &getSignalArrayAsNumpyArray,
- arg("self"),
+ .def("getSignalArray", &getSignalArrayAsNumpyArray, arg("self"),
"Returns a read-only numpy array containing the signal values")
.def("getErrorSquaredArray", &getErrorSquaredArrayAsNumpyArray,
@@ -176,8 +175,7 @@ void export_IMDHistoWorkspace() {
"Returns a read-only numpy array containing the square of the error "
"values")
- .def("getNumEventsArray", &getNumEventsArrayAsNumpyArray,
- arg("self"),
+ .def("getNumEventsArray", &getNumEventsArrayAsNumpyArray, arg("self"),
"Returns a read-only numpy array containing the number of MD events "
"in each bin")
@@ -199,23 +197,21 @@ void export_IMDHistoWorkspace() {
(arg("self"), arg("index"), arg("value")),
"Sets the squared-error at the specified index.")
- .def("setSignalArray", &setSignalArray,
- arg("self"),
+ .def("setSignalArray", &setSignalArray, arg("self"),
"Sets the signal from a numpy array. The sizes must match the "
"current workspace sizes. A ValueError is thrown if not")
- .def("setErrorSquaredArray", &setErrorSquaredArray,
- arg("self"),
+ .def("setErrorSquaredArray", &setErrorSquaredArray, arg("self"),
"Sets the square of the errors from a numpy array. The sizes must "
"match the current workspace sizes. A ValueError is thrown if not")
.def("setTo", &IMDHistoWorkspace::setTo,
- (arg("self"), arg("signal"), arg("error_squared"), arg("num_events")),
+ (arg("self"), arg("signal"), arg("error_squared"),
+ arg("num_events")),
"Sets all signals/errors in the workspace to the given values")
.def("getInverseVolume", &IMDHistoWorkspace::getInverseVolume,
- arg("self"),
- return_value_policy<return_by_value>(),
+ arg("self"), return_value_policy<return_by_value>(),
"Return the inverse of volume of EACH cell in the workspace.")
.def("getLinearIndex",
@@ -236,7 +232,8 @@ void export_IMDHistoWorkspace() {
(size_t (IMDHistoWorkspace::*)(size_t, size_t, size_t, size_t)
const) &
IMDHistoWorkspace::getLinearIndex,
- (arg("self"), arg("index1"), arg("index2"), arg("index3"), arg("index4")),
+ (arg("self"), arg("index1"), arg("index2"), arg("index3"),
+ arg("index4")),
return_value_policy<return_by_value>(),
"Get the 1D linear index from the 4D array")
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
index 41bd81c0453..3dcc380b56d 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
@@ -36,78 +36,58 @@ void export_IPeak() {
register_ptr_to_python<IPeak *>();
class_<IPeak, boost::noncopyable>("IPeak", no_init)
- .def("getDetectorID", &IPeak::getDetectorID,
- arg("self"),
+ .def("getDetectorID", &IPeak::getDetectorID, arg("self"),
"Get the ID of the detector at the center of the peak")
- .def("setDetectorID", &IPeak::setDetectorID,
- (arg("self"), arg("det_id")),
+ .def("setDetectorID", &IPeak::setDetectorID, (arg("self"), arg("det_id")),
"Set the detector ID and look up and cache values related to it.")
- .def("getRunNumber", &IPeak::getRunNumber,
- arg("self"),
+ .def("getRunNumber", &IPeak::getRunNumber, arg("self"),
"Return the run number this peak was measured at")
.def("setRunNumber", &IPeak::setRunNumber,
(arg("self"), arg("run_number")),
"Set the run number that measured this peak")
- .def("getMonitorCount", &IPeak::getMonitorCount,
- arg("self"),
+ .def("getMonitorCount", &IPeak::getMonitorCount, arg("self"),
"Get the monitor count set for this peak")
.def("setMonitorCount", &IPeak::setMonitorCount,
(arg("self"), arg("monitor_count")),
"Set the monitor count for this peak")
- .def("getH", &IPeak::getH,
- arg("self"),
- "Get the H index of the peak")
- .def("getK", &IPeak::getK,
- arg("self"),
- "Get the K index of the peak")
- .def("getL", &IPeak::getL,
- arg("self"),
- "Get the L index of the peak")
- .def("getHKL", &IPeak::getHKL,
- arg("self"),
- "Get HKL as a V3D object")
+ .def("getH", &IPeak::getH, arg("self"), "Get the H index of the peak")
+ .def("getK", &IPeak::getK, arg("self"), "Get the K index of the peak")
+ .def("getL", &IPeak::getL, arg("self"), "Get the L index of the peak")
+ .def("getHKL", &IPeak::getHKL, arg("self"), "Get HKL as a V3D object")
.def("setHKL", (void (IPeak::*)(double, double, double)) & IPeak::setHKL,
(arg("self"), arg("h"), arg("k"), arg("l")),
"Set the HKL values of this peak")
- .def("setH", &IPeak::setH,
- (arg("self"), arg("h")),
+ .def("setH", &IPeak::setH, (arg("self"), arg("h")),
"Get the H index of the peak")
- .def("setK", &IPeak::setK,
- (arg("self"), arg("k")),
+ .def("setK", &IPeak::setK, (arg("self"), arg("k")),
"Get the K index of the peak")
- .def("setL", &IPeak::setL,
- (arg("self"), arg("l")),
+ .def("setL", &IPeak::setL, (arg("self"), arg("l")),
"Get the L index of the peak")
- .def("getQLabFrame", &IPeak::getQLabFrame,
- arg("self"),
+ .def("getQLabFrame", &IPeak::getQLabFrame, arg("self"),
"Return the Q change (of the lattice, k_i - k_f) for this peak.\n"
"The Q is in the Lab frame: the goniometer rotation was NOT taken "
"out.\n"
"Note: There is no 2*pi factor used, so \\|Q| = 1/wavelength.")
- .def("findDetector", &IPeak::findDetector,
- arg("self"),
+ .def("findDetector", &IPeak::findDetector, arg("self"),
"Using the instrument set in the peak, perform ray tracing to find "
"the exact detector.")
- .def("getQSampleFrame", &IPeak::getQSampleFrame,
- arg("self"),
+ .def("getQSampleFrame", &IPeak::getQSampleFrame, arg("self"),
"Return the Q change (of the lattice, k_i - k_f) for this peak."
"The Q is in the Sample frame: the goniometer rotation WAS taken "
"out. ")
- .def("setQLabFrame", setQLabFrame1,
- (arg("self"), arg("qlab_frame")),
+ .def("setQLabFrame", setQLabFrame1, (arg("self"), arg("qlab_frame")),
"Set the peak using the peak's "
- "position in reciprocal space, in "
- "the lab frame.")
+ "position in reciprocal space, in "
+ "the lab frame.")
.def("setQLabFrame", setQLabFrame2,
(arg("self"), arg("qlab_frame"), arg("distance")),
"Set the peak using the peak's position in reciprocal space, in the "
"lab frame. Detector distance explicitly supplied.") // two argument
// overload
.def("setQSampleFrame", setQSampleFrame1,
- (arg("self"), arg("qsample_frame")),
- "Set the peak using the peak's "
- "position in reciprocal space, "
- "in the sample frame.")
+ (arg("self"), arg("qsample_frame")), "Set the peak using the peak's "
+ "position in reciprocal space, "
+ "in the sample frame.")
.def("setQSampleFrame", setQSampleFrame2,
(arg("self"), arg("qsample_frame"), arg("distance")),
"Set the peak using the peak's position in reciprocal space, in the "
@@ -116,69 +96,51 @@ void export_IPeak() {
(arg("self"), arg("wave_length")),
"Set the incident wavelength of the neutron. Calculates the energy "
"from this assuming elastic scattering.")
- .def("getWavelength", &IPeak::getWavelength,
- arg("self"),
+ .def("getWavelength", &IPeak::getWavelength, arg("self"),
"Return the incident wavelength")
- .def("getScattering", &IPeak::getScattering,
- arg("self"),
+ .def("getScattering", &IPeak::getScattering, arg("self"),
"Calculate the scattering angle of the peak")
- .def("getDSpacing", &IPeak::getDSpacing,
- arg("self"),
+ .def("getDSpacing", &IPeak::getDSpacing, arg("self"),
"Calculate the d-spacing of the peak, in 1/Angstroms")
- .def("getTOF", &IPeak::getTOF,
- arg("self"),
+ .def("getTOF", &IPeak::getTOF, arg("self"),
"Calculate the time of flight (in "
"microseconds) of the neutrons for this "
"peak")
- .def("getInitialEnergy", &IPeak::getInitialEnergy,
- arg("self"),
+ .def("getInitialEnergy", &IPeak::getInitialEnergy, arg("self"),
"Get the initial (incident) neutron energy")
- .def("getFinalEnergy", &IPeak::getFinalEnergy,
- arg("self"),
+ .def("getFinalEnergy", &IPeak::getFinalEnergy, arg("self"),
"Get the final neutron energy")
.def("setInitialEnergy", &IPeak::setInitialEnergy,
(arg("self"), arg("initial_energy")),
"Set the initial (incident) neutron energy")
.def("setFinalEnergy", &IPeak::setFinalEnergy,
- (arg("self"), arg("final_energy")),
- "Set the final neutron energy")
- .def("getIntensity", &IPeak::getIntensity,
- arg("self"),
+ (arg("self"), arg("final_energy")), "Set the final neutron energy")
+ .def("getIntensity", &IPeak::getIntensity, arg("self"),
"Return the integrated peak intensity")
- .def("getSigmaIntensity", &IPeak::getSigmaIntensity,
- arg("self"),
+ .def("getSigmaIntensity", &IPeak::getSigmaIntensity, arg("self"),
"Return the error on the integrated peak intensity")
.def("setIntensity", &IPeak::setIntensity,
- (arg("self"), arg("intensity")),
- "Set the integrated peak intensity")
+ (arg("self"), arg("intensity")), "Set the integrated peak intensity")
.def("setSigmaIntensity", &IPeak::setSigmaIntensity,
(arg("self"), arg("sigma_intensity")),
"Set the error on the integrated peak intensity")
.def("getBinCount", &IPeak::getBinCount,
"Return the # of counts in the bin at its peak")
- .def("setBinCount", &IPeak::setBinCount,
- (arg("self"), arg("bin_count")),
+ .def("setBinCount", &IPeak::setBinCount, (arg("self"), arg("bin_count")),
"Set the # of counts in the bin at its peak")
- .def("getRow", &IPeak::getRow,
- arg("self"),
+ .def("getRow", &IPeak::getRow, arg("self"),
"For RectangularDetectors only, returns "
"the row (y) of the pixel of the "
"detector.")
- .def("getCol", &IPeak::getCol,
- arg("self"),
+ .def("getCol", &IPeak::getCol, arg("self"),
"For RectangularDetectors only, returns "
"the column (x) of the pixel of the "
"detector.")
- .def("getDetPos", &IPeak::getDetPos,
- arg("self"),
+ .def("getDetPos", &IPeak::getDetPos, arg("self"),
"Return the detector position vector")
- .def("getL1", &IPeak::getL1,
- arg("self"),
+ .def("getL1", &IPeak::getL1, arg("self"),
"Return the L1 flight path length (source to sample), in meters. ")
- .def("getL2", &IPeak::getL2,
- arg("self"),
+ .def("getL2", &IPeak::getL2, arg("self"),
"Return the L2 flight path length (sample to detector), in meters.")
- .def("getPeakShape", getPeakShape,
- arg("self"),
- "Get the peak shape");
+ .def("getPeakShape", getPeakShape, arg("self"), "Get the peak shape");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
index 0c0c19486ea..3ac4f633273 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
@@ -17,8 +17,7 @@ void export_IPeakFunction() {
(arg("self"), arg("vec_x")),
"Calculate the values of the function for the given x values. The "
"output should be stored in the out array")
- .def("intensity", &IPeakFunction::intensity,
- arg("self"),
+ .def("intensity", &IPeakFunction::intensity, arg("self"),
"Returns the integral intensity of the peak function.")
.def("setIntensity", &IPeakFunction::setIntensity,
(arg("self"), arg("new_intensity")),
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp
index 2ccf1151a06..392d246c8fc 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp
@@ -40,20 +40,16 @@ void export_IPeaksWorkspace() {
// IPeaksWorkspace class
class_<IPeaksWorkspace, bases<ITableWorkspace, ExperimentInfo>,
boost::noncopyable>("IPeaksWorkspace", no_init)
- .def("getNumberPeaks", &IPeaksWorkspace::getNumberPeaks,
- arg("self"),
+ .def("getNumberPeaks", &IPeaksWorkspace::getNumberPeaks, arg("self"),
"Returns the number of peaks within the workspace")
- .def("addPeak", &IPeaksWorkspace::addPeak,
- (arg("self"), arg("peak")),
+ .def("addPeak", &IPeaksWorkspace::addPeak, (arg("self"), arg("peak")),
"Add a peak to the workspace")
.def("removePeak", &IPeaksWorkspace::removePeak,
- (arg("self"), arg("peak_num")),
- "Remove a peak from the workspace")
+ (arg("self"), arg("peak_num")), "Remove a peak from the workspace")
.def("getPeak", &IPeaksWorkspace::getPeakPtr,
- (arg("self"), arg("peak_num")),
- return_internal_reference<>(), "Returns a peak at the given index")
- .def("createPeak", createPeakQLab,
- (arg("self"), arg("data")),
+ (arg("self"), arg("peak_num")), return_internal_reference<>(),
+ "Returns a peak at the given index")
+ .def("createPeak", createPeakQLab, (arg("self"), arg("data")),
return_value_policy<manage_new_object>(),
"Create a Peak and return it from its coordinates in the QLab frame")
.def("createPeak", createPeakQLabWithDistance,
@@ -61,15 +57,12 @@ void export_IPeaksWorkspace() {
return_value_policy<manage_new_object>(),
"Create a Peak and return it from its coordinates in the QLab "
"frame, detector-sample distance explicitly provided")
- .def("createPeakHKL", createPeakHKL,
- (arg("self"), arg("data")),
+ .def("createPeakHKL", createPeakHKL, (arg("self"), arg("data")),
return_value_policy<manage_new_object>(),
"Create a Peak and return it from its coordinates in the HKL frame")
.def("hasIntegratedPeaks", &IPeaksWorkspace::hasIntegratedPeaks,
- arg("self"),
- "Determine if the peaks have been integrated")
- .def("getRun", &IPeaksWorkspace::mutableRun,
- arg("self"),
+ arg("self"), "Determine if the peaks have been integrated")
+ .def("getRun", &IPeaksWorkspace::mutableRun, arg("self"),
return_internal_reference<>(),
"Return the Run object for this workspace")
.def("peakInfoNumber", &IPeaksWorkspace::peakInfoNumber,
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp
index ea0cbceda97..3afbf36902c 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp
@@ -14,28 +14,22 @@ void export_ISpectrum() {
.def("hasDetectorID", &ISpectrum::hasDetectorID,
(arg("self"), arg("det_id")),
"Returns True if the spectrum contain the given spectrum number")
- .def("getSpectrumNo", &ISpectrum::getSpectrumNo,
- arg("self"),
+ .def("getSpectrumNo", &ISpectrum::getSpectrumNo, arg("self"),
"Returns the spectrum number of this spectrum")
.def("getDetectorIDs", (const std::set<detid_t> &(ISpectrum::*)() const) &
ISpectrum::getDetectorIDs,
- arg("self"),
- return_value_policy<copy_const_reference>(),
+ arg("self"), return_value_policy<copy_const_reference>(),
"Returns a list of detector IDs for this spectrum")
.def("addDetectorID", &ISpectrum::addDetectorID,
- (arg("self"), arg("det_id")),
- "Add a detector ID to this spectrum")
+ (arg("self"), arg("det_id")), "Add a detector ID to this spectrum")
.def("setDetectorID", &ISpectrum::setDetectorID,
- (arg("self"), arg("det_id")),
- "Set the given ID has the only")
- .def("clearDetectorIDs", &ISpectrum::clearDetectorIDs,
- arg("self"),
+ (arg("self"), arg("det_id")), "Set the given ID has the only")
+ .def("clearDetectorIDs", &ISpectrum::clearDetectorIDs, arg("self"),
"Clear the set of detector IDs")
.def("setSpectrumNo", &ISpectrum::setSpectrumNo,
(arg("self"), arg("num")),
"Set the spectrum number for this spectrum")
- .def("hasDx", &ISpectrum::hasDx,
- arg("self"),
+ .def("hasDx", &ISpectrum::hasDx, arg("self"),
"Returns True if the spectrum uses the "
"DX (X Error) array, else False.");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp
index 4c3a6c8c43d..853166f3094 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp
@@ -338,67 +338,55 @@ void export_ITableWorkspace() {
class_<ITableWorkspace, bases<Workspace>, boost::noncopyable>(
"ITableWorkspace", iTableWorkspace_docstring.c_str(), no_init)
- .def("addColumn", &addColumn,
- (arg("self"), arg("type"), arg("name")),
+ .def("addColumn", &addColumn, (arg("self"), arg("type"), arg("name")),
"Add a named column with the given type. Recognized types are: "
"int,float,double,bool,str,V3D,long64")
.def("removeColumn", &ITableWorkspace::removeColumn,
- (arg("self"), arg("name")),
- "Remove the named column")
+ (arg("self"), arg("name")), "Remove the named column")
- .def("columnCount", &ITableWorkspace::columnCount,
- arg("self"),
+ .def("columnCount", &ITableWorkspace::columnCount, arg("self"),
"Returns the number of columns in the workspace")
- .def("rowCount", &ITableWorkspace::rowCount,
- arg("self"),
+ .def("rowCount", &ITableWorkspace::rowCount, arg("self"),
"Returns the number of rows within the workspace")
.def("setRowCount", &ITableWorkspace::setRowCount,
(arg("self"), arg("count")),
"Resize the table to contain count rows")
- .def("__len__", &ITableWorkspace::rowCount,
- arg("self"),
+ .def("__len__", &ITableWorkspace::rowCount, arg("self"),
"Returns the number of rows within the workspace")
- .def("getColumnNames", &ITableWorkspace::getColumnNames,
- arg("self"),
+ .def("getColumnNames", &ITableWorkspace::getColumnNames, arg("self"),
boost::python::return_value_policy<VectorToNumpy>(),
"Return a list of the column names")
- .def("keys", &ITableWorkspace::getColumnNames,
- arg("self"),
+ .def("keys", &ITableWorkspace::getColumnNames, arg("self"),
boost::python::return_value_policy<VectorToNumpy>(),
"Return a list of the column names")
- .def("column", &column,
- (arg("self"), arg("column")),
+ .def("column", &column, (arg("self"), arg("column")),
"Return all values of a specific column as a list")
- .def("row", &row,
- (arg("self"), arg("row")),
+ .def("row", &row, (arg("self"), arg("row")),
"Return all values of a specific row as a dict")
- .def("addRow", &addRowFromDict,
- (arg("self"), arg("row_items_dict")),
+ .def("addRow", &addRowFromDict, (arg("self"), arg("row_items_dict")),
"Appends a row with the values from the dictionary")
- .def("addRow", &addRowFromList,
- (arg("self"), arg("row_items_list")),
+ .def("addRow", &addRowFromList, (arg("self"), arg("row_items_list")),
"Appends a row with the values from the given list. "
"It it assumed that the items are in the correct order for the "
"defined columns")
- .def("cell", &cell,
- (arg("self"), arg("value"), arg("row_or_column")),
+ .def("cell", &cell, (arg("self"), arg("value"), arg("row_or_column")),
"Return the given cell. If the first argument is a "
"number then it is interpreted as a row otherwise it "
"is interpreted as a column name")
- .def("setCell", &setCell,
- (arg("self"), arg("row_or_column"), arg("column_or_row"), arg("value")),
+ .def("setCell", &setCell, (arg("self"), arg("row_or_column"),
+ arg("column_or_row"), arg("value")),
"Sets the value of a given cell. If the first argument is a "
"number then it is interpreted as a row otherwise it is interpreted "
"as a column name");
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MDGeometry.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MDGeometry.cpp
index 8101365252b..c739bc51666 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MDGeometry.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MDGeometry.cpp
@@ -35,8 +35,7 @@ boost::python::list getNonIntegratedDimensionsAsPyList(const MDGeometry &self) {
void export_MDGeometry() {
class_<MDGeometry, boost::noncopyable>("MDGeometry", no_init)
- .def("getNumDims", &MDGeometry::getNumDims,
- arg("self"),
+ .def("getNumDims", &MDGeometry::getNumDims, arg("self"),
"Returns the number of dimensions present")
.def("getDimension", &MDGeometry::getDimension,
@@ -52,47 +51,43 @@ void export_MDGeometry() {
"Raises ValueError if the string is not a known id.")
.def("getDimensionIndexByName", &MDGeometry::getDimensionIndexByName,
- (arg("self"), arg("name")), "Returns the index of the dimension with the given "
- "name. Raises RuntimeError if the name does not "
- "exist.")
+ (arg("self"), arg("name")),
+ "Returns the index of the dimension with the given "
+ "name. Raises RuntimeError if the name does not "
+ "exist.")
.def("getDimensionIndexById", &MDGeometry::getDimensionIndexById,
- (arg("self"), arg("id")), "Returns the index of the dimension with the given "
- "ID. Raises RuntimeError if the name does not exist.")
+ (arg("self"), arg("id")),
+ "Returns the index of the dimension with the given "
+ "ID. Raises RuntimeError if the name does not exist.")
.def("getNonIntegratedDimensions", &getNonIntegratedDimensionsAsPyList,
arg("self"),
"Returns the description objects of the non-integrated dimension as "
"a python list of IMDDimension.")
- .def("estimateResolution", &MDGeometry::estimateResolution,
- arg("self"),
+ .def("estimateResolution", &MDGeometry::estimateResolution, arg("self"),
return_value_policy<VectorToNumpy>(),
"Returns a numpy array containing the width of the smallest bin in "
"each dimension")
- .def("getXDimension", &MDGeometry::getXDimension,
- arg("self"),
+ .def("getXDimension", &MDGeometry::getXDimension, arg("self"),
return_value_policy<RemoveConstSharedPtr>(),
"Returns the dimension description mapped to X")
- .def("getYDimension", &MDGeometry::getYDimension,
- arg("self"),
+ .def("getYDimension", &MDGeometry::getYDimension, arg("self"),
return_value_policy<RemoveConstSharedPtr>(),
"Returns the dimension description mapped to Y")
- .def("getZDimension", &MDGeometry::getZDimension,
- arg("self"),
+ .def("getZDimension", &MDGeometry::getZDimension, arg("self"),
return_value_policy<RemoveConstSharedPtr>(),
"Returns the dimension description mapped to Z")
- .def("getTDimension", &MDGeometry::getTDimension,
- arg("self"),
+ .def("getTDimension", &MDGeometry::getTDimension, arg("self"),
return_value_policy<RemoveConstSharedPtr>(),
"Returns the dimension description mapped to time")
- .def("getGeometryXML", &MDGeometry::getGeometryXML,
- arg("self"),
+ .def("getGeometryXML", &MDGeometry::getGeometryXML, arg("self"),
"Returns an XML representation, as a string, of the geometry of the "
"workspace")
@@ -109,8 +104,7 @@ void export_MDGeometry() {
"Returns True if there is a source workspace at the given index")
.def("numOriginalWorkspaces", &MDGeometry::numOriginalWorkspaces,
- arg("self"),
- "Returns the number of source workspaces attached")
+ arg("self"), "Returns the number of source workspaces attached")
.def("getOriginalWorkspace", &MDGeometry::getOriginalWorkspace,
(arg("self"), arg("index")),
@@ -118,20 +112,17 @@ void export_MDGeometry() {
.def("getOrigin", (const Mantid::Kernel::VMD &(MDGeometry::*)() const) &
MDGeometry::getOrigin,
- arg("self"),
- return_value_policy<copy_const_reference>(),
+ arg("self"), return_value_policy<copy_const_reference>(),
"Returns the vector of the origin (in the original workspace) that "
"corresponds to 0,0,0... in this workspace")
.def("getNumberTransformsFromOriginal",
- &MDGeometry::getNumberTransformsFromOriginal,
- arg("self"),
+ &MDGeometry::getNumberTransformsFromOriginal, arg("self"),
"Returns the number of transformations from original workspace "
"coordinate systems")
.def("getNumberTransformsToOriginal",
- &MDGeometry::getNumberTransformsToOriginal,
- arg("self"),
+ &MDGeometry::getNumberTransformsToOriginal, arg("self"),
"Returns the number of transformations to original workspace "
"coordinate systems")
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
index ce09525b9b9..fe588b2413c 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -150,12 +150,10 @@ void export_MatrixWorkspace() {
boost::noncopyable>("MatrixWorkspace", no_init)
//--------------------------------------- Meta information
//-----------------------------------------------------------------------
- .def("blocksize", &MatrixWorkspace::blocksize,
- arg("self"),
+ .def("blocksize", &MatrixWorkspace::blocksize, arg("self"),
"Returns size of the Y data array")
.def("getNumberHistograms", &MatrixWorkspace::getNumberHistograms,
- arg("self"),
- "Returns the number of spectra in the workspace")
+ arg("self"), "Returns the number of spectra in the workspace")
.def("binIndexOf", &MatrixWorkspace::binIndexOf,
MatrixWorkspace_binIndexOfOverloads(
(arg("self"), arg("xvalue"), arg("workspaceIndex")),
@@ -171,12 +169,10 @@ void export_MatrixWorkspace() {
"Returns the signed two theta value for given detector")
.def("getSpectrum", (ISpectrum * (MatrixWorkspace::*)(const size_t)) &
MatrixWorkspace::getSpectrum,
- (arg("self"), arg("workspaceIndex")),
- return_internal_reference<>(),
+ (arg("self"), arg("workspaceIndex")), return_internal_reference<>(),
"Return the spectra at the given workspace index.")
.def("getIndexFromSpectrumNumber",
- &MatrixWorkspace::getIndexFromSpectrumNumber,
- arg("self"),
+ &MatrixWorkspace::getIndexFromSpectrumNumber, arg("self"),
"Returns workspace index correspondent to the given spectrum "
"number. Throws if no such spectrum is present in the workspace")
.def("getDetector", &MatrixWorkspace::getDetector,
@@ -185,23 +181,19 @@ void export_MatrixWorkspace() {
"Return the Detector or "
"DetectorGroup that is linked to "
"the given workspace index")
- .def("getRun", &MatrixWorkspace::mutableRun,
- arg("self"),
+ .def("getRun", &MatrixWorkspace::mutableRun, arg("self"),
return_internal_reference<>(),
"Return the Run object for this workspace")
- .def("axes", &MatrixWorkspace::axes,
- arg("self"),
+ .def("axes", &MatrixWorkspace::axes, arg("self"),
"Returns the number of axes attached to the workspace")
.def("getAxis", &MatrixWorkspace::getAxis,
- (arg("self"), arg("axis_index")),
- return_internal_reference<>(),
- "Get a pointer to a workspace axis")
+ (arg("self"), arg("axis_index")), return_internal_reference<>(),
+ "Get a pointer to a workspace axis")
.def("isHistogramData", &MatrixWorkspace::isHistogramData, arg("self"),
"Returns True if this is considered to be binned data.")
.def("isDistribution", (const bool &(MatrixWorkspace::*)() const) &
MatrixWorkspace::isDistribution,
- arg("self"),
- return_value_policy<copy_const_reference>(),
+ arg("self"), return_value_policy<copy_const_reference>(),
"Returns the status of the distribution flag")
.def("YUnit", &MatrixWorkspace::YUnit, arg("self"),
"Returns the current Y unit for the data (Y axis) in the workspace")
@@ -212,8 +204,7 @@ void export_MatrixWorkspace() {
.def("getNumberBins", &getNumberBinsDeprecated, arg("self"),
"Returns size of the Y data array (deprecated, use blocksize "
"instead)")
- .def("getSampleDetails", &getSampleDetailsDeprecated,
- arg("self"),
+ .def("getSampleDetails", &getSampleDetailsDeprecated, arg("self"),
return_internal_reference<>(),
"Return the Run object for this workspace (deprecated, use getRun "
"instead)")
@@ -228,8 +219,7 @@ void export_MatrixWorkspace() {
"Sets a new unit for the data (Y axis) in the workspace")
.def("setDistribution", (bool &(MatrixWorkspace::*)(const bool)) &
MatrixWorkspace::isDistribution,
- (arg("self"), arg("newVal")),
- return_value_policy<return_by_value>(),
+ (arg("self"), arg("newVal")), return_value_policy<return_by_value>(),
"Set distribution flag. If True the workspace has been divided by "
"the bin-width.")
.def("replaceAxis", &MatrixWorkspace::replaceAxis,
@@ -239,11 +229,10 @@ void export_MatrixWorkspace() {
//--------------------------------------- Read spectrum data
//-------------------------
.def("readX", &MatrixWorkspace::readX,
- (arg("self"), arg("workspaceIndex")),
- return_readonly_numpy(),
+ (arg("self"), arg("workspaceIndex")), return_readonly_numpy(),
"Creates a read-only numpy wrapper "
- "around the original X data at the "
- "given index")
+ "around the original X data at the "
+ "given index")
.def("readY", &MatrixWorkspace::readY, return_readonly_numpy(),
args("self", "workspaceIndex"), "Creates a read-only numpy wrapper "
"around the original Y data at the "
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
index 40f96646efb..0973bf8190b 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
@@ -114,14 +114,11 @@ void export_Projection() {
"of u and v.")
.def("__init__", make_constructor(&projCtor3),
"Constructs a 3 dimensional projection")
- .def("getOffset", &Projection::getOffset,
- (arg("self"), arg("nd")),
+ .def("getOffset", &Projection::getOffset, (arg("self"), arg("nd")),
"Returns the offset for the given dimension", args("dimension"))
- .def("getAxis", &Projection::getAxis,
- (arg("self"), arg("nd")),
+ .def("getAxis", &Projection::getAxis, (arg("self"), arg("nd")),
"Returns the axis for the given dimension", args("dimension"))
- .def("getType", &getUnit,
- (arg("self"), arg("dimension")),
+ .def("getType", &getUnit, (arg("self"), arg("dimension")),
"Returns the unit for the given dimension")
.def("setOffset", &Projection::setOffset,
(arg("self"), arg("nd"), arg("offset")),
@@ -130,11 +127,9 @@ void export_Projection() {
.def("setAxis", &Projection::setAxis,
(arg("self"), arg("dimension"), arg("axis")),
"Sets the axis for the given dimension")
- .def("setAxis", &projSetAxis,
- (arg("self"), arg("nd"), arg("data")),
+ .def("setAxis", &projSetAxis, (arg("self"), arg("nd"), arg("data")),
"Sets the axis for the given dimension")
- .def("setType", &setUnit,
- (arg("self"), arg("dimension"), arg("unit")),
+ .def("setType", &setUnit, (arg("self"), arg("dimension"), arg("unit")),
"Sets the unit for the given dimension")
.add_property(
"u", make_function(&Projection::U, return_internal_reference<>(),
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
index 7c8767a982f..e99ea1c92c6 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
@@ -116,48 +116,39 @@ void export_Run() {
// Run class
class_<Run, boost::noncopyable>("Run", no_init)
- .def("getProtonCharge", &Run::getProtonCharge,
- arg("self"),
+ .def("getProtonCharge", &Run::getProtonCharge, arg("self"),
"Return the total good proton charge for the run")
- .def("integrateProtonCharge", &Run::integrateProtonCharge,
- arg("self"),
+ .def("integrateProtonCharge", &Run::integrateProtonCharge, arg("self"),
"Return the total good proton charge for the run")
- .def("hasProperty", &Run::hasProperty,
- (arg("self"), arg("name")),
+ .def("hasProperty", &Run::hasProperty, (arg("self"), arg("name")),
"Returns True if the given log value is contained within the run")
- .def("getProperty", &Run::getProperty,
- (arg("self"), arg("name")),
- return_value_policy<return_by_value>(),
- "Returns the named property "
- "(log value). Use '.value' "
- "to return the value.")
+ .def("getProperty", &Run::getProperty, (arg("self"), arg("name")),
+ return_value_policy<return_by_value>(), "Returns the named property "
+ "(log value). Use '.value' "
+ "to return the value.")
- .def("getProperties", &Run::getProperties,
- arg("self"),
+ .def("getProperties", &Run::getProperties, arg("self"),
return_internal_reference<>(),
"Return the list of run properties managed by this object.")
.def("getLogData",
(Property * (Run::*)(const std::string &) const) & Run::getLogData,
- (arg("self"), arg("name")),
- return_value_policy<return_by_value>(),
+ (arg("self"), arg("name")), return_value_policy<return_by_value>(),
"Returns the named log. Use '.value' to return the value. The same "
"as getProperty.")
.def("getLogData",
(const std::vector<Property *> &(Run::*)() const) & Run::getLogData,
- arg("self"),
- return_internal_reference<>(),
+ arg("self"), return_internal_reference<>(),
"Return the list of logs for this run. The same as getProperties.")
.def("getGoniometer",
(const Mantid::Geometry::Goniometer &(Run::*)() const) &
Run::getGoniometer,
- arg("self"),
- return_value_policy<reference_existing_object>(),
+ arg("self"), return_value_policy<reference_existing_object>(),
"Get the oriented lattice for this sample")
.def("addProperty", &addProperty,
@@ -167,7 +158,8 @@ void export_Run() {
"existing property is overwritten")
.def("addProperty", &addPropertyWithUnit,
- (arg("self"), arg("name"), arg("value"), arg("units"), arg("replace")),
+ (arg("self"), arg("name"), arg("value"), arg("units"),
+ arg("replace")),
"Adds a property with the given name, value and unit. If "
"replace=True then an existing property is overwritten")
@@ -175,25 +167,20 @@ void export_Run() {
(arg("self"), arg("start"), arg("end")),
"Set the start and end time of the run")
- .def("startTime", &Run::startTime,
- arg("self"),
+ .def("startTime", &Run::startTime, arg("self"),
"Return the total starting time of the run.")
- .def("endTime", &Run::endTime,
- arg("self"),
+ .def("endTime", &Run::endTime, arg("self"),
"Return the total ending time of the run.")
//--------------------------- Dictionary
// access----------------------------
- .def("get", &getWithDefault,
- (arg("self"), arg("key"), arg("default")),
+ .def("get", &getWithDefault, (arg("self"), arg("key"), arg("default")),
"Returns the value pointed to by the key or "
- "None if it does not exist")
- .def("get", &get,
- (arg("self"), arg("key")),
+ "None if it does not exist")
+ .def("get", &get, (arg("self"), arg("key")),
"Returns the value pointed to by the key or the default value given")
- .def("keys", &keys,
- arg("self"),
+ .def("keys", &keys, arg("self"),
"Returns the names of the properties as list")
.def("__contains__", &Run::hasProperty)
.def("__getitem__", &Run::getProperty,
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp
index 61c76c586bf..baa9826478d 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp
@@ -16,56 +16,41 @@ void export_Sample() {
class_<Sample, boost::noncopyable>("Sample", no_init)
.def("getName", &Sample::getName,
- return_value_policy<copy_const_reference>(),
- arg("self"),
+ return_value_policy<copy_const_reference>(), arg("self"),
"Returns the string name of the sample")
.def("getOrientedLattice", (const OrientedLattice &(Sample::*)() const) &
Sample::getOrientedLattice,
- arg("self"),
- return_value_policy<reference_existing_object>(),
+ arg("self"), return_value_policy<reference_existing_object>(),
"Get the oriented lattice for this sample")
- .def("hasOrientedLattice", &Sample::hasOrientedLattice,
- arg("self"),
+ .def("hasOrientedLattice", &Sample::hasOrientedLattice, arg("self"),
"Returns True if this sample has an oriented lattice, false "
"otherwise")
- .def("size", &Sample::size,
- arg("self"),
+ .def("size", &Sample::size, arg("self"),
"Return the number of samples contained within this sample")
// Required for ISIS SANS reduction until the full sample geometry is
// defined on loading
- .def("getGeometryFlag", &Sample::getGeometryFlag,
- arg("self"),
+ .def("getGeometryFlag", &Sample::getGeometryFlag, arg("self"),
"Return the geometry flag.")
- .def("getThickness", &Sample::getThickness,
- arg("self"),
- "Return the thickness in mm")
- .def("getHeight", &Sample::getHeight,
- arg("self"),
- "Return the height in mm")
- .def("getWidth", &Sample::getWidth,
- arg("self"),
- "Return the width in mm")
+ .def("getThickness", &Sample::getThickness, arg("self"),
+ "Return the thickness in mm")
+ .def("getHeight", &Sample::getHeight, arg("self"),
+ "Return the height in mm")
+ .def("getWidth", &Sample::getWidth, arg("self"), "Return the width in mm")
.def("getMaterial",
(const Material &(Sample::*)() const)(&Sample::getMaterial),
- arg("self"),
- return_value_policy<reference_existing_object>(),
+ arg("self"), return_value_policy<reference_existing_object>(),
"The material the sample is composed of")
.def("setGeometryFlag", &Sample::setGeometryFlag,
- (arg("self"), arg("geom_id")),
- "Set the geometry flag.")
- .def("setThickness", &Sample::setThickness,
- (arg("self"), arg("thick")),
+ (arg("self"), arg("geom_id")), "Set the geometry flag.")
+ .def("setThickness", &Sample::setThickness, (arg("self"), arg("thick")),
"Set the thickness in mm.")
- .def("setHeight", &Sample::setHeight,
- (arg("self"), arg("height")),
+ .def("setHeight", &Sample::setHeight, (arg("self"), arg("height")),
"Set the height in mm.")
- .def("setWidth", &Sample::setWidth,
- (arg("self"), arg("width")),
+ .def("setWidth", &Sample::setWidth, (arg("self"), arg("width")),
"Set the width in mm.")
// -------------------------Operators
// -------------------------------------
- .def("__len__", &Sample::size,
- arg("self"),
+ .def("__len__", &Sample::size, arg("self"),
"Gets the number of samples in this collection")
.def("__getitem__", &Sample::operator[], return_internal_reference<>());
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepository.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepository.cpp
index 39d04431763..2422b6c7a81 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepository.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepository.cpp
@@ -197,24 +197,14 @@ Arguments:\n\
class_<ScriptRepository, boost::noncopyable>("ScriptRepository", repo_desc,
no_init)
.def("install", &ScriptRepository::install,
- (arg("self"), arg("local_path")),
- install_desc)
- .def("listFiles", &getListFiles,
- arg("self"),
- list_files_desc)
- .def("fileInfo", &getInfo,
- (arg("self"), arg("path")),
- file_info_desc)
- .def("description", &getDescription,
- (arg("self"), arg("path")),
- file_description_desc)
- .def("fileStatus", &getStatus,
- (arg("self"), arg("path")),
- file_status_desc)
+ (arg("self"), arg("local_path")), install_desc)
+ .def("listFiles", &getListFiles, arg("self"), list_files_desc)
+ .def("fileInfo", &getInfo, (arg("self"), arg("path")), file_info_desc)
+ .def("description", &getDescription, (arg("self"), arg("path")),
+ file_description_desc)
+ .def("fileStatus", &getStatus, (arg("self"), arg("path")),
+ file_status_desc)
.def("download", &ScriptRepository::download,
- (arg("self"), arg("file_path")),
- download_desc)
- .def("update", &ScriptRepository::check4Update,
- arg("self"),
- update_desc);
+ (arg("self"), arg("file_path")), download_desc)
+ .def("update", &ScriptRepository::check4Update, arg("self"), update_desc);
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
index adda6989111..79ad1d6ba6c 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
@@ -22,33 +22,26 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Workspace_isDirtyOverloads,
void export_Workspace() {
class_<Workspace, bases<DataItem>, boost::noncopyable>("Workspace", no_init)
.def("getName", &Workspace::getName,
- return_value_policy<copy_const_reference>(),
- arg("self"),
+ return_value_policy<copy_const_reference>(), arg("self"),
"Returns the name of the workspace. This could be an empty string")
- .def("getTitle", &Workspace::getTitle,
- arg("self"),
+ .def("getTitle", &Workspace::getTitle, arg("self"),
"Returns the title of the workspace")
- .def("setTitle", &Workspace::setTitle,
- (arg("self"), arg("title")),
+ .def("setTitle", &Workspace::setTitle, (arg("self"), arg("title")),
"Set the title of the workspace")
- .def("getComment", &Workspace::getComment,
- arg("self"),
+ .def("getComment", &Workspace::getComment, arg("self"),
return_value_policy<copy_const_reference>(),
"Returns the comment field on the workspace")
- .def("setComment", &Workspace::setComment,
- (arg("self"), arg("comment")),
+ .def("setComment", &Workspace::setComment, (arg("self"), arg("comment")),
"Set the comment field of the workspace")
.def("isDirty", &Workspace::isDirty,
Workspace_isDirtyOverloads(arg("n"), "True if the workspace has run "
"more than n algorithms "
"(Default=1)"))
- .def("getMemorySize", &Workspace::getMemorySize,
- arg("self"),
+ .def("getMemorySize", &Workspace::getMemorySize, arg("self"),
"Returns the memory footprint of the workspace in KB")
.def("getHistory", (const WorkspaceHistory &(Workspace::*)() const) &
Workspace::getHistory,
- arg("self"),
- return_value_policy<reference_existing_object>(),
+ arg("self"), return_value_policy<reference_existing_object>(),
"Return read-only access to the workspace history");
// register pointers
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp
index 7f587468bf7..8c15d0331d1 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp
@@ -13,32 +13,26 @@ void export_WorkspaceGroup() {
class_<WorkspaceGroup, bases<Workspace>, boost::noncopyable>("WorkspaceGroup",
no_init)
.def("getNumberOfEntries", &WorkspaceGroup::getNumberOfEntries,
- arg("self"),
- "Returns the number of entries in the group")
- .def("getNames", &WorkspaceGroup::getNames,
- arg("self"),
+ arg("self"), "Returns the number of entries in the group")
+ .def("getNames", &WorkspaceGroup::getNames, arg("self"),
"Returns the names of the entries in the group")
.def("contains",
(bool (WorkspaceGroup::*)(const std::string &wsName) const) &
WorkspaceGroup::contains,
(arg("self"), arg("workspace")),
"Returns true if the given name is in the group")
- .def("add", &WorkspaceGroup::add,
- (arg("self"), arg("workspace_name")),
- "Add a name to the group")
- .def("size", &WorkspaceGroup::size,
- arg("self"),
+ .def("add", &WorkspaceGroup::add, (arg("self"), arg("workspace_name")),
+ "Add a name to the group")
+ .def("size", &WorkspaceGroup::size, arg("self"),
"Returns the number of workspaces contained in the group")
.def("remove", &WorkspaceGroup::remove,
- (arg("self"), arg("workspace_name")),
- "Remove a name from the group")
+ (arg("self"), arg("workspace_name")), "Remove a name from the group")
.def("getItem", (Workspace_sptr (WorkspaceGroup::*)(const size_t) const) &
WorkspaceGroup::getItem,
(arg("self"), arg("workspace_name")),
return_value_policy<Policies::ToWeakPtr>(),
"Returns the item at the given index")
- .def("isMultiPeriod", &WorkspaceGroup::isMultiperiod,
- arg("self"),
+ .def("isMultiPeriod", &WorkspaceGroup::isMultiperiod, arg("self"),
"Retuns true if the workspace group is multi-period")
// ------------ Operators --------------------------------
.def("__len__", &WorkspaceGroup::getNumberOfEntries)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp
index a7f06384b81..9a32321b85f 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp
@@ -38,8 +38,7 @@ void export_WorkspaceHistory() {
class_<WorkspaceHistory, boost::noncopyable>("WorkspaceHistory", no_init)
- .def("getAlgorithmHistories", &getHistoriesAsList,
- arg("self"),
+ .def("getAlgorithmHistories", &getHistoriesAsList, arg("self"),
"Returns a list of algorithm histories for this workspace history.")
.def("getAlgorithmHistory", &WorkspaceHistory::getAlgorithmHistory,
@@ -47,16 +46,13 @@ void export_WorkspaceHistory() {
return_value_policy<Policies::RemoveConstSharedPtr>(),
"Returns the algorithm history at the given index in the history")
- .def("size", &WorkspaceHistory::size,
- arg("self"),
+ .def("size", &WorkspaceHistory::size, arg("self"),
"Returns the number of algorithms in the immediate history")
- .def("empty", &WorkspaceHistory::empty,
- arg("self"),
+ .def("empty", &WorkspaceHistory::empty, arg("self"),
"Returns whether the history has any entries")
- .def("lastAlgorithm", &WorkspaceHistory::lastAlgorithm,
- arg("self"),
+ .def("lastAlgorithm", &WorkspaceHistory::lastAlgorithm, arg("self"),
"Returns the last algorithm run on this workspace so that its "
"properties can be accessed")
--
GitLab
From 671bb0702ff4eff62cdbd26288d9999f2df20834 Mon Sep 17 00:00:00 2001
From: Dan Nixon <dan@dan-nixon.com>
Date: Tue, 13 Oct 2015 19:13:37 +0100
Subject: [PATCH 204/223] Add VESUVIO diffraction algorithm
Re #13960
---
.../EVSDiffractionReduction.py | 208 ++++++++++++++++++
.../python/plugins/algorithms/CMakeLists.txt | 1 +
.../algorithms/EVSDiffractionReductionTest.py | 45 ++++
Testing/Data/DocTest/EVS15289.raw.md5 | 1 +
Testing/Data/UnitTest/EVS15289.raw.md5 | 1 +
.../algorithms/EVSDiffractionReduction-v1.rst | 44 ++++
6 files changed, 300 insertions(+)
create mode 100644 Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EVSDiffractionReduction.py
create mode 100644 Framework/PythonInterface/test/python/plugins/algorithms/EVSDiffractionReductionTest.py
create mode 100644 Testing/Data/DocTest/EVS15289.raw.md5
create mode 100644 Testing/Data/UnitTest/EVS15289.raw.md5
create mode 100644 docs/source/algorithms/EVSDiffractionReduction-v1.rst
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EVSDiffractionReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EVSDiffractionReduction.py
new file mode 100644
index 00000000000..7fc7669b877
--- /dev/null
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EVSDiffractionReduction.py
@@ -0,0 +1,208 @@
+from mantid.simpleapi import *
+from mantid.api import *
+from mantid.kernel import *
+from mantid import config
+
+import os
+
+class EVSDiffractionReduction(DataProcessorAlgorithm):
+
+ _workspace_names = None
+ _chopped_data = None
+ _output_ws = None
+ _data_files = None
+ _instrument_name = None
+ _mode = None
+ _par_filename = None
+ _spectra_range = None
+ _grouping_method = None
+ _rebin_string = None
+ _ipf_filename = None
+ _sum_files = None
+
+
+ def category(self):
+ return 'Diffraction;PythonAlgorithms'
+
+
+ def summary(self):
+ return 'Performs diffraction reduction for VESUVIO'
+
+
+ def PyInit(self):
+ self.declareProperty(StringArrayProperty('InputFiles'),
+ doc='Comma separated list of input files.')
+
+ self.declareProperty(FileProperty('InstrumentParFile', '',
+ action=FileAction.Load,
+ extensions=['.dat', '.par']),
+ doc='PAR file containing instrument definition.')
+
+ self.declareProperty(name='SumFiles', defaultValue=False,
+ doc='Enabled to sum spectra from each input file.')
+
+ self.declareProperty(IntArrayProperty('SpectraRange', [3, 198]),
+ doc='Range of spectra to use.')
+
+ self.declareProperty(name='RebinParam', defaultValue='',
+ doc='Rebin parameters.')
+
+ self.declareProperty(name='GroupingPolicy', defaultValue='All',
+ validator=StringListValidator(['All', 'Individual', 'IPF']),
+ doc='Selects the type of detector grouping to be used.')
+
+ self.declareProperty(WorkspaceGroupProperty('OutputWorkspace', '',
+ direction=Direction.Output),
+ doc='Group name for the result workspaces.')
+
+
+ def validateInputs(self):
+ """
+ Checks for issues with user input.
+ """
+ issues = dict()
+
+ # Validate input files
+ input_files = self.getProperty('InputFiles').value
+ if len(input_files) == 0:
+ issues['InputFiles'] = 'InputFiles must contain at least one filename'
+
+ # Validate detector range
+ detector_range = self.getProperty('SpectraRange').value
+ if len(detector_range) != 2:
+ issues['SpectraRange'] = 'SpectraRange must be an array of 2 values only'
+ else:
+ if detector_range[0] > detector_range[1]:
+ issues['SpectraRange'] = 'SpectraRange must be in format [lower_index,upper_index]'
+
+ return issues
+
+
+ def PyExec(self):
+ from IndirectReductionCommon import (load_files,
+ get_multi_frame_rebin,
+ identify_bad_detectors,
+ unwrap_monitor,
+ process_monitor_efficiency,
+ scale_monitor,
+ scale_detectors,
+ rebin_reduction,
+ group_spectra,
+ fold_chopped,
+ rename_reduction)
+
+ self._setup()
+
+ load_opts = dict()
+ load_opts['Mode'] = 'FoilOut'
+ load_opts['InstrumentParFile'] = self._par_filename
+
+ self._workspace_names, self._chopped_data = load_files(self._data_files,
+ ipf_filename=self._ipf_filename,
+ spec_min=self._spectra_range[0],
+ spec_max=self._spectra_range[1],
+ sum_files=self._sum_files,
+ load_opts=load_opts)
+
+ for c_ws_name in self._workspace_names:
+ is_multi_frame = isinstance(mtd[c_ws_name], WorkspaceGroup)
+
+ # Get list of workspaces
+ if is_multi_frame:
+ workspaces = mtd[c_ws_name].getNames()
+ else:
+ workspaces = [c_ws_name]
+
+ # Process rebinning for framed data
+ rebin_string_2, num_bins = get_multi_frame_rebin(c_ws_name,
+ self._rebin_string)
+
+ masked_detectors = identify_bad_detectors(workspaces[0])
+
+ # Process workspaces
+ for ws_name in workspaces:
+ monitor_ws_name = ws_name + '_mon'
+
+ # Process monitor
+ if not unwrap_monitor(ws_name):
+ ConvertUnits(InputWorkspace=monitor_ws_name,
+ OutputWorkspace=monitor_ws_name,
+ Target='Wavelength',
+ EMode='Elastic')
+
+ process_monitor_efficiency(ws_name)
+ scale_monitor(ws_name)
+
+ # Scale detector data by monitor intensities
+ scale_detectors(ws_name, 'Elastic')
+
+ # Remove the no longer needed monitor workspace
+ DeleteWorkspace(monitor_ws_name)
+
+ # Convert to dSpacing
+ ConvertUnits(InputWorkspace=ws_name,
+ OutputWorkspace=ws_name,
+ Target='dSpacing',
+ EMode='Elastic')
+
+ # Handle rebinning
+ rebin_reduction(ws_name,
+ self._rebin_string,
+ rebin_string_2,
+ num_bins)
+
+ # Group spectra
+ group_spectra(ws_name,
+ masked_detectors,
+ self._grouping_method)
+
+ if is_multi_frame:
+ fold_chopped(c_ws_name)
+
+ # Rename output workspaces
+ output_workspace_names = [rename_reduction(ws_name, self._sum_files) for ws_name in self._workspace_names]
+
+ # Group result workspaces
+ GroupWorkspaces(InputWorkspaces=output_workspace_names,
+ OutputWorkspace=self._output_ws)
+
+ self.setProperty('OutputWorkspace', self._output_ws)
+
+
+ def _setup(self):
+ """
+ Gets algorithm properties.
+ """
+ self._instrument_name = 'VESUVIO'
+ self._mode = 'diffspec'
+
+ self._output_ws = self.getPropertyValue('OutputWorkspace')
+ self._data_files = self.getProperty('InputFiles').value
+ self._par_filename = self.getPropertyValue('InstrumentParFile')
+ self._spectra_range = self.getProperty('SpectraRange').value
+ self._rebin_string = self.getPropertyValue('RebinParam')
+ self._grouping_method = self.getPropertyValue('GroupingPolicy')
+
+ if self._rebin_string == '':
+ self._rebin_string = None
+
+ # Get the IPF filename
+ self._ipf_filename = self._instrument_name + '_diffraction_' + self._mode + '_Parameters.xml'
+ if not os.path.exists(self._ipf_filename):
+ self._ipf_filename = os.path.join(config['instrumentDefinition.directory'], self._ipf_filename)
+ logger.information('IPF filename is: %s' % (self._ipf_filename))
+
+ # Only enable sum files if we actually have more than one file
+ sum_files = self.getProperty('SumFiles').value
+ self._sum_files = False
+
+ if sum_files:
+ num_raw_files = len(self._data_files)
+ if num_raw_files > 1:
+ self._sum_files = True
+ logger.information('Summing files enabled (have %d files)' % num_raw_files)
+ else:
+ logger.information('SumFiles options is ignored when only one file is provided')
+
+
+AlgorithmFactory.subscribe(EVSDiffractionReduction)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt b/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
index c12c040cddb..187662f9476 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
@@ -26,6 +26,7 @@ set ( TEST_PY_FILES
EnggFitPeaksTest.py
EnggFocusTest.py
EnggVanadiumCorrectionsTest.py
+ EVSDiffractionReductionTest.py
FilterLogByTimeTest.py
FindReflectometryLinesTest.py
FlatPlatePaalmanPingsCorrectionTest.py
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EVSDiffractionReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EVSDiffractionReductionTest.py
new file mode 100644
index 00000000000..9ec89cdaf40
--- /dev/null
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EVSDiffractionReductionTest.py
@@ -0,0 +1,45 @@
+#pylint: disable=too-many-public-methods,invalid-name
+
+import unittest
+from mantid.simpleapi import *
+from mantid.api import *
+
+
+class EVDDiffractionReductionTest(unittest.TestCase):
+
+ def test_basic_reduction_completes(self):
+ """
+ Sanity test to ensure the most basic reduction actually completes.
+ """
+
+ wks = EVSDiffractionReduction(InputFiles=['EVS15289.raw'],
+ InstrumentParFIle='IP0005.dat')
+
+ self.assertTrue(isinstance(wks, WorkspaceGroup), 'Result workspace should be a workspace group.')
+ self.assertEqual(len(wks), 1)
+ self.assertEqual(wks.getNames()[0], 'EVS15289_diffspec_red')
+
+ red_ws = wks[0]
+ self.assertEqual(red_ws.getAxis(0).getUnit().unitID(), 'dSpacing')
+ self.assertEqual(red_ws.getNumberHistograms(), 1)
+
+
+ def test_grouping_individual(self):
+ """
+ Test setting individual grouping, one spectrum per detector.
+ """
+
+ wks = EVSDiffractionReduction(InputFiles=['EVS15289.raw'],
+ GroupingPolicy='Individual',
+ InstrumentParFIle='IP0005.dat')
+
+ self.assertTrue(isinstance(wks, WorkspaceGroup), 'Result workspace should be a workspace group.')
+ self.assertEqual(len(wks), 1)
+
+ red_ws = wks[0]
+ self.assertEqual(red_ws.getAxis(0).getUnit().unitID(), 'dSpacing')
+ self.assertEqual(red_ws.getNumberHistograms(), 196)
+
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Testing/Data/DocTest/EVS15289.raw.md5 b/Testing/Data/DocTest/EVS15289.raw.md5
new file mode 100644
index 00000000000..dc2506b2335
--- /dev/null
+++ b/Testing/Data/DocTest/EVS15289.raw.md5
@@ -0,0 +1 @@
+ea1cb1b0d1daa9579fbeb4acf3716162
\ No newline at end of file
diff --git a/Testing/Data/UnitTest/EVS15289.raw.md5 b/Testing/Data/UnitTest/EVS15289.raw.md5
new file mode 100644
index 00000000000..dc2506b2335
--- /dev/null
+++ b/Testing/Data/UnitTest/EVS15289.raw.md5
@@ -0,0 +1 @@
+ea1cb1b0d1daa9579fbeb4acf3716162
\ No newline at end of file
diff --git a/docs/source/algorithms/EVSDiffractionReduction-v1.rst b/docs/source/algorithms/EVSDiffractionReduction-v1.rst
new file mode 100644
index 00000000000..c6fd73dc8b2
--- /dev/null
+++ b/docs/source/algorithms/EVSDiffractionReduction-v1.rst
@@ -0,0 +1,44 @@
+.. algorithm::
+
+.. summary::
+
+.. alias::
+
+.. properties::
+
+Description
+-----------
+
+A version of :ref:`ISISIndirectDiffractionReduction
+<algm-ISISIndirectDiffractionReduction>` specific to use with VESUVIO (EVS)
+data, the reduction is performed in the same way however there is the additional
+option to load a PAR file.
+
+Usage
+-----
+
+**Example - Running EVSDiffractionReduction.**
+
+.. testcode:: ExEVSDiffractionReductionSimple
+
+ EVSDiffractionReduction(InputFiles='EVS15289.raw',
+ OutputWorkspace='DiffractionReductions',
+ InstrumentParFile='IP0005.dat')
+
+ ws = mtd['DiffractionReductions'].getItem(0)
+
+ print 'Workspace name: %s' % ws.getName()
+ print 'Number of spectra: %d' % ws.getNumberHistograms()
+ print 'Number of bins: %s' % ws.blocksize()
+
+Output:
+
+.. testoutput:: ExEVSDiffractionReductionSimple
+
+ Workspace name: EVS15289_diffspec_red
+ Number of spectra: 1
+ Number of bins: 3875
+
+.. categories::
+
+.. sourcelink::
--
GitLab
From 3e4ff5b2a9768cc94f02f2bbfac8439c674d098e Mon Sep 17 00:00:00 2001
From: Jiao Lin <linjiao@ornl.gov>
Date: Tue, 13 Oct 2015 17:25:46 -0400
Subject: [PATCH 205/223] Refs #13691. Added documenation of parameters for
python methods
---
.../geometry/src/Exports/BoundingBox.cpp | 23 +-
.../mantid/geometry/src/Exports/Component.cpp | 113 +++++-----
.../geometry/src/Exports/DetectorGroup.cpp | 2 +
.../geometry/src/Exports/Goniometer.cpp | 4 +-
.../mantid/geometry/src/Exports/Group.cpp | 62 ++++--
.../geometry/src/Exports/ICompAssembly.cpp | 2 +
.../geometry/src/Exports/IComponent.cpp | 29 +--
.../mantid/geometry/src/Exports/IDetector.cpp | 30 +--
.../geometry/src/Exports/IMDDimension.cpp | 40 ++--
.../geometry/src/Exports/IObjComponent.cpp | 5 +-
.../geometry/src/Exports/Instrument.cpp | 78 +++----
.../mantid/geometry/src/Exports/MDFrame.cpp | 4 +-
.../mantid/geometry/src/Exports/Object.cpp | 3 +-
.../geometry/src/Exports/OrientedLattice.cpp | 33 +--
.../mantid/geometry/src/Exports/PeakShape.cpp | 13 +-
.../geometry/src/Exports/PointGroup.cpp | 21 +-
.../src/Exports/PointGroupFactory.cpp | 9 +-
.../src/Exports/RectangularDetector.cpp | 20 +-
.../geometry/src/Exports/ReferenceFrame.cpp | 20 +-
.../geometry/src/Exports/SpaceGroup.cpp | 28 +--
.../src/Exports/SpaceGroupFactory.cpp | 46 ++--
.../geometry/src/Exports/SymmetryElement.cpp | 19 +-
.../src/Exports/SymmetryElementFactory.cpp | 1 +
.../src/Exports/SymmetryOperation.cpp | 14 +-
.../src/Exports/SymmetryOperationFactory.cpp | 4 +
.../mantid/geometry/src/Exports/UnitCell.cpp | 199 +++++++++---------
26 files changed, 473 insertions(+), 349 deletions(-)
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/BoundingBox.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/BoundingBox.cpp
index 47d718238f0..4e864930e38 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/BoundingBox.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/BoundingBox.cpp
@@ -8,40 +8,47 @@ using namespace boost::python;
void export_BoundingBox() {
class_<BoundingBox>("BoundingBox", "Constructs a zero-sized box")
- .def(init<double, double, double, double, double, double>(
- (arg("xmax"), arg("ymax"), arg("zmax"), arg("xmin"), arg("ymin"),
- arg("zmin")),
- "Constructs a box from the six given points"))
+ .def(init<double, double, double, double, double, double>
+ ((arg("self"), arg("xmax"), arg("ymax"), arg("zmax"),
+ arg("xmin"), arg("ymin"), arg("zmin")),
+ "Constructs a box from the six given points"))
.def("minPoint", &BoundingBox::minPoint,
+ arg("self"),
return_value_policy<copy_const_reference>(),
"Returns a V3D containing the values of the minimum of the box. See "
"mantid.kernel.V3D")
.def("maxPoint", &BoundingBox::maxPoint,
+ arg("self"),
return_value_policy<copy_const_reference>(),
"Returns a V3D containing the values of the minimum of the box. See "
"mantid.kernel.V3D")
.def("centrePoint", &BoundingBox::centrePoint,
+ arg("self"),
"Returns a V3D containing the coordinates of the centre point. See "
"mantid.kernel.V3D")
- .def("width", &BoundingBox::width, "Returns a V3D containing the widths "
- "for each dimension. See "
- "mantid.kernel.V3D")
+ .def("width", &BoundingBox::width,
+ arg("self"),
+ "Returns a V3D containing the widths "
+ "for each dimension. See "
+ "mantid.kernel.V3D")
.def("isNull", &BoundingBox::isNull,
+ arg("self"),
"Returns true if the box has no dimensions that have been set")
.def("isPointInside", &BoundingBox::isPointInside,
+ arg("self"),
"Returns true if the given point is inside the object. See "
"mantid.kernel.V3D")
.def("doesLineIntersect",
(bool (BoundingBox::*)(const V3D &, const V3D &) const) &
BoundingBox::doesLineIntersect,
- (arg("startPoint"), arg("lineDir")),
+ (arg("self"), arg("startPoint"), arg("lineDir")),
"Returns true if the line given by the starting point & direction "
"vector passes through the box");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
index 5ad6c63e6d0..b79d0cfe051 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
@@ -39,53 +39,70 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParamDescription,
void export_Component() {
class_<Component, bases<IComponent>, boost::noncopyable>("Component", no_init)
- .def("getParameterNames", &Component::getParameterNames,
- Component_getParameterNames())
- .def("hasParameter", &Component::hasParameter, Component_hasParameter())
- .def("getNumberParameter", &Component::getNumberParameter,
- Component_getNumberParameter())
- .def("getBoolParameter", &Component::getBoolParameter,
- Component_getBoolParameter())
- .def("getPositionParameter", &Component::getPositionParameter,
- Component_getPositionParameter())
- .def("getRotationParameter", &Component::getRotationParameter,
- Component_getRotationParameter())
- .def("getStringParameter", &Component::getStringParameter,
- Component_getStringParameter())
- .def("getIntParameter", &Component::getIntParameter,
- Component_getIntParameter())
- //
- .def("getRotation", &Component::getRotation, Component_getRotation())
- .def("getRelativePos", &Component::getRelativePos,
- Component_getRelativePos())
- //
- .def("getParamShortDescription", &Component::getParamShortDescription,
- Component_getParamShortDescription())
- .def("getParamDescription", &Component::getParamDescription,
- Component_getParamDescription())
- .def("getShortDescription", &Component::getShortDescription,
- "Return the short description of current parameterized component")
- .def("getDescription", &Component::getDescription,
- "Return the description of current parameterized component")
- .def("setDescription", &Component::setDescription,
- "Set component's description, works only if the component is "
- "parameterized component")
+ .def("getParameterNames", &Component::getParameterNames,
+ Component_getParameterNames((arg("self"), arg("recursive")=true))
+ )
+ .def("hasParameter", &Component::hasParameter,
+ Component_hasParameter
+ ((arg("self"), arg("name"), arg("recursive")=true)))
+ .def("getNumberParameter", &Component::getNumberParameter,
+ Component_getNumberParameter
+ ((arg("self"), arg("pname"), arg("recursive")=true)))
+ .def("getBoolParameter", &Component::getBoolParameter,
+ Component_getBoolParameter
+ ((arg("self"), arg("pname"), arg("recursive")=true)))
+ .def("getPositionParameter", &Component::getPositionParameter,
+ Component_getPositionParameter
+ ((arg("self"), arg("pname"), arg("recursive")=true)))
+ .def("getRotationParameter", &Component::getRotationParameter,
+ Component_getRotationParameter
+ ((arg("self"), arg("pname"), arg("recursive")=true)))
+ .def("getStringParameter", &Component::getStringParameter,
+ Component_getStringParameter
+ ((arg("self"), arg("pname"), arg("recursive")=true)))
+ .def("getIntParameter", &Component::getIntParameter,
+ Component_getIntParameter
+ ((arg("self"), arg("pname"), arg("recursive")=true)))
+ //
+ .def("getRotation", &Component::getRotation,
+ Component_getRotation(arg("self")))
+ .def("getRelativePos", &Component::getRelativePos,
+ Component_getRelativePos(arg("self")))
+ //
+ .def("getParamShortDescription", &Component::getParamShortDescription,
+ Component_getParamShortDescription
+ ((arg("self"), arg("pname"), arg("recursive")=true)))
+ .def("getParamDescription", &Component::getParamDescription,
+ Component_getParamDescription
+ ((arg("self"), arg("pname"), arg("recursive")=true)))
+
+ .def("getShortDescription", &Component::getShortDescription,
+ arg("self"),
+ "Return the short description of current parameterized component")
+ .def("getDescription", &Component::getDescription,
+ arg("self"),
+ "Return the description of current parameterized component")
+ .def("setDescription", &Component::setDescription,
+ (arg("self"), arg("descr")),
+ "Set component's description, works only if the component is "
+ "parameterized component")
- // HACK -- python should return parameters regardless of type. this is
- // untill rows below do not work
- .def("getParameterType", &Component::getParameterType,
- Component_getParameterType())
- //// this does not work for some obvious or not obvious reasons
- //.def("getParameter", &Component::getNumberParameter,
- // Component_getNumberParameter())
- //.def("getParameter", &Component::getBoolParameter,
- // Component_getBoolParameter())
- //.def("getParameter", &Component::getStringParameter,
- // Component_getStringParameter())
- //.def("getParameter", &Component::getPositionParameter,
- // Component_getPositionParameter())
- //.def("getParameter", &Component::getRotationParameter,
- // Component_getRotationParameter())
-
- ;
+ // HACK -- python should return parameters regardless of type. this is
+ // untill rows below do not work
+ .def("getParameterType", &Component::getParameterType,
+ Component_getParameterType
+ ((arg("self"), arg("pname"), arg("recursive")=true)))
+ //// this does not work for some obvious or not obvious reasons
+ //.def("getParameter", &Component::getNumberParameter,
+ // Component_getNumberParameter())
+ //.def("getParameter", &Component::getBoolParameter,
+ // Component_getBoolParameter())
+ //.def("getParameter", &Component::getStringParameter,
+ // Component_getStringParameter())
+ //.def("getParameter", &Component::getPositionParameter,
+ // Component_getPositionParameter())
+ //.def("getParameter", &Component::getRotationParameter,
+ // Component_getRotationParameter())
+
+ ;
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorGroup.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorGroup.cpp
index fe6107d725d..027f012747e 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorGroup.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorGroup.cpp
@@ -9,7 +9,9 @@ void export_DetectorGroup() {
class_<DetectorGroup, bases<IDetector>, boost::noncopyable>("DetectorGroup",
no_init)
.def("getDetectorIDs", &DetectorGroup::getDetectorIDs,
+ arg("self"),
"Returns the list of detector IDs within this group")
.def("getNameSeparator", &DetectorGroup::getNameSeparator,
+ arg("self"),
"Returns separator for list of names of detectors");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
index 184ca40caf1..ce9e6c0f80e 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
@@ -37,6 +37,6 @@ void export_Goniometer() {
getEulerAngles_overloads(args("self", "convention"),
"Default convention is \'YZX\'. Universal "
"goniometer is \'YZY\'"))
- .def("getR", &Goniometer::getR, return_readonly_numpy())
- .def("setR", &setR);
+ .def("getR", &Goniometer::getR, arg("self"), return_readonly_numpy())
+ .def("setR", &setR, (arg("self"), arg("rot")));
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Group.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Group.cpp
index cc83d3c6c3d..a2aae13b228 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Group.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Group.cpp
@@ -64,25 +64,45 @@ void export_Group() {
.value("Associativity", Group::Associativity);
class_<Group, boost::noncopyable>("Group", no_init)
- .def("__init__", make_constructor(&constructGroupFromString),
- "Construct a group from the provided initializer string.")
- .def("__init__", make_constructor(&constructGroupFromVector),
- "Construct a group from the provided symmetry operation list.")
- .def("__init__", make_constructor(&constructGroupFromPythonList),
- "Construct a group from a python generated symmetry operation list.")
- .def("getOrder", &Group::order, "Returns the order of the group.")
- .def("getCoordinateSystem", &Group::getCoordinateSystem,
- "Returns the type of coordinate system to distinguish groups with "
- "hexagonal system definition.")
- .def("getSymmetryOperations", &Group::getSymmetryOperations,
- "Returns the symmetry operations contained in the group.")
- .def("getSymmetryOperationStrings", &getSymmetryOperationStrings,
- "Returns the x,y,z-strings for the contained symmetry operations.")
- .def("containsOperation", &Group::containsOperation,
- "Checks whether a SymmetryOperation is included in Group.")
- .def("isGroup", &Group::isGroup, "Checks whether the contained symmetry "
- "operations fulfill the group axioms.")
- .def("fulfillsAxiom", &Group::fulfillsAxiom,
- "Checks if the contained symmetry operations fulfill the specified "
- "group axiom.");
+ .def("__init__",
+ make_constructor
+ (&constructGroupFromString,
+ default_call_policies(),
+ (arg("symmetryOperationString"))),
+ "Construct a group from the provided initializer string.")
+ .def("__init__",
+ make_constructor
+ (&constructGroupFromVector,
+ default_call_policies(),
+ (arg("symmetryOperationVector"))),
+ "Construct a group from the provided symmetry operation list.")
+ .def("__init__",
+ make_constructor
+ (&constructGroupFromPythonList,
+ default_call_policies(),
+ (arg("symmetryOperationList"))),
+ "Construct a group from a python generated symmetry operation list.")
+ .def("getOrder", &Group::order, arg("self"),
+ "Returns the order of the group.")
+ .def("getCoordinateSystem", &Group::getCoordinateSystem,
+ arg("self"),
+ "Returns the type of coordinate system to distinguish groups with "
+ "hexagonal system definition.")
+ .def("getSymmetryOperations", &Group::getSymmetryOperations,
+ arg("self"),
+ "Returns the symmetry operations contained in the group.")
+ .def("getSymmetryOperationStrings", &getSymmetryOperationStrings,
+ arg("self"),
+ "Returns the x,y,z-strings for the contained symmetry operations.")
+ .def("containsOperation", &Group::containsOperation,
+ (arg("self"), arg("operation")),
+ "Checks whether a SymmetryOperation is included in Group.")
+ .def("isGroup", &Group::isGroup,
+ arg("self"),
+ "Checks whether the contained symmetry "
+ "operations fulfill the group axioms.")
+ .def("fulfillsAxiom", &Group::fulfillsAxiom,
+ (arg("self"), arg("axiom")),
+ "Checks if the contained symmetry operations fulfill the specified "
+ "group axiom.");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/ICompAssembly.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/ICompAssembly.cpp
index bc8d4d2cec5..d82744edacc 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/ICompAssembly.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/ICompAssembly.cpp
@@ -12,7 +12,9 @@ void export_ICompAssembly() {
class_<ICompAssembly, boost::python::bases<IComponent>, boost::noncopyable>(
"ICompAssembly", no_init)
.def("nelements", &ICompAssembly::nelements,
+ arg("self"),
"Returns the number of elements in the assembly")
.def("__getitem__", &ICompAssembly::operator[],
+ (arg("self"), arg("index")),
"Return the component at the given index");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/IComponent.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/IComponent.cpp
index ff0a9194122..c59eb740f23 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/IComponent.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/IComponent.cpp
@@ -29,16 +29,21 @@ void export_IComponent() {
register_ptr_to_python<boost::shared_ptr<IComponent>>();
class_<IComponent, boost::noncopyable>("IComponent", no_init)
- .def("getPos", &IComponent::getPos,
- "Returns the absolute position of the component")
- .def("getDistance", &getDistance, "Returns the distance, in metres, "
- "between this and the given component")
- .def("getName", &IComponent::getName, "Returns the name of the component")
- .def("getFullName", &IComponent::getFullName,
- "Returns full path name of component")
- .def("type", &IComponent::type,
- "Returns the type of the component represented as a string")
- .def("getRelativeRot", &IComponent::getRelativeRot,
- return_value_policy<copy_const_reference>(),
- "Returns the relative rotation as a Quat");
+ .def("getPos", &IComponent::getPos,
+ arg("self"),
+ "Returns the absolute position of the component")
+ .def("getDistance", &getDistance,
+ (arg("self"), arg("other")),
+ "Returns the distance, in metres, "
+ "between this and the given component")
+ .def("getName", &IComponent::getName, arg("self"),
+ "Returns the name of the component")
+ .def("getFullName", &IComponent::getFullName, arg("self"),
+ "Returns full path name of component")
+ .def("type", &IComponent::type, arg("self"),
+ "Returns the type of the component represented as a string")
+ .def("getRelativeRot", &IComponent::getRelativeRot,
+ arg("self"),
+ return_value_policy<copy_const_reference>(),
+ "Returns the relative rotation as a Quat");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/IDetector.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/IDetector.cpp
index 8bb8d029989..adc2b6c2ffb 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/IDetector.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/IDetector.cpp
@@ -11,18 +11,20 @@ void export_IDetector() {
class_<IDetector, bases<IObjComponent>, boost::noncopyable>("IDetector",
no_init)
- .def("getID", &IDetector::getID, "Returns the detector ID")
- .def("isMasked", &IDetector::isMasked, "Returns the value of the masked "
- "flag. True means ignore this "
- "detector")
- .def("isMonitor", &IDetector::isMonitor,
- "Returns True if the detector is marked as a monitor in the IDF")
- .def("solidAngle", &IDetector::solidAngle, "Return the solid angle in "
- "steradians between this "
- "detector and an observer")
- .def("getTwoTheta", &IDetector::getTwoTheta,
- "Calculate the angle between this detector, another component and "
- "an axis")
- .def("getPhi", &IDetector::getPhi,
- "Returns the azimuthal angle of this detector");
+ .def("getID", &IDetector::getID, arg("self"), "Returns the detector ID")
+ .def("isMasked", &IDetector::isMasked, arg("self"),
+ "Returns the value of the masked flag. True means ignore this "
+ "detector")
+ .def("isMonitor", &IDetector::isMonitor, arg("self"),
+ "Returns True if the detector is marked as a monitor in the IDF")
+ .def("solidAngle", &IDetector::solidAngle,
+ (arg("self"), arg("observer")),
+ "Return the solid angle in steradians between this "
+ "detector and an observer")
+ .def("getTwoTheta", &IDetector::getTwoTheta,
+ (arg("self"), arg("observer"), arg("axis")),
+ "Calculate the angle between this detector, another component and "
+ "an axis")
+ .def("getPhi", &IDetector::getPhi, arg("self"),
+ "Returns the azimuthal angle of this detector");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp
index 7f32083e78f..1c3eda82316 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp
@@ -39,24 +39,24 @@ void export_IMDDimension() {
register_ptr_to_python<boost::shared_ptr<IMDDimension>>();
class_<IMDDimension, boost::noncopyable>("IMDDimension", no_init)
- .def("getName", &IMDDimension::getName, "Return the name of the "
- "dimension as can be displayed "
- "along the axis")
- .def("getMaximum", &IMDDimension::getMaximum,
- "Return the maximum extent of this dimension")
- .def("getMinimum", &IMDDimension::getMinimum,
- "Return the maximum extent of this dimension")
- .def("getNBins", &IMDDimension::getNBins,
- "Return the number of bins dimension have (an integrated has one). "
- "A axis directed along dimension would have getNBins+1 axis points.")
- .def("getX", &IMDDimension::getX,
- "Return coordinate of the axis at the given index")
- .def("getDimensionId", &IMDDimension::getDimensionId,
- "Return a short name which identify the dimension among other "
- "dimension."
- "A dimension can be usually find by its ID and various ")
- .def("getUnits", &getUnitsAsStr,
- "Return the units associated with this dimension.")
- .def("getMDFrame", &getMDFrame,
- "Return the multidimensional frame for this dimension.");
+ .def("getName", &IMDDimension::getName, arg("self"),
+ "Return the name of the dimension as can be displayed "
+ "along the axis")
+ .def("getMaximum", &IMDDimension::getMaximum, arg("self"),
+ "Return the maximum extent of this dimension")
+ .def("getMinimum", &IMDDimension::getMinimum, arg("self"),
+ "Return the maximum extent of this dimension")
+ .def("getNBins", &IMDDimension::getNBins, arg("self"),
+ "Return the number of bins dimension have (an integrated has one). "
+ "A axis directed along dimension would have getNBins+1 axis points.")
+ .def("getX", &IMDDimension::getX, (arg("self"), arg("ind")),
+ "Return coordinate of the axis at the given index")
+ .def("getDimensionId", &IMDDimension::getDimensionId, arg("self"),
+ "Return a short name which identify the dimension among other "
+ "dimension."
+ "A dimension can be usually find by its ID and various ")
+ .def("getUnits", &getUnitsAsStr, arg("self"),
+ "Return the units associated with this dimension.")
+ .def("getMDFrame", &getMDFrame, arg("self"),
+ "Return the multidimensional frame for this dimension.");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/IObjComponent.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/IObjComponent.cpp
index cf9a708a50e..cf56507f695 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/IObjComponent.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/IObjComponent.cpp
@@ -25,6 +25,7 @@ void export_IObjComponent() {
class_<IObjComponent, boost::python::bases<IComponent>, boost::noncopyable>(
"IObjComponent", no_init)
- .def("shape", &getShape, "Get the object that represents the physical "
- "shape of this component");
+ .def("shape", &getShape, arg("self"),
+ "Get the object that represents the physical shape of this component"
+ );
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp
index d7ba8222708..7fe291a9cb4 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp
@@ -15,41 +15,45 @@ void export_Instrument() {
class_<Instrument, bases<CompAssembly>, boost::noncopyable>("Instrument",
no_init)
- .def("getSample", &Instrument::getSample,
- return_value_policy<RemoveConstSharedPtr>(),
- "Return the object that represents the sample")
-
- .def("getSource", &Instrument::getSource,
- return_value_policy<RemoveConstSharedPtr>(),
- "Return the object that represents the source")
-
- .def("getComponentByName",
- (boost::shared_ptr<IComponent>(Instrument::*)(const std::string &)) &
- Instrument::getComponentByName,
- "Returns the named component")
-
- .def("getDetector", (boost::shared_ptr<IDetector>(
- Instrument::*)(const detid_t &) const) &
- Instrument::getDetector,
- "Returns the detector with the given ID")
-
- .def("getReferenceFrame",
- (boost::shared_ptr<const ReferenceFrame>(Instrument::*)()) &
- Instrument::getReferenceFrame,
- return_value_policy<RemoveConstSharedPtr>(),
- "Returns the reference frame attached that defines the instrument "
- "axes")
-
- .def("getValidFromDate", &Instrument::getValidFromDate,
- "Return the valid from date of the instrument")
-
- .def("getValidToDate", &Instrument::getValidToDate,
- "Return the valid to date of the instrument")
-
- .def("getBaseInstrument", &Instrument::baseInstrument,
- return_value_policy<RemoveConstSharedPtr>(),
- "Return reference to the base instrument");
- ;
-
- ;
+ .def("getSample", &Instrument::getSample, arg("self"),
+ return_value_policy<RemoveConstSharedPtr>(),
+ "Return the object that represents the sample")
+
+ .def("getSource", &Instrument::getSource, arg("self"),
+ return_value_policy<RemoveConstSharedPtr>(),
+ "Return the object that represents the source")
+
+ .def("getComponentByName",
+ (boost::shared_ptr<IComponent>(Instrument::*)(const std::string &)) &
+ Instrument::getComponentByName,
+ (arg("self"), arg("cname")),
+ "Returns the named component")
+
+ .def("getDetector",
+ (boost::shared_ptr<IDetector>(Instrument::*)(const detid_t &) const) &
+ Instrument::getDetector,
+ (arg("self"), arg("detector_id")),
+ "Returns the detector with the given ID")
+
+ .def("getReferenceFrame",
+ (boost::shared_ptr<const ReferenceFrame>(Instrument::*)()) &
+ Instrument::getReferenceFrame,
+ arg("self"),
+ return_value_policy<RemoveConstSharedPtr>(),
+ "Returns the reference frame attached that defines the instrument "
+ "axes")
+
+ .def("getValidFromDate", &Instrument::getValidFromDate,
+ arg("self"),
+ "Return the valid from date of the instrument")
+
+ .def("getValidToDate", &Instrument::getValidToDate,
+ arg("self"),
+ "Return the valid to date of the instrument")
+
+ .def("getBaseInstrument", &Instrument::baseInstrument,
+ arg("self"),
+ return_value_policy<RemoveConstSharedPtr>(),
+ "Return reference to the base instrument")
+ ;
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/MDFrame.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/MDFrame.cpp
index 3f6a3e2ed81..cd988294e63 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/MDFrame.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/MDFrame.cpp
@@ -13,6 +13,6 @@ void export_MDFrame() {
register_ptr_to_python<boost::shared_ptr<MDFrame>>();
class_<MDFrame, boost::noncopyable>("MDFrame", no_init)
- .def("getUnitLabel", &MDFrame::getUnitLabel)
- .def("name", &MDFrame::name);
+ .def("getUnitLabel", &MDFrame::getUnitLabel, arg("self"))
+ .def("name", &MDFrame::name, arg("self"));
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Object.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Object.cpp
index 756ed9f2b7d..c4d7783edd5 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Object.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Object.cpp
@@ -13,9 +13,10 @@ void export_Object() {
class_<Object, boost::noncopyable>("Object", no_init)
.def("getBoundingBox",
(const BoundingBox &(Object::*)() const) & Object::getBoundingBox,
+ arg("self"),
return_value_policy<copy_const_reference>(),
"Return the axis-aligned bounding box for this shape")
- .def("getShapeXML", &Object::getShapeXML,
+ .def("getShapeXML", &Object::getShapeXML, arg("self"),
"Returns the XML that was used to create this shape.");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp
index b392a312a8e..49d1f62e5c7 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp
@@ -49,19 +49,22 @@ void export_OrientedLattice() {
return_readonly_numpy;
class_<OrientedLattice, bases<UnitCell>>("OrientedLattice", init<>())
- .def(init<OrientedLattice const &>((arg("other"))))
- .def(init<double, double, double>((arg("_a"), arg("_b"), arg("_c"))))
- .def(init<double, double, double, double, double, double, optional<int>>(
- (arg("_a"), arg("_b"), arg("_c"), arg("_alpha"), arg("_beta"),
- arg("_gamma"), arg("Unit") = (int)(angDegrees))))
- .def(init<UnitCell>(arg("uc")))
- .def("getuVector", (&OrientedLattice::getuVector))
- .def("getvVector", (&OrientedLattice::getvVector))
- .def("getU", &OrientedLattice::getU, return_readonly_numpy())
- .def("setU", &setU)
- .def("getUB", &OrientedLattice::getUB, return_readonly_numpy())
- .def("setUB", &setUB)
- .def("setUFromVectors", &setUFromVectors)
- .def("qFromHKL", &qFromHKL, "Q vector from HKL vector")
- .def("hklFromQ", &hklFromQ, "HKL value from Q vector");
+ .def(init<OrientedLattice const &>((arg("other"))))
+ .def(init<double, double, double>((arg("_a"), arg("_b"), arg("_c"))))
+ .def(init<double, double, double, double, double, double,
+ optional<int>>
+ ((arg("_a"), arg("_b"), arg("_c"), arg("_alpha"), arg("_beta"),
+ arg("_gamma"), arg("Unit") = (int)(angDegrees))))
+ .def(init<UnitCell>(arg("uc")))
+ .def("getuVector", (&OrientedLattice::getuVector), arg("self"))
+ .def("getvVector", (&OrientedLattice::getvVector), arg("self"))
+ .def("getU", &OrientedLattice::getU, arg("self"), return_readonly_numpy())
+ .def("setU", &setU, (arg("self"), arg("newU")))
+ .def("getUB", &OrientedLattice::getUB, arg("self"), return_readonly_numpy())
+ .def("setUB", &setUB, (arg("self"), arg("newUB")))
+ .def("setUFromVectors", &setUFromVectors, (arg("self"), arg("u"), arg("v")))
+ .def("qFromHKL", &qFromHKL, (arg("self"), arg("vec")),
+ "Q vector from HKL vector")
+ .def("hklFromQ", &hklFromQ, (arg("self"), arg("vec")),
+ "HKL value from Q vector");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/PeakShape.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/PeakShape.cpp
index 420e07c0ea2..89f6f20b34d 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/PeakShape.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/PeakShape.cpp
@@ -9,10 +9,11 @@ void export_PeakShape() {
register_ptr_to_python<Mantid::Geometry::PeakShape_sptr>();
class_<PeakShape, boost::noncopyable>("PeakShape", no_init)
- .def("toJSON", &PeakShape::toJSON, "Serialize object to JSON")
- .def("shapeName", &PeakShape::shapeName, "Shape name for type of shape")
- .def("algorithmVersion", &PeakShape::algorithmVersion,
- "Number of source integration algorithm version")
- .def("algorithmName", &PeakShape::algorithmName,
- "Name of source integration algorithm");
+ .def("toJSON", &PeakShape::toJSON, arg("self"), "Serialize object to JSON")
+ .def("shapeName", &PeakShape::shapeName, arg("self"),
+ "Shape name for type of shape")
+ .def("algorithmVersion", &PeakShape::algorithmVersion, arg("self"),
+ "Number of source integration algorithm version")
+ .def("algorithmName", &PeakShape::algorithmName, arg("self"),
+ "Name of source integration algorithm");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroup.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroup.cpp
index 31d222c1a7f..010d14c4deb 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroup.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroup.cpp
@@ -55,14 +55,15 @@ void export_PointGroup() {
.value("Cubic", PointGroup::Cubic);
class_<PointGroup, boost::noncopyable, bases<Group>>("PointGroup", no_init)
- .def("getName", &PointGroup::getName)
- .def("getHMSymbol", &PointGroup::getSymbol)
- .def("getCrystalSystem", &PointGroup::crystalSystem)
- .def("isEquivalent", &isEquivalent,
- "Check whether the two HKLs are symmetrically equivalent.")
- .def("getEquivalents", &getEquivalents, "Returns an array with all "
- "symmetry equivalents of the "
- "supplied HKL.")
- .def("getReflectionFamily", &getReflectionFamily,
- "Returns the same HKL for all symmetry equivalents.");
+ .def("getName", &PointGroup::getName, arg("self"))
+ .def("getHMSymbol", &PointGroup::getSymbol, arg("self"))
+ .def("getCrystalSystem", &PointGroup::crystalSystem, arg("self"))
+ .def("isEquivalent", &isEquivalent,
+ (arg("self"), arg("hkl1"), arg("hkl2")),
+ "Check whether the two HKLs are symmetrically equivalent.")
+ .def("getEquivalents", &getEquivalents, (arg("self"), arg("hkl")),
+ "Returns an array with all symmetry equivalents of the supplied HKL.")
+ .def("getReflectionFamily", &getReflectionFamily,
+ (arg("self"), arg("hkl")),
+ "Returns the same HKL for all symmetry equivalents.");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroupFactory.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroupFactory.cpp
index 0ec8f5c51de..b01885743b5 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroupFactory.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroupFactory.cpp
@@ -25,19 +25,26 @@ void export_PointGroupFactory() {
class_<PointGroupFactoryImpl, boost::noncopyable>("PointGroupFactoryImpl",
no_init)
.def("isSubscribed", &PointGroupFactoryImpl::isSubscribed,
+ (arg("self"), arg("hmSymbol")),
"Returns true of the point group with the given symbol is "
"subscribed.")
.def("createPointGroup", &PointGroupFactoryImpl::createPointGroup,
+ (arg("self"), arg("hmSymbol")),
"Creates a point group if registered.")
- .def("createPointGroupFromSpaceGroup", &getPointGroupFromSpaceGroup,
+ .def("createPointGroupFromSpaceGroup",
+ &getPointGroupFromSpaceGroup,
+ (arg("self"), arg("group")),
"Creates the point group that corresponds to the given space group.")
.def("createPointGroupFromSpaceGroupSymbol",
&getPointGroupFromSpaceGroupSymbol,
+ (arg("self"), arg("group")),
"Creates a point group directly from the space group symbol.")
.def("getAllPointGroupSymbols",
&PointGroupFactoryImpl::getAllPointGroupSymbols,
+ arg("self"),
"Returns all registered point group symbols.")
.def("getPointGroupSymbols", &PointGroupFactoryImpl::getPointGroupSymbols,
+ (arg("self"), arg("crystalsystem")),
"Returns all point groups registered for the given crystal system.")
.def("Instance", &PointGroupFactory::Instance,
return_value_policy<reference_existing_object>(),
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/RectangularDetector.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/RectangularDetector.cpp
index 01cf57f0361..cc6420e29dc 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/RectangularDetector.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/RectangularDetector.cpp
@@ -17,30 +17,46 @@ void export_RectangularDetector() {
class_<RectangularDetector, bases<CompAssembly, IObjComponent>,
boost::noncopyable>("RectangularDetector", no_init)
.def("xpixels", &RectangularDetector::xpixels,
+ arg("self"),
"Returns the number of pixels in the X direction")
.def("ypixels", &RectangularDetector::ypixels,
+ arg("self"),
"Returns the number of pixels in the Y direction")
.def("xstep", &RectangularDetector::xstep,
+ arg("self"),
"Returns the step size in the X direction")
.def("ystep", &RectangularDetector::ystep,
+ arg("self"),
"Returns the step size in the Y direction")
.def("xsize", &RectangularDetector::xsize,
+ arg("self"),
"Returns the size in the X direction")
.def("ysize", &RectangularDetector::ysize,
+ arg("self"),
"Returns the size in the Y direction")
.def("xstart", &RectangularDetector::xstart,
+ arg("self"),
"Returns the start position in the X direction")
.def("ystart", &RectangularDetector::ystart,
+ arg("self"),
"Returns the start position in the Y direction")
- .def("idstart", &RectangularDetector::idstart, "Returns the idstart")
+ .def("idstart", &RectangularDetector::idstart,
+ arg("self"),
+ "Returns the idstart")
.def("idfillbyfirst_y", &RectangularDetector::idfillbyfirst_y,
+ arg("self"),
"Returns the idfillbyfirst_y")
.def("idstepbyrow", &RectangularDetector::idstepbyrow,
+ arg("self"),
"Returns the idstepbyrow")
- .def("idstep", &RectangularDetector::idstep, "Returns the idstep")
+ .def("idstep", &RectangularDetector::idstep,
+ arg("self"),
+ "Returns the idstep")
.def("minDetectorID", &RectangularDetector::minDetectorID,
+ arg("self"),
"Returns the minimum detector id")
.def("maxDetectorID", &RectangularDetector::maxDetectorID,
+ arg("self"),
"Returns the maximum detector id");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/ReferenceFrame.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/ReferenceFrame.cpp
index be19d8047e4..b0b69c85dba 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/ReferenceFrame.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/ReferenceFrame.cpp
@@ -21,13 +21,15 @@ void export_ReferenceFrame() {
.export_values();
class_<ReferenceFrame, boost::noncopyable>("ReferenceFrame", no_init)
- .def("pointingAlongBeam", &ReferenceFrame::pointingAlongBeam)
- .def("pointingUp", &ReferenceFrame::pointingUp)
- .def("vecPointingUp", &ReferenceFrame::vecPointingUp)
- .def("vecPointingAlongBeam", &ReferenceFrame::vecPointingAlongBeam)
- .def("pointingAlongBeamAxis", &ReferenceFrame::pointingAlongBeamAxis)
- .def("pointingUpAxis", &ReferenceFrame::pointingUpAxis)
- .def("pointingHorizontalAxis", &ReferenceFrame::pointingHorizontalAxis)
-
- ;
+ .def("pointingAlongBeam", &ReferenceFrame::pointingAlongBeam, arg("self"))
+ .def("pointingUp", &ReferenceFrame::pointingUp, arg("self"))
+ .def("vecPointingUp", &ReferenceFrame::vecPointingUp, arg("self"))
+ .def("vecPointingAlongBeam", &ReferenceFrame::vecPointingAlongBeam,
+ arg("self"))
+ .def("pointingAlongBeamAxis", &ReferenceFrame::pointingAlongBeamAxis,
+ arg("self"))
+ .def("pointingUpAxis", &ReferenceFrame::pointingUpAxis, arg("self"))
+ .def("pointingHorizontalAxis", &ReferenceFrame::pointingHorizontalAxis,
+ arg("self"))
+ ;
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp
index 9b83cabe216..a8d9a851224 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp
@@ -53,16 +53,20 @@ void export_SpaceGroup() {
register_ptr_to_python<boost::shared_ptr<SpaceGroup>>();
class_<SpaceGroup, boost::noncopyable, bases<Group>>("SpaceGroup", no_init)
- .def("getNumber", &SpaceGroup::number)
- .def("getHMSymbol", &SpaceGroup::hmSymbol)
- .def("getEquivalentPositions", &getEquivalentPositions,
- "Returns an array with all symmetry equivalents of the supplied "
- "HKL.")
- .def("isAllowedReflection", &isAllowedReflection,
- "Returns True if the supplied reflection is allowed with respect to "
- "space group symmetry operations.")
- .def("getPointGroup", &SpaceGroup::getPointGroup,
- "Returns the point group of the space group.")
- .def("getSiteSymmetryGroup", &getSiteSymmetryGroup,
- "Returns the site symmetry group for supplied point coordinates.");
+ .def("getNumber", &SpaceGroup::number, arg("self"))
+ .def("getHMSymbol", &SpaceGroup::hmSymbol, arg("self"))
+ .def("getEquivalentPositions", &getEquivalentPositions,
+ (arg("self"), arg("point")),
+ "Returns an array with all symmetry equivalents of the supplied "
+ "HKL.")
+ .def("isAllowedReflection", &isAllowedReflection,
+ (arg("self"), arg("hkl")),
+ "Returns True if the supplied reflection is allowed with respect to "
+ "space group symmetry operations.")
+ .def("getPointGroup", &SpaceGroup::getPointGroup, arg("self"),
+ "Returns the point group of the space group.")
+ .def("getSiteSymmetryGroup", &getSiteSymmetryGroup,
+ (arg("self"), arg("position")),
+ "Returns the site symmetry group for supplied point coordinates.")
+ ;
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp
index 365d6e02a78..5f0384c252f 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp
@@ -44,22 +44,32 @@ void export_SpaceGroupFactory() {
class_<SpaceGroupFactoryImpl, boost::noncopyable>("SpaceGroupFactoryImpl",
no_init)
- .def("isSubscribedSymbol", &isSubscribedSymbol,
- "Returns true if the space group the supplied symbol is subscribed.")
- .def("isSubscribedNumber", &isSubscribedNumber,
- "Returns true if a space group with the given number is subscribed.")
- .def("createSpaceGroup", &createSpaceGroup, "Creates a space group.")
- .def("getAllSpaceGroupSymbols", &allSpaceGroupSymbols,
- "Returns all subscribed space group symbols.")
- .def("getAllSpaceGroupNumbers",
- &SpaceGroupFactoryImpl::subscribedSpaceGroupNumbers,
- "Returns all subscribed space group numbers.")
- .def("subscribedSpaceGroupSymbols", &spaceGroupSymbolsForNumber,
- "Returns all space group symbols that are registered under the "
- "given number.")
- .def("getSpaceGroupsForPointGroup", &spaceGroupSymbolsForPointGroup)
- .def("Instance", &SpaceGroupFactory::Instance,
- return_value_policy<reference_existing_object>(),
- "Returns a reference to the SpaceGroupFactory singleton")
- .staticmethod("Instance");
+ .def("isSubscribedSymbol", &isSubscribedSymbol,
+ (arg("self"), arg("symbol")),
+ "Returns true if the space group the supplied symbol is subscribed.")
+ .def("isSubscribedNumber", &isSubscribedNumber,
+ (arg("self"), arg("number")),
+ "Returns true if a space group with the given number is subscribed.")
+ .def("createSpaceGroup", &createSpaceGroup,
+ (arg("self"), arg("symbol")),
+ "Creates a space group.")
+ .def("getAllSpaceGroupSymbols", &allSpaceGroupSymbols,
+ arg("self"),
+ "Returns all subscribed space group symbols.")
+ .def("getAllSpaceGroupNumbers",
+ &SpaceGroupFactoryImpl::subscribedSpaceGroupNumbers,
+ arg("self"),
+ "Returns all subscribed space group numbers.")
+ .def("subscribedSpaceGroupSymbols", &spaceGroupSymbolsForNumber,
+ (arg("self"), arg("number")),
+ "Returns all space group symbols that are registered under the "
+ "given number.")
+ .def("getSpaceGroupsForPointGroup",
+ &spaceGroupSymbolsForPointGroup,
+ (arg("self"), arg("pointGroup"))
+ )
+ .def("Instance", &SpaceGroupFactory::Instance,
+ return_value_policy<reference_existing_object>(),
+ "Returns a reference to the SpaceGroupFactory singleton")
+ .staticmethod("Instance");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElement.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElement.cpp
index be79196c0fe..b95d57c4099 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElement.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElement.cpp
@@ -42,12 +42,15 @@ void export_SymmetryElement() {
.value("None", SymmetryElementRotation::None);
class_<SymmetryElement, boost::noncopyable>("SymmetryElement", no_init)
- .def("getHMSymbol", &SymmetryElement::hmSymbol,
- "Returns the Hermann-Mauguin symbol for the element.")
- .def("getAxis", &getAxis, "Returns the symmetry axis or [0,0,0] for "
- "identiy, inversion and translations.")
- .def("getRotationSense", &getRotationSense,
- "Returns the rotation sense"
- "of a rotation axis or None"
- "if the element is not a rotation.");
+ .def("getHMSymbol", &SymmetryElement::hmSymbol,
+ arg("self"),
+ "Returns the Hermann-Mauguin symbol for the element.")
+ .def("getAxis", &getAxis,
+ arg("self"),
+ "Returns the symmetry axis or [0,0,0] for "
+ "identiy, inversion and translations.")
+ .def("getRotationSense", &getRotationSense,
+ arg("self"),
+ "Returns the rotation sense of a rotation axis or None"
+ "if the element is not a rotation.");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElementFactory.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElementFactory.cpp
index 59db23c9a35..f3970012864 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElementFactory.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElementFactory.cpp
@@ -9,6 +9,7 @@ void export_SymmetryElementFactory() {
class_<SymmetryElementFactoryImpl, boost::noncopyable>(
"SymmetryElementFactoryImpl", no_init)
.def("createSymElement", &SymmetryElementFactoryImpl::createSymElement,
+ (arg("self"), arg("operation")),
"Creates the symmetry element that corresponds to the supplied "
"symmetry operation.")
.def("Instance", &SymmetryElementFactory::Instance,
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperation.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperation.cpp
index 180a9153aa9..f7fc5202f8d 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperation.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperation.cpp
@@ -35,18 +35,24 @@ void export_SymmetryOperation() {
class_<SymmetryOperation>("SymmetryOperation")
.def("getOrder", &SymmetryOperation::order,
+ arg("self"),
"Returns the order of the symmetry operation, which indicates how "
"often the operation needs to be applied to a point to arrive at "
"identity.")
.def("getIdentifier", &SymmetryOperation::identifier,
+ arg("self"),
"The identifier of the operation in x,y,z-notation.")
.def("transformCoordinates", &applyToCoordinates,
+ (arg("self"), arg("coordinates")),
"Returns transformed coordinates. For transforming HKLs, use "
"transformHKL.")
- .def("transformHKL", &applyToVector, "Returns transformed HKLs. For "
- "transformation of coordinates use "
- "transformCoordinates.")
- .def("apply", &applyToVector, "An alias for transformHKL.");
+ .def("transformHKL", &applyToVector,
+ (arg("self"), arg("hkl")),
+ "Returns transformed HKLs. For transformation of coordinates use "
+ "transformCoordinates.")
+ .def("apply", &applyToVector,
+ (arg("self"), arg("hkl")),
+ "An alias for transformHKL.");
std_vector_exporter<Mantid::Geometry::SymmetryOperation>::wrap(
"std_vector_symmetryoperation");
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperationFactory.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperationFactory.cpp
index dc78c2bcd5d..6ba22c63760 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperationFactory.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperationFactory.cpp
@@ -25,14 +25,18 @@ void export_SymmetryOperationFactory() {
class_<SymmetryOperationFactoryImpl, boost::noncopyable>(
"SymmetryOperationFactoryImpl", no_init)
.def("exists", &SymmetryOperationFactoryImpl::isSubscribed,
+ (arg("self"), arg("identifier")),
"Returns true if the symmetry operation is supplied.")
.def("createSymOp", &SymmetryOperationFactoryImpl::createSymOp,
+ (arg("self"), arg("identifier")),
"Creates the symmetry operation from the supplied x,y,z-identifier.")
.def("createSymOps", &createSymOps,
+ (arg("self"), arg("identifier")),
"Creates a vector of SymmetryOperation objects from a semi-colon "
"separated list of x,y,z-identifiers.")
.def("subscribedSymbols",
&SymmetryOperationFactoryImpl::subscribedSymbols,
+ arg("self"),
"Return all subscribed symbols.")
.def("Instance", &SymmetryOperationFactory::Instance,
return_value_policy<reference_existing_object>(),
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp
index 9da36354a38..6e8fa294174 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp
@@ -38,103 +38,108 @@ void export_UnitCell() {
return_readonly_numpy;
class_<UnitCell>("UnitCell", init<>())
- .def(init<UnitCell const &>(arg("other")))
- .def(init<double, double, double>((arg("_a"), arg("_b"), arg("_c"))))
- .def(init<double, double, double, double, double, double, optional<int>>(
- (arg("_a"), arg("_b"), arg("_c"), arg("_alpha"), arg("_beta"),
- arg("_gamma"), arg("Unit") = (int)(angDegrees))))
- .def("a", (double (UnitCell::*)() const) & UnitCell::a)
- .def("a1", (double (UnitCell::*)() const) & UnitCell::a1)
- .def("a2", (double (UnitCell::*)() const) & UnitCell::a2)
- .def("a3", (double (UnitCell::*)() const) & UnitCell::a3)
- .def("alpha", (double (UnitCell::*)() const) & UnitCell::alpha)
- .def("alpha1", (double (UnitCell::*)() const) & UnitCell::alpha1)
- .def("alpha2", (double (UnitCell::*)() const) & UnitCell::alpha2)
- .def("alpha3", (double (UnitCell::*)() const) & UnitCell::alpha3)
- .def("alphastar", (double (UnitCell::*)() const) & UnitCell::alphastar)
- .def("astar", (double (UnitCell::*)() const) & UnitCell::astar)
- .def("b", (double (UnitCell::*)() const) & UnitCell::b)
- .def("b1", (double (UnitCell::*)() const) & UnitCell::b1)
- .def("b2", (double (UnitCell::*)() const) & UnitCell::b2)
- .def("b3", (double (UnitCell::*)() const) & UnitCell::b3)
- .def("beta", (double (UnitCell::*)() const) & UnitCell::beta)
- .def("beta1", (double (UnitCell::*)() const) & UnitCell::beta1)
- .def("beta2", (double (UnitCell::*)() const) & UnitCell::beta2)
- .def("beta3", (double (UnitCell::*)() const) & UnitCell::beta3)
- .def("betastar", (double (UnitCell::*)() const) & UnitCell::betastar)
- .def("bstar", (double (UnitCell::*)() const) & UnitCell::bstar)
- .def("c", (double (UnitCell::*)() const) & UnitCell::c)
- .def("cstar", (double (UnitCell::*)() const) & UnitCell::cstar)
- .def("d",
- (double (UnitCell::*)(double, double, double) const) & UnitCell::d,
- (arg("h"), arg("k"), arg("l")))
- .def("d", (double (UnitCell::*)(const V3D &) const) & UnitCell::d,
- (arg("hkl")))
- .def("dstar", (double (UnitCell::*)(double, double, double) const) &
- UnitCell::dstar,
- (arg("h"), arg("k"), arg("l")))
- .def("errora", (double (UnitCell::*)() const) & UnitCell::errora)
- .def("errorb", (double (UnitCell::*)() const) & UnitCell::errorb)
- .def("errorc", (double (UnitCell::*)() const) & UnitCell::errorc)
- .def("erroralpha",
- (double (UnitCell::*)(int const) const) & UnitCell::erroralpha,
- (arg("Unit") = (int)(angDegrees)))
- .def("errorbeta",
- (double (UnitCell::*)(int const) const) & UnitCell::errorbeta,
- (arg("Unit") = (int)(angDegrees)))
- .def("errorgamma",
- (double (UnitCell::*)(int const) const) & UnitCell::errorgamma,
- (arg("Unit") = (int)(angDegrees)))
- .def("gamma", (double (UnitCell::*)() const) & UnitCell::gamma)
- .def("gammastar", (double (UnitCell::*)() const) & UnitCell::gammastar)
- .def("recAngle", (double (UnitCell::*)(double, double, double, double,
- double, double, int const) const) &
- UnitCell::recAngle,
- (arg("h1"), arg("k1"), arg("l1"), arg("h2"), arg("k2"), arg("l2"),
- arg("Unit") = (int)(angDegrees)))
- .def("recVolume", (double (UnitCell::*)() const) & UnitCell::recVolume)
- .def("set", (void (UnitCell::*)(double, double, double, double, double,
- double, int const)) &
- UnitCell::set,
- (arg("_a"), arg("_b"), arg("_c"), arg("_alpha"), arg("_beta"),
- arg("_gamma"), arg("Unit") = (int)(angDegrees)))
- .def("seta", (void (UnitCell::*)(double))(&UnitCell::seta), (arg("_a")))
- .def("setalpha",
- (void (UnitCell::*)(double, int const))(&UnitCell::setalpha),
- (arg("_alpha"), arg("Unit") = (int)(angDegrees)))
- .def("setb", (void (UnitCell::*)(double))(&UnitCell::setb), (arg("_b")))
- .def("setbeta",
- (void (UnitCell::*)(double, int const))(&UnitCell::setbeta),
- (arg("_beta"), arg("Unit") = (int)(angDegrees)))
- .def("setc", (void (UnitCell::*)(double))(&UnitCell::setc), (arg("_c")))
- .def("setgamma",
- (void (UnitCell::*)(double, int const))(&UnitCell::setgamma),
- (arg("_gamma"), arg("Unit") = (int)(angDegrees)))
- .def("setError", (void (UnitCell::*)(double, double, double, double,
- double, double, int const)) &
- UnitCell::setError,
- (arg("_aerr"), arg("_berr"), arg("_cerr"), arg("_alphaerr"),
- arg("_betaerr"), arg("_gammaerr"), arg("Unit") = (int)(angDegrees)))
- .def("setErrora", (void (UnitCell::*)(double))(&UnitCell::setErrora),
- (arg("_aerr")))
- .def("setErroralpha",
- (void (UnitCell::*)(double, int const))(&UnitCell::setErroralpha),
- (arg("_alphaerr"), arg("Unit") = (int)(angDegrees)))
- .def("setErrorb", (void (UnitCell::*)(double))(&UnitCell::setErrorb),
- (arg("_berr")))
- .def("setErrorbeta",
- (void (UnitCell::*)(double, int const))(&UnitCell::setErrorbeta),
- (arg("_betaerr"), arg("Unit") = (int)(angDegrees)))
- .def("setErrorc", (void (UnitCell::*)(double))(&UnitCell::setErrorc),
- (arg("_cerr")))
- .def("setErrorgamma",
- (void (UnitCell::*)(double, int const))(&UnitCell::setErrorgamma),
- (arg("_gammaerr"), arg("Unit") = (int)(angDegrees)))
- .def("volume", (double (UnitCell::*)() const) & UnitCell::volume)
- .def("getG", &UnitCell::getG, return_readonly_numpy())
- .def("getGstar", &UnitCell::getGstar, return_readonly_numpy())
- .def("getB", &UnitCell::getB, return_readonly_numpy())
- .def("recalculateFromGstar", &recalculateFromGstar);
+ .def(init<UnitCell const &>((arg("self"), arg("other"))))
+ .def(init<double, double, double>
+ ((arg("self"), arg("_a"), arg("_b"), arg("_c"))))
+ .def(init<double, double, double, double, double, double, optional<int>>
+ ((arg("self"), arg("_a"), arg("_b"), arg("_c"),
+ arg("_alpha"), arg("_beta"), arg("_gamma"),
+ arg("Unit") = (int)(angDegrees))))
+ .def("a", (double (UnitCell::*)() const) & UnitCell::a, arg("self"))
+ .def("a1", (double (UnitCell::*)() const) & UnitCell::a1, arg("self"))
+ .def("a2", (double (UnitCell::*)() const) & UnitCell::a2, arg("self"))
+ .def("a3", (double (UnitCell::*)() const) & UnitCell::a3, arg("self"))
+ .def("alpha", (double (UnitCell::*)() const) & UnitCell::alpha, arg("self"))
+ .def("alpha1", (double (UnitCell::*)() const) & UnitCell::alpha1, arg("self"))
+ .def("alpha2", (double (UnitCell::*)() const) & UnitCell::alpha2, arg("self"))
+ .def("alpha3", (double (UnitCell::*)() const) & UnitCell::alpha3, arg("self"))
+ .def("alphastar", (double (UnitCell::*)() const) & UnitCell::alphastar, arg("self"))
+ .def("astar", (double (UnitCell::*)() const) & UnitCell::astar, arg("self"))
+ .def("b", (double (UnitCell::*)() const) & UnitCell::b, arg("self"))
+ .def("b1", (double (UnitCell::*)() const) & UnitCell::b1, arg("self"))
+ .def("b2", (double (UnitCell::*)() const) & UnitCell::b2, arg("self"))
+ .def("b3", (double (UnitCell::*)() const) & UnitCell::b3, arg("self"))
+ .def("beta", (double (UnitCell::*)() const) & UnitCell::beta, arg("self"))
+ .def("beta1", (double (UnitCell::*)() const) & UnitCell::beta1, arg("self"))
+ .def("beta2", (double (UnitCell::*)() const) & UnitCell::beta2, arg("self"))
+ .def("beta3", (double (UnitCell::*)() const) & UnitCell::beta3, arg("self"))
+ .def("betastar", (double (UnitCell::*)() const) & UnitCell::betastar, arg("self"))
+ .def("bstar", (double (UnitCell::*)() const) & UnitCell::bstar, arg("self"))
+ .def("c", (double (UnitCell::*)() const) & UnitCell::c, arg("self"))
+ .def("cstar", (double (UnitCell::*)() const) & UnitCell::cstar, arg("self"))
+ .def("d",
+ (double (UnitCell::*)(double, double, double) const) & UnitCell::d,
+ (arg("self"), arg("h"), arg("k"), arg("l")))
+ .def("d", (double (UnitCell::*)(const V3D &) const) & UnitCell::d,
+ (arg("self"), arg("hkl")))
+ .def("dstar", (double (UnitCell::*)(double, double, double) const) &
+ UnitCell::dstar,
+ (arg("self"), arg("h"), arg("k"), arg("l")))
+ .def("errora", (double (UnitCell::*)() const) & UnitCell::errora, arg("self"))
+ .def("errorb", (double (UnitCell::*)() const) & UnitCell::errorb, arg("self"))
+ .def("errorc", (double (UnitCell::*)() const) & UnitCell::errorc, arg("self"))
+ .def("erroralpha",
+ (double (UnitCell::*)(int const) const) & UnitCell::erroralpha,
+ (arg("self"), arg("Unit") = (int)(angDegrees)))
+ .def("errorbeta",
+ (double (UnitCell::*)(int const) const) & UnitCell::errorbeta,
+ (arg("self"), arg("Unit") = (int)(angDegrees)))
+ .def("errorgamma",
+ (double (UnitCell::*)(int const) const) & UnitCell::errorgamma,
+ (arg("self"), arg("Unit") = (int)(angDegrees)))
+ .def("gamma", (double (UnitCell::*)() const) & UnitCell::gamma, arg("self"))
+ .def("gammastar", (double (UnitCell::*)() const) & UnitCell::gammastar, arg("self"))
+ .def("recAngle", (double (UnitCell::*)(double, double, double, double,
+ double, double, int const) const) &
+ UnitCell::recAngle,
+ (arg("self"), arg("h1"), arg("k1"), arg("l1"), arg("h2"), arg("k2"), arg("l2"),
+ arg("Unit") = (int)(angDegrees)))
+ .def("recVolume", (double (UnitCell::*)() const) & UnitCell::recVolume, arg("self"))
+ .def("set", (void (UnitCell::*)(double, double, double, double, double,
+ double, int const)) &
+ UnitCell::set,
+ (arg("self"), arg("_a"), arg("_b"), arg("_c"), arg("_alpha"), arg("_beta"),
+ arg("_gamma"), arg("Unit") = (int)(angDegrees)))
+ .def("seta", (void (UnitCell::*)(double))(&UnitCell::seta), (arg("self"), arg("_a")))
+ .def("setalpha",
+ (void (UnitCell::*)(double, int const))(&UnitCell::setalpha),
+ (arg("self"), arg("_alpha"), arg("Unit") = (int)(angDegrees)))
+ .def("setb", (void (UnitCell::*)(double))(&UnitCell::setb), (arg("self"), arg("_b")))
+ .def("setbeta",
+ (void (UnitCell::*)(double, int const))(&UnitCell::setbeta),
+ (arg("self"), arg("_beta"), arg("Unit") = (int)(angDegrees)))
+ .def("setc", (void (UnitCell::*)(double))(&UnitCell::setc), (arg("self"), arg("_c")))
+ .def("setgamma",
+ (void (UnitCell::*)(double, int const))(&UnitCell::setgamma),
+ (arg("self"), arg("_gamma"), arg("Unit") = (int)(angDegrees)))
+ .def("setError", (void (UnitCell::*)(double, double, double, double,
+ double, double, int const)) &
+ UnitCell::setError,
+ (arg("self"), arg("_aerr"), arg("_berr"), arg("_cerr"), arg("_alphaerr"),
+ arg("_betaerr"), arg("_gammaerr"), arg("Unit") = (int)(angDegrees)))
+ .def("setErrora", (void (UnitCell::*)(double))(&UnitCell::setErrora),
+ (arg("self"), arg("_aerr")))
+ .def("setErroralpha",
+ (void (UnitCell::*)(double, int const))(&UnitCell::setErroralpha),
+ (arg("self"), arg("_alphaerr"), arg("Unit") = (int)(angDegrees)))
+ .def("setErrorb", (void (UnitCell::*)(double))(&UnitCell::setErrorb),
+ (arg("self"), arg("_berr")))
+ .def("setErrorbeta",
+ (void (UnitCell::*)(double, int const))(&UnitCell::setErrorbeta),
+ (arg("self"), arg("_betaerr"), arg("Unit") = (int)(angDegrees)))
+ .def("setErrorc", (void (UnitCell::*)(double))(&UnitCell::setErrorc),
+ (arg("self"), arg("_cerr")))
+ .def("setErrorgamma",
+ (void (UnitCell::*)(double, int const))(&UnitCell::setErrorgamma),
+ (arg("self"), arg("_gammaerr"), arg("Unit") = (int)(angDegrees)))
+ .def("volume", (double (UnitCell::*)() const) & UnitCell::volume, arg("self"))
+ .def("getG", &UnitCell::getG, arg("self"), return_readonly_numpy())
+ .def("getGstar", &UnitCell::getGstar, arg("self"), return_readonly_numpy())
+ .def("getB", &UnitCell::getB, arg("self"), return_readonly_numpy())
+ .def("recalculateFromGstar", &recalculateFromGstar,
+ (arg("self"), arg("NewGstar"))
+ )
+ ;
scope().attr("deg2rad") = Mantid::Geometry::deg2rad;
scope().attr("rad2deg") = Mantid::Geometry::rad2deg;
--
GitLab
From ca3eb13aa8c1e666cfd83bc3f7ea1b2869bb5cf1 Mon Sep 17 00:00:00 2001
From: Wenduo Zhou <zhouw@ornl.gov>
Date: Tue, 13 Oct 2015 22:00:47 -0400
Subject: [PATCH 206/223] Refs #13692. Reduced to 143 warnings.
---
.../mantid/api/src/Exports/Algorithm.cpp | 1 +
.../api/src/Exports/AlgorithmFactory.cpp | 6 +++-
.../api/src/Exports/AlgorithmHistory.cpp | 20 ++++++++---
.../api/src/Exports/AlgorithmManager.cpp | 8 +++++
.../mantid/api/src/Exports/BoxController.cpp | 13 ++++++-
.../src/Exports/DataProcessorAlgorithm.cpp | 15 +++++++-
.../api/src/Exports/FrameworkManager.cpp | 8 +++++
.../api/src/Exports/FunctionFactory.cpp | 5 ++-
.../mantid/api/src/Exports/IAlgorithm.cpp | 34 +++++++++++++++----
.../mantid/api/src/Exports/IFunction.cpp | 10 +++++-
.../mantid/api/src/Exports/IPeakFunction.cpp | 3 +-
.../api/src/Exports/IWorkspaceProperty.cpp | 2 ++
12 files changed, 107 insertions(+), 18 deletions(-)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index 41ef7653cab..2ebe6a155f3 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -121,6 +121,7 @@ void export_leaf_classes() {
// deprecated methods
.def("setWikiSummary", &PythonAlgorithm::setWikiSummary,
+ (arg("self"), arg("summary")),
"(Deprecated.) Set summary for the help.");
// Prior to version 3.2 there was a separate C++ PythonAlgorithm class that
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
index 48b38115527..4aa463269f8 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
@@ -118,11 +118,15 @@ void export_AlgorithmFactory() {
"an option to specify the version"))
.def("getRegisteredAlgorithms", &getRegisteredAlgorithms,
+ (arg("self"), arg("include_hidden")),
"Returns a Python dictionary of currently registered algorithms")
.def("highestVersion", &AlgorithmFactoryImpl::highestVersion,
+ (arg("self"), arg("algorithm_name")),
"Returns the highest version of the named algorithm. Throws "
"ValueError if no algorithm can be found")
- .def("subscribe", &subscribe, "Register a Python class derived from "
+ .def("subscribe", &subscribe,
+ (arg("self"), arg("object")),
+ "Register a Python class derived from "
"PythonAlgorithm into the factory")
.def("Instance", &AlgorithmFactory::Instance,
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp
index 8c886db7e8e..e0778ad2d26 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp
@@ -59,39 +59,49 @@ void export_AlgorithmHistory() {
class_<AlgorithmHistory>("AlgorithmHistory", no_init)
.def("name", &AlgorithmHistory::name,
+ arg("self"),
return_value_policy<copy_const_reference>(),
"Returns the name of the algorithm.")
.def("version", &AlgorithmHistory::version,
+ arg("self"),
return_value_policy<copy_const_reference>(),
"Returns the version of the algorithm.")
.def("executionDuration", &AlgorithmHistory::executionDuration,
+ arg("self"),
"Returns the execution duration of the algorithm.")
.def("executionDate", &AlgorithmHistory::executionDate,
+ arg("self"),
"Returns the execution date of the algorithm.")
.def("execCount", &AlgorithmHistory::execCount,
+ arg("self"),
return_value_policy<copy_const_reference>(),
"Returns the execution number of the algorithm.")
.def("childHistorySize", &AlgorithmHistory::childHistorySize,
+ arg("self"),
"Returns the number of the child algorithms.")
.def("getChildAlgorithmHistory",
- &AlgorithmHistory::getChildAlgorithmHistory, arg("index"),
+ &AlgorithmHistory::getChildAlgorithmHistory,
+ (arg("self"), arg("index")),
"Returns the child algorithm at the given index in the history")
- .def("getChildHistories", &getChildrenAsList, "Returns a list of child "
- "algorithm histories for "
- "this algorithm history.")
+ .def("getChildHistories", &getChildrenAsList,
+ arg("self"),
+ "Returns a list of child "
+ "algorithm histories for "
+ "this algorithm history.")
.def("getProperties", &getPropertiesAsList,
+ arg("self"),
"Returns properties for this algorithm history.")
.def("getChildAlgorithm", &AlgorithmHistory::getChildAlgorithm,
- arg("index"),
+ (arg("self"), arg("index")),
"Returns the algorithm at the given index in the history")
// ----------------- Operators --------------------------------------
.def(self_ns::str(self));
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
index f827fd3728b..d31a131fe26 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
@@ -79,21 +79,29 @@ void export_AlgorithmManager() {
createUnmanaged_overloads((arg("name"), arg("version")),
"Creates an unmanaged algorithm."))
.def("size", &AlgorithmManagerImpl::size,
+ arg("self"),
"Returns the number of managed algorithms")
.def("setMaxAlgorithms", &AlgorithmManagerImpl::setMaxAlgorithms,
+ (arg("self"), arg("n")),
"Set the maximum number of allowed managed algorithms")
.def("getAlgorithm", &getAlgorithm,
+ (arg("self"), arg("id_holder")),
"Return the algorithm instance identified by the given id.")
.def("removeById", &removeById,
+ (arg("self"), arg("id_holder")),
"Remove an algorithm from the managed list")
.def("newestInstanceOf", &AlgorithmManagerImpl::newestInstanceOf,
+ (arg("self"), arg("algorithm_name")),
"Returns the newest created instance of the named algorithm")
.def("runningInstancesOf", &runningInstancesOf,
+ (arg("self"), arg("algorithm_name")),
"Returns a list of managed algorithm instances that are "
"currently executing")
.def("clear", &AlgorithmManagerImpl::clear,
+ arg("self"),
"Clears the current list of managed algorithms")
.def("cancelAll", &AlgorithmManagerImpl::cancelAll,
+ arg("self"),
"Requests that all currently running algorithms be cancelled");
// Instance method
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp b/Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp
index 7caf592a3ea..35b0b67d837 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp
@@ -11,24 +11,35 @@ void export_BoxController() {
register_ptr_to_python<boost::shared_ptr<BoxController>>();
class_<BoxController, boost::noncopyable>("BoxController", no_init)
- .def("getNDims", &BoxController::getNDims, "Get # of dimensions")
+ .def("getNDims", &BoxController::getNDims,
+ arg("self"),
+ "Get # of dimensions")
.def("getSplitThreshold", &BoxController::getSplitThreshold,
+ arg("self"),
"Return the splitting threshold, in # of events")
.def("getSplitInto", &BoxController::getSplitInto,
+ (arg("self"), arg("dim")),
"Return into how many to split along a dimension")
.def("getMaxDepth", &BoxController::getMaxDepth,
+ arg("self"),
"Return the max recursion depth allowed for grid box splitting.")
.def("getTotalNumMDBoxes", &BoxController::getTotalNumMDBoxes,
+ arg("self"),
"Return the total number of MD Boxes, irrespective of depth")
.def("getTotalNumMDGridBoxes", &BoxController::getTotalNumMDGridBoxes,
+ arg("self"),
"Return the total number of MDGridBox'es, irrespective of depth")
.def("getAverageDepth", &BoxController::getAverageDepth,
+ arg("self"),
"Return the average recursion depth of gridding.")
.def("isFileBacked", &BoxController::isFileBacked,
+ arg("self"),
"Return True if the MDEventWorkspace is backed by a file ")
.def("getFilename", &BoxController::getFilename,
+ arg("self"),
"Return the full path to the file open as the file-based back or "
"empty string if no file back-end is initiated")
.def("useWriteBuffer", &BoxController::useWriteBuffer,
+ arg("self"),
"Return true if the MRU should be used");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
index 1dacf9c7bc5..2f9350e4ae7 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
@@ -25,39 +25,48 @@ void export_DataProcessorAlgorithm() {
"DataProcessorAlgorithm", "Base class workflow-type algorithms")
.def("setLoadAlg", &DataProcessorAdapter::setLoadAlgProxy,
+ (arg("self"), arg("alg")),
"Set the name of the algorithm called using the load() method "
"[Default=Load]")
.def("setLoadAlgFileProp", &DataProcessorAdapter::setLoadAlgFilePropProxy,
+ (arg("self"), arg("file_prop_name")),
"Set the name of the file property for the load algorithm when "
"using "
"the load() method [Default=Filename]")
.def("setAccumAlg", &DataProcessorAdapter::setAccumAlgProxy,
+ (arg("self"), arg("alg")),
"Set the name of the algorithm called to accumulate a chunk of "
"processed data [Default=Plus]")
.def("determineChunk", &DataProcessorAdapter::determineChunkProxy,
+ (arg("self"), arg("file_name")),
"Return a TableWorkspace containing the information on how to split "
"the "
"input file when processing in chunks")
.def("loadChunk", &DataProcessorAdapter::loadChunkProxy,
+ (arg("self"), arg("row_index")),
"Load a chunk of data")
.def("load", (loadOverload1)&DataProcessorAdapter::loadProxy,
+ (arg("self"), arg("input_data")),
"Loads the given file or workspace data and returns the workspace. "
"The output is not stored in the AnalysisDataService.")
.def("load", (loadOverload2)&DataProcessorAdapter::loadProxy,
+ (arg("self"), arg("input_data"), arg("load_quite")),
"Loads the given file or workspace data and returns the workspace. "
"If loadQuiet=True then output is not stored in the "
"AnalysisDataService.")
.def("splitInput", &DataProcessorAdapter::splitInputProxy,
+ (arg("self"), arg("input")),
return_value_policy<VectorToNumpy>())
- .def("forwardProperties", &DataProcessorAdapter::forwardPropertiesProxy)
+ .def("forwardProperties", &DataProcessorAdapter::forwardPropertiesProxy,
+ arg("self"))
.def("getProcessProperties",
&DataProcessorAdapter::getProcessPropertiesProxy,
@@ -65,21 +74,25 @@ void export_DataProcessorAlgorithm() {
"a new one if it does not exist")
.def("assemble", &DataProcessorAdapter::assembleProxy,
+ (arg("self"), arg("partial_wsname"), arg("output_wsname")),
"If an MPI build, assemble the partial workspaces from all MPI "
"processes. "
"Otherwise, simply returns the input workspace")
.def("saveNexus", &DataProcessorAdapter::saveNexusProxy,
+ (arg("self"), arg("output_wsname"), arg("output_filename")),
"Save a workspace as a nexus file. If this is an MPI build then "
"saving only "
"happens for the main thread.")
.def("isMainThread", &DataProcessorAdapter::isMainThreadProxy,
+ arg("self"),
"Returns true if this algorithm is the main thread for an MPI "
"build. For "
"non-MPI build it always returns true")
.def("getNThreads", &DataProcessorAdapter::getNThreadsProxy,
+ arg("self"),
"Returns the number of running MPI processes in an MPI build or 1 "
"for "
"a non-MPI build");
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp b/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp
index 1e31d32096f..1203f15ca02 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp
@@ -13,30 +13,38 @@ void export_FrameworkManager() {
no_init)
.def("setNumOMPThreadsToConfigValue",
&FrameworkManagerImpl::setNumOMPThreadsToConfigValue,
+ arg("self"),
"Sets the number of OpenMP threads to the value specified in the "
"config file")
.def("setNumOMPThreads", &FrameworkManagerImpl::setNumOMPThreads,
+ (arg("self"), arg("nthread")),
"Set the number of OpenMP threads to the given value")
.def("getNumOMPThreads", &FrameworkManagerImpl::getNumOMPThreads,
+ arg("self"),
"Returns the number of OpenMP threads that will be used.")
.def("clear", &FrameworkManagerImpl::clear,
+ arg("self"),
"Clear all memory held by Mantid")
.def("clearAlgorithms", &FrameworkManagerImpl::clearAlgorithms,
+ arg("self"),
"Clear memory held by algorithms (does not include workspaces)")
.def("clearData", &FrameworkManagerImpl::clearData,
+ arg("self"),
"Clear memory held by the data service (essentially all workspaces, "
"including hidden)")
.def("clearInstruments", &FrameworkManagerImpl::clearInstruments,
+ arg("self"),
"Clear memory held by the cached instruments")
.def("clearPropertyManagers",
&FrameworkManagerImpl::clearPropertyManagers,
+ arg("self"),
"Clear memory held by the PropertyManagerDataService")
.def("Instance", &FrameworkManager::Instance,
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp
index 2d94e8f7aea..f5c103bca4b 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp
@@ -90,14 +90,17 @@ void export_FunctionFactory() {
class_<FunctionFactoryImpl, boost::noncopyable>("FunctionFactoryImpl",
no_init)
.def("getFunctionNames", &getFunctionNames,
+ arg("self"),
"Returns a list of the currently available functions")
.def("createFunction", &FunctionFactoryImpl::createFunction,
+ (arg("self"), arg("type")),
"Return a pointer to the requested function")
.def("subscribe", &subscribe,
+ (arg("self"), arg("object")),
"Register a Python class derived from IFunction into the factory")
.def("unsubscribe", &FunctionFactoryImpl::unsubscribe,
+ (arg("self"), arg("class_name")),
"Remove a type from the factory")
-
.def("Instance", &FunctionFactory::Instance,
return_value_policy<reference_existing_object>(),
"Returns a reference to the FunctionFactory singleton")
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
index f70cc834983..2bf8059cae0 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
@@ -340,46 +340,64 @@ void export_ialgorithm() {
"Return a list of input, in/out and output properties "
"such that the mandatory properties are first followed by the "
"optional ones.")
-
.def("outputProperties", &getOutputProperties,
+ arg("self"),
"Returns a list of the output properties on the algorithm")
.def("isInitialized", &IAlgorithm::isInitialized,
+ arg("self"),
"Returns True if the algorithm is initialized, False otherwise")
.def("isExecuted", &IAlgorithm::isExecuted,
+ arg("self"),
"Returns True if the algorithm has been executed successfully, "
"False otherwise")
.def("isLogging", &IAlgorithm::isLogging, arg("self"),
"Returns True if the "
"algorithm's logger is turned "
"on, False otherwise")
- .def("isRunning", &IAlgorithm::isRunning, "Returns True if the algorithm "
- "is considered to be running, "
- "False otherwise")
+ .def("isRunning", &IAlgorithm::isRunning,
+ arg("self"),
+ "Returns True if the algorithm "
+ "is considered to be running, "
+ "False otherwise")
.def("setChild", &IAlgorithm::setChild,
+ (arg("self"), arg("is_child")),
"If true this algorithm is run as a child algorithm. There will be "
"no logging and nothing is stored in the Analysis Data Service")
.def("enableHistoryRecordingForChild",
&IAlgorithm::enableHistoryRecordingForChild,
+ (arg("self"), arg("on")),
"If true then history will be recorded regardless of the child "
"status")
.def("setAlgStartupLogging", &IAlgorithm::setAlgStartupLogging,
+ (arg("self"), arg("enabled")),
"If true then allow logging of start and end messages")
.def("getAlgStartupLogging", &IAlgorithm::getAlgStartupLogging,
+ arg("self"),
"Returns true if logging of start and end messages")
.def("setAlwaysStoreInADS", &IAlgorithm::setAlwaysStoreInADS,
+ (arg("self"), arg("do_store")),
"If true then even child algorithms will have their workspaces "
"stored in the ADS.")
.def("isChild", &IAlgorithm::isChild,
+ arg("self"),
"Returns True if the algorithm has been marked to run as a child. "
"If True then Output workspaces "
"are NOT stored in the Analysis Data Service but must be retrieved "
"from the property.")
- .def("setLogging", &IAlgorithm::setLogging, "Toggle logging on/off.")
- .def("setRethrows", &IAlgorithm::setRethrows)
- .def("initialize", &IAlgorithm::initialize, "Initializes the algorithm")
+ .def("setLogging", &IAlgorithm::setLogging,
+ (arg("self"), arg("value")),
+ "Toggle logging on/off.")
+ .def("setRethrows", &IAlgorithm::setRethrows,
+ (arg("self"), arg("rethrow")),
+ "To query whether an algorithm should rethrow exceptions when executing.")
+ .def("initialize", &IAlgorithm::initialize,
+ arg("self"),
+ "Initializes the algorithm")
.def("validateInputs", &IAlgorithm::validateInputs,
+ arg("self"),
"Cross-check all inputs and return any errors as a dictionary")
.def("execute", &executeProxy,
+ arg("self"),
"Runs the algorithm and returns whether it has been successful")
// 'Private' static methods
.def("_algorithmInThread", &_algorithmInThread)
@@ -389,7 +407,9 @@ void export_ialgorithm() {
// deprecated methods
.def("getOptionalMessage", &getOptionalMessage,
+ arg("self"),
"Returns the optional user message attached to the algorithm")
.def("getWikiSummary", &getWikiSummary,
+ arg("self"),
"Returns the summary found on the wiki page");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index 9e7b21eb69d..f755085d7fe 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -123,18 +123,26 @@ void export_IFunction() {
//-- Deprecated functions that have the wrong names --
.def("categories", &getCategories,
+ arg("self"),
"Returns a list of the categories for an algorithm")
- .def("numParams", &IFunction::nParams, "Return the number of parameters")
+ .def("numParams", &IFunction::nParams,
+ arg("self"),
+ "Return the number of parameters")
.def("getParamName", &IFunction::parameterName,
+ (arg("self"), arg("i")),
"Return the name of the ith parameter")
.def("getParamDescr", &IFunction::parameterDescription,
+ (arg("self"), arg("i")),
"Return a description of the ith parameter")
.def("getParamExplicit", &IFunction::isExplicitlySet,
+ (arg("self"), arg("i")),
"Return whether the ith parameter needs to be explicitely set")
.def("getParamValue",
(double (IFunction::*)(std::size_t) const) & IFunction::getParameter,
+ (arg("self"), arg("i")),
"Get the value of the ith parameter")
//-- Python special methods --
.def("__repr__", &IFunction::asString,
+ arg("self"),
"Return a string representation of the function");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
index 3ac4f633273..0c0c19486ea 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
@@ -17,7 +17,8 @@ void export_IPeakFunction() {
(arg("self"), arg("vec_x")),
"Calculate the values of the function for the given x values. The "
"output should be stored in the out array")
- .def("intensity", &IPeakFunction::intensity, arg("self"),
+ .def("intensity", &IPeakFunction::intensity,
+ arg("self"),
"Returns the integral intensity of the peak function.")
.def("setIntensity", &IPeakFunction::setIntensity,
(arg("self"), arg("new_intensity")),
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IWorkspaceProperty.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IWorkspaceProperty.cpp
index 525d92c8448..08baa602526 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IWorkspaceProperty.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IWorkspaceProperty.cpp
@@ -7,7 +7,9 @@ void export_IWorkspaceProperty() {
class_<IWorkspaceProperty, boost::noncopyable>("IWorkspaceProperty", no_init)
.def("isOptional", &IWorkspaceProperty::isOptional,
+ arg("self"),
"Is the input workspace property optional")
.def("isLocking", &IWorkspaceProperty::isLocking,
+ arg("self"),
"Will the workspace be locked when starting an algorithm");
}
--
GitLab
From a07ebc58919fcbd8b98b159399b33fce2df9f65f Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 14 Oct 2015 08:27:13 +0100
Subject: [PATCH 207/223] check Increment and next() retvals, 1292909, 1295474,
re #13951
---
.../src/MDHistoWorkspaceIterator.cpp | 20 +++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp b/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp
index 9965a7d0507..87ad5e25ccd 100644
--- a/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp
+++ b/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp
@@ -199,8 +199,17 @@ void MDHistoWorkspaceIterator::init(
for (size_t d = 0; d < m_nd; d++)
m_center[d] = m_origin[d] + 0.5f * m_binWidth[d];
// Skip on if the first point is NOT contained
- if (!m_function->isPointContained(m_center))
- next();
+ if (!m_function->isPointContained(m_center)) {
+ bool didNext = next();
+ if (!didNext && this->valid()) {
+ throw std::runtime_error(
+ "Inconsistency found initializing "
+ "MDHistoWorkspace iterator: this iterator should be valid, but "
+ "when tried to skip the "
+ "first point (not contained) could not iterate to "
+ "next point.");
+ }
+ }
}
// --- Calculate index permutations for neighbour finding face touching ---
@@ -293,9 +302,11 @@ bool MDHistoWorkspaceIterator::valid() const { return (m_pos < m_max); }
/// @return true if you can continue iterating
bool MDHistoWorkspaceIterator::next() {
if (m_function) {
+ bool allIncremented = false;
do {
m_pos++;
- Utils::NestedForLoop::Increment(m_nd, m_index, m_indexMax);
+ allIncremented =
+ Utils::NestedForLoop::Increment(m_nd, m_index, m_indexMax);
// Calculate the center
for (size_t d = 0; d < m_nd; d++) {
m_center[d] =
@@ -304,7 +315,8 @@ bool MDHistoWorkspaceIterator::next() {
}
// std::cout<<std::endl;
// Keep incrementing until you are in the implicit function
- } while (!m_function->isPointContained(m_center) && m_pos < m_max);
+ } while (!allIncremented && !m_function->isPointContained(m_center) &&
+ m_pos < m_max);
} else {
++m_pos;
}
--
GitLab
From 87df835f5fe3ac1f5385d98968cd914eee9cd331 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 14 Oct 2015 08:27:32 +0100
Subject: [PATCH 208/223] low priority log if config service key not found,
1076110 , re #13951
---
Framework/DataObjects/src/PeakColumn.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Framework/DataObjects/src/PeakColumn.cpp b/Framework/DataObjects/src/PeakColumn.cpp
index b3d7e129cc9..bbc8cb309ea 100644
--- a/Framework/DataObjects/src/PeakColumn.cpp
+++ b/Framework/DataObjects/src/PeakColumn.cpp
@@ -80,7 +80,13 @@ PeakColumn::PeakColumn(std::vector<Peak> &peaks, const std::string &name)
this->m_name = name;
this->m_type = typeFromName(name); // Throws if the name is unknown
this->m_hklPrec = 2;
- ConfigService::Instance().getValue("PeakColumn.hklPrec", this->m_hklPrec);
+ const std::string key = "PeakColumn.hklPrec";
+ int gotit = ConfigService::Instance().getValue(key, this->m_hklPrec);
+ if (!gotit)
+ g_log.information()
+ << "In PeakColumn constructor, did not find any value for '" << key
+ << "' from the Config Service. Using default: " << this->m_hklPrec
+ << "\n";
}
//----------------------------------------------------------------------------------------------
--
GitLab
From 6053d847e3e75de44ea3afaeb3ac011a70561050 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 14 Oct 2015 08:27:40 +0100
Subject: [PATCH 209/223] check neg/end-of-string retval from find_first_of,
1075689, re #13951
---
Framework/Geometry/src/Objects/Object.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Framework/Geometry/src/Objects/Object.cpp b/Framework/Geometry/src/Objects/Object.cpp
index e6ab975dda9..d7bccf922d6 100644
--- a/Framework/Geometry/src/Objects/Object.cpp
+++ b/Framework/Geometry/src/Objects/Object.cpp
@@ -221,11 +221,13 @@ int Object::complementaryObject(const int Cnum, std::string &Ln) {
std::string::size_type posB;
posB = Ln.find_first_of("()", posA);
if (posB == std::string::npos)
- throw std::runtime_error("Object::complemenet :: " + Ln);
+ throw std::runtime_error("Object::complement :: " + Ln);
brackCnt = (Ln[posB] == '(') ? 1 : 0;
while (posB != std::string::npos && brackCnt) {
posB = Ln.find_first_of("()", posB);
+ if (posB == std::string::npos)
+ break;
brackCnt += (Ln[posB] == '(') ? 1 : -1;
posB++;
}
@@ -242,7 +244,7 @@ int Object::complementaryObject(const int Cnum, std::string &Ln) {
return 1;
}
- throw std::runtime_error("Object::complemenet :: " + Part);
+ throw std::runtime_error("Object::complement :: " + Part);
return 0;
}
--
GitLab
From 90b78bd3f51d348374ea9d969ade455ebd70b743 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 14 Oct 2015 08:27:46 +0100
Subject: [PATCH 210/223] check negative index, 1301217 , re #13951
---
Framework/LiveData/src/ISISHistoDataListener.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Framework/LiveData/src/ISISHistoDataListener.cpp b/Framework/LiveData/src/ISISHistoDataListener.cpp
index d962ecea3ea..b211f601a4e 100644
--- a/Framework/LiveData/src/ISISHistoDataListener.cpp
+++ b/Framework/LiveData/src/ISISHistoDataListener.cpp
@@ -181,6 +181,10 @@ boost::shared_ptr<Workspace> ISISHistoDataListener::extractData() {
getFloatArray("RRPB", floatBuffer, 32);
const double protonCharge = floatBuffer[8];
+ if (m_timeRegime < 0)
+ throw std::runtime_error("The value of the time regime variable is "
+ "negative. This is an Internal inconsistency.");
+
// find out the number of histograms in the output workspace
const size_t numberOfHistograms =
m_specList.empty() ? m_numberOfSpectra[m_timeRegime] : m_specList.size();
--
GitLab
From 90a71d2ccf8e279066a8d9d5aa2f2752f2761aa7 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 14 Oct 2015 08:28:02 +0100
Subject: [PATCH 211/223] check retval from setsockopt, 1076053, re #13951
---
Framework/LiveData/src/LoadDAE/isisds_command.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/Framework/LiveData/src/LoadDAE/isisds_command.cpp b/Framework/LiveData/src/LoadDAE/isisds_command.cpp
index 790c2391b29..201cc1f771a 100644
--- a/Framework/LiveData/src/LoadDAE/isisds_command.cpp
+++ b/Framework/LiveData/src/LoadDAE/isisds_command.cpp
@@ -145,8 +145,14 @@ SOCKET isisds_send_open(const char *host, ISISDSAccessMode access_type,
if (s == INVALID_SOCKET) {
return INVALID_SOCKET;
}
- setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (char *)&setkeepalive,
- sizeof(setkeepalive));
+
+ int zero = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (char *)&setkeepalive,
+ sizeof(setkeepalive));
+ if (0 != zero) {
+ closesocket(s);
+ return INVALID_SOCKET;
+ }
+
if (connect(s, (struct sockaddr *)&address, sizeof(address)) == -1) {
closesocket(s);
return INVALID_SOCKET;
--
GitLab
From abcf5920eb82b2d262315b4ca562f5b55d5e1065 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 14 Oct 2015 08:28:16 +0100
Subject: [PATCH 212/223] get GL errors and log to debug, 1076045, re #13951
---
MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp | 5 +++++
MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.h | 2 ++
MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.cpp | 3 ++-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp b/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp
index 8da241a02ea..afa7126f749 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp
@@ -33,3 +33,8 @@ std::ostream& OpenGLError::log()
{
return g_log.error();
}
+
+std::ostream& OpenGLError::logDebug()
+{
+ return g_log.debug();
+}
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.h b/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.h
index cdeb10d98f2..c5e63188a82 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.h
@@ -16,6 +16,8 @@ public:
static bool check(const std::string& funName);
static bool hasError(const std::string& funName){return check(funName);}
static std::ostream& log();
+ static std::ostream& logDebug();
+
private:
std::string m_msg;
};
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.cpp b/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.cpp
index 1c6a0052da5..37a85ee1cfd 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.cpp
@@ -220,7 +220,8 @@ void ProjectionSurface::draw(MantidGLWidget *widget,bool picking)const
getController()->onPaint( painter );
painter.end();
// Discard any error generated here
- glGetError();
+ GLuint ecode = glGetError();
+ OpenGLError::logDebug() << "Discarding OpenGL error: " << gluErrorString(ecode);
}
}
--
GitLab
From 46f9b1b23219b39df39dd41a970cd93d5eb196a2 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 14 Oct 2015 08:28:40 +0100
Subject: [PATCH 213/223] check retvals from fread/fseek/fsetpos/fgetpos,
1076113-20, re #13951
---
Framework/DataHandling/src/LoadRaw/isisraw2.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Framework/DataHandling/src/LoadRaw/isisraw2.cpp b/Framework/DataHandling/src/LoadRaw/isisraw2.cpp
index 4029ea10496..331b26bb1f8 100644
--- a/Framework/DataHandling/src/LoadRaw/isisraw2.cpp
+++ b/Framework/DataHandling/src/LoadRaw/isisraw2.cpp
@@ -125,8 +125,13 @@ int ISISRAW2::ioRAW(FILE *file, bool from_file, bool read_data) {
/// @param file :: The file pointer
/// @param i :: The amount of data to skip
void ISISRAW2::skipData(FILE *file, int i) {
- if (i < ndes)
- fseek(file, 4 * ddes[i].nwords, SEEK_CUR);
+ if (i < ndes) {
+ int zero = fseek(file, 4 * ddes[i].nwords, SEEK_CUR);
+ if (0 != zero) {
+ g_log.warning() << "Failed to skip data from file, with value: " << i
+ << "\n";
+ }
+ }
}
/// Read data
--
GitLab
From c935e51bfc3243a749b1ba495b4863db774b5543 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 14 Oct 2015 08:28:51 +0100
Subject: [PATCH 214/223] check retvals from fread/fseek/fsetpos/fgetpos,
1076113-20, re #13951
---
.../DataHandling/src/LoadRaw/isisraw.cpp | 95 ++++++++++---------
Framework/DataHandling/src/LoadRaw/isisraw.h | 1 -
2 files changed, 52 insertions(+), 44 deletions(-)
diff --git a/Framework/DataHandling/src/LoadRaw/isisraw.cpp b/Framework/DataHandling/src/LoadRaw/isisraw.cpp
index 62812053467..475c96358d3 100644
--- a/Framework/DataHandling/src/LoadRaw/isisraw.cpp
+++ b/Framework/DataHandling/src/LoadRaw/isisraw.cpp
@@ -484,8 +484,12 @@ int ISISRAW::ioRAW(FILE *file, bool from_file, bool read_data) {
if (from_file) {
ndes = t_nper * (t_nsp1 + 1);
ioRAW(file, &ddes, ndes, from_file);
- for (i = 0; i < ndes; i++)
- fseek(file, 4 * ddes[i].nwords, SEEK_CUR);
+ for (i = 0; i < ndes; i++) {
+ int zero = fseek(file, 4 * ddes[i].nwords, SEEK_CUR);
+ if (0 != zero)
+ std::cerr << "Failed to seek position in file for index: " << i
+ << "\n";
+ }
}
} else if (dhdr.d_comp == 0) {
ndata = t_nper * (t_nsp1 + 1) * (t_ntc1 + 1);
@@ -537,15 +541,38 @@ int ISISRAW::ioRAW(FILE *file, bool from_file, bool read_data) {
dhdr.d_exp_filesize =
uncomp_filesize /
128; // in 512 byte blocks (vms default allocation unit)
- fgetpos(file, &keep_pos);
+ int zero = fgetpos(file, &keep_pos);
+ if (!zero) {
+ std::cerr << "Error when getting file position: " << strerror(errno)
+ << std::endl;
+ return -1;
+ }
+
// update section addresses
- fsetpos(file, &add_pos);
+ zero = fsetpos(file, &add_pos);
+ if (!zero) {
+ std::cerr << "Error when setting file position: " << strerror(errno)
+ << std::endl;
+ return -1;
+ }
+
ioRAW(file, &add, 1, from_file);
// update data header and descriptors etc.
- fsetpos(file, &dhdr_pos);
+ zero = fsetpos(file, &dhdr_pos);
+ if (!zero) {
+ std::cerr << "Error when setting file position to header: "
+ << strerror(errno) << std::endl;
+ return -1;
+ }
+
ioRAW(file, &dhdr, 1, from_file);
ioRAW(file, &ddes, ndes, from_file);
- fsetpos(file, &keep_pos);
+ zero = fsetpos(file, &keep_pos);
+ if (!zero) {
+ std::cerr << "Error when restoring file position: " << strerror(errno)
+ << std::endl;
+ return -1;
+ }
}
return 0;
}
@@ -679,16 +706,18 @@ int ISISRAW::ioRAW(FILE *file, LOG_LINE *s, int len, bool from_file) {
/// stuff
int ISISRAW::ioRAW(FILE *file, char *s, int len, bool from_file) {
- size_t n;
if ((len <= 0) || (s == 0)) {
return 0;
}
+
+ size_t n;
if (from_file) {
n = fread(s, sizeof(char), len, file);
return static_cast<int>(n - len);
} else {
n = fwrite(s, sizeof(char), len, file);
}
+
return 0;
}
@@ -697,11 +726,15 @@ int ISISRAW::ioRAW(FILE *file, int *s, int len, bool from_file) {
if ((len <= 0) || (s == 0)) {
return 0;
}
+
+ size_t n;
if (from_file) {
- fread(s, sizeof(int), len, file);
+ n = fread(s, sizeof(int), len, file);
+ return static_cast<int>(n - len);
} else {
- fwrite(s, sizeof(int), len, file);
+ n = fwrite(s, sizeof(int), len, file);
}
+
return 0;
}
@@ -710,10 +743,13 @@ int ISISRAW::ioRAW(FILE *file, uint32_t *s, int len, bool from_file) {
if ((len <= 0) || (s == 0)) {
return 0;
}
+
+ size_t n;
if (from_file) {
- fread(s, sizeof(uint32_t), len, file);
+ n = fread(s, sizeof(uint32_t), len, file);
+ return static_cast<int>(n - len);
} else {
- fwrite(s, sizeof(uint32_t), len, file);
+ n = fwrite(s, sizeof(uint32_t), len, file);
}
return 0;
}
@@ -724,12 +760,15 @@ int ISISRAW::ioRAW(FILE *file, float *s, int len, bool from_file) {
if ((len <= 0) || (s == 0)) {
return 0;
}
+
+ size_t n;
if (from_file) {
- fread(s, sizeof(float), len, file);
+ n = fread(s, sizeof(float), len, file);
vaxf_to_local(s, &len, &errcode);
+ return static_cast<int>(n - len);
} else {
local_to_vaxf(s, &len, &errcode);
- fwrite(s, sizeof(float), len, file);
+ n = fwrite(s, sizeof(float), len, file);
vaxf_to_local(s, &len, &errcode);
}
return 0;
@@ -910,36 +949,6 @@ int ISISRAW::readFromFile(const char *filename, bool read_data) {
}
}
-/// stuff
-int ISISRAW::writeToFile(const char *filename) {
- unsigned char zero_pad[512];
- memset(zero_pad, 0, sizeof(zero_pad));
- remove(filename);
-#ifdef MS_VISUAL_STUDIO
- FILE *output_file = NULL;
- if (fopen_s(&output_file, filename, "w+bc") != 0) {
- return -1;
- }
-#else //_WIN32
- FILE *output_file = fopen(filename, "w+bc");
-#endif //_WIN32
- if (output_file != NULL) {
- ioRAW(output_file, false, 0);
- fflush(output_file);
- // we need to pad to a multiple of 512 bytes for VMS compatibility
- fseek(output_file, 0, SEEK_END);
- long pos = ftell(output_file);
- if (pos % 512 > 0) {
- int npad = 512 - pos % 512;
- fwrite(zero_pad, 1, npad, output_file);
- }
- fclose(output_file);
- return 0;
- } else {
- return -1;
- }
-}
-
/// stuff
int ISISRAW::printInfo(std::ostream &os) {
int i;
diff --git a/Framework/DataHandling/src/LoadRaw/isisraw.h b/Framework/DataHandling/src/LoadRaw/isisraw.h
index c7c419aac95..84d82a06fe2 100644
--- a/Framework/DataHandling/src/LoadRaw/isisraw.h
+++ b/Framework/DataHandling/src/LoadRaw/isisraw.h
@@ -373,7 +373,6 @@ public:
int ioRAW(FILE *file, DDES_STRUCT **s, int len, bool from_file);
int ioRAW(FILE *file, LOG_LINE **s, int len, bool from_file);
int readFromFile(const char *filename, bool read_data = true);
- int writeToFile(const char *filename);
int printInfo(std::ostream &os);
int getTimeChannels(float *rtcb1, int n);
};
--
GitLab
From 037d40ab8bd3ad30e4f3392b5fb26c8a88848c46 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 14 Oct 2015 08:30:26 +0100
Subject: [PATCH 215/223] send error details to log, 1311473, re #13951
---
Framework/DataHandling/src/CheckMantidVersion.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Framework/DataHandling/src/CheckMantidVersion.cpp b/Framework/DataHandling/src/CheckMantidVersion.cpp
index 2748bf49ba2..379744d6bfc 100644
--- a/Framework/DataHandling/src/CheckMantidVersion.cpp
+++ b/Framework/DataHandling/src/CheckMantidVersion.cpp
@@ -110,10 +110,11 @@ void CheckMantidVersion::exec() {
bool parseOK = r.parse(json, root);
if (!parseOK) {
g_log.error() << "Error trying to parse this JSON string from GitHub: "
- << json << std::endl;
+ << json << std::endl
+ << ". Error details: " << r.getFormattedErrorMessages()
+ << std::endl;
throw std::runtime_error("Error found when parsing version information "
- "retrieved from GitHub as a JSON string." +
- r.getFormattedErrorMessages());
+ "retrieved from GitHub as a JSON string.");
}
std::string gitHubVersionTag = root["tag_name"].asString();
--
GitLab
From 1cba9cb44dceacdda91c6a14761f60688c730c83 Mon Sep 17 00:00:00 2001
From: NickDraper <nick.draper@stfc.ac.uk>
Date: Wed, 14 Oct 2015 08:57:52 +0100
Subject: [PATCH 216/223] I had a guard term the wrong way around
Fixed now
re #13938
---
Framework/Kernel/src/Matrix.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Framework/Kernel/src/Matrix.cpp b/Framework/Kernel/src/Matrix.cpp
index b61a69823ee..014284f04c4 100644
--- a/Framework/Kernel/src/Matrix.cpp
+++ b/Framework/Kernel/src/Matrix.cpp
@@ -158,7 +158,7 @@ Matrix<T>::Matrix(const Matrix<T> &A, const size_t nrow, const size_t ncol)
throw Kernel::Exception::IndexError(ncol, A.ny,
"Matrix::Constructor without col");
setMem(nx, ny);
- if (!V) {
+ if (V) {
size_t iR(0);
for (size_t i = 0; i <= nx; i++) {
if (i != nrow) {
--
GitLab
From 8a89d3d1c54cca6eefcdbc8bcea0ce8ac3663bfb Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 14 Oct 2015 09:52:31 +0100
Subject: [PATCH 217/223] clang-format + softer error handling in
CheckMantidVersion, re #13951
---
.../DataHandling/src/CheckMantidVersion.cpp | 32 ++++++++++++++-----
Framework/ICat/src/GSoap/stdsoap2.cpp | 5 +--
Framework/Kernel/src/ANN/kd_dump.cpp | 8 +++--
.../LiveData/src/LoadDAE/isisds_command.cpp | 2 +-
4 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/Framework/DataHandling/src/CheckMantidVersion.cpp b/Framework/DataHandling/src/CheckMantidVersion.cpp
index 379744d6bfc..01776379510 100644
--- a/Framework/DataHandling/src/CheckMantidVersion.cpp
+++ b/Framework/DataHandling/src/CheckMantidVersion.cpp
@@ -109,17 +109,33 @@ void CheckMantidVersion::exec() {
Json::Value root;
bool parseOK = r.parse(json, root);
if (!parseOK) {
- g_log.error() << "Error trying to parse this JSON string from GitHub: "
- << json << std::endl
- << ". Error details: " << r.getFormattedErrorMessages()
- << std::endl;
- throw std::runtime_error("Error found when parsing version information "
- "retrieved from GitHub as a JSON string.");
+ // just warning. The parser is able to get relevant info even if there are
+ // formatting issues like missing quotes or brackets.
+ g_log.warning() << "Error found when parsing version information "
+ "retrieved from GitHub as a JSON string. "
+ "Error trying to parse this JSON string: " << json
+ << std::endl
+ << ". Parsing error details: "
+ << r.getFormattedErrorMessages() << std::endl;
}
- std::string gitHubVersionTag = root["tag_name"].asString();
- mostRecentVersion = cleanVersionTag(gitHubVersionTag);
+ std::string gitHubVersionTag;
+ try {
+ gitHubVersionTag = root["tag_name"].asString();
+ } catch (std::runtime_error &re) {
+ g_log.error()
+ << "Error while trying to get the field 'tag_name' from "
+ "the version information retrieved from GitHub. This "
+ "algorithm cannot continue and will stop now. Error details: "
+ << re.what() << std::endl;
+
+ mostRecentVersion = "Could not get information from GitHub";
+ setProperty("MostRecentVersion", mostRecentVersion);
+ setProperty("IsNewVersionAvailable", isNewVersionAvailable);
+ return;
+ }
+ mostRecentVersion = cleanVersionTag(gitHubVersionTag);
isNewVersionAvailable =
isVersionMoreRecent(currentVersion, mostRecentVersion);
if (isNewVersionAvailable) {
diff --git a/Framework/ICat/src/GSoap/stdsoap2.cpp b/Framework/ICat/src/GSoap/stdsoap2.cpp
index 642794f1e67..20a01ac2c17 100644
--- a/Framework/ICat/src/GSoap/stdsoap2.cpp
+++ b/Framework/ICat/src/GSoap/stdsoap2.cpp
@@ -16062,12 +16062,13 @@ int SOAP_FMAC2 soap_puthttphdr(struct soap *soap, int status, size_t count) {
if (soap->mime.start) {
const char startStr[] = "\"; start=\"";
strcat(soap->tmpbuf, startStr);
- strncat(soap->tmpbuf, soap->mime.start, sizeof(soap->tmpbuf)-sizeof(startStr));
+ strncat(soap->tmpbuf, soap->mime.start,
+ sizeof(soap->tmpbuf) - sizeof(startStr));
}
strcat(soap->tmpbuf, "\"");
if (r) {
const char startInfoStr[] = "; start-info=\"";
- size_t lenStart = sizeof(soap->tmpbuf)-sizeof(startInfoStr);
+ size_t lenStart = sizeof(soap->tmpbuf) - sizeof(startInfoStr);
strncat(soap->tmpbuf, startInfoStr, lenStart);
size_t lenR = lenStart - strnlen(r, lenStart);
strncat(soap->tmpbuf, r, lenR);
diff --git a/Framework/Kernel/src/ANN/kd_dump.cpp b/Framework/Kernel/src/ANN/kd_dump.cpp
index 47230ad5a08..f01241a4dd6 100644
--- a/Framework/Kernel/src/ANN/kd_dump.cpp
+++ b/Framework/Kernel/src/ANN/kd_dump.cpp
@@ -335,7 +335,9 @@ annReadDump(istream &in, // input stream
in >> the_bnd_box_hi[j];
}
- if (std::numeric_limits<int>::max() <= the_n_pts / sizeof(ANNidx)) {
+ if (0 > the_n_pts ||
+ static_cast<size_t>(std::numeric_limits<int>::max()) <=
+ static_cast<size_t>(the_n_pts / sizeof(ANNidx))) {
annError("Too big number of elements for the point index array. This "
"would cause an overflow when allocating memory",
ANNabort);
@@ -439,7 +441,9 @@ static ANNkd_ptr annReadTree(istream &in, // input stream
in >> n_bnds; // number of bounding sides
// allocate bounds array
- if (std::numeric_limits<int>::max() <= n_bnds / sizeof(ANNorthHalfSpace)) {
+ if (0 < n_bnds ||
+ static_cast<size_t>(std::numeric_limits<int>::max()) <=
+ static_cast<size_t>(n_bnds / sizeof(ANNorthHalfSpace))) {
annError("Too big number of bounding sides, would cause overflow when "
"allocating memory",
ANNabort);
diff --git a/Framework/LiveData/src/LoadDAE/isisds_command.cpp b/Framework/LiveData/src/LoadDAE/isisds_command.cpp
index 201cc1f771a..b54ea2c9781 100644
--- a/Framework/LiveData/src/LoadDAE/isisds_command.cpp
+++ b/Framework/LiveData/src/LoadDAE/isisds_command.cpp
@@ -147,7 +147,7 @@ SOCKET isisds_send_open(const char *host, ISISDSAccessMode access_type,
}
int zero = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (char *)&setkeepalive,
- sizeof(setkeepalive));
+ sizeof(setkeepalive));
if (0 != zero) {
closesocket(s);
return INVALID_SOCKET;
--
GitLab
From ef19e9924ed29664f9550ee826f9e88e0955e2ab Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 14 Oct 2015 11:54:06 +0100
Subject: [PATCH 218/223] fix wrong comparison in a fix for error handling
issues, re #13951
---
Framework/Kernel/src/ANN/kd_dump.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Framework/Kernel/src/ANN/kd_dump.cpp b/Framework/Kernel/src/ANN/kd_dump.cpp
index f01241a4dd6..eb99a37d414 100644
--- a/Framework/Kernel/src/ANN/kd_dump.cpp
+++ b/Framework/Kernel/src/ANN/kd_dump.cpp
@@ -441,7 +441,7 @@ static ANNkd_ptr annReadTree(istream &in, // input stream
in >> n_bnds; // number of bounding sides
// allocate bounds array
- if (0 < n_bnds ||
+ if (0 > n_bnds ||
static_cast<size_t>(std::numeric_limits<int>::max()) <=
static_cast<size_t>(n_bnds / sizeof(ANNorthHalfSpace))) {
annError("Too big number of bounding sides, would cause overflow when "
--
GitLab
From 12a957aff71240ea56541b505ae67e51d8f8486d Mon Sep 17 00:00:00 2001
From: Elliot Oram <Elliot.Oram@stfc.ac.uk>
Date: Wed, 14 Oct 2015 12:32:17 +0100
Subject: [PATCH 219/223] Added diff data to miniplot + ensure removal of plot
guess after fit
Refs #13976
---
MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp b/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
index c4e727187fc..8af4d002b29 100644
--- a/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
+++ b/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
@@ -993,8 +993,14 @@ void ConvFit::updatePlot() {
return;
MatrixWorkspace_sptr ws = boost::dynamic_pointer_cast<MatrixWorkspace>(
outputGroup->getItem(specNo));
- if (ws)
+ if (ws) {
m_uiForm.ppPlot->addSpectrum("Fit", ws, 1, Qt::red);
+ m_uiForm.ppPlot->addSpectrum("Diff", ws, 2, Qt::blue);
+ if(m_uiForm.ckPlotGuess->isChecked()){
+ m_uiForm.ppPlot->removeSpectrum("Guess");
+ m_uiForm.ckPlotGuess->setChecked(false);
+ }
+ }
}
}
--
GitLab
From 7d572dc290289b89ec8901854d86e38ba86d53a0 Mon Sep 17 00:00:00 2001
From: mantid-builder <mantid-buildserver@mantidproject.org>
Date: Tue, 13 Oct 2015 17:45:28 -0400
Subject: [PATCH 220/223] clang-format PR13964 3e4ff5b
---
.../geometry/src/Exports/BoundingBox.cpp | 32 +--
.../mantid/geometry/src/Exports/Component.cpp | 127 +++++-----
.../geometry/src/Exports/DetectorGroup.cpp | 6 +-
.../mantid/geometry/src/Exports/Group.cpp | 72 +++---
.../geometry/src/Exports/ICompAssembly.cpp | 7 +-
.../geometry/src/Exports/IComponent.cpp | 31 ++-
.../mantid/geometry/src/Exports/IDetector.cpp | 31 ++-
.../geometry/src/Exports/IMDDimension.cpp | 40 ++--
.../geometry/src/Exports/IObjComponent.cpp | 6 +-
.../geometry/src/Exports/Instrument.cpp | 76 +++---
.../mantid/geometry/src/Exports/MDFrame.cpp | 4 +-
.../mantid/geometry/src/Exports/Object.cpp | 5 +-
.../geometry/src/Exports/OrientedLattice.cpp | 37 +--
.../mantid/geometry/src/Exports/PeakShape.cpp | 15 +-
.../geometry/src/Exports/PointGroup.cpp | 23 +-
.../src/Exports/PointGroupFactory.cpp | 17 +-
.../src/Exports/RectangularDetector.cpp | 46 ++--
.../geometry/src/Exports/ReferenceFrame.cpp | 21 +-
.../geometry/src/Exports/SpaceGroup.cpp | 31 ++-
.../src/Exports/SpaceGroupFactory.cpp | 51 ++--
.../geometry/src/Exports/SymmetryElement.cpp | 19 +-
.../src/Exports/SymmetryElementFactory.cpp | 2 +-
.../src/Exports/SymmetryOperation.cpp | 20 +-
.../src/Exports/SymmetryOperationFactory.cpp | 10 +-
.../mantid/geometry/src/Exports/UnitCell.cpp | 225 ++++++++++--------
25 files changed, 456 insertions(+), 498 deletions(-)
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/BoundingBox.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/BoundingBox.cpp
index 4e864930e38..52eb111ecf2 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/BoundingBox.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/BoundingBox.cpp
@@ -8,40 +8,34 @@ using namespace boost::python;
void export_BoundingBox() {
class_<BoundingBox>("BoundingBox", "Constructs a zero-sized box")
- .def(init<double, double, double, double, double, double>
- ((arg("self"), arg("xmax"), arg("ymax"), arg("zmax"),
- arg("xmin"), arg("ymin"), arg("zmin")),
- "Constructs a box from the six given points"))
+ .def(init<double, double, double, double, double, double>(
+ (arg("self"), arg("xmax"), arg("ymax"), arg("zmax"), arg("xmin"),
+ arg("ymin"), arg("zmin")),
+ "Constructs a box from the six given points"))
- .def("minPoint", &BoundingBox::minPoint,
- arg("self"),
+ .def("minPoint", &BoundingBox::minPoint, arg("self"),
return_value_policy<copy_const_reference>(),
"Returns a V3D containing the values of the minimum of the box. See "
"mantid.kernel.V3D")
- .def("maxPoint", &BoundingBox::maxPoint,
- arg("self"),
+ .def("maxPoint", &BoundingBox::maxPoint, arg("self"),
return_value_policy<copy_const_reference>(),
"Returns a V3D containing the values of the minimum of the box. See "
"mantid.kernel.V3D")
- .def("centrePoint", &BoundingBox::centrePoint,
- arg("self"),
+ .def("centrePoint", &BoundingBox::centrePoint, arg("self"),
"Returns a V3D containing the coordinates of the centre point. See "
"mantid.kernel.V3D")
- .def("width", &BoundingBox::width,
- arg("self"),
- "Returns a V3D containing the widths "
- "for each dimension. See "
- "mantid.kernel.V3D")
+ .def("width", &BoundingBox::width, arg("self"),
+ "Returns a V3D containing the widths "
+ "for each dimension. See "
+ "mantid.kernel.V3D")
- .def("isNull", &BoundingBox::isNull,
- arg("self"),
+ .def("isNull", &BoundingBox::isNull, arg("self"),
"Returns true if the box has no dimensions that have been set")
- .def("isPointInside", &BoundingBox::isPointInside,
- arg("self"),
+ .def("isPointInside", &BoundingBox::isPointInside, arg("self"),
"Returns true if the given point is inside the object. See "
"mantid.kernel.V3D")
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
index b79d0cfe051..d7f3b0badba 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
@@ -39,70 +39,67 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParamDescription,
void export_Component() {
class_<Component, bases<IComponent>, boost::noncopyable>("Component", no_init)
- .def("getParameterNames", &Component::getParameterNames,
- Component_getParameterNames((arg("self"), arg("recursive")=true))
- )
- .def("hasParameter", &Component::hasParameter,
- Component_hasParameter
- ((arg("self"), arg("name"), arg("recursive")=true)))
- .def("getNumberParameter", &Component::getNumberParameter,
- Component_getNumberParameter
- ((arg("self"), arg("pname"), arg("recursive")=true)))
- .def("getBoolParameter", &Component::getBoolParameter,
- Component_getBoolParameter
- ((arg("self"), arg("pname"), arg("recursive")=true)))
- .def("getPositionParameter", &Component::getPositionParameter,
- Component_getPositionParameter
- ((arg("self"), arg("pname"), arg("recursive")=true)))
- .def("getRotationParameter", &Component::getRotationParameter,
- Component_getRotationParameter
- ((arg("self"), arg("pname"), arg("recursive")=true)))
- .def("getStringParameter", &Component::getStringParameter,
- Component_getStringParameter
- ((arg("self"), arg("pname"), arg("recursive")=true)))
- .def("getIntParameter", &Component::getIntParameter,
- Component_getIntParameter
- ((arg("self"), arg("pname"), arg("recursive")=true)))
- //
- .def("getRotation", &Component::getRotation,
- Component_getRotation(arg("self")))
- .def("getRelativePos", &Component::getRelativePos,
- Component_getRelativePos(arg("self")))
- //
- .def("getParamShortDescription", &Component::getParamShortDescription,
- Component_getParamShortDescription
- ((arg("self"), arg("pname"), arg("recursive")=true)))
- .def("getParamDescription", &Component::getParamDescription,
- Component_getParamDescription
- ((arg("self"), arg("pname"), arg("recursive")=true)))
-
- .def("getShortDescription", &Component::getShortDescription,
- arg("self"),
- "Return the short description of current parameterized component")
- .def("getDescription", &Component::getDescription,
- arg("self"),
- "Return the description of current parameterized component")
- .def("setDescription", &Component::setDescription,
- (arg("self"), arg("descr")),
- "Set component's description, works only if the component is "
- "parameterized component")
+ .def("getParameterNames", &Component::getParameterNames,
+ Component_getParameterNames((arg("self"), arg("recursive") = true)))
+ .def("hasParameter", &Component::hasParameter,
+ Component_hasParameter(
+ (arg("self"), arg("name"), arg("recursive") = true)))
+ .def("getNumberParameter", &Component::getNumberParameter,
+ Component_getNumberParameter(
+ (arg("self"), arg("pname"), arg("recursive") = true)))
+ .def("getBoolParameter", &Component::getBoolParameter,
+ Component_getBoolParameter(
+ (arg("self"), arg("pname"), arg("recursive") = true)))
+ .def("getPositionParameter", &Component::getPositionParameter,
+ Component_getPositionParameter(
+ (arg("self"), arg("pname"), arg("recursive") = true)))
+ .def("getRotationParameter", &Component::getRotationParameter,
+ Component_getRotationParameter(
+ (arg("self"), arg("pname"), arg("recursive") = true)))
+ .def("getStringParameter", &Component::getStringParameter,
+ Component_getStringParameter(
+ (arg("self"), arg("pname"), arg("recursive") = true)))
+ .def("getIntParameter", &Component::getIntParameter,
+ Component_getIntParameter(
+ (arg("self"), arg("pname"), arg("recursive") = true)))
+ //
+ .def("getRotation", &Component::getRotation,
+ Component_getRotation(arg("self")))
+ .def("getRelativePos", &Component::getRelativePos,
+ Component_getRelativePos(arg("self")))
+ //
+ .def("getParamShortDescription", &Component::getParamShortDescription,
+ Component_getParamShortDescription(
+ (arg("self"), arg("pname"), arg("recursive") = true)))
+ .def("getParamDescription", &Component::getParamDescription,
+ Component_getParamDescription(
+ (arg("self"), arg("pname"), arg("recursive") = true)))
- // HACK -- python should return parameters regardless of type. this is
- // untill rows below do not work
- .def("getParameterType", &Component::getParameterType,
- Component_getParameterType
- ((arg("self"), arg("pname"), arg("recursive")=true)))
- //// this does not work for some obvious or not obvious reasons
- //.def("getParameter", &Component::getNumberParameter,
- // Component_getNumberParameter())
- //.def("getParameter", &Component::getBoolParameter,
- // Component_getBoolParameter())
- //.def("getParameter", &Component::getStringParameter,
- // Component_getStringParameter())
- //.def("getParameter", &Component::getPositionParameter,
- // Component_getPositionParameter())
- //.def("getParameter", &Component::getRotationParameter,
- // Component_getRotationParameter())
-
- ;
+ .def("getShortDescription", &Component::getShortDescription, arg("self"),
+ "Return the short description of current parameterized component")
+ .def("getDescription", &Component::getDescription, arg("self"),
+ "Return the description of current parameterized component")
+ .def("setDescription", &Component::setDescription,
+ (arg("self"), arg("descr")),
+ "Set component's description, works only if the component is "
+ "parameterized component")
+
+ // HACK -- python should return parameters regardless of type. this is
+ // untill rows below do not work
+ .def("getParameterType", &Component::getParameterType,
+ Component_getParameterType(
+ (arg("self"), arg("pname"), arg("recursive") = true)))
+ //// this does not work for some obvious or not obvious reasons
+ //.def("getParameter", &Component::getNumberParameter,
+ // Component_getNumberParameter())
+ //.def("getParameter", &Component::getBoolParameter,
+ // Component_getBoolParameter())
+ //.def("getParameter", &Component::getStringParameter,
+ // Component_getStringParameter())
+ //.def("getParameter", &Component::getPositionParameter,
+ // Component_getPositionParameter())
+ //.def("getParameter", &Component::getRotationParameter,
+ // Component_getRotationParameter())
+
+ ;
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorGroup.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorGroup.cpp
index 027f012747e..2a9be545cbb 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorGroup.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorGroup.cpp
@@ -8,10 +8,8 @@ using namespace boost::python;
void export_DetectorGroup() {
class_<DetectorGroup, bases<IDetector>, boost::noncopyable>("DetectorGroup",
no_init)
- .def("getDetectorIDs", &DetectorGroup::getDetectorIDs,
- arg("self"),
+ .def("getDetectorIDs", &DetectorGroup::getDetectorIDs, arg("self"),
"Returns the list of detector IDs within this group")
- .def("getNameSeparator", &DetectorGroup::getNameSeparator,
- arg("self"),
+ .def("getNameSeparator", &DetectorGroup::getNameSeparator, arg("self"),
"Returns separator for list of names of detectors");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Group.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Group.cpp
index a2aae13b228..28565ab5935 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Group.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Group.cpp
@@ -64,45 +64,35 @@ void export_Group() {
.value("Associativity", Group::Associativity);
class_<Group, boost::noncopyable>("Group", no_init)
- .def("__init__",
- make_constructor
- (&constructGroupFromString,
- default_call_policies(),
- (arg("symmetryOperationString"))),
- "Construct a group from the provided initializer string.")
- .def("__init__",
- make_constructor
- (&constructGroupFromVector,
- default_call_policies(),
- (arg("symmetryOperationVector"))),
- "Construct a group from the provided symmetry operation list.")
- .def("__init__",
- make_constructor
- (&constructGroupFromPythonList,
- default_call_policies(),
- (arg("symmetryOperationList"))),
- "Construct a group from a python generated symmetry operation list.")
- .def("getOrder", &Group::order, arg("self"),
- "Returns the order of the group.")
- .def("getCoordinateSystem", &Group::getCoordinateSystem,
- arg("self"),
- "Returns the type of coordinate system to distinguish groups with "
- "hexagonal system definition.")
- .def("getSymmetryOperations", &Group::getSymmetryOperations,
- arg("self"),
- "Returns the symmetry operations contained in the group.")
- .def("getSymmetryOperationStrings", &getSymmetryOperationStrings,
- arg("self"),
- "Returns the x,y,z-strings for the contained symmetry operations.")
- .def("containsOperation", &Group::containsOperation,
- (arg("self"), arg("operation")),
- "Checks whether a SymmetryOperation is included in Group.")
- .def("isGroup", &Group::isGroup,
- arg("self"),
- "Checks whether the contained symmetry "
- "operations fulfill the group axioms.")
- .def("fulfillsAxiom", &Group::fulfillsAxiom,
- (arg("self"), arg("axiom")),
- "Checks if the contained symmetry operations fulfill the specified "
- "group axiom.");
+ .def("__init__",
+ make_constructor(&constructGroupFromString, default_call_policies(),
+ (arg("symmetryOperationString"))),
+ "Construct a group from the provided initializer string.")
+ .def("__init__",
+ make_constructor(&constructGroupFromVector, default_call_policies(),
+ (arg("symmetryOperationVector"))),
+ "Construct a group from the provided symmetry operation list.")
+ .def("__init__", make_constructor(&constructGroupFromPythonList,
+ default_call_policies(),
+ (arg("symmetryOperationList"))),
+ "Construct a group from a python generated symmetry operation list.")
+ .def("getOrder", &Group::order, arg("self"),
+ "Returns the order of the group.")
+ .def("getCoordinateSystem", &Group::getCoordinateSystem, arg("self"),
+ "Returns the type of coordinate system to distinguish groups with "
+ "hexagonal system definition.")
+ .def("getSymmetryOperations", &Group::getSymmetryOperations, arg("self"),
+ "Returns the symmetry operations contained in the group.")
+ .def("getSymmetryOperationStrings", &getSymmetryOperationStrings,
+ arg("self"),
+ "Returns the x,y,z-strings for the contained symmetry operations.")
+ .def("containsOperation", &Group::containsOperation,
+ (arg("self"), arg("operation")),
+ "Checks whether a SymmetryOperation is included in Group.")
+ .def("isGroup", &Group::isGroup, arg("self"),
+ "Checks whether the contained symmetry "
+ "operations fulfill the group axioms.")
+ .def("fulfillsAxiom", &Group::fulfillsAxiom, (arg("self"), arg("axiom")),
+ "Checks if the contained symmetry operations fulfill the specified "
+ "group axiom.");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/ICompAssembly.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/ICompAssembly.cpp
index d82744edacc..32e39ed16f5 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/ICompAssembly.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/ICompAssembly.cpp
@@ -11,10 +11,9 @@ void export_ICompAssembly() {
class_<ICompAssembly, boost::python::bases<IComponent>, boost::noncopyable>(
"ICompAssembly", no_init)
- .def("nelements", &ICompAssembly::nelements,
- arg("self"),
+ .def("nelements", &ICompAssembly::nelements, arg("self"),
"Returns the number of elements in the assembly")
- .def("__getitem__", &ICompAssembly::operator[],
- (arg("self"), arg("index")),
+ .def("__getitem__",
+ &ICompAssembly::operator[], (arg("self"), arg("index")),
"Return the component at the given index");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/IComponent.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/IComponent.cpp
index c59eb740f23..d6052b1728b 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/IComponent.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/IComponent.cpp
@@ -29,21 +29,18 @@ void export_IComponent() {
register_ptr_to_python<boost::shared_ptr<IComponent>>();
class_<IComponent, boost::noncopyable>("IComponent", no_init)
- .def("getPos", &IComponent::getPos,
- arg("self"),
- "Returns the absolute position of the component")
- .def("getDistance", &getDistance,
- (arg("self"), arg("other")),
- "Returns the distance, in metres, "
- "between this and the given component")
- .def("getName", &IComponent::getName, arg("self"),
- "Returns the name of the component")
- .def("getFullName", &IComponent::getFullName, arg("self"),
- "Returns full path name of component")
- .def("type", &IComponent::type, arg("self"),
- "Returns the type of the component represented as a string")
- .def("getRelativeRot", &IComponent::getRelativeRot,
- arg("self"),
- return_value_policy<copy_const_reference>(),
- "Returns the relative rotation as a Quat");
+ .def("getPos", &IComponent::getPos, arg("self"),
+ "Returns the absolute position of the component")
+ .def("getDistance", &getDistance, (arg("self"), arg("other")),
+ "Returns the distance, in metres, "
+ "between this and the given component")
+ .def("getName", &IComponent::getName, arg("self"),
+ "Returns the name of the component")
+ .def("getFullName", &IComponent::getFullName, arg("self"),
+ "Returns full path name of component")
+ .def("type", &IComponent::type, arg("self"),
+ "Returns the type of the component represented as a string")
+ .def("getRelativeRot", &IComponent::getRelativeRot, arg("self"),
+ return_value_policy<copy_const_reference>(),
+ "Returns the relative rotation as a Quat");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/IDetector.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/IDetector.cpp
index adc2b6c2ffb..669fbd06ccd 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/IDetector.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/IDetector.cpp
@@ -11,20 +11,19 @@ void export_IDetector() {
class_<IDetector, bases<IObjComponent>, boost::noncopyable>("IDetector",
no_init)
- .def("getID", &IDetector::getID, arg("self"), "Returns the detector ID")
- .def("isMasked", &IDetector::isMasked, arg("self"),
- "Returns the value of the masked flag. True means ignore this "
- "detector")
- .def("isMonitor", &IDetector::isMonitor, arg("self"),
- "Returns True if the detector is marked as a monitor in the IDF")
- .def("solidAngle", &IDetector::solidAngle,
- (arg("self"), arg("observer")),
- "Return the solid angle in steradians between this "
- "detector and an observer")
- .def("getTwoTheta", &IDetector::getTwoTheta,
- (arg("self"), arg("observer"), arg("axis")),
- "Calculate the angle between this detector, another component and "
- "an axis")
- .def("getPhi", &IDetector::getPhi, arg("self"),
- "Returns the azimuthal angle of this detector");
+ .def("getID", &IDetector::getID, arg("self"), "Returns the detector ID")
+ .def("isMasked", &IDetector::isMasked, arg("self"),
+ "Returns the value of the masked flag. True means ignore this "
+ "detector")
+ .def("isMonitor", &IDetector::isMonitor, arg("self"),
+ "Returns True if the detector is marked as a monitor in the IDF")
+ .def("solidAngle", &IDetector::solidAngle, (arg("self"), arg("observer")),
+ "Return the solid angle in steradians between this "
+ "detector and an observer")
+ .def("getTwoTheta", &IDetector::getTwoTheta,
+ (arg("self"), arg("observer"), arg("axis")),
+ "Calculate the angle between this detector, another component and "
+ "an axis")
+ .def("getPhi", &IDetector::getPhi, arg("self"),
+ "Returns the azimuthal angle of this detector");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp
index 1c3eda82316..77f8f1778ea 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp
@@ -39,24 +39,24 @@ void export_IMDDimension() {
register_ptr_to_python<boost::shared_ptr<IMDDimension>>();
class_<IMDDimension, boost::noncopyable>("IMDDimension", no_init)
- .def("getName", &IMDDimension::getName, arg("self"),
- "Return the name of the dimension as can be displayed "
- "along the axis")
- .def("getMaximum", &IMDDimension::getMaximum, arg("self"),
- "Return the maximum extent of this dimension")
- .def("getMinimum", &IMDDimension::getMinimum, arg("self"),
- "Return the maximum extent of this dimension")
- .def("getNBins", &IMDDimension::getNBins, arg("self"),
- "Return the number of bins dimension have (an integrated has one). "
- "A axis directed along dimension would have getNBins+1 axis points.")
- .def("getX", &IMDDimension::getX, (arg("self"), arg("ind")),
- "Return coordinate of the axis at the given index")
- .def("getDimensionId", &IMDDimension::getDimensionId, arg("self"),
- "Return a short name which identify the dimension among other "
- "dimension."
- "A dimension can be usually find by its ID and various ")
- .def("getUnits", &getUnitsAsStr, arg("self"),
- "Return the units associated with this dimension.")
- .def("getMDFrame", &getMDFrame, arg("self"),
- "Return the multidimensional frame for this dimension.");
+ .def("getName", &IMDDimension::getName, arg("self"),
+ "Return the name of the dimension as can be displayed "
+ "along the axis")
+ .def("getMaximum", &IMDDimension::getMaximum, arg("self"),
+ "Return the maximum extent of this dimension")
+ .def("getMinimum", &IMDDimension::getMinimum, arg("self"),
+ "Return the maximum extent of this dimension")
+ .def("getNBins", &IMDDimension::getNBins, arg("self"),
+ "Return the number of bins dimension have (an integrated has one). "
+ "A axis directed along dimension would have getNBins+1 axis points.")
+ .def("getX", &IMDDimension::getX, (arg("self"), arg("ind")),
+ "Return coordinate of the axis at the given index")
+ .def("getDimensionId", &IMDDimension::getDimensionId, arg("self"),
+ "Return a short name which identify the dimension among other "
+ "dimension."
+ "A dimension can be usually find by its ID and various ")
+ .def("getUnits", &getUnitsAsStr, arg("self"),
+ "Return the units associated with this dimension.")
+ .def("getMDFrame", &getMDFrame, arg("self"),
+ "Return the multidimensional frame for this dimension.");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/IObjComponent.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/IObjComponent.cpp
index cf56507f695..fe184670cb1 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/IObjComponent.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/IObjComponent.cpp
@@ -25,7 +25,7 @@ void export_IObjComponent() {
class_<IObjComponent, boost::python::bases<IComponent>, boost::noncopyable>(
"IObjComponent", no_init)
- .def("shape", &getShape, arg("self"),
- "Get the object that represents the physical shape of this component"
- );
+ .def("shape", &getShape, arg("self"), "Get the object that represents "
+ "the physical shape of this "
+ "component");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp
index 7fe291a9cb4..d082519344c 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp
@@ -15,45 +15,39 @@ void export_Instrument() {
class_<Instrument, bases<CompAssembly>, boost::noncopyable>("Instrument",
no_init)
- .def("getSample", &Instrument::getSample, arg("self"),
- return_value_policy<RemoveConstSharedPtr>(),
- "Return the object that represents the sample")
-
- .def("getSource", &Instrument::getSource, arg("self"),
- return_value_policy<RemoveConstSharedPtr>(),
- "Return the object that represents the source")
-
- .def("getComponentByName",
- (boost::shared_ptr<IComponent>(Instrument::*)(const std::string &)) &
- Instrument::getComponentByName,
- (arg("self"), arg("cname")),
- "Returns the named component")
-
- .def("getDetector",
- (boost::shared_ptr<IDetector>(Instrument::*)(const detid_t &) const) &
- Instrument::getDetector,
- (arg("self"), arg("detector_id")),
- "Returns the detector with the given ID")
-
- .def("getReferenceFrame",
- (boost::shared_ptr<const ReferenceFrame>(Instrument::*)()) &
- Instrument::getReferenceFrame,
- arg("self"),
- return_value_policy<RemoveConstSharedPtr>(),
- "Returns the reference frame attached that defines the instrument "
- "axes")
-
- .def("getValidFromDate", &Instrument::getValidFromDate,
- arg("self"),
- "Return the valid from date of the instrument")
-
- .def("getValidToDate", &Instrument::getValidToDate,
- arg("self"),
- "Return the valid to date of the instrument")
-
- .def("getBaseInstrument", &Instrument::baseInstrument,
- arg("self"),
- return_value_policy<RemoveConstSharedPtr>(),
- "Return reference to the base instrument")
- ;
+ .def("getSample", &Instrument::getSample, arg("self"),
+ return_value_policy<RemoveConstSharedPtr>(),
+ "Return the object that represents the sample")
+
+ .def("getSource", &Instrument::getSource, arg("self"),
+ return_value_policy<RemoveConstSharedPtr>(),
+ "Return the object that represents the source")
+
+ .def("getComponentByName",
+ (boost::shared_ptr<IComponent>(Instrument::*)(const std::string &)) &
+ Instrument::getComponentByName,
+ (arg("self"), arg("cname")), "Returns the named component")
+
+ .def("getDetector", (boost::shared_ptr<IDetector>(
+ Instrument::*)(const detid_t &) const) &
+ Instrument::getDetector,
+ (arg("self"), arg("detector_id")),
+ "Returns the detector with the given ID")
+
+ .def("getReferenceFrame",
+ (boost::shared_ptr<const ReferenceFrame>(Instrument::*)()) &
+ Instrument::getReferenceFrame,
+ arg("self"), return_value_policy<RemoveConstSharedPtr>(),
+ "Returns the reference frame attached that defines the instrument "
+ "axes")
+
+ .def("getValidFromDate", &Instrument::getValidFromDate, arg("self"),
+ "Return the valid from date of the instrument")
+
+ .def("getValidToDate", &Instrument::getValidToDate, arg("self"),
+ "Return the valid to date of the instrument")
+
+ .def("getBaseInstrument", &Instrument::baseInstrument, arg("self"),
+ return_value_policy<RemoveConstSharedPtr>(),
+ "Return reference to the base instrument");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/MDFrame.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/MDFrame.cpp
index cd988294e63..af5dad9763b 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/MDFrame.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/MDFrame.cpp
@@ -13,6 +13,6 @@ void export_MDFrame() {
register_ptr_to_python<boost::shared_ptr<MDFrame>>();
class_<MDFrame, boost::noncopyable>("MDFrame", no_init)
- .def("getUnitLabel", &MDFrame::getUnitLabel, arg("self"))
- .def("name", &MDFrame::name, arg("self"));
+ .def("getUnitLabel", &MDFrame::getUnitLabel, arg("self"))
+ .def("name", &MDFrame::name, arg("self"));
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Object.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Object.cpp
index c4d7783edd5..33acda45f4d 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Object.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Object.cpp
@@ -13,10 +13,9 @@ void export_Object() {
class_<Object, boost::noncopyable>("Object", no_init)
.def("getBoundingBox",
(const BoundingBox &(Object::*)() const) & Object::getBoundingBox,
- arg("self"),
- return_value_policy<copy_const_reference>(),
+ arg("self"), return_value_policy<copy_const_reference>(),
"Return the axis-aligned bounding box for this shape")
- .def("getShapeXML", &Object::getShapeXML, arg("self"),
+ .def("getShapeXML", &Object::getShapeXML, arg("self"),
"Returns the XML that was used to create this shape.");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp
index 49d1f62e5c7..14a995b5b9a 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp
@@ -49,22 +49,23 @@ void export_OrientedLattice() {
return_readonly_numpy;
class_<OrientedLattice, bases<UnitCell>>("OrientedLattice", init<>())
- .def(init<OrientedLattice const &>((arg("other"))))
- .def(init<double, double, double>((arg("_a"), arg("_b"), arg("_c"))))
- .def(init<double, double, double, double, double, double,
- optional<int>>
- ((arg("_a"), arg("_b"), arg("_c"), arg("_alpha"), arg("_beta"),
- arg("_gamma"), arg("Unit") = (int)(angDegrees))))
- .def(init<UnitCell>(arg("uc")))
- .def("getuVector", (&OrientedLattice::getuVector), arg("self"))
- .def("getvVector", (&OrientedLattice::getvVector), arg("self"))
- .def("getU", &OrientedLattice::getU, arg("self"), return_readonly_numpy())
- .def("setU", &setU, (arg("self"), arg("newU")))
- .def("getUB", &OrientedLattice::getUB, arg("self"), return_readonly_numpy())
- .def("setUB", &setUB, (arg("self"), arg("newUB")))
- .def("setUFromVectors", &setUFromVectors, (arg("self"), arg("u"), arg("v")))
- .def("qFromHKL", &qFromHKL, (arg("self"), arg("vec")),
- "Q vector from HKL vector")
- .def("hklFromQ", &hklFromQ, (arg("self"), arg("vec")),
- "HKL value from Q vector");
+ .def(init<OrientedLattice const &>((arg("other"))))
+ .def(init<double, double, double>((arg("_a"), arg("_b"), arg("_c"))))
+ .def(init<double, double, double, double, double, double, optional<int>>(
+ (arg("_a"), arg("_b"), arg("_c"), arg("_alpha"), arg("_beta"),
+ arg("_gamma"), arg("Unit") = (int)(angDegrees))))
+ .def(init<UnitCell>(arg("uc")))
+ .def("getuVector", (&OrientedLattice::getuVector), arg("self"))
+ .def("getvVector", (&OrientedLattice::getvVector), arg("self"))
+ .def("getU", &OrientedLattice::getU, arg("self"), return_readonly_numpy())
+ .def("setU", &setU, (arg("self"), arg("newU")))
+ .def("getUB", &OrientedLattice::getUB, arg("self"),
+ return_readonly_numpy())
+ .def("setUB", &setUB, (arg("self"), arg("newUB")))
+ .def("setUFromVectors", &setUFromVectors,
+ (arg("self"), arg("u"), arg("v")))
+ .def("qFromHKL", &qFromHKL, (arg("self"), arg("vec")),
+ "Q vector from HKL vector")
+ .def("hklFromQ", &hklFromQ, (arg("self"), arg("vec")),
+ "HKL value from Q vector");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/PeakShape.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/PeakShape.cpp
index 89f6f20b34d..7c8fbf8f636 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/PeakShape.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/PeakShape.cpp
@@ -9,11 +9,12 @@ void export_PeakShape() {
register_ptr_to_python<Mantid::Geometry::PeakShape_sptr>();
class_<PeakShape, boost::noncopyable>("PeakShape", no_init)
- .def("toJSON", &PeakShape::toJSON, arg("self"), "Serialize object to JSON")
- .def("shapeName", &PeakShape::shapeName, arg("self"),
- "Shape name for type of shape")
- .def("algorithmVersion", &PeakShape::algorithmVersion, arg("self"),
- "Number of source integration algorithm version")
- .def("algorithmName", &PeakShape::algorithmName, arg("self"),
- "Name of source integration algorithm");
+ .def("toJSON", &PeakShape::toJSON, arg("self"),
+ "Serialize object to JSON")
+ .def("shapeName", &PeakShape::shapeName, arg("self"),
+ "Shape name for type of shape")
+ .def("algorithmVersion", &PeakShape::algorithmVersion, arg("self"),
+ "Number of source integration algorithm version")
+ .def("algorithmName", &PeakShape::algorithmName, arg("self"),
+ "Name of source integration algorithm");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroup.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroup.cpp
index 010d14c4deb..612397d3524 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroup.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroup.cpp
@@ -55,15 +55,16 @@ void export_PointGroup() {
.value("Cubic", PointGroup::Cubic);
class_<PointGroup, boost::noncopyable, bases<Group>>("PointGroup", no_init)
- .def("getName", &PointGroup::getName, arg("self"))
- .def("getHMSymbol", &PointGroup::getSymbol, arg("self"))
- .def("getCrystalSystem", &PointGroup::crystalSystem, arg("self"))
- .def("isEquivalent", &isEquivalent,
- (arg("self"), arg("hkl1"), arg("hkl2")),
- "Check whether the two HKLs are symmetrically equivalent.")
- .def("getEquivalents", &getEquivalents, (arg("self"), arg("hkl")),
- "Returns an array with all symmetry equivalents of the supplied HKL.")
- .def("getReflectionFamily", &getReflectionFamily,
- (arg("self"), arg("hkl")),
- "Returns the same HKL for all symmetry equivalents.");
+ .def("getName", &PointGroup::getName, arg("self"))
+ .def("getHMSymbol", &PointGroup::getSymbol, arg("self"))
+ .def("getCrystalSystem", &PointGroup::crystalSystem, arg("self"))
+ .def("isEquivalent", &isEquivalent,
+ (arg("self"), arg("hkl1"), arg("hkl2")),
+ "Check whether the two HKLs are symmetrically equivalent.")
+ .def("getEquivalents", &getEquivalents, (arg("self"), arg("hkl")),
+ "Returns an array with all symmetry equivalents of the supplied "
+ "HKL.")
+ .def("getReflectionFamily", &getReflectionFamily,
+ (arg("self"), arg("hkl")),
+ "Returns the same HKL for all symmetry equivalents.");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroupFactory.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroupFactory.cpp
index b01885743b5..07ef88cf35d 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroupFactory.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroupFactory.cpp
@@ -25,26 +25,23 @@ void export_PointGroupFactory() {
class_<PointGroupFactoryImpl, boost::noncopyable>("PointGroupFactoryImpl",
no_init)
.def("isSubscribed", &PointGroupFactoryImpl::isSubscribed,
- (arg("self"), arg("hmSymbol")),
+ (arg("self"), arg("hmSymbol")),
"Returns true of the point group with the given symbol is "
"subscribed.")
.def("createPointGroup", &PointGroupFactoryImpl::createPointGroup,
- (arg("self"), arg("hmSymbol")),
+ (arg("self"), arg("hmSymbol")),
"Creates a point group if registered.")
- .def("createPointGroupFromSpaceGroup",
- &getPointGroupFromSpaceGroup,
- (arg("self"), arg("group")),
+ .def("createPointGroupFromSpaceGroup", &getPointGroupFromSpaceGroup,
+ (arg("self"), arg("group")),
"Creates the point group that corresponds to the given space group.")
.def("createPointGroupFromSpaceGroupSymbol",
- &getPointGroupFromSpaceGroupSymbol,
- (arg("self"), arg("group")),
+ &getPointGroupFromSpaceGroupSymbol, (arg("self"), arg("group")),
"Creates a point group directly from the space group symbol.")
.def("getAllPointGroupSymbols",
- &PointGroupFactoryImpl::getAllPointGroupSymbols,
- arg("self"),
+ &PointGroupFactoryImpl::getAllPointGroupSymbols, arg("self"),
"Returns all registered point group symbols.")
.def("getPointGroupSymbols", &PointGroupFactoryImpl::getPointGroupSymbols,
- (arg("self"), arg("crystalsystem")),
+ (arg("self"), arg("crystalsystem")),
"Returns all point groups registered for the given crystal system.")
.def("Instance", &PointGroupFactory::Instance,
return_value_policy<reference_existing_object>(),
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/RectangularDetector.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/RectangularDetector.cpp
index cc6420e29dc..8738dd36438 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/RectangularDetector.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/RectangularDetector.cpp
@@ -16,47 +16,33 @@ void export_RectangularDetector() {
class_<RectangularDetector, bases<CompAssembly, IObjComponent>,
boost::noncopyable>("RectangularDetector", no_init)
- .def("xpixels", &RectangularDetector::xpixels,
- arg("self"),
+ .def("xpixels", &RectangularDetector::xpixels, arg("self"),
"Returns the number of pixels in the X direction")
- .def("ypixels", &RectangularDetector::ypixels,
- arg("self"),
+ .def("ypixels", &RectangularDetector::ypixels, arg("self"),
"Returns the number of pixels in the Y direction")
- .def("xstep", &RectangularDetector::xstep,
- arg("self"),
+ .def("xstep", &RectangularDetector::xstep, arg("self"),
"Returns the step size in the X direction")
- .def("ystep", &RectangularDetector::ystep,
- arg("self"),
+ .def("ystep", &RectangularDetector::ystep, arg("self"),
"Returns the step size in the Y direction")
- .def("xsize", &RectangularDetector::xsize,
- arg("self"),
+ .def("xsize", &RectangularDetector::xsize, arg("self"),
"Returns the size in the X direction")
- .def("ysize", &RectangularDetector::ysize,
- arg("self"),
+ .def("ysize", &RectangularDetector::ysize, arg("self"),
"Returns the size in the Y direction")
- .def("xstart", &RectangularDetector::xstart,
- arg("self"),
+ .def("xstart", &RectangularDetector::xstart, arg("self"),
"Returns the start position in the X direction")
- .def("ystart", &RectangularDetector::ystart,
- arg("self"),
+ .def("ystart", &RectangularDetector::ystart, arg("self"),
"Returns the start position in the Y direction")
- .def("idstart", &RectangularDetector::idstart,
- arg("self"),
- "Returns the idstart")
+ .def("idstart", &RectangularDetector::idstart, arg("self"),
+ "Returns the idstart")
.def("idfillbyfirst_y", &RectangularDetector::idfillbyfirst_y,
- arg("self"),
- "Returns the idfillbyfirst_y")
- .def("idstepbyrow", &RectangularDetector::idstepbyrow,
- arg("self"),
+ arg("self"), "Returns the idfillbyfirst_y")
+ .def("idstepbyrow", &RectangularDetector::idstepbyrow, arg("self"),
"Returns the idstepbyrow")
- .def("idstep", &RectangularDetector::idstep,
- arg("self"),
- "Returns the idstep")
- .def("minDetectorID", &RectangularDetector::minDetectorID,
- arg("self"),
+ .def("idstep", &RectangularDetector::idstep, arg("self"),
+ "Returns the idstep")
+ .def("minDetectorID", &RectangularDetector::minDetectorID, arg("self"),
"Returns the minimum detector id")
- .def("maxDetectorID", &RectangularDetector::maxDetectorID,
- arg("self"),
+ .def("maxDetectorID", &RectangularDetector::maxDetectorID, arg("self"),
"Returns the maximum detector id");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/ReferenceFrame.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/ReferenceFrame.cpp
index b0b69c85dba..c8a79ddbbc7 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/ReferenceFrame.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/ReferenceFrame.cpp
@@ -21,15 +21,14 @@ void export_ReferenceFrame() {
.export_values();
class_<ReferenceFrame, boost::noncopyable>("ReferenceFrame", no_init)
- .def("pointingAlongBeam", &ReferenceFrame::pointingAlongBeam, arg("self"))
- .def("pointingUp", &ReferenceFrame::pointingUp, arg("self"))
- .def("vecPointingUp", &ReferenceFrame::vecPointingUp, arg("self"))
- .def("vecPointingAlongBeam", &ReferenceFrame::vecPointingAlongBeam,
- arg("self"))
- .def("pointingAlongBeamAxis", &ReferenceFrame::pointingAlongBeamAxis,
- arg("self"))
- .def("pointingUpAxis", &ReferenceFrame::pointingUpAxis, arg("self"))
- .def("pointingHorizontalAxis", &ReferenceFrame::pointingHorizontalAxis,
- arg("self"))
- ;
+ .def("pointingAlongBeam", &ReferenceFrame::pointingAlongBeam, arg("self"))
+ .def("pointingUp", &ReferenceFrame::pointingUp, arg("self"))
+ .def("vecPointingUp", &ReferenceFrame::vecPointingUp, arg("self"))
+ .def("vecPointingAlongBeam", &ReferenceFrame::vecPointingAlongBeam,
+ arg("self"))
+ .def("pointingAlongBeamAxis", &ReferenceFrame::pointingAlongBeamAxis,
+ arg("self"))
+ .def("pointingUpAxis", &ReferenceFrame::pointingUpAxis, arg("self"))
+ .def("pointingHorizontalAxis", &ReferenceFrame::pointingHorizontalAxis,
+ arg("self"));
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp
index a8d9a851224..919d784341e 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp
@@ -53,20 +53,19 @@ void export_SpaceGroup() {
register_ptr_to_python<boost::shared_ptr<SpaceGroup>>();
class_<SpaceGroup, boost::noncopyable, bases<Group>>("SpaceGroup", no_init)
- .def("getNumber", &SpaceGroup::number, arg("self"))
- .def("getHMSymbol", &SpaceGroup::hmSymbol, arg("self"))
- .def("getEquivalentPositions", &getEquivalentPositions,
- (arg("self"), arg("point")),
- "Returns an array with all symmetry equivalents of the supplied "
- "HKL.")
- .def("isAllowedReflection", &isAllowedReflection,
- (arg("self"), arg("hkl")),
- "Returns True if the supplied reflection is allowed with respect to "
- "space group symmetry operations.")
- .def("getPointGroup", &SpaceGroup::getPointGroup, arg("self"),
- "Returns the point group of the space group.")
- .def("getSiteSymmetryGroup", &getSiteSymmetryGroup,
- (arg("self"), arg("position")),
- "Returns the site symmetry group for supplied point coordinates.")
- ;
+ .def("getNumber", &SpaceGroup::number, arg("self"))
+ .def("getHMSymbol", &SpaceGroup::hmSymbol, arg("self"))
+ .def("getEquivalentPositions", &getEquivalentPositions,
+ (arg("self"), arg("point")),
+ "Returns an array with all symmetry equivalents of the supplied "
+ "HKL.")
+ .def("isAllowedReflection", &isAllowedReflection,
+ (arg("self"), arg("hkl")),
+ "Returns True if the supplied reflection is allowed with respect to "
+ "space group symmetry operations.")
+ .def("getPointGroup", &SpaceGroup::getPointGroup, arg("self"),
+ "Returns the point group of the space group.")
+ .def("getSiteSymmetryGroup", &getSiteSymmetryGroup,
+ (arg("self"), arg("position")),
+ "Returns the site symmetry group for supplied point coordinates.");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp
index 5f0384c252f..2b0a5b54e83 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp
@@ -44,32 +44,27 @@ void export_SpaceGroupFactory() {
class_<SpaceGroupFactoryImpl, boost::noncopyable>("SpaceGroupFactoryImpl",
no_init)
- .def("isSubscribedSymbol", &isSubscribedSymbol,
- (arg("self"), arg("symbol")),
- "Returns true if the space group the supplied symbol is subscribed.")
- .def("isSubscribedNumber", &isSubscribedNumber,
- (arg("self"), arg("number")),
- "Returns true if a space group with the given number is subscribed.")
- .def("createSpaceGroup", &createSpaceGroup,
- (arg("self"), arg("symbol")),
- "Creates a space group.")
- .def("getAllSpaceGroupSymbols", &allSpaceGroupSymbols,
- arg("self"),
- "Returns all subscribed space group symbols.")
- .def("getAllSpaceGroupNumbers",
- &SpaceGroupFactoryImpl::subscribedSpaceGroupNumbers,
- arg("self"),
- "Returns all subscribed space group numbers.")
- .def("subscribedSpaceGroupSymbols", &spaceGroupSymbolsForNumber,
- (arg("self"), arg("number")),
- "Returns all space group symbols that are registered under the "
- "given number.")
- .def("getSpaceGroupsForPointGroup",
- &spaceGroupSymbolsForPointGroup,
- (arg("self"), arg("pointGroup"))
- )
- .def("Instance", &SpaceGroupFactory::Instance,
- return_value_policy<reference_existing_object>(),
- "Returns a reference to the SpaceGroupFactory singleton")
- .staticmethod("Instance");
+ .def("isSubscribedSymbol", &isSubscribedSymbol,
+ (arg("self"), arg("symbol")),
+ "Returns true if the space group the supplied symbol is subscribed.")
+ .def("isSubscribedNumber", &isSubscribedNumber,
+ (arg("self"), arg("number")),
+ "Returns true if a space group with the given number is subscribed.")
+ .def("createSpaceGroup", &createSpaceGroup, (arg("self"), arg("symbol")),
+ "Creates a space group.")
+ .def("getAllSpaceGroupSymbols", &allSpaceGroupSymbols, arg("self"),
+ "Returns all subscribed space group symbols.")
+ .def("getAllSpaceGroupNumbers",
+ &SpaceGroupFactoryImpl::subscribedSpaceGroupNumbers, arg("self"),
+ "Returns all subscribed space group numbers.")
+ .def("subscribedSpaceGroupSymbols", &spaceGroupSymbolsForNumber,
+ (arg("self"), arg("number")),
+ "Returns all space group symbols that are registered under the "
+ "given number.")
+ .def("getSpaceGroupsForPointGroup", &spaceGroupSymbolsForPointGroup,
+ (arg("self"), arg("pointGroup")))
+ .def("Instance", &SpaceGroupFactory::Instance,
+ return_value_policy<reference_existing_object>(),
+ "Returns a reference to the SpaceGroupFactory singleton")
+ .staticmethod("Instance");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElement.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElement.cpp
index b95d57c4099..f520a92edac 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElement.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElement.cpp
@@ -42,15 +42,12 @@ void export_SymmetryElement() {
.value("None", SymmetryElementRotation::None);
class_<SymmetryElement, boost::noncopyable>("SymmetryElement", no_init)
- .def("getHMSymbol", &SymmetryElement::hmSymbol,
- arg("self"),
- "Returns the Hermann-Mauguin symbol for the element.")
- .def("getAxis", &getAxis,
- arg("self"),
- "Returns the symmetry axis or [0,0,0] for "
- "identiy, inversion and translations.")
- .def("getRotationSense", &getRotationSense,
- arg("self"),
- "Returns the rotation sense of a rotation axis or None"
- "if the element is not a rotation.");
+ .def("getHMSymbol", &SymmetryElement::hmSymbol, arg("self"),
+ "Returns the Hermann-Mauguin symbol for the element.")
+ .def("getAxis", &getAxis, arg("self"),
+ "Returns the symmetry axis or [0,0,0] for "
+ "identiy, inversion and translations.")
+ .def("getRotationSense", &getRotationSense, arg("self"),
+ "Returns the rotation sense of a rotation axis or None"
+ "if the element is not a rotation.");
}
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElementFactory.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElementFactory.cpp
index f3970012864..5804ab01d36 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElementFactory.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElementFactory.cpp
@@ -9,7 +9,7 @@ void export_SymmetryElementFactory() {
class_<SymmetryElementFactoryImpl, boost::noncopyable>(
"SymmetryElementFactoryImpl", no_init)
.def("createSymElement", &SymmetryElementFactoryImpl::createSymElement,
- (arg("self"), arg("operation")),
+ (arg("self"), arg("operation")),
"Creates the symmetry element that corresponds to the supplied "
"symmetry operation.")
.def("Instance", &SymmetryElementFactory::Instance,
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperation.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperation.cpp
index f7fc5202f8d..d20617ea957 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperation.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperation.cpp
@@ -34,25 +34,21 @@ void export_SymmetryOperation() {
register_ptr_to_python<boost::shared_ptr<SymmetryOperation>>();
class_<SymmetryOperation>("SymmetryOperation")
- .def("getOrder", &SymmetryOperation::order,
- arg("self"),
+ .def("getOrder", &SymmetryOperation::order, arg("self"),
"Returns the order of the symmetry operation, which indicates how "
"often the operation needs to be applied to a point to arrive at "
"identity.")
- .def("getIdentifier", &SymmetryOperation::identifier,
- arg("self"),
+ .def("getIdentifier", &SymmetryOperation::identifier, arg("self"),
"The identifier of the operation in x,y,z-notation.")
.def("transformCoordinates", &applyToCoordinates,
- (arg("self"), arg("coordinates")),
+ (arg("self"), arg("coordinates")),
"Returns transformed coordinates. For transforming HKLs, use "
"transformHKL.")
- .def("transformHKL", &applyToVector,
- (arg("self"), arg("hkl")),
- "Returns transformed HKLs. For transformation of coordinates use "
- "transformCoordinates.")
- .def("apply", &applyToVector,
- (arg("self"), arg("hkl")),
- "An alias for transformHKL.");
+ .def("transformHKL", &applyToVector, (arg("self"), arg("hkl")),
+ "Returns transformed HKLs. For transformation of coordinates use "
+ "transformCoordinates.")
+ .def("apply", &applyToVector, (arg("self"), arg("hkl")),
+ "An alias for transformHKL.");
std_vector_exporter<Mantid::Geometry::SymmetryOperation>::wrap(
"std_vector_symmetryoperation");
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperationFactory.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperationFactory.cpp
index 6ba22c63760..147ff1e8537 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperationFactory.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperationFactory.cpp
@@ -25,18 +25,16 @@ void export_SymmetryOperationFactory() {
class_<SymmetryOperationFactoryImpl, boost::noncopyable>(
"SymmetryOperationFactoryImpl", no_init)
.def("exists", &SymmetryOperationFactoryImpl::isSubscribed,
- (arg("self"), arg("identifier")),
+ (arg("self"), arg("identifier")),
"Returns true if the symmetry operation is supplied.")
.def("createSymOp", &SymmetryOperationFactoryImpl::createSymOp,
- (arg("self"), arg("identifier")),
+ (arg("self"), arg("identifier")),
"Creates the symmetry operation from the supplied x,y,z-identifier.")
- .def("createSymOps", &createSymOps,
- (arg("self"), arg("identifier")),
+ .def("createSymOps", &createSymOps, (arg("self"), arg("identifier")),
"Creates a vector of SymmetryOperation objects from a semi-colon "
"separated list of x,y,z-identifiers.")
.def("subscribedSymbols",
- &SymmetryOperationFactoryImpl::subscribedSymbols,
- arg("self"),
+ &SymmetryOperationFactoryImpl::subscribedSymbols, arg("self"),
"Return all subscribed symbols.")
.def("Instance", &SymmetryOperationFactory::Instance,
return_value_policy<reference_existing_object>(),
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp
index 6e8fa294174..326b247bb1c 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp
@@ -38,108 +38,129 @@ void export_UnitCell() {
return_readonly_numpy;
class_<UnitCell>("UnitCell", init<>())
- .def(init<UnitCell const &>((arg("self"), arg("other"))))
- .def(init<double, double, double>
- ((arg("self"), arg("_a"), arg("_b"), arg("_c"))))
- .def(init<double, double, double, double, double, double, optional<int>>
- ((arg("self"), arg("_a"), arg("_b"), arg("_c"),
- arg("_alpha"), arg("_beta"), arg("_gamma"),
- arg("Unit") = (int)(angDegrees))))
- .def("a", (double (UnitCell::*)() const) & UnitCell::a, arg("self"))
- .def("a1", (double (UnitCell::*)() const) & UnitCell::a1, arg("self"))
- .def("a2", (double (UnitCell::*)() const) & UnitCell::a2, arg("self"))
- .def("a3", (double (UnitCell::*)() const) & UnitCell::a3, arg("self"))
- .def("alpha", (double (UnitCell::*)() const) & UnitCell::alpha, arg("self"))
- .def("alpha1", (double (UnitCell::*)() const) & UnitCell::alpha1, arg("self"))
- .def("alpha2", (double (UnitCell::*)() const) & UnitCell::alpha2, arg("self"))
- .def("alpha3", (double (UnitCell::*)() const) & UnitCell::alpha3, arg("self"))
- .def("alphastar", (double (UnitCell::*)() const) & UnitCell::alphastar, arg("self"))
- .def("astar", (double (UnitCell::*)() const) & UnitCell::astar, arg("self"))
- .def("b", (double (UnitCell::*)() const) & UnitCell::b, arg("self"))
- .def("b1", (double (UnitCell::*)() const) & UnitCell::b1, arg("self"))
- .def("b2", (double (UnitCell::*)() const) & UnitCell::b2, arg("self"))
- .def("b3", (double (UnitCell::*)() const) & UnitCell::b3, arg("self"))
- .def("beta", (double (UnitCell::*)() const) & UnitCell::beta, arg("self"))
- .def("beta1", (double (UnitCell::*)() const) & UnitCell::beta1, arg("self"))
- .def("beta2", (double (UnitCell::*)() const) & UnitCell::beta2, arg("self"))
- .def("beta3", (double (UnitCell::*)() const) & UnitCell::beta3, arg("self"))
- .def("betastar", (double (UnitCell::*)() const) & UnitCell::betastar, arg("self"))
- .def("bstar", (double (UnitCell::*)() const) & UnitCell::bstar, arg("self"))
- .def("c", (double (UnitCell::*)() const) & UnitCell::c, arg("self"))
- .def("cstar", (double (UnitCell::*)() const) & UnitCell::cstar, arg("self"))
- .def("d",
- (double (UnitCell::*)(double, double, double) const) & UnitCell::d,
- (arg("self"), arg("h"), arg("k"), arg("l")))
- .def("d", (double (UnitCell::*)(const V3D &) const) & UnitCell::d,
- (arg("self"), arg("hkl")))
- .def("dstar", (double (UnitCell::*)(double, double, double) const) &
- UnitCell::dstar,
- (arg("self"), arg("h"), arg("k"), arg("l")))
- .def("errora", (double (UnitCell::*)() const) & UnitCell::errora, arg("self"))
- .def("errorb", (double (UnitCell::*)() const) & UnitCell::errorb, arg("self"))
- .def("errorc", (double (UnitCell::*)() const) & UnitCell::errorc, arg("self"))
- .def("erroralpha",
- (double (UnitCell::*)(int const) const) & UnitCell::erroralpha,
- (arg("self"), arg("Unit") = (int)(angDegrees)))
- .def("errorbeta",
- (double (UnitCell::*)(int const) const) & UnitCell::errorbeta,
- (arg("self"), arg("Unit") = (int)(angDegrees)))
- .def("errorgamma",
- (double (UnitCell::*)(int const) const) & UnitCell::errorgamma,
- (arg("self"), arg("Unit") = (int)(angDegrees)))
- .def("gamma", (double (UnitCell::*)() const) & UnitCell::gamma, arg("self"))
- .def("gammastar", (double (UnitCell::*)() const) & UnitCell::gammastar, arg("self"))
- .def("recAngle", (double (UnitCell::*)(double, double, double, double,
- double, double, int const) const) &
- UnitCell::recAngle,
- (arg("self"), arg("h1"), arg("k1"), arg("l1"), arg("h2"), arg("k2"), arg("l2"),
- arg("Unit") = (int)(angDegrees)))
- .def("recVolume", (double (UnitCell::*)() const) & UnitCell::recVolume, arg("self"))
- .def("set", (void (UnitCell::*)(double, double, double, double, double,
- double, int const)) &
- UnitCell::set,
- (arg("self"), arg("_a"), arg("_b"), arg("_c"), arg("_alpha"), arg("_beta"),
- arg("_gamma"), arg("Unit") = (int)(angDegrees)))
- .def("seta", (void (UnitCell::*)(double))(&UnitCell::seta), (arg("self"), arg("_a")))
- .def("setalpha",
- (void (UnitCell::*)(double, int const))(&UnitCell::setalpha),
- (arg("self"), arg("_alpha"), arg("Unit") = (int)(angDegrees)))
- .def("setb", (void (UnitCell::*)(double))(&UnitCell::setb), (arg("self"), arg("_b")))
- .def("setbeta",
- (void (UnitCell::*)(double, int const))(&UnitCell::setbeta),
- (arg("self"), arg("_beta"), arg("Unit") = (int)(angDegrees)))
- .def("setc", (void (UnitCell::*)(double))(&UnitCell::setc), (arg("self"), arg("_c")))
- .def("setgamma",
- (void (UnitCell::*)(double, int const))(&UnitCell::setgamma),
- (arg("self"), arg("_gamma"), arg("Unit") = (int)(angDegrees)))
- .def("setError", (void (UnitCell::*)(double, double, double, double,
- double, double, int const)) &
- UnitCell::setError,
- (arg("self"), arg("_aerr"), arg("_berr"), arg("_cerr"), arg("_alphaerr"),
- arg("_betaerr"), arg("_gammaerr"), arg("Unit") = (int)(angDegrees)))
- .def("setErrora", (void (UnitCell::*)(double))(&UnitCell::setErrora),
- (arg("self"), arg("_aerr")))
- .def("setErroralpha",
- (void (UnitCell::*)(double, int const))(&UnitCell::setErroralpha),
- (arg("self"), arg("_alphaerr"), arg("Unit") = (int)(angDegrees)))
- .def("setErrorb", (void (UnitCell::*)(double))(&UnitCell::setErrorb),
- (arg("self"), arg("_berr")))
- .def("setErrorbeta",
- (void (UnitCell::*)(double, int const))(&UnitCell::setErrorbeta),
- (arg("self"), arg("_betaerr"), arg("Unit") = (int)(angDegrees)))
- .def("setErrorc", (void (UnitCell::*)(double))(&UnitCell::setErrorc),
- (arg("self"), arg("_cerr")))
- .def("setErrorgamma",
- (void (UnitCell::*)(double, int const))(&UnitCell::setErrorgamma),
- (arg("self"), arg("_gammaerr"), arg("Unit") = (int)(angDegrees)))
- .def("volume", (double (UnitCell::*)() const) & UnitCell::volume, arg("self"))
- .def("getG", &UnitCell::getG, arg("self"), return_readonly_numpy())
- .def("getGstar", &UnitCell::getGstar, arg("self"), return_readonly_numpy())
- .def("getB", &UnitCell::getB, arg("self"), return_readonly_numpy())
- .def("recalculateFromGstar", &recalculateFromGstar,
- (arg("self"), arg("NewGstar"))
- )
- ;
+ .def(init<UnitCell const &>((arg("self"), arg("other"))))
+ .def(init<double, double, double>(
+ (arg("self"), arg("_a"), arg("_b"), arg("_c"))))
+ .def(init<double, double, double, double, double, double, optional<int>>(
+ (arg("self"), arg("_a"), arg("_b"), arg("_c"), arg("_alpha"),
+ arg("_beta"), arg("_gamma"), arg("Unit") = (int)(angDegrees))))
+ .def("a", (double (UnitCell::*)() const) & UnitCell::a, arg("self"))
+ .def("a1", (double (UnitCell::*)() const) & UnitCell::a1, arg("self"))
+ .def("a2", (double (UnitCell::*)() const) & UnitCell::a2, arg("self"))
+ .def("a3", (double (UnitCell::*)() const) & UnitCell::a3, arg("self"))
+ .def("alpha", (double (UnitCell::*)() const) & UnitCell::alpha,
+ arg("self"))
+ .def("alpha1", (double (UnitCell::*)() const) & UnitCell::alpha1,
+ arg("self"))
+ .def("alpha2", (double (UnitCell::*)() const) & UnitCell::alpha2,
+ arg("self"))
+ .def("alpha3", (double (UnitCell::*)() const) & UnitCell::alpha3,
+ arg("self"))
+ .def("alphastar", (double (UnitCell::*)() const) & UnitCell::alphastar,
+ arg("self"))
+ .def("astar", (double (UnitCell::*)() const) & UnitCell::astar,
+ arg("self"))
+ .def("b", (double (UnitCell::*)() const) & UnitCell::b, arg("self"))
+ .def("b1", (double (UnitCell::*)() const) & UnitCell::b1, arg("self"))
+ .def("b2", (double (UnitCell::*)() const) & UnitCell::b2, arg("self"))
+ .def("b3", (double (UnitCell::*)() const) & UnitCell::b3, arg("self"))
+ .def("beta", (double (UnitCell::*)() const) & UnitCell::beta, arg("self"))
+ .def("beta1", (double (UnitCell::*)() const) & UnitCell::beta1,
+ arg("self"))
+ .def("beta2", (double (UnitCell::*)() const) & UnitCell::beta2,
+ arg("self"))
+ .def("beta3", (double (UnitCell::*)() const) & UnitCell::beta3,
+ arg("self"))
+ .def("betastar", (double (UnitCell::*)() const) & UnitCell::betastar,
+ arg("self"))
+ .def("bstar", (double (UnitCell::*)() const) & UnitCell::bstar,
+ arg("self"))
+ .def("c", (double (UnitCell::*)() const) & UnitCell::c, arg("self"))
+ .def("cstar", (double (UnitCell::*)() const) & UnitCell::cstar,
+ arg("self"))
+ .def("d",
+ (double (UnitCell::*)(double, double, double) const) & UnitCell::d,
+ (arg("self"), arg("h"), arg("k"), arg("l")))
+ .def("d", (double (UnitCell::*)(const V3D &) const) & UnitCell::d,
+ (arg("self"), arg("hkl")))
+ .def("dstar", (double (UnitCell::*)(double, double, double) const) &
+ UnitCell::dstar,
+ (arg("self"), arg("h"), arg("k"), arg("l")))
+ .def("errora", (double (UnitCell::*)() const) & UnitCell::errora,
+ arg("self"))
+ .def("errorb", (double (UnitCell::*)() const) & UnitCell::errorb,
+ arg("self"))
+ .def("errorc", (double (UnitCell::*)() const) & UnitCell::errorc,
+ arg("self"))
+ .def("erroralpha",
+ (double (UnitCell::*)(int const) const) & UnitCell::erroralpha,
+ (arg("self"), arg("Unit") = (int)(angDegrees)))
+ .def("errorbeta",
+ (double (UnitCell::*)(int const) const) & UnitCell::errorbeta,
+ (arg("self"), arg("Unit") = (int)(angDegrees)))
+ .def("errorgamma",
+ (double (UnitCell::*)(int const) const) & UnitCell::errorgamma,
+ (arg("self"), arg("Unit") = (int)(angDegrees)))
+ .def("gamma", (double (UnitCell::*)() const) & UnitCell::gamma,
+ arg("self"))
+ .def("gammastar", (double (UnitCell::*)() const) & UnitCell::gammastar,
+ arg("self"))
+ .def("recAngle", (double (UnitCell::*)(double, double, double, double,
+ double, double, int const) const) &
+ UnitCell::recAngle,
+ (arg("self"), arg("h1"), arg("k1"), arg("l1"), arg("h2"), arg("k2"),
+ arg("l2"), arg("Unit") = (int)(angDegrees)))
+ .def("recVolume", (double (UnitCell::*)() const) & UnitCell::recVolume,
+ arg("self"))
+ .def("set", (void (UnitCell::*)(double, double, double, double, double,
+ double, int const)) &
+ UnitCell::set,
+ (arg("self"), arg("_a"), arg("_b"), arg("_c"), arg("_alpha"),
+ arg("_beta"), arg("_gamma"), arg("Unit") = (int)(angDegrees)))
+ .def("seta", (void (UnitCell::*)(double))(&UnitCell::seta),
+ (arg("self"), arg("_a")))
+ .def("setalpha",
+ (void (UnitCell::*)(double, int const))(&UnitCell::setalpha),
+ (arg("self"), arg("_alpha"), arg("Unit") = (int)(angDegrees)))
+ .def("setb", (void (UnitCell::*)(double))(&UnitCell::setb),
+ (arg("self"), arg("_b")))
+ .def("setbeta",
+ (void (UnitCell::*)(double, int const))(&UnitCell::setbeta),
+ (arg("self"), arg("_beta"), arg("Unit") = (int)(angDegrees)))
+ .def("setc", (void (UnitCell::*)(double))(&UnitCell::setc),
+ (arg("self"), arg("_c")))
+ .def("setgamma",
+ (void (UnitCell::*)(double, int const))(&UnitCell::setgamma),
+ (arg("self"), arg("_gamma"), arg("Unit") = (int)(angDegrees)))
+ .def("setError", (void (UnitCell::*)(double, double, double, double,
+ double, double, int const)) &
+ UnitCell::setError,
+ (arg("self"), arg("_aerr"), arg("_berr"), arg("_cerr"),
+ arg("_alphaerr"), arg("_betaerr"), arg("_gammaerr"),
+ arg("Unit") = (int)(angDegrees)))
+ .def("setErrora", (void (UnitCell::*)(double))(&UnitCell::setErrora),
+ (arg("self"), arg("_aerr")))
+ .def("setErroralpha",
+ (void (UnitCell::*)(double, int const))(&UnitCell::setErroralpha),
+ (arg("self"), arg("_alphaerr"), arg("Unit") = (int)(angDegrees)))
+ .def("setErrorb", (void (UnitCell::*)(double))(&UnitCell::setErrorb),
+ (arg("self"), arg("_berr")))
+ .def("setErrorbeta",
+ (void (UnitCell::*)(double, int const))(&UnitCell::setErrorbeta),
+ (arg("self"), arg("_betaerr"), arg("Unit") = (int)(angDegrees)))
+ .def("setErrorc", (void (UnitCell::*)(double))(&UnitCell::setErrorc),
+ (arg("self"), arg("_cerr")))
+ .def("setErrorgamma",
+ (void (UnitCell::*)(double, int const))(&UnitCell::setErrorgamma),
+ (arg("self"), arg("_gammaerr"), arg("Unit") = (int)(angDegrees)))
+ .def("volume", (double (UnitCell::*)() const) & UnitCell::volume,
+ arg("self"))
+ .def("getG", &UnitCell::getG, arg("self"), return_readonly_numpy())
+ .def("getGstar", &UnitCell::getGstar, arg("self"),
+ return_readonly_numpy())
+ .def("getB", &UnitCell::getB, arg("self"), return_readonly_numpy())
+ .def("recalculateFromGstar", &recalculateFromGstar,
+ (arg("self"), arg("NewGstar")));
scope().attr("deg2rad") = Mantid::Geometry::deg2rad;
scope().attr("rad2deg") = Mantid::Geometry::rad2deg;
--
GitLab
From 48fc951aa6afe0f6996c60f99040f5aa2743523c Mon Sep 17 00:00:00 2001
From: Wenduo Zhou <zhouw@ornl.gov>
Date: Wed, 14 Oct 2015 15:29:53 -0400
Subject: [PATCH 221/223] Refs #13692. Downsized to 46.
---
.../api/WorkspacePropertyExporter.h | 3 ++-
.../kernel/DataServiceExporter.h | 26 ++++++++++++++-----
.../kernel/TypedValidatorExporter.h | 1 +
.../mantid/api/src/Exports/Algorithm.cpp | 6 ++---
.../mantid/api/src/Exports/Axis.cpp | 15 +++++++----
.../src/Exports/DataProcessorAlgorithm.cpp | 1 +
.../mantid/api/src/Exports/FileFinder.cpp | 3 ++-
.../api/src/Exports/FileLoaderRegistry.cpp | 3 ++-
.../mantid/api/src/Exports/IAlgorithm.cpp | 6 +++--
.../mantid/api/src/Exports/IFunction.cpp | 8 ++++--
.../mantid/api/src/Exports/IFunction1D.cpp | 1 +
.../api/src/Exports/IMDHistoWorkspace.cpp | 3 ++-
.../mantid/api/src/Exports/IMaskWorkspace.cpp | 3 +++
.../mantid/api/src/Exports/IPeak.cpp | 4 ++-
.../api/src/Exports/ISplittersWorkspace.cpp | 1 +
.../mantid/api/src/Exports/Jacobian.cpp | 4 +--
.../api/src/Exports/MatrixWorkspace.cpp | 3 ++-
.../src/Exports/MultipleExperimentInfos.cpp | 2 ++
.../mantid/api/src/Exports/Run.cpp | 7 +++--
.../src/Exports/ScriptRepositoryFactory.cpp | 1 +
.../mantid/api/src/Exports/Workspace.cpp | 8 +++---
.../api/src/Exports/WorkspaceFactory.cpp | 8 +++---
22 files changed, 82 insertions(+), 35 deletions(-)
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/api/WorkspacePropertyExporter.h b/Framework/PythonInterface/inc/MantidPythonInterface/api/WorkspacePropertyExporter.h
index f28cb821523..dc429e1a15f 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/api/WorkspacePropertyExporter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/api/WorkspacePropertyExporter.h
@@ -137,7 +137,7 @@ template <typename WorkspaceType> struct WorkspacePropertyExporter {
.def("__init__",
make_constructor(
&createPropertyWithValidator, default_call_policies(),
- args("name", "defaultValue", "direction", "validator")))
+ (arg("name"), arg("defaultValue"), arg("direction"), arg("validator"))))
.def("__init__",
make_constructor(&createPropertyWithOptionalFlag,
default_call_policies(),
@@ -149,6 +149,7 @@ template <typename WorkspaceType> struct WorkspacePropertyExporter {
args("name", "defaultValue", "direction",
"optional", "locking", "validator")))
.def("isOptional", &TypedWorkspaceProperty::isOptional,
+ arg("self"),
"Returns true if the property has been marked as optional")
.add_property("value", &value);
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/DataServiceExporter.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/DataServiceExporter.h
index 5de200f7777..83663e18f0c 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/DataServiceExporter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/DataServiceExporter.h
@@ -66,30 +66,44 @@ template <typename SvcType, typename SvcPtrType> struct DataServiceExporter {
auto classType =
PythonType(pythonClassName, no_init)
.def("add", &DataServiceExporter::addItem,
+ (arg("self"), arg("name"), arg("item")),
"Adds the given object to the service with the given name. If "
"the name/object exists it will raise an error.")
.def("addOrReplace", &DataServiceExporter::addOrReplaceItem,
+ (arg("self"), arg("name"), arg("item")),
"Adds the given object to the service with the given name. "
"The the name exists the object is replaced.")
.def("doesExist", &SvcType::doesExist,
+ (arg("self"), arg("name")),
"Returns True if the object is found in the service.")
.def("retrieve", &DataServiceExporter::retrieveOrKeyError,
+ (arg("self"), arg("name")),
"Retrieve the named object. Raises an exception if the name "
"does not exist")
- .def("remove", &SvcType::remove, "Remove a named object")
+ .def("remove", &SvcType::remove,
+ (arg("self"), arg("name")),
+ "Remove a named object")
.def("clear", &SvcType::clear,
+ arg("self"),
"Removes all objects managed by the service.")
.def("size", &SvcType::size,
+ arg("self"),
"Returns the number of objects within the service")
.def("getObjectNames", &DataServiceExporter::getObjectNamesAsList,
+ arg("self"),
"Return the list of names currently known to the ADS")
// Make it act like a dictionary
- .def("__len__", &SvcType::size)
- .def("__getitem__", &DataServiceExporter::retrieveOrKeyError)
- .def("__setitem__", &DataServiceExporter::addOrReplaceItem)
- .def("__contains__", &SvcType::doesExist)
- .def("__delitem__", &SvcType::remove);
+ .def("__len__", &SvcType::size,
+ arg("self"))
+ .def("__getitem__", &DataServiceExporter::retrieveOrKeyError,
+ (arg("self"), arg("name")))
+ .def("__setitem__", &DataServiceExporter::addOrReplaceItem,
+ (arg("self"), arg("name"), arg("item")))
+ .def("__contains__", &SvcType::doesExist,
+ arg("self"))
+ .def("__delitem__", &SvcType::remove,
+ (arg("self"), arg("name")));
return classType;
}
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/TypedValidatorExporter.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/TypedValidatorExporter.h
index e876486b65c..95e603d5319 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/TypedValidatorExporter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/TypedValidatorExporter.h
@@ -40,6 +40,7 @@ template <typename Type> struct TypedValidatorExporter {
class_<TypedValidator<Type>, bases<IValidator>, boost::noncopyable>(
pythonClassName, no_init)
.def("isValid", &IValidator::isValid<Type>,
+ (arg("self"), arg("value")),
"Returns an empty string if the value is considered valid, "
"otherwise a string defining the error is returned.");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index 2ebe6a155f3..1c0e9db570d 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -78,8 +78,8 @@ void export_leaf_classes() {
"Initialize the algorithm from a string representation")
.staticmethod("fromString")
.def("createChildAlgorithm", &Algorithm::createChildAlgorithm,
- (arg("name"), arg("startProgress") = -1.0, arg("endProgress") = -1.0,
- arg("enableLogging") = true, arg("version") = -1),
+ (arg("self"), arg("name"), arg("startProgress"), arg("endProgress"),
+ arg("enableLogging"), arg("version")),
"Creates and intializes a named child algorithm. Output workspaces "
"are given a dummy name.")
.def("declareProperty",
@@ -87,7 +87,7 @@ void export_leaf_classes() {
declarePropertyType1_Overload(
(arg("self"), arg("prop"), arg("doc") = "")))
.def("enableHistoryRecordingForChild",
- &Algorithm::enableHistoryRecordingForChild, (args("on")),
+ &Algorithm::enableHistoryRecordingForChild, (arg("self"), arg("on")),
"Turns history recording on or off for an algorithm.")
.def("declareProperty",
(declarePropertyType2)&PythonAlgorithm::declarePyAlgProperty,
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
index 2c1705e25f1..a185fc4b017 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
@@ -90,9 +90,10 @@ void export_Axis() {
arg("self"), return_value_policy<copy_const_reference>(),
"Returns the unit object for the axis")
.def("getValue", &Axis::getValue,
- Axis_getValue(args("index", "vertical_index"),
- "Returns the value at the given point on the Axis. "
- "The vertical axis index [default=0]"))
+ Axis_getValue(
+ (arg("self"), arg("index"), arg("vertical_index")),
+ "Returns the value at the given point on the Axis. "
+ "The vertical axis index [default=0]"))
.def("extractValues", &extractAxisValues, arg("self"),
"Return a numpy array of the axis values")
.def("setUnit", &Axis::setUnit, (arg("self"), arg("unit_name")),
@@ -126,7 +127,9 @@ void export_NumericAxis() {
/// Exported so that Boost.Python can give back a NumericAxis class when an
/// Axis* is returned
class_<NumericAxis, bases<Axis>, boost::noncopyable>("NumericAxis", no_init)
- .def("create", &createNumericAxis, return_internal_reference<>(),
+ .def("create", &createNumericAxis,
+ arg("length"),
+ return_internal_reference<>(),
"Creates a new NumericAxis of a specified length")
.staticmethod("create");
}
@@ -149,7 +152,9 @@ void export_BinEdgeAxis() {
/// Axis* is returned
class_<BinEdgeAxis, bases<NumericAxis>, boost::noncopyable>("BinEdgeAxis",
no_init)
- .def("create", &createBinEdgeAxis, return_internal_reference<>(),
+ .def("create", &createBinEdgeAxis,
+ arg("length"),
+ return_internal_reference<>(),
"Creates a new BinEdgeAxis of a specified length")
.staticmethod("create");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
index 2f9350e4ae7..782feec2f82 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
@@ -70,6 +70,7 @@ void export_DataProcessorAlgorithm() {
.def("getProcessProperties",
&DataProcessorAdapter::getProcessPropertiesProxy,
+ (arg("self"), arg("property_manager")),
"Returns the named property manager from the service or creates "
"a new one if it does not exist")
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp b/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
index f762919cdf1..c80cd1af888 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
@@ -15,11 +15,12 @@ void export_FileFinder() {
class_<FileFinderImpl, boost::noncopyable>("FileFinderImpl", no_init)
.def("getFullPath", &FileFinderImpl::getFullPath,
getFullPathOverloader(
- (arg("path"), arg("ignoreDirs") = false),
+ (arg("self"), arg("path"), arg("ignoreDirs") = false),
"Return a full path to the given file if it can be found within "
"datasearch.directories paths. Directories can be ignored with "
"ignoreDirs=True. An empty string is returned otherwise."))
.def("findRuns", &FileFinderImpl::findRuns,
+ (arg("self"), arg("hintstr")),
"Find a list of files file given a hint. "
"The hint can be a comma separated list of run numbers and can also "
"include ranges of runs, e.g. 123-135 or equivalently 123-35"
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/FileLoaderRegistry.cpp b/Framework/PythonInterface/mantid/api/src/Exports/FileLoaderRegistry.cpp
index 5935cb7aae9..baa9c3e8a18 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/FileLoaderRegistry.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/FileLoaderRegistry.cpp
@@ -10,9 +10,10 @@ void export_FileLoaderRegistry() {
class_<FileLoaderRegistryImpl, boost::noncopyable>("FileLoaderRegistryImpl",
no_init)
.def("canLoad", &FileLoaderRegistryImpl::canLoad,
+ (arg("self"), arg("algorithm_name"), arg("file_name")),
"Perform a check that that the given algorithm can load the file")
.def("Instance", &FileLoaderRegistry::Instance,
return_value_policy<reference_existing_object>(),
"Returns a reference to the FileLoaderRegistry singleton instance")
.staticmethod("Instance");
-}
\ No newline at end of file
+}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
index 2bf8059cae0..2c775d7d4b1 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
@@ -400,10 +400,12 @@ void export_ialgorithm() {
arg("self"),
"Runs the algorithm and returns whether it has been successful")
// 'Private' static methods
- .def("_algorithmInThread", &_algorithmInThread)
+ .def("_algorithmInThread", &_algorithmInThread,
+ arg("thread_id"))
.staticmethod("_algorithmInThread")
// Special methods
- .def("__str__", &IAlgorithm::toString)
+ .def("__str__", &IAlgorithm::toString,
+ arg("self"))
// deprecated methods
.def("getOptionalMessage", &getOptionalMessage,
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index f755085d7fe..9c7f5b920b4 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -93,10 +93,14 @@ void export_IFunction() {
(arg("self"), arg("name")), "Get the value of the named parameter")
.def("setParameter", (setParameterType1)&IFunction::setParameter,
- setParameterType1_Overloads("Sets the value of the ith parameter"))
+ setParameterType1_Overloads(
+ (arg("self"), arg("i"), arg("value"), arg("explicitlySet")),
+ "Sets the value of the ith parameter"))
.def("setParameter", (setParameterType2)&IFunction::setParameter,
- setParameterType2_Overloads("Sets the value of the named parameter"))
+ setParameterType2_Overloads(
+ (arg("self"), arg("name"), arg("value"), arg("explicitlySet")),
+ "Sets the value of the named parameter"))
.def("declareAttribute", &IFunctionAdapter::declareAttribute,
(arg("self"), arg("name"), arg("default_value")),
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IFunction1D.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IFunction1D.cpp
index b610b945ffb..a435fc7b192 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IFunction1D.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IFunction1D.cpp
@@ -18,6 +18,7 @@ void export_IFunction1D() {
.def("function1D",
(object (IFunction1DAdapter::*)(const object &) const) &
IFunction1DAdapter::function1D,
+ (arg("self"), arg("xvals")),
"Calculate the values of the function for the given x values and "
"returns them");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
index 5ed3e256452..f64840efaf7 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
@@ -197,7 +197,8 @@ void export_IMDHistoWorkspace() {
(arg("self"), arg("index"), arg("value")),
"Sets the squared-error at the specified index.")
- .def("setSignalArray", &setSignalArray, arg("self"),
+ .def("setSignalArray", &setSignalArray,
+ (arg("self"), arg("signalValues")),
"Sets the signal from a numpy array. The sizes must match the "
"current workspace sizes. A ValueError is thrown if not")
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp
index 66affb607c0..cacc585f954 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp
@@ -29,11 +29,14 @@ bool isMaskedFromList(const IMaskWorkspace &self,
void export_IMaskWorkspace() {
class_<IMaskWorkspace, boost::noncopyable>("IMaskWorkspace", no_init)
.def("getNumberMasked", &IMaskWorkspace::getNumberMasked,
+ arg("self"),
"Returns the number of masked pixels in the workspace")
.def("isMasked", (bool (IMaskWorkspace::*)(const Mantid::detid_t) const) &
IMaskWorkspace::isMasked,
+ (arg("self"), arg("detector_id")),
"Returns whether the given detector ID is masked")
.def("isMasked", isMaskedFromList,
+ (arg("self"), arg("detector_id_list")),
"Returns whether all of the given detector ID list are masked");
// register pointers
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
index 3dcc380b56d..6f2d447f7e6 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
@@ -125,8 +125,10 @@ void export_IPeak() {
(arg("self"), arg("sigma_intensity")),
"Set the error on the integrated peak intensity")
.def("getBinCount", &IPeak::getBinCount,
+ arg("self"),
"Return the # of counts in the bin at its peak")
- .def("setBinCount", &IPeak::setBinCount, (arg("self"), arg("bin_count")),
+ .def("setBinCount", &IPeak::setBinCount,
+ (arg("self"), arg("bin_count")),
"Set the # of counts in the bin at its peak")
.def("getRow", &IPeak::getRow, arg("self"),
"For RectangularDetectors only, returns "
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ISplittersWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ISplittersWorkspace.cpp
index 55585283456..7471b0b121b 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ISplittersWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ISplittersWorkspace.cpp
@@ -11,6 +11,7 @@ void export_ISplittersWorkspace() {
class_<ISplittersWorkspace, boost::noncopyable>("ISplittersWorkspace",
no_init)
.def("getNumberSplitters", &ISplittersWorkspace::getNumberSplitters,
+ arg("self"),
"Returns the number of splitters within the workspace");
// register pointers
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Jacobian.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Jacobian.cpp
index 732cae6fca5..31bb8859817 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Jacobian.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Jacobian.cpp
@@ -9,11 +9,11 @@ void export_Jacobian() {
register_ptr_to_python<Jacobian *>();
class_<Jacobian, boost::noncopyable>("Jacobian", no_init)
- .def("set", &Jacobian::set, (arg("iy"), arg("ip"), arg("value")),
+ .def("set", &Jacobian::set, (arg("self"), arg("iy"), arg("ip"), arg("value")),
"Set an element of the Jacobian matrix where iy=index of data "
"point, ip=index of parameter.")
- .def("get", &Jacobian::get, (arg("iy"), arg("ip")),
+ .def("get", &Jacobian::get, (arg("self"), arg("iy"), arg("ip")),
"Return the given element of the Jacobian matrix where iy=index of "
"data point, ip=index of parameter.");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
index fe588b2413c..b695c41e3e4 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -172,7 +172,8 @@ void export_MatrixWorkspace() {
(arg("self"), arg("workspaceIndex")), return_internal_reference<>(),
"Return the spectra at the given workspace index.")
.def("getIndexFromSpectrumNumber",
- &MatrixWorkspace::getIndexFromSpectrumNumber, arg("self"),
+ &MatrixWorkspace::getIndexFromSpectrumNumber,
+ (arg("self"), arg("spec_no")),
"Returns workspace index correspondent to the given spectrum "
"number. Throws if no such spectrum is present in the workspace")
.def("getDetector", &MatrixWorkspace::getDetector,
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MultipleExperimentInfos.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MultipleExperimentInfos.cpp
index e1ee9336718..5ebb9d41783 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MultipleExperimentInfos.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MultipleExperimentInfos.cpp
@@ -12,8 +12,10 @@ void export_MultipleExperimentInfos() {
.def("getExperimentInfo",
(ExperimentInfo_sptr (MultipleExperimentInfos::*)(const uint16_t)) &
MultipleExperimentInfos::getExperimentInfo,
+ (arg("self"), arg("run_index")),
"Return the experiment info at the given index.")
.def("getNumExperimentInfo",
&MultipleExperimentInfos::getNumExperimentInfo,
+ arg("self"),
"Return the number of experiment info objects,");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
index e99ea1c92c6..6f57b9aab6b 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
@@ -182,10 +182,13 @@ void export_Run() {
"Returns the value pointed to by the key or the default value given")
.def("keys", &keys, arg("self"),
"Returns the names of the properties as list")
- .def("__contains__", &Run::hasProperty)
+ .def("__contains__", &Run::hasProperty,
+ (arg("self"), arg("name")))
.def("__getitem__", &Run::getProperty,
+ (arg("self"), arg("name")),
return_value_policy<return_by_value>())
- .def("__setitem__", &addOrReplaceProperty)
+ .def("__setitem__", &addOrReplaceProperty,
+ (arg("self"), arg("name"), arg("value")))
;
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepositoryFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepositoryFactory.cpp
index 0f572e8bf63..91eef3e8041 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepositoryFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepositoryFactory.cpp
@@ -19,6 +19,7 @@ void export_ScriptRepositoryFactory() {
class_<ScriptRepositoryFactoryImpl, boost::noncopyable>(
"ScriptRepositoryFactory", no_init)
.def("create", &ScriptRepositoryFactoryImpl::create,
+ (arg("self"), arg("class_name")),
"Return a pointer to the ScriptRepository object")
.def("Instance", &ScriptRepositoryFactory::Instance,
return_value_policy<reference_existing_object>(),
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
index 79ad1d6ba6c..a926f6057b5 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
@@ -34,9 +34,11 @@ void export_Workspace() {
.def("setComment", &Workspace::setComment, (arg("self"), arg("comment")),
"Set the comment field of the workspace")
.def("isDirty", &Workspace::isDirty,
- Workspace_isDirtyOverloads(arg("n"), "True if the workspace has run "
- "more than n algorithms "
- "(Default=1)"))
+ Workspace_isDirtyOverloads(
+ (arg("self"), arg("n")),
+ "True if the workspace has run "
+ "more than n algorithms "
+ "(Default=1)"))
.def("getMemorySize", &Workspace::getMemorySize, arg("self"),
"Returns the memory footprint of the workspace in KB")
.def("getHistory", (const WorkspaceHistory &(Workspace::*)() const) &
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
index b77d3cc8a15..ad9a9207e81 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
@@ -63,21 +63,21 @@ void export_WorkspaceFactory() {
no_init)
.def("create", &createFromParentPtr,
createFromParent_Overload(
- createFromParentDoc, (arg("parent"), arg("NVectors") = -1,
+ createFromParentDoc, (arg("self"), arg("parent"), arg("NVectors") = -1,
arg("XLength") = -1, arg("YLength") = -1)))
.def("create", (createFromScratchPtr)&WorkspaceFactoryImpl::create,
createFromScratchDoc, return_value_policy<AsType<Workspace_sptr>>(),
- (arg("className"), arg("NVectors"), arg("XLength"), arg("YLength")))
+ (arg("self"), arg("className"), arg("NVectors"), arg("XLength"), arg("YLength")))
.def("createTable", &WorkspaceFactoryImpl::createTable,
createTable_Overload("Creates an empty TableWorkspace",
- (arg("className") = "TableWorkspace"))
+ (arg("self"), arg("className") = "TableWorkspace"))
[return_value_policy<AsType<Workspace_sptr>>()])
.def("createPeaks", &WorkspaceFactoryImpl::createPeaks,
createPeaks_Overload("Creates an empty PeaksWorkspace",
- (arg("className") = "PeaksWorkspace"))
+ (arg("self"), arg("className") = "PeaksWorkspace"))
[return_value_policy<AsType<Workspace_sptr>>()])
.def("Instance", &WorkspaceFactory::Instance,
--
GitLab
From 048fd3ddf730fc9fe796b8b9a0e7794c60b4ba2f Mon Sep 17 00:00:00 2001
From: Wenduo Zhou <zhouw@ornl.gov>
Date: Wed, 14 Oct 2015 16:02:06 -0400
Subject: [PATCH 222/223] Refs #13692. Fixed an error for default value.
---
.../PythonInterface/mantid/api/src/Exports/Algorithm.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index 1c0e9db570d..28a2bd3235f 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -78,8 +78,8 @@ void export_leaf_classes() {
"Initialize the algorithm from a string representation")
.staticmethod("fromString")
.def("createChildAlgorithm", &Algorithm::createChildAlgorithm,
- (arg("self"), arg("name"), arg("startProgress"), arg("endProgress"),
- arg("enableLogging"), arg("version")),
+ (arg("self"), arg("name"), arg("startProgress") = -1.0, arg("endProgress") = -1.0,
+ arg("enableLogging") = true, arg("version") = -1),
"Creates and intializes a named child algorithm. Output workspaces "
"are given a dummy name.")
.def("declareProperty",
--
GitLab
From 6c01b253c04736bb3e9b266685a674cdc98a9a53 Mon Sep 17 00:00:00 2001
From: Wenduo Zhou <zhouw@ornl.gov>
Date: Wed, 14 Oct 2015 16:14:00 -0400
Subject: [PATCH 223/223] Refs #13692. Fixed clang-format.
---
.../api/WorkspacePropertyExporter.h | 11 ++--
.../kernel/DataServiceExporter.h | 21 +++-----
.../kernel/TypedValidatorExporter.h | 3 +-
.../mantid/api/src/Exports/Algorithm.cpp | 5 +-
.../api/src/Exports/AlgorithmFactory.cpp | 5 +-
.../api/src/Exports/AlgorithmHistory.cpp | 24 +++------
.../api/src/Exports/AlgorithmManager.cpp | 15 ++----
.../mantid/api/src/Exports/Axis.cpp | 13 ++---
.../mantid/api/src/Exports/BoxController.cpp | 21 +++-----
.../src/Exports/DataProcessorAlgorithm.cpp | 9 ++--
.../mantid/api/src/Exports/FileFinder.cpp | 3 +-
.../api/src/Exports/FrameworkManager.cpp | 15 ++----
.../api/src/Exports/FunctionFactory.cpp | 9 ++--
.../mantid/api/src/Exports/IAlgorithm.cpp | 50 +++++++------------
.../mantid/api/src/Exports/IFunction.cpp | 26 ++++------
.../mantid/api/src/Exports/IMaskWorkspace.cpp | 6 +--
.../mantid/api/src/Exports/IPeak.cpp | 6 +--
.../mantid/api/src/Exports/IPeakFunction.cpp | 3 +-
.../api/src/Exports/ISplittersWorkspace.cpp | 3 +-
.../api/src/Exports/IWorkspaceProperty.cpp | 6 +--
.../mantid/api/src/Exports/Jacobian.cpp | 3 +-
.../src/Exports/MultipleExperimentInfos.cpp | 3 +-
.../mantid/api/src/Exports/Run.cpp | 6 +--
.../mantid/api/src/Exports/Workspace.cpp | 9 ++--
.../api/src/Exports/WorkspaceFactory.cpp | 20 +++++---
25 files changed, 112 insertions(+), 183 deletions(-)
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/api/WorkspacePropertyExporter.h b/Framework/PythonInterface/inc/MantidPythonInterface/api/WorkspacePropertyExporter.h
index dc429e1a15f..aff1c6a9507 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/api/WorkspacePropertyExporter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/api/WorkspacePropertyExporter.h
@@ -134,10 +134,10 @@ template <typename WorkspaceType> struct WorkspacePropertyExporter {
API::PropertyMode::Type, API::LockMode::Type>(
args("name", "defaultValue", "direction", "optional", "locking")))
// These variants require the validator object to be cloned
- .def("__init__",
- make_constructor(
- &createPropertyWithValidator, default_call_policies(),
- (arg("name"), arg("defaultValue"), arg("direction"), arg("validator"))))
+ .def("__init__", make_constructor(&createPropertyWithValidator,
+ default_call_policies(),
+ (arg("name"), arg("defaultValue"),
+ arg("direction"), arg("validator"))))
.def("__init__",
make_constructor(&createPropertyWithOptionalFlag,
default_call_policies(),
@@ -148,8 +148,7 @@ template <typename WorkspaceType> struct WorkspacePropertyExporter {
default_call_policies(),
args("name", "defaultValue", "direction",
"optional", "locking", "validator")))
- .def("isOptional", &TypedWorkspaceProperty::isOptional,
- arg("self"),
+ .def("isOptional", &TypedWorkspaceProperty::isOptional, arg("self"),
"Returns true if the property has been marked as optional")
.add_property("value", &value);
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/DataServiceExporter.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/DataServiceExporter.h
index 83663e18f0c..90679c67007 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/DataServiceExporter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/DataServiceExporter.h
@@ -73,37 +73,30 @@ template <typename SvcType, typename SvcPtrType> struct DataServiceExporter {
(arg("self"), arg("name"), arg("item")),
"Adds the given object to the service with the given name. "
"The the name exists the object is replaced.")
- .def("doesExist", &SvcType::doesExist,
- (arg("self"), arg("name")),
+ .def("doesExist", &SvcType::doesExist, (arg("self"), arg("name")),
"Returns True if the object is found in the service.")
.def("retrieve", &DataServiceExporter::retrieveOrKeyError,
(arg("self"), arg("name")),
"Retrieve the named object. Raises an exception if the name "
"does not exist")
- .def("remove", &SvcType::remove,
- (arg("self"), arg("name")),
+ .def("remove", &SvcType::remove, (arg("self"), arg("name")),
"Remove a named object")
- .def("clear", &SvcType::clear,
- arg("self"),
+ .def("clear", &SvcType::clear, arg("self"),
"Removes all objects managed by the service.")
- .def("size", &SvcType::size,
- arg("self"),
+ .def("size", &SvcType::size, arg("self"),
"Returns the number of objects within the service")
.def("getObjectNames", &DataServiceExporter::getObjectNamesAsList,
arg("self"),
"Return the list of names currently known to the ADS")
// Make it act like a dictionary
- .def("__len__", &SvcType::size,
- arg("self"))
+ .def("__len__", &SvcType::size, arg("self"))
.def("__getitem__", &DataServiceExporter::retrieveOrKeyError,
(arg("self"), arg("name")))
.def("__setitem__", &DataServiceExporter::addOrReplaceItem,
(arg("self"), arg("name"), arg("item")))
- .def("__contains__", &SvcType::doesExist,
- arg("self"))
- .def("__delitem__", &SvcType::remove,
- (arg("self"), arg("name")));
+ .def("__contains__", &SvcType::doesExist, arg("self"))
+ .def("__delitem__", &SvcType::remove, (arg("self"), arg("name")));
return classType;
}
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/TypedValidatorExporter.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/TypedValidatorExporter.h
index 95e603d5319..aed38b70fe7 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/TypedValidatorExporter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/TypedValidatorExporter.h
@@ -39,8 +39,7 @@ template <typename Type> struct TypedValidatorExporter {
class_<TypedValidator<Type>, bases<IValidator>, boost::noncopyable>(
pythonClassName, no_init)
- .def("isValid", &IValidator::isValid<Type>,
- (arg("self"), arg("value")),
+ .def("isValid", &IValidator::isValid<Type>, (arg("self"), arg("value")),
"Returns an empty string if the value is considered valid, "
"otherwise a string defining the error is returned.");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index 28a2bd3235f..33ccab704e1 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -78,8 +78,9 @@ void export_leaf_classes() {
"Initialize the algorithm from a string representation")
.staticmethod("fromString")
.def("createChildAlgorithm", &Algorithm::createChildAlgorithm,
- (arg("self"), arg("name"), arg("startProgress") = -1.0, arg("endProgress") = -1.0,
- arg("enableLogging") = true, arg("version") = -1),
+ (arg("self"), arg("name"), arg("startProgress") = -1.0,
+ arg("endProgress") = -1.0, arg("enableLogging") = true,
+ arg("version") = -1),
"Creates and intializes a named child algorithm. Output workspaces "
"are given a dummy name.")
.def("declareProperty",
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
index 4aa463269f8..1e6b97507c9 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
@@ -124,10 +124,9 @@ void export_AlgorithmFactory() {
(arg("self"), arg("algorithm_name")),
"Returns the highest version of the named algorithm. Throws "
"ValueError if no algorithm can be found")
- .def("subscribe", &subscribe,
- (arg("self"), arg("object")),
+ .def("subscribe", &subscribe, (arg("self"), arg("object")),
"Register a Python class derived from "
- "PythonAlgorithm into the factory")
+ "PythonAlgorithm into the factory")
.def("Instance", &AlgorithmFactory::Instance,
return_value_policy<reference_existing_object>(),
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp
index e0778ad2d26..05a5f704543 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp
@@ -58,31 +58,25 @@ void export_AlgorithmHistory() {
register_ptr_to_python<Mantid::API::AlgorithmHistory_sptr>();
class_<AlgorithmHistory>("AlgorithmHistory", no_init)
- .def("name", &AlgorithmHistory::name,
- arg("self"),
+ .def("name", &AlgorithmHistory::name, arg("self"),
return_value_policy<copy_const_reference>(),
"Returns the name of the algorithm.")
- .def("version", &AlgorithmHistory::version,
- arg("self"),
+ .def("version", &AlgorithmHistory::version, arg("self"),
return_value_policy<copy_const_reference>(),
"Returns the version of the algorithm.")
.def("executionDuration", &AlgorithmHistory::executionDuration,
- arg("self"),
- "Returns the execution duration of the algorithm.")
+ arg("self"), "Returns the execution duration of the algorithm.")
- .def("executionDate", &AlgorithmHistory::executionDate,
- arg("self"),
+ .def("executionDate", &AlgorithmHistory::executionDate, arg("self"),
"Returns the execution date of the algorithm.")
- .def("execCount", &AlgorithmHistory::execCount,
- arg("self"),
+ .def("execCount", &AlgorithmHistory::execCount, arg("self"),
return_value_policy<copy_const_reference>(),
"Returns the execution number of the algorithm.")
- .def("childHistorySize", &AlgorithmHistory::childHistorySize,
- arg("self"),
+ .def("childHistorySize", &AlgorithmHistory::childHistorySize, arg("self"),
"Returns the number of the child algorithms.")
.def("getChildAlgorithmHistory",
@@ -90,14 +84,12 @@ void export_AlgorithmHistory() {
(arg("self"), arg("index")),
"Returns the child algorithm at the given index in the history")
- .def("getChildHistories", &getChildrenAsList,
- arg("self"),
+ .def("getChildHistories", &getChildrenAsList, arg("self"),
"Returns a list of child "
"algorithm histories for "
"this algorithm history.")
- .def("getProperties", &getPropertiesAsList,
- arg("self"),
+ .def("getProperties", &getPropertiesAsList, arg("self"),
"Returns properties for this algorithm history.")
.def("getChildAlgorithm", &AlgorithmHistory::getChildAlgorithm,
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
index d31a131fe26..17e52e83fc0 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
@@ -78,17 +78,14 @@ void export_AlgorithmManager() {
.def("createUnmanaged", &AlgorithmManagerImpl::createUnmanaged,
createUnmanaged_overloads((arg("name"), arg("version")),
"Creates an unmanaged algorithm."))
- .def("size", &AlgorithmManagerImpl::size,
- arg("self"),
+ .def("size", &AlgorithmManagerImpl::size, arg("self"),
"Returns the number of managed algorithms")
.def("setMaxAlgorithms", &AlgorithmManagerImpl::setMaxAlgorithms,
(arg("self"), arg("n")),
"Set the maximum number of allowed managed algorithms")
- .def("getAlgorithm", &getAlgorithm,
- (arg("self"), arg("id_holder")),
+ .def("getAlgorithm", &getAlgorithm, (arg("self"), arg("id_holder")),
"Return the algorithm instance identified by the given id.")
- .def("removeById", &removeById,
- (arg("self"), arg("id_holder")),
+ .def("removeById", &removeById, (arg("self"), arg("id_holder")),
"Remove an algorithm from the managed list")
.def("newestInstanceOf", &AlgorithmManagerImpl::newestInstanceOf,
(arg("self"), arg("algorithm_name")),
@@ -97,11 +94,9 @@ void export_AlgorithmManager() {
(arg("self"), arg("algorithm_name")),
"Returns a list of managed algorithm instances that are "
"currently executing")
- .def("clear", &AlgorithmManagerImpl::clear,
- arg("self"),
+ .def("clear", &AlgorithmManagerImpl::clear, arg("self"),
"Clears the current list of managed algorithms")
- .def("cancelAll", &AlgorithmManagerImpl::cancelAll,
- arg("self"),
+ .def("cancelAll", &AlgorithmManagerImpl::cancelAll, arg("self"),
"Requests that all currently running algorithms be cancelled");
// Instance method
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
index a185fc4b017..6cc64c5f4ee 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
@@ -90,10 +90,9 @@ void export_Axis() {
arg("self"), return_value_policy<copy_const_reference>(),
"Returns the unit object for the axis")
.def("getValue", &Axis::getValue,
- Axis_getValue(
- (arg("self"), arg("index"), arg("vertical_index")),
- "Returns the value at the given point on the Axis. "
- "The vertical axis index [default=0]"))
+ Axis_getValue((arg("self"), arg("index"), arg("vertical_index")),
+ "Returns the value at the given point on the Axis. "
+ "The vertical axis index [default=0]"))
.def("extractValues", &extractAxisValues, arg("self"),
"Return a numpy array of the axis values")
.def("setUnit", &Axis::setUnit, (arg("self"), arg("unit_name")),
@@ -127,8 +126,7 @@ void export_NumericAxis() {
/// Exported so that Boost.Python can give back a NumericAxis class when an
/// Axis* is returned
class_<NumericAxis, bases<Axis>, boost::noncopyable>("NumericAxis", no_init)
- .def("create", &createNumericAxis,
- arg("length"),
+ .def("create", &createNumericAxis, arg("length"),
return_internal_reference<>(),
"Creates a new NumericAxis of a specified length")
.staticmethod("create");
@@ -152,8 +150,7 @@ void export_BinEdgeAxis() {
/// Axis* is returned
class_<BinEdgeAxis, bases<NumericAxis>, boost::noncopyable>("BinEdgeAxis",
no_init)
- .def("create", &createBinEdgeAxis,
- arg("length"),
+ .def("create", &createBinEdgeAxis, arg("length"),
return_internal_reference<>(),
"Creates a new BinEdgeAxis of a specified length")
.staticmethod("create");
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp b/Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp
index 35b0b67d837..af6debd38bd 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp
@@ -11,17 +11,14 @@ void export_BoxController() {
register_ptr_to_python<boost::shared_ptr<BoxController>>();
class_<BoxController, boost::noncopyable>("BoxController", no_init)
- .def("getNDims", &BoxController::getNDims,
- arg("self"),
+ .def("getNDims", &BoxController::getNDims, arg("self"),
"Get # of dimensions")
- .def("getSplitThreshold", &BoxController::getSplitThreshold,
- arg("self"),
+ .def("getSplitThreshold", &BoxController::getSplitThreshold, arg("self"),
"Return the splitting threshold, in # of events")
.def("getSplitInto", &BoxController::getSplitInto,
(arg("self"), arg("dim")),
"Return into how many to split along a dimension")
- .def("getMaxDepth", &BoxController::getMaxDepth,
- arg("self"),
+ .def("getMaxDepth", &BoxController::getMaxDepth, arg("self"),
"Return the max recursion depth allowed for grid box splitting.")
.def("getTotalNumMDBoxes", &BoxController::getTotalNumMDBoxes,
arg("self"),
@@ -29,17 +26,13 @@ void export_BoxController() {
.def("getTotalNumMDGridBoxes", &BoxController::getTotalNumMDGridBoxes,
arg("self"),
"Return the total number of MDGridBox'es, irrespective of depth")
- .def("getAverageDepth", &BoxController::getAverageDepth,
- arg("self"),
+ .def("getAverageDepth", &BoxController::getAverageDepth, arg("self"),
"Return the average recursion depth of gridding.")
- .def("isFileBacked", &BoxController::isFileBacked,
- arg("self"),
+ .def("isFileBacked", &BoxController::isFileBacked, arg("self"),
"Return True if the MDEventWorkspace is backed by a file ")
- .def("getFilename", &BoxController::getFilename,
- arg("self"),
+ .def("getFilename", &BoxController::getFilename, arg("self"),
"Return the full path to the file open as the file-based back or "
"empty string if no file back-end is initiated")
- .def("useWriteBuffer", &BoxController::useWriteBuffer,
- arg("self"),
+ .def("useWriteBuffer", &BoxController::useWriteBuffer, arg("self"),
"Return true if the MRU should be used");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
index 782feec2f82..00c8a380907 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
@@ -47,8 +47,7 @@ void export_DataProcessorAlgorithm() {
"input file when processing in chunks")
.def("loadChunk", &DataProcessorAdapter::loadChunkProxy,
- (arg("self"), arg("row_index")),
- "Load a chunk of data")
+ (arg("self"), arg("row_index")), "Load a chunk of data")
.def("load", (loadOverload1)&DataProcessorAdapter::loadProxy,
(arg("self"), arg("input_data")),
@@ -62,8 +61,7 @@ void export_DataProcessorAlgorithm() {
"AnalysisDataService.")
.def("splitInput", &DataProcessorAdapter::splitInputProxy,
- (arg("self"), arg("input")),
- return_value_policy<VectorToNumpy>())
+ (arg("self"), arg("input")), return_value_policy<VectorToNumpy>())
.def("forwardProperties", &DataProcessorAdapter::forwardPropertiesProxy,
arg("self"))
@@ -92,8 +90,7 @@ void export_DataProcessorAlgorithm() {
"build. For "
"non-MPI build it always returns true")
- .def("getNThreads", &DataProcessorAdapter::getNThreadsProxy,
- arg("self"),
+ .def("getNThreads", &DataProcessorAdapter::getNThreadsProxy, arg("self"),
"Returns the number of running MPI processes in an MPI build or 1 "
"for "
"a non-MPI build");
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp b/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
index c80cd1af888..6ceb418a721 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
@@ -19,8 +19,7 @@ void export_FileFinder() {
"Return a full path to the given file if it can be found within "
"datasearch.directories paths. Directories can be ignored with "
"ignoreDirs=True. An empty string is returned otherwise."))
- .def("findRuns", &FileFinderImpl::findRuns,
- (arg("self"), arg("hintstr")),
+ .def("findRuns", &FileFinderImpl::findRuns, (arg("self"), arg("hintstr")),
"Find a list of files file given a hint. "
"The hint can be a comma separated list of run numbers and can also "
"include ranges of runs, e.g. 123-135 or equivalently 123-35"
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp b/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp
index 1203f15ca02..d6df442a862 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp
@@ -12,8 +12,7 @@ void export_FrameworkManager() {
class_<FrameworkManagerImpl, boost::noncopyable>("FrameworkManagerImpl",
no_init)
.def("setNumOMPThreadsToConfigValue",
- &FrameworkManagerImpl::setNumOMPThreadsToConfigValue,
- arg("self"),
+ &FrameworkManagerImpl::setNumOMPThreadsToConfigValue, arg("self"),
"Sets the number of OpenMP threads to the value specified in the "
"config file")
@@ -25,26 +24,22 @@ void export_FrameworkManager() {
arg("self"),
"Returns the number of OpenMP threads that will be used.")
- .def("clear", &FrameworkManagerImpl::clear,
- arg("self"),
+ .def("clear", &FrameworkManagerImpl::clear, arg("self"),
"Clear all memory held by Mantid")
.def("clearAlgorithms", &FrameworkManagerImpl::clearAlgorithms,
arg("self"),
"Clear memory held by algorithms (does not include workspaces)")
- .def("clearData", &FrameworkManagerImpl::clearData,
- arg("self"),
+ .def("clearData", &FrameworkManagerImpl::clearData, arg("self"),
"Clear memory held by the data service (essentially all workspaces, "
"including hidden)")
.def("clearInstruments", &FrameworkManagerImpl::clearInstruments,
- arg("self"),
- "Clear memory held by the cached instruments")
+ arg("self"), "Clear memory held by the cached instruments")
.def("clearPropertyManagers",
- &FrameworkManagerImpl::clearPropertyManagers,
- arg("self"),
+ &FrameworkManagerImpl::clearPropertyManagers, arg("self"),
"Clear memory held by the PropertyManagerDataService")
.def("Instance", &FrameworkManager::Instance,
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp
index f5c103bca4b..7735fc15dec 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp
@@ -89,18 +89,15 @@ void export_FunctionFactory() {
class_<FunctionFactoryImpl, boost::noncopyable>("FunctionFactoryImpl",
no_init)
- .def("getFunctionNames", &getFunctionNames,
- arg("self"),
+ .def("getFunctionNames", &getFunctionNames, arg("self"),
"Returns a list of the currently available functions")
.def("createFunction", &FunctionFactoryImpl::createFunction,
(arg("self"), arg("type")),
"Return a pointer to the requested function")
- .def("subscribe", &subscribe,
- (arg("self"), arg("object")),
+ .def("subscribe", &subscribe, (arg("self"), arg("object")),
"Register a Python class derived from IFunction into the factory")
.def("unsubscribe", &FunctionFactoryImpl::unsubscribe,
- (arg("self"), arg("class_name")),
- "Remove a type from the factory")
+ (arg("self"), arg("class_name")), "Remove a type from the factory")
.def("Instance", &FunctionFactory::Instance,
return_value_policy<reference_existing_object>(),
"Returns a reference to the FunctionFactory singleton")
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
index 2c775d7d4b1..009ca30fb11 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
@@ -340,27 +340,22 @@ void export_ialgorithm() {
"Return a list of input, in/out and output properties "
"such that the mandatory properties are first followed by the "
"optional ones.")
- .def("outputProperties", &getOutputProperties,
- arg("self"),
+ .def("outputProperties", &getOutputProperties, arg("self"),
"Returns a list of the output properties on the algorithm")
- .def("isInitialized", &IAlgorithm::isInitialized,
- arg("self"),
+ .def("isInitialized", &IAlgorithm::isInitialized, arg("self"),
"Returns True if the algorithm is initialized, False otherwise")
- .def("isExecuted", &IAlgorithm::isExecuted,
- arg("self"),
+ .def("isExecuted", &IAlgorithm::isExecuted, arg("self"),
"Returns True if the algorithm has been executed successfully, "
"False otherwise")
.def("isLogging", &IAlgorithm::isLogging, arg("self"),
"Returns True if the "
"algorithm's logger is turned "
"on, False otherwise")
- .def("isRunning", &IAlgorithm::isRunning,
- arg("self"),
+ .def("isRunning", &IAlgorithm::isRunning, arg("self"),
"Returns True if the algorithm "
"is considered to be running, "
"False otherwise")
- .def("setChild", &IAlgorithm::setChild,
- (arg("self"), arg("is_child")),
+ .def("setChild", &IAlgorithm::setChild, (arg("self"), arg("is_child")),
"If true this algorithm is run as a child algorithm. There will be "
"no logging and nothing is stored in the Analysis Data Service")
.def("enableHistoryRecordingForChild",
@@ -372,46 +367,37 @@ void export_ialgorithm() {
(arg("self"), arg("enabled")),
"If true then allow logging of start and end messages")
.def("getAlgStartupLogging", &IAlgorithm::getAlgStartupLogging,
- arg("self"),
- "Returns true if logging of start and end messages")
+ arg("self"), "Returns true if logging of start and end messages")
.def("setAlwaysStoreInADS", &IAlgorithm::setAlwaysStoreInADS,
(arg("self"), arg("do_store")),
"If true then even child algorithms will have their workspaces "
"stored in the ADS.")
- .def("isChild", &IAlgorithm::isChild,
- arg("self"),
+ .def("isChild", &IAlgorithm::isChild, arg("self"),
"Returns True if the algorithm has been marked to run as a child. "
"If True then Output workspaces "
"are NOT stored in the Analysis Data Service but must be retrieved "
"from the property.")
- .def("setLogging", &IAlgorithm::setLogging,
- (arg("self"), arg("value")),
+ .def("setLogging", &IAlgorithm::setLogging, (arg("self"), arg("value")),
"Toggle logging on/off.")
.def("setRethrows", &IAlgorithm::setRethrows,
- (arg("self"), arg("rethrow")),
- "To query whether an algorithm should rethrow exceptions when executing.")
- .def("initialize", &IAlgorithm::initialize,
- arg("self"),
+ (arg("self"), arg("rethrow")), "To query whether an algorithm "
+ "should rethrow exceptions when "
+ "executing.")
+ .def("initialize", &IAlgorithm::initialize, arg("self"),
"Initializes the algorithm")
- .def("validateInputs", &IAlgorithm::validateInputs,
- arg("self"),
+ .def("validateInputs", &IAlgorithm::validateInputs, arg("self"),
"Cross-check all inputs and return any errors as a dictionary")
- .def("execute", &executeProxy,
- arg("self"),
+ .def("execute", &executeProxy, arg("self"),
"Runs the algorithm and returns whether it has been successful")
// 'Private' static methods
- .def("_algorithmInThread", &_algorithmInThread,
- arg("thread_id"))
+ .def("_algorithmInThread", &_algorithmInThread, arg("thread_id"))
.staticmethod("_algorithmInThread")
// Special methods
- .def("__str__", &IAlgorithm::toString,
- arg("self"))
+ .def("__str__", &IAlgorithm::toString, arg("self"))
// deprecated methods
- .def("getOptionalMessage", &getOptionalMessage,
- arg("self"),
+ .def("getOptionalMessage", &getOptionalMessage, arg("self"),
"Returns the optional user message attached to the algorithm")
- .def("getWikiSummary", &getWikiSummary,
- arg("self"),
+ .def("getWikiSummary", &getWikiSummary, arg("self"),
"Returns the summary found on the wiki page");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index 9c7f5b920b4..d3eaabbe8e0 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -94,13 +94,13 @@ void export_IFunction() {
.def("setParameter", (setParameterType1)&IFunction::setParameter,
setParameterType1_Overloads(
- (arg("self"), arg("i"), arg("value"), arg("explicitlySet")),
- "Sets the value of the ith parameter"))
+ (arg("self"), arg("i"), arg("value"), arg("explicitlySet")),
+ "Sets the value of the ith parameter"))
.def("setParameter", (setParameterType2)&IFunction::setParameter,
setParameterType2_Overloads(
- (arg("self"), arg("name"), arg("value"), arg("explicitlySet")),
- "Sets the value of the named parameter"))
+ (arg("self"), arg("name"), arg("value"), arg("explicitlySet")),
+ "Sets the value of the named parameter"))
.def("declareAttribute", &IFunctionAdapter::declareAttribute,
(arg("self"), arg("name"), arg("default_value")),
@@ -126,27 +126,21 @@ void export_IFunction() {
"Declare a fitting parameter settings its default value to 0.0")
//-- Deprecated functions that have the wrong names --
- .def("categories", &getCategories,
- arg("self"),
+ .def("categories", &getCategories, arg("self"),
"Returns a list of the categories for an algorithm")
- .def("numParams", &IFunction::nParams,
- arg("self"),
+ .def("numParams", &IFunction::nParams, arg("self"),
"Return the number of parameters")
- .def("getParamName", &IFunction::parameterName,
- (arg("self"), arg("i")),
+ .def("getParamName", &IFunction::parameterName, (arg("self"), arg("i")),
"Return the name of the ith parameter")
.def("getParamDescr", &IFunction::parameterDescription,
- (arg("self"), arg("i")),
- "Return a description of the ith parameter")
+ (arg("self"), arg("i")), "Return a description of the ith parameter")
.def("getParamExplicit", &IFunction::isExplicitlySet,
(arg("self"), arg("i")),
"Return whether the ith parameter needs to be explicitely set")
.def("getParamValue",
(double (IFunction::*)(std::size_t) const) & IFunction::getParameter,
- (arg("self"), arg("i")),
- "Get the value of the ith parameter")
+ (arg("self"), arg("i")), "Get the value of the ith parameter")
//-- Python special methods --
- .def("__repr__", &IFunction::asString,
- arg("self"),
+ .def("__repr__", &IFunction::asString, arg("self"),
"Return a string representation of the function");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp
index cacc585f954..7090972a851 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp
@@ -28,15 +28,13 @@ bool isMaskedFromList(const IMaskWorkspace &self,
void export_IMaskWorkspace() {
class_<IMaskWorkspace, boost::noncopyable>("IMaskWorkspace", no_init)
- .def("getNumberMasked", &IMaskWorkspace::getNumberMasked,
- arg("self"),
+ .def("getNumberMasked", &IMaskWorkspace::getNumberMasked, arg("self"),
"Returns the number of masked pixels in the workspace")
.def("isMasked", (bool (IMaskWorkspace::*)(const Mantid::detid_t) const) &
IMaskWorkspace::isMasked,
(arg("self"), arg("detector_id")),
"Returns whether the given detector ID is masked")
- .def("isMasked", isMaskedFromList,
- (arg("self"), arg("detector_id_list")),
+ .def("isMasked", isMaskedFromList, (arg("self"), arg("detector_id_list")),
"Returns whether all of the given detector ID list are masked");
// register pointers
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
index 6f2d447f7e6..f3e42c14c3f 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
@@ -124,11 +124,9 @@ void export_IPeak() {
.def("setSigmaIntensity", &IPeak::setSigmaIntensity,
(arg("self"), arg("sigma_intensity")),
"Set the error on the integrated peak intensity")
- .def("getBinCount", &IPeak::getBinCount,
- arg("self"),
+ .def("getBinCount", &IPeak::getBinCount, arg("self"),
"Return the # of counts in the bin at its peak")
- .def("setBinCount", &IPeak::setBinCount,
- (arg("self"), arg("bin_count")),
+ .def("setBinCount", &IPeak::setBinCount, (arg("self"), arg("bin_count")),
"Set the # of counts in the bin at its peak")
.def("getRow", &IPeak::getRow, arg("self"),
"For RectangularDetectors only, returns "
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
index 0c0c19486ea..3ac4f633273 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
@@ -17,8 +17,7 @@ void export_IPeakFunction() {
(arg("self"), arg("vec_x")),
"Calculate the values of the function for the given x values. The "
"output should be stored in the out array")
- .def("intensity", &IPeakFunction::intensity,
- arg("self"),
+ .def("intensity", &IPeakFunction::intensity, arg("self"),
"Returns the integral intensity of the peak function.")
.def("setIntensity", &IPeakFunction::setIntensity,
(arg("self"), arg("new_intensity")),
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ISplittersWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ISplittersWorkspace.cpp
index 7471b0b121b..2ace16a65bb 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ISplittersWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ISplittersWorkspace.cpp
@@ -11,8 +11,7 @@ void export_ISplittersWorkspace() {
class_<ISplittersWorkspace, boost::noncopyable>("ISplittersWorkspace",
no_init)
.def("getNumberSplitters", &ISplittersWorkspace::getNumberSplitters,
- arg("self"),
- "Returns the number of splitters within the workspace");
+ arg("self"), "Returns the number of splitters within the workspace");
// register pointers
RegisterWorkspacePtrToPython<ISplittersWorkspace>();
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IWorkspaceProperty.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IWorkspaceProperty.cpp
index 08baa602526..8e50a5b5732 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IWorkspaceProperty.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IWorkspaceProperty.cpp
@@ -6,10 +6,8 @@ void export_IWorkspaceProperty() {
using Mantid::API::IWorkspaceProperty;
class_<IWorkspaceProperty, boost::noncopyable>("IWorkspaceProperty", no_init)
- .def("isOptional", &IWorkspaceProperty::isOptional,
- arg("self"),
+ .def("isOptional", &IWorkspaceProperty::isOptional, arg("self"),
"Is the input workspace property optional")
- .def("isLocking", &IWorkspaceProperty::isLocking,
- arg("self"),
+ .def("isLocking", &IWorkspaceProperty::isLocking, arg("self"),
"Will the workspace be locked when starting an algorithm");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Jacobian.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Jacobian.cpp
index 31bb8859817..e9d0eb07cfb 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Jacobian.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Jacobian.cpp
@@ -9,7 +9,8 @@ void export_Jacobian() {
register_ptr_to_python<Jacobian *>();
class_<Jacobian, boost::noncopyable>("Jacobian", no_init)
- .def("set", &Jacobian::set, (arg("self"), arg("iy"), arg("ip"), arg("value")),
+ .def("set", &Jacobian::set,
+ (arg("self"), arg("iy"), arg("ip"), arg("value")),
"Set an element of the Jacobian matrix where iy=index of data "
"point, ip=index of parameter.")
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MultipleExperimentInfos.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MultipleExperimentInfos.cpp
index 5ebb9d41783..1635dd5d4cc 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MultipleExperimentInfos.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MultipleExperimentInfos.cpp
@@ -15,7 +15,6 @@ void export_MultipleExperimentInfos() {
(arg("self"), arg("run_index")),
"Return the experiment info at the given index.")
.def("getNumExperimentInfo",
- &MultipleExperimentInfos::getNumExperimentInfo,
- arg("self"),
+ &MultipleExperimentInfos::getNumExperimentInfo, arg("self"),
"Return the number of experiment info objects,");
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
index 6f57b9aab6b..bc950c6e2ff 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
@@ -182,10 +182,8 @@ void export_Run() {
"Returns the value pointed to by the key or the default value given")
.def("keys", &keys, arg("self"),
"Returns the names of the properties as list")
- .def("__contains__", &Run::hasProperty,
- (arg("self"), arg("name")))
- .def("__getitem__", &Run::getProperty,
- (arg("self"), arg("name")),
+ .def("__contains__", &Run::hasProperty, (arg("self"), arg("name")))
+ .def("__getitem__", &Run::getProperty, (arg("self"), arg("name")),
return_value_policy<return_by_value>())
.def("__setitem__", &addOrReplaceProperty,
(arg("self"), arg("name"), arg("value")))
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
index a926f6057b5..73427a85734 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
@@ -34,11 +34,10 @@ void export_Workspace() {
.def("setComment", &Workspace::setComment, (arg("self"), arg("comment")),
"Set the comment field of the workspace")
.def("isDirty", &Workspace::isDirty,
- Workspace_isDirtyOverloads(
- (arg("self"), arg("n")),
- "True if the workspace has run "
- "more than n algorithms "
- "(Default=1)"))
+ Workspace_isDirtyOverloads((arg("self"), arg("n")),
+ "True if the workspace has run "
+ "more than n algorithms "
+ "(Default=1)"))
.def("getMemorySize", &Workspace::getMemorySize, arg("self"),
"Returns the memory footprint of the workspace in KB")
.def("getHistory", (const WorkspaceHistory &(Workspace::*)() const) &
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
index ad9a9207e81..7875811ce61 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
@@ -62,22 +62,26 @@ void export_WorkspaceFactory() {
class_<WorkspaceFactoryImpl, boost::noncopyable>("WorkspaceFactoryImpl",
no_init)
.def("create", &createFromParentPtr,
- createFromParent_Overload(
- createFromParentDoc, (arg("self"), arg("parent"), arg("NVectors") = -1,
- arg("XLength") = -1, arg("YLength") = -1)))
+ createFromParent_Overload(createFromParentDoc,
+ (arg("self"), arg("parent"),
+ arg("NVectors") = -1, arg("XLength") = -1,
+ arg("YLength") = -1)))
.def("create", (createFromScratchPtr)&WorkspaceFactoryImpl::create,
createFromScratchDoc, return_value_policy<AsType<Workspace_sptr>>(),
- (arg("self"), arg("className"), arg("NVectors"), arg("XLength"), arg("YLength")))
+ (arg("self"), arg("className"), arg("NVectors"), arg("XLength"),
+ arg("YLength")))
.def("createTable", &WorkspaceFactoryImpl::createTable,
- createTable_Overload("Creates an empty TableWorkspace",
- (arg("self"), arg("className") = "TableWorkspace"))
+ createTable_Overload(
+ "Creates an empty TableWorkspace",
+ (arg("self"), arg("className") = "TableWorkspace"))
[return_value_policy<AsType<Workspace_sptr>>()])
.def("createPeaks", &WorkspaceFactoryImpl::createPeaks,
- createPeaks_Overload("Creates an empty PeaksWorkspace",
- (arg("self"), arg("className") = "PeaksWorkspace"))
+ createPeaks_Overload(
+ "Creates an empty PeaksWorkspace",
+ (arg("self"), arg("className") = "PeaksWorkspace"))
[return_value_policy<AsType<Workspace_sptr>>()])
.def("Instance", &WorkspaceFactory::Instance,
--
GitLab