Fix DifferenceCompositor not using metadata from YAML

pytroll · Mar 11, 2022 · f00d025 · f00d025
1 parent a61e08e
commit f00d025
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/satpy/composites/__init__.py b/satpy/composites/__init__.py
@@ -257,7 +257,8 @@ def __call__(self, projectables, nonprojectables=None, **attrs):
         projectables = self.match_data_arrays(projectables)
         info = combine_metadata(*projectables)
         info['name'] = self.attrs['name']
-        info.update(attrs)
+        info.update(self.attrs)  # attrs from YAML/__init__
+        info.update(attrs)  # overwriting of DataID properties
 
         proj = projectables[0] - projectables[1]
         proj.attrs = info

diff --git a/satpy/tests/test_composites.py b/satpy/tests/test_composites.py
@@ -269,8 +269,8 @@ def setUp(self):
     def test_basic_diff(self):
         """Test that a basic difference composite works."""
         from satpy.composites import DifferenceCompositor
-        comp = DifferenceCompositor(name='diff')
-        res = comp((self.ds1, self.ds2), standard_name='temperature_difference')
+        comp = DifferenceCompositor(name='diff', standard_name='temperature_difference')
+        res = comp((self.ds1, self.ds2))
         np.testing.assert_allclose(res.values, -2)
         assert res.attrs.get('standard_name') == 'temperature_difference'