rm _get_diurnal_only and associated tests

metno · Oct 6, 2024 · 519df9f · 519df9f
1 parent 88a7c45
commit 519df9f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 25 deletions.
diff --git a/pyaerocom/aeroval/_processing_base.py b/pyaerocom/aeroval/_processing_base.py
@@ -76,24 +76,6 @@ class HasColocator(HasConfig):
     Config class that also has the ability to co-locate
     """
 
-    def _get_diurnal_only(self, obs_name):
-        """
-        Check if colocated data is flagged for only diurnal processing
-
-        Parameters
-        ----------
-        obs_name : string
-            Name of observational subset
-        colocated_data : ColocatedData
-            A ColocatedData object that will be checked for suitability of
-            diurnal processing.
-
-        Returns
-        -------
-        diurnal_only : bool
-        """
-        return self.cfg.get_obs_entry(obs_name).diurnal_only
-
     def get_colocator(self, model_name: str = None, obs_name: str = None) -> Colocator:
         """
         Instantiate colocation engine
@@ -136,7 +118,7 @@ def get_colocator(self, model_name: str = None, obs_name: str = None) -> Colocat
                 if key in ColocationSetup.model_fields:
                     col_cfg[key] = val
 
-            col_cfg["add_meta"].update(diurnal_only=self._get_diurnal_only(obs_name))
+            col_cfg["add_meta"].update(diurnal_only=self.cfg.get_obs_entry(obs_name).diurnal_only)
 
         col_stp = ColocationSetup(**col_cfg)
         col = Colocator(col_stp)

diff --git a/tests/aeroval/test__processing_base.py b/tests/aeroval/test__processing_base.py
@@ -14,7 +14,12 @@ def setup() -> EvalSetup:
     """EvalSetup instance"""
     obs_cfg = dict(
         obs1=dict(obs_id="obs1", obs_vars=["od550aer"], obs_vert_type="Column"),
-        obs2=dict(obs_id="obs2", obs_vars=["od550aer"], obs_vert_type="Column", diurnal_only=True),
+        obs2=dict(
+            obs_id="obs2",
+            obs_vars=["od550aer"],
+            obs_vert_type="Column",
+            diurnal_only=True,
+        ),
     )
     return EvalSetup(proj_id="bla", exp_id="blub", obs_cfg=obs_cfg)
 
@@ -44,11 +49,6 @@ def collocator(setup: EvalSetup) -> HasColocator:
     return HasColocator(setup)
 
 
-def test_HasColocator_get_diurnal_only(collocator: HasColocator):
-    assert not collocator._get_diurnal_only("obs1")
-    assert collocator._get_diurnal_only("obs2")
-
-
 @pytest.mark.parametrize("obs_name", [None, "obs1", "obs2"])
 def test_HasColocator_get_colocator(collocator: HasColocator, obs_name: str | None):
     col = collocator.get_colocator(obs_name=obs_name)