From b3a1bd9f49ed103ba5c58748b746eedd26529025 Mon Sep 17 00:00:00 2001
From: Anthony Lim <anthony.lim@stfc.ac.uk>
Date: Thu, 24 Oct 2019 11:21:16 +0100
Subject: [PATCH] refs #26774 consistant muon GUI naming
---
docs/source/interfaces/Muon Analysis.rst | 2 +-
docs/source/release/v4.2.0/muon.rst | 2 +-
qt/scientific_interfaces/Muon/MuonAnalysis.cpp | 3 +--
qt/scientific_interfaces/Muon/MuonAnalysis.h | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/docs/source/interfaces/Muon Analysis.rst b/docs/source/interfaces/Muon Analysis.rst
index 0314e430def..32a114b0612 100644
--- a/docs/source/interfaces/Muon Analysis.rst
+++ b/docs/source/interfaces/Muon Analysis.rst
@@ -15,7 +15,7 @@ Interface Overview
This interface is deprecated, please use :ref:`Muon Analysis <MuonAnalysis_2-ref>` instead.
This interface is used to analyse the data collected on Muon instruments. The interface can be
-accessed from the main menu of MantidPlot, in *Interfaces → Muon → Muon Analysis (old)*. For sample
+accessed from the main menu of MantidPlot, in *Interfaces → Muon → Muon Analysis old*. For sample
datasets, please visit `Muon - Downloads <http://www.isis.stfc.ac.uk/groups/muons/downloads/downloads4612.html>`_.#
If the :ref:`Frequency_Domain_Analysis-ref` interfaces is opened it will import all of the data available for the current run in Muon Analysis.
diff --git a/docs/source/release/v4.2.0/muon.rst b/docs/source/release/v4.2.0/muon.rst
index 1a2023b794a..f44224b46e4 100644
--- a/docs/source/release/v4.2.0/muon.rst
+++ b/docs/source/release/v4.2.0/muon.rst
@@ -47,7 +47,7 @@ Muon Analysis 2 and Frequency Domain Analysis
- Can now plot FFT's of PhaseQuad data.
- No longer produces an error if using multiple runs and the user plots all the FFT results when no imaginary data was used.
- Muon Analysis (new) and Frequency Domain Analysis (new) work with project recovery.
-- The original Muon Analysis GUI has been renamed Muon Analysis (old) and has been deprecated.
+- The original Muon Analysis GUI has been renamed Muon Analysis old and has been deprecated.
- The new Muon Analysis has been renamed Muon Analysis.
Algorithms
diff --git a/qt/scientific_interfaces/Muon/MuonAnalysis.cpp b/qt/scientific_interfaces/Muon/MuonAnalysis.cpp
index 81ff0674981..b3c20ca936d 100644
--- a/qt/scientific_interfaces/Muon/MuonAnalysis.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysis.cpp
@@ -147,8 +147,7 @@ MuonAnalysis::MuonAnalysis(QWidget *parent)
// instruments later
{"MUSR", "HIFI", "EMU", "ARGUS", "CHRONUS"}),
m_deadTimeIndex(-1), m_useDeadTime(true) {
- g_log.warning(
- "This interface is deprecated, please use Muon Analysis instead");
+ arn;
}
/**
diff --git a/qt/scientific_interfaces/Muon/MuonAnalysis.h b/qt/scientific_interfaces/Muon/MuonAnalysis.h
index 556e57ba2b2..3064c109912 100644
--- a/qt/scientific_interfaces/Muon/MuonAnalysis.h
+++ b/qt/scientific_interfaces/Muon/MuonAnalysis.h
@@ -60,7 +60,7 @@ class MuonAnalysis : public MantidQt::API::UserSubWindow {
public:
/// Name of the interface
- static std::string name() { return "Muon Analysis (old)"; }
+ static std::string name() { return "Muon Analysis old)"; }
// This interface's categories.
static QString categoryInfo() { return "Muon"; }
--
GitLab