[#1017] Unifying interface for loading equilibria from EQDSK and MEQ,…

tofu/data/__init__.py

@@ -4,7 +4,7 @@
 """
 from ._core import *
 from ._DataCollection_class1_interactivity import *
-from ._class01_eqdsk import *
+from ._class01_load_equilibrium import main as load_equilibrium
 from ._spectrallines_class import *
 from ._class00_poly2d_check import check as poly2d_check
 from ._class00_poly2d_sample import main as poly2d_sample

tofu/data/_class01_Plasma2D.py

@@ -5,16 +5,11 @@
 import copy
 
 
-# Common
-import numpy as np
-import datastock as ds
-
-
 # tofu
 # from tofu import __version__ as __version__
 from ._class00_Config import Config as Previous
 from . import _class01_compute as _compute
-from . import _class01_eqdsk as _eqdsk
+from . import _class01_load_equilibrium as _load_equilibrium
 
 
 __all__ = ['Plasma2D']
@@ -63,36 +58,55 @@ def convert_units_spectral(
     # load specific file formats
     # -------------------
 
-    def load_equilirium_from_eqdsk(
+    def load_equilibrium_from_files(
         self,
         dpfe=None,
         returnas=None,
         # keys
         kmesh=None,
+        # user-defined dunits
+        dunits=None,
         # group naming
         func_key_groups=None,
         # sorting
         sort_vs=None,
         # options
         verb=None,
         strict=None,
+        explore=None,
     ):
-        """ Load an equilibriu map from an eqdsk file
+        """ Load an equilibria maps from several files
+
+        Arg dpfe is fed to ds.get_files()
+        Can be a dict of path / list of patterns
+        Handles either:
+            - .eqdsk
+            - .mat (mep files)
+
+        If all files do not have the same mesh size, they are grouped by shape
+            - func_key_groups: callable to name those groups
+
+        Loaded files can be  sorted vs any scalar quantity using
+            - sort_vs
 
-        Load the R, Z mesh and corresponding psi 2d map
+        Loads the R, Z mesh and corresponding 2d maps
+        Also loads all 1d or scalar quantities
         """
-        return _eqdsk.load_eqdsk(
+        return _load_equilibrium.main(
             dpfe=dpfe,
             returnas=returnas,
             # keys
             kmesh=kmesh,
+            # user-defined dunits
+            dunits=dunits,
             # group naming
             func_key_groups=func_key_groups,
             # sorting
             sort_vs=sort_vs,
             # options
             verb=verb,
             strict=strict,
+            explore=explore,
         )
 
     # -------------------