moving and correcting checks for finite source methods

rpoleski · Oct 5, 2023 · 5bea3a9 · 5bea3a9
1 parent 2d8fdc1
commit 5bea3a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/source/MulensModel/magnificationcurve.py b/source/MulensModel/magnificationcurve.py
@@ -151,16 +151,14 @@ 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:
             magnification = self.get_binary_lens_magnification()
         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
@@ -1 +1 @@
-__version__ = "2.18.4"
+__version__ = "2.18.5"