Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
03b6311
[Issue356] Created openadas2tofu sub-package with __init__.py
Feb 27, 2020
cb0c53f
[Issue356] updated version
Feb 27, 2020
7f7a339
[Issue356] Advanced search()
Feb 27, 2020
687249c
[Issue356] Web interface operational for search, download, download_a…
Feb 28, 2020
d28fd3d
[Issue356] Started reading routines, ADF15 to be finished and tested
Feb 28, 2020
ecbc0a2
Merge branch 'devel' into Issue356_openadas
Mar 3, 2020
ee6f48b
[Issue356] Debugged tofucustom for openadas/ creation and debugged im…
Mar 4, 2020
a4c55fe
[Issue356] ADF15 file reading ok with proper keys and checks, now imp…
Mar 4, 2020
b7e9007
[Issue356] search_online(), search_online_by_wavelength() and downloa…
Mar 5, 2020
480d04d
[Issue356] read() operational for both absolute path and full adas na…
Mar 5, 2020
c42e00c
[Issue356] read_all() operational, with element, Type and optional ch…
Mar 5, 2020
39b1824
[Issue356] Debugged search_online() and now operational for adf11
Mar 5, 2020
11e72e0
[Issue356] Replace '+' by '1+' in search_online()
Mar 5, 2020
029850e
[Issue356] Finishing ADF11/SCD reading routine
Mar 5, 2020
f657de5
[Issue356] _read_adf11 operational and read_all() operational for adf…
Mar 6, 2020
76d020d
[Issue356] Harmonized output for adf11 and adf15 in read_all()
Mar 6, 2020
f4208ff
[Issue356] Added docstr to read() and read_all()
Mar 6, 2020
26371bf
[Issue356] Minor typo
Mar 6, 2020
2d4ab61
[Issue356] PEPA compliance
Mar 6, 2020
328d320
[Issue356] PEP8 compliance 2
Mar 6, 2020
0d3af17
Merge branch 'devel' into Issue356_openadas
Didou09 Mar 6, 2020
b9a55dc
[Issue356] Typo in lambmin / lambmax selection in _read_adf15()
Mar 6, 2020
f832ab7
[Issue356] Improve consistency with Issue202 for dlines dict out of _…
Mar 6, 2020
3ee8536
[Issue356] Typo
Mar 6, 2020
21beb70
Merge branch 'devel' into Issue356_openadas
lasofivec Mar 10, 2020
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
2 changes: 1 addition & 1 deletion tofu/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
# -------------------------------------

msg = None
dsub = dict.fromkeys(['imas2tofu', 'mag'])
dsub = dict.fromkeys(['imas2tofu', 'openadas2tofu', 'mag'])
for sub in dsub.keys():
try:
exec('import tofu.{0} as {0}'.format(sub))
Expand Down
21 changes: 21 additions & 0 deletions tofu/openadas2tofu/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
#! /usr/bin/python
"""
The openadas-compatibility module of tofu

"""
import traceback

try:
try:
from tofu.openadas2tofu._requests import *
from tofu.openadas2tofu._read_files import *
except Exception:
from ._requests import *
from ._read_files import *
except Exception as err:
msg = str(traceback.format_exc())
msg += "\n\n => the optional sub-package tofu.imas2tofu is not usable\n"
raise Exception(msg)

del traceback
Loading