diff --git a/Code/Mantid/Framework/Algorithms/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
index 7831adf6a7595689faef72150b1407782629c2a7..e8b586cf1d3f2eef6bc53fe14efd36e7deb472d9 100644
--- a/Code/Mantid/Framework/Algorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
@@ -51,6 +51,7 @@ set ( SRC_FILES
src/DetectorEfficiencyVariation.cpp
src/DiffractionEventCalibrateDetectors.cpp
src/DiffractionEventReadDetCal.cpp
+ src/DiffractionFocussing.cpp
src/DiffractionFocussing2.cpp
src/Divide.cpp
src/DspacemaptoCal.cpp
@@ -216,6 +217,7 @@ set ( INC_FILES
inc/MantidAlgorithms/DetectorEfficiencyVariation.h
inc/MantidAlgorithms/DiffractionEventCalibrateDetectors.h
inc/MantidAlgorithms/DiffractionEventReadDetCal.h
+ inc/MantidAlgorithms/DiffractionFocussing.h
inc/MantidAlgorithms/DiffractionFocussing2.h
inc/MantidAlgorithms/Divide.h
inc/MantidAlgorithms/DspacemaptoCal.h
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing.h
new file mode 100644
index 0000000000000000000000000000000000000000..515edb051268acdac4b45c8ce0dd3aa949c2f997
--- /dev/null
+++ b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing.h
@@ -0,0 +1,125 @@
+#ifndef MANTID_ALGORITHM_DIFFRACTIONFOCUSSING_H_
+#define MANTID_ALGORITHM_DIFFRACTIONFOCUSSING_H_
+/*WIKI*
+
+[[Image:GEM Focused.png|200px|thumb|right|Example of RAW GEM data focused across the 5 detector banks]]
+Given an InputWorkspace and a Grouping filename, the algorithm performs the following:
+# The calibration file is read and a map of corresponding udet-group is created.
+# The algorithm determine the X boundaries for each group as the upper and lower limits of all contributing detectors to this group and determine a logarithmic step that will ensure preserving the number of bins in the initial workspace.
+# All histograms are read and rebinned to the new grid for their group.
+# A new workspace with N histograms is created.
+
+Within the [[CalFile]] any detectors with the 'select' flag can be set to zero or with a group number of 0 or -ve groups are not included in the analysis.
+
+Since the new X boundaries depend on the group and not the entire workspace,
+this focusing algorithm does not create overestimated X ranges for multi-group instruments.
+However it is important to remember that this means that this algorithm outputs a [[Ragged_Workspace|ragged workspace]]. Some 2D and 3D plots will not display the data correctly.
+
+The DiffractionFocussing algorithm uses GroupDetectors algorithm to combine data from several spectra according to GroupingFileName file which is a [[CalFile]].
+
+===For EventWorkspaces===
+
+The algorithm can be used with an [[EventWorkspace]] input, and will create an EventWorkspace output if a different workspace is specified.
+
+The main difference vs. using a Workspace2D is that the event lists from all the incoming pixels are simply appended in the grouped spectra; this means that you can rebin the resulting spectra to finer bins with no loss of data. In fact, it is unnecessary to bin your incoming data at all; binning can be performed as the very last step.
+
+==Usage==
+'''Python'''
+ DiffractionFocussing("InWS","OutWS","filename")
+'''C++'''
+ IAlgorithm* alg = FrameworkManager::Instance().createAlgorithm("DiffractionFocussing");
+ alg->setPropertyValue("InputWorkspace", "InWS");
+ alg->setPropertyValue("OutputWorkspace", "OutWS");
+ alg->setPropertyValue("GroupingFileName", "filename");
+ alg->execute();
+ Workspace* ws = FrameworkManager::Instance().getWorkspace("OutWS");
+
+
+*WIKI*/
+
+//----------------------------------------------------------------------
+// Includes
+//----------------------------------------------------------------------
+#include "MantidAPI/Algorithm.h"
+#include <Poco/NObserver.h>
+#include "MantidAPI/DeprecatedAlgorithm.h"
+#include "MantidAlgorithms/DiffractionFocussing2.h"
+
+namespace Mantid
+{
+ namespace Algorithms
+ {
+ /**
+ This is a parent algorithm that uses several different child algorithms to perform it's task.
+ Takes a workspace as input and the filename of a grouping file of a suitable format.
+
+ The input workspace is
+ 1) Converted to d-spacing units
+ 2) Rebinnned to a common set of bins
+ 3) The spectra are grouped according to the grouping file.
+
+ Required Properties:
+ <UL>
+ <LI> InputWorkspace - The name of the 2D Workspace to take as input </LI>
+ <LI> GroupingFileName - The path to a grouping file</LI>
+ <LI> OutputWorkspace - The name of the 2D workspace in which to store the result </LI>
+ </UL>
+
+ The structure of the grouping file is as follows:
+ # Format: number UDET offset select group
+ 0 611 0.0000000 1 0
+ 1 612 0.0000000 1 0
+ 2 601 0.0000000 0 0
+ 3 602 0.0000000 0 0
+ 4 621 0.0000000 1 0
+
+
+ @author Nick Draper, Tessella
+ @date 11/07/2008
+
+ Copyright © 2008 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
+
+ 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://svn.mantidproject.org/mantid/trunk/Code/Mantid>
+ Code Documentation is available at: <http://doxygen.mantidproject.org>
+ */
+ class DLLExport DiffractionFocussing : public DiffractionFocussing2, public API::DeprecatedAlgorithm
+ {
+ public:
+ /// Default constructor
+ DiffractionFocussing() : API::DeprecatedAlgorithm()
+ {
+ this->useAlgorithm("DiffractionFocussing");
+ this->deprecatedDate("2011-07-08");
+ };
+ /// Destructor
+ virtual ~DiffractionFocussing() {};
+ /// Algorithm's name for identification overriding a virtual method
+ virtual const std::string name() const { return "DiffractionFocussing";}
+ /// Algorithm's version for identification overriding a virtual method
+ virtual int version() const { return 1;}
+ /// Algorithm's category for identification overriding a virtual method
+ virtual const std::string category() const { return "Diffraction";}
+
+ private:
+
+ };
+
+ } // namespace Algorithm
+} // namespace Mantid
+
+#endif /*MANTID_ALGORITHM_DIFFRACTIONFOCUSSING_H_*/
diff --git a/Code/Mantid/Framework/Algorithms/src/DiffractionFocussing.cpp b/Code/Mantid/Framework/Algorithms/src/DiffractionFocussing.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..66f6527cd0747f7b4d6d3942880b1e029c96374b
--- /dev/null
+++ b/Code/Mantid/Framework/Algorithms/src/DiffractionFocussing.cpp
@@ -0,0 +1,18 @@
+//----------------------------------------------------------------------
+// Includes
+//----------------------------------------------------------------------
+#include "MantidAlgorithms/DiffractionFocussing.h"
+#include "MantidAPI/FileProperty.h"
+
+namespace Mantid
+{
+namespace Algorithms
+{
+
+// Register the class into the algorithm factory
+DECLARE_ALGORITHM(DiffractionFocussing)
+
+
+
+} // namespace Algorithm
+} // namespace Mantid
diff --git a/Code/Mantid/Framework/Algorithms/test/DiffractionFocussingTest.h b/Code/Mantid/Framework/Algorithms/test/DiffractionFocussingTest.h
new file mode 100644
index 0000000000000000000000000000000000000000..d309bc11c76dafb7e5473615ff5eea5e104a80a4
--- /dev/null
+++ b/Code/Mantid/Framework/Algorithms/test/DiffractionFocussingTest.h
@@ -0,0 +1,74 @@
+#ifndef DIFFRACTIONFOCUSSINGTEST_H_
+#define DIFFRACTIONFOCUSSINGTEST_H_
+
+#include <cxxtest/TestSuite.h>
+
+#include "MantidAlgorithms/DiffractionFocussing.h"
+#include "MantidDataHandling/LoadRaw.h"
+
+using namespace Mantid::API;
+using namespace Mantid::Kernel;
+using namespace Mantid::Algorithms;
+using namespace Mantid::DataObjects;
+
+class DiffractionFocussingTest : public CxxTest::TestSuite
+{
+public:
+ void testName()
+ {
+ TS_ASSERT_EQUALS( focus.name(), "DiffractionFocussing" );
+ }
+
+ void testVersion()
+ {
+ TS_ASSERT_EQUALS( focus.version(), 1 );
+ }
+
+ void testCategory()
+ {
+ TS_ASSERT_EQUALS( focus.category(), "Diffraction" );
+ }
+
+ void testInit()
+ {
+ focus.initialize();
+ TS_ASSERT( focus.isInitialized() );
+ }
+
+ /** Disabled due to deprecation */
+ void xtestExec()
+ {
+ IAlgorithm* loader = new Mantid::DataHandling::LoadRaw;
+ loader->initialize();
+ loader->setPropertyValue("Filename", "HRP38692.raw");
+
+ std::string outputSpace = "tofocus";
+ loader->setPropertyValue("OutputWorkspace", outputSpace);
+ loader->setPropertyValue("SpectrumMin","50");
+ loader->setPropertyValue("SpectrumMax","100");
+ TS_ASSERT_THROWS_NOTHING( loader->execute() );
+ TS_ASSERT( loader->isExecuted() );
+
+ focus.setPropertyValue("InputWorkspace", outputSpace);
+ focus.setPropertyValue("OutputWorkspace", "focusedWS" );
+ focus.setPropertyValue("GroupingFileName","hrpd_new_072_01.cal");
+
+ TS_ASSERT_THROWS_NOTHING( focus.execute() );
+ TS_ASSERT( focus.isExecuted() );
+
+ MatrixWorkspace_const_sptr output;
+ TS_ASSERT_THROWS_NOTHING( output = boost::dynamic_pointer_cast<MatrixWorkspace>(AnalysisDataService::Instance().retrieve("focusedWS")) );
+
+ // only 2 groups for this limited range of spectra
+ TS_ASSERT_EQUALS( output->getNumberHistograms(), 2 );
+
+ AnalysisDataService::Instance().remove(outputSpace);
+ AnalysisDataService::Instance().remove("focusedWS");
+ delete loader;
+ }
+
+private:
+ DiffractionFocussing focus;
+};
+
+#endif /*DIFFRACTIONFOCUSSINGTEST_H_*/