Skip to content

Conversation

peterfpeterson
Copy link
Member

@peterfpeterson peterfpeterson commented Feb 19, 2025

Once #38824 and #38845 were merged into main mantid ended up not compiling with what was already merged into main due to PRs hanging out too long waiting for review.

This was started from ornl-next and pulls some other things in from main. Only the third commit matters.

Refs #38332

Further detail of work

To test:

The code should compile again.

This does not require release notes because it fixes an error that was introduced the same day this PR was created.


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.

peterfpeterson and others added 3 commits February 19, 2025 11:28
This is a squashed version of mantidproject#38824

Disambiguate which NeXus::File is actually being used

Rename NexusDescriptor to LegacyNexusDescriptor

Add LegacyNexus
@peterfpeterson peterfpeterson force-pushed the 38332_legacy_descriptor_loadmuon branch from 765938b to 9dc7fa9 Compare February 19, 2025 16:30
@peterfpeterson peterfpeterson added High Priority An issue or pull request that if not addressed is severe enough to postponse a release. Technical Debt Marks a piece of work to address technical debt introduced to solve a problem quickly labels Feb 19, 2025
@peterfpeterson peterfpeterson added this to the Release 6.13 milestone Feb 19, 2025
@peterfpeterson peterfpeterson marked this pull request as ready for review February 19, 2025 16:39
@peterfpeterson peterfpeterson changed the title 38332 legacy descriptor loadmuon Get LoadMuonNexus3 compiling in main Feb 19, 2025
@MialLewis MialLewis self-requested a review February 19, 2025 17:13
Copy link
Contributor

@MialLewis MialLewis left a comment

Choose a reason for hiding this comment

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

First two commits are related to other PRs already reviewed and merged into main (hangovers from a different base branch).

The third commit moves Framework/Muon/inc/MantidMuon/LoadMuonNexus3.h over to use the newly named LegacyNexusDescriptor.

All compiles locally and is working.

@rboston628 rboston628 enabled auto-merge February 19, 2025 17:37
@rboston628 rboston628 merged commit d48273f into mantidproject:main Feb 19, 2025
10 checks passed
@peterfpeterson peterfpeterson deleted the 38332_legacy_descriptor_loadmuon branch February 19, 2025 20:14
@rboston628 rboston628 added the Nexus Pull requests that are part of Nexus Refactor in issue #38332 label Aug 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
High Priority An issue or pull request that if not addressed is severe enough to postponse a release. Nexus Pull requests that are part of Nexus Refactor in issue #38332 Technical Debt Marks a piece of work to address technical debt introduced to solve a problem quickly
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants