minor fixes

CambridgeCIA · Mar 16, 2024 · 8ef63f7 · 8ef63f7
1 parent b195412
commit 8ef63f7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/LION/experiments/ct_experiments.py b/LION/experiments/ct_experiments.py
@@ -33,19 +33,23 @@ def __init__(self, experiment_params=None, dataset="LIDC-IDRI", datafolder=None)
             self.param.data_loader_params.folder = datafolder
         self.geo = self.experiment_params.geo
         self.dataset = dataset
-        self.sino_fun = lambda sino, I0=self.param.noise_params.I0, sigma=self.param.noise_params.sigma, cross_talk=self.param.noise_params.cross_talk: ct.sinogram_add_noise(
-            sino, I0=I0, sigma=sigma, cross_talk=cross_talk
-        )
+        if hasattr(self.param, "noise_params"):
+            self.sino_fun = lambda sino, I0=self.param.noise_params.I0, sigma=self.param.noise_params.sigma, cross_talk=self.param.noise_params.cross_talk: ct.sinogram_add_noise(
+                sino, I0=I0, sigma=sigma, cross_talk=cross_talk
+            )
 
     @staticmethod
     @abstractmethod  # crash if not defined in derived class
     def default_parameters():
         pass
 
     def get_training_dataset(self):
+
         if self.dataset == "LIDC-IDRI":
             dataloader = LIDC_IDRI(
-                mode="training", parameters=self.param.data_loader_params
+                mode="training",
+                parameters=self.param.data_loader_params,
+                geometry_parameters=self.geo,
             )
         else:
             raise NotImplementedError(f"Dataset {self.dataset} not implemented")
@@ -55,7 +59,9 @@ def get_training_dataset(self):
     def get_validation_dataset(self):
         if self.dataset == "LIDC-IDRI":
             dataloader = LIDC_IDRI(
-                mode="validation", parameters=self.param.data_loader_params
+                mode="validation",
+                parameters=self.param.data_loader_params,
+                geometry_parameters=self.geo,
             )
         else:
             raise NotImplementedError(f"Dataset {self.dataset} not implemented")
@@ -65,7 +71,9 @@ def get_validation_dataset(self):
     def get_testing_dataset(self):
         if self.dataset == "LIDC-IDRI":
             dataloader = LIDC_IDRI(
-                mode="testing", parameters=self.param.data_loader_params
+                mode="testing",
+                parameters=self.param.data_loader_params,
+                geometry_parameters=self.geo,
             )
         else:
             raise NotImplementedError(f"Dataset {self.dataset} not implemented")

diff --git a/LION/models/iterative_unrolled/LPD.py b/LION/models/iterative_unrolled/LPD.py
@@ -1,5 +1,5 @@
 # This file is part of LION library
-# License : BSD-3
+# License : GPL-3
 #
 # Author  : Ander Biguri
 # Modifications: -

diff --git a/LION/utils/paths.py b/LION/utils/paths.py
@@ -4,17 +4,13 @@
 # If you don't have access to the paths and you are part of the research group, ask Ander Biguri about it.
 # Otherwise, feel free to change those to your paths.
 
-TOMOTOOLS_DATASET_PATH = pathlib.Path(
-    "/store/DAMTP/ab2860/AItomotools/data/AItomotools/"
-)
-LUNA_DATASET_PATH = TOMOTOOLS_DATASET_PATH.joinpath("raw/LUNA16")
-WALNUT_DATASET_PATH = TOMOTOOLS_DATASET_PATH.joinpath("raw/walnuts")
-LIDC_IDRI_PATH = TOMOTOOLS_DATASET_PATH.joinpath("raw/LIDC-IDRI")
-DETECT_PATH = TOMOTOOLS_DATASET_PATH.joinpath("raw/2detect")
+LION_DATA_PATH = pathlib.Path("/store/LION/datasets/")
+LUNA_DATASET_PATH = LION_DATA_PATH.joinpath("raw/LUNA16")
+WALNUT_DATASET_PATH = LION_DATA_PATH.joinpath("raw/walnuts")
+LIDC_IDRI_PATH = LION_DATA_PATH.joinpath("raw/LIDC-IDRI")
+DETECT_PATH = LION_DATA_PATH.joinpath("raw/2detect")
 
 ## Data ready for training use
-LUNA_PROCESSED_DATASET_PATH = TOMOTOOLS_DATASET_PATH.joinpath("processed/LUNA16")
-LIDC_IDRI_PROCESSED_DATASET_PATH = TOMOTOOLS_DATASET_PATH.joinpath(
-    "processed/LIDC-IDRI"
-)
-DETECT_PROCESSED_DATASET_PATH = TOMOTOOLS_DATASET_PATH.joinpath("processed/2detect")
+LUNA_PROCESSED_DATASET_PATH = LION_DATA_PATH.joinpath("processed/LUNA16")
+LIDC_IDRI_PROCESSED_DATASET_PATH = LION_DATA_PATH.joinpath("processed/LIDC-IDRI")
+DETECT_PROCESSED_DATASET_PATH = LION_DATA_PATH.joinpath("processed/2detect")