From 0b3693eb8624c9a84bf6a6c07838f8e5c145a1d9 Mon Sep 17 00:00:00 2001
From: Andrei Savici <saviciat@ornl.gov>
Date: Fri, 17 Apr 2015 17:33:55 -0400
Subject: [PATCH] Mostly UI. refs #11585
---
.../WorkflowAlgorithms/SavePlot1D.py | 4 ++--
.../tests/analysis/CodeConventions.py | 2 ++
.../SystemTests/tests/analysis/DOSTest.py | 4 ++--
.../tests/analysis/ReduceOneSCD_Run.py | 1 -
.../tests/analysis/SNSPowderRedux.py | 24 +++++++++----------
.../TobyFitResolutionSimulationTest.py | 9 +++----
.../Mantid/scripts/CrystalTools/PeakReport.py | 15 +++++++-----
.../diffraction/ui_diffraction_adv_setup.py | 2 +-
.../ui_diffraction_filter_setup.py | 2 +-
.../diffraction/ui_diffraction_run_setup.py | 2 +-
.../ui/diffraction/ui_filter_info.py | 2 +-
.../ui/inelastic/ui_dgs_absolute_units.py | 2 +-
.../ui/inelastic/ui_dgs_data_corrections.py | 2 +-
.../ui/inelastic/ui_dgs_diagnose_detectors.py | 2 +-
.../ui/inelastic/ui_dgs_pd_sc_conversion.py | 2 +-
.../ui/inelastic/ui_dgs_sample_setup.py | 2 +-
.../Interface/ui/sans/ui_trans_direct_beam.py | 2 +-
.../Interface/ui/ui_cluster_details_dialog.py | 2 +-
.../scripts/Interface/ui/ui_cluster_status.py | 2 +-
.../scripts/Interface/ui/ui_data_catalog.py | 2 +-
.../scripts/Interface/ui/ui_hfir_output.py | 2 +-
.../Interface/ui/ui_instrument_dialog.py | 2 +-
.../scripts/Interface/ui/ui_reduction_main.py | 2 +-
.../scripts/Interface/ui/ui_stitcher.py | 2 +-
.../Interface/ui/ui_trans_direct_beam.py | 2 +-
.../scripts/Interface/ui/ui_trans_spreader.py | 2 +-
Code/Mantid/scripts/SANS/isis_instrument.py | 7 ++----
Code/Mantid/scripts/Vates/SXD_NaCl.py | 13 ++++++----
28 files changed, 61 insertions(+), 56 deletions(-)
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
index d2fdfd570aa..f27c92fd462 100644
--- a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
+++ b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
@@ -37,7 +37,7 @@ class SavePlot1D(mantid.api.PythonAlgorithm):
from distutils.version import LooseVersion
if LooseVersion(matplotlib.__version__)<LooseVersion("1.2.0"):
ok2run='Wrong version of matplotlib. Required >= 1.2.0'
- except:
+ except ImportError:
ok2run='Problem importing matplotlib'
if ok2run!='':
raise RuntimeError(ok2run)
@@ -46,7 +46,7 @@ class SavePlot1D(mantid.api.PythonAlgorithm):
import matplotlib.pyplot as plt
self._wksp = self.getProperty("InputWorkspace").value
plt.figure()
- if type(self._wksp)==mantid.api._api.WorkspaceGroup:
+ if type(self._wksp)==mantid.api.WorkspaceGroup:
for i in range(self._wksp.getNumberOfEntries()):
plt.subplot(self._wksp.getNumberOfEntries(),1,i+1)
self.DoPlot(self._wksp.getItem(i))
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/CodeConventions.py b/Code/Mantid/Testing/SystemTests/tests/analysis/CodeConventions.py
index 6e101eebcd5..ed6448af746 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/CodeConventions.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/CodeConventions.py
@@ -63,6 +63,7 @@ FUNC_BAD_PARAMS = {
class Algorithms(stresstesting.MantidStressTest):
def __init__(self):
+ super(Algorithms, self).__init__()
self.__ranOk = 0
self.algRegExp = re.compile(r'^[A-Z][a-zA-Z0-9]+$')
self.paramRegExp = re.compile(r'^[A-Z][a-zA-Z0-9]*$')
@@ -147,6 +148,7 @@ class Algorithms(stresstesting.MantidStressTest):
class FitFunctions(stresstesting.MantidStressTest):
def __init__(self):
+ super(FitFunctions, self).__init__()
self.__ranOk = 0
self.funcRegExp = re.compile(r'^[A-Z][a-zA-Z0-9]+$')
self.paramRegExp = re.compile(r'^[A-Z][a-zA-Z0-9]*$')
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/DOSTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/DOSTest.py
index ebaa9487eda..efbdc3bdb65 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/DOSTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/DOSTest.py
@@ -123,7 +123,7 @@ class DOSPartialCrossSectionScaleTest(stresstesting.MantidStressTest):
self.ref_result = 'II.DOSPartialCrossSectionScaleTest.nxs'
DensityOfStates(File=file_name, SpectrumType=spec_type, Ions="H,C,O", ScaleByCrossSection='Incoherent',
- OutputWorkspace=self.ouput_ws_name)
+ OutputWorkspace=self.ouput_ws_name)
def validate(self):
return self.ouput_ws_name, self.ref_result
@@ -146,7 +146,7 @@ class DOSPartialSummedContributionsCrossSectionScaleTest(stresstesting.MantidStr
self.tolerance = 1e-10
DensityOfStates(File=file_name, SpectrumType=spec_type, Ions="H,C,O", SumContributions=True,
- ScaleByCrossSection='Incoherent', OutputWorkspace=self.ouput_ws_name)
+ ScaleByCrossSection='Incoherent', OutputWorkspace=self.ouput_ws_name)
def validate(self):
return self.ouput_ws_name, self.ref_result
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
index f1e5a6fbf4e..ff3ba022855 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
@@ -19,7 +19,6 @@ import stresstesting
from mantid.api import *
-#sys.path.append("/home/ruth/GIT_MantidBuild/bin/")
from mantid.simpleapi import *
class ReduceOneSCD_Run( stresstesting.MantidStressTest):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SNSPowderRedux.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SNSPowderRedux.py
index 26f0aab056e..7db8091f619 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SNSPowderRedux.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SNSPowderRedux.py
@@ -10,25 +10,24 @@ def _skip_test():
import platform
# Only runs on RHEL6 at the moment
- return ("Linux" not in platform.platform())
+ return "Linux" not in platform.platform()
def getSaveDir():
"""determine where to save - the current working directory"""
- import os
return os.path.abspath(os.path.curdir)
def do_cleanup():
Files = ["PG3_9829.gsa",
- "PG3_9829.py",
- "PG3_9830.gsa",
- "PG3_9830.py",
- "PG3_4844-1.dat",
- "PG3_4844.getn",
- "PG3_4844.gsa",
- "PG3_4844.py",
- "PG3_4866.gsa"]
- for file in Files:
- absfile = FileFinder.getFullPath(file)
+ "PG3_9829.py",
+ "PG3_9830.gsa",
+ "PG3_9830.py",
+ "PG3_4844-1.dat",
+ "PG3_4844.getn",
+ "PG3_4844.gsa",
+ "PG3_4844.py",
+ "PG3_4866.gsa"]
+ for filename in Files:
+ absfile = FileFinder.getFullPath(filename)
if os.path.exists(absfile):
os.remove(absfile)
return True
@@ -96,7 +95,6 @@ class PG3StripPeaks(stresstesting.MantidStressTest):
def runTest(self):
# determine where to save
- import os
savedir = os.path.abspath(os.path.curdir)
LoadEventNexus(Filename="PG3_4866_event.nxs",
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/TobyFitResolutionSimulationTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/TobyFitResolutionSimulationTest.py
index 0c24b3cc234..94778c8ef5a 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/TobyFitResolutionSimulationTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/TobyFitResolutionSimulationTest.py
@@ -71,7 +71,8 @@ class TobyFitResolutionSimulationTest(MantidStressTest):
CreateModeratorModel(Workspace=fake_data,ModelType='IkedaCarpenterModerator',
Parameters="TiltAngle=32,TauF=2.7,TauS=0,R=0")
CreateChopperModel(Workspace=fake_data,ModelType='FermiChopperModel',
- Parameters="AngularVelocity=chopper_speed_log,ChopperRadius=0.049,SlitThickness=0.0023,SlitRadius=1.3,Ei=Ei,JitterSigma=0.0")
+ Parameters="AngularVelocity=chopper_speed_log,ChopperRadius=0.049,\
+ SlitThickness=0.0023,SlitRadius=1.3,Ei=Ei,JitterSigma=0.0")
##
## UB matrix
@@ -88,9 +89,9 @@ class TobyFitResolutionSimulationTest(MantidStressTest):
# Create the MD workspace
qscale = 'Q in A^-1'
- fake_md = ConvertToMD( InputWorkspace=fake_data, QDimensions="Q3D", QConversionScales=qscale,
- SplitInto=[3], SplitThreshold=100,
- MinValues="-15,-15,-15,-30", MaxValues="25,25,25,279",OverwriteExisting=True)
+ fake_md = ConvertToMD(InputWorkspace=fake_data, QDimensions="Q3D", QConversionScales=qscale,
+ SplitInto=[3], SplitThreshold=100,MinValues="-15,-15,-15,-30",
+ MaxValues="25,25,25,279",OverwriteExisting=True)
# Run the simulation.
resol_model = "TobyFitResolutionModel"
diff --git a/Code/Mantid/scripts/CrystalTools/PeakReport.py b/Code/Mantid/scripts/CrystalTools/PeakReport.py
index c7a28c6c3e5..f4b031dac0f 100644
--- a/Code/Mantid/scripts/CrystalTools/PeakReport.py
+++ b/Code/Mantid/scripts/CrystalTools/PeakReport.py
@@ -35,9 +35,9 @@ class PeakReport(object):
def clean_files(self):
# Clean up generated image files
- for file in self.__image_files:
- os.remove(file)
- self.__image_files.remove(file)
+ for ifile in self.__image_files:
+ os.remove(ifile)
+ self.__image_files.remove(ifile)
def __del__(self):
self.clean_files()
@@ -100,7 +100,8 @@ class PeakReport(object):
if not pdf_name:
pdf_name = md_workspace.name() + 'IntegrationReport.pdf'
- doc = SimpleDocTemplate(self.__out_location + pdf_name, pagesize=letter, leftMargin=2, rightMargin=2, topMargin=2.5, bottomMargin=2 ,showBoundary=1)
+ doc = SimpleDocTemplate(self.__out_location + pdf_name, pagesize=letter, leftMargin=2, rightMargin=2,
+ topMargin=2.5, bottomMargin=2 ,showBoundary=1)
parts = list()
styles = getSampleStyleSheet()
title = Paragraph("Peak Integration Report for %s" % md_workspace.name(), styles["Heading1"], )
@@ -144,8 +145,10 @@ class PeakReport(object):
# Get the peak object
peak = peaks_workspace.getPeak(i)
- infoData = [['PeakNumber:', i],['Run Number:', peak.getRunNumber()], ['Intensity:', peak.getIntensity()], ['TOF:', peak.getTOF()]]
- coordData = [['Detector Id:', peak.getDetectorID()], ['Q Lab:', peak.getQLabFrame()], ['Q Sample:', peak.getQSampleFrame()], ['HKL:', peak.getHKL()]]
+ infoData = [['PeakNumber:', i],['Run Number:', peak.getRunNumber()], ['Intensity:', peak.getIntensity()],
+ ['TOF:', peak.getTOF()]]
+ coordData = [['Detector Id:', peak.getDetectorID()], ['Q Lab:', peak.getQLabFrame()],
+ ['Q Sample:', peak.getQSampleFrame()], ['HKL:', peak.getHKL()]]
data = [[ img , Table(infoData), Table(coordData)]]
colwidths = (150, 160, 160)
diff --git a/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_adv_setup.py b/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_adv_setup.py
index 034e3994dcb..158727ebbdd 100644
--- a/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_adv_setup.py
+++ b/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_adv_setup.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes,too-many-statements
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'diffraction_adv_setup.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_filter_setup.py b/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_filter_setup.py
index d88b116c7de..1abb6824bda 100644
--- a/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_filter_setup.py
+++ b/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_filter_setup.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes,too-many-statements
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'diffraction_filter_setup.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_run_setup.py b/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_run_setup.py
index cc7c42d4b27..4f035b95c68 100644
--- a/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_run_setup.py
+++ b/Code/Mantid/scripts/Interface/ui/diffraction/ui_diffraction_run_setup.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes,too-many-statements
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'diffraction_run_setup.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/diffraction/ui_filter_info.py b/Code/Mantid/scripts/Interface/ui/diffraction/ui_filter_info.py
index 9a448ee278d..bbdf54f0bc3 100644
--- a/Code/Mantid/scripts/Interface/ui/diffraction/ui_filter_info.py
+++ b/Code/Mantid/scripts/Interface/ui/diffraction/ui_filter_info.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'filter_info.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_absolute_units.py b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_absolute_units.py
index 4a326237468..9d7c1ac7bb9 100644
--- a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_absolute_units.py
+++ b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_absolute_units.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes,too-many-statements
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/inelastic/dgs_absolute_units.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_data_corrections.py b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_data_corrections.py
index 6ad6b96db96..1ef11a3e125 100644
--- a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_data_corrections.py
+++ b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_data_corrections.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes,too-many-statements
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/inelastic/dgs_data_corrections.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_diagnose_detectors.py b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_diagnose_detectors.py
index dfbb26eecbe..3eddfed7c55 100644
--- a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_diagnose_detectors.py
+++ b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_diagnose_detectors.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes,too-many-statements
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/inelastic/dgs_diagnose_detectors.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_pd_sc_conversion.py b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_pd_sc_conversion.py
index 9cd9be76360..23344adf8f2 100644
--- a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_pd_sc_conversion.py
+++ b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_pd_sc_conversion.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/inelastic/dgs_pd_sc_conversion.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_sample_setup.py b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_sample_setup.py
index 88f73ac3988..d54978a8836 100644
--- a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_sample_setup.py
+++ b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_sample_setup.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes,too-many-statements
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file './dgs_sample_setup.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/sans/ui_trans_direct_beam.py b/Code/Mantid/scripts/Interface/ui/sans/ui_trans_direct_beam.py
index 423ff87ff5f..8a7308b7ce2 100644
--- a/Code/Mantid/scripts/Interface/ui/sans/ui_trans_direct_beam.py
+++ b/Code/Mantid/scripts/Interface/ui/sans/ui_trans_direct_beam.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes,too-many-statements
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/sans/trans_direct_beam.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/ui_cluster_details_dialog.py b/Code/Mantid/scripts/Interface/ui/ui_cluster_details_dialog.py
index d29d1c85259..3d1e66eb28a 100644
--- a/Code/Mantid/scripts/Interface/ui/ui_cluster_details_dialog.py
+++ b/Code/Mantid/scripts/Interface/ui/ui_cluster_details_dialog.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,too-many-instance-attributes
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/cluster_details_dialog.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/ui_cluster_status.py b/Code/Mantid/scripts/Interface/ui/ui_cluster_status.py
index edb55cc7111..2c4e73b0181 100644
--- a/Code/Mantid/scripts/Interface/ui/ui_cluster_status.py
+++ b/Code/Mantid/scripts/Interface/ui/ui_cluster_status.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/cluster_status.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/ui_data_catalog.py b/Code/Mantid/scripts/Interface/ui/ui_data_catalog.py
index 9893c53b9a4..e45838f492f 100644
--- a/Code/Mantid/scripts/Interface/ui/ui_data_catalog.py
+++ b/Code/Mantid/scripts/Interface/ui/ui_data_catalog.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/data_catalog.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/ui_hfir_output.py b/Code/Mantid/scripts/Interface/ui/ui_hfir_output.py
index b779a4dc13d..fee6fe518da 100644
--- a/Code/Mantid/scripts/Interface/ui/ui_hfir_output.py
+++ b/Code/Mantid/scripts/Interface/ui/ui_hfir_output.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/hfir_output.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/ui_instrument_dialog.py b/Code/Mantid/scripts/Interface/ui/ui_instrument_dialog.py
index 67b3ab66b28..f0355cfaa03 100644
--- a/Code/Mantid/scripts/Interface/ui/ui_instrument_dialog.py
+++ b/Code/Mantid/scripts/Interface/ui/ui_instrument_dialog.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,too-many-instance-attributes
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/instrument_dialog.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/ui_reduction_main.py b/Code/Mantid/scripts/Interface/ui/ui_reduction_main.py
index f3fecebf0c6..b7f965acb10 100644
--- a/Code/Mantid/scripts/Interface/ui/ui_reduction_main.py
+++ b/Code/Mantid/scripts/Interface/ui/ui_reduction_main.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'reduction_main.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/ui_stitcher.py b/Code/Mantid/scripts/Interface/ui/ui_stitcher.py
index 9ca6c11a4af..a607f4aa62a 100644
--- a/Code/Mantid/scripts/Interface/ui/ui_stitcher.py
+++ b/Code/Mantid/scripts/Interface/ui/ui_stitcher.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes,too-many-statements
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/stitcher.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/ui_trans_direct_beam.py b/Code/Mantid/scripts/Interface/ui/ui_trans_direct_beam.py
index d7a996b2600..a9f0c2a6260 100644
--- a/Code/Mantid/scripts/Interface/ui/ui_trans_direct_beam.py
+++ b/Code/Mantid/scripts/Interface/ui/ui_trans_direct_beam.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/trans_direct_beam.ui'
diff --git a/Code/Mantid/scripts/Interface/ui/ui_trans_spreader.py b/Code/Mantid/scripts/Interface/ui/ui_trans_spreader.py
index d5d5119dbcc..80a16af8b37 100644
--- a/Code/Mantid/scripts/Interface/ui/ui_trans_spreader.py
+++ b/Code/Mantid/scripts/Interface/ui/ui_trans_spreader.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init,line-too-long,too-many-instance-attributes
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'ui/trans_spreader.ui'
diff --git a/Code/Mantid/scripts/SANS/isis_instrument.py b/Code/Mantid/scripts/SANS/isis_instrument.py
index 2f1b19ea1c0..4560564c06b 100644
--- a/Code/Mantid/scripts/SANS/isis_instrument.py
+++ b/Code/Mantid/scripts/SANS/isis_instrument.py
@@ -1,11 +1,8 @@
#pylint: disable=invalid-name
-import datetime
import math
import os
import re
import sys
-import time
-import xml.dom.minidom
from mantid.simpleapi import *
from mantid.api import WorkspaceGroup, Workspace, ExperimentInfo
@@ -1382,7 +1379,7 @@ class LARMOR(ISISInstrument):
# The angle value
# Note that the x position gets converted from mm to m when read from the user file so we need to reverse this if X is now an angle
- if(int(run_num) < 2217):
+ if int(run_num) < 2217:
# Initial commisioning before run 2217 did not pay much attention to making sure the bench_rot value was meaningful
xshift = -xbeam
sanslog.notice("Setup move " + str(xshift*XSF) + " " + str(0.0) + " " + str(0.0))
@@ -1446,7 +1443,7 @@ class LARMOR(ISISInstrument):
run_num = ws_ref.getRun().getLogData('run_number').value
except:
run_num = int(re.findall(r'\d+',str(ws_name))[-1])
- if(int(run_num) >= 2217):
+ if int(run_num) >= 2217:
try:
#logger.warning("Trying get_detector_log")
log = self.get_detector_log(ws_ref)
diff --git a/Code/Mantid/scripts/Vates/SXD_NaCl.py b/Code/Mantid/scripts/Vates/SXD_NaCl.py
index 409c422541e..90448f33ae5 100644
--- a/Code/Mantid/scripts/Vates/SXD_NaCl.py
+++ b/Code/Mantid/scripts/Vates/SXD_NaCl.py
@@ -17,7 +17,9 @@ Load(Filename='SXD23767.raw',OutputWorkspace='SXD23767',LoadMonitors='Exclude')
#
# A lower SplitThreshold, with a reasonable bound on the recursion depth, helps find weaker peaks at higher Q.
#
-QLab = ConvertToDiffractionMDWorkspace(InputWorkspace='SXD23767', OutputDimensions='Q (lab frame)', SplitThreshold=50, LorentzCorrection='1',MaxRecursionDepth='13',Extents='-15,15,-15,15,-15,15')
+QLab = ConvertToDiffractionMDWorkspace(InputWorkspace='SXD23767', OutputDimensions='Q (lab frame)',
+ SplitThreshold=50, LorentzCorrection='1',
+ MaxRecursionDepth='13',Extents='-15,15,-15,15,-15,15')
#
# NaCl has a relatively small unit cell, so the distance between peaks is relatively large. Setting the PeakDistanceThreshold
@@ -44,11 +46,13 @@ if use_fft:
print '\nNiggli cell found from FindUBUsingFFT:'
if use_cubic_lat_par:
- FindUBUsingLatticeParameters(PeaksWorkspace=peaks_qLab, a=5.6402,b=5.6402,c=5.6402,alpha=90,beta=90,gamma=90,NumInitial=25,Tolerance=0.12)
+ FindUBUsingLatticeParameters(PeaksWorkspace=peaks_qLab, a=5.6402,b=5.6402,c=5.6402,
+ alpha=90,beta=90,gamma=90,NumInitial=25,Tolerance=0.12)
print '\nCubic cell found directly from FindUBUsingLatticeParameters'
if use_Niggli_lat_par:
- FindUBUsingLatticeParameters(PeaksWorkspace=peaks_qLab, a=3.9882,b=3.9882,c=3.9882,alpha=60,beta=60,gamma=60,NumInitial=25,Tolerance=0.12)
+ FindUBUsingLatticeParameters(PeaksWorkspace=peaks_qLab, a=3.9882,b=3.9882,c=3.9882,
+ alpha=60,beta=60,gamma=60,NumInitial=25,Tolerance=0.12)
print '\nNiggli cell found from FindUBUsingLatticeParameters:'
reportUnitCell(peaks_qLab)
@@ -59,7 +63,8 @@ if use_fft or use_Niggli_lat_par:
ShowPossibleCells(PeaksWorkspace=peaks_qLab,MaxScalarError='0.5')
SelectCellOfType(PeaksWorkspace=peaks_qLab, CellType='Cubic', Centering='F', Apply=True)
-peaks_qLab_Integrated = IntegratePeaksMD(InputWorkspace=QLab, PeaksWorkspace=peaks_qLab, PeakRadius=0.2, BackgroundInnerRadius=0.3, BackgroundOuterRadius=0.4)
+peaks_qLab_Integrated = IntegratePeaksMD(InputWorkspace=QLab, PeaksWorkspace=peaks_qLab, PeakRadius=0.2,
+ BackgroundInnerRadius=0.3, BackgroundOuterRadius=0.4)
binned=BinMD(InputWorkspace=QLab,AlignedDim0='Q_lab_x,-15,15,200',AlignedDim1='Q_lab_y,-15,15,200',AlignedDim2='Q_lab_z,-15,15,200')
--
GitLab