Merge remote-tracking branch 'origin/release-v3.6.0'

Framework/Algorithms/inc/MantidAlgorithms/PerformIndexOperations.h

@@ -3,7 +3,6 @@
 
 #include "MantidKernel/System.h"
 #include "MantidAPI/DataProcessorAlgorithm.h"
-#include "MantidAPI/DeprecatedAlgorithm.h"
 
 namespace Mantid {
 namespace Algorithms {
@@ -32,8 +31,7 @@ namespace Algorithms {
   File change history is stored at: <https://github.com/mantidproject/mantid>
   Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
-class DLLExport PerformIndexOperations : public API::DataProcessorAlgorithm,
-                                         public API::DeprecatedAlgorithm {
+class DLLExport PerformIndexOperations : public API::DataProcessorAlgorithm {
 public:
   PerformIndexOperations();
   virtual ~PerformIndexOperations();

Framework/Algorithms/src/PerformIndexOperations.cpp

@@ -258,9 +258,7 @@ DECLARE_ALGORITHM(PerformIndexOperations)
 //------------------------------------------------------------------------------
 /** Constructor
  */
-PerformIndexOperations::PerformIndexOperations() {
-  useAlgorithm("GroupDetectors", 2);
-}
+PerformIndexOperations::PerformIndexOperations() {}
 
 //------------------------------------------------------------------------------
 /** Destructor
@@ -340,11 +338,6 @@ VecCommands interpret(const std::string &processingInstructions) {
 /** Execute the algorithm.
  */
 void PerformIndexOperations::exec() {
-  g_log.error("PerformIndexOperations has been deprecated. It will be "
-              "removed in the next release of Mantid. The same functionality "
-              "is provided by GroupDetectors-v2. Its GroupingPattern "
-              "property accepts the same syntax as PerformIndexOperations' "
-              "ProcessingInstructions property.");
   MatrixWorkspace_sptr inputWorkspace = this->getProperty("InputWorkspace");
   const std::string processingInstructions =
       this->getProperty("ProcessingInstructions");