diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsScan.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsScan.py index a6099fd532156d44709e0277513ddc0a4f9ab3d3..e5a3ed17c56c6f6302507e40a78f2391f69003ae 100644 --- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsScan.py +++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsScan.py @@ -161,7 +161,7 @@ class SofQWMomentsScan(DataProcessorAlgorithm): sofqw_alg.setProperty("QAxisBinning", self._q_range) sofqw_alg.setProperty("EMode", 'Indirect') sofqw_alg.setProperty("ReplaceNaNs", True) - sofqw_alg.setProperty("Method", 'Polygon') + sofqw_alg.setProperty("Method", 'NormalisedPolygon') sofqw_alg.setProperty("OutputWorkspace", input_ws + '_sqw') sofqw_alg.execute() mtd.addOrReplace(input_ws + '_sqw', sofqw_alg.getProperty("OutputWorkspace").value) diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.ui b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.ui index aa0c22f78e70e04aabd03cacb5ef40c1781c2b72..4c655be98293dde989b2bbc62b801c9ff23438b7 100644 --- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.ui +++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.ui @@ -71,7 +71,7 @@ </property> <layout class="QVBoxLayout" name="verticalLayout_7"> <item> - <layout class="QGridLayout" name="loOptions" columnstretch="0,10,0,0,10,0" columnminimumwidth="0,0,0,0,0,0"> + <layout class="QGridLayout" name="loOptions" columnstretch="0,0,0,0,0,0"> <item row="1" column="4"> <widget class="QDoubleSpinBox" name="spELow"> <property name="enabled"> @@ -185,19 +185,6 @@ </property> </widget> </item> - <item row="0" column="0"> - <widget class="QLabel" name="lbMethod"> - <property name="minimumSize"> - <size> - <width>43</width> - <height>0</height> - </size> - </property> - <property name="text"> - <string>Method:</string> - </property> - </widget> - </item> <item row="1" column="0"> <widget class="QLabel" name="lbQLow"> <property name="minimumSize"> @@ -344,41 +331,6 @@ </property> </widget> </item> - <item row="0" column="1"> - <widget class="QComboBox" name="cbMethod"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>200</width> - <height>16777215</height> - </size> - </property> - <property name="currentIndex"> - <number>0</number> - </property> - <item> - <property name="text"> - <string>Polygon</string> - </property> - </item> - <item> - <property name="text"> - <string>NormalisedPolygon</string> - </property> - </item> - </widget> - </item> <item row="0" column="2"> <spacer name="horizontalSpacer"> <property name="orientation"> @@ -485,7 +437,6 @@ </customwidget> </customwidgets> <tabstops> - <tabstop>cbMethod</tabstop> <tabstop>spQLow</tabstop> <tabstop>spQWidth</tabstop> <tabstop>spQHigh</tabstop> diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectSqw.cpp b/MantidQt/CustomInterfaces/src/Indirect/IndirectSqw.cpp index eb8030a2270ca357464771241652018e42b93fa8..e096b1def676950cca540ee90d076c23acb7a0d1 100644 --- a/MantidQt/CustomInterfaces/src/Indirect/IndirectSqw.cpp +++ b/MantidQt/CustomInterfaces/src/Indirect/IndirectSqw.cpp @@ -62,7 +62,6 @@ void IndirectSqw::run() { QString sampleWsName = m_uiForm.dsSampleInput->getCurrentDataName(); QString sqwWsName = sampleWsName.left(sampleWsName.length() - 4) + "_sqw"; QString eRebinWsName = sampleWsName.left(sampleWsName.length() - 4) + "_r"; - QString method = m_uiForm.cbMethod->currentText(); QString rebinString = m_uiForm.spQLow->text() + "," + m_uiForm.spQWidth->text() + "," + @@ -101,7 +100,7 @@ void IndirectSqw::run() { sqwAlg->setProperty("QAxisBinning", rebinString.toStdString()); sqwAlg->setProperty("EMode", "Indirect"); sqwAlg->setProperty("EFixed", eFixed.toStdString()); - sqwAlg->setProperty("Method", method.toStdString()); + sqwAlg->setProperty("Method", "NormalisedPolygon"); m_batchAlgoRunner->addAlgorithm(sqwAlg, sqwInputProps); @@ -112,7 +111,7 @@ void IndirectSqw::run() { sampleLogAlg->setProperty("LogName", "rebin_type"); sampleLogAlg->setProperty("LogType", "String"); - sampleLogAlg->setProperty("LogText", method.toStdString()); + sampleLogAlg->setProperty("LogText", "NormalisedPolygon"); BatchAlgorithmRunner::AlgorithmRuntimeProps inputToAddSampleLogProps; inputToAddSampleLogProps["Workspace"] = sqwWsName.toStdString(); diff --git a/docs/source/release/v3.10.0/indirect_inelastic.rst b/docs/source/release/v3.10.0/indirect_inelastic.rst index 87aaacc2a87aed489d51d751b2221f25679c7c98..9604017a9c35d0c9de1b3535aaf6bb063ba14064 100644 --- a/docs/source/release/v3.10.0/indirect_inelastic.rst +++ b/docs/source/release/v3.10.0/indirect_inelastic.rst @@ -39,6 +39,11 @@ Calibration - The range selector for resolution files is now dependent on the range of the spectrum, not the limit in the IPF +SofQW +~~~~~ + +- The polygon option has been removed and the default method is NormalisedPolygon + Data Analysis #############