Ticket #9209 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

Indirect Diffraction: Add can file to reduction

Reported by: Samuel Jackson Owned by: Samuel Jackson
Priority: major Milestone: Release 3.2
Component: Indirect Inelastic Keywords:
Cc: Blocked By:
Blocking: Tester: Anders Markvardsen

Description

Request from Sanghamitra. It would be useful to add an option to the Indirect C2E interface that would allow the user to optionally input a can file at the same time as the sample. Then do the following steps:

  • Run the reducer on both files
  • Normalise both by the beam current
  • Subtract the can from the sample

Change History

comment:1 Changed 7 years ago by Owen Arnold

  • Status changed from new to assigned

comment:2 Changed 6 years ago by Samuel Jackson

  • Summary changed from Indirect C2E: Add can file to reduction to Indirect Diffraction: Add can file to reduction

comment:3 Changed 6 years ago by Samuel Jackson

  • Milestone changed from Backlog to Release 3.3

comment:4 Changed 6 years ago by Samuel Jackson

  • Status changed from assigned to inprogress

Refs #9209 Add post processing step to diffraction.

Changeset: a7a428625890b65dc1f93cd973bc5c97c8ba35d4

comment:5 Changed 6 years ago by Samuel Jackson

Refs #9209 Modify interface to support can file.

Changeset: 00b2e3c0cad631f8521fb249ef1842a24d2de86b

comment:6 Changed 6 years ago by Samuel Jackson

  • Milestone changed from Release 3.3 to Release 3.2

comment:7 Changed 6 years ago by Samuel Jackson

To Test

There's a new can option on the Indirect diffraction interface for everything except OSIRIS in diffonly mode. You can use irs26176 (sample) and irs26173 (can) to test this option works. The can should get reduced with the sample, then in the post processing, both are normalised by the beam current and the can is subtracted from the sample(s). Also check the scale option scales the can as you would expect.

Last edited 6 years ago by Samuel Jackson (previous) (diff)

comment:8 Changed 6 years ago by Samuel Jackson

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

comment:9 Changed 6 years ago by Samuel Jackson

  • Status changed from verify to reopened
  • Resolution fixed deleted

Further discussion with instrument scientists required.

comment:10 Changed 6 years ago by Samuel Jackson

  • Status changed from reopened to inprogress

Revert "Refs #9209 Modify interface to support can file."

This reverts commit 00b2e3c0cad631f8521fb249ef1842a24d2de86b.

Changeset: 95c4d764ebed487a65c93749862c496096384032

comment:11 Changed 6 years ago by Samuel Jackson

Revert "Refs #9209 Add post processing step to diffraction."

This reverts commit a7a428625890b65dc1f93cd973bc5c97c8ba35d4.

Changeset: b3a52c10019d45416193b684e93083120df666ed

comment:12 Changed 6 years ago by Samuel Jackson

Refs #9209 Add support for diffraction runs to Apply Corrections.

This only adds support using a can file with it. Calculate corrections can be supported but will take more time than we have for release.

Changeset: 8e0ce368f631d72ecccf8377c5891d60da9908ec

comment:13 Changed 6 years ago by Samuel Jackson

Refs #9209 Rename workspace in reduction to fit format expected.

Changeset: f4eba034db20d682147e7942d9cf4fc953e52cf2

comment:14 Changed 6 years ago by Samuel Jackson

Refs #9209 Update parameter files with naming scheme.

Changeset: efbf4f4db8ffed645958255ba16c900652096a50

comment:15 Changed 6 years ago by Samuel Jackson

Merge branch 'feature/9209_can_file_in_diffraction' into develop

Refs #9209

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Changeset: 75f842c44ce47ffc251b721259cb6d14dcc72102

comment:16 Changed 6 years ago by Samuel Jackson

Refs #9209 Update system tests.

The workspaces should still match exactly. It's just the name of the output workspaces that have changed.

Changeset: 3baf74eda69501205b406fc64fad7cd04c71a1ad

comment:17 Changed 6 years ago by Samuel Jackson

Refs #9209 Correct units.

Changeset: d7bb69fe6356738180246b4f9830b3d8dbc53612

comment:18 Changed 6 years ago by Samuel Jackson

Refs #9209 Fix plotting for can subtraction.

Changeset: 14b57b3bd003179a72642dafe67e82536b9e33a2

comment:19 Changed 6 years ago by Samuel Jackson

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

To Test

These changes have been implemented as part of Apply Corrections.

  • Open Indirect diffraction and reduce the raw workspaces 26173, 26176 from IRIS in diffspec mode.
  • Use 26176 as the sample and 26173 as the can for parameters to Apply Corrections (in indirect data analysis).
  • Check plot spectrum
  • Run, this should work and should plot the resulting spectrum with units of DSpacing on the x axis.
  • Try running with corrections and you should get an error telling you it's currently unsupported.

More info on Apply Corrections here: http://www.mantidproject.org/Indirect:Indirect_Data_Analysis

comment:20 Changed 6 years ago by Anders Markvardsen

  • Status changed from verify to verifying
  • Tester set to Anders Markvardsen

comment:21 Changed 6 years ago by Anders Markvardsen

  • Status changed from verifying to reopened
  • Resolution fixed deleted

Please note get the conflict. Note immediate obvious have to fix merge

Auto-merging Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py CONFLICT (content): Merge conflict in Code/Mantid/scripts/Inelastic/IndirectData Analysis.py

comment:22 Changed 6 years ago by Samuel Jackson

  • Status changed from reopened to inprogress

Merge remote-tracking branch 'origin/master' into feature/9209_can_file_in_diffraction

Refs #9209

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Changeset: 72b2ae360c0b05b3b2694412a5937796e52a0e19

comment:23 Changed 6 years ago by Samuel Jackson

Merge branch 'feature/9209_can_file_in_diffraction' into develop

Refs #9209

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Changeset: 3ea5926ce3f71739d94afb3c11ab8b4b17600c3d

comment:24 Changed 6 years ago by Samuel Jackson

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

Try again now.

comment:25 Changed 6 years ago by Samuel Jackson

  • Status changed from verify to closed

Merge branch 'feature/9209_can_file_in_diffraction' of github.com:mantidproject/mantid into feature/9209_can_file_in_diffraction

Full changeset: 402c7508f2372baddb92412ba65b88ce6e457313

comment:26 Changed 6 years ago by Martyn Gigg

Merge remote-tracking branch 'origin/feature/9209_can_file_in_diffraction'

Full changeset: 9c098689b5464439bb399c1246d26919d29e4741

comment:27 Changed 6 years ago by Martyn Gigg

Merge remote-tracking branch 'origin/feature/9209_can_file_diffraction'

Full changeset: d2c55cec811df36ebfe01f01c0b99cb1f4c6cdfd

comment:28 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 10052

Note: See TracTickets for help on using tickets.