Refs #7841 Removed plot energy button.

Also fixed bug where the plotted _red workspace is removed when creating a res file.
mantidproject · Oct 10, 2013 · fb99eb8 · fb99eb8
1 parent ebc189a
commit fb99eb8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
@@ -1890,13 +1890,6 @@ Later steps in the process (saving, renaming) will not be done.</string>
                </property>
               </widget>
              </item>
-             <item>
-              <widget class="QPushButton" name="cal_pbPlotEnergy">
-               <property name="text">
-                <string>Plot Energy</string>
-               </property>
-              </widget>
-             </item>
             </layout>
            </item>
           </layout>

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect.cpp
@@ -96,7 +96,6 @@ void Indirect::initLayout()
   // "Calibration" tab
   connect(m_uiForm.cal_leRunNo, SIGNAL(filesFound()), this, SLOT(calPlotRaw()));
   connect(m_uiForm.cal_pbPlot, SIGNAL(clicked()), this, SLOT(calPlotRaw()));
-  connect(m_uiForm.cal_pbPlotEnergy, SIGNAL(clicked()), this, SLOT(calPlotEnergy()));
   connect(m_uiForm.cal_ckRES, SIGNAL(toggled(bool)), this, SLOT(resCheck(bool)));
   connect(m_uiForm.cal_ckIntensityScaleMultiplier, SIGNAL(toggled(bool)), this, SLOT(intensityScaleMultiplierCheck(bool)));
   connect(m_uiForm.cal_leIntensityScaleMultiplier, SIGNAL(textChanged(const QString &)), this, SLOT(calibValidateIntensity(const QString &)));

diff --git a/Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py b/Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py
@@ -74,7 +74,6 @@ def resolution(files, iconOpt, rebinParam, bground,
         CalculateFlatBackground(InputWorkspace=iconWS, OutputWorkspace=name, StartX=bground[0], EndX=bground[1], 
             Mode='Mean', OutputMode='Subtract Background')
         Rebin(InputWorkspace=name, OutputWorkspace=name, Params=rebinParam)
-        DeleteWorkspace(iconWS)
 
         SaveNexusProcessed(InputWorkspace=name, Filename=name+'.nxs')