Merge pull request #81 from sfinkens/update-msg4-calib

Update MSG-4 visible calibration coefficients
foua-pps · Nov 16, 2023 · 2568eef · 2568eef
2 parents 1ed7063 + 1c8cc0f
commit 2568eef
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 39 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,10 +10,10 @@ jobs:
       fail-fast: true
       matrix:
         os: ["ubuntu-latest", "macos-latest"]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
         experimental: [false]
         include:
-          - python-version: "3.9"
+          - python-version: "3.10"
             os: "ubuntu-latest"
             experimental: true
 
@@ -25,17 +25,18 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Conda Environment
         uses: conda-incubator/setup-miniconda@v2
         with:
-          miniconda-version: "latest"
+          miniforge-variant: Mambaforge
+          miniforge-version: latest
+          use-mamba: true
           python-version: ${{ matrix.python-version }}
-          mamba-version: "*"
-          channels: conda-forge,defaults
           environment-file: continuous_integration/environment.yaml
           activate-environment: test-environment
+          auto-update-conda: true
 
       - name: Install unstable dependencies
         if: matrix.experimental == true
@@ -66,7 +67,7 @@ jobs:
           pytest --cov=level1c4pps level1c4pps/tests --cov-report=xml --cov-report=
 
       - name: Upload unittest coverage to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           flags: unittests
           file: ./coverage.xml

diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml
@@ -2,28 +2,13 @@ name: test-environment
 channels:
   - conda-forge
 dependencies:
-  - distributed
-  - toolz
   - sphinx
-  - dask
   - scipy
   - h5py
-  - requests
-  - six
   - python-geotiepoints
-  - docutils
-  - pyresample
-  - pykdtree
-  - pyyaml
-  - pyproj
-  - coveralls
-  - coverage
-  - codecov
-  - behave
   - mock
   - numpy
-  - xarray
-  - satpy<0.38|>0.41.1
+  - satpy>0.41.1
   - pyspectral
   - h5netcdf
   - pyorbital
@@ -33,4 +18,3 @@ dependencies:
   - pip:
     - trollsift
     - pygac
-
diff --git a/level1c4pps/calibration_coefs.py b/level1c4pps/calibration_coefs.py
@@ -45,9 +45,9 @@ class CalibrationData(Enum):
             IR_016=dict(b=23.066, a=-0.0286E-3)
         ),
         MSG4=dict(
-            VIS006=dict(b=21.040, a=0.2877E-3),
-            VIS008=dict(b=24.966, a=0.6074E-3),
-            IR_016=dict(b=21.236, a=0.1420E-3)
+            VIS006=dict(b=20.515, a=0.3600E-3),
+            VIS008=dict(b=25.803, a=0.4844E-3),
+            IR_016=dict(b=22.354, a=-0.0187E-3)
         )
     )
     SPACE_COUNT = -51.0

diff --git a/level1c4pps/tests/test_seviri2pps.py b/level1c4pps/tests/test_seviri2pps.py
@@ -573,24 +573,24 @@ def _assert_coefs_close(self, coefs, expected, **tol):
                     'MSG4',
                     dt.datetime(2019, 1, 18, 0, 0),
                     {
-                        'VIS006': {'gain': 0.0230415289,
-                                   'offset': -1.1751179739},
-                        'VIS008': {'gain': 0.0291916818,
-                                   'offset': -1.4887757718},
-                        'IR_016': {'gain': 0.022223894,
-                                   'offset': -1.1334185940000001}
+                        'VIS006': {'gain': 0.02301952,
+                                   'offset': -1.17399552},
+                        'VIS008': {'gain': 0.029172970800000003,
+                                   'offset': -1.4878215108000001},
+                        'IR_016': {'gain': 0.022223904099999997,
+                                   'offset': -1.1334191090999999}
                     }
                 ),
                 (
                     'MSG4',
                     dt.datetime(2024, 1, 18, 0, 0),
                     {
-                        'VIS006': {'gain': 0.0235668691,
-                                   'offset': -1.2019103241},
-                        'VIS008': {'gain': 0.0303007942,
-                                   'offset': -1.5453405042000001},
-                        'IR_016': {'gain': 0.022483186,
-                                   'offset': -1.146642486}
+                        'VIS006': {'gain': 0.02367688,
+                                   'offset': -1.2075208800000001},
+                        'VIS008': {'gain': 0.0300574852,
+                                   'offset': -1.5329317452},
+                        'IR_016': {'gain': 0.0221897579,
+                                   'offset': -1.1316776528999999}
                     }  # extrapolation beyond time coverage of calib. dataset
                 )
             ]