update

Author: MartinPdeS

FlowCyPy/distribution/lognormal.py

@@ -254,13 +254,11 @@ def generate(self, n_samples: int) -> AnyUnit:
         uniform_samples = np.clip(uniform_samples, 1e-12, 1.0 - 1e-12)
 
         if self.cutoff is None:
-            samples = np.random.lognormal(mean=mu, sigma=sigma, size=int(n_samples))
-            return samples * self._units
+            return np.random.lognormal(mean=mu, sigma=sigma, size=int(n_samples))
 
         cutoff_value = self.cutoff.to(self._units).magnitude
         if cutoff_value <= 0.0:
-            samples = np.random.lognormal(mean=mu, sigma=sigma, size=int(n_samples))
-            return samples * self._units
+            return np.random.lognormal(mean=mu, sigma=sigma, size=int(n_samples))
 
         cdf_at_cutoff = lognorm.cdf(cutoff_value, s=sigma, scale=np.exp(mu))
         cdf_at_cutoff = float(np.clip(cdf_at_cutoff, 0.0, 1.0 - 1e-15))

FlowCyPy/distribution/normal.py

@@ -225,7 +225,7 @@ def generate(self, n_samples: int) -> AnyUnit:
 
         if self.cutoff is None:
             samples = np.random.normal(loc=mu, scale=sigma, size=int(n_samples))
-            return samples * self._units
+            return samples
 
         cutoff_value = self.cutoff.to(self._units).magnitude
 

tests/python_api/distribution.py

@@ -3,7 +3,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 import pytest
-from TypedUnit import ureg
+from TypedUnit import ureg, Length
 
 import FlowCyPy
 from FlowCyPy import distribution as dist
@@ -42,6 +42,10 @@ def test_number_of_samples(mock_show, distribution):
     # Generate particle sizes
     sizes = distribution.generate(N_SAMPLES)
 
+    assert np.all(
+        Length.check(sizes)
+    ), f"{distribution.__class__.__name__}: Generated sizes have incorrect units."
+
     # Assert the shape is correct
     assert sizes.shape == (
         N_SAMPLES,

tests/python_api/workflow.py

@@ -5,7 +5,6 @@
 import pytest
 from TypedUnit import ureg
 
-import FlowCyPy
 from FlowCyPy import FlowCytometer
 from FlowCyPy.fluidics import (
     FlowCell,
@@ -28,8 +27,6 @@
     triggering_system,
 )
 
-FlowCyPy.debug_mode = True  # Enable debug mode for detailed logging
-
 
 # ----------------- FIXTURES -----------------
 
@@ -275,4 +272,4 @@ def test_peak_plot(mock_show, flow_cytometer, digitizer):
 
 
 if __name__ == "__main__":
-    pytest.main(["-W error", "-s", __file__])
+    pytest.main(["-W error", __file__])