Fix LOQ Batch reduction issues#18888
Merged
Merged
Conversation
Member
|
Code checks out and the functionality works as expected. The workspace names are now appropriate to what has been reduced and allow easier working with multiple instruments. I looked at the produced CanSAS files and the geometry information is now there too.
|
Member
|
@AntonPiccardoSelg please check merge conflicts |
martyngigg
added a commit
that referenced
this pull request
Feb 23, 2017
Refs #18877 Add handling of missing file extension (cherry picked from commit 6977e9e) Refs #18877 Add correct workspace name for batch reduce (cherry picked from commit 78de78b) Refs #18877 Add metadata to saving (cherry picked from commit c517eb0) Refs #18877 Fix trailing white space (cherry picked from commit d135f78) Refs #188877 Grab geom info at right point (cherry picked from commit bc7aed4) Add patch release note
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes a set of batch mode related issues found by Steve King.
The fix here adresses:
FileFinderbeing sensitive to file extensionsSaveCanSAS1DThe fixes are being validated by Steve King -- Steve King wrote:
The subsequent issue is addressed here: #18926
To test:
Test LOQ
Steve King's LOQ instrument was having the issues so, let's test this first.
The test data can be found here:
\\olympic\Babylon5\Scratch\Anton\LOQ_Batch_BUG_2Make sure it is in your Mantid path
CanSAS (1D)user_filecolumn don't have a.txtextension1DReduceSample1_600C_*contain the suffixmain. You will see it twice here since the output name was specified asSample1_600C_mainwhich then gets a suffix_main. The important bit is that there is a suffix_mainreduce-nimrod-check-samples-hab.csvuser_filecolumn don't have a.txtextension1DReduceSample1_600C_hab*contain the suffix_hab. You will see it twice here since the output name was specified asSample1_600C_habwhich then gets a suffix_hab. The important bit is that there is a suffix_habSample1_600C_main_mainandSample1_600C_hab_hab.Sample1_600C_main_mainis.007to0.255Sample1_600C_hab_habis.1125to1.4CanSAS1Dformat. Open the fileSample1_600C_hab_hab.xmlin a text editor.Test SANS2D
Please find the releveant test data here: \olympic\Babylon5\Scratch\Anton\SANS2DTUBES_Batch_BUG
Please make sure that the data is in your path.
user_filecolumn don't have a.txtextension1DReducetest_file_rearexists. The important thing here is the suffix_rear.batchTestFront.csvuser_filecolumn don't have a.txtextension1DReducetest_file_frontexists. The important thing here is the suffix_front.CanSAS1Dformat. Open the filetest_file_rear.xmlin a text editor.Fixes #18877
Release notes
Please see here
Reviewer
Please comment on the following (full description):
Code Review
Functional Tests
Do changes function as described? Add comments below that describe the tests performed?
How do the changes handle unexpected situations, e.g. bad input?
Has the relevant documentation been added/updated?
Is user-facing documentation written in a user-friendly manner?
Has developer documentation been updated if required?
Does everything look good? Comment with the ship it emoji but don't merge. A member of
@mantidproject/gatekeeperswill take care of it.