Change target calculation

TomographicImaging · Oct 10, 2024 · db715e6 · db715e6
1 parent ce2fe22
commit db715e6
Showing 1 changed file with 23 additions and 9 deletions.
diff --git a/Wrappers/Python/cil/processors/FluxNormaliser.py b/Wrappers/Python/cil/processors/FluxNormaliser.py
@@ -95,7 +95,8 @@ def __init__(self, flux=None, roi=None, target=None):
                     'roi' : roi,
                     'roi_slice' : None,
                     'roi_axes' : None,
-                    'target' : target
+                    'target' : target,
+                    'target_value' : None,
                     }
             super(FluxNormaliser, self).__init__(**kwargs)
 
@@ -174,7 +175,7 @@ def _calculate_flux(self):
         flux_size = (numpy.shape(self.flux))
         if len(flux_size) > 0:
             # check this
-            data_size = numpy.shape(dataset.geometry.angles)*numpy.shape(dataset.geometry.channels)
+            data_size = numpy.shape(dataset.geometry.angles) # make this also account for channels
             if data_size != flux_size:
                 raise ValueError("Flux must be a scalar or array with length \
                                     \n = number of projections, found {} and {}"
@@ -189,14 +190,26 @@ def _calculate_flux(self):
 
         self.flux = numpy.float32(self.flux)
 
-        if self.norm_value is None:
-            self.norm_value = numpy.mean(self.flux)
+    def _calculate_target(self):
+        if isinstance(self.target, float):
+            self.target_value = self.target
+        elif isinstance(self.target, str):
+            if self.target == 'first':
+                if len(numpy.shape(self.flux)) > 0 :
+                    self.target_value = self.flux[0]
+                else:
+                    self.target_value = self.flux
+            elif self.target == 'mean':
+                self.target_value = numpy.mean(self.flux)
+            else:
+                raise ValueError("Target string not recognised, found {}, expected 'first' or 'mean'"
+                                 .format(self.target))
+        else:
+            raise TypeError("Target must be string or float, found {}"
+                            .format(type(self.target)))
 
-    # def _calculate_target():
-        # if isinstance(self.target, float):
 
 
-
     def preview_configuration(self, angle=None, channel=None, log=False):
         '''
         Preview the FluxNormalisation processor configuration for roi mode.
@@ -335,6 +348,7 @@ def _plot_slice_roi(self, angle_index=None, channel_index=None, log=False, ax=11
 
     def process(self, out=None):
         self._calculate_flux()
+        self._calculate_target()
         data = self.get_input()
 
         if out is None:
@@ -352,8 +366,8 @@ def process(self, out=None):
                 if len(flux_size) > 0:
                     f = self.flux[i]
                 slice_proj[proj_axis] = i
-                out.array[tuple(slice_proj)] = data.array[tuple(slice_proj)]*self.norm_value/f
+                out.array[tuple(slice_proj)] = data.array[tuple(slice_proj)]*self.target_value/f
         else:
-            out.array = data.array*self.norm_value/f 
+            out.array = data.array*self.target_value/f 
 
         return out