Fix for import error in ISIS SX reduction classes #38014
Merged
Conversation
This file contains 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
RichardWaiteSTFC
added
Diffraction
jclarkeSTFC
requested changes
Sep 18, 2024
| if dataPath[-4:] == ".raw": | ||
| # assume log is kept separately in a .log file with same path | ||
| LoadLog(Workspace=tmpWS, Filename="".join(dataPath[:-4] + ".log")) | ||
| self.exec_child_alg("CreateSampleWorkspace", Workspace=tmpWS, Filename="".join(dataPath[:-4] + ".log")) |
There was a problem hiding this comment.
Suggested change
| self.exec_child_alg("CreateSampleWorkspace", Workspace=tmpWS, Filename="".join(dataPath[:-4] + ".log")) | |
| self.exec_child_alg("LoadLog", Workspace=tmpWS, Filename="".join(dataPath[:-4] + ".log")) |
|
|
||
| def createGoniometerTable(self): | ||
| """ | ||
| :return: Empty table workspace with columns Run, Chi, Phi and GonioAxis (unit vector) | ||
| """ | ||
| gonioTable = CreateEmptyTableWorkspace(StoreInADS=False) | ||
| gonioTable = self.exec_child_alg(" CreateEmptyTableWorkspace") |
There was a problem hiding this comment.
Suggested change
| gonioTable = self.exec_child_alg(" CreateEmptyTableWorkspace") | |
| gonioTable = self.exec_child_alg("CreateEmptyTableWorkspace") |
|
Thanks sorry done in a rush - will fix! |
jclarkeSTFC
approved these changes
Sep 18, 2024
SilkeSchomann
deleted the
temporary_fix_for_import_error_isis_sx_class
branch
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.
Description of work
Replace simpleapi imports with child algorithm calls in
FindGoniometerFromUBand use newfrom plugins.algorithmsprefix when importing function from algorithm filePurpose of work
This import fails on nightly on IDAaaS
but not on my local build or in mantid 6.10 IDAaaS
@jclarkeSTFC said maybe related to #37802?
There is no associated issue.
To test:
(1) CI passes
(2) Test import (on linux if possible)
Reviewer
Please comment on the points listed below (full description).
Your comments will be used as part of the gatekeeper process, so please comment clearly on what you have checked during your review. If changes are made to the PR during the review process then your final comment will be the most important for gatekeepers. In this comment you should make it clear why any earlier review is still valid, or confirm that all requested changes have been addressed.
Code Review
Functional Tests
Does everything look good? Mark the review as Approve. A member of
@mantidproject/gatekeeperswill take care of it.Gatekeeper
If you need to request changes to a PR then please add a comment and set the review status to "Request changes". This will stop the PR from showing up in the list for other gatekeepers.