diff --git a/Framework/Properties/Mantid.properties.template b/Framework/Properties/Mantid.properties.template index 0d3a4c04dddf8479674403d593225a3e5db0018d..8acfe0c2bd33cf9f6256e101a5a4e5e76a17fcd8 100644 --- a/Framework/Properties/Mantid.properties.template +++ b/Framework/Properties/Mantid.properties.template @@ -20,7 +20,7 @@ default.instrument = Q.convention = Inelastic # Set of PyQt interfaces to add to the Interfaces menu, separated by a space. Interfaces are seperated from their respective categories by a "/". -mantidqt.python_interfaces = Direct/DGS_Reduction.py Direct/DGSPlanner.py Direct/PyChop.py Direct/MSlice.py SANS/ORNL_SANS.py Utility/TofConverter.py Reflectometry/ISIS_Reflectometry_Old.py Diffraction/Powder_Diffraction_Reduction.py Utility/FilterEvents.py Diffraction/HFIR_4Circle_Reduction.py Utility/QECoverage.py SANS/ISIS_SANS_v2_experimental.py Muon/Frequency_Domain_Analysis.py Muon/Elemental_Analysis.py Muon/Frequency_Domain_Analysis_Old.py +mantidqt.python_interfaces = Direct/DGS_Reduction.py Direct/DGSPlanner.py Direct/PyChop.py Direct/MSlice.py SANS/ORNL_SANS.py Utility/TofConverter.py Reflectometry/ISIS_Reflectometry_Old.py Diffraction/Powder_Diffraction_Reduction.py Utility/FilterEvents.py Diffraction/HFIR_4Circle_Reduction.py Utility/QECoverage.py SANS/ISIS_SANS.py Muon/Frequency_Domain_Analysis.py Muon/Elemental_Analysis.py Muon/Frequency_Domain_Analysis_Old.py # Directory containing the above startup scripts mantidqt.python_interfaces_directory = @MANTID_ROOT@/scripts diff --git a/docs/source/interfaces/ISIS SANS v2.rst b/docs/source/interfaces/ISIS SANS v2.rst index 48e32085d809e6855abf90d123c3b4f63c749f4f..547c58bed850d0a0852025287924e465ed5ec492 100644 --- a/docs/source/interfaces/ISIS SANS v2.rst +++ b/docs/source/interfaces/ISIS SANS v2.rst @@ -1,6 +1,6 @@ .. _ISIS_SANS_v2-ref: -ISIS SANS v2 +ISIS SANS ============ .. image:: ../images/sans_isis_v2_whole_gui.png @@ -14,9 +14,11 @@ Interface Overview ------------------ This interface is used to reduce ISIS SANS data for SANS2D, LOQ,LARMOR and ZOOM. -The interface can be accessed from the main menu of MantidPlot, in *Interfaces → SANS → ISIS SANS v2 experimental*. +The interface can be accessed from the main menu of MantidPlot, in *Interfaces → SANS → ISIS SANS*. This interface is intended as a gradual replacement for the old ISIS SANS -interface. Note that it is not yet feature complete and subject to change. +interface. As of version 3.14 this interface was renamed from *ISIS SANS v2 experimental* to *ISIS SANS*, and the +previous SANS interface was deprecated. This change signifies that this interface provides all major functionality and +will be the only ISIS SANS interface subject to active development. Runs ---- diff --git a/docs/source/release/v4.0.0/sans.rst b/docs/source/release/v4.0.0/sans.rst index 109ace3f87fadc3672559db928101b9166487308..a84527b264edf43c35ee7d7f0c3a8a3b4fb71a10 100644 --- a/docs/source/release/v4.0.0/sans.rst +++ b/docs/source/release/v4.0.0/sans.rst @@ -35,7 +35,6 @@ Improved * Added transmission sample/can to unsubtracted sample/can XML and H5 files when "Save Can" option selected. * Can set PhiMin, PhiMax, and UseMirror mask options from the options column in the table * Autocomplete for Sample shape column in the table. -* Can separate items in variable q binning with commas or spaces. E.g. L/Q 0.0, 0.02 0.3 0.05, 0.8 * Can export table as a csv, which can be re-loaded as a batch file. * File path to batch file will be added to your directories automatically upon loading. * If loading of user file fails, user file field will remain empty to make it clear it has not be loaded successfully. @@ -46,6 +45,8 @@ Improved * The gui will remember which output mode (Memory, File, Both) you last used and set that as your default when on the SANS interface. * The gui will check *save can* by default if it was checked when the gui was last used. * Default adding mode is set to Event for all instruments except for LOQ, which defaults to Custom. +* The old ISIS SANS interface has been renamed *ISIS SANS (Deprecated)* to signify that it is not under active development. +* The v2 experimental interface has been renamed *ISIS SANS* to signify that it is the main interface and is under active development. Bug fixes ######### diff --git a/qt/scientific_interfaces/ISISSANS/SANSRunWindow.h b/qt/scientific_interfaces/ISISSANS/SANSRunWindow.h index 1a4c513465248c314766e56aa875817b5e4c323a..ae49c7e9ac04b8f46e3cb1b8b9a3ef356ad819d1 100644 --- a/qt/scientific_interfaces/ISISSANS/SANSRunWindow.h +++ b/qt/scientific_interfaces/ISISSANS/SANSRunWindow.h @@ -51,7 +51,7 @@ class SANSRunWindow : public MantidQt::API::UserSubWindow { public: /// Name of the interface - static std::string name() { return "ISIS SANS"; } + static std::string name() { return "ISIS SANS (Deprecated)"; } // This interface's categories. static QString categoryInfo() { return "SANS"; } diff --git a/scripts/ISIS_SANS_v2_experimental.py b/scripts/ISIS_SANS.py similarity index 100% rename from scripts/ISIS_SANS_v2_experimental.py rename to scripts/ISIS_SANS.py