Repository navigation
Toksearch integration - #433
Draft
AreWeDreaming wants to merge 46 commits into
Draft
AreWeDreaming wants to merge 46 commits into
AreWeDreaming wants to merge 46 commits into
Conversation
- Refactors mdsvalue to mds_provider for better flexibility - Moves a MDS provider into the ods to cache it on a per-server level
…ch classes - Remove BaseDataValue class and move all functionality to mdsvalue - Remove old toksearch class, replaced by toksearch_provider - Consolidate signal access methods (data, dim_of, units, etc.) in mdsvalue - Maintain provider pattern for efficient backend switching - Preserve backward compatibility for existing code - Clean up class hierarchy and reduce unnecessary abstraction layers
- No passing for all non-OMFIT/ptdata d3d.py fetches
- The EFIT implementation should work now, but toksearch is not cooperating
- Remove some explicit plots yielding failures due to lack of GUI - Removed options override in `_efit_toksearch`
- Fix bugs in efit.py - Skip machine mappings test if there is no mdsplus - Remove ptdata exclusion
- Completely remove old mdsvalue and mdstree classes
- Also fix bug in ods.contains
… toksearch_integration
… into toksearch_integration
This was referenced Aug 3, 2026
Closed
Collaborator
|
@AreWeDreaming it looks like all of the automatic regression tests are failing. That seems like an important place to start unless they won't work with the toksearch options at all (missing token or other issue)? |
EFIT outputs the inferred flux variables (psi, psi_axis, etc) with a different convention than the diagnostic constraints (e.g. flux_loops) so the input COCOS for these need to be different. The constraints are now consistent with the input COCOS of the magnetics IDS.
torrinba
marked this pull request as draft
October 8, 2026 18:08
# Conflicts: # omas/machine_mappings/d3d.py
When a fetch raised, handle_fetch_status still ran in the finally block
with results=None and built {TDI: None}; for a dict or list TDI that
raised TypeError and replaced the original exception.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This branch has not been deployed
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
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.
Description
This adds a toksearch backend to OMAS. It fundamentally changes how toksearch interacts with MDSplus by having either a native MDSplus mode or a toksearch mode that is stored on a per-ods basis.
Given that this is quite a fundamental change of OMAS this will need a lot of testing.
Type of Change
Testing
Pre-Merge Checklist
omas/versionfile0.94.2→0.94.3for bug fixes,0.94.2→0.95.0for new features)Additional Notes