Ticket #10277 (closed: fixed)

Opened 6 years ago

Last modified 5 years ago

Add fit output to Quasi and JumpFit

Reported by: Dan Nixon Owned by: Dan Nixon
Priority: major Milestone: Release 3.3
Component: Indirect Inelastic Keywords:
Cc: spencer.howells@… Blocked By: #7860, #9345, #10259
Blocking: #10278, #10368, #10443 Tester: Roman Tolchenov

Description (last modified by Dan Nixon) (diff)

The fitted data should be plotted in the mini plots of these two interfaces.

Attachments

irs26176_graphite002_conv_2LFixF_s0_to_9_Result.nxs​ (164.6 KB) - added by Dan Nixon 6 years ago.
File for testing JumpFit

Change History

comment:1 Changed 6 years ago by Dan Nixon

  • Status changed from new to assigned

comment:2 Changed 6 years ago by Dan Nixon

  • Status changed from assigned to inprogress

Added new IndirectTab class

Refs #10277

Changeset: 905f6a2a54023bf2f8c67efbc80e4923e33d5c62

comment:3 Changed 6 years ago by Dan Nixon

Added missing new tab files

refs #10277

Changeset: d1a232a0ac8eff300409edf9d60a348d43581aa7

comment:4 Changed 6 years ago by Dan Nixon

Work in progress, IndirectBayesTab inherit from IndirectTab

Refs #10277

Changeset: 6b594b2808065067f9da35573474f22e1f78eae4

comment:5 Changed 6 years ago by Dan Nixon

Indirect Bayes working once again

Refs #10277

Changeset: 9c5a6a9819c1ee44a743b1f52f2cee62f07700fb

comment:6 Changed 6 years ago by Dan Nixon

  • Description modified (diff)
  • Summary changed from Add fit output to Quasi and Stretch to Add fit output to Quasi, Stretch and JumpFit

comment:7 Changed 6 years ago by Dan Nixon

  • Blocked By 9345 added

comment:8 Changed 6 years ago by Dan Nixon

Added plotting to Quasi and Stretch

Refs #10277

Changeset: 3af232b389fd912bbb3be9b4e5bc8537df7d4f22

comment:9 Changed 6 years ago by Dan Nixon

Merge branch 'master' into feature/10277_indirect_bayes_fit_preview_plots

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayesTab.h Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.h Code/Mantid/MantidQt/CustomInterfaces/src/IndirectBayesTab.cpp Code/Mantid/MantidQt/CustomInterfaces/src/JumpFit.cpp

Refs #10277

Changeset: 65486ea5bf77ae97c640667027cc7f494b221e2d

comment:10 Changed 6 years ago by Dan Nixon

Added preview plotting to JumpFit

Refs #10277

Changeset: bf9252c9496724f19940b29d691f7ab3e6978561

comment:11 Changed 6 years ago by Dan Nixon

Added auto updating of JumpFit plot

Refs #10277

Changeset: 77538e24924aaa486426588d3cc326af01db7847

comment:12 Changed 6 years ago by Dan Nixon

  • Blocked By 7860, 10259 added

comment:13 Changed 6 years ago by Dan Nixon

Note that this must be tested on Windows and built in Release configuration to enable F2Py.

Test Quasi:

  • Open Indirect > Bayes > Quasi
  • Load input irs26176_graphite002_red.nxs
  • Load resolution irs26173_graphite002_res.nxs
  • Click Run
  • Notice fit is displayed in mini plot
  • Change the program and run again

Test JumpFit:

  • Open Indirect > Bayes > Jump Fit
  • Load attched file
  • Mini plot should be automatically plotted
  • Move range selectors, change width, change fit function, plot should be automatically updated
Last edited 6 years ago by Dan Nixon (previous) (diff)

Changed 6 years ago by Dan Nixon

File for testing JumpFit

comment:14 Changed 6 years ago by Dan Nixon

  • Blocking 10368 added

(In #10368) Need the nice plotting and graph functions from IndirectTab.

comment:15 Changed 6 years ago by Dan Nixon

  • Blocking 10278 added

comment:16 Changed 6 years ago by Dan Nixon

  • Blocking 10443 added

comment:17 Changed 6 years ago by Dan Nixon

Merge branch 'master' into feature/10277_indirect_bayes_fit_preview_plots

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReductionTab.h Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReductionTab.cpp

Refs #10277

Changeset: b6974ebe13290bf60a1c8bbdbe24efb8327d487f

comment:18 Changed 6 years ago by Dan Nixon

Correct error in merge

Refs #10277

Changeset: fa72b4778efd9a85193173b54b1a58b6ae6fdc9c

comment:19 Changed 6 years ago by Dan Nixon

Merge branch 'master' into feature/10277_indirect_bayes_fit_preview_plots

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReductionTab.h Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReductionTab.cpp

Refs #10277

Changeset: 1dddb4bf8801cdb72fd3bd52923f0b8cfa0a4530

comment:20 Changed 6 years ago by Dan Nixon

Corrected merge errors and compiler warnings

Refs #10277

Changeset: 55e3fad6301c54d84a126582cb34260cb19b7f65

comment:21 Changed 6 years ago by Dan Nixon

Correct JumpFit naming, imporve JumpFit preview plot

Refs #10277

Changeset: 9a2f3a63911bf938480f0f8ac20fd1abeca00499

comment:22 Changed 6 years ago by Dan Nixon

Modify tests for change in output name

Refs #10277

Changeset: 549b8a0d183921d3b0e02e886079ef225151326c

comment:23 Changed 6 years ago by Dan Nixon

Fix JumpFit output naming

Refs #10277

Changeset: 8f37f36cbdcfa3782c6108b4c40961ecde4ed6c2

comment:24 Changed 6 years ago by Dan Nixon

Only plot the HWHM raw plot on JumpFit

Refs #10277

Changeset: 370a80a6d7f24f46ada5fc1bc73a312e3de4c504

comment:25 Changed 6 years ago by Dan Nixon

Remove plotting form Stretch

Refs #10277

Changeset: a69d958e95fb89470e73a8777beb9e2e306af0c8

comment:26 Changed 6 years ago by Dan Nixon

Plot the correct Quasi workspace

Refs #10277

Changeset: 31de5a1ba574ca14bda8fa000b6eefb2e031ddf7

comment:27 Changed 6 years ago by Dan Nixon

  • Description modified (diff)
  • Summary changed from Add fit output to Quasi, Stretch and JumpFit to Add fit output to Quasi and JumpFit

comment:28 Changed 6 years ago by Dan Nixon

Commit (in systemtests) with wrong ticket number: 5ec4c7e5b05ade025f9dedb48379e793cafd1f6b

comment:29 Changed 6 years ago by Dan Nixon

Use correct Quasi workspace for plotting when using red

Refs #10277

Changeset: e8fffc1b5954771e24901f64ae5a77a79a537656

comment:30 Changed 6 years ago by Dan Nixon

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

(disregard any previous testing instructions)

Note there are changes to systemtests with this ticket: ​https://github.com/mantidproject/systemtests/compare/feature/10277_indirect_bayes_fit_preview_plots

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

To test Quasi:

  • Open Indirect > Bayes > Quasi
  • Load input: irs26176_graphite002_red.nxs
  • Load resolution: irs26173_raphite002_res.nxs
  • Run, see fit plotted over raw data in mini plot
  • Re-run selecting the Stretched Exponential program, the plot should change
  • Load resolution: irs26173_raphite002_red.nxs
  • Select program: Lorentzians
  • Run, plot should change

To test JumpFit:

  • Open Indirect > Bayes > JumpFit
  • Load the _Result workspace from Quasi
  • The preview plot should be automatically updated
  • Move the range selectors
  • Plot should be updated (data curve will not change, fit and diff will resize to nearest point inside range)

comment:31 Changed 6 years ago by John Hill

  • Status changed from verify to verifying
  • Tester set to John Hill

comment:32 Changed 6 years ago by John Hill

  • Status changed from verifying to reopened
  • Resolution fixed deleted

Reopening due to merge conflict with master on IndirectDataReductionTab.cpp

comment:33 Changed 6 years ago by Dan Nixon

  • Status changed from reopened to inprogress

Merge branch 'master' into feature/10277_indirect_bayes_fit_preview_plots

Conflicts:

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

Refs #10277

Changeset: a35020d534e3f752936ab7ba4a89d38c44d5cbec

comment:34 Changed 6 years ago by Dan Nixon

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

comment:35 Changed 6 years ago by John Hill

  • Tester John Hill deleted

comment:36 Changed 6 years ago by Lottie Greenwood

  • Status changed from verify to verifying
  • Tester set to Lottie Greenwood

comment:37 Changed 6 years ago by Lottie Greenwood

  • Status changed from verifying to verify
  • Tester Lottie Greenwood deleted

comment:38 Changed 6 years ago by Roman Tolchenov

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

comment:39 Changed 6 years ago by Dan Nixon

  • Status changed from verifying to closed

Merge branch 'master' into feature/10277_indirect_bayes_fit_preview_plots

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayesTab.h Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.h Code/Mantid/MantidQt/CustomInterfaces/src/IndirectBayesTab.cpp Code/Mantid/MantidQt/CustomInterfaces/src/JumpFit.cpp

Refs #10277

Full changeset: ​65486ea5bf77ae97c640667027cc7f494b221e2d

comment:40 Changed 6 years ago by Dan Nixon

Merge branch 'master' into feature/10277_indirect_bayes_fit_preview_plots

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReductionTab.h Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReductionTab.cpp

Refs #10277

Full changeset: ​b6974ebe13290bf60a1c8bbdbe24efb8327d487f

comment:41 Changed 6 years ago by Dan Nixon

Merge branch 'master' into feature/10277_indirect_bayes_fit_preview_plots

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReductionTab.h Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReductionTab.cpp

Refs #10277

Full changeset: ​1dddb4bf8801cdb72fd3bd52923f0b8cfa0a4530

comment:42 Changed 6 years ago by Dan Nixon

Merge branch 'master' into feature/10277_indirect_bayes_fit_preview_plots

Conflicts:

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

Refs #10277

Full changeset: ​a35020d534e3f752936ab7ba4a89d38c44d5cbec

comment:43 Changed 6 years ago by Roman Tolchenov

Merge remote-tracking branch 'origin/feature/10277_indirect_bayes_fit_preview_plots'

Full changeset: ​248d17fd00afa97c8bc4da5a536541b0fc429512

comment:44 Changed 6 years ago by Roman Tolchenov

Merge remote-tracking branch 'origin/feature/10277_indirect_bayes_fit_preview_plots'

Full changeset: ​cdd9e2d5ac44e3be9a0a00ab3f14a2f78bcb14f9

comment:45 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​11119

Note: See TracTickets for help on using tickets.