Refs #17065 Added deprecated LoadILL

Framework/DataHandling/CMakeLists.txt

@@ -51,7 +51,8 @@ set ( SRC_FILES
 	src/LoadGSS.cpp
 	src/LoadHelper.cpp
 	src/LoadIDFFromNexus.cpp
-        src/LoadILLINX.cpp
+	src/LoadILL.cpp
+	src/LoadILLINX.cpp
 	src/LoadILLIndirect.cpp
 	src/LoadILLReflectometry.cpp
 	src/LoadILLSANS.cpp
@@ -225,8 +226,9 @@ set ( INC_FILES
 	inc/MantidDataHandling/LoadGSS.h
 	inc/MantidDataHandling/LoadHelper.h
 	inc/MantidDataHandling/LoadIDFFromNexus.h
-        inc/MantidDataHandling/LoadILLINX.h
-	inc/MantidDataHandling/LoadILLIndirect.h
+    inc/MantidDataHandling/LoadILL.h
+    inc/MantidDataHandling/LoadILLIndirect.h
+    inc/MantidDataHandling/LoadILLINX.h
 	inc/MantidDataHandling/LoadILLReflectometry.h
 	inc/MantidDataHandling/LoadILLSANS.h
 	inc/MantidDataHandling/LoadISISNexus2.h
@@ -395,10 +397,11 @@ set ( TEST_FILES
 	LoadGSASInstrumentFileTest.h
 	LoadGSSTest.h
 	LoadIDFFromNexusTest.h
+	LoadILL.h
 	LoadILLIndirectTest.h
 	LoadILLReflectometryTest.h
 	LoadILLSANSTest.h
-        LoadILLINXTest.h
+    LoadILLINXTest.h
 	LoadISISNexusTest.h
 	LoadInstrumentFromRawTest.h
 	LoadInstrumentTest.h

Framework/DataHandling/inc/MantidDataHandling/LoadILL.h

+#ifndef MANTID_LOADILL_H_
+#define MANTID_LOADILL_H_
+
+#include "MantidAPI/DeprecatedAlgorithm.h"
+#include "DataHandling/LoadILLINX.h"
+
+namespace Mantid {
+namespace DataHandling {
+/**
+ Loads an ILL IN4/5/6 nexus file into a Mantid workspace.
+
+ Copyright © 2016 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 LoadILL : public DataHandling::LoadILLINX,
+                          API::DeprecatedAlgorithm {
+public:
+  /// Constructor
+  LoadILL();
+  /// Algorithm's name
+  const std::string name() const override { return "LoadILL"; }
+};
+
+} // namespace DataHandling
+} // namespace Mantid
+
+#endif // MANTID_LOADILL_H

Framework/DataHandling/inc/MantidDataHandling/LoadILLINX.h

-#ifndef MANTID_DATAHANDLING_LOADILL_H_
-#define MANTID_DATAHANDLING_LOADILL_H_
+#ifndef MANTID_DATAHANDLING_LOADILLINX_H_
+#define MANTID_DATAHANDLING_LOADILLINX_H_
 
 //---------------------------------------------------
 // Includes
@@ -13,7 +13,7 @@ namespace DataHandling {
 /**
  Loads an ILL IN4/5/6 nexus file into a Mantid workspace.
 
- Copyright © 2010 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
+ Copyright © 2016 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
  National Laboratory & European Spallation Source
 
  This file is part of Mantid.

Framework/DataHandling/src/LoadILL.cpp

+//---------------------------------------------------
+// Includes
+//---------------------------------------------------
+#include "MantidDataHandling/LoadILL.h"
+#include "MantidAPI/RegisterFileLoader.h"
+
+namespace Mantid {
+namespace DataHandling {
+
+using namespace Kernel;
+using namespace API;
+using namespace NeXus;
+
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadILL)
+
+} // namespace DataHandling
+} // namespace Mantid

docs/source/release/v3.8.0/framework.rst

@@ -56,14 +56,18 @@ Improved
   This is now fixed and the order is correct.
 
 - :ref:`ConvertUnits <algm-ConvertUnits>` will no longer corrupt an in place workspace if the algorithm fails.
-
+s
 - :ref:`SetSample <algm-SetSample>`: Fixed a bug with interpreting the `Center` attribute for cylinders/annuli 
 
+- :ref: `LoadILL <algm-LoadILL>` was renamed to `LoadILLINX <algm-LoadILLINX>` to better reflect what it does. The new algorithm can also handle cases where the monitor IDs are greater than the detector IDs.
 
 
 Deprecated
 ##########
 
+- :ref: `LoadILL <algm-LoadILL>` is now deprecated, `LoadILLINX <algm-LoadILLINX>` should be used instead.
+
+
 MD Algorithms (VATES CLI)
 #########################