Ticket #10083 (closed: fixed)

Opened 6 years ago

Last modified 5 years ago

Indirect algorithm: inelastic_indirect_reducer

Reported by: Dan Nixon Owned by: Dan Nixon
Priority: major Milestone: Release 3.3
Component: Indirect Inelastic Keywords:
Cc: spencer.howells@… Blocked By: #10085, #10092
Blocking: #9969, #10064, #10215, #10259 Tester: Harry Jeffery

Description

Used in main Energy Conversion tab and Calibration tab.

Convert to Python algorithm, add unit tests and docs.

Replace use in mentioned tabs.

Change History

comment:1 Changed 6 years ago by Dan Nixon

Added InelasticIndirectReducer python algorithm

Refs #10083

Changeset: a0eae3a87de6ca90d9be63b6f2bf67c93820775c

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

comment:4 Changed 6 years ago by Dan Nixon

More refactoring, added sample log saving and plotting

Refs #10083

Changeset: 6a1e8397a19826022980b34d0d2e8da32159e165

comment:5 Changed 6 years ago by Dan Nixon

Added bare unit test and docs, replaced use in C2E tab

Not all features on Energy Conversion are implemented yet

Refs #10083

Changeset: 689227d04c85ac9dca1cd0e58b9f20824d2a23ce

comment:6 Changed 6 years ago by Dan Nixon

UI refactoring, fixed UI rename option

Added error handling if user cancels plotting large numbers of spectra. Removed Verbose option from UI (it was never used) Implmented Rename Workspace checkbox

Refs #10083

Changeset: 7b0fc383064ebd10583751171e1b73a0222d8339

comment:7 Changed 6 years ago by Dan Nixon

Implement load calibration workspace, fix save format checking

Refs #10083

Changeset: e98b0dee415322f331f39b737a348c19678d41de

comment:8 Changed 6 years ago by Dan Nixon

  • Blocked By 10092 added

comment:9 Changed 6 years ago by Dan Nixon

Better use of property types

Refs #10083

Changeset: 0c7f3f9ffee4a10624d98da70bb5fdb7f0c59a9e

comment:10 Changed 6 years ago by Dan Nixon

  • Blocking 9987 added

(In #9987) This is something I will add alongside #10083

comment:11 Changed 6 years ago by Dan Nixon

  • Blocking 10157 added

comment:12 Changed 6 years ago by Dan Nixon

Added option to save using DaveGrp

Refs #10083

Changeset: d6818da1bd9ddb22efdb3385fdc2bad74c5441c0

This is the start of the fix for #10157

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

comment:13 Changed 6 years ago by Dan Nixon

Fixed type in DaveGrp, fixed issue setting array properties

Refs #10083

Changeset: e5f15475aaaadaa1a67ff15f23444ff6b581fdb0

This is part of #10157

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

comment:14 Changed 6 years ago by Dan Nixon

  • Blocked By 10085 added

comment:15 Changed 6 years ago by Dan Nixon

Added marker in output workspace when using multiple runs

Refs #10083

Changeset: 66b989cd60cda64d06d046c4ba502b3209a5ae39

This is the start of the fix for #9987

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

comment:16 Changed 6 years ago by Dan Nixon

Added sample logs for multi run files

Refs #10083

Changeset: 742fcd62bda66a04a6726b8f3b6cae0ed73dd2c5

This completed the fix for #9987

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

comment:17 Changed 6 years ago by Dan Nixon

Added warning when reducing event data without rebinning

Refs #10083

Changeset: d813dc75141c1396cec04e8617841d5ba38ac22a

This is a start to #6468

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

comment:18 Changed 6 years ago by Dan Nixon

Merge branch 'master' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Conflicts:

Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py Code/Mantid/scripts/Inelastic/msg_reducer.py

Refs #10083

Changeset: 6af92784c4f49d4601b51e75d50f3d321367f4b3

comment:19 Changed 6 years ago by Dan Nixon

Algorithm refactor, added DaveGrp option to UI

Refs #10083

Changeset: 829b7e86a9132192082d5f8ffefca56c5b2d408d

This should complete #10157

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

comment:20 Changed 6 years ago by Dan Nixon

Refactored SaveItems step, corrected multi run save name

Refs #10083

Changeset: 0d43274328f84c2a4129063ab11508779e203786

comment:21 Changed 6 years ago by Dan Nixon

Moved property validation to validateInputs

Refs #10083

Changeset: 1d1ac42797eb1a969f325b8a4745ef09d39dfb17

comment:22 Changed 6 years ago by Dan Nixon

  • Blocking 7842 added

comment:23 Changed 6 years ago by Dan Nixon

  • Component changed from Framework to Indirect Inelastic

comment:24 Changed 6 years ago by Dan Nixon

Added menthod to get instrument analyser and reflections

Refs #10083

Changeset: 1ebcbdb13347b6e397937c8e00a3be2a522dc557

comment:25 Changed 6 years ago by Dan Nixon

Use batch algo runner for plat time in indirect C2E

Refs #10083

Changeset: ffba041ad688ffecdee0b971b6f51a1bd89bab61

comment:26 Changed 6 years ago by Dan Nixon

Removed more Python from the Indirect Data Reduction GUI code

Refs #10083

Changeset: 9682c85082e5f1662a11e94fce7e8afe44329c29

comment:27 Changed 6 years ago by Dan Nixon

  • Cc spencer.howells@… added

comment:28 Changed 6 years ago by Dan Nixon

Fixed instrument parameter loading issue

Refs #10083

Changeset: 2445660470a81e0da05d69c54cb29f6dfb4dacae

comment:29 Changed 6 years ago by Dan Nixon

Small typo correction

Refs #10083

Changeset: 5c0ab5462f8a196c7bcaef95eb5d977e74dfa2a4

comment:30 Changed 6 years ago by Dan Nixon

Include first run number of multi run name

Refs #10083

Changeset: 6221b9edc5ae139bb1956dbb6af8778f7d19f51f

comment:31 Changed 6 years ago by Dan Nixon

Merge branch 'bugfix/10085_indirect_algorithm_CreateMappingFile' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/src/IndirectConvertToEnergy.cpp

Refs #10083

Changeset: 39411b6090d075f607a3940651e18fdcf34bddd7

comment:32 Changed 6 years ago by Dan Nixon

Small change to grouping propety, fixed plotting issue

Refs #10083

Changeset: 072fbfd619c73e7e55b6338c4f755b66f815cabd

comment:33 Changed 6 years ago by Dan Nixon

Convert Y axis to ElasticQ before saving DaveGrp

Refs #10083

Changeset: 320562af909bb6fdc91d282c02489839d44b52d1

comment:34 Changed 6 years ago by Dan Nixon

  • Blocking 10259 added

(In #10259) Some nice instrument loading functions were added in this ticket that would be useful here.

comment:35 Changed 6 years ago by Dan Nixon

Added unit test and usgae example

Refs #10083

Changeset: 664fa4357dab344187e5c34b4318dbe63c5c588e

comment:36 Changed 6 years ago by Dan Nixon

Merge branch 'bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring' into develop

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/src/IndirectCalibration.cpp Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReductionTab.cpp

Refs #10083

Changeset: 013dffa2733379c01187b83ec75eb7fe872b8729

comment:37 Changed 6 years ago by Dan Nixon

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

To test:

  • Verify system tests, doc tests and unit tests are passing
  • Open Indirect > Data Reduction > Calibration
  • Create a calibration file using IRS26173, ensure Save Result is selected
  • Switch to the Energy Transfer tab, load run 26175-6, enable Sum Files, enable DaveGrp output, select Grouping:Groups with Number Of Groups = 10, select PlotOutput:Spectra
  • Plot should show 10 spectra
  • Open sample logs for output workspace, verify multi run numbers contain 26175 and 26176
  • Run reduction again with Sum Files disabled and only 26176, notice different file name
  • Disable Use Calib File and switch to Default Grouping, switch Plot Mode to Contour, run reduction again
  • Enable background removal between TOF 66000 - 68000, run reduction again, verify removal by change in contour plot
  • Disable Do Not Rebin, set parameters -0.6, 0.05, 0.6, run reduction, notice effects of rebinning in contour plot

Note that there is a branch on systemtests to go with this ticket.

comment:38 Changed 6 years ago by Dan Nixon

Remove old Rename Output options

Refs #10083

Changeset: 42103299cf0dbc9890fb464ab901c47a0d306b9d

comment:39 Changed 6 years ago by Dan Nixon

Corrected filename in doc test, added file note

Refs #10083

Changeset: 79b240306d78e41aa17c2a8294c428f4f4e7d1de

comment:40 Changed 6 years ago by Martyn Gigg

Temporarily disable failing doctest.

Refs #10083

Changeset: fc27180bea0e34b6f9b116e41a11a5589c2f07f6

comment:41 Changed 6 years ago by Dan Nixon

Search for instument in every facility

Refs #10083

Changeset: c0de1c639f250c7a8c9f16492ace891b4abc6622

comment:42 Changed 6 years ago by Dan Nixon

  • Blocking 10215 added

comment:43 Changed 6 years ago by Dan Nixon

Use lowercase short name for workspace naming

Refs #10083

Changeset: 7c87c5ee914f1e17fdddea5c7fac4d97d96c6f3b

comment:44 Changed 6 years ago by Dan Nixon

Correct IPF reading for IDR

Refs #10083

Changeset: d3f6c9d997961927a99a06d92909505f6c1ec9e2

comment:45 Changed 6 years ago by Dan Nixon

  • Blocking 9987 removed

(In #9987) This has been added in #10083

comment:46 Changed 6 years ago by Dan Nixon

  • Blocking 10157 removed

(In #10157) This has been added in #10083

comment:47 Changed 6 years ago by Dan Nixon

  • Blocking 7842 removed

comment:48 Changed 6 years ago by Dan Nixon

Correct a typo in spectra range

Refs #10083

Changeset: a1f585c4d754ff7d58c600bb3cf92857830b81fe

comment:49 Changed 6 years ago by Harry Jeffery

  • Status changed from verify to verifying
  • Tester set to Harry Jeffery

comment:50 Changed 6 years ago by Dan Nixon

  • Status changed from verifying to closed

Merge branch 'master' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Conflicts:

Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py Code/Mantid/scripts/Inelastic/msg_reducer.py

Refs #10083

Full changeset: 6af92784c4f49d4601b51e75d50f3d321367f4b3

comment:51 Changed 6 years ago by Dan Nixon

Merge branch 'master' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Full changeset: e4eb6bc3a2d108c4c6bb38940aa24df89eee5bf4

comment:52 Changed 6 years ago by Dan Nixon

Merge branch 'master' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Full changeset: 192fd5ca21c3a4d836cbf036022a363bbd5587be

comment:53 Changed 6 years ago by Dan Nixon

Merge branch 'bugfix/10085_indirect_algorithm_CreateMappingFile' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/src/IndirectConvertToEnergy.cpp

Refs #10083

Full changeset: 39411b6090d075f607a3940651e18fdcf34bddd7

comment:54 Changed 6 years ago by Dan Nixon

Merge branch 'master' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Full changeset: 2007afe0a4a1525f09aaf29ffc4eaeecc70f7d7f

comment:55 Changed 6 years ago by Harry Jeffery

Merge remote-tracking branch 'origin/bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring'

Full changeset: b96f5215ade70f0d22c3bc79ff32a277319a5c62

comment:56 Changed 6 years ago by Harry Jeffery

Merge remote-tracking branch 'origin/bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring'

Full changeset: 21059cce5a2c4834032302f373c7980ceff72351

comment:57 Changed 6 years ago by Dan Nixon

Merge branch 'master' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Conflicts:

Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py Code/Mantid/scripts/Inelastic/msg_reducer.py

Refs #10083

Full changeset: 6af92784c4f49d4601b51e75d50f3d321367f4b3

comment:58 Changed 6 years ago by Dan Nixon

Merge branch 'master' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Full changeset: e4eb6bc3a2d108c4c6bb38940aa24df89eee5bf4

comment:59 Changed 6 years ago by Dan Nixon

Merge branch 'master' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Full changeset: 192fd5ca21c3a4d836cbf036022a363bbd5587be

comment:60 Changed 6 years ago by Dan Nixon

Merge branch 'bugfix/10085_indirect_algorithm_CreateMappingFile' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/src/IndirectConvertToEnergy.cpp

Refs #10083

Full changeset: 39411b6090d075f607a3940651e18fdcf34bddd7

comment:61 Changed 6 years ago by Dan Nixon

Merge branch 'master' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Full changeset: 2007afe0a4a1525f09aaf29ffc4eaeecc70f7d7f

comment:62 Changed 6 years ago by Harry Jeffery

Merge remote-tracking branch 'origin/bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring'

Full changeset: b96f5215ade70f0d22c3bc79ff32a277319a5c62

comment:63 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 10925

Note: See TracTickets for help on using tickets.