fixed bug in mulenssystem.source

rpoleski · Sep 15, 2017 · c2e64a7 · c2e64a7
1 parent 1f8b21d
commit c2e64a7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/examples/example_03_mulenssystem.py b/examples/example_03_mulenssystem.py
@@ -14,7 +14,7 @@
 
 # Combine them into a lens system
 point_lens = MulensSystem(lens=my_lens, source=my_source)
-print('The Lens-Source system WITHOUT proper motion:')
+print('The Lens-Source system WITHOUT proper motion specified:')
 print(point_lens)
 
 pl.figure()
@@ -23,7 +23,7 @@
 
 # Give the objects a relative proper motion
 point_lens.mu_rel = 4. * u.mas / u.yr
-print('------\nThe Lens-Source system WITH proper motion:')
+print('------\nThe Lens-Source system WITH proper motion specified:')
 print(point_lens)
 
 pl.figure()

diff --git a/source/MulensModel/mulensobjects/mulenssystem.py b/source/MulensModel/mulensobjects/mulenssystem.py
@@ -180,8 +180,8 @@ def plot_magnification(self, u_0=None, alpha=None,**kwargs):
                 parameters.t_E = 1.
                 xtitle = 'Time (tE)'
 
-            if self.source.angular_size is not None:
-                parameters.rho = (self.source.angular_size.to(u.mas) 
+            if self.source.angular_radius is not None:
+                parameters.rho = (self.source.angular_radius.to(u.mas) 
                                   / self.theta_E.to(u.mas))
 
             if self.lens.n_masses > 1:

diff --git a/source/MulensModel/mulensobjects/source.py b/source/MulensModel/mulensobjects/source.py
@@ -16,10 +16,8 @@ def __init__(self, distance=None, pi_S=None, angular_radius=None,
 
         self.distance = distance
         self.pi_S = pi_S
-
-        if angular_radius is not None:
-            self.angular_radius = angular_radius
-
+        self.angular_radius = angular_radius
+
         if limb_darkening is None:
             self.limb_darkening = LimbDarkeningCoeffs()
         else:
@@ -88,10 +86,7 @@ def angular_radius(self):
 
     @angular_radius.setter
     def angular_radius(self, new_value):
-        if not isinstance(new_value, u.Quantity):
+        if not isinstance(new_value, u.Quantity) and new_value is not None:
             new_value = new_value * u.uas
         self._angular_radius = new_value
 
-
-
-