pim/pg-rad
1
0
Fork 0
mirror of https://github.com/pim-n/pg-rad synced 2026-03-11 19:58:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update sources and objects to new position system

Browse Source
This commit is contained in:
Pim Nelissen
2026-02-10 11:24:40 +01:00
parent a1acf95004
commit 9c1b97d912
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/pg_rad/objects/objects.py
View File

@ -1,36 +1,42 @@
import math
from typing import Self
import numpy as np
class BaseObject:
def __init__(
self,
x: float,
y: float,
z: float,
pos: tuple[float, float, float],
name: str = "Unnamed object",
color: str = 'grey'):
"""
A generic object.
Args:
x (float): X coordinate.
y (float): Y coordinate.
z (float): Z coordinate.
pos (tuple[float, float, float]): Position vector (x,y,z).
name (str, optional): Name for the object.
Defaults to "Unnamed object".
color (str, optional): Matplotlib compatible color string.
Defaults to "red".
"""
self.x = x
self.y = y
self.z = z
if len(pos) != 3:
raise ValueError("Position must be tuple of length 3 (x,y,z).")
self.pos = pos
self.name = name
self.color = color
def distance_to(self, other: Self) -> float:
return math.dist(
(self.x, self.y, self.z),
(other.x, other.y, other.z),
)
def distance_to(self, other: Self | tuple) -> float:
if isinstance(other, tuple) and len(other) == 3:
r = np.linalg.norm(
np.subtract(self.pos, other)
)
else:
try:
r = np.linalg.norm(
np.subtract(self.pos, other.pos)
)
except AttributeError as e:
raise e("other must be an object in the world \
or a position tuple (x,y,z).")
return r

11
src/pg_rad/objects/sources.py
View File

@ -11,9 +11,7 @@ class PointSource(BaseObject):
def __init__(
self,
x: float,
y: float,
z: float,
pos: tuple,
activity: int,
isotope: Isotope,
name: str | None = None,
@ -21,9 +19,7 @@ class PointSource(BaseObject):
"""A point source.
Args:
x (float): X coordinate.
y (float): Y coordinate.
z (float): Z coordinate.
pos (tuple): a position vector of length 3 (x,y,z).
activity (int): Activity A in MBq.
isotope (Isotope): The isotope.
name (str | None, optional): Can give the source a unique name.
@ -40,11 +36,10 @@ class PointSource(BaseObject):
if name is None:
name = f"Source {self.id}"
super().__init__(x, y, z, name, color)
super().__init__(pos, name, color)
self.activity = activity
self.isotope = isotope
self.color = color
logger.debug(f"Source created: {self.name}")