kerrz-python 0.2.3__tar.gz → 0.2.5__tar.gz

{kerrz_python-0.2.3 → kerrz_python-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kerrz_python
-Version: 0.2.3
+Version: 0.2.5
 Summary: Python wrapper for kerrz. Avoid installing directly, use kerrz[py] unless you know what you are doing.
 Home-page: https://codeberg.org/astro-group/kerrz-py
 Author: Fergus Baker
@@ -13,7 +13,7 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Requires-Dist: kerrz_lib==0.2.3
+Requires-Dist: kerrz_lib==0.2.5
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

kerrz_python-0.2.5/kerrz_python/VERSION

@@ -0,0 +1 @@
+0.2.5

{kerrz_python-0.2.3 → kerrz_python-0.2.5}/kerrz_python/wrappers.py

@@ -5,7 +5,7 @@ import enum
 
 import kerrz_lib.bindings as bindings
 
-__all__ = ["Status", "FourVector", "KerrMetric", "TraceResult", "NullGeodesic"]
+__all__ = ["Status", "FourVector", "KerrMetric", "TraceResult", "NullGeodesic", "circular_orbit_velocity"]
 
 PROTECTED_ATTRIBUTE_NAMES = {"lambda": "lambda_"}
 
@@ -56,6 +56,10 @@ class FourVector:
         """Construct a new four-vector in the Boyer-Lindquist coordinates."""
         self._vec = bindings.krz_FourVector(t=t, r=r, th=theta, ph=phi)
 
+    def from_krz(vec: bindings.krz_FourVector) -> "FourVector":
+        """Construct a new four-vector in the Boyer-Lindquist coordinates."""
+        return FourVector(vec.t, vec.r, vec.th, vec.ph)
+
     def __repr__(self) -> str:
         return f"FourVector(t={self.t},r={self.r},theta={self.theta},phi={self.phi})"
 
@@ -115,6 +119,10 @@ class TraceResult(AttributeExtender):
     def __init__(self, result: bindings.krz_TraceResult):
         self._result = result
         super().__init__(self._result)
+        self.t = self.x_final.t
+        self.r = self.x_final.r
+        self.theta = self.x_final.th
+        self.phi = self.x_final.ph
 
     def __getattr__(self, name: str):
         if name == "status":
@@ -133,28 +141,53 @@ class NullGeodesic(AttributeExtender):
     def __init__(
         self,
         metric: KerrMetric,
-        x_init: FourVector = FourVector(r=1e4, theta=0.2),
-        alpha=1.0,
-        beta=2.0,
+        ic: bindings.krz_InitialConditions,
     ):
-        self.x_init = x_init
         self.metric = metric
-        self.alpha = alpha
-        self.beta = beta
+        self._initial_conditions = ic
 
         # Private attributes
         self._path_builder = None
-        self._initial_conditions = bindings.krz_InitialConditions()
-        bindings.krz_fromImpactParameters(
-            ctypes.byref(self._initial_conditions),
-            self.metric._metric,
-            self.x_init._vec,
-            self.alpha,
-            self.beta,
-        )
 
         super().__init__(self._initial_conditions)
 
+    @staticmethod
+    def from_impact_parameters(
+        metric: KerrMetric,
+        alpha: float,
+        beta: float,
+        x_init: FourVector = FourVector(r=1e4, theta=0.2),
+    ) -> "NullGeodesic":
+        ic = bindings.krz_fromImpactParameters(
+            metric._metric,
+            x_init._vec,
+            alpha,
+            beta,
+        )
+        return NullGeodesic(metric, ic)
+
+    @staticmethod
+    def from_local_angles(
+        metric: KerrMetric,
+        theta: float,
+        phi: float,
+        x: FourVector = FourVector(r=10.0, theta=0.2),
+        v: FourVector = None,
+    ) -> "NullGeodesic":
+        if v is None:
+            frame = bindings.krz_stationaryFrame(metric._metric, x._vec)
+        else:
+            frame = bindings.krz_frame(metric._metric, x._vec, v._vec)
+
+        ic = bindings.krz_fromSkyAngles(
+            metric._metric,
+            frame,
+            theta,
+            phi,
+        )
+
+        return NullGeodesic(metric, ic)
+
     def _get_pathbuilder(self):
         if self._path_builder is None:
             pb = bindings.krz_PathBuilder()
@@ -169,3 +202,18 @@ class NullGeodesic(AttributeExtender):
             ctypes.byref(self._get_pathbuilder()), mino_time
         )
         return TraceResult(result)
+
+    def trace_to_angle(self, angle: float) -> TraceResult:
+        result = bindings.krz_traceToAngle(
+            self.metric._metric, self._initial_conditions, angle,
+        )
+        return TraceResult(result)
+
+    def trace_to_radius(self, radius: float) -> TraceResult:
+        result = bindings.krz_traceToRadius(
+            self.metric._metric, self._initial_conditions, radius,
+        )
+        return TraceResult(result)
+
+def circular_orbit_velocity(metric: KerrMetric, radius: float) -> FourVector:
+    return FourVector.from_krz(bindings.krz_circularOrbitVelocity(metric._metric, radius))

{kerrz_python-0.2.3 → kerrz_python-0.2.5}/kerrz_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kerrz_python
-Version: 0.2.3
+Version: 0.2.5
 Summary: Python wrapper for kerrz. Avoid installing directly, use kerrz[py] unless you know what you are doing.
 Home-page: https://codeberg.org/astro-group/kerrz-py
 Author: Fergus Baker
@@ -13,7 +13,7 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Requires-Dist: kerrz_lib==0.2.3
+Requires-Dist: kerrz_lib==0.2.5
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

kerrz_python-0.2.5/kerrz_python.egg-info/requires.txt

@@ -0,0 +1 @@
+kerrz_lib==0.2.5

kerrz_python-0.2.3/kerrz_python/VERSION

@@ -1 +0,0 @@
-0.2.3

kerrz_python-0.2.3/kerrz_python.egg-info/requires.txt

@@ -1 +0,0 @@
-kerrz_lib==0.2.3