Merge branch 'twopowertri' into stream-improvements

jobovy · Jul 8, 2016 · dd65142 · dd65142
2 parents d646fdf + 3c58f77
commit dd65142
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/galpy/potential_src/TwoPowerTriaxialPotential.py b/galpy/potential_src/TwoPowerTriaxialPotential.py
@@ -134,13 +134,14 @@ def __init__(self,amp=1.,a=5.,alpha=1.5,beta=3.5,b=1.,c=1.,
         return None
 
     def _setup_zvec_pa(self,zvec,pa):
+        if not pa is None:
+            if _APY_LOADED and isinstance(pa,units.Quantity):
+                pa= pa.to(units.rad).value
         if zvec is None and (pa is None or numpy.fabs(pa) < 10.**-10.):
             self._aligned= True
         else:
             self._aligned= False
             if not pa is None:
-                if _APY_LOADED and isinstance(pa,units.Quantity):
-                    pa= pa.to(units.rad).value
                 pa_rot= numpy.array([[numpy.cos(pa),numpy.sin(pa),0.],
                                      [-numpy.sin(pa),numpy.cos(pa),0.],
                                      [0.,0.,1.]])