Skip to content

Conversation

SilkeSchomann
Copy link
Contributor

@SilkeSchomann SilkeSchomann commented Aug 14, 2024

Description of work

Summary of work

PyChop only allows in "Instrument Scientist Mode" to change the chopper phase and else needs to use the default phase value. For each calculation, the default phase value must be reset to avoid being overwritten by a temporary value when calculating the possible incident energies.

I have also fixed two NumPy deprecation warnings.

Fixes #37734.

Report to: [Adroja / ISIS]

To test:

Follow the instructions in the original issue and check that the bug is fixed.


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

  • Is the code of an acceptable quality?
  • Does the code conform to the coding standards?
  • Are the unit tests small and test the class in isolation?
  • If there is GUI work does it follow the GUI standards?
  • If there are changes in the release notes then do they describe the changes appropriately?
  • Do the release notes conform to the release notes guide?

Functional Tests

  • Do changes function as described? Add comments below that describe the tests performed?
  • Do the changes handle unexpected situations, e.g. bad input?
  • Has the relevant (user and developer) documentation been added/updated?

Does everything look good? Mark the review as Approve. A member of @mantidproject/gatekeepers will 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.

@SilkeSchomann SilkeSchomann added Bug Issues and pull requests that are regressions or would be considered a bug by users (e.g. crashing) Reported By User Issues that were found or highlighted by a user/scientist ISIS: Excitations/Vesuvio Issue and pull requests relating to Excitiations/Vesuvio at ISIS labels Aug 15, 2024
@SilkeSchomann SilkeSchomann added this to the Release 6.11 milestone Aug 15, 2024
@SilkeSchomann SilkeSchomann changed the title Added phase for Merlin in normnal mode Fix for random phase value bug in PyChop Aug 15, 2024
@SilkeSchomann SilkeSchomann marked this pull request as ready for review August 15, 2024 07:48
mducle
mducle previously approved these changes Aug 20, 2024
Copy link
Member

@mducle mducle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good but I got a bit confused with the if statement... It could be changed to make the logic clearer but is fine as it is...

mducle
mducle previously approved these changes Sep 2, 2024
Copy link
Member

@mducle mducle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry this is so late... I thought I had already approved this.

@cailafinn cailafinn self-assigned this Sep 2, 2024
Copy link
Contributor

@cailafinn cailafinn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple of notes before merging:

…7805.rst

Co-authored-by: Caila Finn <47181718+cailafinn@users.noreply.github.com>
@cailafinn cailafinn merged commit e4c3fca into main Sep 3, 2024
10 checks passed
@cailafinn cailafinn deleted the 37734_phase_bug_for_merlin_pychop branch September 3, 2024 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Issues and pull requests that are regressions or would be considered a bug by users (e.g. crashing) ISIS: Excitations/Vesuvio Issue and pull requests relating to Excitiations/Vesuvio at ISIS Reported By User Issues that were found or highlighted by a user/scientist
Projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

PyChop - reads random value of phase on MERLIN
3 participants