Fix new integration method for single objects

jobovy · May 22, 2019 · 1afd8b6 · 1afd8b6
1 parent d66d6f4
commit 1afd8b6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/galpy/orbit/integrateFullOrbit.py b/galpy/orbit/integrateFullOrbit.py
@@ -539,7 +539,7 @@ def integrate_for_map(vxvv):
             return integrateFullOrbit_c(pot,nu.copy(vxvv),
                                         t,int_method,dt=dt)[0]
     if len(yo) == 1: # Can't map a single value...
-        out= integrate_for_map(yo)
+        out= nu.atleast_3d(integrate_for_map(yo[0]).T).T
     else:
         out= nu.array((parallel_map(integrate_for_map,yo,numcores=numcores)))
     if nophi:

diff --git a/galpy/orbit/integrateLinearOrbit.py b/galpy/orbit/integrateLinearOrbit.py
@@ -250,7 +250,7 @@ def integrate_for_map(vxvv):
             return integrateLinearOrbit_c(pot,nu.copy(vxvv),
                                           t,int_method,dt=dt)[0]
     if len(yo) == 1: # Can't map a single value...
-        return integrate_for_map(yo), 0
+        return nu.atleast_3d(integrate_for_map(yo[0]).T).T, 0
     else:
         return (nu.array((parallel_map(integrate_for_map,yo,numcores=numcores))),
                 nu.zeros(len(yo)))

diff --git a/galpy/orbit/integratePlanarOrbit.py b/galpy/orbit/integratePlanarOrbit.py
@@ -610,7 +610,7 @@ def integrate_for_map(vxvv):
             return integratePlanarOrbit_c(pot,nu.copy(vxvv),
                                           t,int_method,dt=dt)[0]
     if len(yo) == 1: # Can't map a single value...
-        out= integrate_for_map(yo)
+        out= nu.atleast_3d(integrate_for_map(yo[0]).T).T
     else:
         out= nu.array((parallel_map(integrate_for_map,yo,numcores=numcores)))
     if nophi:
@@ -687,7 +687,7 @@ def integrate_for_map(vxvv):
                                                t,int_method,dt=dt,
                                                rtol=rtol,atol=atol)[0]
     if len(this_yo) == 1: # Can't map a single value...
-        out= integrate_for_map(this_yo)
+        out= nu.atleast_3d(integrate_for_map(this_yo[0]).T).T
     else:
         out= nu.array((parallel_map(integrate_for_map,this_yo,
                                     numcores=numcores)))