Ticket #10094 (closed: fixed)

Opened 6 years ago

Last modified 5 years ago

Support diffraction corrections

Reported by: Samuel Jackson Owned by: Dan Nixon
Priority: major Milestone: Release 3.3
Component: Indirect Inelastic Keywords:
Cc: spencer.howells@… Blocked By: #9964
Blocking: #10454, #10641 Tester: Raquel Alvarez Banos

Description

Spencer has provided us with some code that allow apply corrections and calculate corrections in IDA to work with diffraction runs.

Attachments

abs_diff.zip (15.3 KB) - added by Samuel Jackson 6 years ago.
Diffraction corrections supplied by Spencer.

Change History

comment:1 Changed 6 years ago by Samuel Jackson

  • Summary changed from Diffraction corrections to Support diffraction corrections

Changed 6 years ago by Samuel Jackson

Diffraction corrections supplied by Spencer.

comment:2 Changed 6 years ago by Samuel Jackson

  • Cc spencer.howells@… added

comment:3 Changed 6 years ago by Owen Arnold

  • Status changed from new to assigned

comment:4 Changed 6 years ago by Nick Draper

  • Owner changed from Samuel Jackson to Dan Nixon

comment:5 Changed 6 years ago by Dan Nixon

  • Status changed from assigned to inprogress

Added diffraction correction code into IDA

Refs #10094

Changeset: cc5669f2241971017de50306d0bff5c3d32638d7

comment:6 Changed 6 years ago by Dan Nixon

Fixed typos in AbsCorr

Refs #10094

Changeset: fb667b73fae03ea258cbe1453d3563926a1b86cf

comment:7 Changed 6 years ago by Dan Nixon

  • Blocked By 9964 added

comment:8 Changed 6 years ago by Dan Nixon

PyLint refactoring in IndirectAbsCorr

Refs #10094

Changeset: 0941ae3bbfbc58a837207ce90a1dcbd5e2eb7436

comment:9 Changed 6 years ago by Dan Nixon

Merge branch 'master' into feature/10094_support_diffraction_corrections

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectAbsCor.py Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Refs #10094

Changeset: e6a0921e74fda2b3d68c41370f401c192c7bb6ee

comment:10 Changed 6 years ago by Dan Nixon

PyLint refactoring in IDA, replace sys.exit

Refs #10094

Changeset: 33e90d965cd869a30892640a1361c9e235c0c766

comment:11 Changed 6 years ago by Dan Nixon

Corrected tab stop in IDA

Refs #10094

Changeset: 239e897a0b9c3cfba4d05e25f321bbb973b1dc85

comment:12 Changed 6 years ago by Dan Nixon

Disable SQw browsing on CalcCorr

Refs #10094

Changeset: 784f72ec4f1c49d96271b99ed4006e38742a1d3e

comment:13 Changed 6 years ago by Dan Nixon

Merge branch 'feature/10094_support_diffraction_corrections' into develop

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectAbsCor.py

Refs #10094

Changeset: a39bbeb1fb499062fd9a52ca676941bad2035fcc

comment:14 Changed 6 years ago by Dan Nixon

Add sample_shape log entry to test WS

Refs #10094

Changeset: 472f39dcff6fff613901ffc79be7adce9e9f3dbd

comment:15 Changed 6 years ago by Dan Nixon

Can workspaces now have a sample_shape log entry

Needed for Apply Corrections

Refs #10094

Changeset: e1a178c52ee440377541d3de1af72f5e7fc5e4bf

comment:16 Changed 6 years ago by Dan Nixon

Merge branch 'feature/10094_support_diffraction_corrections' into develop

Conflicts:

SystemTests/AnalysisTests/ISISIndirectInelastic.py

Refs #10094

Changeset: 891ceee3f8342b077f64bc04ea4145bfb0cd0453

comment:17 Changed 6 years ago by Dan Nixon

Correct diffraction run axis unit check

Refs #10094

Changeset: 6c4f3e9ca942be9e6c124d4cd3927a76d96b1436

comment:18 Changed 6 years ago by Dan Nixon

Fix incorrect function name

Refs #10094

Changeset: 33ab2f7a7d0eac9bf0839c5893d8b17538dec54a

comment:19 Changed 6 years ago by Dan Nixon

Fix sample log function call

Refs #10094

Changeset: 2e7233d98af5768574cdd937307377db00b492aa

comment:20 Changed 6 years ago by Dan Nixon

Remove restriction on ApplyCor with diffraction run

Refs #10094

Changeset: 14c985d3b471980e942b53f18899f834a9ef812b

comment:21 Changed 6 years ago by Dan Nixon

Correct typo in diffraction corrections

Refs #10094

Changeset: 94d4d8cda8ceecedb2c05493ef67d1a677d32941

comment:22 Changed 6 years ago by Dan Nixon

Added systemtest for diffraction corrections

Refs #10094

Changeset: d697aac2ece028c86bef0607934a464acb1f0dd3

comment:23 Changed 6 years ago by Dan Nixon

Note that there are changes to system tests with this ticket: https://github.com/mantidproject/systemtests/tree/feature/10094_support_diffraction_corrections

This must be tested on Windows with Mantid built in Release mode.

To test:

  • Ensure system test (AbsCorFeederDiffractionTest) is passing
  • Open Indirect > Data Analysis > Calculate Corrections
  • Load input: irs26176_diffspec_red.nxs
  • Load can: irs26173_diffspec_red.nxs
  • Use shape: Cylinder
  • Radius 1: 0.2, Radius 2: 0.25, Can Radius: 0.26
  • Step size: 0.002
  • Beam Width: 4.0
  • Both Number Density fields: 0.1
  • Sample formula (select from combo box): H2-0
  • Can formula (select from combo box): V
  • Run
Last edited 6 years ago by Dan Nixon (previous) (diff)

comment:24 Changed 6 years ago by Dan Nixon

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

comment:25 Changed 6 years ago by Raquel Alvarez Banos

  • Status changed from verify to verifying
  • Tester set to Raquel Alvarez Banos

comment:26 Changed 6 years ago by Dan Nixon

  • Status changed from verifying to reopened
  • Resolution fixed deleted

comment:27 Changed 6 years ago by Dan Nixon

  • Status changed from reopened to inprogress

Plot correct corrected workspace

Refs #10094

Changeset: d1263e9639c39f1195e399aa461193cf17f06fd7

comment:28 Changed 6 years ago by Dan Nixon

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

comment:29 Changed 6 years ago by Dan Nixon

  • Blocking 10454 added

(In #10454) Conflicting changes here.

comment:30 Changed 6 years ago by Federico M Pouzols

  • Status changed from verify to verifying
  • Tester changed from Raquel Alvarez Banos to Federico M Pouzols

comment:31 Changed 6 years ago by Federico M Pouzols

  • Tester changed from Federico M Pouzols to Raquel Alvarez Banos

Sorry for the confusion!

comment:32 Changed 6 years ago by Dan Nixon

  • Blocking 10641 added

comment:33 Changed 6 years ago by Dan Nixon

  • Status changed from verifying to closed

Merge branch 'master' into feature/10094_support_diffraction_corrections

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectAbsCor.py Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Refs #10094

Full changeset: e6a0921e74fda2b3d68c41370f401c192c7bb6ee

comment:34 Changed 6 years ago by Dan Nixon

Merge branch 'master' into feature/10094_support_diffraction_corrections

Full changeset: efe333e4b5d1839d76c24c720404c8b8f360e32d

comment:35 Changed 6 years ago by Raquel Alvarez Banos

Merge remote-tracking branch 'origin/feature/10094_support_diffraction_corrections'

Full changeset: 49d012fed6ccf0df9e4020a8317e8d5f584ccaee

comment:36 Changed 6 years ago by Dan Nixon

Merge branch 'master' into feature/10094_support_diffraction_corrections

Full changeset: 6c3a49447582f640f570d2bda6636618b02b072f

comment:37 Changed 6 years ago by Raquel Alvarez Banos

Merge remote-tracking branch 'origin/feature/10094_support_diffraction_corrections'

Full changeset: 7f2db2113d3d67e52b4c355da52b042210c34504

comment:38 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 10936

Note: See TracTickets for help on using tickets.