From 5bea3a98ce3d1edc24a28519dc63882c0ba64a62 Mon Sep 17 00:00:00 2001 From: radek_poleski Date: Thu, 5 Oct 2023 22:53:23 +0200 Subject: [PATCH] moving and correcting checks for finite source methods --- source/MulensModel/magnificationcurve.py | 10 +++++++--- source/MulensModel/version.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/MulensModel/magnificationcurve.py b/source/MulensModel/magnificationcurve.py index fffcfc30..8804b7b0 100644 --- a/source/MulensModel/magnificationcurve.py +++ b/source/MulensModel/magnificationcurve.py @@ -151,9 +151,6 @@ def get_magnification(self): Vector of magnifications. """ - if self.parameters.rho is not None: - self._check_for_finite_source_method() - if self.parameters.n_lenses == 1: magnification = self.get_point_lens_magnification() elif self.parameters.n_lenses == 2: @@ -161,6 +158,7 @@ def get_magnification(self): else: raise NotImplementedError( "magnification for more than 2 lenses not handled yet") + self._magnification = magnification return self._magnification @@ -251,6 +249,9 @@ def get_point_lens_magnification(self): Vector of magnifications. """ + if self.parameters.is_finite_source(): + self._check_for_finite_source_method() + if self.parameters.n_lenses != 1: raise ValueError( "You're trying to calculate single lens magnification, but " @@ -384,6 +385,9 @@ def get_binary_lens_magnification(self): Vector of magnifications. """ + if self.parameters.is_finite_source(): + self._check_for_finite_source_method() + if self.parameters.n_lenses != 2: raise ValueError( "You're trying to calculate binary lens magnification, but " diff --git a/source/MulensModel/version.py b/source/MulensModel/version.py index b2dc8ad7..5c8d0158 100644 --- a/source/MulensModel/version.py +++ b/source/MulensModel/version.py @@ -1 +1 @@ -__version__ = "2.18.4" +__version__ = "2.18.5"