Ticket #10897 (closed: fixed)

Opened 6 years ago

Last modified 5 years ago

Add new indirect absorption correction algorithms

Reported by: Dan Nixon Owned by: Dan Nixon
Priority: major Milestone: Release 3.4
Component: Indirect Inelastic Keywords:
Cc: spencer.howells@… Blocked By:
Blocking: #10903 Tester: Harry Jeffery

Description (last modified by Dan Nixon) (diff)

These are a temporary/work in progress effort to get cross platform absorption corrections.

After this ticket an additional tab on the IDA UI should be created to provide an interface for this.

This will not replace the current UI/algorithms.

Attached are the algorithms provided by Spencer for this.

Attachments

IndirectAnnulusAbsorption.py (8.2 KB) - added by Dan Nixon 6 years ago.
IndirectCylinderAbsorption.py (7.4 KB) - added by Dan Nixon 6 years ago.
IndirectFlatPlateAbsorption.py (8.1 KB) - added by Dan Nixon 6 years ago.

Change History

Changed 6 years ago by Dan Nixon

Changed 6 years ago by Dan Nixon

Changed 6 years ago by Dan Nixon

comment:1 Changed 6 years ago by Dan Nixon

  • Description modified (diff)

comment:2 Changed 6 years ago by Dan Nixon

  • Status changed from new to assigned

comment:3 Changed 6 years ago by Dan Nixon

  • Status changed from assigned to inprogress

Added refactored annulus shape algorithm

Refs #10897

Changeset: 309767c0c61e3ba9bb7eb644508827579c2a175d

comment:4 Changed 6 years ago by Dan Nixon

  • Blocking 10903 added

comment:5 Changed 6 years ago by Dan Nixon

Added cylinder correction alg

Refs #10897

Changeset: a269ba1901062601fdd2b8e3728d7f1d02c077fe

comment:6 Changed 6 years ago by Dan Nixon

Added flat plate algorithm

Refs #10897

Changeset: 82443aa1bf00ea751dc8890b27b4c3ed2d1a7870

comment:7 Changed 6 years ago by Dan Nixon

Added doc tests for new absorption algorithms

Refs #10897

Changeset: ebcea5801bb8af8e7f9e42006dd0719ebd56e8bd

comment:8 Changed 6 years ago by Dan Nixon

Added unit tests for new abs cor algos

Refs #10897

Changeset: e64212be27fe37066b67e3b94ff98a6626eb1522

comment:9 Changed 6 years ago by Dan Nixon

Improve testing for abs cor algos

Refs #10897

Changeset: 18c7c3efe8899a7fbb5243862b02d1ca29dff009

comment:10 Changed 6 years ago by Dan Nixon

Three algorithms were added:

  • IndirectFlatPlateAbsorption
  • IndirectAnnulusAbsorptios
  • IndirectCylinderAbsorption

To test:

  • See that the unit and doc tests are passing for each algorithm
  • Try running them based on the usage example (e.g. try changing the sample properties)

comment:11 Changed 6 years ago by Dan Nixon

Correct test name, added usgae data note

Refs #10897

Changeset: f836630e1790f8ad75f1b4c20b877df20c716aed

comment:12 Changed 6 years ago by Dan Nixon

Temp. removal of failing tests

Refs #10897

Changeset: 90e319c0f42605bfd9a104f88edf3beb7d5a27ba

comment:13 Changed 6 years ago by Dan Nixon

Revert "Temp. removal of failing tests"

This reverts commit 90e319c0f42605bfd9a104f88edf3beb7d5a27ba.

Refs #10897

Changeset: b3dd084739fc389c66fe614ba20406e6c7010683

comment:14 Changed 6 years ago by Dan Nixon

Ensure correct files are laoded

Refs #10897

Changeset: 018ccd0e0ac825c5431ca21c3542ef61a16d73e1

comment:15 Changed 6 years ago by Dan Nixon

Refactored unit tests

Refs #10897

Changeset: d80bc6fa3e90f88dae1c3e55b8c0d797c5ff42c9

comment:16 Changed 6 years ago by Dan Nixon

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

comment:17 Changed 6 years ago by Dan Nixon

Add to Workflow>MIDAS catagory

Refs #10897

Changeset: 35fec54ef80d2b19e99804875ce898aae2cadf0c

comment:18 Changed 6 years ago by Roman Tolchenov

  • Status changed from verify to verifying
  • Tester set to Roman Tolchenov

comment:19 Changed 6 years ago by Roman Tolchenov

  • Status changed from verifying to reopened
  • Resolution fixed deleted

Tried IndirectAnnulusAbsoptions in the GUI on Windows.

  • The defaults for the radii crash mantid. Martyn suggests making all size properties mandatory.
  • The algorithm doesn't report progress and cannot be cancelled.

comment:20 Changed 6 years ago by Dan Nixon

  • Status changed from reopened to inprogress

Add progress reporting to flat plate and cylinder algos

Refs #10897

Changeset: 4fe20b2bb83c182c2828800dcc136812dbfe1655

comment:21 Changed 6 years ago by Dan Nixon

Add better default values and progress reporting to annulus

Refs #10897

Changeset: a175763710a4a1ecb7cbc64ded9509d85931ce51

comment:22 Changed 6 years ago by Dan Nixon

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

I can't seem to find a way to have the values set without a default value but still be mandatory and float properties from Python, hence I have just made the default values work.

The heavy computation here is done in the other absorption correction algorithms and it seems that this still cannot be cancelled, I will make an additional ticket to fix this.

Last edited 6 years ago by Dan Nixon (previous) (diff)

comment:23 Changed 6 years ago by Dan Nixon

  • Status changed from verify to reopened
  • Resolution fixed deleted

For the sake of easy testing I'm going to open a pull request for this instead.

comment:24 Changed 6 years ago by Dan Nixon

  • Status changed from reopened to inprogress

Merge branch 'master' into feature/10897_add_cross_platform_indirect_abs_cor_algos

Refs #10897

Changeset: b1e59110d7b3572b0fcc237dc2a5e12872dee06b

comment:25 Changed 6 years ago by Dan Nixon

Remove previously committed test data

Refs #10897

Changeset: 80f13f828f0e56ada282d56a226abd35c44069f6

comment:26 Changed 6 years ago by Dan Nixon

Merge branch 'master' into feature/10897_add_cross_platform_indirect_abs_cor_algos

Refs #10897

Changeset: 83cd3139184c03f512c62e52f6da37258fb8e8f6

comment:27 Changed 6 years ago by Dan Nixon

Merge branch 'master' into feature/10897_add_cross_platform_indirect_abs_cor_algos

Refs #10897

Changeset: ebdaf1832b5fb3cdea9480a8886e79f463ae1d12

comment:28 Changed 6 years ago by Dan Nixon

Merge branch 'master' into feature/10897_add_cross_platform_indirect_abs_cor_algos

Refs #10897

Changeset: eb629464cb5e0becf2595a956d30cc35c4e23f57

comment:29 Changed 6 years ago by Dan Nixon

Correct tests for new data location

Refs #10897

Changeset: ba87410955ccf693978b9582b2b1f67d23a94381

comment:30 Changed 6 years ago by Dan Nixon

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

This is being verified as pull request #400.

comment:31 Changed 6 years ago by Dan Nixon

Do not save workspaces when not needed

Refs #10897

Changeset: 435680bb74250ca851bf357265f9fa754dc4ad5f

comment:32 Changed 6 years ago by Dan Nixon

Jenkins, retest this please.

comment:33 Changed 6 years ago by Dan Nixon

Jenkins, retest this please.

comment:34 Changed 6 years ago by Dan Nixon

Jenkins, retest this please.

comment:35 Changed 6 years ago by Harry Jeffery

  • Status changed from verify to verifying
  • Tester changed from Roman Tolchenov to Harry Jeffery

comment:36 Changed 6 years ago by Harry Jeffery

  • Status changed from verifying to closed

Merge pull request #400 from mantidproject/feature/10897_add_cross_platform_indirect_abs_cor_algos

Cross platform indirect absorption correction algorithms

Full changeset: 4c784a0b0caa531272c33839363c21401c75a5a4

comment:37 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 11736

Note: See TracTickets for help on using tickets.