Skip to content

Commit 1ebd41e

Browse files
smitharasmithara
authored
Merge pull request #136 from ESA-VirES/v0.15
Updates for v0.15
2 parents b113f7e + b36c2a9 commit 1ebd41e

10 files changed

Lines changed: 172 additions & 93 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
python-version: 3.9
3434
- os: ubuntu-24.04
3535
python-version: 3.13
36+
- os: ubuntu-24.04
37+
python-version: 3.14
3638
steps:
3739
- uses: actions/checkout@v4
3840
- uses: actions/setup-python@v5

‎CITATION.cff‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,18 @@
44
cff-version: 1.2.0
55
title: ESA-VirES/VirES-Python-Client
66
message: >-
7-
If you use this software, please cite it using the
8-
metadata from this file.
7+
Example citation:
8+
9+
“We use the Python package, viresclient [1], to access [ name the datasets ] from ESA's VirES for Swarm service [2]"
10+
11+
[1] Smith, A. R. A., Pačes, M., & Santillan, D. (2025). ESA-VirES/VirES-Python-Client. Zenodo. Smith, A. R. A., Pačes, M., & Santillan, D. (2025). ESA-VirES/VirES-Python-Client. Zenodo. Smith, A. R. A., Pačes, M., & Santillan, D. (2025). ESA-VirES/VirES-Python-Client (v0.14.1). Zenodo. Smith, A. R. A., Pačes, M., & Santillan, D. (2025). ESA-VirES/VirES-Python-Client (v0.14.1). Zenodo. https://doi.org/10.5281/zenodo.2554162
12+
[2] https://vires.services
13+
14+
You may also wish to cite this paper:
15+
16+
Smith A.R.A., Pačes M. and Swarm DISC (2022) Python tools for ESA's Swarm mission: VirES for Swarm and surrounding ecosystem. Front. Astron. Space Sci. 9:1002697. https://doi.org/10.3389/fspas.2022.1002697
17+
18+
Please refer to the Swarm handbook for product references: https://swarmhandbook.earth.esa.int/
919
type: software
1020
authors:
1121
- given-names: Ashley R. A.

‎README.rst‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,15 @@ You can reference *viresclient* directly using the DOI of our zenodo_ record. Vi
118118

119119
.. _zenodo: https://doi.org/10.5281/zenodo.2554162
120120

121-
| "We use the Python package, viresclient [1], to access [...] from ESA's VirES for Swarm service [2]"
122-
| [1] https://doi.org/10.5281/zenodo.2554162
123-
| [2] https://vires.services
121+
“We use the Python package, viresclient [1], to access [ name the datasets... ] from ESA's VirES for Swarm service [2]"
124122

125-
You can also cite this paper:
123+
[1] Smith, A. R. A., Pačes, M., & Santillan, D. (2025). ESA-VirES/VirES-Python-Client. Zenodo. Smith, A. R. A., Pačes, M., & Santillan, D. (2025). ESA-VirES/VirES-Python-Client. Zenodo. https://doi.org/10.5281/zenodo.2554162
124+
[2] https://vires.services
126125

127-
| Smith A.R.A., Pačes M. and Swarm DISC (2022) Python tools for ESA’s Swarm mission: VirES for Swarm and surrounding ecosystem. Front. Astron. Space Sci. 9:1002697. doi: 10.3389/fspas.2022.1002697
126+
(To follow best practices you should cite the specific version that you used - refer to the Zenodo page to find the correct DOI for that version)
127+
128+
Please refer to the Swarm handbook for product references: https://swarmhandbook.earth.esa.int/
129+
130+
You may also wish to cite this paper:
131+
132+
| Smith A.R.A., Pačes M. and Swarm DISC (2022) Python tools for ESA's Swarm mission: VirES for Swarm and surrounding ecosystem. Front. Astron. Space Sci. 9:1002697. doi: 10.3389/fspas.2022.1002697

‎docs/release_notes.rst‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,24 @@ Release notes
44
Change log
55
----------
66

7+
Changes from 0.14.1 to 0.15.0
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
- Changes to `EEFxTMS <https://swarmhandbook.earth.esa.int/catalogue/sw_eefxtms_2f>`_ products (introduced in product version 0502):
11+
12+
| Old: ``["EEF", "EEJ", "RelErr", "Flags"]``
13+
| New: ``["EEF", "EEJ_meast", "EEJ_mnorth", "RelErr", "Flags"]``
14+
| NB: This does not yet include the additional variables in version 0502
15+
16+
- Improved reliability of long duration requests. If there are short network issues while a job is being processed, the client attempts to stay connected. The connection is retried 3 times, pausing 20 seconds between each attempt.
17+
18+
- Fixed a bug where loading an empty dataframe/dataset would fail when requesting long time periods of data (where chunking of requests occurs)
19+
20+
- Removed unnecessary pytables dependency
21+
22+
- Fixed support for Python 3.14
23+
24+
725
Changes from 0.14.0 to 0.14.1
826
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
927

‎noxfile.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import nox
22

3+
nox.options.default_venv_backend = "uv"
4+
35

46
@nox.session
57
def lint(session):
@@ -10,10 +12,9 @@ def lint(session):
1012
session.run("pre-commit", "run", "--all-files", *session.posargs)
1113

1214

13-
@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"])
15+
@nox.session(python=["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"])
1416
def tests(session):
15-
session.install(".")
16-
session.install("pytest")
17+
session.install(".[test]")
1718
session.run("pytest")
1819

1920

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ classifiers = [
3131
"Programming Language :: Python :: 3.11",
3232
"Programming Language :: Python :: 3.12",
3333
"Programming Language :: Python :: 3.13",
34+
"Programming Language :: Python :: 3.14",
3435
"Development Status :: 5 - Production/Stable",
3536
]
3637
dynamic = ["version"]
@@ -42,7 +43,6 @@ dependencies = [
4243
"netCDF4 >= 1.5.3, <= 1.5.8; python_version<='3.7'",
4344
"pandas >= 0.18",
4445
"requests >= 2.0.0",
45-
"tables >= 3.4.4",
4646
"tqdm >= 4.23.0",
4747
"xarray >= 0.11.0",
4848
]

‎src/viresclient/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535
from ._config import ClientConfig, set_token
3636
from ._data_handling import ReturnedData, ReturnedDataFile
3737

38-
__version__ = "0.14.1"
38+
__version__ = "0.15.0"

‎src/viresclient/_client_swarm.py‎

Lines changed: 83 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
REFERENCES = {
3939
"General Swarm": (
40-
" Swarm Data Handbook, https://earth.esa.int/web/guest/missions/esa-eo-missions/swarm/data-handbook ",
40+
" Swarm Data Handbook, https://swarmhandbook.earth.esa.int/ ",
4141
" The Swarm Satellite Constellation Application and Research Facility (SCARF) and Swarm data products, https://doi.org/10.5047/eps.2013.07.001 ",
4242
" Swarm Science Data Processing and Products (2013), https://link.springer.com/journal/40623/65/11/page/1 ",
4343
" Special issue “Swarm science results after 2 years in space (2016), https://www.springeropen.com/collections/swsr ",
@@ -80,147 +80,157 @@
8080
),
8181
"MCO_SHA_2C": (
8282
"[Comprehensive Inversion]: Core field of CIY4",
83+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mco_sha_2c",
8384
" A comprehensive model of Earth’s magnetic field determined from 4 years of Swarm satellite observations, https://doi.org/10.1186/s40623-018-0896-3 ",
8485
"Validation: ftp://swarm-diss.eo.esa.int/Level2longterm/MCO/SW_OPER_MCO_VAL_2C_20131201T000000_20180101T000000_0401.ZIP ",
8586
),
8687
"MCO_SHA_2D": (
8788
"[Dedicated Chain]: Core field",
89+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mco_sha_2d",
8890
"An algorithm for deriving core magnetic field models from the Swarm data set, https://doi.org/10.5047/eps.2013.07.005 ",
8991
"Validation: ftp://swarm-diss.eo.esa.int/Level2longterm/MCO/SW_OPER_MCO_VAL_2D_20131126T000000_20180101T000000_0401.ZIP ",
9092
),
9193
"MLI_SHA_2C": (
9294
"[Comprehensive Inversion]: Lithospheric field of CIY4",
95+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mli_sha_2c",
9396
"Validation: ftp://swarm-diss.eo.esa.int/Level2longterm/MLI/SW_OPER_MLI_VAL_2C_00000000T000000_99999999T999999_0401.ZIP",
9497
),
9598
"MLI_SHA_2D": (
9699
"[Dedicated Chain]: Lithospheric field",
100+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mli_sha_2d",
97101
" Swarm SCARF Dedicated Lithospheric Field Inversion chain, https://doi.org/10.5047/eps.2013.07.008 ",
98102
" Validation: ftp://swarm-diss.eo.esa.int/Level2longterm/MLI/SW_OPER_MLI_VAL_2D_00000000T000000_99999999T999999_0401.ZIP ",
99103
),
100104
"MLI_SHA_2E": (
101105
"[Extended dedicated chain]: Lithospheric field",
106+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mli_sha_2e",
102107
" Joint inversion of Swarm, CHAMP, and WDMAM data ",
103108
" https://swarm-diss.eo.esa.int/?do=download&file=swarm%2FLevel2longterm%2FMLI%2FSW_OPER_MLI_VAL_2E_00000000T000000_99999999T999999_0502.ZIP ",
104109
),
105110
"MMA_SHA_2C-Primary": (
106111
"[Comprehensive Inversion]: Primary (external) magnetospheric field of CIY4",
112+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mma_sha_2c",
107113
"Validation: ftp://swarm-diss.eo.esa.int/Level2longterm/MMA/SW_OPER_MMA_VAL_2C_20131201T000000_20180101T000000_0401.ZIP",
108114
),
109115
"MMA_SHA_2C-Secondary": (
116+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mma_sha_2c",
110117
"[Comprehensive Inversion]: Secondary (internal/induced) magnetospheric field of CIY4",
111118
),
112119
"MMA_SHA_2F-Primary": (
113120
"[Fast-Track Product]: Primary (external) magnetospheric field",
121+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mma_sha_2f",
114122
" Rapid modelling of the large-scale magnetospheric field from Swarm satellite data, https://doi.org/10.5047/eps.2013.09.003 ",
115123
),
116124
"MMA_SHA_2F-Secondary": (
117125
"[Fast-Track Product]: Secondary (internal/induced) magnetospheric field",
126+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mma_sha_2f",
118127
),
119128
"MIO_SHA_2C-Primary": (
120129
"[Comprehensive Inversion]: Primary (external) ionospheric field of CIY4",
130+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mio_sha_2c",
121131
"Validation: ftp://swarm-diss.eo.esa.int/Level2longterm/MIO/SW_OPER_MIO_VAL_2C_00000000T000000_99999999T999999_0401.ZIP ",
122132
),
123133
"MIO_SHA_2C-Secondary": (
124134
"[Comprehensive Inversion]: Secondary (external/induced) ionospheric field of CIY4",
135+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mio_sha_2c",
125136
),
126137
"MIO_SHA_2D-Primary": (
127138
"[Dedicated Chain]: Primary (external) ionospheric field, DIFI",
139+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mio_sha_2d",
128140
" Swarm SCARF dedicated ionospheric field inversion chain, https://doi.org/10.5047/eps.2013.08.006 ",
129141
" First results from the Swarm Dedicated Ionospheric Field Inversion chain, https://doi.org/10.1186/s40623-016-0481-6 ",
130142
" http://geomag.colorado.edu/difi-3 ",
131143
"Validation: ftp://swarm-diss.eo.esa.int/Level2longterm/MIO/SW_OPER_MIO_VAL_2D_20131201T000000_20171231T235959_0402.ZIP ",
132144
),
133145
"MIO_SHA_2D-Secondary": (
134146
"[Dedicated Chain]: Secondary (external/induced) ionospheric field, DIFI",
147+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mio_sha_2d",
148+
),
149+
"AMPS": (
150+
"AMPS - associated magnetic field, https://github.com/klaundal/pyAMPS",
151+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mio_sha_2e",
152+
),
153+
"MCO_SHA_2X": (
154+
"Alias for 'CHAOS-Core'",
155+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mco_sha_2x",
135156
),
136-
"AMPS": ("AMPS - associated magnetic field, https://github.com/klaundal/pyAMPS",),
137-
"MCO_SHA_2X": ("Alias for 'CHAOS-Core'",),
138157
"CHAOS": (
139158
"Alias for 'CHAOS-Core' + 'CHAOS-Static' + 'CHAOS-MMA-Primary' + 'CHAOS-MMA-Secondary'",
159+
"https://www.spacecenter.dk/files/magnetic-models/CHAOS-8/",
160+
),
161+
"CHAOS-MMA": (
162+
"Alias for 'CHAOS-MMA-Primary' + 'CHAOS-MMA-Secondary'",
163+
"https://www.spacecenter.dk/files/magnetic-models/CHAOS-8/",
164+
),
165+
"MMA_SHA_2C": (
166+
"Alias for 'MMA_SHA_2C-Primary' + 'MMA_SHA_2C-Secondary'",
167+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mma_sha_2c",
168+
),
169+
"MMA_SHA_2F": (
170+
"Alias for 'MMA_SHA_2F-Primary' + 'MMA_SHA_2F-Secondary'",
171+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mma_sha_2f",
172+
),
173+
"MIO_SHA_2C": (
174+
"Alias for 'MIO_SHA_2C-Primary' + 'MIO_SHA_2C-Secondary'",
175+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mio_sha_2c",
176+
),
177+
"MIO_SHA_2D": (
178+
"Alias for 'MIO_SHA_2D-Primary' + 'MIO_SHA_2D-Secondary'",
179+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mio_sha_2d",
140180
),
141-
"CHAOS-MMA": ("Alias for 'CHAOS-MMA-Primary' + 'CHAOS-MMA-Secondary'",),
142-
"MMA_SHA_2C": ("Alias for 'MMA_SHA_2C-Primary' + 'MMA_SHA_2C-Secondary'",),
143-
"MMA_SHA_2F": ("Alias for 'MMA_SHA_2F-Primary' + 'MMA_SHA_2F-Secondary'",),
144-
"MIO_SHA_2C": ("Alias for 'MIO_SHA_2C-Primary' + 'MIO_SHA_2C-Secondary'",),
145-
"MIO_SHA_2D": ("Alias for 'MIO_SHA_2D-Primary' + 'MIO_SHA_2D-Secondary'",),
146181
"SwarmCI": (
147182
"Alias for 'MCO_SHA_2C' + 'MLI_SHA_2C' + 'MIO_SHA_2C-Primary' + 'MIO_SHA_2C-Secondary' + 'MMA_SHA_2C-Primary' + 'MMA_SHA_2C-Secondary'",
183+
"https://swarmhandbook.earth.esa.int/catalogue/sw_mco_sha_2c",
148184
),
149185
}
150186

151187
DEPRECATED_MODELS = {}
152188

153189
COLLECTION_REFERENCES = {
154-
"MAG": (
155-
" https://earth.esa.int/web/guest/missions/esa-eo-missions/swarm/data-handbook/level-1b-product-definitions#MAGX_LR_1B_Product ",
156-
),
157-
"MAG_HR": (
158-
"https://earth.esa.int/web/guest/missions/esa-eo-missions/swarm/data-handbook/level-1b-product-definitions#MAGX_HR_1B_Product ",
159-
),
160-
"EFI": (
161-
" https://earth.esa.int/web/guest/missions/esa-eo-missions/swarm/data-handbook/level-1b-product-definitions#EFIX_LP_1B_Product ",
162-
),
163-
"EFI:B06": (
164-
" https://earth.esa.int/web/guest/missions/esa-eo-missions/swarm/data-handbook/level-1b-product-definitions#EFIX_LP_1B_Product ",
165-
),
166-
"IBI": (
167-
" https://earth.esa.int/web/guest/missions/esa-eo-missions/swarm/data-handbook/level-2-product-definitions#IBIxTMS_2F ",
168-
" https://earth.esa.int/documents/10174/1514862/Swarm_L2_IBI_product_description ",
169-
),
170-
"TEC": (
171-
" https://earth.esa.int/web/guest/missions/esa-eo-missions/swarm/data-handbook/level-2-product-definitions#TECxTMS_2F ",
172-
" https://earth.esa.int/documents/10174/1514862/Swarm_Level-2_TEC_Product_Description ",
173-
),
174-
"FAC": (
175-
" https://earth.esa.int/web/guest/missions/esa-eo-missions/swarm/data-handbook/level-2-product-definitions#FAC_TMS_2F ",
176-
" https://earth.esa.int/web/guest/missions/esa-eo-missions/swarm/data-handbook/level-2-product-definitions#FACxTMS_2F ",
177-
" https://earth.esa.int/documents/10174/1514862/Swarm_L2_FAC_single_product_description ",
178-
" https://earth.esa.int/documents/10174/1514862/Swarm-L2-FAC-Dual-Product-Description ",
179-
),
180-
"EEF": (
181-
" https://earth.esa.int/web/guest/missions/esa-eo-missions/swarm/data-handbook/level-2-product-definitions#EEFxTMS_2F ",
182-
" https://earth.esa.int/documents/10174/1514862/Swarm-Level-2-EEF-Product-Description ",
183-
),
184-
"IPD": (
185-
" https://earth.esa.int/web/guest/missions/esa-eo-missions/swarm/data-handbook/level-2-product-definitions#IPDxIPR_2F ",
186-
),
190+
"MAG": (" https://swarmhandbook.earth.esa.int/catalogue/sw_magx_lr_1b ",),
191+
"MAG_HR": (" https://swarmhandbook.earth.esa.int/catalogue/sw_magx_hr_1b ",),
192+
"EFI": (" https://swarmhandbook.earth.esa.int/catalogue/sw_efix_lp_1b ",),
193+
"EFI:B06": (" https://swarmhandbook.earth.esa.int/catalogue/sw_efix_lp_1b ",),
194+
"IBI": (" https://swarmhandbook.earth.esa.int/catalogue/sw_ibixtms_2f ",),
195+
"TEC": (" https://swarmhandbook.earth.esa.int/catalogue/sw_tecxtms_2f ",),
196+
"FAC": (" https://swarmhandbook.earth.esa.int/catalogue/sw_facxtms_2f ",),
197+
"EEF": (" https://swarmhandbook.earth.esa.int/catalogue/sw_eefxtms_2f ",),
198+
"IPD": (" https://swarmhandbook.earth.esa.int/catalogue/sw_ipdxirr_2f ",),
187199
"AUX_OBSH": ("https://doi.org/10.5047/eps.2013.07.011",),
188200
"AUX_OBSM": ("https://doi.org/10.5047/eps.2013.07.011",),
189201
"AUX_OBSS": ("https://doi.org/10.5047/eps.2013.07.011",),
190-
"VOBS_SW_1M": ("https://earth.esa.int/eogateway/activities/gvo",),
191-
"AEJ_LPL": ("https://earth.esa.int/eogateway/activities/swarm-aebs",),
192-
"AEJ_LPS": ("https://earth.esa.int/eogateway/activities/swarm-aebs",),
193-
"AEJ_PBL": ("https://earth.esa.int/eogateway/activities/swarm-aebs",),
194-
"AEJ_PBS": ("https://earth.esa.int/eogateway/activities/swarm-aebs",),
195-
"AOB_FAC": ("https://earth.esa.int/eogateway/activities/swarm-aebs",),
196-
"MIT_LP": (
197-
"https://earth.esa.int/eogateway/activities/plasmapause-related-boundaries-in-the-topside-ionosphere-as-derived-from-swarm-measurements",
202+
"VOBS_SW_1M": ("https://swarmhandbook.earth.esa.int/catalogue/sw_vobs_1m_2_",),
203+
"AEJ_LPL": ("https://swarmhandbook.earth.esa.int/catalogue/sw_aejxlpl_2f",),
204+
"AEJ_LPS": ("https://swarmhandbook.earth.esa.int/catalogue/sw_aejxlps_2f",),
205+
"AEJ_PBL": ("https://swarmhandbook.earth.esa.int/catalogue/sw_aejxpbl_2f",),
206+
"AEJ_PBS": ("https://swarmhandbook.earth.esa.int/catalogue/sw_aejxpbs_2f",),
207+
"AOB_FAC": ("https://swarmhandbook.earth.esa.int/catalogue/sw_aobxfac_2f",),
208+
"MIT_LP": ("https://swarmhandbook.earth.esa.int/catalogue/sw_mitx_lp_2f",),
209+
"MIT_TEC": ("https://swarmhandbook.earth.esa.int/catalogue/sw_mitxtec_2f",),
210+
"PPI_FAC": ("https://swarmhandbook.earth.esa.int/catalogue/sw_ppixfac_2f",),
211+
"MAG_CHAMP": ("https://doi.org/10.5880/GFZ.2.3.2019.004",),
212+
"MAG_CS": (
213+
"https://swarmhandbook.earth.esa.int/catalogue/cs_mag",
214+
"https://doi.org/10.1186/s40623-020-01171-9",
198215
),
199-
"MIT_TEC": (
200-
"https://earth.esa.int/eogateway/activities/plasmapause-related-boundaries-in-the-topside-ionosphere-as-derived-from-swarm-measurements",
216+
"MAG_GRACE": (
217+
"https://swarmhandbook.earth.esa.int/catalogue/grace_x_mag",
218+
"https://doi.org/10.1186/s40623-021-01373-9",
201219
),
202-
"PPI_FAC": (
203-
"https://earth.esa.int/eogateway/activities/plasmapause-related-boundaries-in-the-topside-ionosphere-as-derived-from-swarm-measurements",
220+
"MAG_GFO": (
221+
"https://swarmhandbook.earth.esa.int/catalogue/gfx_fgm_acal_corr",
222+
"https://doi.org/10.1186/s40623-021-01364-w",
204223
),
205-
"MAG_CHAMP": ("https://doi.org/10.5880/GFZ.2.3.2019.004",),
206-
"MAG_CS": ("https://doi.org/10.1186/s40623-020-01171-9",),
207-
"MAG_GRACE": ("https://doi.org/10.1186/s40623-021-01373-9",),
208-
"MAG_GFO": ("https://doi.org/10.1186/s40623-021-01364-w",),
209224
"MAG_GFO_ML": ("https://doi.org/10.5880/GFZ.2.3.2023.001",),
210-
"EFI_IDM": (
211-
"https://earth.esa.int/eogateway/documents/20142/2860886/SLIDEM_Product_Definition.pdf",
225+
"EFI_IDM": ("https://swarmhandbook.earth.esa.int/catalogue/sw_efixidm_2_",),
226+
"MAG_GOCE": (
227+
"https://swarmhandbook.earth.esa.int/catalogue/go_mag_acal_corr",
228+
"https://doi.org/10.5880/GFZ.2.3.2022.001",
212229
),
213-
"MAG_GOCE": ("https://doi.org/10.5880/GFZ.2.3.2022.001",),
214230
"MAG_GOCE_ML": ("https://doi.org/10.5880/GFZ.2.3.2022.002",),
215-
"EFI_TIE": (
216-
"https://earth.esa.int/eogateway/activities/swarm-ion-temperature-estimation",
217-
),
218-
"EFI_TCT02": (
219-
"https://earth.esa.int/eogateway/documents/20142/37627/swarm-EFI-TII-cross-track-flow-dataset-release-notes.pdf",
220-
),
221-
"EFI_TCT16": (
222-
"https://earth.esa.int/eogateway/documents/20142/37627/swarm-EFI-TII-cross-track-flow-dataset-release-notes.pdf",
223-
),
231+
"EFI_TIE": ("https://swarmhandbook.earth.esa.int/catalogue/sw_efixtie_2_",),
232+
"EFI_TCT02": ("https://swarmhandbook.earth.esa.int/catalogue/sw_efix_tct02",),
233+
"EFI_TCT16": ("https://swarmhandbook.earth.esa.int/catalogue/sw_efix_tct16",),
224234
"DNS_POD": ("https://swarmhandbook.earth.esa.int/catalogue/SW_DNSxPOD_2_",),
225235
"DNS_ACC": ("https://swarmhandbook.earth.esa.int/catalogue/SW_DNSxACC_2_",),
226236
"DNS_ACC_CHAMP": ("https://swarmhandbook.earth.esa.int/catalogue/CH_DNS_ACC_2_",),
@@ -1045,7 +1055,7 @@ class SwarmRequest(ClientRequest):
10451055
"Flags_B",
10461056
"Flags_q",
10471057
],
1048-
"EEF": ["EEF", "EEJ", "RelErr", "Flags"],
1058+
"EEF": ["EEF", "EEJ_meast", "EEJ_mnorth", "RelErr", "Flags"],
10491059
"IPD": [
10501060
"Ne",
10511061
"Te",
@@ -2834,9 +2844,9 @@ def eval_model_for_cdf_file(
28342844
28352845
Args:
28362846
models (list(str)/dict): from .available_models() or defineable with custom expressions
2837-
input_cdf_filename, (str) input CDF file.
2838-
output_cdf_filename, (str) output CDF file.
2839-
show_progress (bool) show download progress True
2847+
input_cdf_filename (str): input CDF file.
2848+
output_cdf_filename (str): output CDF file.
2849+
show_progress (bool): show download progress True
28402850
28412851
Returns:
28422852
copy of output_cdf_filename

0 commit comments

Comments
 (0)