Skip to content

Commit

Permalink
refs #6534 Removed button and assciated code.
Browse files Browse the repository at this point in the history
  • Loading branch information
DereckKachere committed Feb 13, 2013
1 parent 5d44ab6 commit b109dc0
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,6 @@
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="elwin_ckConcat">
<property name="text">
<string>Concatanate Multiple Results</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
Expand Down Expand Up @@ -2209,7 +2202,6 @@
<tabstops>
<tabstop>tabWidget</tabstop>
<tabstop>elwin_pbPlotInput</tabstop>
<tabstop>elwin_ckConcat</tabstop>
<tabstop>elwin_ckVerbose</tabstop>
<tabstop>elwin_ckPlot</tabstop>
<tabstop>elwin_ckSave</tabstop>
Expand Down
7 changes: 0 additions & 7 deletions Code/Mantid/MantidQt/CustomInterfaces/src/Elwin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,6 @@ namespace IDA
pyInput +=
"eq1_ws, eq2_ws = elwin(input, eRange, Save=save, Verbose=verbose, Plot=plot)\n";

if ( uiForm().elwin_ckConcat->isChecked() )
{
pyInput += "from IndirectDataAnalysis import concatWSs\n"
"concatWSs(eq1_ws, 'MomentumTransfer', 'ElwinQResults')\n"
"concatWSs(eq2_ws, 'QSquared', 'ElwinQSqResults')\n";
}

QString pyOutput = runPythonCode(pyInput).trimmed();

}
Expand Down
16 changes: 0 additions & 16 deletions Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,6 @@
# Misc. Helper Functions
##############################################################################

def concatWSs(workspaces, unit, name):
dataX = []
dataY = []
dataE = []
for ws in workspaces:
readX = mtd[ws].readX(0)
readY = mtd[ws].readY(0)
readE = mtd[ws].readE(0)
for i in range(0, len(readX)):
dataX.append(readX[i])
for i in range(0, len(readY)):
dataY.append(readY[i])
dataE.append(readE[i])
CreateWorkspace(OutputWorkspace=name, DataX=dataX, DataY=dataY, DataE=dataE,
NSpec=len(workspaces), UnitX=unit)

def split(l, n):
#Yield successive n-sized chunks from l.
for i in xrange(0, len(l), n):
Expand Down

0 comments on commit b109dc0

Please sign in to comment.