Ticket #4856 (closed: fixed)

Opened 9 years ago

Last modified 5 years ago

[IDA] MSDFit - Change to UI and functionality.

Reported by: Peter Parker Owned by: Samuel Jackson
Priority: major Milestone: Release 3.2
Component: MantidPlot Keywords: IDA
Cc: Blocked By:
Blocking: Tester: Roman Tolchenov

Description (last modified by Samuel Jackson) (diff)

Request from users:

Change MSDFit to look like FuryFit/ConvFit:

The first (or specified) run can be displayed & fitted on its own to find a good x-range & start parameters. Then a Sequential fit can be done & this output is the only plot option. This avoids lots of WSs & plots especially for a huge number of runs.

Change History

comment:1 Changed 9 years ago by Peter Parker

This includes the work to be done on #4866, which has now been marked as a duplicate.

comment:2 Changed 9 years ago by Peter Parker

This includes the work to be done on #4929, which has now been marked as a duplicate.

comment:3 Changed 8 years ago by Robert Whitley

Add drop-down box containing options for plotting:

  • Individual
  • Sequence
  • Both

From ticket #4866

comment:4 Changed 8 years ago by Robert Whitley

Currently, MSDFit plots all intermediate fits when "Plot Result" is checked, and since the standard case is a user has many files (50 or so), this results in a lot of windows popping up.

It has been suggested that the final "result" plot (MSD vs run number) is the only one that should be shown by default; a user can check individual fits by plotting the relevant workspace.

From ticket #4929

comment:5 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.1 to Release 2.2

Moved at end of release 2.1

comment:6 Changed 8 years ago by Peter Parker

  • Owner set to Peter Parker
  • Status changed from new to assigned

comment:7 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.2 to Release 2.3

Moved at the end of release 2.2

comment:8 Changed 8 years ago by Peter Parker

  • Keywords IDA added

comment:9 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.3 to Release 2.4

Moved to milestone 2.4

comment:10 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.4 to Release 2.5

Moved at the code freeze for release 2.4

comment:11 Changed 7 years ago by Nick Draper

  • Milestone changed from Release 2.5 to Release 2.6

Moved to r2.6 at the end of r2.5

comment:12 Changed 7 years ago by Nick Draper

  • Status changed from assigned to new

comment:13 Changed 7 years ago by Nick Draper

  • Milestone changed from Release 2.6 to Backlog

Moved to backlog at the code freeze for R2.6

comment:14 Changed 7 years ago by Samuel Jackson

  • Owner changed from Peter Parker to Samuel Jackson
  • Description modified (diff)

comment:15 Changed 7 years ago by Samuel Jackson

  • Milestone changed from Backlog to Release 3.2

comment:16 Changed 7 years ago by Samuel Jackson

Refs #4856 Add spectrum range options to interface.

Changeset: 108e45a94194a3731a1236378fdb39af73fac724

comment:17 Changed 7 years ago by Samuel Jackson

Refs #4856 Add validation to interface options.

Changeset: daae0dd66d068820a300a09763dac9fc2239b236

comment:18 Changed 7 years ago by Samuel Jackson

Refs #4856 Hook options up to python code.

Changeset: f811c0e3823fb470059b4330e59595ca8d56ae5f

comment:19 Changed 7 years ago by Samuel Jackson

Refs #4856 Add sequential fit option.

Changeset: f32450405a8fe1db386844f2d96244a0f156d7f8

comment:20 Changed 7 years ago by Samuel Jackson

Refs #4856 Hook sequential fit option up to python script.

Changeset: e47d442ae4448d8bfeb2174ee50ac5664f899f03

comment:21 Changed 7 years ago by Samuel Jackson

Refs #4856 Don't plot graph with single data point.

Changeset: e9246bc7170abedb3de56ba943b063e096754e26

comment:22 Changed 7 years ago by Samuel Jackson

The branch name has the wrong ticket number. It says #4858, but it's really #4856

comment:23 Changed 7 years ago by Samuel Jackson

  • Status changed from new to inprogress

comment:24 Changed 7 years ago by Samuel Jackson

Refs #4856 Fix "off by one" error breaking MSD system test

Changeset: 357d7542a823c3bc8f5189c59f9f3bef6b0971f2

comment:25 Changed 7 years ago by Samuel Jackson

Refs #4856 Plot single fit directly in miniplot.

Changeset: 9cb0b781a5f63db59128c71a0df3ef293bc5554f

comment:26 Changed 7 years ago by Samuel Jackson

Refs #4856 Remove debugging statements.

Changeset: bd92d35b67d33e2f8f02f5f0aabad1d8e3b240bf

comment:27 Changed 7 years ago by Samuel Jackson

Refs #4856 Remove fit plotting code.

Changeset: 76a7e18b82348fa450b56a7604701cfc2ff4ac5d

comment:28 Changed 7 years ago by Samuel Jackson

Refs #4856 Update option to save when doing a single run.

Changeset: bc248802e3e8f6d06cb202a8b4d2cda3c6d5ca7d

comment:29 Changed 7 years ago by Samuel Jackson

Refs #4856 Add option to plot specific spectrum.

Changeset: 7786b009e1a3b4d55278c96c8c64053b9bac3429

comment:30 Changed 7 years ago by Samuel Jackson

Refs #4856 Add correct x-units to plots.

Changeset: a0a79160a489ac6679816f991b1be797401c37f1

comment:31 Changed 7 years ago by Samuel Jackson

Refs #4856 Correction to spectrum plotting logic.

Changeset: e426a1cce921a9cffe5f054d3c5cbb0e44005bab

comment:32 Changed 7 years ago by Samuel Jackson

Refs #4856 Swap single fit to use correct plot index.

Changeset: 1b0acaf61f872e64627d087715d1ac18375fdca9

comment:33 Changed 7 years ago by Samuel Jackson

Refs #4856 Convert MSDFit to just use PlotPeakByLogValue.

Changeset: f9791a5252bebe8ef6a13dc489ccc0e0fce1da52

comment:34 Changed 7 years ago by Samuel Jackson

Refs #4856 Clear spectra range when using a different workspace.

Changeset: d9580228056b901b2abc9a99a6ca2fff5a7579ec

comment:35 Changed 7 years ago by Samuel Jackson

Refs #4856 Swap to use ConvertTableToMatrixWorkspace.

Changeset: 954114c18724e9ee7ccf007afbfa1a15f894bb90

comment:36 Changed 7 years ago by Samuel Jackson

Refs #4856 Update reference results for MSDFit.

Changeset: 2cdb8d980794a7159de283f42db47878bfdb0657

comment:37 Changed 7 years ago by Samuel Jackson

Refs #4856 Default to set spec_max as to total no. spectra

Changeset: e74fbf10f6869876512a6dd652c44c4cb7ca7fc3

comment:38 Changed 7 years ago by Samuel Jackson

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

To Tester

There have been several changes to MSDFit that need to be tested as part of this ticket. This needs to be merged both in the main repo and the system tests. You will probably need to run Elwin first to get the *_eq2 file required for MSDFit. You can find instructions for running both here:

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

  • First, as always, check that the system tests are passing for MSDFit.
  • There's a couple of new options on the interface:
    • An option to specify the range of spectra to use in a sequential fit.
    • An option to choose which spectrum to show in the miniplot. This should only allow an index within the spectrum range.
  • Instead of running a sequential fit by default, there is now a separate button for this and the run button only does a single fit.
    • This is consistent with FuryFit and ConvFit in IDA.
  • Running a single fit should display the fit in the miniplot.
  • Running a sequential fit should give you the same output workspaces as before.

comment:39 Changed 7 years ago by Samuel Jackson

  • Status changed from verify to reopened
  • Resolution fixed deleted

comment:40 Changed 7 years ago by Samuel Jackson

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

comment:41 Changed 7 years ago by Samuel Jackson

  • Status changed from verify to reopened
  • Resolution fixed deleted

comment:42 Changed 7 years ago by Samuel Jackson

  • Status changed from reopened to inprogress

Refs #4856 Swap MSDFit to use DataSelector.

Changeset: 6a266a0a49513eaadf54e48fb79573ba02c52464

comment:43 Changed 7 years ago by Samuel Jackson

Merge branch 'feature/4858_msdfit_ui_upgrade' into develop

Refs #4856

Conflicts:

Code/Mantid/QtPropertyBrowser/CMakeLists.txt

Changeset: 36e7bce7ef63f5459d2bc3031d2742d7c62b8427

comment:44 Changed 7 years ago by Samuel Jackson

Refs #4856 Add sort x axis to allow natural ordering.

Changeset: 2e2a539b3021bc3e70ee84f0f2a02f4e1abd41ae

comment:45 Changed 7 years ago by Samuel Jackson

Refs #4856 Fix off by one bug.

Changeset: c208da332a8fe5d13314113eb617ec534a1d1aac

comment:46 Changed 7 years ago by Samuel Jackson

Refs #4856 Fix order of tabs.

Changeset: c938a26924a5be0aa43936f4c069732dc31bf8c

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

comment:47 Changed 7 years ago by Samuel Jackson

Refs #4856 Add copy logs to fit workspaces.

Changeset: 00112b848358d85baf3af562de55aa9dc7852f25

comment:48 Changed 7 years ago by Samuel Jackson

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

To Tester

As in comment 38, but the interface now uses a data selector so check that it works with both file and workspace input.

comment:49 Changed 7 years ago by Samuel Jackson

  • Status changed from verify to reopened
  • Resolution fixed deleted

comment:50 Changed 7 years ago by Samuel Jackson

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

comment:51 Changed 7 years ago by Roman Tolchenov

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

comment:52 Changed 7 years ago by Roman Tolchenov

I had a merge conflict. I looks quite simple but I don't want to risk it on a Friday evening.

comment:53 Changed 7 years ago by Samuel Jackson

Merge branch 'master' into feature/4858_msdfit_ui_upgrade

Refs #4856

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Changeset: caefe41ae7d5a14d63cca79b1b5486cec6d9e49d

comment:54 Changed 6 years ago by Samuel Jackson

Merge branch 'master' into feature/4858_msdfit_ui_upgrade

Refs #4856

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Changeset: a4029375555b4e885b60a516a54609accf32f178

comment:55 Changed 6 years ago by Roman Tolchenov

Re #4856. Updated ref files due to changes in #9030.

Changeset: 4d2722be987d7a49c5cd3b36afee40dbbd508679

comment:56 Changed 6 years ago by Roman Tolchenov

  • Status changed from verifying to closed

Merge remote-tracking branch 'origin/feature/4856_msdfit_ui_upgrade'

Full changeset: 8c127e2f43d569813787895647dfa2c4bcb53a8e

comment:57 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 5703

Note: See TracTickets for help on using tickets.