From d1da2d7bcc7fbc21aa88b5934bead959d9ac5bd7 Mon Sep 17 00:00:00 2001
From: Russell Taylor <taylorrj@ornl.gov>
Date: Thu, 29 Nov 2012 10:47:54 -0500
Subject: [PATCH] Re #6096. Replace tabs with spaces.
---
.../PythonAlgorithms/CreateEmptyTableWorkspace.py | 8 ++++----
.../PythonAlgorithms/CreateLeBailFitInput.py | 12 ++++++------
.../PythonAlgorithms/FindReflectometryLines.py | 2 +-
.../PythonAlgorithms/SelectPowderDiffPeaks.py | 12 ++++++------
.../UpdatePeakParameterTableValue.py | 14 +++++++-------
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/CreateEmptyTableWorkspace.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/CreateEmptyTableWorkspace.py
index 83081c3eec5..050e92d90c2 100644
--- a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/CreateEmptyTableWorkspace.py
+++ b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/CreateEmptyTableWorkspace.py
@@ -6,12 +6,12 @@ class CreateEmptyTableWorkspace(PythonAlgorithm):
def PyInit(self):
# Declare properties
- self.declareProperty(ITableWorkspaceProperty("OutputWorkspace", "", Direction.Output), "Name of Calibration Table Workspace")
+ self.declareProperty(ITableWorkspaceProperty("OutputWorkspace", "", Direction.Output), "Name of Calibration Table Workspace")
def PyExec(self):
- tableWS = WorkspaceFactory.createTable()
-
- self.setProperty("OutputWorkspace", tableWS)
+ tableWS = WorkspaceFactory.createTable()
+
+ self.setProperty("OutputWorkspace", tableWS)
# Register algorithm with Mantid
registerAlgorithm(CreateEmptyTableWorkspace)
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/CreateLeBailFitInput.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/CreateLeBailFitInput.py
index aa5659201e7..674228a5432 100644
--- a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/CreateLeBailFitInput.py
+++ b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/CreateLeBailFitInput.py
@@ -32,10 +32,10 @@ class CreateLeBailFitInput(PythonAlgorithm):
self.declareProperty("LatticeConstant", 10.0, "Lattice constant for cubic lattice in nm.")
- self.declareProperty(ITableWorkspaceProperty("InstrumentParameterWorkspace", "", Direction.Output),
+ self.declareProperty(ITableWorkspaceProperty("InstrumentParameterWorkspace", "", Direction.Output),
"Name of Table Workspace Containing Peak Parameters From .irf File.")
- self.declareProperty(ITableWorkspaceProperty("BraggPeakParameterWorkspace", "", Direction.Output),
+ self.declareProperty(ITableWorkspaceProperty("BraggPeakParameterWorkspace", "", Direction.Output),
"Name of Table Workspace Containing Peaks' Miller Indices From .prf File.")
return
@@ -44,11 +44,11 @@ class CreateLeBailFitInput(PythonAlgorithm):
""" Main Execution Body
"""
# 1. Setup output workspaces
- paramWS = WorkspaceFactory.createTable()
- self.setProperty("InstrumentParameterWorkspace", paramWS)
+ paramWS = WorkspaceFactory.createTable()
+ self.setProperty("InstrumentParameterWorkspace", paramWS)
- hklWS = WorkspaceFactory.createTable()
- self.setProperty("BraggPeakParameterWorkspace", hklWS)
+ hklWS = WorkspaceFactory.createTable()
+ self.setProperty("BraggPeakParameterWorkspace", hklWS)
# 2. Get Other Properties
instrument = self.getProperty("Instrument")
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/FindReflectometryLines.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/FindReflectometryLines.py
index e7025dfaa0a..e8614508b27 100644
--- a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/FindReflectometryLines.py
+++ b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/FindReflectometryLines.py
@@ -101,6 +101,6 @@ class FindReflectometryLines(PythonAlgorithm):
DeleteWorkspace(Workspace=cropped_ws)
DeleteWorkspace(Workspace=summed_ws)
- self.setProperty("OutputWorkspace", output_ws)
+ self.setProperty("OutputWorkspace", output_ws)
registerAlgorithm(FindReflectometryLines())
\ No newline at end of file
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SelectPowderDiffPeaks.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SelectPowderDiffPeaks.py
index 2a4636654af..798efea8faf 100644
--- a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SelectPowderDiffPeaks.py
+++ b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SelectPowderDiffPeaks.py
@@ -25,13 +25,13 @@ class SelectPowderDiffPeaks(PythonAlgorithm):
def PyInit(self):
""" Declare properties
"""
- self.declareProperty(ITableWorkspaceProperty("BraggPeakParameterWorkspace", "", Direction.Input),
+ self.declareProperty(ITableWorkspaceProperty("BraggPeakParameterWorkspace", "", Direction.Input),
"Name of Table Workspace containing peak parameters.")
- self.declareProperty(ITableWorkspaceProperty("ZscoreWorkspace", "", Direction.Input),
+ self.declareProperty(ITableWorkspaceProperty("ZscoreWorkspace", "", Direction.Input),
"Name of Table Workspace containing z-score for the peak parametrs.")
- self.declareProperty(ITableWorkspaceProperty("OutputBraggPeakParameterWorkspace", "", Direction.Output),
+ self.declareProperty(ITableWorkspaceProperty("OutputBraggPeakParameterWorkspace", "", Direction.Output),
"Name of Table Workspace containing the filtered peaks' parameters.")
self.declareProperty("MinimumPeakHeight", 0.0, "Minimum peak height allowed for the peaks to fit. ")
@@ -64,13 +64,13 @@ class SelectPowderDiffPeaks(PythonAlgorithm):
self.filterByPeakHeight(minpeakheight)
# 5. Filter by zscore
- zscorefilterdict = self.parseZscoreFilter(zscorefilterstr)
+ zscorefilterdict = self.parseZscoreFilter(zscorefilterstr)
self.filterByZscore(zscoredict, zscorefilterdict)
# 6. Generate the output
- paramWS = WorkspaceFactory.createTable()
+ paramWS = WorkspaceFactory.createTable()
self.genBraggPeakParameterWorkspace(paramWS)
- self.setProperty("OutputBraggPeakParameterWorkspace", paramWS)
+ self.setProperty("OutputBraggPeakParameterWorkspace", paramWS)
return
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/UpdatePeakParameterTableValue.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/UpdatePeakParameterTableValue.py
index e10ae7aca37..5db05803dbe 100644
--- a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/UpdatePeakParameterTableValue.py
+++ b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/UpdatePeakParameterTableValue.py
@@ -31,7 +31,7 @@ class UpdatePeakParameterTableValue(mantid.api.PythonAlgorithm):
""" Property definition
"""
tableprop = mantid.api.ITableWorkspaceProperty("InputWorkspace", "", mantid.kernel.Direction.InOut)
- self.declareProperty(tableprop, "Name of Calibration Table Workspace")
+ self.declareProperty(tableprop, "Name of Calibration Table Workspace")
colchoices = ["Value", "FitOrTie", "Min", "Max", "StepSize"]
self.declareProperty("Column", "Value", mantid.kernel.StringListValidator(colchoices), "Column to have value changed")
@@ -110,7 +110,7 @@ class UpdatePeakParameterTableValue(mantid.api.PythonAlgorithm):
(2) *partialname
(3) partialname*
(4) *partialname*
- (5) partialname?
+ (5) partialname?
Argument:
- parametername: parameter name to change value
@@ -151,10 +151,10 @@ class UpdatePeakParameterTableValue(mantid.api.PythonAlgorithm):
if parname_low.startswith(corestr):
ismatch = True
- elif parnametofit.endswith("?"):
- # NNNNN?
- corestr = parnametofit.split("?")[0]
- if parname_low.startswith(corestr) and len(parname_low) == len(parnametofit):
+ elif parnametofit.endswith("?"):
+ # NNNNN?
+ corestr = parnametofit.split("?")[0]
+ if parname_low.startswith(corestr) and len(parname_low) == len(parnametofit):
ismatch = True
# ENDIFELSE
@@ -199,7 +199,7 @@ class UpdatePeakParameterTableValue(mantid.api.PythonAlgorithm):
numrows = tablews.rowCount()
for irow in xrange(numrows):
- parname = tablews.cell(irow, 0)
+ parname = tablews.cell(irow, 0)
parname = parname.lower()
parnamedict[parname] = irow
self.parameternames.append(parname)
--
GitLab