Merge remote-tracking branch 'origin/feature/5875_ConvertToMDHelper'

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt

@@ -15,6 +15,7 @@ set ( SRC_FILES
 	src/ConvertToDiffractionMDWorkspace.cpp
 	src/ConvertToDiffractionMDWorkspace2.cpp
 	src/ConvertToMD.cpp
+	src/ConvertToMDHelper.cpp
 	src/CreateMDHistoWorkspace.cpp
 	src/CreateMDWorkspace.cpp
 	src/DivideMD.cpp
@@ -85,6 +86,7 @@ set ( INC_FILES
 	inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace.h
 	inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace2.h
 	inc/MantidMDAlgorithms/ConvertToMD.h
+	inc/MantidMDAlgorithms/ConvertToMDHelper.h
 	inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
 	inc/MantidMDAlgorithms/CreateMDWorkspace.h
 	inc/MantidMDAlgorithms/DivideMD.h
@@ -157,6 +159,7 @@ set ( TEST_FILES
 	ConvertToDiffractionMDWorkspace2Test.h
 	ConvertToDiffractionMDWorkspaceTest.h
 	ConvertToMDComponentsTest.h
+	ConvertToMDHelperTest.h
 	ConvertToMDTest.h
 	ConvertToQ3DdETest.h
 	CreateMDHistoWorkspaceTest.h

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDHelper.h

+#ifndef MANTID_MDALGORITHMS_CONVERTTOMDHELPER_H_
+#define MANTID_MDALGORITHMS_CONVERTTOMDHELPER_H_
+
+#include "MantidKernel/System.h"
+#include "MantidAPI/Algorithm.h"
+
+namespace Mantid
+{
+namespace MDAlgorithms
+{
+
+  /** ConvertToMDHelper : Algorithm to calculate limits for ConvertToMD
+    
+    Copyright © 2013 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://github.com/mantidproject/mantid>
+    Code Documentation is available at: <http://doxygen.mantidproject.org>
+  */
+  class DLLExport ConvertToMDHelper  : public API::Algorithm
+  {
+  public:
+    ConvertToMDHelper();
+    virtual ~ConvertToMDHelper();
+    
+    virtual const std::string name() const;
+    virtual int version() const;
+    virtual const std::string category() const;
+
+  private:
+    virtual void initDocs();
+    void init();
+    void exec();
+
+
+  };
+
+
+} // namespace MDAlgorithms
+} // namespace Mantid
+
+#endif  /* MANTID_MDALGORITHMS_CONVERTTOMDHELPER_H_ */

Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDHelper.cpp

+/*WIKI*
+The algorithm will try to calculate the MinValues and MaxValues limits that are required in the ConvertToMD algorithm, using the following procedure:
+
+* If QDimensions is CopyToMD the first value in MinValues is going to be the workspace minimum X coordinate, and the first value in MaxValues is going to be the maximum X coordinate
+* If QDimensions is |Q| or Q3D, first we calculate the maximum momentum transfer, Qmax. If dEAnalysisMode is Elastic, we convert to Momentum units, find the maximum value, and multiply by 2, since the maximum momentum transfer occurs when the incident beam and the scattered beam are anti-parallel.
+* If dEAnalysisMode is Direct or Indirect, we convert to DeltaE units, find the minimum and maximum (dEmin, dEmax), calculate to ki and kf. The maximum momentum transfer is ki+kf.
+* If QDimensions is |Q|, the first value of the MinValues is 0, and the first value of MaxValues is Qmax
+* If QDimensions is Q3D, and Q3DFrames is Q the first three values of the MinValues are -Qmax, -Qmax, -Qmax, and the first three values of MaxValues are Qmax, Qmax, Qmax
+* If QDimensions is Q3D, and Q3DFrames is HKL the first three values of the MinValues are -Qmax*a/(2*pi), -Qmax*b/(2*pi), -Qmax*c/(2*pi), and the first three values of MaxValues are Qmax*a/(2*pi), Qmax*b/(2*pi), Qmax*c/(2*pi). Note: for HKL mode one needs to have an OrientedLattice attached to the sample.
+* If QDimensions is |Q| or Q3D, and dEAnalysisMode is Elastic or Inelastic, the next value in MinValues is dEmin, and the next value in MaxValues is dEmax
+* If any OtherDimensions are added, the last values in MinValues (MaxValues) are the minimum (maximum) of each of the sample log values selected
+
+*WIKI*/
+
+#include "MantidMDAlgorithms/ConvertToMDHelper.h"
+#include "MantidAPI/WorkspaceValidators.h"
+#include "MantidKernel/ListValidator.h"
+#include "MantidMDEvents/ConvToMDSelector.h"
+#include "MantidMDEvents/MDWSTransform.h"
+#include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/VisibleWhenProperty.h"
+#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidGeometry/Crystal/OrientedLattice.h"
+#include "MantidDataObjects/EventWorkspace.h"
+
+using namespace Mantid;
+using namespace Mantid::Kernel;
+using namespace Mantid::API;
+using namespace Mantid::MDEvents;
+
+namespace Mantid
+{
+namespace MDAlgorithms
+{
+
+  // Register the algorithm into the AlgorithmFactory
+  DECLARE_ALGORITHM(ConvertToMDHelper)
+  
+
+
+  //----------------------------------------------------------------------------------------------
+  /** Constructor
+   */
+  ConvertToMDHelper::ConvertToMDHelper()
+  {
+  }
+    
+  //----------------------------------------------------------------------------------------------
+  /** Destructor
+   */
+  ConvertToMDHelper::~ConvertToMDHelper()
+  {
+  }
+  
+
+  //----------------------------------------------------------------------------------------------
+  /// Algorithm's name for identification. @see Algorithm::name
+  const std::string ConvertToMDHelper::name() const { return "ConvertToMDHelper";};
+  
+  /// Algorithm's version for identification. @see Algorithm::version
+  int ConvertToMDHelper::version() const { return 1;};
+  
+  /// Algorithm's category for identification. @see Algorithm::category
+  const std::string ConvertToMDHelper::category() const { return "MDAlgorithms";}
+
+  //----------------------------------------------------------------------------------------------
+  /// Sets documentation strings for this algorithm
+  void ConvertToMDHelper::initDocs()
+  {
+    this->setWikiSummary("Calculate limits required for ConvertToMD");
+    this->setOptionalMessage("Calculate limits required for ConvertToMD");
+  }
+
+  //----------------------------------------------------------------------------------------------
+  /** Initialize the algorithm's properties.
+   */
+  void ConvertToMDHelper::init()
+  {
+      auto ws_valid = boost::make_shared<CompositeValidator>();
+      //
+      ws_valid->add<InstrumentValidator>();
+      // the validator which checks if the workspace has axis and any units
+      ws_valid->add<WorkspaceUnitValidator>("");
+      //histogram needed by ConvertUnits
+      ws_valid->add<HistogramValidator>();
+      declareProperty(new WorkspaceProperty<MatrixWorkspace>("InputWorkspace","",Direction::Input,ws_valid),
+           "An input Matrix Workspace (Workspace2D or Event workspace) ");
+
+      std::vector<std::string> Q_modes = MDEvents::MDTransfFactory::Instance().getKeys();
+      // something to do with different moments of thime when algorithm or test loads library. To avoid empty factory always do this.
+      if(Q_modes.empty()) Q_modes.assign(1,"ERROR IN LOADING Q-converters");
+
+      /// this variable describes default possible ID-s for Q-dimensions
+      declareProperty("QDimensions",Q_modes[0],boost::make_shared<StringListValidator>(Q_modes),
+ "String, describing available analysis modes, registered with [[MD Transformation factory]]. "
+ "There are 3 modes currently available and described in details on [[MD Transformation factory]] page. "
+ "The modes names are '''CopyToMD''', '''|Q|''' and '''Q3D'''",
+                      Direction::InOut);
+      /// temporary, untill dEMode is not properly defined on Workspace
+      std::vector<std::string> dE_modes = Kernel::DeltaEMode().availableTypes();
+      declareProperty("dEAnalysisMode",dE_modes[Kernel::DeltaEMode::Direct],boost::make_shared<StringListValidator>(dE_modes),
+ "You can analyse neutron energy transfer in '''Direct''', '''Indirect''' or '''Elastic''' mode. "
+ "The analysis mode has to correspond to experimental set up. Selecting inelastic mode increases "
+ "the number of the target workspace dimensions by one. See [[MD Transformation factory]] for further details.",
+                      Direction::InOut);
+
+      setPropertySettings("dEAnalysisMode",
+                new VisibleWhenProperty("QDimensions", IS_NOT_EQUAL_TO, "CopyToMD"));
+
+      std::vector<std::string> TargFrames;
+      TargFrames.push_back("AutoSelect");
+      TargFrames.push_back("Q");
+      TargFrames.push_back("HKL");
+      declareProperty("Q3DFrames", "AutoSelect",boost::make_shared<StringListValidator>(TargFrames),
+        "What will be the Q-dimensions of the output workspace in Q3D case?\n"
+        "  AutoSelect: Q by default, HKL if sample has a UB matrix:\n"
+        "  Q - momentum in inverse angstroms. Can be used for both laboratory or sample frame.\n"
+        "  HKL - reciprocal lattice units"
+         );
+
+      setPropertySettings("Q3DFrames",
+                new VisibleWhenProperty("QDimensions", IS_EQUAL_TO, "Q3D"));
+
+      declareProperty(new ArrayProperty<std::string>("OtherDimensions",Direction::Input),
+  "List(comma separated) of additional to '''Q''' and '''DeltaE''' variables which form additional "
+  "(orthogonal) to '''Q''' dimensions in the target workspace (e.g. Temperature or Magnetic field). "
+  "These variables had to be logged during experiment and the names of these variables have to coincide "
+  "with the log names for the records of these variables in the source workspace.");
+
+      declareProperty(new ArrayProperty<double>("MinValues",Direction::Output));
+      declareProperty(new ArrayProperty<double>("MaxValues",Direction::Output));
+  }
+
+  //----------------------------------------------------------------------------------------------
+  /** Execute the algorithm.
+   */
+  void ConvertToMDHelper::exec()
+  {
+    std::vector<double> MinValues,MaxValues;
+    std::string QDimension=getPropertyValue("QDimensions");
+    std::string GeometryMode=getPropertyValue("dEAnalysisMode");
+    std::string Q3DFrames=getPropertyValue("Q3DFrames");
+    std::vector<std::string> OtherDimensions=getProperty("OtherDimensions");
+
+    MatrixWorkspace_sptr ws=getProperty("InputWorkspace"),wstemp;
+    DataObjects::EventWorkspace_sptr evWS;
+    double xmin,xmax;
+
+    if (QDimension=="CopyToMD")
+    {
+        ws->getXMinMax(xmin,xmax);
+        MinValues.push_back(xmin);
+        MaxValues.push_back(xmax);
+    }
+    else //need to calculate the appropriate q values
+    {
+        double qmax,deltaEmax,deltaEmin;
+        IAlgorithm_sptr conv = createChildAlgorithm("ConvertUnits",0.0,0.9);
+        conv->setProperty<MatrixWorkspace_sptr>("InputWorkspace", ws);
+        conv->setProperty<MatrixWorkspace_sptr>("OutputWorkspace", wstemp);
+        //Calculate maxumum momentum transfer Q
+        if(GeometryMode=="Elastic")
+        {
+            conv->setProperty("Target","Momentum");
+            conv->setProperty("Emode","Elastic");
+            conv->executeAsChildAlg();
+
+            wstemp=conv->getProperty("OutputWorkspace");
+            evWS=boost::dynamic_pointer_cast< Mantid::DataObjects::EventWorkspace >(wstemp);
+            if (evWS)
+            {
+                qmax=evWS->getTofMax()*2;//assumes maximum scattering angle 180 degrees
+            }
+            else
+            {
+                qmax=wstemp->getXMax()*2.;//assumes maximum scattering angle 180 degrees
+            }
+        }
+        else //inelastic
+        {
+            conv->setProperty("Target","DeltaE");
+            conv->setProperty("Emode",GeometryMode);
+            conv->executeAsChildAlg();
+            wstemp=conv->getProperty("OutputWorkspace");
+            evWS=boost::dynamic_pointer_cast< Mantid::DataObjects::EventWorkspace>(wstemp);
+            if(evWS)
+            {
+                deltaEmin=evWS->getTofMin();
+                deltaEmax=evWS->getTofMax();
+            }
+            else
+            {
+                wstemp->getXMinMax(deltaEmin,deltaEmax);
+            }
+
+            //Deal with nonphisical energies - conversion to DeltaE yields +-DBL_MAX
+            if (deltaEmin < -DBL_MAX/2) deltaEmin=-deltaEmax;
+            if (deltaEmax > DBL_MAX/2) deltaEmax=-deltaEmin;
+
+            // Conversion constant for E->k. k(A^-1) = sqrt(energyToK*E(meV))
+            const double energyToK = 8.0*M_PI*M_PI*PhysicalConstants::NeutronMass*PhysicalConstants::meV*1e-20 /
+              (PhysicalConstants::h*PhysicalConstants::h);
+            if(GeometryMode=="Direct")
+            {
+                double Ei=boost::lexical_cast<double,std::string>(ws->run().getProperty("Ei")->value());
+                qmax=std::sqrt(energyToK*Ei)+std::sqrt(energyToK*(Ei-deltaEmin));
+            }
+            else//indirect
+            {
+                double Ef=-DBL_MAX,Eftemp=Ef;
+                const Geometry::ParameterMap& pmap = ws->constInstrumentParameters();
+                for(size_t i=0;i<ws->getNumberHistograms();i++)
+                {
+                    Geometry::IDetector_const_sptr spDet;
+                    try
+                    {
+                      spDet= ws->getDetector(i);
+                      Geometry::Parameter_sptr par = pmap.getRecursive(spDet.get(),"eFixed");
+                      if(par) Eftemp=par->value<double>();
+                      if(Eftemp>Ef) Ef=Eftemp;
+                    }
+                    catch(...)
+                    {
+                      continue;
+                    }
+                    if(Ef<=0)
+                    {
+                        throw std::runtime_error("Could not find a fixed final energy for indirect geometry instrument.");
+                    }
+                }
+                qmax=std::sqrt(energyToK*Ef)+std::sqrt(energyToK*(Ef+deltaEmax));
+            }
+        }
+        //Calculate limits from qmax
+        if (QDimension=="|Q|")
+        {
+            MinValues.push_back(0.);
+            MaxValues.push_back(qmax);
+        }
+        else//Q3D
+        {
+            //Q in angstroms
+            if ((Q3DFrames=="Q")||((Q3DFrames=="AutoSelect")&&(!ws->sample().hasOrientedLattice())))
+            {
+                MinValues.push_back(-qmax);MinValues.push_back(-qmax);MinValues.push_back(-qmax);
+                MaxValues.push_back(qmax);MaxValues.push_back(qmax);MaxValues.push_back(qmax);
+            }
+            else //HKL
+            {
+                if(!ws->sample().hasOrientedLattice())
+                {
+                    g_log.error()<<"Samplem has no oriented lattice"<<std::endl;
+                    throw std::invalid_argument("No UB set");
+                }
+                Mantid::Geometry::OrientedLattice ol=ws->sample().getOrientedLattice();
+                qmax/=(2.*M_PI);
+                MinValues.push_back(-qmax*ol.a());MinValues.push_back(-qmax*ol.b());MinValues.push_back(-qmax*ol.c());
+                MaxValues.push_back(qmax*ol.a());MaxValues.push_back(qmax*ol.b());MaxValues.push_back(qmax*ol.c());
+            }
+        }
+
+
+        //Push deltaE if necessary
+        if(GeometryMode!="Elastic")
+        {
+            MinValues.push_back(deltaEmin);
+            MaxValues.push_back(deltaEmax);
+        }
+    }
+
+    for(size_t i=0;i<OtherDimensions.size();++i)
+    {
+        if(!ws->run().hasProperty(OtherDimensions[i]))
+        {
+            g_log.error()<<"The workspace does not have a property "<<OtherDimensions[i]<<std::endl;
+            throw std::invalid_argument("Property not found. Please see error log.");
+        }
+        TimeSeriesProperty<double> *p=dynamic_cast<TimeSeriesProperty<double> *>(ws->run().getProperty(OtherDimensions[i]));
+        MinValues.push_back(p->getStatistics().minimum);
+        MaxValues.push_back(p->getStatistics().maximum);
+    }
+
+    setProperty("MinValues",MinValues);
+    setProperty("MaxValues",MaxValues);
+  }
+
+
+
+} // namespace MDAlgorithms
+} // namespace Mantid

Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDHelperTest.h

+#ifndef MANTID_MDALGORITHMS_CONVERTTOMDHELPERTEST_H_
+#define MANTID_MDALGORITHMS_CONVERTTOMDHELPERTEST_H_
+
+#include <cxxtest/TestSuite.h>
+
+#include "MantidMDAlgorithms/ConvertToMDHelper.h"
+#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include "MantidKernel/ArrayProperty.h"
+#include "MantidAPI/NumericAxis.h"
+#include "MantidDataHandling/LoadEventNexus.h"
+#include "MantidGeometry/Instrument.h"
+#include "MantidGeometry/Crystal/OrientedLattice.h"
+#include "MantidAPI/FrameworkManager.h"
+#include "MantidKernel/TimeSeriesProperty.h"
+
+
+
+using Mantid::MDAlgorithms::ConvertToMDHelper;
+class ConvertToMDHelperTest : public CxxTest::TestSuite
+{
+public:
+  // This pair of boilerplate methods prevent the suite being created statically
+  // This means the constructor isn't called when running other tests
+  static ConvertToMDHelperTest *createSuite() { return new ConvertToMDHelperTest(); }
+  static void destroySuite( ConvertToMDHelperTest *suite ) { delete suite; }
+
+  ConvertToMDHelperTest():WSName("CMDHTest")
+  {
+
+  }
+
+
+  void test_Init()
+  {
+    ConvertToMDHelper alg;
+    TS_ASSERT_THROWS_NOTHING( alg.initialize() )
+    TS_ASSERT( alg.isInitialized() )
+  }
+  
+  void test_direct1D()
+  {
+
+    Mantid::API::FrameworkManager::Instance();
+    ConvertToMDHelper alg;
+    Mantid::API::MatrixWorkspace_sptr  ws=MakeWorkspace(-50,1,true,60,0);
+    WorkspaceCreationHelper::storeWS(WSName,ws);
+
+    TS_ASSERT_THROWS_NOTHING( alg.initialize() )
+    TS_ASSERT( alg.isInitialized() )
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("InputWorkspace", WSName) );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("QDimensions","|Q|") );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("dEAnalysisMode","Direct") );
+    TS_ASSERT_THROWS_NOTHING( alg.execute(); );
+    TS_ASSERT( alg.isExecuted() );
+    // Check the results
+
+    TS_ASSERT_EQUALS(alg.getPropertyValue("MinValues"),"0,-50");
+    TS_ASSERT_EQUALS(alg.getPropertyValue("MaxValues"),"12.667,50");
+    // Remove workspace from the data service.
+    Mantid::API::AnalysisDataService::Instance().remove(WSName);
+  }
+
+  void test_direct3D()
+  {
+
+    Mantid::API::FrameworkManager::Instance();
+    ConvertToMDHelper alg;
+    Mantid::API::MatrixWorkspace_sptr  ws=MakeWorkspace(-50,1,true,60,0);
+    WorkspaceCreationHelper::storeWS(WSName,ws);
+
+    TS_ASSERT_THROWS_NOTHING( alg.initialize() )
+    TS_ASSERT( alg.isInitialized() )
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("InputWorkspace", WSName) );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("QDimensions","Q3D") );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("dEAnalysisMode","Direct") );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("Q3DFrames","Q") );
+    TS_ASSERT_THROWS_NOTHING( alg.execute(); );
+    TS_ASSERT( alg.isExecuted() );
+    // Check the results
+    TS_ASSERT_EQUALS(alg.getPropertyValue("MinValues"),"-12.667,-12.667,-12.667,-50");
+    TS_ASSERT_EQUALS(alg.getPropertyValue("MaxValues"),"12.667,12.667,12.667,50");
+    // Remove workspace from the data service.
+    Mantid::API::AnalysisDataService::Instance().remove(WSName);
+  }
+  
+  void test_direct3DHKL()
+  {
+
+    Mantid::API::FrameworkManager::Instance();
+    ConvertToMDHelper alg;
+    Mantid::API::MatrixWorkspace_sptr  ws=MakeWorkspace(-50,1,true,60,0);
+    WorkspaceCreationHelper::storeWS(WSName,ws);
+
+    TS_ASSERT_THROWS_NOTHING( alg.initialize() )
+    TS_ASSERT( alg.isInitialized() )
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("InputWorkspace", WSName) );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("QDimensions","Q3D") );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("dEAnalysisMode","Direct") );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("Q3DFrames","HKL") );
+    TS_ASSERT_THROWS_NOTHING( alg.execute(); );
+    TS_ASSERT( alg.isExecuted() );
+    // Check the results
+    TS_ASSERT_EQUALS(alg.getPropertyValue("MinValues"),"-4.03205,-6.04807,-8.06409,-50");
+    TS_ASSERT_EQUALS(alg.getPropertyValue("MaxValues"),"4.03205,6.04807,8.06409,50");
+    // Remove workspace from the data service.
+    Mantid::API::AnalysisDataService::Instance().remove(WSName);
+  }
+
+  void test_indirect1D()
+  {
+
+    Mantid::API::FrameworkManager::Instance();
+    ConvertToMDHelper alg;
+    Mantid::API::MatrixWorkspace_sptr  ws=MakeWorkspace(-2.5,0.05,true,0,5);
+    WorkspaceCreationHelper::storeWS(WSName,ws);
+
+    TS_ASSERT_THROWS_NOTHING( alg.initialize() )
+    TS_ASSERT( alg.isInitialized() )
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("InputWorkspace", WSName) );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("QDimensions","|Q|") );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("dEAnalysisMode","Indirect") );
+    TS_ASSERT_THROWS_NOTHING( alg.execute(); );
+    TS_ASSERT( alg.isExecuted() );
+    // Check the results
+
+    TS_ASSERT_EQUALS(alg.getPropertyValue("MinValues"),"0,-2.5");
+    TS_ASSERT_EQUALS(alg.getPropertyValue("MaxValues"),"3.45587,2.5");
+    // Remove workspace from the data service.
+    Mantid::API::AnalysisDataService::Instance().remove(WSName);
+  }
+
+  void test_elastic1D()
+  {
+
+    Mantid::API::FrameworkManager::Instance();
+    ConvertToMDHelper alg;
+    Mantid::API::MatrixWorkspace_sptr  ws=MakeWorkspace(25000,10,false,0,0);
+    WorkspaceCreationHelper::storeWS(WSName,ws);
+
+    TS_ASSERT_THROWS_NOTHING( alg.initialize() )
+    TS_ASSERT( alg.isInitialized() )
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("InputWorkspace", WSName) );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("QDimensions","|Q|") );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("dEAnalysisMode","Elastic") );
+    TS_ASSERT_THROWS_NOTHING( alg.execute(); );
+    TS_ASSERT( alg.isExecuted() );
+    // Check the results
+
+    TS_ASSERT_EQUALS(alg.getPropertyValue("MinValues"),"0");
+    TS_ASSERT_EQUALS(alg.getPropertyValue("MaxValues"),"2.54437");
+    // Remove workspace from the data service.
+    Mantid::API::AnalysisDataService::Instance().remove(WSName);
+  }
+
+  void test_elastic1DandExtra()
+  {
+
+    Mantid::API::FrameworkManager::Instance();
+    ConvertToMDHelper alg;
+    Mantid::API::MatrixWorkspace_sptr  ws=MakeWorkspace(25000,10,false,0,0);
+    WorkspaceCreationHelper::storeWS(WSName,ws);
+
+    TS_ASSERT_THROWS_NOTHING( alg.initialize() )
+    TS_ASSERT( alg.isInitialized() )
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("InputWorkspace", WSName) );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("QDimensions","|Q|") );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("dEAnalysisMode","Elastic") );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("OtherDimensions","doubleProp") );
+    TS_ASSERT_THROWS_NOTHING( alg.execute(); );
+    TS_ASSERT( alg.isExecuted() );
+    // Check the results
+
+    TS_ASSERT_EQUALS(alg.getPropertyValue("MinValues"),"0,5.55");
+    TS_ASSERT_EQUALS(alg.getPropertyValue("MaxValues"),"2.54437,10.55");
+    // Remove workspace from the data service.
+    Mantid::API::AnalysisDataService::Instance().remove(WSName);
+  }
+
+private:
+  std::string WSName;
+
+
+  Mantid::API::MatrixWorkspace_sptr MakeWorkspace(double xmin,double dx,bool deltaEUnits,
+                                                  double Ei, double Ef)
+  {
+
+      Mantid::API::MatrixWorkspace_sptr  ws= WorkspaceCreationHelper::Create2DWorkspaceBinned(1,100,xmin, dx);
+
+      if((Ei>0 || Ef>0)&&deltaEUnits)
+      {
+          ws->getAxis(0)->setUnit("DeltaE");
+      }
+      else
+      {
+          ws->getAxis(0)->setUnit("TOF");
+      }
+
+      Mantid::Geometry::Instrument_sptr testInst(new Mantid::Geometry::Instrument);
+      ws->setInstrument(testInst);
+      // Define a source and sample position
+      //Define a source component
+      Mantid::Geometry::ObjComponent *source = new Mantid::Geometry::ObjComponent("moderator", Mantid::Geometry::Object_sptr(), testInst.get());
+      source->setPos(Mantid::Kernel::V3D(0, 0.0, -15.));
+      testInst->add(source);
+      testInst->markAsSource(source);
+      // Define a sample as a simple sphere
+      Mantid::Geometry::ObjComponent *sample = new Mantid::Geometry::ObjComponent("samplePos", Mantid::Geometry::Object_sptr(), testInst.get());
+      testInst->setPos(0.0, 0.0, 0.0);
+      testInst->add(sample);
+      testInst->markAsSamplePos(sample);
+      //Detector
+      Mantid::Geometry::Detector * physicalPixel = new Mantid::Geometry::Detector("pixel", 1, testInst.get());
+      physicalPixel->setPos(0.5,0,5.0);
+      testInst->add(physicalPixel);
+      testInst->markAsDetector(physicalPixel);
+
+      ws->getSpectrum(0)->addDetectorID(physicalPixel->getID());
+
+
+      if (Ei>0)
+      {
+          ws->mutableRun().addProperty(new Mantid::Kernel::PropertyWithValue<double>("Ei",Ei));
+      }
+
+      if (Ef>0)
+      {
+          Mantid::Geometry::ParameterMap pmap(ws->instrumentParameters());
+          pmap.addDouble(physicalPixel,"Efixed",Ef);
+          ws->replaceInstrumentParameters(pmap);
+      }
+
+      ws->mutableSample().setOrientedLattice(new Mantid::Geometry::OrientedLattice(2,3,4,90,90,90));
+
+      Mantid::Kernel::TimeSeriesProperty<double> * p = new Mantid::Kernel::TimeSeriesProperty<double>("doubleProp");
+      TS_ASSERT_THROWS_NOTHING( p->addValue("2007-11-30T16:17:00",9.99) );
+      TS_ASSERT_THROWS_NOTHING( p->addValue("2007-11-30T16:17:10",7.55) );
+      TS_ASSERT_THROWS_NOTHING( p->addValue("2007-11-30T16:17:20",5.55) );
+      TS_ASSERT_THROWS_NOTHING( p->addValue("2007-11-30T16:17:30",10.55) );
+
+      ws->mutableRun().addLogData(p);
+
+      return ws;
+  }
+};
+
+
+#endif /* MANTID_MDALGORITHMS_CONVERTTOMDHELPERTEST_H_ */