diff --git a/pyproject.toml b/pyproject.toml
index 745d0473337e454a3148a397a939af94af7d0949..f932ebf92f26087e890289471aec25a9bb8deabe 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,6 +13,7 @@ dependencies = [
"h5py>=3.12.1",
"jax>=0.4.35 ; sys_platform == 'win32'",
"jax[cuda12]>=0.4.35 ; sys_platform == 'linux'",
+ "kiwisolver>=1.4.7",
"matplotlib>=3.9.2",
"numpy>=2.1.3",
"ruff>=0.7.3",
diff --git a/scripts/06_generate_dataset.py b/scripts/06_generate_dataset.py
index edd7d0fe8869b371bdf5b0df43845d9202653612..2a148db36efc001e52cb261267617a6165dd5a3f 100644
--- a/scripts/06_generate_dataset.py
+++ b/scripts/06_generate_dataset.py
@@ -12,11 +12,11 @@ and needs 100gb of space.
def main():
# Dataset save folder
- save_folder = Path(r"\\192.168.43.8\data\Wittl\06_datasets\XrayTransform")
+ save_folder = Path(r"C:\data\xray_transform")
number_of_maps = 4
map_bounding_box = 25
# Dataset of multiple random stl files from: https://ten-thousand-models.appspot.com/
- load_folder = Path(r"C:\Users\swittl\Downloads\Thingi10K\Thingi10K\raw_meshes")
+ load_folder = Path(r"C:\data\meshes")
number_of_samples = len(list(save_folder.glob("*.h5"))) + 1
diff --git a/src/cyxtrax/simulation/artist_bridge.py b/src/cyxtrax/simulation/artist_bridge.py
index 93d32f2fc703c50a38eaa4e251554effb13c3856..2a472cff07340b599498569643aaba862269c335 100644
--- a/src/cyxtrax/simulation/artist_bridge.py
+++ b/src/cyxtrax/simulation/artist_bridge.py
@@ -34,6 +34,19 @@ from cyxtrax.common.mesh_object import MeshObject
GLOBAL_COUNTER = 0
+def set_cylindrical_mode(api: API):
+ with importlib.resources.path("cyxtrax.data", "cylinder.aRTist") as file_path:
+ print(f"Load: {file_path}")
+ api.load_project(file_path)
+
+
+def set_cone_mode(api: API):
+ with importlib.resources.path("cyxtrax.data", "cone.aRTist") as file_path:
+ print(f"Load: {file_path}")
+ api.load_project(file_path)
+
+
+
class CylindricalProjection:
def __init__(self, api: API = API()) -> None:
self.api = api
@@ -114,24 +127,20 @@ class CylindricalProjection:
return image
def set_cylindrical_mode(self):
- with importlib.resources.path("cyxtrax.data", "cylinder.aRTist") as file_path:
- print(f"Load: {file_path}")
- self.api.load_project(file_path)
- self.x_px = 2000.0
- self.y_px = 2000.0
- self.x_resolution_mm = np.pi
- self.y_resolution_mm = np.pi
- self.detector_radius_mm = 1000.0
+ set_cylindrical_mode(self.api)
+ self.x_px = 2000.0
+ self.y_px = 2000.0
+ self.x_resolution_mm = np.pi
+ self.y_resolution_mm = np.pi
+ self.detector_radius_mm = 1000.0
self._cylindrical = True
print(
"Care! The default pixel pitch etc is set. If changes are made change the state of this class ..."
)
def set_cone_mode(self):
- with importlib.resources.path("cyxtrax.data", "cone.aRTist") as file_path:
- print(f"Load: {file_path}")
- self.api.load_project(file_path)
- self.pixel_pitch_mm = 0.139
+ set_cone_mode(self.api)
+ self.pixel_pitch_mm = 0.139
self._cylindrical = False
print(
"Care! The default pixel pitch etc is set. If changes are made change the state of this class ..."
diff --git a/uv.lock b/uv.lock
index 2b921bf9b5ceeaf450fffc5aa73b9fd2e46a314f..868018ea270e55ce6f2aec8ef7af3edb04928a11 100644
--- a/uv.lock
+++ b/uv.lock
@@ -126,8 +126,9 @@ dependencies = [
{ name = "artistlib", marker = "sys_platform == 'win32'" },
{ name = "dm-pix" },
{ name = "h5py" },
- { name = "jax", marker = "sys_platform == 'linux' or sys_platform == 'windows'" },
+ { name = "jax", marker = "sys_platform == 'linux' or sys_platform == 'win32'" },
{ name = "jax", extra = ["cuda12"], marker = "sys_platform == 'linux'" },
+ { name = "kiwisolver" },
{ name = "matplotlib" },
{ name = "numpy" },
{ name = "ruff" },
@@ -140,8 +141,9 @@ requires-dist = [
{ name = "artistlib", marker = "sys_platform == 'win32'", git = "https://github.com/wittlsn/aRTist-PythonLib" },
{ name = "dm-pix", specifier = ">=0.4.3" },
{ name = "h5py", specifier = ">=3.12.1" },
- { name = "jax", marker = "sys_platform == 'windows'", specifier = ">=0.4.35" },
+ { name = "jax", marker = "sys_platform == 'win32'", specifier = ">=0.4.35" },
{ name = "jax", extras = ["cuda12"], marker = "sys_platform == 'linux'", specifier = ">=0.4.35" },
+ { name = "kiwisolver", specifier = ">=1.4.7" },
{ name = "matplotlib", specifier = ">=3.9.2" },
{ name = "numpy", specifier = ">=2.1.3" },
{ name = "ruff", specifier = ">=0.7.3" },
@@ -555,7 +557,9 @@ name = "nvidia-cuda-cupti-cu12"
version = "12.6.80"
source = { registry = "https://pypi.org/simple" }
wheels = [
+ { url = "https://files.pythonhosted.org/packages/e6/8b/2f6230cb715646c3a9425636e513227ce5c93c4d65823a734f4bb86d43c3/nvidia_cuda_cupti_cu12-12.6.80-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:166ee35a3ff1587f2490364f90eeeb8da06cd867bd5b701bf7f9a02b78bc63fc", size = 8236764 },
{ url = "https://files.pythonhosted.org/packages/25/0f/acb326ac8fd26e13c799e0b4f3b2751543e1834f04d62e729485872198d4/nvidia_cuda_cupti_cu12-12.6.80-py3-none-manylinux2014_aarch64.whl", hash = "sha256:358b4a1d35370353d52e12f0a7d1769fc01ff74a191689d3870b2123156184c4", size = 8236756 },
+ { url = "https://files.pythonhosted.org/packages/49/60/7b6497946d74bcf1de852a21824d63baad12cd417db4195fc1bfe59db953/nvidia_cuda_cupti_cu12-12.6.80-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:6768bad6cab4f19e8292125e5f1ac8aa7d1718704012a0e3272a6f61c4bce132", size = 8917980 },
{ url = "https://files.pythonhosted.org/packages/a5/24/120ee57b218d9952c379d1e026c4479c9ece9997a4fb46303611ee48f038/nvidia_cuda_cupti_cu12-12.6.80-py3-none-manylinux2014_x86_64.whl", hash = "sha256:a3eff6cdfcc6a4c35db968a06fcadb061cbc7d6dde548609a941ff8701b98b73", size = 8917972 },
]
@@ -573,7 +577,9 @@ name = "nvidia-cuda-runtime-cu12"
version = "12.6.77"
source = { registry = "https://pypi.org/simple" }
wheels = [
+ { url = "https://files.pythonhosted.org/packages/8f/ea/590b2ac00d772a8abd1c387a92b46486d2679ca6622fd25c18ff76265663/nvidia_cuda_runtime_cu12-12.6.77-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6116fad3e049e04791c0256a9778c16237837c08b27ed8c8401e2e45de8d60cd", size = 908052 },
{ url = "https://files.pythonhosted.org/packages/b7/3d/159023799677126e20c8fd580cca09eeb28d5c5a624adc7f793b9aa8bbfa/nvidia_cuda_runtime_cu12-12.6.77-py3-none-manylinux2014_aarch64.whl", hash = "sha256:d461264ecb429c84c8879a7153499ddc7b19b5f8d84c204307491989a365588e", size = 908040 },
+ { url = "https://files.pythonhosted.org/packages/e1/23/e717c5ac26d26cf39a27fbc076240fad2e3b817e5889d671b67f4f9f49c5/nvidia_cuda_runtime_cu12-12.6.77-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ba3b56a4f896141e25e19ab287cd71e52a6a0f4b29d0d31609f60e3b4d5219b7", size = 897690 },
{ url = "https://files.pythonhosted.org/packages/f0/62/65c05e161eeddbafeca24dc461f47de550d9fa8a7e04eb213e32b55cfd99/nvidia_cuda_runtime_cu12-12.6.77-py3-none-manylinux2014_x86_64.whl", hash = "sha256:a84d15d5e1da416dd4774cb42edf5e954a3e60cc945698dc1d5be02321c44dc8", size = 897678 },
]
@@ -597,7 +603,9 @@ dependencies = [
{ name = "nvidia-nvjitlink-cu12", marker = "sys_platform == 'linux'" },
]
wheels = [
+ { url = "https://files.pythonhosted.org/packages/1f/37/c50d2b2f2c07e146776389e3080f4faf70bcc4fa6e19d65bb54ca174ebc3/nvidia_cufft_cu12-11.3.0.4-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d16079550df460376455cba121db6564089176d9bac9e4f360493ca4741b22a6", size = 200164144 },
{ url = "https://files.pythonhosted.org/packages/ce/f5/188566814b7339e893f8d210d3a5332352b1409815908dad6a363dcceac1/nvidia_cufft_cu12-11.3.0.4-py3-none-manylinux2014_aarch64.whl", hash = "sha256:8510990de9f96c803a051822618d42bf6cb8f069ff3f48d93a8486efdacb48fb", size = 200164135 },
+ { url = "https://files.pythonhosted.org/packages/8f/16/73727675941ab8e6ffd86ca3a4b7b47065edcca7a997920b831f8147c99d/nvidia_cufft_cu12-11.3.0.4-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ccba62eb9cef5559abd5e0d54ceed2d9934030f51163df018532142a8ec533e5", size = 200221632 },
{ url = "https://files.pythonhosted.org/packages/60/de/99ec247a07ea40c969d904fc14f3a356b3e2a704121675b75c366b694ee1/nvidia_cufft_cu12-11.3.0.4-py3-none-manylinux2014_x86_64.whl", hash = "sha256:768160ac89f6f7b459bee747e8d175dbf53619cfe74b2a5636264163138013ca", size = 200221622 },
]
@@ -612,7 +620,9 @@ dependencies = [
]
wheels = [
{ url = "https://files.pythonhosted.org/packages/93/17/dbe1aa865e4fdc7b6d4d0dd308fdd5aaab60f939abfc0ea1954eac4fb113/nvidia_cusolver_cu12-11.7.1.2-py3-none-manylinux2014_aarch64.whl", hash = "sha256:0ce237ef60acde1efc457335a2ddadfd7610b892d94efee7b776c64bb1cac9e0", size = 157833628 },
+ { url = "https://files.pythonhosted.org/packages/f0/6e/c2cf12c9ff8b872e92b4a5740701e51ff17689c4d726fca91875b07f655d/nvidia_cusolver_cu12-11.7.1.2-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e9e49843a7707e42022babb9bcfa33c29857a93b88020c4e4434656a655b698c", size = 158229790 },
{ url = "https://files.pythonhosted.org/packages/9f/81/baba53585da791d043c10084cf9553e074548408e04ae884cfe9193bd484/nvidia_cusolver_cu12-11.7.1.2-py3-none-manylinux2014_x86_64.whl", hash = "sha256:6cf28f17f64107a0c4d7802be5ff5537b2130bfc112f25d5a30df227058ca0e6", size = 158229780 },
+ { url = "https://files.pythonhosted.org/packages/7c/5f/07d0ba3b7f19be5a5ec32a8679fc9384cfd9fc6c869825e93be9f28d6690/nvidia_cusolver_cu12-11.7.1.2-py3-none-manylinux_2_27_aarch64.whl", hash = "sha256:dbbe4fc38ec1289c7e5230e16248365e375c3673c9c8bac5796e2e20db07f56e", size = 157833630 },
]
[[package]]
@@ -623,7 +633,9 @@ dependencies = [
{ name = "nvidia-nvjitlink-cu12", marker = "sys_platform == 'linux'" },
]
wheels = [
+ { url = "https://files.pythonhosted.org/packages/eb/eb/6681efd0aa7df96b4f8067b3ce7246833dd36830bb4cec8896182773db7d/nvidia_cusparse_cu12-12.5.4.2-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d25b62fb18751758fe3c93a4a08eff08effedfe4edf1c6bb5afd0890fe88f887", size = 216451147 },
{ url = "https://files.pythonhosted.org/packages/d3/56/3af21e43014eb40134dea004e8d0f1ef19d9596a39e4d497d5a7de01669f/nvidia_cusparse_cu12-12.5.4.2-py3-none-manylinux2014_aarch64.whl", hash = "sha256:7aa32fa5470cf754f72d1116c7cbc300b4e638d3ae5304cfa4a638a5b87161b1", size = 216451135 },
+ { url = "https://files.pythonhosted.org/packages/06/1e/b8b7c2f4099a37b96af5c9bb158632ea9e5d9d27d7391d7eb8fc45236674/nvidia_cusparse_cu12-12.5.4.2-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7556d9eca156e18184b94947ade0fba5bb47d69cec46bf8660fd2c71a4b48b73", size = 216561367 },
{ url = "https://files.pythonhosted.org/packages/43/ac/64c4316ba163e8217a99680c7605f779accffc6a4bcd0c778c12948d3707/nvidia_cusparse_cu12-12.5.4.2-py3-none-manylinux2014_x86_64.whl", hash = "sha256:23749a6571191a215cb74d1cdbff4a86e7b19f1200c071b3fcf844a5bea23a2f", size = 216561357 },
]