Skip to content

Commit c50539a

Browse files
committed
Merge branch 'master' into staging
2 parents 0ecec13 + 526b557 commit c50539a

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

docs/available_parameters.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ See the `Swarm Data Handbook`_ for details about the products and `Swarm Product
4646
- ``SW_FAST_MAGx_HR_1B``
4747
- ``SW_FAST_EFIx_LP_1B``
4848
- ``SW_FAST_MODx_SC_1B``
49+
- ``SW_FAST_FACxTMS_2F``
4950

5051
Collections are grouped according to a type containing similar measurements (i.e. the same product from different spacecraft). The collection type can be given to :py:meth:`viresclient.SwarmRequest.available_collections` to retrieve the full collection names. These cover the Swarm data products as below (replace x with A, B, or C for Alpha, Bravo, or Charlie):
5152

docs/release_notes.rst

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

7-
Changes from 0.11.6 to 0.12.0
7+
Changes from 0.11.8 to 0.12.0
88
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
99

10-
- Added auxiliaries ``["F107_avg81d", "F107_avg81d_count"]``
11-
- Updated and added ML-calibrated variants of GOCE & GRACE-FO magnetic datasets, ``GO_MAG_ACAL_CORR_ML`` & ``GFx_MAG_ACAL_CORR_ML``
1210
- Added TOLEOS thermosphere products:
1311

1412
- e.g. ``"CH_OPER_DNS_ACC_2_"`` and ``"CH_OPER_WND_ACC_2_"`` from CHAMP and equivalents from GRACE and GRACE-FO
1513
- conjunction information within ``"MM_CON_SPH_2_:crossover"`` and ``"MM_CON_SPH_2_:plane_alignment"``
1614

1715
- Added CHAMP magnetic dataset, ``CH_ME_MAG_LR_3``
1816

17+
Changes from 0.11.7 to 0.11.8
18+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
19+
20+
- Added FAC FAST dataset ``SW_FAST_FACxTMS_2F``
21+
22+
Changes from 0.11.6 to 0.11.7
23+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
24+
25+
- Added auxiliaries ``["F107_avg81d", "F107_avg81d_count"]``
26+
- Updated and added ML-calibrated variants of GOCE & GRACE-FO magnetic datasets, ``GO_MAG_ACAL_CORR_ML`` & ``GFx_MAG_ACAL_CORR_ML``
27+
1928
Changes from 0.11.5 to 0.11.6
2029
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2130

src/viresclient/_client_swarm.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,10 @@ class SwarmRequest(ClientRequest):
530530
"EFI_TCT16": [f"SW_EXPT_EFI{x}_TCT16" for x in "ABC"],
531531
"IBI": [f"SW_OPER_IBI{x}TMS_2F" for x in "ABC"],
532532
"TEC": [f"SW_OPER_TEC{x}TMS_2F" for x in "ABC"],
533-
"FAC": [f"SW_OPER_FAC{x}TMS_2F" for x in "ABC_"],
533+
"FAC": [
534+
*(f"SW_OPER_FAC{x}TMS_2F" for x in "ABC_"),
535+
*(f"SW_FAST_FAC{x}TMS_2F" for x in "ABC"),
536+
],
534537
"EEF": [f"SW_OPER_EEF{x}TMS_2F" for x in "ABC"],
535538
"IPD": [f"SW_OPER_IPD{x}IRR_2F" for x in "ABC"],
536539
"AEJ_LPL": [f"SW_OPER_AEJ{x}LPL_2F" for x in "ABC"],

0 commit comments

Comments
 (0)