Context Navigation

← Previous Ticket
Next Ticket →

Ticket #8131 (closed)

Opened 7 years ago

Last modified 5 years ago

[IDA] Update and tidy CalcCorr

Reported by:	Samuel Jackson	Owned by:	Samuel Jackson
Priority:	major	Milestone:	Release 3.2
Component:	Indirect Inelastic	Keywords:
Cc:	spencer.howells@…	Blocked By:
Blocking:		Tester:	Martyn Gigg

Description

Spencer would like the CalCorr interface updated in a similar fashion to what happened with Apply Corr:

In 'Shape Details' 'Can Angle' should be 'Sample Angle'
'Beam Width' default value from IPF 'beam-width'
In 'Can details' Input file like Sample
In 'Sample & Can Details':

'Number Density' stays as-is on its own Then drop-down menu 'Cross-sections from' with values 'Input' & 'Formula' If Input, Scatt & Abs x-sect as now If Formula, text input box 'Chemical Formula'

Verbose, Plot & Save in frame labelled 'Output Options'

Change History

comment:1 Changed 7 years ago by Nick Draper

Status changed from new to assigned

Bulk move to assigned at the introduction of the triage step

comment:2 Changed 7 years ago by Samuel Jackson

Status changed from assigned to inprogress

Refs #8131 Updated CalcCorr interface.

Changeset: 0eec27e6fd54c65c164c8588ec11c5ea5257af5b

comment:3 Changed 7 years ago by Samuel Jackson

Refs #8131 Adding new AbsRun method.

Changeset: 02399ecd4aea2825fd9b92219bfa5ee926c29941

comment:4 Changed 7 years ago by Samuel Jackson

Refs #8131 Refactored IndirectAbsCor

Changeset: 3521be2b57edadce4dde4b853386bb5aab10df50

comment:5 Changed 7 years ago by Samuel Jackson

Refs #8131 Merge master into branch.

Changeset: 607b3a3e004d50e13afd20149f6da77d9c8d1931

comment:6 Changed 7 years ago by Samuel Jackson

Refs #8131 Pass correct parameters to routine.

Changeset: 0ae94feb933a181d0df517085ade8934c1bceb23

comment:7 Changed 7 years ago by Samuel Jackson

Refs #8131 Fix various issues with SetSampleMaterial.

Changeset: b4642736f29f51b10d2fa963953ab32f2bbb21fe

comment:8 Changed 7 years ago by Samuel Jackson

Refs #8131 Minor interface tweak.

Changeset: 0ece923e6441472de9a280967dd291d216e14fff

comment:9 Changed 7 years ago by Samuel Jackson

Refs #8131 Minor interface updates.

Changeset: 00dac7620c1b63357b0ee15e31a48f8f3515b4ac

comment:10 Changed 7 years ago by Samuel Jackson

Refs #8131 Only set sample material when using formula.

Changeset: 808c0fc6ae0f60c739370126e3d918646091a590

comment:11 Changed 7 years ago by Samuel Jackson

Refs #8131 Update documentation.

Changeset: 8325d06dc9b451756a5a7a4dff7f02b66cb7cd03

comment:12 Changed 7 years ago by Samuel Jackson

Refs #8131 Tidy and move FlatAbs comment to docstring.

Changeset: aa8b895f296cdc2777822da6f90c42a0f4775a23

comment:13 Changed 6 years ago by Samuel Jackson

Refs #8131 Re-enable can input.

Changeset: 3c86658fc83cd6fb4b3e9f81122a0f08ae9dc461

comment:14 Changed 6 years ago by Samuel Jackson

Refs #8131 Fix bug in FlatAbs.

Changeset: 8bd51811649aadaa665561b85d59a6d6a39cda45

comment:15 Changed 6 years ago by Samuel Jackson

Refs #8131 CalCorr was passing sample formula as both sample and can.

Changeset: 143bcd67c7715ba9c961fdad48e1c005e5737b6f

comment:16 Changed 6 years ago by Samuel Jackson

Refs #8131 Change starting index to be the first tab.

Changeset: a599ad8026a6e43d4ba8ecf08cae07120ac0195c

comment:17 Changed 6 years ago by Samuel Jackson

Refs #8131 Swap to make beam width non mandatory.

We can try and get it from the instrument in the workspace.

Changeset: ca86a1129aa583aceb9d2ab3d66207846c57f39a

comment:18 Changed 6 years ago by Samuel Jackson

Refs #8131 Fix issues with running CalcCorr.

Changeset: 749b1c02063934c2ef9431a88bfde6d43d5a79cf

comment:19 Changed 6 years ago by Samuel Jackson

Refs #8131 Validate input from formula.

Changeset: c2ad6b3cc8707c27cb1c4229dbdd270642cfd9e8

comment:20 Changed 6 years ago by Samuel Jackson

Refs #8131 Swap to simply auto load the file at the beginning.

Changeset: 278080444c5860e2aed7350b789fe9eaf6f27aa2

comment:21 Changed 6 years ago by Samuel Jackson

Refs #8131 Attempt to get the beam width from the workspace.

Changeset: 0ec788b3053d6023cc8be95288e3f7f354d26965

comment:22 Changed 6 years ago by Samuel Jackson

Refs #8131 Correct bug with can sample material.

Changeset: 8710bbe140259bf967d81893048bee789c9b481f

comment:23 Changed 6 years ago by Samuel Jackson

Refs #8131 Fix PEP 8 warnings.

Changeset: 36f59574cff5fe364f7a2adebb7f32b54fa98ec2

comment:24 Changed 6 years ago by Samuel Jackson

Refs #8131 Attempt to get height of beam from IP file.

Changeset: b94bd3f6c06f1c30146d5854d1db3d66869377e2

comment:25 Changed 6 years ago by Samuel Jackson

Refs #8131 Update definition beam parameters.

Changeset: 021324383bdf0cc299f0730f6e14fe9268d2d08f

comment:26 Changed 6 years ago by Samuel Jackson

Refs #8131 Better form validation.

Changeset: 37d066c673f5ccfdf694e7a7d4390ca4e94bcfbc

comment:27 Changed 6 years ago by Samuel Jackson

Merge branch 'feature/8131_calc_corr_update' into develop

Refs #8131

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui

Changeset: 2a23e66150b3d2ee9fbe24a794dec115ad34f23a

comment:28 Changed 6 years ago by Samuel Jackson

Refs #8131 Add basis for new tests.

Changeset: 7e2d4b11b22620586459d6f4ceae0d7d7fa5c770

comment:29 Changed 6 years ago by Samuel Jackson

Refs #8131 Tidy up existing tests

Changeset: 4a6da9ee7186a52fb8d2d0214cd8b0d6ce19d610

comment:30 Changed 6 years ago by Samuel Jackson

Merge remote-tracking branch 'origin/master' into

feature/8131_calc_corr_update

Refs #8131

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui

Changeset: e6eb96df0cdee9adac9b146efc6b3d486284a921

comment:31 Changed 6 years ago by Samuel Jackson

Refs #8131 Fix a couple of minor interface issues.

Changeset: d509beaa33b5ed1acbfb46f495cc63251f9a33ed

comment:32 Changed 6 years ago by Samuel Jackson

Refs #8131 Minor feedback changes.

Changeset: 2c6be047b6dbc00587e531ef919206534a14233a

comment:33 Changed 6 years ago by Samuel Jackson

Milestone changed from Backlog to Release 3.2

comment:34 Changed 6 years ago by Samuel Jackson

Status changed from inprogress to verify
Resolution set to fixed

To Test

This ticket is for a windows tester and must be built in release mode (cylindrical corrections still use Fortran)

Calculate Corrections has had a general face lift but we've also added the ability to calculate parameters from the sample material. Run through the instructions for calculate corrections at:

http://www.mantidproject.org/Indirect:Indirect_Data_Analysis

Use irs26176_graphite002_red as the sample and irs26173_graphite002_red as the can (both in the sys tests). Check that the routine still works with the input parameters described on that page.

Then try doing it again, but using the chemical formula for either the sample or can (or both). Sample is water (H2-O) and can is Vanadium (V). Can geometry is cylindrical.