Bringing changes of main into branch #641#698
Merged
Conversation
…e removal of fast parameters (#690) * Removing undefined and outdated variable f. Fixing also the if-else structure to the original. * Changelog items added. * Renaming the changelog items.
#666 X-PSI in Jean-Zay IDRIS
Make background 2D (phase-resolved) to be compatible with the plotting (in the last cell)
Removed old synthesise method and fixed background in the new version
reverting to older version, removing do_fast option, and re-running all
* Fixed corrupted Instrument Synergy reverting to older version, removing do_fast option, and re-running all * Fixing figures not showing up properly in the notebook. --------- Co-authored-by: Sebastien Guillot <sebguillot60@gmail.com>
Contributor
Author
|
@pstammler I am updating your branch #641 with the latest commits in the main. There doesn't seem to be any merging conflicts from main to #641 |
pstammler
approved these changes
Mar 18, 2026
Collaborator
pstammler
left a comment
pstammler
left a comment
There was a problem hiding this comment.
Some updates to anticipate with synthetic data. Everything else is fine.
sguillot
merged commit 39ec818
into
641-energy-integration-2D-edges
10 of 11 checks passed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
No description provided.