Ticket #3945 (closed: fixed)
AzizAnalysis System Tests
Reported by: | Owen Arnold | Owned by: | Owen Arnold |
---|---|---|---|
Priority: | critical | Milestone: | Release 2.0 |
Component: | Mantid | Keywords: | |
Cc: | nick.draper@… | Blocked By: | |
Blocking: | #3946 | Tester: | Michael Reuter |
Description
AzizAnalysis system tests are failing. There seems to be a small delta between the expected results and the actual results. Following changes made on the 07/Oct #3923. The change is at most 1E-5 so Nick has requested the the expected results are updated with the current workspace output. A ticket will be generated as part of this iteration to verify that changes to Cylindrical Absorption have been applied correctly.
Change History
comment:3 Changed 9 years ago by Owen Arnold
For reference. new AzizAnalysis file was generated as follows based on the existing AzizAnalysis.py test script. I'm including this here to give guidance for future improvement/debugging work in this area.
calfile="C:/mantid/Test/Data/hrpd_new_072_01_corr.cal" rawfile="C:/mantid/Test/Data/HRP39191.RAW" outputfile="C:/mantid/Test/Data/AzizAnalysis.nxs"
LoadRaw(Filename=rawfile,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=calfile)
#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=rawfile,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=calfile)
#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=rawfile,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=calfile)
#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=calfile)
SaveNexus(InputWorkspace="Vanadium", Filename=outputfile)
comment:5 Changed 9 years ago by Owen Arnold
- Status changed from accepted to verify
- Resolution set to fixed
Tester: This got the system tests working. Check the progress of the full fix under #3946.
comment:6 Changed 9 years ago by Michael Reuter
- Status changed from verify to verifying
- Tester set to Michael Reuter