Skip to content
Snippets Groups Projects
Commit ff219ddf authored by Martyn Gigg's avatar Martyn Gigg
Browse files

Remove out of date system test 

The ISIS powder scripts are now in use for HRPD.
parent 2bf145d6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Testing/SystemTests/tests/analysis/HRPDPowderDiffraction.py deleted 100644 → 0
+ 0
− 86
View file @ 2bf145d6
# Mantid Repository : https://github.com/mantidproject/mantid
#
# Copyright © 2018 ISIS Rutherford Appleton Laboratory UKRI,
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
import systemtesting
from mantid.simpleapi import *
# Simply tests that our LoadRaw and LoadISISNexus algorithms produce the same workspace
class HRPDPowderDiffraction(systemtesting.MantidSystemTest):
def requiredFiles(self):
return ["HRP39191.RAW", "hrpd_new_072_01_corr.cal", "HRP39187.RAW", 'HRPDPowderDiffraction.nxs']
def runTest(self):
#Load the Vanadium
LoadRaw(Filename="HRP39191.RAW",OutputWorkspace="Vanadium")
#mask out the vanadium peaks
MaskBins(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",XMin="19970",XMax="20140")
MaskBins(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",XMin="39970",XMax="40140")
MaskBins(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",XMin="59970",XMax="60140")
MaskBins(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",XMin="79970",XMax="80140")
MaskBins(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",XMin="99970",XMax="100140")
#align vanadium detectors
AlignDetectors(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",CalibrationFile="hrpd_new_072_01_corr.cal")
#normalise by current
NormaliseByCurrent(InputWorkspace="Vanadium",OutputWorkspace="Vanadium")
#correct for solid angle
SolidAngle(InputWorkspace="Vanadium",OutputWorkspace="Corr")
Divide(LHSWorkspace="Vanadium",RHSWorkspace="Corr",OutputWorkspace="Vanadium")
#Multiply the solid angle by the integrated vanadium flux between 1.4 and 3 Angstrom
ConvertUnits(InputWorkspace="Vanadium",OutputWorkspace="flux",Target="Wavelength")
Integration(InputWorkspace="flux",OutputWorkspace="flux",RangeLower="1.4",RangeUpper="3")
Multiply(LHSWorkspace="Corr",RHSWorkspace="flux",OutputWorkspace="Corr")
#adjust the correction down by a factor of 1000
CreateSingleValuedWorkspace(OutputWorkspace="Sc",DataValue="1000")
Divide(LHSWorkspace="Corr",RHSWorkspace="Sc",OutputWorkspace="Corr")
#Load the Vanadium - a second time
LoadRaw(Filename="HRP39191.RAW",OutputWorkspace="Vanadium")
#mask out the vanadium peaks
MaskBins(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",XMin="19970",XMax="20140")
MaskBins(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",XMin="39970",XMax="40140")
MaskBins(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",XMin="59970",XMax="60140")
MaskBins(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",XMin="79970",XMax="80140")
MaskBins(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",XMin="99970",XMax="100140")
#align vanadium detectors
AlignDetectors(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",CalibrationFile="hrpd_new_072_01_corr.cal")
#normalise by current
NormaliseByCurrent(InputWorkspace="Vanadium",OutputWorkspace="Vanadium")
#correct by accumulated correction - solid angle/(1000*flux(1.4 - 3 Angstrom))
Divide(LHSWorkspace="Vanadium",RHSWorkspace="Corr",OutputWorkspace="Vanadium")
#Load the vanadium empty
LoadRaw(Filename="HRP39187.RAW",OutputWorkspace="VEmpty")
#mask out the vanadium peaks
MaskBins(InputWorkspace="VEmpty",OutputWorkspace="VEmpty",XMin="19970",XMax="20140")
MaskBins(InputWorkspace="VEmpty",OutputWorkspace="VEmpty",XMin="39970",XMax="40140")
MaskBins(InputWorkspace="VEmpty",OutputWorkspace="VEmpty",XMin="59970",XMax="60140")
MaskBins(InputWorkspace="VEmpty",OutputWorkspace="VEmpty",XMin="79970",XMax="80140")
MaskBins(InputWorkspace="VEmpty",OutputWorkspace="VEmpty",XMin="99970",XMax="100140")
#align vanadium empty detectors
AlignDetectors(InputWorkspace="VEmpty",OutputWorkspace="VEmpty",CalibrationFile="hrpd_new_072_01_corr.cal")
#correct by accumulated correction - solid angle/(1000*flux(1.4 - 3 Angstrom))
Divide(LHSWorkspace="VEmpty",RHSWorkspace="Corr",OutputWorkspace="VEmpty")
#normalise by current
NormaliseByCurrent(InputWorkspace="VEmpty",OutputWorkspace="VEmpty")
#Subtract Vanadium empty from the Vanadium
Minus(LHSWorkspace="Vanadium",RHSWorkspace="VEmpty",OutputWorkspace="Vanadium")
#Convert to wavelength
ConvertUnits(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",Target="Wavelength")
#Correct for cylinderAbsorption
CylinderAbsorption(InputWorkspace="Vanadium",OutputWorkspace="Transmission",CylinderSampleHeight="2",
CylinderSampleRadius="0.4",AttenuationXSection="5.1",ScatteringXSection="5.08",
SampleNumberDensity="0.072",NumberOfSlices="10",NumberOfAnnuli="10",NumberOfWavelengthPoints="100")
Divide(LHSWorkspace="Vanadium",RHSWorkspace="Transmission",OutputWorkspace="Vanadium")
#convert to dspacing and focuss
ConvertUnits(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",Target="dSpacing")
DiffractionFocussing(InputWorkspace="Vanadium",OutputWorkspace="Vanadium",GroupingFileName="hrpd_new_072_01_corr.cal")
def validate(self):
# Fitting parameters not saved to ParameterMap
self.disableChecking.append("Instrument")
return 'Vanadium','HRPDPowderDiffraction.nxs'
Testing/SystemTests/tests/analysis/ISIS_PowderGeneric.py deleted 100644 → 0
+ 0
− 52
View file @ 2bf145d6
# Mantid Repository : https://github.com/mantidproject/mantid
#
# Copyright © 2018 ISIS Rutherford Appleton Laboratory UKRI,
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
class PEARLPowderDiffraction(systemtesting.MantidSystemTest):
sample = "PEARL00073987.raw"
calfile = "pearl_offset_11_4.cal"
groupfile = "pearl_group_11_2_TT88.cal"
reffile = "PEARLPowderDiffraction.nxs"
def requiredFiles(self):
return [self.sample, self.calfile, self.groupfile, self.reffile]
def runTest(self):
LoadRaw(Filename=self.sample, OutputWorkspace='work',LoadLogFiles='0')
ConvertUnits(InputWorkspace='work',OutputWorkspace='work',Target='Wavelength')
LoadRaw(Filename=self.sample, OutputWorkspace='monitor73987',LoadLogFiles='0',SpectrumMax='1')
ConvertUnits(InputWorkspace='monitor73987',OutputWorkspace='monitor73987',Target='Wavelength')
CropWorkspace(InputWorkspace='monitor73987',OutputWorkspace='monitor73987',
XMin=0.03,XMax=6.0)
MaskBins(InputWorkspace='monitor73987',OutputWorkspace='monitor73987',XMin=3.45,XMax=3.7)
MaskBins(InputWorkspace='monitor73987',OutputWorkspace='monitor73987',XMin=2.96,XMax=3.2)
MaskBins(InputWorkspace='monitor73987',OutputWorkspace='monitor73987',XMin=2.1,XMax=2.26)
MaskBins(InputWorkspace='monitor73987',OutputWorkspace='monitor73987',XMin=1.73,XMax=1.98)
SplineBackground(InputWorkspace='monitor73987',OutputWorkspace='monitor73987',NCoeff=20)
NormaliseToMonitor(InputWorkspace='work',OutputWorkspace='work',MonitorWorkspace='monitor73987',
IntegrationRangeMin=0.6,IntegrationRangeMax=5.0)
ConvertUnits(InputWorkspace='work',OutputWorkspace='work',Target='TOF')
rb_params = [1500,-0.0006,19900]
Rebin(InputWorkspace='work',OutputWorkspace='work',Params=rb_params)
AlignDetectors(InputWorkspace='work',OutputWorkspace='work', CalibrationFile=self.calfile)
DiffractionFocussing(InputWorkspace='work',OutputWorkspace='focus',
GroupingFileName=self.groupfile)
ConvertUnits(InputWorkspace='focus',OutputWorkspace='focus',Target='TOF')
Rebin(InputWorkspace='focus',OutputWorkspace='focus',Params=rb_params)
CropWorkspace(InputWorkspace='focus',OutputWorkspace='focus',XMin=0.1)
def validate(self):
return 'focus','PEARLPowderDiffraction.nxs'
Testing/SystemTests/tests/analysis/reference/HRPDPowderDiffraction.nxs.md5 deleted 100644 → 0
+ 0
− 1
View file @ 2bf145d6
ce1622243acd564e16ca69ab64b2929d
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment