Remove deprecation and update wiki re #7644

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreateCalFileByNames.h

@@ -54,7 +54,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 CreateCalFileByNames : public API::Algorithm, public API::DeprecatedAlgorithm
+class DLLExport CreateCalFileByNames : public API::Algorithm
 {
 public:
   /// (Empty) Constructor
@@ -66,7 +66,7 @@ class DLLExport CreateCalFileByNames : public API::Algorithm, public API::Deprec
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "Deprecated"; }
+  virtual const std::string category() const { return "Diffraction"; }
 
 private:
   /// Sets documentation strings for this algorithm

Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreateDummyCalFile.h

@@ -50,7 +50,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 CreateDummyCalFile : public API::Algorithm, public API::DeprecatedAlgorithm
+class DLLExport CreateDummyCalFile : public API::Algorithm
 {
 public:
   /// (Empty) Constructor
@@ -62,7 +62,7 @@ class DLLExport CreateDummyCalFile : public API::Algorithm, public API::Deprecat
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "Deprecated"; }
+  virtual const std::string category() const { return "Diffraction"; }
 
 private:
   /// Sets documentation strings for this algorithm

Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h

@@ -69,7 +69,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 ReadGroupsFromFile : public API::Algorithm, API::DeprecatedAlgorithm
+class DLLExport ReadGroupsFromFile : public API::Algorithm
 {
 public:
   /// (Empty) Constructor
@@ -81,7 +81,7 @@ class DLLExport ReadGroupsFromFile : public API::Algorithm, API::DeprecatedAlgor
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "Deprecated"; }
+  virtual const std::string category() const { return "Diffraction"; }
 
 private:
   /// Sets documentation strings for this algorithm

Code/Mantid/Framework/Algorithms/src/CreateCalFileByNames.cpp

@@ -4,7 +4,9 @@
 
 Create a [[CalFile|calibration file]] for diffraction focusing based on list of names of the instrument tree.
 
-If a new file name is specified then offsets in the file are all sets to zero and all detectors are selected. If a valid calibration file already exists at the location specified by the [[CalFile|GroupingFileName]] then any existing offsets and selection values will be maintained and only the grouping values changed.
+If a new file name is specified then offsets in the file are all sets to zero and all detectors are selected. 
+If a valid calibration file already exists at the location specified by the [[CalFile|GroupingFileName]] 
+then any existing offsets and selection values will be maintained and only the grouping values changed.
 
 Detectors not assigned to any group will appear as group 0, i.e. not included when using AlignDetector or DiffractionFocussing algorithms.
 
@@ -56,8 +58,8 @@ namespace Mantid
     /// Sets documentation strings for this algorithm
     void CreateCalFileByNames::initDocs()
     {
-      this->setWikiSummary("Create a [[CalFile|calibration file]] (extension *.cal) for diffraction focusing based on the names of the components in the instrument tree. Deprecated: use [[CreateGroupingWorkspace]] instead.");
-      this->setOptionalMessage("Create a calibration file (extension *.cal) for diffraction focusing based on the names of the components in the instrument tree. Deprecated: use [[CreateGroupingWorkspace]] instead.");
+      this->setWikiSummary("Create a [[CalFile|calibration file]] (extension *.cal) for diffraction focusing based on the names of the components in the instrument tree.");
+      this->setOptionalMessage("Create a calibration file (extension *.cal) for diffraction focusing based on the names of the components in the instrument tree.");
     }
 
 
@@ -68,8 +70,6 @@ namespace Mantid
 
     CreateCalFileByNames::CreateCalFileByNames():API::Algorithm(),group_no(0)
     {
-      this->useAlgorithm("CreateGroupingWorkspace");
-      this->deprecatedDate("2011-05-10");
     }
 
     /** Initialisation method. Declares properties to be used in algorithm.

Code/Mantid/Framework/Algorithms/src/CreateDummyCalFile.cpp

@@ -64,8 +64,8 @@ namespace Mantid
     /// Sets documentation strings for this algorithm
     void CreateDummyCalFile::initDocs()
     {
-      this->setWikiSummary("Create a [[CalFile|calibration file]] (extension *.cal) from a workspace by harvesting the detector ids from the instrument. All of the offsets will be zero, and the pixels will be all grouped into group one and the final column should be one. This will allow generating powder patterns from instruments that have not done a proper calibration. Deprecated: use [[CreateGroupingWorkspace]] instead.");
-      this->setOptionalMessage("Create a calibration file (extension *.cal) from a workspace by harvesting the detector ids from the instrument. All of the offsets will be zero, and the pixels will be all grouped into group one and the final column should be one. This will allow generating powder patterns from instruments that have not done a proper calibration. Deprecated: use CreateGroupingWorkspace instead.");
+      this->setWikiSummary("Create a [[CalFile|calibration file]] (extension *.cal) from a workspace by harvesting the detector ids from the instrument. All of the offsets will be zero, and the pixels will be all grouped into group one and the final column should be one. This will allow generating powder patterns from instruments that have not done a proper calibration.");
+      this->setOptionalMessage("Create a calibration file (extension *.cal) from a workspace by harvesting the detector ids from the instrument. All of the offsets will be zero, and the pixels will be all grouped into group one and the final column should be one. This will allow generating powder patterns from instruments that have not done a proper calibration.");
     }
 
 
@@ -76,8 +76,6 @@ namespace Mantid
 
     CreateDummyCalFile::CreateDummyCalFile():API::Algorithm(),group_no(0)
     {
-      this->useAlgorithm("CreateGroupingWorkspace");
-      this->deprecatedDate("2011-05-10");
     }
 
     /** Initialisation method. Declares properties to be used in algorithm.

Code/Mantid/Framework/Algorithms/src/ReadGroupsFromFile.cpp

@@ -64,8 +64,6 @@ namespace Algorithms
 
   ReadGroupsFromFile::ReadGroupsFromFile():API::Algorithm(),calibration()
   {
-    this->useAlgorithm("LoadCalFile");
-    this->deprecatedDate("2011-05-10");
   }
 
   //-----------------------------------------------------------------------------------------------