From 89e0184a5a6a3e9cb9ef19315b5f869a0824c21d Mon Sep 17 00:00:00 2001
From: Andrei Savici <saviciat@ornl.gov>
Date: Mon, 10 Aug 2015 17:22:52 -0400
Subject: [PATCH] More pylint in systemtests. refs #12661
---
.../analysis/Diffraction_Workflow_Test.py | 39 ++++++-----
.../tests/analysis/EQSANSBeamCenterAPIv2.py | 8 +--
.../tests/analysis/EQSANSEffAPIv2.py | 4 +-
.../tests/analysis/EQSANSFlatTestAPIv2.py | 4 +-
.../tests/analysis/EQSANSIQOutputAPIv2.py | 66 +++++++++----------
.../analysis/EQSANSNormalisationAPIv2.py | 19 +++---
.../tests/analysis/EQSANSProcessedEffAPIv2.py | 4 +-
.../tests/analysis/EQSANSTransAPIv2.py | 41 ++++++------
.../SystemTests/tests/analysis/GEMTests.py | 24 +++----
.../tests/analysis/HFIRBackgroundAPIv2.py | 44 ++++++-------
.../tests/analysis/HFIREffAPIv2.py | 22 +++----
.../tests/analysis/HFIRReductionAPIv2.py | 43 ++++++------
.../tests/analysis/HFIRTestsAPIv2.py | 66 ++++++++++++-------
.../tests/analysis/HFIRTransAPIv2.py | 50 +++++++-------
.../tests/analysis/ISIS_LETReduction.py | 9 +--
.../tests/analysis/LOQSANSUtilityTest.py | 2 +-
...eflectometryReductionWithBackgroundTest.py | 15 +++--
.../analysis/LoadEmbeddedInstrumentInfo.py | 2 +-
.../tests/analysis/LoadLotsOfFiles.py | 12 ++--
.../tests/analysis/LoadLotsOfInstruments.py | 3 +-
.../tests/analysis/LoadVesuvioTest.py | 8 +--
.../tests/analysis/MDWorkspaceTests.py | 20 +++---
.../tests/analysis/POLDIFitPeaks1DTest.py | 14 ++--
.../tests/analysis/POLDIFitPeaks2DTest.py | 8 +--
.../tests/analysis/POLDILoadRunsTest.py | 10 +--
.../tests/analysis/ReduceOneSCD_Run.py | 43 ++++++------
.../analysis/SANS2DLOQReloadWorkspaces.py | 1 -
.../tests/analysis/TOPAZPeakFinding.py | 10 +--
28 files changed, 305 insertions(+), 286 deletions(-)
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 bc2e057934c..809b30a3d49 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
@@ -14,9 +14,9 @@ class Diffraction_Workflow_Test(stresstesting.MantidStressTest):
def cleanup(self):
Files = ["TOPAZ_3132.hkl",
- "TOPAZ_3132FFT.hkl"]
- for file in Files:
- absfile = FileFinder.getFullPath(file)
+ "TOPAZ_3132FFT.hkl"]
+ for filename in Files:
+ absfile = FileFinder.getFullPath(filename)
if os.path.exists(absfile):
os.remove(absfile)
return True
@@ -33,7 +33,6 @@ class Diffraction_Workflow_Test(stresstesting.MantidStressTest):
resource.setrlimit(resource.RLIMIT_CORE, (-1, -1))
# determine where to save
- import os
savedir = os.path.abspath(os.path.curdir)
@@ -48,21 +47,21 @@ class Diffraction_Workflow_Test(stresstesting.MantidStressTest):
# Convert to Q space
ConvertToDiffractionMDWorkspace(InputWorkspace=ws,OutputWorkspace=ws+'_MD2',LorentzCorrection='0',
- OutputDimensions='Q (lab frame)', SplitInto='2',SplitThreshold='150') #,Version=1
+ OutputDimensions='Q (lab frame)', SplitInto='2',SplitThreshold='150') #,Version=1
# Find peaks (Reduced number of peaks so file comparison with reference does not fail with small differences)
FindPeaksMD(InputWorkspace=ws+'_MD2',MaxPeaks='20',OutputWorkspace=ws+'_peaksLattice')
# 3d integration to centroid peaks
CentroidPeaksMD(InputWorkspace=ws+'_MD2',CoordinatesToUse='Q (lab frame)',
- PeakRadius='0.12',PeaksWorkspace=ws+'_peaksLattice',OutputWorkspace=ws+'_peaksLattice')
+ PeakRadius='0.12',PeaksWorkspace=ws+'_peaksLattice',OutputWorkspace=ws+'_peaksLattice')
# Find the UB matrix using the peaks and known lattice parameters
FindUBUsingLatticeParameters(PeaksWorkspace=ws+'_peaksLattice',a='10.3522',b='6.0768',c='4.7276',
- alpha='90',beta='90',gamma='90', NumInitial='20', Tolerance='0.12')
+ alpha='90',beta='90',gamma='90', NumInitial='20', Tolerance='0.12')
# And index to HKL
IndexPeaks(PeaksWorkspace=ws+'_peaksLattice', Tolerance='0.12')
# Integrate peaks in Q space using spheres
IntegratePeaksMD(InputWorkspace=ws+'_MD2',PeakRadius='0.12',
- BackgroundOuterRadius='0.18',BackgroundInnerRadius='0.15',
- PeaksWorkspace=ws+'_peaksLattice',OutputWorkspace=ws+'_peaksLattice')
+ BackgroundOuterRadius='0.18',BackgroundInnerRadius='0.15',
+ PeaksWorkspace=ws+'_peaksLattice',OutputWorkspace=ws+'_peaksLattice')
# Save for SHELX
SaveHKL(InputWorkspace=ws+'_peaksLattice', Filename=savedir+'/'+ws+'.hkl')
@@ -70,30 +69,30 @@ class Diffraction_Workflow_Test(stresstesting.MantidStressTest):
FindPeaksMD(InputWorkspace=ws+'_MD2',MaxPeaks='100',OutputWorkspace=ws+'_peaksFFT')
# 3d integration to centroid peaks
CentroidPeaksMD(InputWorkspace=ws+'_MD2', CoordinatesToUse='Q (lab frame)',
- PeakRadius='0.12',PeaksWorkspace=ws+'_peaksFFT',OutputWorkspace=ws+'_peaksFFT')
+ PeakRadius='0.12',PeaksWorkspace=ws+'_peaksFFT',OutputWorkspace=ws+'_peaksFFT')
# Find the UB matrix using FFT
FindUBUsingFFT(PeaksWorkspace=ws+'_peaksFFT',MinD=3.,MaxD=14.)
## TODO conventional cell
# And index to HKL
- alg = IndexPeaks(PeaksWorkspace=ws+'_peaksFFT', Tolerance='0.12')
+ dummy_alg = IndexPeaks(PeaksWorkspace=ws+'_peaksFFT', Tolerance='0.12')
# Integrate peaks in Q space using spheres
IntegratePeaksMD(InputWorkspace=ws+'_MD2',PeakRadius='0.12',
- BackgroundOuterRadius='0.18',BackgroundInnerRadius='0.15',
- PeaksWorkspace=ws+'_peaksFFT',OutputWorkspace=ws+'_peaksFFT')
+ BackgroundOuterRadius='0.18',BackgroundInnerRadius='0.15',
+ PeaksWorkspace=ws+'_peaksFFT',OutputWorkspace=ws+'_peaksFFT')
# Save for SHELX
SaveHKL(InputWorkspace=ws+'_peaksFFT', Filename=savedir+'/'+ws+'FFT.hkl')
# Copy the UB matrix back to the original workspace
CopySample(InputWorkspace=ws+'_peaksFFT',OutputWorkspace=ws,
- CopyName='0',CopyMaterial='0',CopyEnvironment='0',CopyShape='0', CopyLattice=1)
+ CopyName='0',CopyMaterial='0',CopyEnvironment='0',CopyShape='0', CopyLattice=1)
# Convert to reciprocal space, in the sample frame
ConvertToDiffractionMDWorkspace(InputWorkspace=ws,OutputWorkspace=ws+'_HKL',
- OutputDimensions='HKL',LorentzCorrection='0', SplitInto='2',SplitThreshold='150')
+ OutputDimensions='HKL',LorentzCorrection='0', SplitInto='2',SplitThreshold='150')
# Bin to a regular grid
BinMD(InputWorkspace=ws+'_HKL',AlignedDim0="[H,0,0], -20, 20, 800",AlignedDim1="[0,K,0], -5, 5, 50",
AlignedDim2="[0,0,L], -10, 10, 800",OutputWorkspace=ws+'_binned')
@@ -117,9 +116,9 @@ class Diffraction_Workflow_Test(stresstesting.MantidStressTest):
# Bin to a line (H=0 to 6, L=3, K=3)
BinMD(InputWorkspace='TOPAZ_3132_HKL',AxisAligned='0',
- BasisVector0='X,units,1,0,0',BasisVector1='Y,units,6.12323e-17,1,0',BasisVector2='2,units,-0,0,1',
- Translation='-0,3,6',OutputExtents='0,6, -0.1,0.1, -0.1,0.1',OutputBins='60,1,1',
- OutputWorkspace='TOPAZ_3132_HKL_line')
+ BasisVector0='X,units,1,0,0',BasisVector1='Y,units,6.12323e-17,1,0',BasisVector2='2,units,-0,0,1',
+ Translation='-0,3,6',OutputExtents='0,6, -0.1,0.1, -0.1,0.1',OutputBins='60,1,1',
+ OutputWorkspace='TOPAZ_3132_HKL_line')
# Now check the integrated bin and the peaks
w = mtd["TOPAZ_3132_HKL_line"]
@@ -162,8 +161,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/EQSANSBeamCenterAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSBeamCenterAPIv2.py
index 59af7140a76..41112ce659b 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSBeamCenterAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSBeamCenterAPIv2.py
@@ -19,8 +19,8 @@ class EQSANSBeamCenter(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS(False)
AppendDataFile("EQSANS_4061_event.nxs")
NoSolidAngle()
@@ -55,8 +55,8 @@ class EQSANSBeamCenterEvent(EQSANSBeamCenter):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS(True)
AppendDataFile("EQSANS_4061_event.nxs")
NoSolidAngle()
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSEffAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSEffAPIv2.py
index 70f9a8882d5..62d905c6861 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSEffAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSEffAPIv2.py
@@ -18,8 +18,8 @@ class EQSANSEff(stresstesting.MantidStressTest):
"""
System test for sensitivity correction
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS(False)
AppendDataFile("EQSANS_1466_event.nxs")
SolidAngle()
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSFlatTestAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSFlatTestAPIv2.py
index 40da2ba524a..4fdf380574e 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSFlatTestAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSFlatTestAPIv2.py
@@ -25,8 +25,8 @@ class EQSANSFlatTest(stresstesting.MantidStressTest):
It is used to verify that the complete reduction chain works
and reproduces reference results.
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS(True)
SolidAngle()
DarkCurrent(FILE_LOCATION+"EQSANS_5704_event.nxs")
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
index fc609cb16e9..809d8887d55 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
@@ -9,29 +9,29 @@ import os
def do_cleanup():
Files = ["EQSANS_4061_event_reduction.log",
- "EQSANS_1466_event_reduction.log"]
- for file in Files:
- absfile = FileFinder.getFullPath(file)
+ "EQSANS_1466_event_reduction.log"]
+ for filename in Files:
+ absfile = FileFinder.getFullPath(filename)
if os.path.exists(absfile):
os.remove(absfile)
return True
class EQSANSIQOutput(stresstesting.MantidStressTest):
-
- def cleanup(self):
- do_cleanup()
- return True
"""
Analysis Tests for EQSANS
Testing that the I(Q) output of is correct
"""
+ def cleanup(self):
+ do_cleanup()
+ return True
+
def runTest(self):
"""
Check that EQSANSTofStructure returns the correct workspace
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS()
SetBeamCenter(96.29, 126.15)
AppendDataFile("EQSANS_1466_event.nxs")
@@ -59,18 +59,18 @@ class EQSANSIQOutput(stresstesting.MantidStressTest):
return "EQSANS_1466_event_Iq", 'EQSANSIQOutput.nxs'
class EQSANSBeamMonitor(stresstesting.MantidStressTest):
-
- def cleanup(self):
- do_cleanup()
- return True
"""
Analysis Tests for EQSANS
Testing that the I(Q) output of is correct
"""
+ def cleanup(self):
+ do_cleanup()
+ return True
+
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS()
SetBeamCenter(96.29, 126.15)
AppendDataFile("EQSANS_1466_event.nxs")
@@ -89,23 +89,23 @@ class EQSANSBeamMonitor(stresstesting.MantidStressTest):
return "EQSANS_1466_event_Iq", 'EQSANSBeamMonitor.nxs'
class EQSANSDQPositiveOutput(stresstesting.MantidStressTest):
-
- def cleanup(self):
- do_cleanup()
- return True
"""
Analysis Tests for EQSANS
Testing that the Q resolution output of is correct
"""
+ def cleanup(self):
+ do_cleanup()
+ return True
+
def runTest(self):
"""
Check that the Q resolution calculation returns positive values
even when background is larger than signal and I(q) is negative.
(Non-physical value that's an experimental edge case)
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS()
SetBeamCenter(96.29, 126.15)
AppendDataFile("EQSANS_1466_event.nxs")
@@ -126,23 +126,23 @@ class EQSANSDQPositiveOutput(stresstesting.MantidStressTest):
return True
class EQSANSDQOutput(stresstesting.MantidStressTest):
-
- def cleanup(self):
- do_cleanup()
- return True
"""
Analysis Tests for EQSANS
Testing that the Q resolution output of is correct
"""
+ def cleanup(self):
+ do_cleanup()
+ return True
+
def runTest(self):
"""
Check that the Q resolution calculation returns positive values
even when background is larger than signal and I(q) is negative.
(Non-physical value that's an experimental edge case)
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS()
SetBeamCenter(96.29, 126.15)
AppendDataFile("EQSANS_1466_event.nxs")
@@ -192,23 +192,23 @@ class EQSANSDQOutput(stresstesting.MantidStressTest):
return output
class EQSANSDQOutput_FS(stresstesting.MantidStressTest):
-
- def cleanup(self):
- do_cleanup()
- return True
"""
Analysis Tests for EQSANS
Testing that the Q resolution output of is correct
"""
+ def cleanup(self):
+ do_cleanup()
+ return True
+
def runTest(self):
"""
Check that the Q resolution calculation returns positive values
even when background is larger than signal and I(q) is negative.
(Non-physical value that's an experimental edge case)
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS()
SetBeamCenter(96.29, 126.15)
AppendDataFile("EQSANS_4061_event.nxs")
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSNormalisationAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSNormalisationAPIv2.py
index a42969d95b3..1ef30145bf0 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSNormalisationAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSNormalisationAPIv2.py
@@ -15,8 +15,8 @@ class EQSANSNormalisationNoFlux(stresstesting.MantidStressTest):
"""
Check that EQSANSTofStructure returns the correct workspace
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
ws = "__eqsans_normalisation_test"
EQSANSLoad(Filename="EQSANS_1466_event.nxs", OutputWorkspace=ws,
@@ -43,8 +43,8 @@ class EQSANSNormalisationDefault(stresstesting.MantidStressTest):
"""
Check that EQSANSTofStructure returns the correct workspace
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
ws = "__eqsans_normalisation_test"
EQSANSLoad(Filename="EQSANS_1466_event.nxs", OutputWorkspace=ws,
@@ -79,8 +79,8 @@ class EQSANSNormalisationInputFlux(stresstesting.MantidStressTest):
"""
Check that EQSANSTofStructure returns the correct workspace
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
ws = "__eqsans_normalisation_test"
spectrum_file = "eqsans_beam_flux.txt"
@@ -103,13 +103,14 @@ class EQSANSNormalisationBeamFlux(stresstesting.MantidStressTest):
"""
Analysis Tests for EQSANS
"""
-
+ data_ws=""
+ prop_mng=""
def runTest(self):
"""
Check that EQSANSTofStructure returns the correct workspace
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
self.prop_mng = "eqsans_normalise_options"
self.data_ws = "eqsans_normalise_data_ws"
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSProcessedEffAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSProcessedEffAPIv2.py
index 85723381966..adeb36f0b92 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSProcessedEffAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSProcessedEffAPIv2.py
@@ -18,8 +18,8 @@ class EQSANSProcessedEff(stresstesting.MantidStressTest):
"""
System test for sensitivity correction
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS(False)
AppendDataFile("EQSANS_1466_event.nxs")
SolidAngle()
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSTransAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSTransAPIv2.py
index 14d279d991b..2119824a8ae 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSTransAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSTransAPIv2.py
@@ -8,9 +8,9 @@ import os
def do_cleanup():
Files = ["EQSANS_4061_event_reduction.log",
- "EQSANS_1466_event_reduction.log"]
- for file in Files:
- absfile = FileFinder.getFullPath(file)
+ "EQSANS_1466_event_reduction.log"]
+ for filename in Files:
+ absfile = FileFinder.getFullPath(filename)
if os.path.exists(absfile):
os.remove(absfile)
return True
@@ -22,8 +22,8 @@ class EQSANSTransmission(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS(False)
AppendDataFile("EQSANS_1466_event.nxs")
SolidAngle()
@@ -57,8 +57,8 @@ class EQSANSTransmissionEvent(EQSANSTransmission):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS(True)
AppendDataFile("EQSANS_1466_event.nxs")
SolidAngle()
@@ -95,8 +95,8 @@ class EQSANSTransmissionDC(stresstesting.MantidStressTest):
"""
Check that EQSANSTofStructure returns the correct workspace
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS(False)
AppendDataFile("EQSANS_1466_event.nxs")
SolidAngle()
@@ -124,20 +124,19 @@ class EQSANSTransmissionDC(stresstesting.MantidStressTest):
return "EQSANS_1466_event_Iq", 'EQSANSTransmissionDC.nxs'
class EQSANSTransmissionCompatibility(EQSANSTransmission):
-
- def cleanup(self):
- do_cleanup()
- return True
-
"""
Analysis Tests for EQSANS
- Check that the transmission correction can be applied if the
+ Check that the transmission correction can be applied if the
sample run and transmission runs don't have the same binning
"""
+ def cleanup(self):
+ do_cleanup()
+ return True
+
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS(True)
AppendDataFile("EQSANS_1466_event.nxs")
SolidAngle()
@@ -173,8 +172,8 @@ class EQSANSTransmissionFS(stresstesting.MantidStressTest):
"""
Check that EQSANSTofStructure returns the correct workspace
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS(False)
SetBeamCenter(96.29, 126.15)
AppendDataFile("EQSANS_4061_event.nxs")
@@ -205,8 +204,8 @@ class EQSANSDirectTransFS(stresstesting.MantidStressTest):
"""
Check that EQSANSTofStructure returns the correct workspace
"""
- config = ConfigService.Instance()
- config["facilityName"]='SNS'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='SNS'
EQSANS(False)
SetBeamCenter(96.29, 126.15)
AppendDataFile("EQSANS_4061_event.nxs")
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/GEMTests.py b/Code/Mantid/Testing/SystemTests/tests/analysis/GEMTests.py
index 16642bc4bea..a73a603d949 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/GEMTests.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/GEMTests.py
@@ -1,8 +1,9 @@
import stresstesting
import os
from mantid.simpleapi import *
-
+#pylint: disable=too-many-instance-attributes
class GEMTest(stresstesting.MantidStressTest):
+ validate=None
def __init__(self):
stresstesting.MantidStressTest.__init__(self)
@@ -143,12 +144,12 @@ class GEMTest(stresstesting.MantidStressTest):
os.remove(self.gss_file)
if os.path.exists(self.new_cal_file):
os.remove(self.new_cal_file)
- for file in self.xye_tof_files:
- if os.path.exists(file):
- os.remove(file)
- for file in self.xye_d_files:
- if os.path.exists(file):
- os.remove(file)
+ for filename in self.xye_tof_files:
+ if os.path.exists(filename):
+ os.remove(filename)
+ for filename in self.xye_d_files:
+ if os.path.exists(filename):
+ os.remove(filename)
def doValidation(self):
'''Override doValidation to vaildate two things at the same time'''
@@ -167,14 +168,16 @@ class GEMTest(stresstesting.MantidStressTest):
self.validate = self.validateTOFXYE
self.file_index = 0
# file_index is incremented after each call to validateASCII()
- res = self.validateASCII() and self.validateASCII() and self.validateASCII() and self.validateASCII() and self.validateASCII() and self.validateASCII()
+ res = self.validateASCII() and self.validateASCII() and self.validateASCII() and \
+ self.validateASCII() and self.validateASCII() and self.validateASCII()
if not res:
return False
# reset validate() method to call validateTOFXYE()
self.validate = self.validateDXYE
self.file_index = 0
# file_index is incremented after each call to validateASCII()
- res = self.validateASCII() and self.validateASCII() and self.validateASCII() and self.validateASCII() and self.validateASCII() and self.validateASCII()
+ res = self.validateASCII() and self.validateASCII() and self.validateASCII() and \
+ self.validateASCII() and self.validateASCII() and self.validateASCII()
return res
def validateNexus(self):
@@ -183,19 +186,16 @@ class GEMTest(stresstesting.MantidStressTest):
def validateGSS(self):
'''Validate the created gss file'''
- from mantid.api import FileFinder
return self.gss_file, FileFinder.getFullPath(self.ref_gss_file)
def validateTOFXYE(self):
'''Validate the created gss file'''
- from mantid.api import FileFinder
i = self.file_index
self.file_index += 1
return self.xye_tof_files[i], FileFinder.getFullPath(self.ref_xye_tof_files[i])
def validateDXYE(self):
'''Validate the created gss file'''
- from mantid.api import FileFinder
i = self.file_index
self.file_index += 1
return self.xye_d_files[i], FileFinder.getFullPath(self.ref_xye_d_files[i])
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRBackgroundAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRBackgroundAPIv2.py
index 1ae6707a9a6..e9ef2e5d7c7 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRBackgroundAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRBackgroundAPIv2.py
@@ -8,11 +8,11 @@ import os
def do_cleanup():
Files = ["BioSANS_test_data_reduction.log",
- "BioSANS_test_data_Iq.xml",
- "BioSANS_test_data_Iq.txt",
- "BioSANS_test_data_Iqxy.dat"]
- for file in Files:
- absfile = FileFinder.getFullPath(file)
+ "BioSANS_test_data_Iq.xml",
+ "BioSANS_test_data_Iq.txt",
+ "BioSANS_test_data_Iqxy.dat"]
+ for filename in Files:
+ absfile = FileFinder.getFullPath(filename)
if os.path.exists(absfile):
os.remove(absfile)
return True
@@ -24,8 +24,8 @@ class HFIRBackground(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
SetBeamCenter(16, 95)
AppendDataFile("BioSANS_test_data.xml")
@@ -48,8 +48,8 @@ class HFIRBackgroundTransmission(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
AppendDataFile("BioSANS_test_data.xml")
Background("BioSANS_test_data.xml")
@@ -72,8 +72,8 @@ class HFIRBackgroundDirectBeamTrans(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
AppendDataFile("BioSANS_test_data.xml")
Background("BioSANS_test_data.xml")
@@ -98,17 +98,17 @@ class HFIRBackgroundBeamSpreaderTrans(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
AppendDataFile("BioSANS_test_data.xml")
Background("BioSANS_test_data.xml")
BckBeamSpreaderTransmission(sample_spreader="BioSANS_test_data.xml",
- direct_spreader="BioSANS_empty_cell.xml",
- sample_scattering="BioSANS_test_data.xml",
- direct_scattering="BioSANS_empty_cell.xml",
- spreader_transmission=0.5,
- spreader_transmission_err=0.1)
+ direct_spreader="BioSANS_empty_cell.xml",
+ sample_scattering="BioSANS_test_data.xml",
+ direct_scattering="BioSANS_empty_cell.xml",
+ spreader_transmission=0.5,
+ spreader_transmission_err=0.1)
AzimuthalAverage(binning="0.01,0.001,0.11")
Reduce1D()
@@ -127,8 +127,8 @@ class HFIRBackgroundTransDarkCurrent(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
AppendDataFile("BioSANS_test_data.xml")
Background("BioSANS_test_data.xml")
@@ -154,8 +154,8 @@ class HFIRBackgroundDirectBeamTransDC(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
AppendDataFile("BioSANS_test_data.xml")
Background("BioSANS_test_data.xml")
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIREffAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIREffAPIv2.py
index 775b6c55d14..a5348b5c310 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIREffAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIREffAPIv2.py
@@ -8,11 +8,11 @@ import os
def do_cleanup():
Files = ["BioSANS_test_data_reduction.log",
- "BioSANS_test_data_Iq.xml",
- "BioSANS_test_data_Iq.txt",
- "BioSANS_test_data_Iqxy.dat"]
- for file in Files:
- absfile = FileFinder.getFullPath(file)
+ "BioSANS_test_data_Iq.xml",
+ "BioSANS_test_data_Iq.txt",
+ "BioSANS_test_data_Iqxy.dat"]
+ for filename in Files:
+ absfile = FileFinder.getFullPath(filename)
if os.path.exists(absfile):
os.remove(absfile)
return True
@@ -27,8 +27,8 @@ class HFIREffAPIv2(stresstesting.MantidStressTest):
"""
System test for sensitivity correction
"""
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
AppendDataFile("BioSANS_test_data.xml")
@@ -55,8 +55,8 @@ class HFIRSensitivityDirectBeamCenter(stresstesting.MantidStressTest):
"""
System test for sensitivity correction
"""
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
AppendDataFile("BioSANS_test_data.xml")
@@ -85,8 +85,8 @@ class HFIRSensitivityScatteringBeamCenter(stresstesting.MantidStressTest):
"""
System test for sensitivity correction
"""
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
AppendDataFile("BioSANS_test_data.xml")
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRReductionAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRReductionAPIv2.py
index c8750b363ef..86b83091ccf 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRReductionAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRReductionAPIv2.py
@@ -8,29 +8,28 @@ import os
def do_cleanup():
Files = ["BioSANS_test_data_reduction.log",
- "BioSANS_test_data_Iq.xml",
- "BioSANS_test_data_Iq.txt",
- "BioSANS_test_data_Iqxy.dat"]
- for file in Files:
- absfile = FileFinder.getFullPath(file)
+ "BioSANS_test_data_Iq.xml",
+ "BioSANS_test_data_Iq.txt",
+ "BioSANS_test_data_Iqxy.dat"]
+ for filename in Files:
+ absfile = FileFinder.getFullPath(filename)
if os.path.exists(absfile):
os.remove(absfile)
return True
class HFIRReductionAPIv2(stresstesting.MantidStressTest):
+ """
+ Simple reduction example
+ """
def cleanup(self):
do_cleanup()
return True
- """
- Simple reduction example
- """
-
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
AppendDataFile("BioSANS_test_data.xml")
@@ -47,18 +46,17 @@ class HFIRReductionAPIv2(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", "HFIRReduction.nxs"
class HFIRAbsoluteScalingReference(stresstesting.MantidStressTest):
+ """
+ Test absolute scaling using a reference data set
+ """
def cleanup(self):
do_cleanup()
return True
- """
- Test absolute scaling using a reference data set
- """
-
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
SolidAngle(detector_tubes=True)
MonitorNormalization()
@@ -76,18 +74,17 @@ class HFIRAbsoluteScalingReference(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", "HFIRAbsoluteScalingReference.nxs"
class HFIRAbsoluteScalingValue(stresstesting.MantidStressTest):
+ """
+ Test absolute scaling using a reference data set
+ """
def cleanup(self):
do_cleanup()
return True
- """
- Test absolute scaling using a reference data set
- """
-
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
SolidAngle(detector_tubes=True)
MonitorNormalization()
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py
index 526b72b6c9c..2bf08bb2d5a 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py
@@ -23,8 +23,10 @@ for item in data_search_dirs:
if len(TEST_DIR)==0:
raise RuntimeError, "Could not locate test data directory: [...]/Data/SANS2D"
-def _diff_iq(x,y): return x-y
-def _add(x,y): return x+y
+def _diff_iq(x,y):
+ return x-y
+def _add(x,y):
+ return x+y
def _read_IGOR(filepath):
"""
@@ -69,10 +71,14 @@ def _check_result(ws, test_file, tolerance=1e-6):
return False
# Utility methods for manipulating the lists
- def _diff_chi2(x,y): return (x[1]-y[1])*(x[1]-y[1])/(x[2]*x[2])
- def _diff_iq(x,y): return x[1]-y[1]
- def _diff_err(x,y): return x[2]-y[2]
- def _add(x,y): return x+y
+ def _diff_chi2(x,y):
+ return (x[1]-y[1])*(x[1]-y[1])/(x[2]*x[2])
+ def _diff_iq(x,y):
+ return x[1]-y[1]
+ def _diff_err(x,y):
+ return x[2]-y[2]
+ def _add(x,y):
+ return x+y
# Check that I(q) is the same for both data sets
deltas = map(_diff_iq, data_mantid, data_igor)
@@ -99,20 +105,20 @@ def _check_result(ws, test_file, tolerance=1e-6):
def do_cleanup():
Files = ["GPSANS_reduction.log",
- "BioSANS_exp61_scan0004_0001_Iq.txt",
- "BioSANS_exp61_scan0004_0001_Iq.xml",
- "BioSANS_exp61_scan0004_0001_Iqxy.dat",
- "BioSANS_exp61_scan0004_0001_reduction.log",
- "BioSANS_test_data_Iq.txt",
- "BioSANS_test_data_Iq.xml",
- "BioSANS_test_data_Iqxy.dat",
- "BioSANS_test_data_reduction.log",
- "test_data_Iq.txt",
- "test_data_Iq.xml",
- "test_data_Iqxy.dat",
- "test_data_reduction.log"]
- for file in Files:
- absfile = FileFinder.getFullPath(file)
+ "BioSANS_exp61_scan0004_0001_Iq.txt",
+ "BioSANS_exp61_scan0004_0001_Iq.xml",
+ "BioSANS_exp61_scan0004_0001_Iqxy.dat",
+ "BioSANS_exp61_scan0004_0001_reduction.log",
+ "BioSANS_test_data_Iq.txt",
+ "BioSANS_test_data_Iq.xml",
+ "BioSANS_test_data_Iqxy.dat",
+ "BioSANS_test_data_reduction.log",
+ "test_data_Iq.txt",
+ "test_data_Iq.xml",
+ "test_data_Iqxy.dat",
+ "test_data_reduction.log"]
+ for filename in Files:
+ absfile = FileFinder.getFullPath(filename)
if os.path.exists(absfile):
os.remove(absfile)
return True
@@ -305,7 +311,16 @@ class HFIRTestsAPIv2(stresstesting.MantidStressTest):
ws = AnalysisDataService.retrieve("BioSANS_test_data_Iq")
data = ws.dataY(0)
- check = [0.19472,0.204269,0.215354,0.230114,0.238961,0.237201,0.247843,0.248424,0.253676,0.254327,0.254366,0.252931,0.258339,0.259297,0.257155,0.254059,0.252383,0.252826,0.256604,0.256754,0.255592,0.256813,0.248569,0.25331,0.251032,0.246424,0.249477,0.250939,0.251959,0.24925,0.250372,0.246148,0.250478,0.244621,0.247428,0.246431,0.245041,0.241647,0.24307,0.240096,0.242797,0.238182,0.237548,0.239789,0.241477,0.23456,0.237372,0.233715,0.233789,0.232262,0.231589,0.230986,0.231646,0.231331,0.230484,0.2277,0.226819,0.224341,0.227239,0.223228,0.221232,0.222011,0.224747,0.219533,0.216973,0.218734,0.21668,0.218366,0.214926,0.213985,0.214469,0.210473,0.209867,0.209066,0.208965,0.207498,0.204505,0.205786,0.202186,0.200442,0.200485,0.200554,0.200499,0.198152,0.193945,0.192082,0.193783,0.193787,0.190557,0.190471,0.186827,0.190088,0.188204,0.187547,0.182206,0.181384,0.180358,0.182663,0.178844,0.176556]
+ check = [0.19472,0.204269,0.215354,0.230114,0.238961,0.237201,0.247843,0.248424,0.253676,0.254327,
+ 0.254366,0.252931,0.258339,0.259297,0.257155,0.254059,0.252383,0.252826,0.256604,0.256754,
+ 0.255592,0.256813,0.248569,0.25331,0.251032,0.246424,0.249477,0.250939,0.251959,0.24925,0.250372,
+ 0.246148,0.250478,0.244621,0.247428,0.246431,0.245041,0.241647,0.24307,0.240096,0.242797,0.238182,
+ 0.237548,0.239789,0.241477,0.23456,0.237372,0.233715,0.233789,0.232262,0.231589,0.230986,0.231646,
+ 0.231331,0.230484,0.2277,0.226819,0.224341,0.227239,0.223228,0.221232,0.222011,0.224747,0.219533,
+ 0.216973,0.218734,0.21668,0.218366,0.214926,0.213985,0.214469,0.210473,0.209867,0.209066,
+ 0.208965,0.207498,0.204505,0.205786,0.202186,0.200442,0.200485,0.200554,0.200499,0.198152,0.193945,
+ 0.192082,0.193783,0.193787,0.190557,0.190471,0.186827,0.190088,0.188204,0.187547,0.182206,
+ 0.181384,0.180358,0.182663,0.178844,0.176556]
deltas = map(_diff_iq, data, check)
delta = reduce(_add, deltas)/len(deltas)
@@ -506,6 +521,7 @@ class HFIRTestsAPIv2(stresstesting.MantidStressTest):
def test_SampleGeometry_functions(self):
print "SKIPPING test_SampleGeometry_functions()"
return
+ #pylint: disable=unreachable
GPSANS()
DataPath(TEST_DIR)
AppendDataFile("BioSANS_test_data.xml")
@@ -711,8 +727,8 @@ def assertAlmostEqual(first, second, places=None, msg=None, delta=None, rel_delt
return True
elif abs(first - second)/abs(second)<rel_delta:
print '\n-----> %s != %s but within %s percent' % (str(first),
- str(second),
- str(rel_delta*100.0))
+ str(second),
+ str(rel_delta*100.0))
return True
standardMsg = '%s != %s within %s delta' % (str(first),
@@ -726,8 +742,8 @@ def assertAlmostEqual(first, second, places=None, msg=None, delta=None, rel_delt
return True
standardMsg = '%s != %s within %r places' % (str(first),
- str(second),
- places)
+ str(second),
+ places)
print standardMsg
return False
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRTransAPIv2.py b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRTransAPIv2.py
index 4a77810a3b1..04b8f98eddb 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRTransAPIv2.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/HFIRTransAPIv2.py
@@ -8,24 +8,24 @@ import os
def do_cleanup():
Files = ["BioSANS_test_data_reduction.log",
- "BioSANS_test_data_Iq.xml",
- "BioSANS_test_data_Iq.txt",
- "BioSANS_test_data_Iqxy.dat"]
- for file in Files:
- absfile = FileFinder.getFullPath(file)
+ "BioSANS_test_data_Iq.xml",
+ "BioSANS_test_data_Iq.txt",
+ "BioSANS_test_data_Iqxy.dat"]
+ for filename in Files:
+ absfile = FileFinder.getFullPath(filename)
if os.path.exists(absfile):
os.remove(absfile)
return True
-class HFIRTrans(stresstesting.MantidStressTest):
+class HFIRTrans1(stresstesting.MantidStressTest):
def cleanup(self):
do_cleanup()
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
TimeNormalization()
@@ -43,15 +43,15 @@ class HFIRTrans(stresstesting.MantidStressTest):
self.disableChecking.append('Axes')
return "BioSANS_test_data_Iq", 'HFIRTrans.nxs'
-class HFIRTrans(stresstesting.MantidStressTest):
+class HFIRTrans2(stresstesting.MantidStressTest):
def cleanup(self):
do_cleanup()
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
TimeNormalization()
@@ -75,8 +75,8 @@ class HFIRTransmissionDarkCurrent(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
TimeNormalization()
@@ -102,8 +102,8 @@ class HFIRTransmissionDirectBeamCenter(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
TimeNormalization()
@@ -129,8 +129,8 @@ class HFIRTransmissionBeamCenter(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
TimeNormalization()
@@ -157,8 +157,8 @@ class HFIRTransmissionBeamSpreader(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
TimeNormalization()
@@ -187,8 +187,8 @@ class HFIRTransmissionBeamSpreaderDC(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
TimeNormalization()
@@ -218,8 +218,8 @@ class HFIRTransmissionBeamSpreaderDBC(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
TimeNormalization()
@@ -249,8 +249,8 @@ class HFIRTransmissionBeamSpreaderBC(stresstesting.MantidStressTest):
return True
def runTest(self):
- config = ConfigService.Instance()
- config["facilityName"]='HFIR'
+ configI = ConfigService.Instance()
+ configI["facilityName"]='HFIR'
GPSANS()
DirectBeamCenter("BioSANS_empty_cell.xml")
TimeNormalization()
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
index e43851af224..bc6ba04a0cb 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
@@ -6,7 +6,7 @@
from Direct.ReductionWrapper import *
try:
import reduce_vars as web_var
-except:
+except ImportError:
web_var = None
#
@@ -65,7 +65,8 @@ class ReduceLET_OneRep(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
+ #prop['sample_mass'] = 10/(94.4/13)
+ # -- this number allows to get approximately the same system test intensities for MAPS as the old test
#prop['sample_rmm'] = 435.96 #
return prop
@@ -100,8 +101,8 @@ class ReduceLET_OneRep(ReductionWrapper):
sample_ws = 'w1'
monitors_ws = sample_ws + '_monitors'
LoadEventNexus(Filename='LET00006278.nxs',OutputWorkspace=sample_ws,
- SingleBankPixelsOnly='0',LoadMonitors='1',
- MonitorsAsEvents='1')
+ SingleBankPixelsOnly='0',LoadMonitors='1',
+ MonitorsAsEvents='1')
ConjoinWorkspaces(InputWorkspace1=sample_ws, InputWorkspace2=monitors_ws)
#prop.sample_run = sample_ws
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/LOQSANSUtilityTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/LOQSANSUtilityTest.py
index caf625890c8..e4f13dce7dc 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/LOQSANSUtilityTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/LOQSANSUtilityTest.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name,no-init
+#pylint: disable=invalid-name,no-init,too-few-public-methods
import stresstesting
from mantid.simpleapi import *
import SANSUtility as su
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/LiquidsReflectometryReductionWithBackgroundTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/LiquidsReflectometryReductionWithBackgroundTest.py
index 07fa5084cc3..a6e50c72fd4 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/LiquidsReflectometryReductionWithBackgroundTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/LiquidsReflectometryReductionWithBackgroundTest.py
@@ -162,6 +162,7 @@ class NoBackgroundTest(stresstesting.MantidStressTest):
class TOFMismatchTest(stresstesting.MantidStressTest):
+ correct_exception_caught = False
def runTest(self):
#TODO: The reduction algorithm should not require an absolute path
scaling_factor_file = FileFinder.getFullPath("directBeamDatabaseFall2014_IPTS_11601_2.cfg")
@@ -192,8 +193,8 @@ class TOFMismatchTest(stresstesting.MantidStressTest):
SlitsWidthFlag=True,
CropFirstAndLastPoints=False,
OutputWorkspace='reflectivity_119816')
- except RuntimeError as e:
- if str(e).startswith("Requested TOF range does not match data"):
+ except RuntimeError as err:
+ if str(err).startswith("Requested TOF range does not match data"):
self.correct_exception_caught = True
def validate(self):
@@ -201,6 +202,7 @@ class TOFMismatchTest(stresstesting.MantidStressTest):
class BadDataTOFRangeTest(stresstesting.MantidStressTest):
+ correct_exception_caught = False
def runTest(self):
#TODO: The reduction algorithm should not require an absolute path
scaling_factor_file = FileFinder.getFullPath("directBeamDatabaseFall2014_IPTS_11601_2.cfg")
@@ -231,8 +233,8 @@ class BadDataTOFRangeTest(stresstesting.MantidStressTest):
SlitsWidthFlag=True,
CropFirstAndLastPoints=False,
OutputWorkspace='reflectivity_119816')
- except RuntimeError as e:
- if str(e).startswith("Requested TOF range does not match data"):
+ except RuntimeError as err:
+ if str(err).startswith("Requested TOF range does not match data"):
self.correct_exception_caught = True
def validate(self):
@@ -240,6 +242,7 @@ class BadDataTOFRangeTest(stresstesting.MantidStressTest):
class BadPeakSelectionTest(stresstesting.MantidStressTest):
+ correct_exception_caught = False
def runTest(self):
#TODO: The reduction algorithm should not require an absolute path
scaling_factor_file = FileFinder.getFullPath("directBeamDatabaseFall2014_IPTS_11601_2.cfg")
@@ -269,8 +272,8 @@ class BadPeakSelectionTest(stresstesting.MantidStressTest):
SlitsWidthFlag=True,
CropFirstAndLastPoints=False,
OutputWorkspace='reflectivity_119816')
- except RuntimeError as e:
- if str(e).startswith("The reflectivity is all zeros"):
+ except RuntimeError as err:
+ if str(err).startswith("The reflectivity is all zeros"):
self.correct_exception_caught = True
def validate(self):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/LoadEmbeddedInstrumentInfo.py b/Code/Mantid/Testing/SystemTests/tests/analysis/LoadEmbeddedInstrumentInfo.py
index 944933366c9..e300dbfbbdd 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/LoadEmbeddedInstrumentInfo.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/LoadEmbeddedInstrumentInfo.py
@@ -16,7 +16,7 @@ class ISISRawHistNexus(stresstesting.MantidStressTest):
def runTest(self):
# ISIS raw hist nexus file with A1_window at location (0,3,0)
- #pylint: disable=(unused-variable
+ #pylint: disable=unused-variable
MAPS00018314_raw_ISIS_hist = Load('MAPS00018314.nxs')
def validate(self):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py b/Code/Mantid/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
index 8c41a505b82..6fb382f2f3a 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
@@ -70,14 +70,14 @@ BANNED_FILES = ['992 Descriptions.txt',
'MaskLOQData.txt',
'DIRECTHAB.983',
'loq_batch_mode_reduction.csv',
- 'det_corrected7.nxs', # this file can be loaded by LoadDetectorInfo but I am not sure if generic loader should ever deal with it
+ 'det_corrected7.nxs', # this file can be loaded by LoadDetectorInfo; not sure if generic loader should ever deal with it
'poldi2013n006903.hdf',
'poldi2013n006904.hdf',
'poldi2014n019874.hdf',
'poldi2014n019881.hdf',
'poldi2015n000977.hdf',
'USER_SANS2D_143ZC_2p4_4m_M4_Knowles_12mm.txt'
- ]
+ ]
EXPECTED_EXT = '.expected'
@@ -169,7 +169,7 @@ class LoadLotsOfFiles(stresstesting.MantidStressTest):
cur_index = datafiles.index(fname)
except ValueError:
continue
- value = datafiles.pop(cur_index)
+ dummy_value = datafiles.pop(cur_index)
datafiles.insert(insertion_index, fname)
return datafiles
@@ -231,8 +231,8 @@ class LoadLotsOfFiles(stresstesting.MantidStressTest):
del wksp
return False
- id = wksp.id()
- if id is None or len(id) <= 0:
+ wid = wksp.id()
+ if wid is None or len(wid) <= 0:
print "Workspace does not have an id"
del wksp
return False
@@ -243,7 +243,7 @@ class LoadLotsOfFiles(stresstesting.MantidStressTest):
print "Workspace has zero histograms"
del wksp
return False
- if "managed" not in id.lower() and wksp.getMemorySize() <= 0:
+ if "managed" not in wid.lower() and wksp.getMemorySize() <= 0:
print "Workspace takes no memory: Memory used=" + str(wksp.getMemorySize())
del wksp
return False
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py b/Code/Mantid/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py
index 950d1075dae..e3176226679 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py
@@ -1,4 +1,4 @@
-#pylint: disable=no-init,invalid-name
+#pylint: disable=no-init,invalid-name,too-few-public-methods
from mantid.simpleapi import *
from mantid.api import FrameworkManager
import os
@@ -57,6 +57,7 @@ class LoadLotsOfInstruments(stresstesting.MantidStressTest):
if not self.__loadAndTest__(filename):
print "FAILED TO LOAD '%s'" % filename
failed.append(filename)
+ #pylint: disable=broad-except
except Exception, e:
print "FAILED TO LOAD '%s' WITH ERROR:" % filename
print e
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
index 4354f51c17b..d0fbaa674ef 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
@@ -248,21 +248,21 @@ class VesuvioTests(unittest.TestCase):
def test_load_with_spectra_that_are_just_monitors_raises_error(self):
self.assertRaises(RuntimeError, ms.LoadVesuvio, Filename="14188",
- OutputWorkspace=self.ws_name, SpectrumList="1")
+ OutputWorkspace=self.ws_name, SpectrumList="1")
self.assertRaises(RuntimeError, ms.LoadVesuvio, Filename="14188",
OutputWorkspace=self.ws_name, SpectrumList="1-2")
def test_load_with_invalid_difference_option_raises_error(self):
self.assertRaises(ValueError, ms.LoadVesuvio, Filename="14188",
- OutputWorkspace=self.ws_name, Mode="Unknown",SpectrumList="3-134")
+ OutputWorkspace=self.ws_name, Mode="Unknown",SpectrumList="3-134")
def test_load_with_difference_option_not_applicable_to_current_spectra_raises_error(self):
self.assertRaises(ValueError, ms.LoadVesuvio, Filename="14188",
- OutputWorkspace=self.ws_name, Mode="",SpectrumList="3-134")
+ OutputWorkspace=self.ws_name, Mode="",SpectrumList="3-134")
def test_raising_error_removes_temporary_raw_workspaces(self):
self.assertRaises(RuntimeError, ms.LoadVesuvio, Filename="14188,14199", # Second run is invalid
- OutputWorkspace=self.ws_name, Mode="SingleDifference",SpectrumList="3-134")
+ OutputWorkspace=self.ws_name, Mode="SingleDifference",SpectrumList="3-134")
self._do_test_temp_raw_workspaces_not_left_around()
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py b/Code/Mantid/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
index fec25eaec93..6a51a5aab04 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
@@ -30,15 +30,15 @@ class PlusMDTest(stresstesting.MantidStressTest):
def runTest(self):
# Some platforms can't clean up the open file handle on cncs.nxs from the last test, so run cleanup here as well
barefilename = "cncs.nxs"
- config = ConfigService.Instance()
- self._saved_filename = os.path.join(config["defaultsave.directory"], barefilename)
+ configI = ConfigService.Instance()
+ self._saved_filename = os.path.join(configI["defaultsave.directory"], barefilename)
self.cleanup()
# Load then convert to Q in the lab frame
LoadEventNexus(Filename=r'CNCS_7860_event.nxs',OutputWorkspace='cncs_nxs')
ConvertToDiffractionMDWorkspace(InputWorkspace='cncs_nxs', OutputWorkspace='cncs_original', SplitInto=2)
- alg = SaveMD(InputWorkspace='cncs_original', Filename=barefilename)
+ SaveMD(InputWorkspace='cncs_original', Filename=barefilename)
self.assertDelta( mtd['cncs_original'].getNPoints(), 112266, 1)
BinMD(InputWorkspace='cncs_original',AlignedDim0='Q_lab_x, -3, 3, 100',AlignedDim1='Q_lab_y, -3, 3, 100',
@@ -143,16 +143,16 @@ class MergeMDTest(stresstesting.MantidStressTest):
return filenames_string
def runTest(self):
- config = ConfigService.Instance()
+ configI = ConfigService.Instance()
LoadEventNexus(Filename='CNCS_7860_event.nxs',
- OutputWorkspace='CNCS_7860_event_NXS',CompressTolerance=0.1)
+ OutputWorkspace='CNCS_7860_event_NXS',CompressTolerance=0.1)
for omega in xrange(0, 5):
print "Starting omega %03d degrees" % omega
CreateMDWorkspace(Dimensions='3',Extents='-5,5,-5,5,-5,5',Names='Q_sample_x,Q_sample_y,Q__sample_z',
Units='A,A,A',SplitInto='3',SplitThreshold='200',MaxRecursionDepth='3',
- MinRecursionDepth='3', OutputWorkspace='CNCS_7860_event_MD')
+ MinRecursionDepth='3', OutputWorkspace='CNCS_7860_event_MD')
# Convert events to MD events
AddSampleLog("CNCS_7860_event_NXS", "omega", "%s.0" % omega, "Number Series")
@@ -165,12 +165,12 @@ class MergeMDTest(stresstesting.MantidStressTest):
OutputDimensions='Q (sample frame)',LorentzCorrection='1', Append=True)
barefilename = "CNCS_7860_event_rotated_%03d.nxs" % omega
- filename = os.path.join(config["defaultsave.directory"], barefilename)
- alg = SaveMD("CNCS_7860_event_MD", Filename=filename)
+ filename = os.path.join(configI["defaultsave.directory"], barefilename)
+ SaveMD("CNCS_7860_event_MD", Filename=filename)
self._saved_filenames.append(filename)
# End for loop
- filename = os.path.join(config["defaultsave.directory"], r'merged.nxs')
- alg = MergeMDFiles(Filenames=self.make_files_to_merge_string(), OutputFilename=filename, OutputWorkspace='merged')
+ filename = os.path.join(configI["defaultsave.directory"], r'merged.nxs')
+ MergeMDFiles(Filenames=self.make_files_to_merge_string(), OutputFilename=filename, OutputWorkspace='merged')
self._saved_filenames.append(filename)
# 5 times the number of events in the output workspace.
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py
index c9fa0b4737b..96708b546bc 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py
@@ -29,8 +29,8 @@ class POLDIFitPeaks1DTest(stresstesting.MantidStressTest):
def runPeakSearch(self, filenames, deleteList):
for dataFile,deleteRowList in zip(filenames, deleteList):
PoldiPeakSearch(InputWorkspace=dataFile,
- MinimumPeakSeparation=8,
- OutputWorkspace="%s_Peaks" % (dataFile))
+ MinimumPeakSeparation=8,
+ OutputWorkspace="%s_Peaks" % (dataFile))
for deleteRows in deleteRowList:
DeleteTableRows(TableWorkspace="%s_Peaks" % (dataFile), Rows=deleteRows)
@@ -42,11 +42,11 @@ class POLDIFitPeaks1DTest(stresstesting.MantidStressTest):
def runPoldiFitPeaks1D(self, filenames, versions):
for dataFile, version in zip(filenames, versions):
args = {"InputWorkspace": dataFile,
- "FwhmMultiples": 4,
- "PoldiPeakTable": "%s_Peaks" % (dataFile),
- "OutputWorkspace": "%s_Peaks_Refined" % (dataFile),
- "FitPlotsWorkspace": "%s_FitPlots" % (dataFile),
- "Version": version}
+ "FwhmMultiples": 4,
+ "PoldiPeakTable": "%s_Peaks" % (dataFile),
+ "OutputWorkspace": "%s_Peaks_Refined" % (dataFile),
+ "FitPlotsWorkspace": "%s_FitPlots" % (dataFile),
+ "Version": version}
if version == 2:
args["AllowedOverlap"] = 0.1
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
index a2fbd7fa4c8..cf70b750a64 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
@@ -132,12 +132,12 @@ class POLDIFitPeaks2DIntegratedIntensities(stresstesting.MantidStressTest):
# Run the same analysis twice, once with integrated and once with maximum intensities
# Since a Gaussian is used, the integration can be checked numerically.
fit2d, fit1d, peaks_ref_2d = PoldiFitPeaks2D('si_data_6904', peaks_ref,
- OutputIntegratedIntensities=False,
- MaximumIterations=100)
+ OutputIntegratedIntensities=False,
+ MaximumIterations=100)
fit2d, fit1d, peaks_ref_2d_integrated = PoldiFitPeaks2D('si_data_6904', peaks_ref,
- OutputIntegratedIntensities=True,
- MaximumIterations=100)
+ OutputIntegratedIntensities=True,
+ MaximumIterations=100)
self.assertEquals(peaks_ref_2d.rowCount(), peaks_ref_2d_integrated.rowCount())
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/POLDILoadRunsTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/POLDILoadRunsTest.py
index 8fd73d1cea6..47cf3407857 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/POLDILoadRunsTest.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/POLDILoadRunsTest.py
@@ -135,8 +135,8 @@ class POLDILoadRunsTest(stresstesting.MantidStressTest):
def checkRemoveBadDetectors(self):
# Determine bad detectors automatically
PoldiLoadRuns(2013, 6903, 6904, 2, MaskBadDetectors=True,
- BadDetectorThreshold=2.5,
- OutputWorkspace='twoWorkspacesMerged')
+ BadDetectorThreshold=2.5,
+ OutputWorkspace='twoWorkspacesMerged')
wsMerged = AnalysisDataService.retrieve("twoWorkspacesMerged_data_6904")
self.assertEquals(len([True for x in range(wsMerged.getNumberHistograms()) if wsMerged.getDetector(
@@ -146,8 +146,8 @@ class POLDILoadRunsTest(stresstesting.MantidStressTest):
# Lower threshold, more excluded detectors
PoldiLoadRuns(2013, 6903, 6904, 2, MaskBadDetectors=True,
- BadDetectorThreshold=2.0,
- OutputWorkspace='twoWorkspacesMerged')
+ BadDetectorThreshold=2.0,
+ OutputWorkspace='twoWorkspacesMerged')
wsMerged = AnalysisDataService.retrieve("twoWorkspacesMerged_data_6904")
self.assertEquals(len([True for x in range(wsMerged.getNumberHistograms()) if wsMerged.getDetector(
@@ -157,7 +157,7 @@ class POLDILoadRunsTest(stresstesting.MantidStressTest):
# Only use those from the IDF
PoldiLoadRuns(2013, 6903, 6904, 2, MaskBadDetectors=False,
- OutputWorkspace='twoWorkspacesMerged')
+ OutputWorkspace='twoWorkspacesMerged')
wsMerged = AnalysisDataService.retrieve("twoWorkspacesMerged_data_6904")
self.assertEquals(len([True for x in range(wsMerged.getNumberHistograms()) if wsMerged.getDetector(
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
index ff3ba022855..97f999904c3 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
@@ -1,4 +1,4 @@
-#pylint: disable=invalid-name,no-init
+#pylint: disable=invalid-name,no-init,too-many-locals
# File: ReduceOneSCD_Run.py
#
# Version 2.0, modified to work with Mantid's new python interface.
@@ -17,12 +17,16 @@ import time
import stresstesting
-
+import os
from mantid.api import *
from mantid.simpleapi import *
class ReduceOneSCD_Run( stresstesting.MantidStressTest):
+ __reduced_ws_name=""
+ saved=False
+ output_directory=""
+ run_conventional_matrix_file=""
def requiredMemoryMB(self):
""" Require about 12GB free """
@@ -80,15 +84,15 @@ class ReduceOneSCD_Run( stresstesting.MantidStressTest):
#
# Name the files to write for this run
#
- run_niggli_matrix_file = self.output_directory + "/" + run + "_Niggli.mat"
- run_niggli_integrate_file = self.output_directory + "/" + run + "_Niggli.integrate"
+# run_niggli_matrix_file = self.output_directory + "/" + run + "_Niggli.mat"
+# run_niggli_integrate_file = self.output_directory + "/" + run + "_Niggli.integrate"
#
# Load the run data and find the total monitor counts
#
- event_ws = LoadEventNexus( Filename=full_name,
- FilterByTofMin=min_tof, FilterByTofMax=max_tof )
+ event_ws = LoadEventNexus(Filename=full_name,
+ FilterByTofMin=min_tof, FilterByTofMax=max_tof )
if (calibration_file_1 is not None) or (calibration_file_2 is not None):
LoadIsawDetCal(event_ws, Filename=calibration_file_1)
@@ -141,10 +145,10 @@ class ReduceOneSCD_Run( stresstesting.MantidStressTest):
#
if integrate_predicted_peaks:
print "PREDICTING peaks to integrate...."
- peaks_ws = PredictPeaks( InputWorkspace=peaks_ws,
- WavelengthMin=min_pred_wl, WavelengthMax=max_pred_wl,
- MinDSpacing=min_pred_dspacing, MaxDSpacing=max_pred_dspacing,
- ReflectionCondition='Primitive' )
+ peaks_ws = PredictPeaks(InputWorkspace=peaks_ws,
+ WavelengthMin=min_pred_wl, WavelengthMax=max_pred_wl,
+ MinDSpacing=min_pred_dspacing, MaxDSpacing=max_pred_dspacing,
+ ReflectionCondition='Primitive' )
else:
print "Only integrating FOUND peaks ...."
#
@@ -167,14 +171,14 @@ class ReduceOneSCD_Run( stresstesting.MantidStressTest):
SplitInto='2', SplitThreshold='500', MaxRecursionDepth='5' )
peaks_ws = IntegratePeaksMD(InputWorkspace=MDEW, PeakRadius=peak_radius,
- BackgroundOuterRadius=bkg_outer_radius,
+ BackgroundOuterRadius=bkg_outer_radius,
BackgroundInnerRadius=bkg_inner_radius,
- PeaksWorkspace=peaks_ws,
+ PeaksWorkspace=peaks_ws,
IntegrateIfOnEdge=integrate_if_edge_peak )
elif use_fit_peaks_integration:
event_ws = Rebin(InputWorkspace=event_ws,
- Params=rebin_params, PreserveEvents=preserve_events )
+ Params=rebin_params, PreserveEvents=preserve_events )
peaks_ws = PeakIntegration( InPeaksWorkspace=peaks_ws, InputWorkspace=event_ws,
IkedaCarpenterTOF=use_ikeda_carpenter,
MatchingRunNo=True,
@@ -194,11 +198,11 @@ class ReduceOneSCD_Run( stresstesting.MantidStressTest):
if (not cell_type is None) and (not centering is None) :
self.run_conventional_matrix_file = self.output_directory + "/" + run + "_" + \
cell_type + "_" + centering + ".mat"
- run_conventional_integrate_file = self.output_directory + "/" + run + "_" + \
- cell_type + "_" + centering + ".integrate"
+ # run_conventional_integrate_file = self.output_directory + "/" + run + "_" + \
+ # cell_type + "_" + centering + ".integrate"
SelectCellOfType( PeaksWorkspace=peaks_ws,
- CellType=cell_type, Centering=centering,
- Apply=True, Tolerance=tolerance )
+ CellType=cell_type, Centering=centering,
+ Apply=True, Tolerance=tolerance )
# UNCOMMENT the line below to get new output values if an algorithm changes
#SaveIsawPeaks( InputWorkspace=peaks_ws, AppendFile=False, Filename=run_conventional_integrate_file )
SaveIsawUB( InputWorkspace=peaks_ws, Filename=self.run_conventional_matrix_file )
@@ -218,9 +222,9 @@ class ReduceOneSCD_Run( stresstesting.MantidStressTest):
CreateSingleValuedWorkspace(OutputWorkspace="XX2",DataValue="3")
LoadIsawUB(InputWorkspace="XX2",Filename="3132_Orthorhombic_P.mat")
- s2 = mtd["XX2"].sample()
+ #s2 = mtd["XX2"].sample()
ol = s1.getOrientedLattice()
- o2 = s2.getOrientedLattice()
+ #o2 = s2.getOrientedLattice()
self.assertDelta( ol.a(), ol.a(), 0.01, "Correct lattice a value not found.")
self.assertDelta( ol.b(), ol.b(), 0.01, "Correct lattice b value not found.")
self.assertDelta( ol.c(), ol.c(), 0.01, "Correct lattice c value not found.")
@@ -235,7 +239,6 @@ class ReduceOneSCD_Run( stresstesting.MantidStressTest):
def cleanup(self):
if self.saved:
- import os
os.remove( self.run_conventional_matrix_file)
def validateMethod(self):
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
index 89f698b9972..040039f721d 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
@@ -4,7 +4,6 @@ from mantid.simpleapi import *
from ISISCommandInterface import *
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/TOPAZPeakFinding.py b/Code/Mantid/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
index 5d95b6e0045..a643f55dbe1 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
@@ -49,9 +49,9 @@ class TOPAZPeakFinding(stresstesting.MantidStressTest):
# Bin to a line (H=0 to 6, L=3, K=3)
BinMD(InputWorkspace='topaz_3132_HKL',AxisAligned='0',
- BasisVector0='X,units,1,0,0',BasisVector1='Y,units,6.12323e-17,1,0',BasisVector2='2,units,-0,0,1',
- Translation='-0,3,6',OutputExtents='0,6, -0.1,0.1, -0.1,0.1',OutputBins='60,1,1',
- OutputWorkspace='topaz_3132_HKL_line')
+ BasisVector0='X,units,1,0,0',BasisVector1='Y,units,6.12323e-17,1,0',BasisVector2='2,units,-0,0,1',
+ Translation='-0,3,6',OutputExtents='0,6, -0.1,0.1, -0.1,0.1',OutputBins='60,1,1',
+ OutputWorkspace='topaz_3132_HKL_line')
# Now check the integrated bin and the peaks
w = mtd["topaz_3132_HKL_line"]
@@ -93,8 +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
--
GitLab