Commit 42e7c880 authored by mantid-builder's avatar mantid-builder
Browse files

Merge remote-tracking branch 'origin/release-next'

parents 16b8111a b1e86cd3
......@@ -267,7 +267,7 @@ double GetEi2::calculateEi(const double initial_guess) {
* passed
* @param ws_index :: The workspace index of the detector
* @param spectrumInfo :: A spectrum info object for the input workspace
* @return The distance between the source and the given detector(or
* @return The distance between the source and the given detector (or
* DetectorGroup)
* @throw runtime_error if there is a problem
*/
......
......@@ -394,12 +394,12 @@ void LoadRaw3::separateMonitors(FILE *file, const int64_t &period, const std::ve
if (!readData(file, histToRead)) {
throw std::runtime_error("Error reading raw file");
}
// if this a monitor store that spectrum to monitor workspace
// if this a monitor, store that spectrum to monitor workspace
if (isMonitor(monitorList, i)) {
setWorkspaceData(mws_sptr, m_timeChannelsVec, mwsIndex, i, m_noTimeRegimes, m_lengthIn, 1);
++mwsIndex;
} else {
// not a monitor,store the spectrum to normal output workspace
// not a monitor, store the spectrum to normal output workspace
setWorkspaceData(ws_sptr, m_timeChannelsVec, wsIndex, i, m_noTimeRegimes, m_lengthIn, 1);
++wsIndex;
}
......
......@@ -4,7 +4,7 @@ SCRIPT_DIR=$(dirname "$0")
# If errors slip through to master this can be used to set a non-zero
# allowed count while those errors are dealt with. This avoids breaking all
# builds for all developers
ALLOWED_ERRORS_COUNT=1203
ALLOWED_ERRORS_COUNT=1204
if [[ ${JOB_NAME} == *pull_requests* ]]; then
# This relies on the fact pull requests use pull/$PR-NAME
......
......@@ -90,6 +90,8 @@ Bugfixes
- The help button on the :ref:`Engineering Diffraction interface<Engineering_Diffraction-ref>` points to the correct page, having been broken in the last release.
- Using the Clear button on the Workspace widget while using the :ref:`Fitting tab <ui engineering fitting>` no longer causes errors when you try to load runs back in.
- On the :ref:`Fitting tab <ui engineering fitting>` of the :ref:`Engineering Diffraction interface<Engineering_Diffraction-ref>` the background can be inspected whether the background subtraction box is checked or not.
- Prevent crash when invalid arguments passed to background subtraction algorithm (:ref:`EnggEstimateFocussedBackground <algm-EnggEstimateFocussedBackground>`) in the :ref:`Fitting tab <ui engineering fitting>` of the :ref:`Engineering Diffraction interface<Engineering_Diffraction-ref>`.
Single Crystal Diffraction
--------------------------
......
......@@ -5,39 +5,44 @@ SANS Changes
.. contents:: Table of Contents
:local:
.. warning:: **Developers:** Sort changes under appropriate heading
putting new features at the top of the section, followed by
improvements, followed by bug fixes.
New
---
New Features
------------
- :ref:`SANSILLIntegration <algm-SANSILLIntegration>` has new resolution calculation option alternative to Mildner-Carpenter based on fitting horizontal size of direct beam. The fitting is handled in :ref:`SANSILLReduction <algm-SANSILLReduction>` while processing beam.
- :ref:`LoadILLSANS <algm-LoadILLSANS>` is extended to support loading monochromatic kinetic files from the new D11.
- :ref:`SANSILLReduction <algm-SANSILLReduction>` is extended to support processing of monochromatic kinetic runs.
- A series of improvements have been introduced to :ref:`SANSILLAutoProcess <algm-SANSILLAutoProcess>` such as the use of the new :ref:`Stitch <algm-Stitch>`, allowing for semi-automatic q binning, supporting attenuator 2 on D22, as well as improved naming and grouping for the output workspaces.
- ISIS SANS GUI will automatically toggle between Can SAS and NXS Can SAS when switching between 1D and 2D reductions.
If you have toggled any save options it will not update the selected methods until the interface is restarted to avoid interfering with the user's save selection.
- :ref:`Q1DWeighted <algm-Q1DWeighted>` now supports kinetic data from SANS, with multiple samples instead of time bins.
* :ref:`SANSILLIntegration <algm-SANSILLIntegration>` has new a resolution calculation option alternative to Mildner-Carpenter based on fitting horizontal size of direct beam. The fitting is handled in :ref:`SANSILLReduction <algm-SANSILLReduction>` while processing beam.
* :ref:`LoadILLSANS <algm-LoadILLSANS>` is extended to support loading monochromatic kinetic files from the new D11.
* :ref:`SANSILLReduction <algm-SANSILLReduction>` is extended to support processing of monochromatic kinetic runs.
* A series of improvements have been introduced to :ref:`SANSILLAutoProcess <algm-SANSILLAutoProcess>` including
Bugfixes
--------
* the use of the new :ref:`Stitch <algm-Stitch>` algorithm
* allowing for semi-automatic q binning
* supporting attenuator 2 on D22
* improved naming and grouping for the output workspaces.
* The :ref:`ISIS SANS Interface <ISIS_Sans_interface_contents>` will automatically toggle between Can SAS and NXS Can SAS when switching between 1D and 2D reductions.
If you have toggled any save options it will not update the selected methods until the interface is restarted to avoid interfering with the user's saved selection.
* :ref:`Q1DWeighted <algm-Q1DWeighted>` now supports kinetic data from SANS, with multiple samples instead of time bins.
- The ISIS SANS Interface will now display an error, instead of an unexpected error, if the user does not have permission to save a CSV file to the requested location.
- The ISIS SANS interface will no longer throw an uncaught exception when a user tries to enter row information without loading a Mask/TOML file.
- The ISIS SANS beam centre finder correctly accepts zero values (0.0) and won't try to replace them with empty strings.
- The warning "Reduction Mode 'x' is not valid" will no longer incorrectly show when there are errors with the user's mask file.
Improvements
############
------------
- :ref:The ANSTO Bilby loader `LoadBBY <algm-LoadBBY>` logs the occurence of invalid events detected in the file as a warning.
- The ANSTO Bilby loader, :ref:`LoadBBY <algm-LoadBBY>`, logs the occurrence of invalid events detected in the file as a warning.
- The ISIS SANS threading has been switched to use Python native threading. This provides users with much clearer error messages
if something goes wrong, and improves tool compatibility for future development.
- :ref:`DeadTimeCorrection <algm-DeadTimeCorrection>` now does not integrate TOF axis if the unit is `Empty`, allowing to correct multi-frame monochromatic SANS data.
- The ISIS SANS TOML V0 format was updated with several incompatible changes as-per testing feedback.
A full list of changes can be found on the :ref:`TOML documentation page <sans_toml_v1-ref>` along with more conversion entries.
- ISIS SANS now uses Front / Rear instead of HAB / LAB respectively in the UI. This only affects the text in the interface, and does
- The :ref:`ISIS SANS Interface <ISIS_Sans_interface_contents>` now uses Front / Rear instead of HAB / LAB respectively. This only affects the text in the interface, and does
not affect compatibility with existing user files.
Bugfixes
--------
- The :ref:`ISIS SANS Interface <ISIS_Sans_interface_contents>` will now display an error, instead of an unexpected error, if the user does not have permission to save a CSV file to the requested location.
- The :ref:`ISIS SANS Interface <ISIS_Sans_interface_contents>` will no longer throw an uncaught exception when a user tries to enter row information without loading a Mask/TOML file.
- The :ref:`ISIS SANS beam centre finder<ISIS_SANS_Beam_Centre_Tab-ref>` correctly accepts zero values (0.0) and won't try to replace them with empty strings.
- The warning "Reduction Mode 'x' is not valid" will no longer incorrectly show when there are errors with the user's mask file.
:ref:`Release 6.2.0 <v6.2.0>`
......@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
from os import path
from mantid.simpleapi import Load, logger, EnggEstimateFocussedBackground, Minus, AverageLogData, \
from mantid.simpleapi import Load, logger, EnggEstimateFocussedBackground, Minus, AverageLogData, SetUncertainties, \
CreateEmptyTableWorkspace, GroupWorkspaces, DeleteWorkspace, DeleteTableRows, RenameWorkspace, CreateWorkspace
from Engineering.gui.engineering_diffraction.settings.settings_helper import get_setting
from Engineering.gui.engineering_diffraction.tabs.common import output_settings
......@@ -321,8 +321,14 @@ class FittingDataModel(object):
self._bg_params[ws_name][0] = status
def estimate_background(self, ws_name, niter, xwindow, doSGfilter):
ws_bg = EnggEstimateFocussedBackground(InputWorkspace=ws_name, OutputWorkspace=ws_name + "_bg",
NIterations=niter, XWindow=xwindow, ApplyFilterSG=doSGfilter)
try:
ws_bg = EnggEstimateFocussedBackground(InputWorkspace=ws_name, OutputWorkspace=ws_name + "_bg",
NIterations=niter, XWindow=xwindow, ApplyFilterSG=doSGfilter)
except (ValueError, RuntimeError) as e:
# ValueError when Niter not positive integer, RuntimeError when Window too small
logger.error("Error on arguments supplied to EnggEstimateFocusedBackground: " + str(e))
ws_bg = SetUncertainties(InputWorkspace=ws_name) # copy data and zero errors
ws_bg = Minus(LHSWorkspace=ws_bg, RHSWorkspace=ws_bg) # workspace of zeros with same num spectra
return ws_bg
def plot_background_figure(self, ws_name):
......
......@@ -236,7 +236,7 @@ class PhaseTablePresenter(object):
# Update the table stored in each phasequad
self.context.group_pair_context.update_phase_tables(new_table)
self.context.calculate_all_pairs() # Updates phasequads
self.context.update_phasequads() # Updates phasequads
self.calculation_finished_notifier.notify_subscribers()
self.view.enable_widget()
self.enable_editing_notifier.notify_subscribers()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment