Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7a2812e
[Issue205] Created debugging figures in tofu root
Oct 2, 2019
24abc38
[Issue205] Added non-empty png figure
Oct 2, 2019
b7a91fd
[Issue208] Started DataHolder class in tofu/data/_core_new.py
Oct 5, 2019
6840fff
[Issue208] Added tofu/data/_core_new.py
Oct 6, 2019
eb4ff4e
[Issue208] DataHolder ok up to properties. TODO: select()
Oct 6, 2019
08a421d
[Issue208] Continued DataHolder up to interpolation (excluded) => sta…
Oct 7, 2019
c17094a
[Issue208] Added _core_new on tofu/data/__init__.py
Oct 7, 2019
00bc95f
[Issue208] Debugging and cleaning DataHolder up to add_param()
Oct 7, 2019
0160797
[Issue208] DataHolder operational up to get_summary() and test add / …
Oct 7, 2019
72535dc
[Issue209] Debugged, there was an wrong interp_t was None and not set
Oct 8, 2019
45756c7
[Issue209] PEP8 compliance in tofu/data/_core_new.py 1
Oct 8, 2019
d229257
[Issue209] PEP8 compliance in tofu/data/_core_new.py 2
Oct 8, 2019
cd3d895
[Issue209] PEP8 compliance in tofu/data/_core_new.py 3
Oct 8, 2019
1a88ce1
[Issue209] PEP8 compliance in tofu/data/_core_new.py 4
Oct 8, 2019
9814d7d
[Issue209] PEP8 compliance in tofu/data/_core_new.py 5
Oct 8, 2019
243a3c8
[Issue209] PEP8 compliance in tofu/data/_core_new.py 6
Oct 8, 2019
557280b
[Issue209] Trying to get back python 2.7 compatibility
Oct 8, 2019
0840858
[Issue209] PEP8 compliance in tofu/data/_core.py 1
Oct 8, 2019
d5bf3d8
[Issue209] Debuuged py27-compatible dict concatenation in DataHolder
Oct 8, 2019
ad1956d
[Issue209] Removed debugging in tofu/imas2tofu/_core.py
Oct 8, 2019
bd12ae5
[Issue209] One remaining py27-incompatible dict in tofu/data/_core_ne…
Oct 8, 2019
31eeb07
[Issue209] PEP8 compliance in tofu/data/_core_new.py 7
Oct 8, 2019
55f8314
[Issue209] py27 compatibility in tofu/data/_core_new.py
Oct 8, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added Debug_JINTRACMesh.pdf
Empty file.
Binary file added Debug_JINTRACMesh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Debug_JINTRACMesh.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Debug_JINTRACMesh2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions tofu/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
Provide data handling class and methods (storing, processing, plotting...)
"""
from tofu.data._core import *
from tofu.data._core_new import *
39 changes: 18 additions & 21 deletions tofu/data/_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -2241,18 +2241,11 @@ def nlamb(self):
DataCam2D.__signature__ = sig.replace(parameters=lp)







#####################################################################
#####################################################################
#####################################################################
# ####################################################################
# ####################################################################
# Plasma2D
#####################################################################
#####################################################################

# ####################################################################
# ####################################################################


class Plasma2D(utils.ToFuObject):
Expand All @@ -2265,20 +2258,21 @@ class Plasma2D(utils.ToFuObject):

"""
# Fixed (class-wise) dictionary of default properties
_ddef = {'Id':{'include':['Mod','Cls','Exp','Diag',
'Name','shot','version']},
'dtreat':{'order':['mask','interp-indt','interp-indch','data0','dfit',
'indt', 'indch', 'indlamb', 'interp-t']}}
_ddef = {'Id': {'include': ['Mod', 'Cls', 'Exp', 'Diag',
'Name', 'shot', 'version']},
'dtreat': {'order': ['mask', 'interp-indt', 'interp-indch',
'data0', 'dfit',
'indt', 'indch', 'indlamb', 'interp-t']}}

# Does not exist before Python 3.6 !!!
def __init_subclass__(cls, **kwdargs):
# Does not exist before Python 3.6 !!!
# Python 2
super(Plasma2D,cls).__init_subclass__(**kwdargs)
# Python 3
#super().__init_subclass__(**kwdargs)
# super().__init_subclass__(**kwdargs)
cls._ddef = copy.deepcopy(Plasma2D._ddef)
#cls._dplot = copy.deepcopy(Struct._dplot)
#cls._set_color_ddef(cls._color)
# cls._dplot = copy.deepcopy(Struct._dplot)
# cls._set_color_ddef(cls._color)


def __init__(self, dtime=None, dradius=None, d0d=None, d1d=None,
Expand Down Expand Up @@ -3607,9 +3601,12 @@ def _get_tcom(self, idquant=None, idref1d=None,
def _get_finterp(self,
idquant=None, idref1d=None, idref2d=None,
idq2dR=None, idq2dPhi=None, idq2dZ=None,
interp_t='nearest', interp_space=None,
interp_t=None, interp_space=None,
fill_value=np.nan, ani=False, Type=None):

if interp_t is None:
interp_t = 'nearest'

# Get idmesh
if idquant is not None:
if idref1d is None:
Expand Down Expand Up @@ -3749,7 +3746,7 @@ def interp_pts2profile(self, pts=None, vect=None, t=None,
""" Return the value of the desired profiles_1d quantity

For the desired inputs points (pts):
- pts are in (R,Z) coordinates
- pts are in (X,Y,Z) coordinates
- space interpolation is linear on the 1d profiles
At the desired input times (t):
- using a nearest-neighbourg approach for time
Expand Down
Loading