Refs #5549 focus before ConvertUnits

mantidproject · Aug 5, 2012 · e57a18d · e57a18d
1 parent 2fe6f77
commit e57a18d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py
@@ -353,6 +353,8 @@ def _focus(self, wksp, calib, info, filterLogs=None, preserveEvents=True,
             EditInstrumentGeometry(Workspace=wksp, NewInstrument=False, **focusPos)
             if (self._config.iparmFile is not None) and (len(self._config.iparmFile) > 0):
                 wksp.getRun()['iparm_file'] = self._config.iparmFile
+        ConvertUnits(InputWorkspace=wksp, OutputWorkspace=wksp, Target="TOF")
+        Rebin(InputWorkspace=wksp, OutputWorkspace=wksp, Params=binning[1]) # reset bin width
 
         return wksp
 

diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
@@ -260,7 +260,7 @@ void AlignAndFocusPowder::exec()
   focusAlg->executeAsSubAlg();
   m_outputW = focusAlg->getProperty("OutputWorkspace");
 
-  API::IAlgorithm_sptr convert3Alg = createSubAlgorithm("ConvertUnits");
+/*  API::IAlgorithm_sptr convert3Alg = createSubAlgorithm("ConvertUnits");
   convert3Alg->setProperty("InputWorkspace", m_outputW);
   convert3Alg->setProperty("OutputWorkspace", m_outputW);
   convert3Alg->setProperty("Target","TOF");
@@ -277,7 +277,7 @@ void AlignAndFocusPowder::exec()
   rebin3Alg->setProperty("OutputWorkspace", m_outputW);
   rebin3Alg->setProperty("Params",params);
   rebin3Alg->executeAsSubAlg();
-  m_outputW = rebin3Alg->getProperty("OutputWorkspace");
+  m_outputW = rebin3Alg->getProperty("OutputWorkspace");*/
   setProperty("OutputWorkspace",m_outputW);
 
 }
@@ -486,7 +486,7 @@ void AlignAndFocusPowder::execEvent()
 
   doSortEvents(m_outputW);
 
-  API::IAlgorithm_sptr convert3Alg = createSubAlgorithm("ConvertUnits");
+/*  API::IAlgorithm_sptr convert3Alg = createSubAlgorithm("ConvertUnits");
   convert3Alg->setProperty("InputWorkspace", m_outputW);
   convert3Alg->setProperty("OutputWorkspace", m_outputW);
   convert3Alg->setProperty("Target","TOF");
@@ -503,7 +503,7 @@ void AlignAndFocusPowder::execEvent()
   rebin3Alg->setProperty("OutputWorkspace", m_outputW);
   rebin3Alg->setProperty("Params",params);
   rebin3Alg->executeAsSubAlg();
-  m_outputW = rebin3Alg->getProperty("OutputWorkspace");
+  m_outputW = rebin3Alg->getProperty("OutputWorkspace");*/
   setProperty("OutputWorkspace",m_outputW);
 
 }