From b04dfbad01806cf18dc742510bf68e6d965afb2b Mon Sep 17 00:00:00 2001 From: Nicolas Mounet Date: Sun, 30 May 2021 07:56:06 +0200 Subject: [PATCH] Fixing previous merge --- cara/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cara/models.py b/cara/models.py index 6efa29db..a72f1b48 100644 --- a/cara/models.py +++ b/cara/models.py @@ -572,7 +572,7 @@ class _ExpirationBase: #: Pre-populated examples of Masks. types: typing.ClassVar[typing.Dict[str, "_ExpirationBase"]] - def aerosols(self, mask: Mask): + def aerosols(self, mask: _MaskBase): # total volume of aerosols expired per volume of air (mL/cm^3). raise NotImplementedError("Subclass must implement") @@ -617,7 +617,7 @@ class MultipleExpiration(_ExpirationBase): raise ValueError("expirations and weigths should contain the" "same number of elements") - def aerosols(self, mask: Mask): + def aerosols(self, mask: _MaskBase): return np.array([ weight * expiration.aerosols(mask) / sum(self.weights) for weight,expiration in zip(self.weights,self.expirations)