Ticket #10085 (closed: fixed)

Opened 6 years ago

Last modified 5 years ago

Indirect algorithm: CreateMappingFile

Reported by: Dan Nixon Owned by: Dan Nixon
Priority: major Milestone: Release 3.3
Component: Framework Keywords:
Cc: spencer.howells@… Blocked By:
Blocking: #9969, #10083 Tester: Anders Markvardsen

Description

Used in IndirectConvertToEnergy::createMapFile

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

Initial conversion of createMappingFile to algorithm

Refs #10085

Changeset: 24a5369cfd581b17a71f0cc917028d58ef1ddc36

comment:3 Changed 6 years ago by Dan Nixon

Added unit test class and docs

refs #10085

Changeset: dc0c2d4ec4f13bf2d0b08b130e5e358c7f8f1c2e

comment:4 Changed 6 years ago by Dan Nixon

Improved unit test, added sample file for comparison

Refs #10085

Changeset: 82af88b48ae9c0254386ac588ccde35acead0e67

comment:5 Changed 6 years ago by Dan Nixon

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

To test:

  • Open the generated dialog from the algorithms widget
  • Specify an output file
  • Set the spectra range to 1,10 and number of groups to 2 and run the algorithm
  • Open the generated .map file in a text editor
  • Check the output is in the format described in the Group Detectors algorithm docs

Also ensure that the unit test CreateMappingFileTest is passing on all platforms.

comment:6 Changed 6 years ago by Dan Nixon

Fixed RHEL6 build, added file extensions to save file

Refs #10085

Changeset: 12dd14e36745e131759e80b775be377abd15986c

comment:7 Changed 6 years ago by Samuel Jackson

  • Status changed from verify to verifying
  • Tester set to Samuel Jackson

comment:8 Changed 6 years ago by Samuel Jackson

  • Status changed from verifying to reopened
  • Resolution fixed deleted

As discussed. I think this would be better of going as an option on CreateGroupingWorkspace.

comment:9 Changed 6 years ago by Dan Nixon

  • Status changed from reopened to inprogress

Removed old algorithm and modified CreateGroupingWorkspace

Refs #10085

Changeset: 188df1653610a8221ef8ecf6399e2a0b19a395fd

comment:10 Changed 6 years ago by Dan Nixon

Added grouping workspace to indirect energy conversion tab

Refs #10085

Changeset: d17a494dd0f143d1ea9cc05b384345a41238dca9

comment:11 Changed 6 years ago by Dan Nixon

Remove invisible workspace when finished

Refs #10085

Changeset: 332c7f7914e7cf6aa8ec115b426e76669ee4c851

comment:12 Changed 6 years ago by Dan Nixon

Added unit test for new CreateGroupingWorkspace functionality

Refs #10085

Changeset: 85f84b4e6592f1cab23b78055f8750b10e1e2365

comment:13 Changed 6 years ago by Dan Nixon

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

Updated test:

  • Ensure new test in CreateGroupingWorkspace is passing on all platforms
  • Perform an indirect energy conversion with the grouping set to "Groups" and a value entered for the group count
  • Open the workspace history for the reduction
  • Notice the first entry for CreateGroupingWorkspace and the entry for GroupDetectors (close tho the end, before AddSampleLogs) which uses the workspace created by CreateGroupingWorkspace.

comment:14 Changed 6 years ago by Dan Nixon

  • Blocking 10083 added

comment:15 Changed 6 years ago by Martyn Gigg

  • Status changed from verify to reopened
  • Resolution fixed deleted

As the ticket has been in testing for a while there have been some merge conflicts that have accumulated. I think they are just simple whitespace changes but could you merge master and fix them on the branch and then I'll look at retesting it.

comment:16 Changed 6 years ago by Dan Nixon

  • Status changed from reopened to inprogress

Merge branch 'master' into bugfix/10085_indirect_algorithm_CreateMappingFile

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Refs #10085

Changeset: bead95bca1361522cdf67a0263b5e072821a0d77

comment:17 Changed 6 years ago by Dan Nixon

Merge branch 'bugfix/10085_indirect_algorithm_CreateMappingFile' into develop

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Refs #10085

Changeset: 329e34127837de61c57b80aa7238813738d7834a

comment:18 Changed 6 years ago by Dan Nixon

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

comment:19 Changed 6 years ago by Dan Nixon

  • Cc spencer.howells@… added

comment:20 Changed 6 years ago by Anders Markvardsen

  • Status changed from verify to verifying
  • Tester changed from Samuel Jackson to Anders Markvardsen

comment:21 Changed 6 years ago by Dan Nixon

  • Status changed from verifying to closed

Merge branch 'master' into bugfix/10085_indirect_algorithm_CreateMappingFile

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Refs #10085

Full changeset: bead95bca1361522cdf67a0263b5e072821a0d77

comment:22 Changed 6 years ago by Anders Markvardsen

Merge remote-tracking branch 'origin/bugfix/10085_indirect_algorithm_CreateMappingFile'

Full changeset: 5431e398f23a466658d1601e2ba853cbe518a09d

comment:23 Changed 6 years ago by Anders Markvardsen

New option added to CreateGroupingWorkspace tested here and with unit test and usage example

comment:24 Changed 6 years ago by Dan Nixon

Merge branch 'master' into bugfix/10085_indirect_algorithm_CreateMappingFile

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Refs #10085

Full changeset: bead95bca1361522cdf67a0263b5e072821a0d77

comment:25 Changed 6 years ago by Anders Markvardsen

Merge remote-tracking branch 'origin/bugfix/10085_indirect_algorithm_CreateMappingFile'

Full changeset: 5431e398f23a466658d1601e2ba853cbe518a09d

comment:26 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 10927

Note: See TracTickets for help on using tickets.