Ticket #4877 (closed: fixed)

Opened 9 years ago

Last modified 5 years ago

[IDA] Apply Corr - Finish UI

Reported by: Peter Parker Owned by: Dereck Kachere
Priority: blocker Milestone: Release 2.5
Component: Mantid Keywords: IDA
Cc: spencer.howells@…, nick.draper@… Blocked By:
Blocking: Tester: Roman Tolchenov

Description (last modified by Peter Parker) (diff)

This tab is missing options / has incomplete features, such as the "Plot Output" dropdown menu and no save options.

Add ability to input a 'Scaling factor' which multiplies the container data before corrections are applied.

Attachments

irs26173_graphite002_flt_Abs.nxs​ (173.8 KB) - added by Dereck Kachere 7 years ago.
irs26176_graphite002_flt_Abs.nxs​ (173.8 KB) - added by Dereck Kachere 7 years ago.
irs26173_graphite002_red.nxs​ (1.2 MB) - added by Dereck Kachere 7 years ago.
irs26176_graphite002_red.nxs​ (1.5 MB) - added by Dereck Kachere 7 years ago.

Change History

comment:1 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:2 Changed 8 years ago by Peter Parker

  • Description modified (diff)

comment:3 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:4 Changed 8 years ago by Peter Parker

  • Keywords IDA added

comment:5 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.3 to Release 2.4

Moved to milestone 2.4

comment:6 Changed 8 years ago by Dereck Kachere

  • Status changed from new to assigned
  • Owner changed from Peter Parker to Dereck Kachere

comment:7 Changed 8 years ago by Dereck Kachere

  • Milestone changed from Release 2.4 to Release 2.5

comment:8 Changed 8 years ago by Dereck Kachere

  • Status changed from assigned to accepted

comment:9 Changed 7 years ago by Dereck Kachere

  • Cc spencer.howells@… added

comment:10 Changed 7 years ago by Dereck Kachere

refs #4877 Added save and plot option.

Save option in CalcCorr and ApplyCorr. Improved the drop-down menu in ApplyCorr.

Changeset: 22f7d81ad17dc9f3954c273a2c3c40316978bab0

comment:11 Changed 7 years ago by Dereck Kachere

refs #4877 Improved GUI options

'Plot Output' drop-down menu now complete and added an option to 'Plot Contributions'

Changeset: 91c0bd11da15115dfd4dfe4ad468ca2637f367f3

comment:12 Changed 7 years ago by Dereck Kachere

refs #4877 Added option to scale container

Changeset: 3f6bc8d99ba5784a0bb401964189c5e6089acea3

comment:13 Changed 7 years ago by Dereck Kachere

refs #4877 Merge branch 'develop' into feature/4877_apply_corr

My latest updates rely on previous code pushed and merged into develop.

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/src/ApplyCorr.cpp Code/Mantid/MantidQt/CustomInterfaces/src/CalcCorr.cpp Code/Mantid/scripts/Inelastic/IndirectAbsCor.py

Changeset: 4205a4549e95fe896c67c6f923fba78dc1e9feb1

comment:14 Changed 7 years ago by Dereck Kachere

refs #4877 Corrected line I missed when solving merge conflict.

Allows 'Verbose' option to be changeable between 'True' or 'False'

Changeset: 2c78aada7587bc88395d6068723c3fca5f6d39ce

comment:15 Changed 7 years ago by Dereck Kachere

refs #4877 Changed tabs into spaces

Changeset: 975ac88dd0de0ba5c609c5c02f4192b4926645ac

comment:16 Changed 7 years ago by Dereck Kachere

refs #4877 Added save and plot option.

Save option in CalcCorr and ApplyCorr. Improved the drop-down menu in ApplyCorr.

Changeset: 22f7d81ad17dc9f3954c273a2c3c40316978bab0

comment:17 Changed 7 years ago by Dereck Kachere

refs #4877 Improved GUI options

'Plot Output' drop-down menu now complete and added an option to 'Plot Contributions'

Changeset: 91c0bd11da15115dfd4dfe4ad468ca2637f367f3

comment:18 Changed 7 years ago by Dereck Kachere

refs #4877 Added option to scale container

Changeset: 3f6bc8d99ba5784a0bb401964189c5e6089acea3

comment:19 Changed 7 years ago by Dereck Kachere

refs #4877 Merge branch 'develop' into feature/4877_apply_corr

My latest updates rely on previous code pushed and merged into develop.

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/src/ApplyCorr.cpp Code/Mantid/MantidQt/CustomInterfaces/src/CalcCorr.cpp Code/Mantid/scripts/Inelastic/IndirectAbsCor.py

Changeset: 4205a4549e95fe896c67c6f923fba78dc1e9feb1

comment:20 Changed 7 years ago by Dereck Kachere

refs #4877 Corrected line I missed when solving merge conflict.

Allows 'Verbose' option to be changeable between 'True' or 'False'

Changeset: 2c78aada7587bc88395d6068723c3fca5f6d39ce

comment:21 Changed 7 years ago by Dereck Kachere

refs #4877 Changed tabs into spaces

Changeset: 975ac88dd0de0ba5c609c5c02f4192b4926645ac

comment:22 Changed 7 years ago by Dereck Kachere

refs #4877 Repositioned objects in the GUI.

Changeset: 5773744a8dea0466d2f48ebe722d47dd34bbc832

comment:23 Changed 7 years ago by Dereck Kachere

refs #4877 Repositioned objects in the GUI.

Changeset: 5773744a8dea0466d2f48ebe722d47dd34bbc832

comment:24 Changed 7 years ago by Dereck Kachere

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

Changed 7 years ago by Dereck Kachere

Changed 7 years ago by Dereck Kachere

Changed 7 years ago by Dereck Kachere

Changed 7 years ago by Dereck Kachere

comment:25 Changed 7 years ago by Dereck Kachere

Tester:

  • Download the attached files, put them in a file and set that file as destination in 'Manage User Directories'
  • Open up the ApplyCorr tab in 'Interfaces' -> 'Indirect Data Analysis'

Inputs:

  • file = irs26173_graphite002_red.nxs
  • Geometry = Flat
  • Use Corrections & Use Container: tick the box
  • flie2 = irs26176_graphite002_red.nxs

Experiment and compare the rest of the options.

  • Selecting the 'Verbose' option should result in more information being displayed in the logger in MantidPlot (you could compare the outputs in Notepad2).
  • 'Scale' option should change the axes.
  • 'Save Result' should save an output workspace in your directory.
  • 'Plot Contributions' should plot contributions, even if 'Plot Output' is set to 'None'.
  • 'Plot Output' options should result in different graphs being plotted.

comment:26 Changed 7 years ago by Roman Tolchenov

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

comment:27 Changed 7 years ago by Dereck Kachere

refs #4877 Added save and plot option.

Save option in CalcCorr and ApplyCorr. Improved the drop-down menu in ApplyCorr.

Changeset: 22f7d81ad17dc9f3954c273a2c3c40316978bab0

comment:28 Changed 7 years ago by Dereck Kachere

refs #4877 Improved GUI options

'Plot Output' drop-down menu now complete and added an option to 'Plot Contributions'

Changeset: 91c0bd11da15115dfd4dfe4ad468ca2637f367f3

comment:29 Changed 7 years ago by Dereck Kachere

refs #4877 Added option to scale container

Changeset: 3f6bc8d99ba5784a0bb401964189c5e6089acea3

comment:30 Changed 7 years ago by Dereck Kachere

refs #4877 Merge branch 'develop' into feature/4877_apply_corr

My latest updates rely on previous code pushed and merged into develop.

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/src/ApplyCorr.cpp Code/Mantid/MantidQt/CustomInterfaces/src/CalcCorr.cpp Code/Mantid/scripts/Inelastic/IndirectAbsCor.py

Changeset: 4205a4549e95fe896c67c6f923fba78dc1e9feb1

comment:31 Changed 7 years ago by Dereck Kachere

refs #4877 Corrected line I missed when solving merge conflict.

Allows 'Verbose' option to be changeable between 'True' or 'False'

Changeset: 2c78aada7587bc88395d6068723c3fca5f6d39ce

comment:32 Changed 7 years ago by Dereck Kachere

refs #4877 Changed tabs into spaces

Changeset: 975ac88dd0de0ba5c609c5c02f4192b4926645ac

comment:33 Changed 7 years ago by Dereck Kachere

refs #4877 Repositioned objects in the GUI.

Changeset: 5773744a8dea0466d2f48ebe722d47dd34bbc832

comment:34 Changed 7 years ago by Roman Tolchenov

  • Status changed from verifying to closed

Works for me.

comment:35 Changed 7 years ago by Dereck Kachere

refs #4877 Added save and plot option.

Save option in CalcCorr and ApplyCorr. Improved the drop-down menu in ApplyCorr.

Changeset: 22f7d81ad17dc9f3954c273a2c3c40316978bab0

comment:36 Changed 7 years ago by Dereck Kachere

refs #4877 Improved GUI options

'Plot Output' drop-down menu now complete and added an option to 'Plot Contributions'

Changeset: 91c0bd11da15115dfd4dfe4ad468ca2637f367f3

comment:37 Changed 7 years ago by Dereck Kachere

refs #4877 Added option to scale container

Changeset: 3f6bc8d99ba5784a0bb401964189c5e6089acea3

comment:38 Changed 7 years ago by Dereck Kachere

refs #4877 Merge branch 'develop' into feature/4877_apply_corr

My latest updates rely on previous code pushed and merged into develop.

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/src/ApplyCorr.cpp Code/Mantid/MantidQt/CustomInterfaces/src/CalcCorr.cpp Code/Mantid/scripts/Inelastic/IndirectAbsCor.py

Changeset: 4205a4549e95fe896c67c6f923fba78dc1e9feb1

comment:39 Changed 7 years ago by Dereck Kachere

refs #4877 Corrected line I missed when solving merge conflict.

Allows 'Verbose' option to be changeable between 'True' or 'False'

Changeset: 2c78aada7587bc88395d6068723c3fca5f6d39ce

comment:40 Changed 7 years ago by Dereck Kachere

refs #4877 Changed tabs into spaces

Changeset: 975ac88dd0de0ba5c609c5c02f4192b4926645ac

comment:41 Changed 7 years ago by Dereck Kachere

refs #4877 Repositioned objects in the GUI.

Changeset: 5773744a8dea0466d2f48ebe722d47dd34bbc832

comment:42 Changed 7 years ago by Russell Taylor

  • Priority changed from major to blocker
  • Status changed from closed to reopened
  • Resolution fixed deleted
  • Cc nick.draper@… added

There was a big problem here. At comment:13 develop was merged into this topic branch. This is a big no-no as it, means that it pulled a whole load of unfinished, untested stuff into master when it was passed.

I've fixed master, which means that the changes in this ticket are no longer in it. I have a local copy of the feature/4877_apply_corr branch, and will see if I can fix it prior to republishing it.

comment:43 Changed 7 years ago by Dereck Kachere

refs #4877 Added save and plot option.

Save option in CalcCorr and ApplyCorr. Improved the drop-down menu in ApplyCorr.

Changeset: ca9405d97c1d1c95ddf9a55bd5182cbb48d0e809

comment:44 Changed 7 years ago by Dereck Kachere

refs #4877 Improved GUI options

'Plot Output' drop-down menu now complete and added an option to 'Plot Contributions'

Changeset: c7340a69ab16d13fd02b6a46db7de7b25954795d

comment:45 Changed 7 years ago by Dereck Kachere

refs #4877 Added option to scale container

Changeset: e4bab1bef486f2e321940b83af96ea62d648b927

comment:46 Changed 7 years ago by Dereck Kachere

refs #4877 Changed tabs into spaces

Changeset: 7eeb4a48821404119315e861d741dd5a51e12bc1

comment:47 Changed 7 years ago by Dereck Kachere

refs #4877 Added save and plot option.

Save option in CalcCorr and ApplyCorr. Improved the drop-down menu in ApplyCorr.

Changeset: ca9405d97c1d1c95ddf9a55bd5182cbb48d0e809

comment:48 Changed 7 years ago by Dereck Kachere

refs #4877 Improved GUI options

'Plot Output' drop-down menu now complete and added an option to 'Plot Contributions'

Changeset: c7340a69ab16d13fd02b6a46db7de7b25954795d

comment:49 Changed 7 years ago by Dereck Kachere

refs #4877 Added option to scale container

Changeset: e4bab1bef486f2e321940b83af96ea62d648b927

comment:50 Changed 7 years ago by Dereck Kachere

refs #4877 Changed tabs into spaces

Changeset: 7eeb4a48821404119315e861d741dd5a51e12bc1

comment:51 Changed 7 years ago by Dereck Kachere

Merge branch 'feature/4877_indirect_apply_corr' into develop Refs #4877

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui Code/Mantid/MantidQt/CustomInterfaces/src/ApplyCorr.cpp Code/Mantid/MantidQt/CustomInterfaces/src/CalcCorr.cpp Code/Mantid/scripts/Inelastic/IndirectAbsCor.py

Changeset: 978efcc210695983f7d084f4e52f4d1550b9c6fd

comment:52 Changed 7 years ago by Dereck Kachere

refs #4877 Rearranged buttons and reactivated 'Verbose' options

Changeset: fb08b0c83fae216ad855a519fc7cc968fe01b046

comment:53 Changed 7 years ago by Dereck Kachere

refs #4877 Rearranged buttons and reactivated 'Verbose' options

Changeset: fb08b0c83fae216ad855a519fc7cc968fe01b046

comment:54 Changed 7 years ago by Dereck Kachere

  • Status changed from reopened to accepted

comment:55 Changed 7 years ago by Dereck Kachere

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

comment:56 Changed 7 years ago by Roman Tolchenov

  • Status changed from verify to verifying

comment:57 Changed 7 years ago by Dereck Kachere

refs #4877 Added save and plot option.

Save option in CalcCorr and ApplyCorr. Improved the drop-down menu in ApplyCorr.

Changeset: ca9405d97c1d1c95ddf9a55bd5182cbb48d0e809

comment:58 Changed 7 years ago by Dereck Kachere

refs #4877 Improved GUI options

'Plot Output' drop-down menu now complete and added an option to 'Plot Contributions'

Changeset: c7340a69ab16d13fd02b6a46db7de7b25954795d

comment:59 Changed 7 years ago by Dereck Kachere

refs #4877 Added option to scale container

Changeset: e4bab1bef486f2e321940b83af96ea62d648b927

comment:60 Changed 7 years ago by Dereck Kachere

refs #4877 Changed tabs into spaces

Changeset: 7eeb4a48821404119315e861d741dd5a51e12bc1

comment:61 Changed 7 years ago by Dereck Kachere

refs #4877 Rearranged buttons and reactivated 'Verbose' options

Changeset: fb08b0c83fae216ad855a519fc7cc968fe01b046

comment:62 Changed 7 years ago by Roman Tolchenov

  • Status changed from verifying to closed

comment:63 Changed 7 years ago by Dereck Kachere

refs #4877 Added save and plot option.

Save option in CalcCorr and ApplyCorr. Improved the drop-down menu in ApplyCorr.

Changeset: ca9405d97c1d1c95ddf9a55bd5182cbb48d0e809

comment:64 Changed 7 years ago by Dereck Kachere

refs #4877 Improved GUI options

'Plot Output' drop-down menu now complete and added an option to 'Plot Contributions'

Changeset: c7340a69ab16d13fd02b6a46db7de7b25954795d

comment:65 Changed 7 years ago by Dereck Kachere

refs #4877 Added option to scale container

Changeset: e4bab1bef486f2e321940b83af96ea62d648b927

comment:66 Changed 7 years ago by Dereck Kachere

refs #4877 Changed tabs into spaces

Changeset: 7eeb4a48821404119315e861d741dd5a51e12bc1

comment:67 Changed 7 years ago by Dereck Kachere

refs #4877 Rearranged buttons and reactivated 'Verbose' options

Changeset: fb08b0c83fae216ad855a519fc7cc968fe01b046

comment:68 Changed 7 years ago by Wenduo Zhou

Merge branch 'feature/6462_filter_int_log' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:69 Changed 7 years ago by Dennis Mikkelson

Merge branch 'feature/6901_MantidEV_usability' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:70 Changed 7 years ago by Anders Markvardsen

Merge branch 'feature/6922_mcstas' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:71 Changed 7 years ago by Dereck Kachere

Merge branch 'feature/4877_apply_corr' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:72 Changed 7 years ago by Dereck Kachere

Merge branch 'feature/4877_apply_corr' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:73 Changed 7 years ago by Stuart Campbell

Merge branch 'feature/6973_fix_rpm' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:74 Changed 7 years ago by Wenduo Zhou

Merge branch 'feature/6462_filter_int_log' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:75 Changed 7 years ago by Dennis Mikkelson

Merge branch 'feature/6901_MantidEV_usability' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:76 Changed 7 years ago by Anders Markvardsen

Merge branch 'feature/6922_mcstas' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:77 Changed 7 years ago by Dereck Kachere

Merge branch 'feature/4877_apply_corr' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:78 Changed 7 years ago by Dereck Kachere

Merge branch 'feature/4877_apply_corr' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:79 Changed 7 years ago by Stuart Campbell

Merge branch 'feature/6973_fix_rpm' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:80 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​5724

Note: See TracTickets for help on using tickets.