Fixes to Orbit

jobovy · Jul 21, 2023 · ca0e8ae · ca0e8ae
1 parent 2cf4c16
commit ca0e8ae
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/galpy/orbit/Orbits.py b/galpy/orbit/Orbits.py
@@ -8213,7 +8213,11 @@ def _XYZvxvyvz(orb, thiso, *args, **kwargs):
                         obs[3] * obs[0] / Xsun / vo + obs[4] * obs[1] / Xsun / vo,
                         -obs[3] * obs[1] / Xsun / vo + obs[4] * obs[0] / Xsun / vo,
                         obs[5]
-                        * (numpy.ones_like(Xsun) if obs[5].ndim == 0 else 1.0)
+                        * (
+                            numpy.ones_like(Xsun)
+                            if isinstance(Xsun, numpy.ndarray) and obs[5].ndim == 0
+                            else 1.0
+                        )
                         / vo,
                     ]
                 ),
@@ -8294,7 +8298,11 @@ def _XYZvxvyvz(orb, thiso, *args, **kwargs):
                         obs[3] * obs[0] / Xsun / vo + obs[4] * obs[1] / Xsun / vo,
                         -obs[3] * obs[1] / Xsun / vo + obs[4] * obs[0] / Xsun / vo,
                         obs[5]
-                        * (numpy.ones_like(Xsun) if obs[5].ndim == 0 else 1.0)
+                        * (
+                            numpy.ones_like(Xsun)
+                            if isinstance(Xsun, numpy.ndarray) and obs[5].ndim == 0
+                            else 1.0
+                        )
                         / vo,
                     ]
                 ),
@@ -8413,7 +8421,7 @@ def _parse_radec_kwargs(orb, kwargs, vel=False, dontpop=False, thiso=None):
     else:
         vo = orb._vo
     # Tile everything when thiso includes a time axis
-    if not thiso is None and thiso.shape[1] > orb.size:
+    if isinstance(obs, list) and not thiso is None and thiso.shape[1] > orb.size:
         nt = thiso.shape[1] // orb.size
         obs = [
             numpy.tile(obs[ii], nt)