Ticket #5626 (closed: fixed)

Opened 8 years ago

Last modified 5 years ago

NormaliseByDetector

Reported by: Owen Arnold Owned by: Owen Arnold
Priority: major Milestone: Release 2.2
Component: Mantid Keywords:
Cc: Blocked By:
Blocking: #5639 Tester: Jean Bilheux

Description

Requested by Tim Charlton:

Normalisation procedure is as follows:

  • Store a function to map detector efficiency as a function of wavelength
  • Store the coefficients for that function for each detector
  • Create a workspace from the detector coefficients + functions + xbins
  • Divide the numerator by this new workspace

Attachments

demo.xml​ (437 bytes) - added by Owen Arnold 8 years ago.

Change History

comment:1 Changed 8 years ago by Owen Arnold

  • Status changed from new to accepted

comment:2 Changed 8 years ago by Owen Arnold

refs #5626. New search features in parammap.

Changeset: 9ef93b87c949b69c38062e5c8afabd123f518694

comment:3 Changed 8 years ago by Owen Arnold

refs #5626. Gets function from param file.

Changeset: 8254afc3219ec18f5beb9e10321f851a869b5c3b

comment:4 Changed 8 years ago by Owen Arnold

refs #5626. Uses function against wavelengths on input.

Changeset: 1954025f8ac17a37c456af847b3b377f4ef9dbe0

comment:5 Changed 8 years ago by Owen Arnold

refs #5626. Verify denominator WS calculations.

Changeset: 665926d153685f15e55f452827448abad25feeff

comment:6 Changed 8 years ago by Owen Arnold

refs #5626. Separate tests for inst and det level fit functions.

Changeset: fe0e71ee8cb18355245d827ef3408359c21eb4d1

comment:7 Changed 8 years ago by Owen Arnold

refs #5626. Perform division.

Changeset: 1b2f900bc4bf5c9461182d055d8d4977bbbc9f7b

comment:8 Changed 8 years ago by Owen Arnold

refs #5626. Test edge cases.

Changeset: 510986b0bef2ec0a5c6111857464f501e35de3b7

comment:9 Changed 8 years ago by Owen Arnold

refs #5626. Kill warnings.

Changeset: 85ca582d35dc6c60a71ea4e48260a67620c6b5c1

comment:10 Changed 8 years ago by Owen Arnold

refs #5626. Parallelise alg.

Changeset: 9a0e9ef9a302273dd7a853dade867970c1162f87

comment:11 Changed 8 years ago by Owen Arnold

refs #5626. Test Parallel and Sequential implementations.

Changeset: a21340803af6688d4f490c2cac889537a68264ae

comment:12 Changed 8 years ago by Owen Arnold

refs #5626. Performance Test Parallel and Sequential.

Changeset: b98cc75e9e03ee546d2746a88d3c73b2c81e4598

comment:13 Changed 8 years ago by Owen Arnold

The parallel implementation is running consistently 10 - 20 % faster than the sequential version.

comment:14 Changed 8 years ago by Owen Arnold

refs #5626. Disable parallel tests.

Changeset: 0198138c2fbfe49f7ef5671e0623dcc0fe9599b6

comment:15 Changed 8 years ago by Owen Arnold

refs #5626. Should fix tests.

Changeset: e3777693a6595a5d04c52e1736b160fbd2dafe23

comment:16 Changed 8 years ago by Owen Arnold

refs #5626. Explicit file paths.

Changeset: b606bd92bbca0301ab8065c79575b3952325934a

comment:17 Changed 8 years ago by Owen Arnold

refs #5626. Re-enable parallel tests.

Changeset: 7861e5e745bd9f83ff14f703ecb2fdf0a235adb1

comment:18 Changed 8 years ago by Owen Arnold

refs #5626. Compute the error.

Changeset: 43c301a69bb2cc68721f950397be427d1f51623e

comment:19 Changed 8 years ago by Owen Arnold

refs #5626. Type conversion warning fixed.

Changeset: 4db62d30a7101fb004e965d7f4f735d4a935a14d

comment:20 Changed 8 years ago by Owen Arnold

refs #5626. Full Wiki Docs.

Changeset: db3a603b725f78eb8b068549b8e20013747b8584

comment:21 Changed 8 years ago by Owen Arnold

  • Status changed from accepted to verify
  • Resolution set to fixed

Tester: Using the attached file demo.xml and the python code below will demonstrate this working by normalising by unity. The POLREF file is the one in the AutoTest directory. 

Load(Filename='POLREF00004699.nxs',OutputWorkspace='POLREF00004699')
ConvertSpectrumAxis(InputWorkspace='POLREF00004699_1',OutputWorkspace='converted_1',Target='signed_theta')
ConvertUnits(InputWorkspace='converted_1',OutputWorkspace='inwavelength_1',Target='Wavelength',EMode='Indirect')
# Setup so that will be normalising by unity. see file contents.
LoadParameterFile(Workspace='inwavelength_1',Filename=r'demo.xml')
NormaliseByDetector(InputWorkspace='inwavelength_1', OutputWorkspace='normalised_1')
match = CheckWorkspacesMatch(Workspace1='inwavelength_1', Workspace2='normalised_1', CheckAxes=False)
print match # Should print Success!

Changed 8 years ago by Owen Arnold

comment:22 Changed 8 years ago by Owen Arnold

  • Blocking 5639 added

comment:23 Changed 8 years ago by Owen Arnold

refs #5626. Fix warning

Changeset: 20e716d82ab7ec1721e0e2a25a8551b073eb93f4

comment:24 Changed 8 years ago by Owen Arnold

refs #5626. Fix warning

Changeset: 20e716d82ab7ec1721e0e2a25a8551b073eb93f4

comment:25 Changed 8 years ago by Jean Bilheux

  • Status changed from verify to verifying
  • Tester set to Jean Bilheux

comment:26 Changed 8 years ago by Jean Bilheux

  • Status changed from verifying to closed

Works as expected.

comment:27 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​6472

Note: See TracTickets for help on using tickets.