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

Marcosertoli/equilibrium not nan #334

Merged
merged 29 commits into from
Jul 4, 2024

Conversation

marcosertoli
Copy link
Contributor

No description provided.

Jussi Hakosalo and others added 28 commits June 18, 2024 13:50
* Now consistent with new DataArray convention + assigning Indica-native attributes also to DataArray coordinates.

* Modified all DataArray coordinate instances to new convention
… where every time and radial points are != NaN
@marcosertoli
Copy link
Contributor Author

  • Resolved equilibrium issues due to R_shift - restricting (R,z) to where psi != NaN
  • PPTS consistency with Indica native coordinates - rpos --> R, zpos --> z
  • Working on fixing ASTRA...
  • get_revision in mds_utils and in readers so that we can work with trees that don't have BEST.

@marcosertoli marcosertoli marked this pull request as ready for review July 3, 2024 14:51
Copy link
Collaborator

@michael-gemmell michael-gemmell 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 to me.

wavelength, _ = self._get_signal(
uid, instrument, ":wavelength", results["revision"]
)
# TODO: change once wavelength in MDS+ has been fixed to nanometers!
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why has this been readded? New XRCS runs don't need this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Error: will check it out and fix. Send it back you you by EOP today

@michael-gemmell michael-gemmell merged commit 1a57377 into main Jul 4, 2024
2 checks passed
@michael-gemmell michael-gemmell deleted the marcosertoli/equilibrium_not_nan branch July 4, 2024 13:50
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.

2 participants