removed double

Author: RemDelaporteMathurin

libra_toolbox/neutron_detection/activation_foils/compass.py

@@ -178,12 +178,13 @@ def __init__(self, channel_nb) -> None:
         self.real_count_time = None
 
     def get_energy_hist(
-        self, bins: Union[int, str, NDArray[np.float64]]
+        self, bins: Union[int, NDArray[np.float64], None] = None
     ) -> Tuple[np.ndarray, np.ndarray]:
         """
         Get the energy histogram of the detector events.
         Args:
-            bins: number of bins or "double" to use half the max energy as bin size
+            bins: number of bins, can be a numpy array, if None, it will be set to the
+                maximum energy value in the events (one bin per energy value)
         Returns:
             Tuple of histogram values and bin edges
         """
@@ -198,12 +199,10 @@ def get_energy_hist(
 
         energy_values = np.nan_to_num(energy_values, nan=0)
 
-        if isinstance(bins, (np.ndarray, int)):
-            real_bins = bins
-        elif bins == "double":
-            real_bins = int(np.nanmax(energy_values) / 2)
+        if bins is None:
+            bins = int(np.nanmax(energy_values))
 
-        return np.histogram(energy_values, bins=real_bins)
+        return np.histogram(energy_values, bins=bins)
 
 
 class Measurement:

test/neutron_detection/test_compass.py

@@ -300,7 +300,7 @@ def test_measurement_object_from_directory(no_root):
 
     assert measurement.detectors[0].events.shape[1] == 2
 
-    measurement.detectors[0].get_energy_hist(bins="double")
+    measurement.detectors[0].get_energy_hist(bins=None)
 
 
 @pytest.mark.parametrize(
@@ -310,7 +310,7 @@ def test_measurement_object_from_directory(no_root):
         20,
         50,
         100,
-        "double",
+        None,
         np.arange(0, 10, 1),
         np.linspace(0, 10, num=100),
     ],