From f221bbc9c076a89c1c870bbfeda4069d8c48fa35 Mon Sep 17 00:00:00 2001
From: Dan Nixon <dan@dan-nixon.com>
Date: Thu, 9 Apr 2015 10:44:21 +0100
Subject: [PATCH] More PyLint fixes in tests
Refs #11502
---
.../tests/analysis/BASISAutoReduction.py | 2 +-
.../tests/analysis/BuildSQWTest.py | 2 +-
.../tests/analysis/CRISPLoadingTest.py | 2 +-
.../CalibrateRectangularDetector_Test.py | 3 +-
.../SystemTests/tests/analysis/DOSTest.py | 2 +-
.../analysis/Diffraction_Workflow_Test.py | 12 +++--
.../analysis/DirectInelasticDiagnostic.py | 4 +-
.../analysis/DirectInelasticDiagnostic2.py | 2 +-
.../tests/analysis/EQSANSBeamCenterAPIv2.py | 3 +-
.../tests/analysis/EQSANSDarkCurrentAPIv2.py | 7 ++-
.../tests/analysis/EQSANSEffAPIv2.py | 3 +-
.../tests/analysis/EQSANSFlatTestAPIv2.py | 3 +-
.../tests/analysis/EQSANSIQOutputAPIv2.py | 13 +++--
.../tests/analysis/EQSANSProcessedEffAPIv2.py | 3 +-
.../tests/analysis/EQSANSSolidAPIv2.py | 6 +--
.../tests/analysis/EQSANSTransAPIv2.py | 3 +-
.../tests/analysis/EllipsoidIntegr.py | 7 ---
.../tests/analysis/EnginXCalibrateTest.py | 1 -
.../analysis/FilteredLoadvsLoadThenFilter.py | 10 ++--
.../SystemTests/tests/analysis/GEMTests.py | 49 +++++++++++++------
.../tests/analysis/HFIRBackgroundAPIv2.py | 3 +-
.../tests/analysis/HFIREffAPIv2.py | 3 +-
.../tests/analysis/HFIRReductionAPIv2.py | 1 -
.../tests/analysis/HFIRTransAPIv2.py | 3 +-
.../SystemTests/tests/analysis/ILLD2BTest.py | 2 -
.../SystemTests/tests/analysis/ILLD33Test.py | 2 -
.../tests/analysis/INTERLoadingTest.py | 2 +-
.../tests/analysis/ISISDirectInelastic.py | 2 -
.../analysis/ISISDirectReductionComponents.py | 7 ++-
.../tests/analysis/ISISLoadingEventData.py | 2 +-
.../tests/analysis/ISISMuonAnalysis.py | 6 +--
.../analysis/ISISMuonAnalysisGrouping.py | 7 ++-
.../tests/analysis/ISIS_LETReduction.py | 3 +-
.../tests/analysis/ISIS_MAPS_DGSReduction.py | 3 +-
.../tests/analysis/ISIS_MERLINReduction.py | 1 -
.../tests/analysis/ISIS_MariReduction.py | 2 +-
.../analysis/IndirectDiffractionTests.py | 1 +
.../tests/analysis/REFLReduction.py | 4 +-
.../tests/analysis/REFLWithBackground.py | 4 +-
.../tests/analysis/REFMReduction.py | 2 +-
.../SystemTests/tests/analysis/RawVNexus.py | 2 +-
.../SystemTests/tests/analysis/RefRoi.py | 7 ++-
.../tests/analysis/ReflectometryISIS.py | 18 ++++---
.../ReflectometryQuickCombineMulti.py | 3 +-
.../ReflectometryQuickMultiDetector.py | 9 ++--
.../SystemTests/tests/analysis/SANS2DBatch.py | 2 +-
.../analysis/SANS2DLOQReloadWorkspaces.py | 2 -
.../tests/analysis/SANS2DMultiPeriod.py | 4 +-
.../tests/analysis/SANS2DReductionGUI.py | 3 +-
.../tests/analysis/SANS2DReductionGUIAdded.py | 4 --
.../tests/analysis/SANS2DSearchCentreGUI.py | 32 ------------
.../tests/analysis/SANS2DSlicing.py | 2 +-
.../tests/analysis/SANSLoadersTest.py | 4 +-
.../tests/analysis/SNSConvertToMDTest.py | 4 +-
.../tests/analysis/SNSPowderRedux.py | 1 +
.../SystemTests/tests/analysis/SXDAnalysis.py | 4 +-
.../tests/analysis/SphinxWarnings.py | 3 +-
.../SystemTests/tests/analysis/StepScan.py | 5 +-
.../tests/analysis/TOPAZPeakFinding.py | 15 ++++--
.../tests/analysis/ValidateGroupingFiles.py | 2 +-
.../ValidateInstrumentDefinitionFiles.py | 2 +-
.../tests/analysis/ValidateParameterFiles.py | 2 -
.../tests/analysis/VesuvioFittingTest.py | 2 +-
.../tests/analysis/WishAnalysis.py | 7 ++-
.../tests/analysis/WishDiffuseScattering.py | 23 ++++++---
.../SystemTests/tests/analysis/WishMasking.py | 7 +--
.../SystemTests/tests/analysis/utils.py | 4 +-
67 files changed, 175 insertions(+), 195 deletions(-)
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/BASISAutoReduction.py b/Code/Mantid/Testing/SystemTests/tests/analysis/BASISAutoReduction.py
index 5cce60b77bf..7c999280f96 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/BASISAutoReduction.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/BASISAutoReduction.py
@@ -1,10 +1,10 @@
+#pylint: disable=no-init,attribute-defined-outside-init
"""
System Test for BASIS autoreduction
"""
from mantid.simpleapi import *
import stresstesting
-import shutil
import os
class BASISAutoReductionTest(stresstesting.MantidStressTest):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/BuildSQWTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/BuildSQWTest.py
index e6be1495df3..f97d908b12a 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/BuildSQWTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/BuildSQWTest.py
@@ -155,4 +155,4 @@ class LoadSQW_MemBasedTest(BuildSQWTest):
DeleteWorkspace("wsMD")
- return rez[0];
+ return rez[0]
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/CRISPLoadingTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/CRISPLoadingTest.py
index a18d3c84f20..784435f1e1a 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/CRISPLoadingTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/CRISPLoadingTest.py
@@ -22,4 +22,4 @@ class CRISPLoadingTest(LoadAndCheckBase):
return "CSP85423_1Integrated.nxs"
def get_expected_instrument_name(self):
- return "CRISP"
+ return "CRISP"
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py b/Code/Mantid/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
index 88b8421a9de..f2f78439cf5 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
@@ -1,7 +1,6 @@
-#pylint: disable=invalid-name,no-init
+#pylint: disable=invalid-name,no-init,attribute-defined-outside-init
import stresstesting
from mantid.simpleapi import *
-from time import strftime
import os
def _skip_test():
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/DOSTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/DOSTest.py
index 1e8bd095dcb..ebaa9487eda 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/DOSTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/DOSTest.py
@@ -1,4 +1,4 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
from mantid.kernel import *
from mantid.api import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py b/Code/Mantid/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
index 153a43f2a87..bc2e057934c 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
@@ -111,7 +111,8 @@ class Diffraction_Workflow_Test(stresstesting.MantidStressTest):
self.assertDelta( ol.gamma(), 90, 0.4, "Correct lattice angle gamma value not found.")
# Go to HKL
- ConvertToDiffractionMDWorkspace(InputWorkspace='TOPAZ_3132',OutputWorkspace='TOPAZ_3132_HKL',OutputDimensions='HKL',LorentzCorrection='1',SplitInto='2',SplitThreshold='150')
+ ConvertToDiffractionMDWorkspace(InputWorkspace='TOPAZ_3132',OutputWorkspace='TOPAZ_3132_HKL',
+ OutputDimensions='HKL',LorentzCorrection='1',SplitInto='2',SplitThreshold='150')
# Bin to a line (H=0 to 6, L=3, K=3)
@@ -130,10 +131,12 @@ class Diffraction_Workflow_Test(stresstesting.MantidStressTest):
# Now do the same peak finding with Q in the sample frame
- ConvertToDiffractionMDWorkspace(InputWorkspace='TOPAZ_3132',OutputWorkspace='TOPAZ_3132_QSample',OutputDimensions='Q (sample frame)',LorentzCorrection='1',SplitInto='2',SplitThreshold='150')
+ ConvertToDiffractionMDWorkspace(InputWorkspace='TOPAZ_3132',OutputWorkspace='TOPAZ_3132_QSample',
+ OutputDimensions='Q (sample frame)',LorentzCorrection='1',SplitInto='2',SplitThreshold='150')
FindPeaksMD(InputWorkspace='TOPAZ_3132_QSample',PeakDistanceThreshold='0.12',MaxPeaks='200',OutputWorkspace='peaks_QSample')
FindUBUsingFFT(PeaksWorkspace='peaks_QSample',MinD='2',MaxD='16')
- CopySample(InputWorkspace='peaks_QSample',OutputWorkspace='TOPAZ_3132',CopyName='0',CopyMaterial='0',CopyEnvironment='0',CopyShape='0')
+ CopySample(InputWorkspace='peaks_QSample',OutputWorkspace='TOPAZ_3132',CopyName='0',CopyMaterial='0',
+ CopyEnvironment='0',CopyShape='0')
# Index the peaks and check
results = IndexPeaks(PeaksWorkspace='peaks_QSample')
@@ -159,7 +162,8 @@ class Diffraction_Workflow_Test(stresstesting.MantidStressTest):
for c in xrange(3):
# This compares each column, allowing old == new OR old == -new
if not numpy.all(diff[:,c]) :
- raise Exception("More than 0.001 difference between UB matrices: Q (lab frame):\n%s\nQ (sample frame):\n%s" % (originalUB, newUB) )
+ raise Exception("More than 0.001 difference between UB matrices: Q (lab frame):\n%s\nQ (sample frame):\n%s" % (
+ originalUB, newUB) )
# load output hkl file and the golden one
LoadHKL(Filename="TOPAZ_3132.hkl", OutputWorkspace="TOPAZ_3132")
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic.py b/Code/Mantid/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic.py
index dcbc3c1d338..a46981d209c 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic.py
@@ -1,6 +1,6 @@
#pylint: disable=no-init
from stresstesting import MantidStressTest
-from mantid.simpleapi import MaskDetectors, mtd, config
+from mantid.simpleapi import MaskDetectors, config
import Direct.DirectEnergyConversion as reduction
import os
@@ -51,7 +51,7 @@ class DirectInelasticDiagnostic(MantidStressTest):
if sample_ws.getDetector(index).isMasked():
spec_no = sample_ws.getSpectrum(index).getSpectrumNo()
handle.write(str(spec_no) + '\n')
- handle.close
+ handle.close()
def cleanup(self):
if os.path.exists(self.saved_diag_file):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py
index 01374b83eed..42fff86f1f7 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py
@@ -72,7 +72,7 @@ class DirectInelasticDiagnostic2(MantidStressTest):
if sample.getDetector(index).isMasked():
spec_no = sample.getSpectrum(index).getSpectrumNo()
handle.write(str(spec_no) + '\n')
- handle.close
+ handle.close()
def cleanup(self):
if os.path.exists(self.saved_diag_file):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSBeamCenterAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSBeamCenterAPIv2.py
index 682d7c9758d..59af7140a76 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSBeamCenterAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSBeamCenterAPIv2.py
@@ -1,6 +1,5 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
-import mantid
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from mantid.api import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py
index 894ad9cdbaf..10cf5adc5d0 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py
@@ -1,6 +1,5 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
-import mantid
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from mantid.api import *
@@ -17,7 +16,7 @@ class EQSANSDarkCurrent(stresstesting.MantidStressTest):
"""
Analysis Tests for EQSANS
- Testing that the I(Q) output of is correct
+ Testing that the I(Q) output of is correct
"""
def runTest(self):
@@ -48,4 +47,4 @@ class EQSANSDarkCurrent(stresstesting.MantidStressTest):
self.disableChecking.append('Axes')
return "EQSANS_1466_event_Iq", 'EQSANSDarkCurrent.nxs'
-
\ No newline at end of file
+
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSEffAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSEffAPIv2.py
index 2a47ff984db..70f9a8882d5 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSEffAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSEffAPIv2.py
@@ -1,6 +1,5 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
-import mantid
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from mantid.api import FileFinder
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSFlatTestAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSFlatTestAPIv2.py
index e2c0df871dd..40da2ba524a 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSFlatTestAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSFlatTestAPIv2.py
@@ -1,6 +1,5 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
-import mantid
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
index a4b0bb11665..fc609cb16e9 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
@@ -1,7 +1,6 @@
-#pylint: disable=no-init,invalid-name
+#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
import stresstesting
import math
-import mantid
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from mantid.api import *
@@ -24,7 +23,7 @@ class EQSANSIQOutput(stresstesting.MantidStressTest):
return True
"""
Analysis Tests for EQSANS
- Testing that the I(Q) output of is correct
+ Testing that the I(Q) output of is correct
"""
def runTest(self):
@@ -66,7 +65,7 @@ class EQSANSBeamMonitor(stresstesting.MantidStressTest):
return True
"""
Analysis Tests for EQSANS
- Testing that the I(Q) output of is correct
+ Testing that the I(Q) output of is correct
"""
def runTest(self):
@@ -96,7 +95,7 @@ class EQSANSDQPositiveOutput(stresstesting.MantidStressTest):
return True
"""
Analysis Tests for EQSANS
- Testing that the Q resolution output of is correct
+ Testing that the Q resolution output of is correct
"""
def runTest(self):
@@ -133,7 +132,7 @@ class EQSANSDQOutput(stresstesting.MantidStressTest):
return True
"""
Analysis Tests for EQSANS
- Testing that the Q resolution output of is correct
+ Testing that the Q resolution output of is correct
"""
def runTest(self):
@@ -199,7 +198,7 @@ class EQSANSDQOutput_FS(stresstesting.MantidStressTest):
return True
"""
Analysis Tests for EQSANS
- Testing that the Q resolution output of is correct
+ Testing that the Q resolution output of is correct
"""
def runTest(self):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSProcessedEffAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSProcessedEffAPIv2.py
index 9f154a050b9..85723381966 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSProcessedEffAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSProcessedEffAPIv2.py
@@ -1,6 +1,5 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
-import mantid
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from mantid.api import FileFinder
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py
index 90f4a49d40f..79486d62dfb 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py
@@ -1,4 +1,4 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
@@ -20,7 +20,7 @@ class EQSANSSolid(stresstesting.MantidStressTest):
return True
"""
Analysis Tests for EQSANS
- Testing that the I(Q) output of is correct
+ Testing that the I(Q) output of is correct
"""
def runTest(self):
@@ -63,7 +63,7 @@ class EQSANSSolidEvent(EQSANSSolid):
return True
"""
Analysis Tests for EQSANS
- Testing that the I(Q) output of is correct
+ Testing that the I(Q) output of is correct
"""
def runTest(self):
"""
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSTransAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSTransAPIv2.py
index 30efff6d605..14d279d991b 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSTransAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSTransAPIv2.py
@@ -1,6 +1,5 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
-import mantid
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from mantid.api import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EllipsoidIntegr.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EllipsoidIntegr.py
index de81b4162cd..21b008adba9 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EllipsoidIntegr.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EllipsoidIntegr.py
@@ -3,14 +3,7 @@
#
# Integrates a run using the ellipsoid technique
-import os
-import sys
-import shutil
-import time
-
import stresstesting
-import numpy
-
from mantid.api import *
#sys.path.append("/home/ruth/GIT_MantidBuild/bin/")
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EnginXCalibrateTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EnginXCalibrateTest.py
index 38af9ef16f7..ac2e21fcd1f 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EnginXCalibrateTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EnginXCalibrateTest.py
@@ -1,5 +1,4 @@
#pylint: disable=no-init
-import platform
import stresstesting
from mantid.simpleapi import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/FilteredLoadvsLoadThenFilter.py b/Code/Mantid/Testing/SystemTests/tests/analysis/FilteredLoadvsLoadThenFilter.py
index db42a62b798..b9f84287836 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/FilteredLoadvsLoadThenFilter.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/FilteredLoadvsLoadThenFilter.py
@@ -2,14 +2,16 @@
import stresstesting
from mantid.simpleapi import *
-'''Tests that filtering with LoadEventNexus gives the same answer as loading the whole file and then filtering'''
class FilteredLoadvsLoadThenFilter(stresstesting.MantidStressTest):
+ '''Tests that filtering with LoadEventNexus gives the same answer as loading the whole file and then filtering'''
def runTest(self):
- filteredLoad = LoadEventNexus("CNCS_7860_event.nxs",FilterByTimeStart=60.0,FilterByTimeStop=120.0,FilterByTofMin=-1e10,FilterByTofMax=1e10)
- loadAll = LoadEventNexus("CNCS_7860_event.nxs",FilterByTimeStart=-1e10,FilterByTimeStop=1e10,FilterByTofMin=-1e10,FilterByTofMax=1e10)
+ filteredLoad = LoadEventNexus("CNCS_7860_event.nxs",FilterByTimeStart=60.0,FilterByTimeStop=120.0,
+ FilterByTofMin=-1e10,FilterByTofMax=1e10)
+ loadAll = LoadEventNexus("CNCS_7860_event.nxs",FilterByTimeStart=-1e10,FilterByTimeStop=1e10,
+ FilterByTofMin=-1e10,FilterByTofMax=1e10)
loadAndFilter = FilterByTime(loadAll,StartTime=60.0,StopTime=120.0)
- # This next step is needed otherwise the X boundaries are different causing CheckWorkspacesMatch to fail
+ # This next step is needed otherwise the X boundaries are different causing CheckWorkspacesMatch to fail
loadAndFilter = RebinToWorkspace(WorkspaceToRebin=loadAndFilter,WorkspaceToMatch=filteredLoad)
def validateMethod(self):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/GEMTests.py b/Code/Mantid/Testing/SystemTests/tests/analysis/GEMTests.py
index db7b987ab9b..16642bc4bea 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/GEMTests.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/GEMTests.py
@@ -9,9 +9,11 @@ class GEMTest(stresstesting.MantidStressTest):
self.gss_file = ''
self.ref_gss_file = 'GEM58654.gss'
self.xye_tof_files = []
- self.ref_xye_tof_files = ['GEM58654_b1_TOF.dat','GEM58654_b2_TOF.dat','GEM58654_b3_TOF.dat','GEM58654_b4_TOF.dat','GEM58654_b5_TOF.dat','GEM58654_b6_TOF.dat']
+ self.ref_xye_tof_files = ['GEM58654_b1_TOF.dat','GEM58654_b2_TOF.dat','GEM58654_b3_TOF.dat','GEM58654_b4_TOF.dat',
+ 'GEM58654_b5_TOF.dat','GEM58654_b6_TOF.dat']
self.xye_d_files = []
- self.ref_xye_d_files = ['GEM58654_b1_D.dat','GEM58654_b2_D.dat','GEM58654_b3_D.dat','GEM58654_b4_D.dat','GEM58654_b5_D.dat','GEM58654_b6_D.dat']
+ self.ref_xye_d_files = ['GEM58654_b1_D.dat','GEM58654_b2_D.dat','GEM58654_b3_D.dat','GEM58654_b4_D.dat',
+ 'GEM58654_b5_D.dat','GEM58654_b6_D.dat']
self.file_index = 0
self.new_cal_file = ''
@@ -59,7 +61,9 @@ class GEMTest(stresstesting.MantidStressTest):
CreateSingleValuedWorkspace(OutputWorkspace='scale',DataValue='1')
Multiply(LHSWorkspace='sample',RHSWorkspace='scale',OutputWorkspace='sample')
ConvertUnits(InputWorkspace='sample',OutputWorkspace='sample',Target='Wavelength')
- CylinderAbsorption(InputWorkspace='sample',OutputWorkspace='SampleTrans',AttenuationXSection='0.5',ScatteringXSection='1',SampleNumberDensity='1',NumberOfWavelengthPoints='100',CylinderSampleHeight='4',CylinderSampleRadius='0.40000000000000002',NumberOfSlices='10',NumberOfAnnuli='10')
+ CylinderAbsorption(InputWorkspace='sample',OutputWorkspace='SampleTrans',AttenuationXSection='0.5',
+ ScatteringXSection='1',SampleNumberDensity='1',NumberOfWavelengthPoints='100',
+ CylinderSampleHeight='4',CylinderSampleRadius='0.40000000000000002',NumberOfSlices='10',NumberOfAnnuli='10')
Divide(LHSWorkspace='sample',RHSWorkspace='SampleTrans',OutputWorkspace='sample')
ConvertUnits(InputWorkspace='sample',OutputWorkspace='sample',Target='dSpacing')
DiffractionFocussing(InputWorkspace='sample',OutputWorkspace='sample',GroupingFileName=self.new_cal_file)
@@ -84,26 +88,39 @@ class GEMTest(stresstesting.MantidStressTest):
Rebin(InputWorkspace='ResultD-5',OutputWorkspace='ResultD-5',Params='0.0818697,-0.00109142,2.82906')
Rebin(InputWorkspace='ResultD-6',OutputWorkspace='ResultD-6',Params='0.0661098,-0.00105175,1.87008')
ConvertUnits(InputWorkspace='ResultD-1',OutputWorkspace='ResultTOF-1',Target='TOF')
- ReplaceSpecialValues(InputWorkspace='ResultD-1',OutputWorkspace='ResultD-1',NaNValue='0',InfinityValue='0',BigNumberThreshold='99999999.999999985')
- ReplaceSpecialValues(InputWorkspace='ResultTOF-1',OutputWorkspace='ResultTOF-1',NaNValue='0',InfinityValue='0',BigNumberThreshold='99999999.999999985')
+ ReplaceSpecialValues(InputWorkspace='ResultD-1',OutputWorkspace='ResultD-1',NaNValue='0',
+ InfinityValue='0',BigNumberThreshold='99999999.999999985')
+ ReplaceSpecialValues(InputWorkspace='ResultTOF-1',OutputWorkspace='ResultTOF-1',NaNValue='0',
+ InfinityValue='0',BigNumberThreshold='99999999.999999985')
ConvertUnits(InputWorkspace='ResultD-2',OutputWorkspace='ResultTOF-2',Target='TOF')
- ReplaceSpecialValues(InputWorkspace='ResultD-2',OutputWorkspace='ResultD-2',NaNValue='0',InfinityValue='0',BigNumberThreshold='99999999.999999985')
- ReplaceSpecialValues(InputWorkspace='ResultTOF-2',OutputWorkspace='ResultTOF-2',NaNValue='0',InfinityValue='0',BigNumberThreshold='99999999.999999985')
+ ReplaceSpecialValues(InputWorkspace='ResultD-2',OutputWorkspace='ResultD-2',NaNValue='0',
+ InfinityValue='0',BigNumberThreshold='99999999.999999985')
+ ReplaceSpecialValues(InputWorkspace='ResultTOF-2',OutputWorkspace='ResultTOF-2',NaNValue='0',
+ InfinityValue='0',BigNumberThreshold='99999999.999999985')
ConvertUnits(InputWorkspace='ResultD-3',OutputWorkspace='ResultTOF-3',Target='TOF')
- ReplaceSpecialValues(InputWorkspace='ResultD-3',OutputWorkspace='ResultD-3',NaNValue='0',InfinityValue='0',BigNumberThreshold='99999999.999999985')
- ReplaceSpecialValues(InputWorkspace='ResultTOF-3',OutputWorkspace='ResultTOF-3',NaNValue='0',InfinityValue='0',BigNumberThreshold='99999999.999999985')
+ ReplaceSpecialValues(InputWorkspace='ResultD-3',OutputWorkspace='ResultD-3',NaNValue='0',
+ InfinityValue='0',BigNumberThreshold='99999999.999999985')
+ ReplaceSpecialValues(InputWorkspace='ResultTOF-3',OutputWorkspace='ResultTOF-3',NaNValue='0',
+ InfinityValue='0',BigNumberThreshold='99999999.999999985')
ConvertUnits(InputWorkspace='ResultD-4',OutputWorkspace='ResultTOF-4',Target='TOF')
- ReplaceSpecialValues(InputWorkspace='ResultD-4',OutputWorkspace='ResultD-4',NaNValue='0',InfinityValue='0',BigNumberThreshold='99999999.999999985')
- ReplaceSpecialValues(InputWorkspace='ResultTOF-4',OutputWorkspace='ResultTOF-4',NaNValue='0',InfinityValue='0',BigNumberThreshold='99999999.999999985')
+ ReplaceSpecialValues(InputWorkspace='ResultD-4',OutputWorkspace='ResultD-4',NaNValue='0',
+ InfinityValue='0',BigNumberThreshold='99999999.999999985')
+ ReplaceSpecialValues(InputWorkspace='ResultTOF-4',OutputWorkspace='ResultTOF-4',NaNValue='0',
+ InfinityValue='0',BigNumberThreshold='99999999.999999985')
ConvertUnits(InputWorkspace='ResultD-5',OutputWorkspace='ResultTOF-5',Target='TOF')
- ReplaceSpecialValues(InputWorkspace='ResultD-5',OutputWorkspace='ResultD-5',NaNValue='0',InfinityValue='0',BigNumberThreshold='99999999.999999985')
- ReplaceSpecialValues(InputWorkspace='ResultTOF-5',OutputWorkspace='ResultTOF-5',NaNValue='0',InfinityValue='0',BigNumberThreshold='99999999.999999985')
+ ReplaceSpecialValues(InputWorkspace='ResultD-5',OutputWorkspace='ResultD-5',NaNValue='0',
+ InfinityValue='0',BigNumberThreshold='99999999.999999985')
+ ReplaceSpecialValues(InputWorkspace='ResultTOF-5',OutputWorkspace='ResultTOF-5',NaNValue='0',
+ InfinityValue='0',BigNumberThreshold='99999999.999999985')
ConvertUnits(InputWorkspace='ResultD-6',OutputWorkspace='ResultTOF-6',Target='TOF')
- ReplaceSpecialValues(InputWorkspace='ResultD-6',OutputWorkspace='ResultD-6',NaNValue='0',InfinityValue='0',BigNumberThreshold='99999999.999999985')
- ReplaceSpecialValues(InputWorkspace='ResultTOF-6',OutputWorkspace='ResultTOF-6',NaNValue='0',InfinityValue='0',BigNumberThreshold='99999999.999999985')
+ ReplaceSpecialValues(InputWorkspace='ResultD-6',OutputWorkspace='ResultD-6',NaNValue='0',
+ InfinityValue='0',BigNumberThreshold='99999999.999999985')
+ ReplaceSpecialValues(InputWorkspace='ResultTOF-6',OutputWorkspace='ResultTOF-6',NaNValue='0',
+ InfinityValue='0',BigNumberThreshold='99999999.999999985')
# group and save
- GroupWorkspaces(InputWorkspaces='ResultTOF-1,ResultTOF-2,ResultTOF-3,ResultTOF-4,ResultTOF-5,ResultTOF-6',OutputWorkspace='ResultTOFgrp')
+ GroupWorkspaces(InputWorkspaces='ResultTOF-1,ResultTOF-2,ResultTOF-3,ResultTOF-4,ResultTOF-5,ResultTOF-6',
+ OutputWorkspace='ResultTOFgrp')
self.gss_file = os.path.join(config['defaultsave.directory'],'GEM58654_new.gss')
append=False
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRBackgroundAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRBackgroundAPIv2.py
index 9ab44c8bf82..1ae6707a9a6 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRBackgroundAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRBackgroundAPIv2.py
@@ -1,6 +1,5 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
-import mantid
from mantid.api import FileFinder
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.hfir_command_interface import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIREffAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIREffAPIv2.py
index b3551c6b21b..775b6c55d14 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIREffAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIREffAPIv2.py
@@ -1,6 +1,5 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
-import mantid
from mantid.api import FileFinder
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.hfir_command_interface import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRReductionAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRReductionAPIv2.py
index 3546fb91816..c8750b363ef 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRReductionAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRReductionAPIv2.py
@@ -1,6 +1,5 @@
#pylint: disable=no-init
import stresstesting
-import mantid
from mantid.api import FileFinder
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.hfir_command_interface import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRTransAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRTransAPIv2.py
index 5880047eebc..4a77810a3b1 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRTransAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRTransAPIv2.py
@@ -1,6 +1,5 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
-import mantid
from mantid.api import FileFinder
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.hfir_command_interface import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ILLD2BTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ILLD2BTest.py
index 62b34b26280..3047f60f052 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ILLD2BTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ILLD2BTest.py
@@ -38,8 +38,6 @@ class ILLD2BLoadTest(unittest.TestCase):
self.assertTrue(name in mtd)
self.assertTrue(type(mtd[name]) == IMDEventWorkspace)
-
-
#====================================================================================
class ILLD2BTest(stresstesting.MantidStressTest):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ILLD33Test.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ILLD33Test.py
index 025f516ef6c..a429727bb91 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ILLD33Test.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ILLD33Test.py
@@ -89,8 +89,6 @@ class ILLD33SANSTest(unittest.TestCase):
# TODO
-
-
#====================================================================================
class ILLD33Test(stresstesting.MantidStressTest):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/INTERLoadingTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/INTERLoadingTest.py
index 1712738fe01..74921f7c230 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/INTERLoadingTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/INTERLoadingTest.py
@@ -15,4 +15,4 @@ class INTERLoadingTest(LoadAndCheckBase):
return "INTER00007709Integrated.nxs"
def get_expected_instrument_name(self):
- return "INTER"
+ return "INTER"
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
index ea889a17e9f..9dd54ffab5d 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
@@ -91,8 +91,6 @@ class MARIReductionFromFile(ISISDirectInelasticReduction):
outWS = self.red.reduce()
outWS*=self.scale_to_fix_abf
-
-
def get_result_workspace(self):
"""Returns the result workspace to be checked"""
return "outWS"
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py
index 4fcbbaba007..7175d05ae2c 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py
@@ -5,7 +5,6 @@ from mantid.simpleapi import *
from mantid.api import Workspace,IEventWorkspace
from Direct.PropertyManager import PropertyManager
-from Direct.RunDescriptor import RunDescriptor
import ISIS_MariReduction as mr
#----------------------------------------------------------------------
@@ -81,8 +80,8 @@ class ISIS_ReductionWrapperValidate(stresstesting.MantidStressTest):
def runTest(self):
# prepare reduction variable
- # At the moment MARI reduction differs from it original by
- # less then 1% due to changes in the procedure. At the moment
+ # At the moment MARI reduction differs from it original by
+ # less then 1% due to changes in the procedure. At the moment
# we have to account for this but when we make it the same,
# the code below should be commented. Meanwhile it tests workspace
# workflow
@@ -164,7 +163,7 @@ class ISISLoadFilesRAW(stresstesting.MantidStressTest):
self.assertEqual(ws.getNumberHistograms(),41472)
self.assertEqual(mon_ws.getNumberHistograms(),4)
-
+
#
self.valid = True
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ISISLoadingEventData.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ISISLoadingEventData.py
index 7992f5c1780..7e9973fee51 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ISISLoadingEventData.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ISISLoadingEventData.py
@@ -12,7 +12,7 @@ class ISISLoadingEventData(stresstesting.MantidStressTest):
# isis_vms_compat/SPB[2]
self.assertEqual(ev_ws.sample().getGeometryFlag(), 1, "It does not read correctly the vms compat (check ")
# Isis correct the tof using loadTimeOfFlight method.
- self.assertDelta( ev_ws.getEventList(10).getTofs()[1], 1041.89,0.01,
+ self.assertDelta( ev_ws.getEventList(10).getTofs()[1], 1041.89,0.01,
"The ISIS event correction is incorrect (check LoadEventNexus::loadTimeOfFlight")
def validate(self):
return True
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
index 1bcd56156e0..5d88d3a1581 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
@@ -1,4 +1,4 @@
-#pylint: disable=no-init,invalid-name
+#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
import math
import stresstesting
from mantid.simpleapi import *
@@ -34,7 +34,7 @@ class ISISMuonAnalysis(stresstesting.MantidStressTest):
def get_result_workspace(self):
"""Returns the result workspace to be checked"""
- return self.instr_name + str(self.sample_run)
+ return self.instr_name + str(self.sample_run)
def runTest(self):
"""Defines the workflow for the test"""
@@ -187,4 +187,4 @@ class MuSRAnalysisFromFile(ISISMuonAnalysis):
def get_reference_file(self):
return "MuSRAnalysis.nxs"
-
\ No newline at end of file
+
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
index 775cab6a7a6..bf411b23d56 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
@@ -1,5 +1,4 @@
-#pylint: disable=no-init
-import math
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
from mantid.simpleapi import *
@@ -32,7 +31,7 @@ class ISISMuonAnalysisGrouping(stresstesting.MantidStressTest):
def get_result_workspace(self):
"""Returns the result workspace to be checked"""
- return self.instr_name + str(self.sample_run)
+ return self.instr_name + str(self.sample_run)
def runTest(self):
"""Defines the workflow for the test"""
@@ -168,4 +167,4 @@ class MuSRAnalysisFromFile(ISISMuonAnalysisGrouping):
def get_reference_file(self):
return "MuSRAnalysisLog1.nxs"
-
\ No newline at end of file
+
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
index 29f0d2b372a..89d572b3894 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
@@ -1,6 +1,5 @@
#pylint: disable=invalid-name
""" Sample LET reduction script """
-import os
#os.environ["PATH"] = r"c:/Mantid/Code/builds/br_master/bin/Release;"+os.environ["PATH"]
@@ -294,4 +293,4 @@ if __name__=="__main__":
#if not rez:
# raise RuntimeError("validation failed with error: {0}".format(mess))
#else:
- # print "ALL Fine"
\ No newline at end of file
+ # print "ALL Fine"
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_MAPS_DGSReduction.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_MAPS_DGSReduction.py
index 3f93c239ea8..360396fcf3c 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_MAPS_DGSReduction.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_MAPS_DGSReduction.py
@@ -21,7 +21,8 @@ class ReduceMAPS(ReductionWrapper):
# Absolute units reduction properties.
prop['monovan_run'] = 17589
- prop['sample_mass'] = 10 / (94.4 / 13) # -- this number allows to get approximately the same system test intensities for MAPS as the old test
+ # -- this number allows to get approximately the same system test intensities for MAPS as the old test
+ prop['sample_mass'] = 10 / (94.4 / 13)
prop['sample_rmm'] = 435.96 #
return prop
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_MERLINReduction.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_MERLINReduction.py
index b0435954ea9..447b453e8b8 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_MERLINReduction.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_MERLINReduction.py
@@ -1,6 +1,5 @@
#pylint: disable=invalid-name
""" Sample MERLIN reduction scrip """
-import os
#os.environ["PATH"] = r"c:/Mantid/Code/builds/br_master/bin/Release;"+os.environ["PATH"]
from Direct.ReductionWrapper import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_MariReduction.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_MariReduction.py
index c1d696e3dcd..8d045980429 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_MariReduction.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_MariReduction.py
@@ -1,8 +1,8 @@
#pylint: disable=invalid-name
+""" Sample MARI reduction scrip used in testing ReductionWrapper """
import os
#os.environ["PATH"] =\
#r"c:/Mantid/Code/builds/br_master/bin/Release;"+os.environ["PATH"]
-""" Sample MARI reduction scrip used in testing ReductionWrapper """
from Direct.ReductionWrapper import *
try:
import reduce_vars as web_var
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py b/Code/Mantid/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
index 8592614d184..f5ef84cc459 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
@@ -9,6 +9,7 @@ class MSGDiffractionReductionTest(stresstesting.MantidStressTest):
"""
__metaclass__ = ABCMeta
+ _output_workspace = None
@abstractmethod
def get_reference_file(self):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/REFLReduction.py b/Code/Mantid/Testing/SystemTests/tests/analysis/REFLReduction.py
index 57c9b9c7b02..1655aa0a78d 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/REFLReduction.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/REFLReduction.py
@@ -1,4 +1,4 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
from mantid import *
from mantid.simpleapi import *
@@ -7,7 +7,7 @@ class REFLReduction(stresstesting.MantidStressTest):
def runTest(self):
#TODO: The reduction algorithm should not require an absolute path
scaling_factor_file = FileFinder.getFullPath("directBeamDatabaseFall2014_IPTS_11601_2.cfg")
-
+
RefLReduction(RunNumbers=[119814],
NormalizationRunNumber=119690,
SignalPeakPixelRange=[154, 166],
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/REFLWithBackground.py b/Code/Mantid/Testing/SystemTests/tests/analysis/REFLWithBackground.py
index 17443e9c64b..cd5ab233328 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/REFLWithBackground.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/REFLWithBackground.py
@@ -1,4 +1,4 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
from mantid import *
from mantid.simpleapi import *
@@ -7,7 +7,7 @@ class REFLWithBackground(stresstesting.MantidStressTest):
def runTest(self):
#TODO: The reduction algorithm should not require an absolute path
scaling_factor_file = FileFinder.getFullPath("directBeamDatabaseFall2014_IPTS_11601_2.cfg")
-
+
RefLReduction(RunNumbers=[119816],
NormalizationRunNumber=119692,
SignalPeakPixelRange=[155, 165],
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/REFMReduction.py b/Code/Mantid/Testing/SystemTests/tests/analysis/REFMReduction.py
index 1b47c1ca673..9028c273df3 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/REFMReduction.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/REFMReduction.py
@@ -1,4 +1,4 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
from mantid import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/RawVNexus.py b/Code/Mantid/Testing/SystemTests/tests/analysis/RawVNexus.py
index 4889dc17122..12081a8b6be 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/RawVNexus.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/RawVNexus.py
@@ -2,8 +2,8 @@
import stresstesting
from mantid.simpleapi import *
-''' Simply tests that our LoadRaw and LoadISISNexus algorithms produce the same workspace'''
class RawVNexus(stresstesting.MantidStressTest):
+ ''' Simply tests that our LoadRaw and LoadISISNexus algorithms produce the same workspace'''
def runTest(self):
Raw = LoadRaw(Filename='SANS2D00000808.raw')
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/RefRoi.py b/Code/Mantid/Testing/SystemTests/tests/analysis/RefRoi.py
index a8aee4424f5..71f708df43e 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/RefRoi.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/RefRoi.py
@@ -5,9 +5,9 @@ from mantid.simpleapi import *
class RefRoiTest(stresstesting.MantidStressTest):
def runTest(self):
- ws=Load(Filename="REF_L_119814")
- ws = Integration(InputWorkspace=ws)
- roi = RefRoi(InputWorkspace=ws,
+ workspace = Load(Filename="REF_L_119814")
+ workspace = Integration(InputWorkspace=workspace)
+ roi = RefRoi(InputWorkspace=workspace,
NXPixel=256, NYPixel=304,
IntegrateY=False, ConvertToQ=False)
roi = Transpose(InputWorkspace=roi)
@@ -19,4 +19,3 @@ class RefRoiTest(stresstesting.MantidStressTest):
self.disableChecking.append('Axes')
return "roi", 'REFL_119814_roi_peak.nxs'
-
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ReflectometryISIS.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
index bfda78092a7..eee9257f057 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
@@ -64,14 +64,20 @@ class ReflectometryISIS(stresstesting.MantidStressTest):
self.assertTrue(thisTheta < nextTheta)
# MD transformations
- ConvertToReflectometryQ(InputWorkspace='SignedTheta_vs_Wavelength',OutputWorkspace='QxQy',OutputDimensions='Q (lab frame)', Extents='-0.0005,0.0005,0,0.12')
- ConvertToReflectometryQ(InputWorkspace='SignedTheta_vs_Wavelength',OutputWorkspace='KiKf',OutputDimensions='K (incident, final)', Extents='0,0.05,0,0.05')
- ConvertToReflectometryQ(InputWorkspace='SignedTheta_vs_Wavelength',OutputWorkspace='PiPf',OutputDimensions='P (lab frame)', Extents='0,0.1,-0.02,0.15')
+ ConvertToReflectometryQ(InputWorkspace='SignedTheta_vs_Wavelength',OutputWorkspace='QxQy',
+ OutputDimensions='Q (lab frame)', Extents='-0.0005,0.0005,0,0.12')
+ ConvertToReflectometryQ(InputWorkspace='SignedTheta_vs_Wavelength',OutputWorkspace='KiKf',
+ OutputDimensions='K (incident, final)', Extents='0,0.05,0,0.05')
+ ConvertToReflectometryQ(InputWorkspace='SignedTheta_vs_Wavelength',OutputWorkspace='PiPf',
+ OutputDimensions='P (lab frame)', Extents='0,0.1,-0.02,0.15')
# Bin the outputs to histograms because observations are not important.
- BinMD(InputWorkspace='QxQy',AxisAligned='0',BasisVector0='Qx,(Ang^-1),1,0',BasisVector1='Qz,(Ang^-1),0,1',OutputExtents='-0.0005,0.0005,0,0.12',OutputBins='100,100',Parallel='1',OutputWorkspace='QxQy_rebinned')
- BinMD(InputWorkspace='KiKf',AxisAligned='0',BasisVector0='Ki,(Ang^-1),1,0',BasisVector1='Kf,(Ang^-1),0,1',OutputExtents='0,0.05,0,0.05',OutputBins='200,200',Parallel='1',OutputWorkspace='KiKf_rebinned')
- BinMD(InputWorkspace='PiPf',AxisAligned='0',BasisVector0='Pz_i + Pz_f,(Ang^-1),1,0',BasisVector1='Pz_i - Pz_f,(Ang^-1),0,1',OutputExtents='0,0.1,-0.02,0.15',OutputBins='50,50',Parallel='1',OutputWorkspace='PiPf_rebinned')
+ BinMD(InputWorkspace='QxQy',AxisAligned='0',BasisVector0='Qx,(Ang^-1),1,0',BasisVector1='Qz,(Ang^-1),0,1',
+ OutputExtents='-0.0005,0.0005,0,0.12',OutputBins='100,100',Parallel='1',OutputWorkspace='QxQy_rebinned')
+ BinMD(InputWorkspace='KiKf',AxisAligned='0',BasisVector0='Ki,(Ang^-1),1,0',BasisVector1='Kf,(Ang^-1),0,1',
+ OutputExtents='0,0.05,0,0.05',OutputBins='200,200',Parallel='1',OutputWorkspace='KiKf_rebinned')
+ BinMD(InputWorkspace='PiPf',AxisAligned='0',BasisVector0='Pz_i + Pz_f,(Ang^-1),1,0',BasisVector1='Pz_i - Pz_f,(Ang^-1),0,1',
+ OutputExtents='0,0.1,-0.02,0.15',OutputBins='50,50',Parallel='1',OutputWorkspace='PiPf_rebinned')
# Fetch benchmarks for testing against
LoadMD(Filename="POLREF_qxqy_benchmark.nxs", OutputWorkspace="QxQy_benchmark")
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ReflectometryQuickCombineMulti.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ReflectometryQuickCombineMulti.py
index a0918ee6dea..1af0a4ae036 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ReflectometryQuickCombineMulti.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ReflectometryQuickCombineMulti.py
@@ -48,7 +48,8 @@ class ReflectometryQuickCombineMulti(stresstesting.MantidStressTest):
IvsQ2Binned = Rebin(InputWorkspace=IvsQ2, Params=self.createBinningParam(run2QLow, -step, run2QHigh))
# Peform the stitching
- combineMulti.combineDataMulti([IvsQ1Binned.name(), IvsQ2Binned.name()], self.__stitchedWorkspaceName, [run1QLow, run2QLow], [run1QHigh, run2QHigh], run1QLow, run2QHigh, -step, 1)
+ combineMulti.combineDataMulti([IvsQ1Binned.name(), IvsQ2Binned.name()], self.__stitchedWorkspaceName, \
+ [run1QLow, run2QLow], [run1QHigh, run2QHigh], run1QLow, run2QHigh, -step, 1)
def validate(self):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ReflectometryQuickMultiDetector.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ReflectometryQuickMultiDetector.py
index 4f2b1524a07..010e340b770 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ReflectometryQuickMultiDetector.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ReflectometryQuickMultiDetector.py
@@ -8,7 +8,8 @@ class ReflectometryQuickMultiDetector(stresstesting.MantidStressTest):
This is a system test for the top-level quick routines. Quick is the name given to the
ISIS reflectometry reduction scripts.
- This test uses the multidetector functionality within the script. No transmission runs are passed, so it uses correction algorithms instead.
+ This test uses the multidetector functionality within the script.
+ No transmission runs are passed, so it uses correction algorithms instead.
"""
def runTest(self):
@@ -18,8 +19,10 @@ class ReflectometryQuickMultiDetector(stresstesting.MantidStressTest):
first_ws = ws[0]
- quick.quick_explicit(first_ws, i0_monitor_index=0, lambda_min=0.8, lambda_max=14.5, background_min=0.8, background_max=14.5, int_min=0.8, int_max=14.5,
- point_detector_start=0, point_detector_stop=245, multi_detector_start=1, theta=0, pointdet=False, roi=[74,74])
+ quick.quick_explicit(first_ws, i0_monitor_index=0, lambda_min=0.8, lambda_max=14.5, background_min=0.8,
+ background_max=14.5, int_min=0.8, int_max=14.5,
+ point_detector_start=0, point_detector_stop=245, multi_detector_start=1, theta=0,
+ pointdet=False, roi=[74,74])
def validate(self):
self.disableChecking.append('Instrument')
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DBatch.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DBatch.py
index 9ece402a6dd..5d5f14b5c7c 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DBatch.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DBatch.py
@@ -1,4 +1,4 @@
-#pylint: disable=no-init
+#pylint: disable=no-init,attribute-defined-outside-init
import stresstesting
from mantid.simpleapi import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
index 435a478073e..36b38536efc 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
@@ -1,9 +1,7 @@
#pylint: disable=invalid-name,no-init
import stresstesting
from mantid.simpleapi import *
-from mantid.api import Workspace
from ISISCommandInterface import *
-import numpy
import unittest
## export PYTHONPATH=/apps/workspace/mantid_debug/bin/:/apps/mantid/systemtests/StressTestFramework/:/apps/mantid/mantid/Code/Mantid/scripts/SANS/:/apps/mantid/mantid/Code/Mantid/scripts/reduction
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py
index 2955a9b9b63..9be38098fc8 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py
@@ -4,9 +4,7 @@ import stresstesting
from mantid.simpleapi import *
from ISISCommandInterface import *
from mantid.simpleapi import *
-from mantid import config
from SANSBatchMode import *
-import os.path
# test batch mode with sans2d and selecting a period in batch mode
class SANS2DMultiPeriodSingle(stresstesting.MantidStressTest):
@@ -46,4 +44,4 @@ class SANS2DMultiPeriodBatch(SANS2DMultiPeriodSingle):
BatchReduce(csv_file, 'nxs', saveAlgs={})
self.reduced = '5512_SANS2DBatch'
-
\ No newline at end of file
+
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py
index 075d0370efb..68501dde45e 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init
"""
These tests ensure that all the steps that the SANS Interface GUI performs to reduce SANS data
on the SANS2D instrument is avalailable and is conforming to this test.
@@ -14,7 +14,6 @@ Test was first created to apply to Mantid Release 3.0.
"""
import sys
-import os
if __name__ == "__main__":
# it is just to allow running this test in Mantid, allowing the following import
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAdded.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAdded.py
index 0410fd59e86..08329b9bda7 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAdded.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAdded.py
@@ -1,6 +1,5 @@
#pylint: disable=invalid-name
import sys
-import os
if __name__ == "__main__":
# it is just to allow running this test in Mantid, allowing the following import
@@ -8,9 +7,6 @@ if __name__ == "__main__":
from mantid.simpleapi import *
import ISISCommandInterface as i
-import isis_reducer
-import isis_instrument
-import isis_reduction_steps
import copy
import SANS2DReductionGUI as sansgui
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py
index 3af500481b1..b6f2b66f7d0 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py
@@ -1,6 +1,5 @@
#pylint: disable=invalid-name
import sys
-import os
if __name__ == "__main__":
# it is just to allow running this test in Mantid, allowing the following import
sys.path.append('/apps/mantid/systemtests/StressTestFramework/')
@@ -37,34 +36,3 @@ if __name__ == "__main__":
test = SANS2DGUISearchCentre()
test.execute()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DSlicing.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DSlicing.py
index f124a94a349..10699bb3ac2 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DSlicing.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DSlicing.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name
+#pylint: disable=invalid-name,attribute-defined-outside-init
import sys
if __name__ == "__main__":
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SANSLoadersTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SANSLoadersTest.py
index 38e6d20dd0a..a427fcd3fe5 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SANSLoadersTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SANSLoadersTest.py
@@ -10,7 +10,6 @@ import stresstesting
from mantid.simpleapi import *
import isis_reduction_steps as steps
import ISISCommandInterface as ici
-import isis_reducer
class LoadRunTest(unittest.TestCase):
def setUp(self):
@@ -30,7 +29,8 @@ class LoadRunTest(unittest.TestCase):
def basicChecks(self, loadRun, file_path, runnum, periods_in_file, ws_name):
- self.assertTrue('Data/SystemTest/SANS2D/'+file_path in loadRun._data_file.replace('\\','/'), 'Wrong data file: ' + loadRun._data_file)
+ self.assertTrue('Data/SystemTest/SANS2D/'+file_path in loadRun._data_file.replace('\\','/'),
+ 'Wrong data file: ' + loadRun._data_file)
self.assertEqual(loadRun.periods_in_file, periods_in_file)
self.assertEqual(loadRun.wksp_name, ws_name)
self.assertEqual(loadRun.shortrun_no, runnum)
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py
index 9cdae3db259..34ffa09f049 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py
@@ -1,7 +1,5 @@
#pylint: disable=invalid-name,no-init
import stresstesting
-import numpy
-import os
from mantid.simpleapi import *
######################################################################
@@ -83,7 +81,7 @@ def validateMD(result,reference,tol=1.e-5,class_name='dummy',mismatchName=None):
#elf.disableChecking.append('Instrument')
valNames = [result,reference]
- from mantid.simpleapi import Load,CompareMDWorkspaces,FrameworkManager,SaveNexus
+ from mantid.simpleapi import Load
if not reference in mtd:
Load(Filename=reference,OutputWorkspace=valNames[1])
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SNSPowderRedux.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SNSPowderRedux.py
index c506bc8ef4e..74ac5e7292d 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SNSPowderRedux.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SNSPowderRedux.py
@@ -1,3 +1,4 @@
+#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
import stresstesting
from mantid.simpleapi import *
from mantid.api import FileFinder
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SXDAnalysis.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SXDAnalysis.py
index df4eded0e3f..c859e0b3748 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SXDAnalysis.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SXDAnalysis.py
@@ -15,7 +15,9 @@ class SXDAnalysis(stresstesting.MantidStressTest):
# A lower SplitThreshold, with a reasonable bound on the recursion depth, helps find weaker peaks at higher Q.
start = clock()
- QLab = ConvertToDiffractionMDWorkspace(InputWorkspace=ws, OutputDimensions='Q (lab frame)', SplitThreshold=50, LorentzCorrection='1',MaxRecursionDepth='13',Extents='-15,15,-15,15,-15,15',OneEventPerBin='0')
+ QLab = ConvertToDiffractionMDWorkspace(InputWorkspace=ws, OutputDimensions='Q (lab frame)',
+ SplitThreshold=50, LorentzCorrection='1',MaxRecursionDepth='13',
+ Extents='-15,15,-15,15,-15,15',OneEventPerBin='0')
print " ConvertToMD runs for: ",clock()-start,' sec'
# NaCl has a relatively small unit cell, so the distance between peaks is relatively large. Setting the PeakDistanceThreshold
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SphinxWarnings.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SphinxWarnings.py
index 3080f3c6485..4d4b02f15b9 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SphinxWarnings.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SphinxWarnings.py
@@ -86,7 +86,8 @@ class SphinxWarnings(stresstesting.MantidStressTest):
#check categories
for cat in alg.categories():
if cat.split("\\")[0] not in self.allowedCategories:
- self.errorMessage+=name+" "+str(version)+" Category: "+cat.split("\\")[0]+" is not in the allowed list. If you need this category, please add it to the systemtest.\n"
+ self.errorMessage += name+" "+str(version)+" Category: "+cat.split("\\")[0]+" is not in the allowed list."
+ self.errorMessage += " If you need this category, please add it to the systemtest.\n"
#check summary
summary=alg.summary()
result=self.checkString(summary)
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/StepScan.py b/Code/Mantid/Testing/SystemTests/tests/analysis/StepScan.py
index 704f5263bc1..d2018f71304 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/StepScan.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/StepScan.py
@@ -2,13 +2,14 @@
import stresstesting
from mantid.simpleapi import *
-'''Tests the StepScan workflow algorithm'''
class StepScanWorkflowAlgorithm(stresstesting.MantidStressTest):
+ '''Tests the StepScan workflow algorithm'''
def runTest(self):
LoadMask(Instrument='HYS',InputFile=r'HYSA_mask.xml',OutputWorkspace='HYSA_mask')
Load(Filename='HYSA_2934.nxs.h5',OutputWorkspace='HYSA_2934',LoadMonitors='1')
- StepScan(InputWorkspace='HYSA_2934',OutputWorkspace='StepScan',MaskWorkspace='HYSA_mask',XMin='3.25',XMax='3.75',RangeUnit='dSpacing')
+ StepScan(InputWorkspace='HYSA_2934',OutputWorkspace='StepScan',MaskWorkspace='HYSA_mask',
+ XMin='3.25',XMax='3.75',RangeUnit='dSpacing')
def validate(self):
return 'StepScan','StepScan.nxs'
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py b/Code/Mantid/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
index 96f67f65500..5d95b6e0045 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
@@ -17,7 +17,8 @@ class TOPAZPeakFinding(stresstesting.MantidStressTest):
def runTest(self):
# Load then convert to Q in the lab frame
LoadEventNexus(Filename=r'TOPAZ_3132_event.nxs',OutputWorkspace='topaz_3132')
- ConvertToDiffractionMDWorkspace(InputWorkspace='topaz_3132',OutputWorkspace='topaz_3132_MD',LorentzCorrection='1',SplitInto='2',SplitThreshold='150',OneEventPerBin='0')
+ ConvertToDiffractionMDWorkspace(InputWorkspace='topaz_3132',OutputWorkspace='topaz_3132_MD',
+ LorentzCorrection='1',SplitInto='2',SplitThreshold='150',OneEventPerBin='0')
# Find peaks and UB matrix
FindPeaksMD(InputWorkspace='topaz_3132_MD',PeakDistanceThreshold='0.12',MaxPeaks='200',OutputWorkspace='peaks')
@@ -43,7 +44,8 @@ class TOPAZPeakFinding(stresstesting.MantidStressTest):
self.assertDelta( ol.gamma(), 90, 0.4, "Correct lattice angle gamma value not found.")
# Go to HKL
- ConvertToDiffractionMDWorkspace(InputWorkspace='topaz_3132',OutputWorkspace='topaz_3132_HKL',OutputDimensions='HKL',LorentzCorrection='1',SplitInto='2',SplitThreshold='150')
+ ConvertToDiffractionMDWorkspace(InputWorkspace='topaz_3132',OutputWorkspace='topaz_3132_HKL',
+ OutputDimensions='HKL',LorentzCorrection='1',SplitInto='2',SplitThreshold='150')
# Bin to a line (H=0 to 6, L=3, K=3)
BinMD(InputWorkspace='topaz_3132_HKL',AxisAligned='0',
@@ -60,10 +62,12 @@ class TOPAZPeakFinding(stresstesting.MantidStressTest):
#self.assertDelta( w.signalAt(30), 231615, 10e3, "Peak 3")
# Now do the same peak finding with Q in the sample frame
- ConvertToDiffractionMDWorkspace(InputWorkspace='topaz_3132',OutputWorkspace='topaz_3132_QSample',OutputDimensions='Q (sample frame)',LorentzCorrection='1',SplitInto='2',SplitThreshold='150')
+ ConvertToDiffractionMDWorkspace(InputWorkspace='topaz_3132',OutputWorkspace='topaz_3132_QSample',
+ OutputDimensions='Q (sample frame)',LorentzCorrection='1',SplitInto='2',SplitThreshold='150')
FindPeaksMD(InputWorkspace='topaz_3132_QSample',PeakDistanceThreshold='0.12',MaxPeaks='200',OutputWorkspace='peaks_QSample')
FindUBUsingFFT(PeaksWorkspace='peaks_QSample',MinD='2',MaxD='16')
- CopySample(InputWorkspace='peaks_QSample',OutputWorkspace='topaz_3132',CopyName='0',CopyMaterial='0',CopyEnvironment='0',CopyShape='0')
+ CopySample(InputWorkspace='peaks_QSample',OutputWorkspace='topaz_3132',CopyName='0',CopyMaterial='0',
+ CopyEnvironment='0',CopyShape='0')
# Index the peaks and check
results = IndexPeaks(PeaksWorkspace='peaks_QSample')
@@ -89,7 +93,8 @@ class TOPAZPeakFinding(stresstesting.MantidStressTest):
for c in xrange(3):
# This compares each column, allowing old == new OR old == -new
if not numpy.all(diff[:,c]) :
- raise Exception("More than 0.001 difference between UB matrices: Q (lab frame):\n%s\nQ (sample frame):\n%s" % (originalUB, newUB) )
+ raise Exception("More than 0.001 difference between UB matrices: Q (lab frame):\n%s\nQ (sample frame):\n%s" % (
+ originalUB, newUB) )
def doValidation(self):
# If we reach here, no validation failed
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateGroupingFiles.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateGroupingFiles.py
index 5cd6ed5bd4f..650b656da43 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateGroupingFiles.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateGroupingFiles.py
@@ -1,6 +1,6 @@
+#pylint: disable=no-init
from mantid import config
import os
-import re
import stresstesting
import glob
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateInstrumentDefinitionFiles.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateInstrumentDefinitionFiles.py
index 7a881a2bd75..996f20245e1 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateInstrumentDefinitionFiles.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateInstrumentDefinitionFiles.py
@@ -1,6 +1,6 @@
+#pylint: disable=no-init
from mantid import config
import os
-import re
import stresstesting
import glob
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateParameterFiles.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateParameterFiles.py
index b484d73adbd..b26a9550501 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateParameterFiles.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateParameterFiles.py
@@ -1,10 +1,8 @@
#pylint: disable=no-init,invalid-name
from mantid import config
import os
-import re
import stresstesting
import glob
-import time
EXPECTED_EXT = '.expected'
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/VesuvioFittingTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/VesuvioFittingTest.py
index 2271cafb91b..5bb79287ef4 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/VesuvioFittingTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/VesuvioFittingTest.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name,no-init
+#pylint: disable=invalid-name,no-init,attribute-defined-outside-init
import stresstesting
from mantid.simpleapi import *
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/WishAnalysis.py b/Code/Mantid/Testing/SystemTests/tests/analysis/WishAnalysis.py
index 713eba0fd70..7ae97a9442b 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/WishAnalysis.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/WishAnalysis.py
@@ -1,3 +1,4 @@
+#pylint: disable=no-init
import stresstesting
from mantid.simpleapi import *
@@ -28,13 +29,15 @@ class WishAnalysis(stresstesting.MantidStressTest):
ConvertFromDistribution(Workspace="monitor16748")
#normalise data to the monitor in wavelength
NormaliseToMonitor(InputWorkspace="w16748-1",OutputWorkspace="w16748-1",MonitorWorkspace="monitor16748")
- NormaliseToMonitor(InputWorkspace="w16748-1",OutputWorkspace="w16748-1",MonitorWorkspace="monitor16748",IntegrationRangeMin="0.6",IntegrationRangeMax="9.8")
+ NormaliseToMonitor(InputWorkspace="w16748-1",OutputWorkspace="w16748-1",MonitorWorkspace="monitor16748",
+ IntegrationRangeMin="0.6",IntegrationRangeMax="9.8")
#align detectors
ConvertUnits(InputWorkspace="w16748-1",OutputWorkspace="w16748-1",Target="TOF")
ReplaceSpecialValues(InputWorkspace="w16748-1",OutputWorkspace="w16748-1",NaNValue="0",InfinityValue="0")
AlignDetectors(InputWorkspace="w16748-1",OutputWorkspace="w16748-1",CalibrationFile="wish_grouping_noends2_no_offsets_nov2009.cal")
#focus data
- DiffractionFocussing(InputWorkspace="w16748-1",OutputWorkspace="w16748-1foc",GroupingFileName="wish_grouping_noends2_no_offsets_nov2009.cal")
+ DiffractionFocussing(InputWorkspace="w16748-1",OutputWorkspace="w16748-1foc",
+ GroupingFileName="wish_grouping_noends2_no_offsets_nov2009.cal")
DeleteWorkspace(Workspace="w16748-1")
CropWorkspace(InputWorkspace="w16748-1foc",OutputWorkspace="w16748-1foc",XMin="0.83",XMax="45")
#load pre-processed empty and subtract
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/WishDiffuseScattering.py b/Code/Mantid/Testing/SystemTests/tests/analysis/WishDiffuseScattering.py
index df8a177df05..cf862ef294d 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/WishDiffuseScattering.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/WishDiffuseScattering.py
@@ -1,3 +1,4 @@
+#pylint: disable=no-init
"""
Tests diffuse scattering reduction as used on WISH
If this breaks for whatever reason, there is a good chance that unregistered scripts will also be broken.
@@ -18,26 +19,31 @@ class WishDiffuseScattering(stresstesting.MantidStressTest):
NormaliseByCurrent(InputWorkspace='C',OutputWorkspace='C')
CropWorkspace(InputWorkspace='C',OutputWorkspace='C',XMin='6000',XMax='99000')
Rebin(InputWorkspace='C',OutputWorkspace='C',Params='6000,-0.004,99900')
- SmoothNeighbours(InputWorkspace='C',OutputWorkspace='Csn',RadiusUnits='NumberOfPixels',Radius='3',NumberOfNeighbours='25',PreserveEvents='0')
+ SmoothNeighbours(InputWorkspace='C',OutputWorkspace='Csn',RadiusUnits='NumberOfPixels',
+ Radius='3',NumberOfNeighbours='25',PreserveEvents='0')
Load(Filename= 'Wish_Diffuse_Scattering_B.nxs',OutputWorkspace='B',LoadLogFiles='0',LoadMonitors='Exclude')
NormaliseByCurrent(InputWorkspace='B',OutputWorkspace='B')
CropWorkspace(InputWorkspace='B',OutputWorkspace='B',XMin='6000',XMax='99000')
Rebin(InputWorkspace='B',OutputWorkspace='B',Params='6000,-0.004,99900')
- SmoothNeighbours(InputWorkspace='B',OutputWorkspace='Bsn',RadiusUnits='NumberOfPixels',Radius='3',NumberOfNeighbours='25',PreserveEvents='0')
+ SmoothNeighbours(InputWorkspace='B',OutputWorkspace='Bsn',RadiusUnits='NumberOfPixels',
+ Radius='3',NumberOfNeighbours='25',PreserveEvents='0')
Load(Filename= 'Wish_Diffuse_Scattering_A.nxs',OutputWorkspace='A',LoadLogFiles='0',LoadMonitors='Exclude')
NormaliseByCurrent(InputWorkspace='A',OutputWorkspace='A')
CropWorkspace(InputWorkspace='A',OutputWorkspace='A',XMin='6000',XMax='99000')
Rebin(InputWorkspace='A',OutputWorkspace='A',Params='6000,-0.004,99900')
- SmoothNeighbours(InputWorkspace='A',OutputWorkspace='Asn',RadiusUnits='NumberOfPixels',Radius='3',NumberOfNeighbours='25',PreserveEvents='0')
+ SmoothNeighbours(InputWorkspace='A',OutputWorkspace='Asn',RadiusUnits='NumberOfPixels',
+ Radius='3',NumberOfNeighbours='25',PreserveEvents='0')
SmoothData(InputWorkspace='Asn',OutputWorkspace='Asn-smooth',NPoints='50')
Divide(LHSWorkspace='Csn',RHSWorkspace='Asn-smooth',OutputWorkspace='C_div_A_sn_smooth')
- ReplaceSpecialValues(InputWorkspace='C_div_A_sn_smooth',OutputWorkspace='C_div_A_sn_smooth',NaNValue='0',InfinityValue='100000',BigNumberThreshold='99000')
+ ReplaceSpecialValues(InputWorkspace='C_div_A_sn_smooth',OutputWorkspace='C_div_A_sn_smooth',NaNValue='0',
+ InfinityValue='100000',BigNumberThreshold='99000')
Divide(LHSWorkspace='Bsn',RHSWorkspace='Asn-smooth',OutputWorkspace='B_div_A_sn_smooth')
- ReplaceSpecialValues(InputWorkspace='B_div_A_sn_smooth',OutputWorkspace='B_div_A_sn_smooth',NaNValue='0',InfinityValue='100000',BigNumberThreshold='99000')
+ ReplaceSpecialValues(InputWorkspace='B_div_A_sn_smooth',OutputWorkspace='B_div_A_sn_smooth',NaNValue='0',
+ InfinityValue='100000',BigNumberThreshold='99000')
Minus(LHSWorkspace='C_div_A_sn_smooth',RHSWorkspace='B_div_A_sn_smooth',OutputWorkspace='CminusB_smooth')
@@ -45,10 +51,11 @@ class WishDiffuseScattering(stresstesting.MantidStressTest):
AddSampleLog(Workspace='CminusB_smooth',LogName='psi',LogText='0.0',LogType='Number Series')
SetGoniometer(Workspace='CminusB_smooth',Axis0='psi,0,1,0,1')
- ConvertToDiffractionMDWorkspace(InputWorkspace='CminusB_smooth',OutputWorkspace='CminusB_smooth_MD_HKL',OutputDimensions='HKL',Version=2)
+ ConvertToDiffractionMDWorkspace(InputWorkspace='CminusB_smooth',OutputWorkspace='CminusB_smooth_MD_HKL',
+ OutputDimensions='HKL',Version=2)
- BinMD(InputWorkspace='CminusB_smooth_MD_HKL',AlignedDim0='[H,0,0],-1.0,8.0,200',
- AlignedDim1='[0,K,0],-1.0,8.0,200',AlignedDim2='[0,0,L],0,1.5,200',OutputWorkspace='test_rebin')
+ BinMD(InputWorkspace='CminusB_smooth_MD_HKL',AlignedDim0='[H,0,0],-1.0,8.0,200',
+ AlignedDim1='[0,K,0],-1.0,8.0,200',AlignedDim2='[0,0,L],0,1.5,200',OutputWorkspace='test_rebin')
#Quick sanity checks. No comparison with a saved workspace because SliceMD is too expensive compared to BinMD.
result = mtd['test_rebin']
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/WishMasking.py b/Code/Mantid/Testing/SystemTests/tests/analysis/WishMasking.py
index 50c2139a71c..a6716e54bba 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/WishMasking.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/WishMasking.py
@@ -70,7 +70,7 @@ class WishMasking(stresstesting.MantidStressTest):
## COMPLETE TESTS: These following are the tests that should pass when everything works. See below for reasons why.
# Test the 'isMasked' property on the detectors of the masked workspace
- # The following tests have been added even though they are broken because extracted workspaces currently do not preserve the
+ # The following tests have been added even though they are broken because extracted workspaces currently do not preserve the
# Masking flags (buty they SHOULD!). Hopefully the broken functionality will be fixed and I can enable them.
#self.assertTrue( mask_ws.getDetector(masking_edge).isMasked() )
#self.assertTrue( not mask_ws.getDetector(masking_edge + 1).isMasked() )
@@ -94,10 +94,11 @@ class WishMasking(stresstesting.MantidStressTest):
## END COMPLETE TESTS
## CHARACTERISATION TESTS: These tests characterise the current breakage of the masking code.
- ## I've included these false-positives as a testing strategy because it will flag up that the functionality
+ ## I've included these false-positives as a testing strategy because it will flag up that the functionality
## has been fixed when these tests start failing (we can then test the right thing, see above)
- # Testing that the isMasking is the same on both sides of the masking boundary. If things were working properly the following would not pass!
+ # Testing that the isMasking is the same on both sides of the masking boundary.
+ # If things were working properly the following would not pass!
self.assertTrue( mask_ws.getDetector(masking_edge).isMasked() == mask_ws.getDetector(masking_edge + 1).isMasked() )
## END CHARACTERISATION TESTS
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/utils.py b/Code/Mantid/Testing/SystemTests/tests/analysis/utils.py
index 9ee6ffa2f76..ea4ce19e8e5 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/utils.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/utils.py
@@ -7,8 +7,8 @@
|=============================================================================|=======|
1 80 <tab>
'''
-import sys, os
-import dis, inspect, opcode
+import os
+import inspect, opcode
def ls():
print os.getcwd()
files=os.listdir(os.getcwd())
--
GitLab