diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/LRPrimaryFraction.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/LRPrimaryFraction.py
index 9c0c3994fd85a2a27fa2582fa5c4515fe3b9eb0a..21b91e6452b6e8cbc4e7c695b673c96c6e697408 100644
--- a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/LRPrimaryFraction.py
+++ b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/LRPrimaryFraction.py
@@ -30,10 +30,10 @@ class LRPrimaryFraction(PythonAlgorithm):
def PyExec(self):
workspace = self.getProperty("InputWorkspace").value
-
+
# Background offset in number of pixels
bck_width = self.getProperty("BackgroundWidth").value
-
+
# Signal region
[peak_from_pixel, peak_to_pixel] = self.getProperty("SignalRange").value
@@ -60,12 +60,14 @@ class LRPrimaryFraction(PythonAlgorithm):
avg_bck = 0
avg_bck_err = 0
for i in range(bck_from_pixel, peak_from_pixel):
- if data_e[i] == 0: data_e[i] = 1.0
+ if data_e[i] == 0:
+ data_e[i] = 1.0
avg_bck += data_y[i] / data_e[i] / data_e[i]
avg_bck_err += 1.0 / data_e[i] / data_e[i]
for i in range(peak_to_pixel+1, bck_to_pixel+1):
- if data_e[i] == 0: data_e[i] = 1
+ if data_e[i] == 0:
+ data_e[i] = 1
avg_bck += data_y[i] / data_e[i] / data_e[i]
avg_bck_err += 1.0 / data_e[i] / data_e[i]
@@ -78,7 +80,8 @@ class LRPrimaryFraction(PythonAlgorithm):
specular_counts_err = 0
for i in range(peak_from_pixel, peak_to_pixel+1):
specular_counts += data_y[i] - avg_bck
- if data_e[i] == 0: data_e[i] = 1.0
+ if data_e[i] == 0:
+ data_e[i] = 1.0
specular_counts_err += data_e[i] * data_e[i] + avg_bck_err * avg_bck_err
specular_counts_err = math.sqrt(specular_counts_err)
@@ -87,7 +90,7 @@ class LRPrimaryFraction(PythonAlgorithm):
# Specular ratio
r = specular_counts / total_counts
r_err = r * math.sqrt(specular_counts_err * specular_counts_err / specular_counts / specular_counts) + 1.0/total_counts
-
+
self.setProperty("ScalingFactor", [r, r_err])
logger.information("Total counts: %s" % total_counts)
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CreateMD.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CreateMD.py
index 5752dd82aa83d6ea1bb16dbdfcc447f05fa764d0..dcc85255c6ee9758beeb27baecb5e916e3a67e39 100644
--- a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CreateMD.py
+++ b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CreateMD.py
@@ -2,7 +2,6 @@
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
-import numpy as np
import __builtin__
@@ -77,7 +76,6 @@ class CreateMD(DataProcessorAlgorithm):
return merge_alg.getProperty('OutputWorkspace').value
def _single_run(self, input_workspace, emode, psi, gl, gs, alatt=None, angdeg=None, u=None, v=None,):
- import numpy as np
ub_params = map(any, [alatt, angdeg, u, v])
goniometer_params = [psi, gl, gs]
if any(ub_params) and not all(ub_params):
@@ -86,17 +84,18 @@ class CreateMD(DataProcessorAlgorithm):
if input_workspace.sample().hasOrientedLattice():
logger.warning("Sample already has a UB. This will not be overwritten by %s. Use ClearUB and re-run."%self.name())
else:
- self._set_ub(workspace=input_workspace, a=alatt[0], b=alatt[1], c=alatt[2], alpha=angdeg[0], beta=angdeg[1], gamma=angdeg[2], u=u, v=v)
+ self._set_ub(workspace=input_workspace, a=alatt[0], b=alatt[1], c=alatt[2],
+ alpha=angdeg[0], beta=angdeg[1], gamma=angdeg[2], u=u, v=v)
if any(goniometer_params):
self._add_sample_log(workspace=input_workspace, log_name='gl', log_number=gl)
self._add_sample_log(workspace=input_workspace, log_name='gs', log_number=gs)
self._add_sample_log(workspace=input_workspace, log_name='psi', log_number=psi)
self._set_goniometer(workspace=input_workspace)
-
+
output_run = self._convert_to_md(workspace=input_workspace, analysis_mode=emode)
return output_run
-
+
def category(self):
return 'MDAlgorithms'
@@ -127,7 +126,6 @@ class CreateMD(DataProcessorAlgorithm):
self.declareProperty(IMDWorkspaceProperty('OutputWorkspace', '', direction=Direction.Output ), doc='Output MDWorkspace')
def _validate_inputs(self):
-
emode = self.getProperty('Emode').value
alatt = self.getProperty('Alatt').value
angdeg = self.getProperty('Angdeg').value
@@ -135,40 +133,40 @@ class CreateMD(DataProcessorAlgorithm):
v = self.getProperty('v').value
psi = self.getProperty('Psi').value
gl = self.getProperty('Gl').value
- gs = self.getProperty('Gs').value
+ gs = self.getProperty('Gs').value
input_workspaces = self.getProperty("InputWorkspaces").value
-
+
ws_entries = len(input_workspaces)
-
+
if ws_entries < 1:
raise ValueError("Need one or more input workspace")
-
+
if len(u) != 3:
raise ValueError("u must have 3 components")
-
+
if len(v) != 3:
raise ValueError("v must have 3 components")
-
+
if len(alatt) != 3:
raise ValueError("lattice parameters must have 3 components")
-
+
if len(angdeg) != 3:
raise ValueError("Angle must have 3 components")
if not emode in self._possible_emodes():
raise ValueError("Unknown emode %s Allowed values are %s" % (emode, self._possible_emodes()))
-
+
if len(psi) > 0 and len(psi) != ws_entries:
raise ValueError("If Psi is given a entry should be provided for every input workspace")
-
+
if len(gl) > 0 and len(gl) != ws_entries:
raise ValueError("If Gl is given a entry should be provided for every input workspace")
-
+
if len(gs) > 0 and len(gs) != ws_entries:
raise ValueError("If Gs is given a entry should be provided for every input workspace")
-
-
+
+
def PyExec(self):
logger.warning('You are running algorithm %s that is the beta stage of development' % (self.name()))
@@ -204,12 +202,12 @@ class CreateMD(DataProcessorAlgorithm):
run_data = zip(input_workspaces, psi, gl, gs)
for run_entry in run_data:
- ws_name, psi_entry, gl_entry, gs_entry = run_entry
- ws = AnalysisDataService.retrieve(ws_name)
- run_md = self._single_run(input_workspace=ws, emode=emode, alatt=alatt, angdeg=angdeg, u=u, v=v, psi=psi_entry, gl=gl_entry, gs=gs_entry)
- to_merge_name = ws_name + "_md"
- AnalysisDataService.addOrReplace(to_merge_name, run_md)
- to_merge_names.append(to_merge_name)
+ ws_name, psi_entry, gl_entry, gs_entry = run_entry
+ ws = AnalysisDataService.retrieve(ws_name)
+ run_md = self._single_run(input_workspace=ws, emode=emode, alatt=alatt, angdeg=angdeg, u=u, v=v, psi=psi_entry, gl=gl_entry, gs=gs_entry)
+ to_merge_name = ws_name + "_md"
+ AnalysisDataService.addOrReplace(to_merge_name, run_md)
+ to_merge_names.append(to_merge_name)
if len(to_merge_names) > 1:
output_workspace = self._merge_runs(to_merge_names)
@@ -221,12 +219,5 @@ class CreateMD(DataProcessorAlgorithm):
DeleteWorkspace(ws)
self.setProperty("OutputWorkspace", output_workspace)
-
-
-
-
-
-
-
AlgorithmFactory.subscribe(CreateMD)
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/dnsdata.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/dnsdata.py
index 6ecc991aefa652c136c4c011281249c80a09ae31..852d1205ceb1b945315a90eef52bb6b77af1474c 100644
--- a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/dnsdata.py
+++ b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/dnsdata.py
@@ -195,7 +195,7 @@ class DNSdata:
except ValueError:
# if start and end time are not given, let them empty
pass
-
+
def parse_header(h):
"""
diff --git a/Code/Mantid/scripts/DGSPlanner/InstrumentSetupWidget.py b/Code/Mantid/scripts/DGSPlanner/InstrumentSetupWidget.py
index 51de7ddea24e269d5d79b52d527d8c8e22ae4c6f..f05ec54cbfef436f1e053026f88cba90c1eb5d79 100644
--- a/Code/Mantid/scripts/DGSPlanner/InstrumentSetupWidget.py
+++ b/Code/Mantid/scripts/DGSPlanner/InstrumentSetupWidget.py
@@ -5,7 +5,7 @@ import mantid
import numpy
import matplotlib
matplotlib.use('Qt4Agg')
-matplotlib.rcParams['backend.qt4']='PyQt4'
+matplotlib.rcParams['backend.qt4']='PyQt4'
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
from matplotlib.figure import Figure
from mpl_toolkits.mplot3d import Axes3D
diff --git a/Code/Mantid/scripts/FilterEvents/Ui_MainWindow.py b/Code/Mantid/scripts/FilterEvents/Ui_MainWindow.py
index dce63f3d90f9fb60e357a51b6909b077edfd07a4..6b3131f3a889ea74b206f4725814e3229b957eba 100644
--- a/Code/Mantid/scripts/FilterEvents/Ui_MainWindow.py
+++ b/Code/Mantid/scripts/FilterEvents/Ui_MainWindow.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name,attribute-defined-outside-init
+#pylint: disable=invalid-name,attribute-defined-outside-init,too-many-locals, too-many-statements,too-many-instance-attributes
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'MainWindow.ui'
diff --git a/Code/Mantid/scripts/FilterEvents/eventFilterGUI.py b/Code/Mantid/scripts/FilterEvents/eventFilterGUI.py
index eec342adbde464590c847830ec922310f2a7260b..c065473b1188eeaa872b83ec073d038986c68369 100644
--- a/Code/Mantid/scripts/FilterEvents/eventFilterGUI.py
+++ b/Code/Mantid/scripts/FilterEvents/eventFilterGUI.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name, too-many-lines, too-many-instance-attributes
import numpy
from FilterEvents.Ui_MainWindow import Ui_MainWindow #import line for the UI python class
@@ -292,8 +292,6 @@ class MainWindow(QtGui.QMainWindow):
def computeMock(self):
""" Compute vecx and vecy as mocking
"""
- import random, math
-
x0 = 0.
xf = 1.
dx = 0.1
@@ -672,10 +670,10 @@ class MainWindow(QtGui.QMainWindow):
filename = str(self.ui.lineEdit.text())
# Find out it is relative path or absolute path
- if os.path.abspath(filename) == filename:
- isabspath = True
- else:
- isabspath = False
+ #if os.path.abspath(filename) == filename:
+ # isabspath = True
+ #else:
+ # isabspath = False
dataws = self._loadFile(str(filename))
if dataws is None:
@@ -1018,12 +1016,6 @@ class MainWindow(QtGui.QMainWindow):
title = str(self.ui.lineEdit_title.text())
- """ Debug
- for k in kwargs.keys():
- print k, kwargs[k], type(kwargs[k])
- print "Input workspace = ", str(self._dataWS)
- END DB """
-
splitws, infows = api.GenerateEventsFilter(\
InputWorkspace = self._dataWS,\
UnitOfTime = "Seconds",\
@@ -1171,7 +1163,7 @@ class MainWindow(QtGui.QMainWindow):
tablewsnames = []
for wsname in wsnames:
wksp = AnalysisDataService.retrieve(wsname)
- if isinstance(wksp, mantid.api._api.ITableWorkspace):
+ if isinstance(wksp, mantid.api.ITableWorkspace):
tablewsnames.append(wsname)
# ENDFOR
diff --git a/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_info.py b/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_info.py
index 8db4195d820dfd955010b3e121c2ec0a5ac9424a..d7fd8a137e51d1b7a946b2ac3430562cc6104714 100644
--- a/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_info.py
+++ b/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_info.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,line-too-long,attribute-defined-outside-init
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'diffraction_info.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/reflectometer/ui_data_refl_simple.py b/Code/Mantid/scripts/Interface/ui/reflectometer/ui_data_refl_simple.py
index 4af2bc635311bd4ac3dd96d4dd238b9655d63950..a0952c1fadd6a895d0822e45c65bb47dd3175736 100644
--- a/Code/Mantid/scripts/Interface/ui/reflectometer/ui_data_refl_simple.py
+++ b/Code/Mantid/scripts/Interface/ui/reflectometer/ui_data_refl_simple.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,line-too-long,too-many-lines,too-many-instance-attributes,too-many-locals,too-many-statements,attribute-defined-outside-init
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'data_refl_simple.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/reflectometer/ui_refm_reduction.py b/Code/Mantid/scripts/Interface/ui/reflectometer/ui_refm_reduction.py
index 267934bda984dd536dc8e886e82d79731dad94e3..431559f14a99f17949a6a1d33d3bf9dfcb84e833 100644
--- a/Code/Mantid/scripts/Interface/ui/reflectometer/ui_refm_reduction.py
+++ b/Code/Mantid/scripts/Interface/ui/reflectometer/ui_refm_reduction.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,line-too-long,too-many-lines,too-many-instance-attributes,too-many-locals,too-many-statements,attribute-defined-outside-init
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'refm_reduction.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/sans/ui_eqsans_instrument.py b/Code/Mantid/scripts/Interface/ui/sans/ui_eqsans_instrument.py
index 870b7a7d93c55866b2f2154475b202d8376c8c07..88ef626d86b250755eb3d1492e65a7512c753c7a 100644
--- a/Code/Mantid/scripts/Interface/ui/sans/ui_eqsans_instrument.py
+++ b/Code/Mantid/scripts/Interface/ui/sans/ui_eqsans_instrument.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,line-too-long,too-many-instance-attributes,too-many-statements,attribute-defined-outside-init
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/sans/eqsans_instrument.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/sans/ui_hfir_instrument.py b/Code/Mantid/scripts/Interface/ui/sans/ui_hfir_instrument.py
index 2224f3ec82bd5e747bbffd1e1f9c290d03ac7828..a9b2337330e236bccaa954dd9df4f3545c0e46af 100644
--- a/Code/Mantid/scripts/Interface/ui/sans/ui_hfir_instrument.py
+++ b/Code/Mantid/scripts/Interface/ui/sans/ui_hfir_instrument.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,line-too-long,too-many-instance-attributes,too-many-statements,attribute-defined-outside-init
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/sans/hfir_instrument.ui'