mosca-client 2.0.7__tar.gz → 2.0.10__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. {mosca_client-2.0.7 → mosca_client-2.0.10}/PKG-INFO +1 -1
  2. {mosca_client-2.0.7 → mosca_client-2.0.10}/pyproject.toml +1 -1
  3. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/devices/falconx.py +5 -4
  4. mosca_client-2.0.10/src/mosca_client/tango/devices/mercury.py +1 -0
  5. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/devices/xia.py +16 -0
  6. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/devices/xmap.py +0 -3
  7. {mosca_client-2.0.7 → mosca_client-2.0.10}/.gitignore +0 -0
  8. {mosca_client-2.0.7 → mosca_client-2.0.10}/README.rst +0 -0
  9. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/__init__.py +0 -0
  10. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/logging.py +0 -0
  11. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/__init__.py +0 -0
  12. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/devices/__init__.py +0 -0
  13. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/devices/dante.py +0 -0
  14. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/devices/danteplus.py +0 -0
  15. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/devices/dummy.py +0 -0
  16. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/devices/generator.py +0 -0
  17. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/devices/simdante.py +0 -0
  18. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/devices/simfalconx.py +0 -0
  19. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/devices/simulation.py +0 -0
  20. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/mca.py +0 -0
  21. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/mosca.py +0 -0
  22. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/readers.py +0 -0
  23. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/rois.py +0 -0
  24. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/saving.py +0 -0
  25. {mosca_client-2.0.7 → mosca_client-2.0.10}/src/mosca_client/tango/utils.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: mosca-client
3
- Version: 2.0.7
3
+ Version: 2.0.10
4
4
  Requires-Python: >=3.10
5
5
  Requires-Dist: numpy
6
6
  Requires-Dist: pytango
@@ -1,7 +1,7 @@
1
1
  [project]
2
2
  name = "mosca-client"
3
3
  requires-python = ">=3.10"
4
- version = "2.0.7"
4
+ version = "2.0.10"
5
5
 
6
6
  dependencies = [
7
7
  "pytango",
@@ -22,16 +22,17 @@ class FalconX(Xia):
22
22
  is None or nul!
23
23
  """
24
24
 
25
- params = super().filter_parameters(**kwargs)
25
+ params = super().filter_parameters(acq_realtime=acq_realtime,
26
+ block_size=block_size,
27
+ trigger_mode=trigger_mode,
28
+ mca_refresh=mca_refresh,
29
+ **kwargs)
26
30
 
27
31
  acq_realtime = params.get("acq_realtime", acq_realtime)
28
32
  block_size = params.get("block_size", block_size)
29
33
  trigger_mode = params.get("trigger_mode", trigger_mode)
30
34
  mca_refresh = params.get("mca_refresh", mca_refresh)
31
35
 
32
- if trigger_mode == "INT_TRIG_READOUT":
33
- params["acq_nb_points"] = 1
34
-
35
36
  if mca_refresh is None:
36
37
  mca_refresh = np.clip(acq_realtime or 0.1,
37
38
  0.01, 0.1)
@@ -0,0 +1 @@
1
+ from .xia import Xia as Mca
@@ -30,6 +30,22 @@ class Xia(McaBase):
30
30
  txt += f" * preset value: {self.proxy.preset_value}\n"
31
31
  return txt
32
32
 
33
+ def filter_parameters(self,
34
+ acq_realtime=None,
35
+ block_size=None,
36
+ trigger_mode=None,
37
+ mca_refresh=None,
38
+ acq_nb_points=None,
39
+ **kwargs):
40
+ params = super().filter_parameters(**kwargs)
41
+
42
+ trigger_mode = params.get("trigger_mode", trigger_mode)
43
+
44
+ if trigger_mode == "INT_TRIG_READOUT":# and acq_nb_points != 1:
45
+ params["acq_nb_points"] = 1
46
+
47
+ return params
48
+
33
49
  @property
34
50
  def configuration_file(self) -> str:
35
51
  return self.current_configuration()
@@ -20,9 +20,6 @@ class XMap(Xia):
20
20
  block_size = params.get("block_size", block_size)
21
21
  trigger_mode = params.get("trigger_mode", trigger_mode)
22
22
 
23
- if trigger_mode == "INT_TRIG_READOUT":
24
- params["acq_nb_points"] = 1
25
-
26
23
  if block_size is None and acq_realtime:
27
24
  if trigger_mode in ("GATE", "EXT_TRIG"):
28
25
  # aiming for a buffer swap every second
File without changes
File without changes