Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changed xaxis label for updated SESANS nomenclature from z to delta #60

Merged
merged 4 commits into from
Mar 12, 2024

Conversation

caitwolf
Copy link
Contributor

@caitwolf caitwolf commented Jan 19, 2024

This fixes #59 which is referencing the original SasView issue SasView/sasview#2663. This only updates the label on the 1D plot. The residuals plot is fixed in a separate sasview PR (SasView/sasview#2754).

@caitwolf caitwolf linked an issue Jan 19, 2024 that may be closed by this pull request
@caitwolf caitwolf marked this pull request as draft January 19, 2024 18:03
@krzywon
Copy link
Collaborator

krzywon commented Jan 22, 2024

This seems reasonable so far. There are no new doc warnings, and the build failures match the failures already documented in #57.

@caitwolf caitwolf marked this pull request as ready for review January 22, 2024 19:08
@caitwolf caitwolf requested review from krzywon and butlerpd January 22, 2024 19:08
@butlerpd
Copy link
Member

assuming the corresponding sasview PR gets merged into 6.0.0 this will need to get merged into 0.9.0 as well

Copy link
Member

@butlerpd butlerpd left a comment

Choose a reason for hiding this comment

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

See review of paired PR in SasView/sasview#2754.

The one change to the caveats, when the paired PR is merged into 6.0.0_release this will need to be merged into the release_0.9.0 branch as well as master

@krzywon krzywon changed the base branch from master to release_0.9.0 February 16, 2024 18:11
Copy link
Member

@butlerpd butlerpd left a comment

Choose a reason for hiding this comment

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

I just realized that the comments to the paired PR in SasView/sasview#2754 actually require changes here as well. Basically removing the changes in that PR which are to a file that is no longer in that repo and making those changes to the file which is now in this repo as part of this PR

@caitwolf
Copy link
Contributor Author

I made requested changes in the paired SasView PR and made sure those changes were reflected in the new file locations in sasdata (it looks like changes were made in both places which helped with this).

@caitwolf caitwolf requested a review from butlerpd March 12, 2024 13:28
Copy link
Member

@butlerpd butlerpd left a comment

Choose a reason for hiding this comment

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

Never mind... I didn't see the changes were made twice

@butlerpd butlerpd merged commit 3900ed7 into release_0.9.0 Mar 12, 2024
18 checks passed
@butlerpd butlerpd deleted the 59-update-nomenclature-for-sesans branch March 12, 2024 17:49
@caitwolf caitwolf restored the 59-update-nomenclature-for-sesans branch March 19, 2024 15:48
@caitwolf caitwolf deleted the 59-update-nomenclature-for-sesans branch March 19, 2024 15:50
@caitwolf caitwolf mentioned this pull request Mar 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update nomenclature for SESANS
3 participants