Fix tests after removing tolerance

TomographicImaging · Sep 23, 2024 · e8423bb · e8423bb
1 parent 3126cc1
commit e8423bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Wrappers/Python/cil/processors/FluxNormaliser.py b/Wrappers/Python/cil/processors/FluxNormaliser.py
@@ -156,13 +156,13 @@ def check_input(self, dataset):
 
                     self.flux = numpy.mean(dataset.array[tuple(slc)], axis=tuple(axes))
 
-                    dataset_range = dataset.max(axis=tuple(axes)) - dataset.min(axis=tuple(axes)) 
+                    dataset_range = numpy.max(dataset.array, axis=tuple(axes)) - numpy.min(dataset.array, axis=tuple(axes)) 
 
                     if (numpy.mean(self.flux) > dataset.mean()):
-                        if numpy.mean(self.flux/dataset_range.array) < 0.9:
+                        if numpy.mean(self.flux/dataset_range) < 0.9:
                             log.warning('Warning: mean value in selected roi is more than 10 percent of data range - may not represent the background')
                     else:
-                        if numpy.mean(self.flux/dataset_range.array) > 0.1:
+                        if numpy.mean(self.flux/dataset_range) > 0.1:
                             log.warning('Warning: mean value in selected roi is more than 10 percent of data range - may not represent the background')
 
                     self.roi_slice = slc

diff --git a/Wrappers/Python/test/test_DataProcessor.py b/Wrappers/Python/test/test_DataProcessor.py
@@ -3110,15 +3110,15 @@ def error_message(self,processor, test_parameter):
     def test_init(self):
         # test default values are initialised
         processor = FluxNormaliser()
-        test_parameter = ['flux','roi','norm_value', 'tolerance']
-        test_value = [None, None, None, 1e-5]
+        test_parameter = ['flux','roi','norm_value']
+        test_value = [None, None, None]
 
         for i in numpy.arange(len(test_value)):
             self.assertEqual(getattr(processor, test_parameter[i]), test_value[i], msg=self.error_message(processor, test_parameter[i]))
 
         # test non-default values are initialised
-        processor = FluxNormaliser(1,2,3,4)
-        test_value = [1, 2, 3, 4]
+        processor = FluxNormaliser(1,2,3)
+        test_value = [1, 2, 3]
         for i in numpy.arange(len(test_value)):
             self.assertEqual(getattr(processor, test_parameter[i]), test_value[i], msg=self.error_message(processor, test_parameter[i]))
 
@@ -3207,13 +3207,13 @@ def test_FluxNormaliser(self):
         numpy.testing.assert_allclose(data_norm.array, 0.5*self.data_cone.array)
 
         #Test flux array with no norm_value
-        processor = FluxNormaliser(flux=numpy.arange(1,2,(2-1)/(data.get_dimension_size('angle'))))
+        processor = FluxNormaliser(flux=numpy.arange(1,2,(2-1)/(self.data_cone.get_dimension_size('angle'))))
         processor.set_input(self.data_cone)
         data_norm = processor.get_output()
         numpy.testing.assert_allclose(data_norm.array, self.data_cone.array)
 
         #Test flux array with norm_value
-        processor = FluxNormaliser(flux=numpy.arange(1,2,(2-1)/(data.get_dimension_size('angle'))), norm_value=5)
+        processor = FluxNormaliser(flux=numpy.arange(1,2,(2-1)/(self.data_cone.get_dimension_size('angle'))), norm_value=5)
         processor.set_input(self.data_cone)
         data_norm = processor.get_output()
         numpy.testing.assert_allclose(data_norm.array, 0.5*self.data_cone.array)