mosca 2.0.2__tar.gz → 2.0.5__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 (224) hide show
  1. {mosca-2.0.2 → mosca-2.0.5}/.gitlab-ci.yml +12 -3
  2. {mosca-2.0.2 → mosca-2.0.5}/PKG-INFO +4 -1
  3. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/quickstart.md +1 -1
  4. {mosca-2.0.2 → mosca-2.0.5}/packages/bliss_mosca/pyproject.toml +1 -1
  5. {mosca-2.0.2 → mosca-2.0.5}/packages/bliss_mosca/src/bliss_mosca/base.py +171 -48
  6. {mosca-2.0.2 → mosca-2.0.5}/packages/bliss_mosca/src/bliss_mosca/calccounters.py +65 -5
  7. {mosca-2.0.2 → mosca-2.0.5}/packages/bliss_mosca/src/bliss_mosca/channel.py +28 -2
  8. {mosca-2.0.2 → mosca-2.0.5}/packages/bliss_mosca/src/bliss_mosca/counters.py +5 -0
  9. {mosca-2.0.2 → mosca-2.0.5}/packages/bliss_mosca/src/bliss_mosca/simulation/moscans.py +24 -20
  10. {mosca-2.0.2 → mosca-2.0.5}/packages/blissdata_mosca/pyproject.toml +1 -1
  11. {mosca-2.0.2 → mosca-2.0.5}/packages/blissdata_mosca/src/blissdata_mosca/stream.py +46 -75
  12. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/pyproject.toml +1 -1
  13. mosca-2.0.5/packages/mosca_client/src/mosca_client/logging.py +111 -0
  14. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/devices/dante.py +6 -1
  15. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/devices/falconx.py +0 -5
  16. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/devices/xia.py +4 -14
  17. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/mca.py +20 -6
  18. mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/mosca.py +367 -0
  19. mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/readers.py +564 -0
  20. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/rois.py +21 -21
  21. mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/saving.py +263 -0
  22. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/utils.py +18 -0
  23. {mosca-2.0.2 → mosca-2.0.5}/pyproject.toml +110 -120
  24. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/controller.py +1 -1
  25. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/datahandler.py +4 -3
  26. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/mosca.py +32 -31
  27. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/spectra.py +2 -0
  28. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/stats.py +2 -0
  29. mosca-2.0.5/src/mosca/control/tasks/rois.py +416 -0
  30. mosca-2.0.5/src/mosca/control/tasks/saving.py +617 -0
  31. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/tasks/task.py +3 -3
  32. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/tasks/taskmanager.py +6 -3
  33. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/simulation/generator.py +1 -1
  34. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/falconx.py +12 -1
  35. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/handel/__init__.py +0 -1
  36. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/handel/_cffi.py +1 -0
  37. mosca-2.0.5/src/mosca/devices/xia/handel/error.py +213 -0
  38. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/handel/handel_inc/handel_constants.h +127 -127
  39. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/handel/handel_inc/handel_errors.h +254 -254
  40. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/handel/handel_inc/handel_generic.h +66 -66
  41. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/handel/interface.py +27 -24
  42. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/xia.py +6 -8
  43. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/xiads.py +16 -22
  44. mosca-2.0.5/src/mosca/rpc/devices.py +27 -0
  45. mosca-2.0.5/src/mosca/rpc/main.py +52 -0
  46. mosca-2.0.5/src/mosca/rpc/mosca.py +241 -0
  47. mosca-2.0.5/src/mosca/rpc/server.py +66 -0
  48. mosca-2.0.5/src/mosca/rpc/tasks/background.py +33 -0
  49. mosca-2.0.5/src/mosca/rpc/tasks/saving.py +93 -0
  50. mosca-2.0.5/src/mosca/rpc/utils.py +27 -0
  51. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/tango/controller.py +46 -3
  52. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/tango/main.py +17 -1
  53. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/tango/mosca.py +85 -70
  54. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/tango/moscav1.py +4 -4
  55. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/tango/tasks/background.py +1 -1
  56. mosca-2.0.5/src/mosca/tango/tasks/saving.py +160 -0
  57. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/conftest.py +1 -1
  58. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/test_moscastream.py +1 -1
  59. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/test_simdante.py +1 -1
  60. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/test_simfalconx.py +19 -14
  61. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/v1/test_moscav1.py +10 -10
  62. {mosca-2.0.2 → mosca-2.0.5}/tests/conftest.py +28 -1
  63. {mosca-2.0.2 → mosca-2.0.5}/tests/mosca/control/tasks/test_rois.py +69 -62
  64. {mosca-2.0.2 → mosca-2.0.5}/tests/mosca/control/test_datahandler.py +2 -2
  65. mosca-2.0.5/tests/mosca/rpc/__init__.py +0 -0
  66. mosca-2.0.5/tests/mosca/rpc/conftest.py +73 -0
  67. mosca-2.0.5/tests/mosca/rpc/test_rpc_server.py +81 -0
  68. mosca-2.0.5/tests/mosca/tango/__init__.py +0 -0
  69. mosca-2.0.5/tests/mosca/tango/devices/__init__.py +0 -0
  70. {mosca-2.0.2 → mosca-2.0.5}/tests/mosca/tango/devices/test_simdante.py +6 -6
  71. {mosca-2.0.2 → mosca-2.0.5}/tests/mosca/tango/devices/test_simfalconx.py +18 -17
  72. {mosca-2.0.2 → mosca-2.0.5}/tests/mosca/tango/test_mosca.py +2 -2
  73. {mosca-2.0.2 → mosca-2.0.5}/tests/mosca/tango/test_rois.py +20 -20
  74. mosca-2.0.2/MANIFEST.in +0 -8
  75. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/mosca.py +0 -639
  76. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/saving.py +0 -135
  77. mosca-2.0.2/setup.py +0 -4
  78. mosca-2.0.2/src/mosca/control/tasks/rois.py +0 -466
  79. mosca-2.0.2/src/mosca/control/tasks/saving.py +0 -391
  80. mosca-2.0.2/src/mosca/devices/xia/handel/error.py +0 -272
  81. mosca-2.0.2/src/mosca/devices/xia/handel/parser.py +0 -62
  82. {mosca-2.0.2 → mosca-2.0.5}/.gitignore +0 -0
  83. {mosca-2.0.2 → mosca-2.0.5}/LICENSE +0 -0
  84. {mosca-2.0.2 → mosca-2.0.5}/README.rst +0 -0
  85. {mosca-2.0.2 → mosca-2.0.5}/conda/meta.yaml +0 -0
  86. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/bliss.md +0 -0
  87. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/controllers.md +0 -0
  88. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/devel/buffer.md +0 -0
  89. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/devel/controller.md +0 -0
  90. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/devel/mosca.md +0 -0
  91. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/devel/overview.md +0 -0
  92. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/devel/tasks/background.md +0 -0
  93. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/hamamatsu.md +0 -0
  94. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/img/mosca.avif +0 -0
  95. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/img/mosca.ico +0 -0
  96. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/img/mosca1.png +0 -0
  97. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/img/mosca2.png +0 -0
  98. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/img/oo_hw_edge_trig.png +0 -0
  99. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/index.md +0 -0
  100. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/install.md +0 -0
  101. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/mosca.md +0 -0
  102. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/oceanoptics.md +0 -0
  103. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/simulators.md +0 -0
  104. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/tasks/background.md +0 -0
  105. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/tasks/overview.md +0 -0
  106. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/tasks/rois.md +0 -0
  107. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/tasks/spectrasum.md +0 -0
  108. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/xglab.md +0 -0
  109. {mosca-2.0.2 → mosca-2.0.5}/doc/docs/xia.md +0 -0
  110. {mosca-2.0.2 → mosca-2.0.5}/doc/mkdocs.yml +0 -0
  111. {mosca-2.0.2 → mosca-2.0.5}/doc/src/wavedrom/oo_hw_edge_trig.txt +0 -0
  112. {mosca-2.0.2 → mosca-2.0.5}/doc/theme/bliss_logo_small.svg +0 -0
  113. {mosca-2.0.2 → mosca-2.0.5}/packages/bliss_mosca/README.rst +0 -0
  114. {mosca-2.0.2 → mosca-2.0.5}/packages/bliss_mosca/src/bliss_mosca/__init__.py +0 -0
  115. {mosca-2.0.2 → mosca-2.0.5}/packages/bliss_mosca/src/bliss_mosca/compat.py +0 -0
  116. {mosca-2.0.2 → mosca-2.0.5}/packages/bliss_mosca/src/bliss_mosca/simulation/__init__.py +0 -0
  117. {mosca-2.0.2 → mosca-2.0.5}/packages/bliss_mosca/src/bliss_mosca/simulation/generator.py +0 -0
  118. {mosca-2.0.2 → mosca-2.0.5}/packages/blissdata_mosca/README.rst +0 -0
  119. {mosca-2.0.2 → mosca-2.0.5}/packages/blissdata_mosca/src/blissdata_mosca/__init__.py +0 -0
  120. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/README.rst +0 -0
  121. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/__init__.py +0 -0
  122. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/__init__.py +0 -0
  123. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/devices/__init__.py +0 -0
  124. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/devices/danteplus.py +0 -0
  125. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/devices/dummy.py +0 -0
  126. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/devices/generator.py +0 -0
  127. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/devices/simdante.py +0 -0
  128. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/devices/simfalconx.py +0 -0
  129. {mosca-2.0.2 → mosca-2.0.5}/packages/mosca_client/src/mosca_client/tango/devices/simulation.py +0 -0
  130. {mosca-2.0.2 → mosca-2.0.5}/scripts/mosca.ps1 +0 -0
  131. {mosca-2.0.2 → mosca-2.0.5}/setup.cfg +0 -0
  132. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/__init__.py +0 -0
  133. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/common/__init__.py +0 -0
  134. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/common/enums.py +0 -0
  135. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/common/logger.py +0 -0
  136. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/common/threads.py +0 -0
  137. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/common/utils.py +0 -0
  138. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/__init__.py +0 -0
  139. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/buffer.py +0 -0
  140. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/detectors.py +0 -0
  141. {mosca-2.0.2/src/mosca/tango → mosca-2.0.5/src/mosca/control}/shared.py +0 -0
  142. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/tasks/__init__.py +0 -0
  143. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/tasks/background.py +0 -0
  144. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/control/tasks/spectrasums.py +0 -0
  145. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/__init__.py +0 -0
  146. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/hamamatsu/__init__.py +0 -0
  147. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/hamamatsu/hamamatsu.py +0 -0
  148. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/hamamatsu/hamamatsuhw.py +0 -0
  149. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/oceanoptics/__init__.py +0 -0
  150. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/oceanoptics/oceanoptics.py +0 -0
  151. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/oceanoptics/oceanopticshw.py +0 -0
  152. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/simulation/__init__.py +0 -0
  153. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/simulation/dante/__init__.py +0 -0
  154. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/simulation/dante/simdante.py +0 -0
  155. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/simulation/dante/simdantehw.py +0 -0
  156. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/simulation/dummy/__init__.py +0 -0
  157. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/simulation/dummy/dummy.py +0 -0
  158. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/simulation/xia/__init__.py +0 -0
  159. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/simulation/xia/iniparser.py +0 -0
  160. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/simulation/xia/simfalconx.py +0 -0
  161. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/simulation/xia/simfalconxhw.py +0 -0
  162. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xglab/__init__.py +0 -0
  163. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xglab/dante.py +0 -0
  164. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xglab/dantehw.py +0 -0
  165. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/__init__.py +0 -0
  166. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/handel/mapping.py +0 -0
  167. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/handel/stats.py +0 -0
  168. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/mercury.py +0 -0
  169. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/devices/xia/utils.py +0 -0
  170. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/mosca.py +0 -0
  171. {mosca-2.0.2/src/mosca/tango/tasks → mosca-2.0.5/src/mosca/rpc}/__init__.py +0 -0
  172. {mosca-2.0.2/tests → mosca-2.0.5/src/mosca/rpc/tasks}/__init__.py +0 -0
  173. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/tango/__init__.py +0 -0
  174. {mosca-2.0.2/tests/bliss → mosca-2.0.5/src/mosca/tango/tasks}/__init__.py +0 -0
  175. {mosca-2.0.2 → mosca-2.0.5}/src/mosca/tango/utils.py +0 -0
  176. {mosca-2.0.2/tests/bliss/v1 → mosca-2.0.5/tests}/__init__.py +0 -0
  177. {mosca-2.0.2/tests/data/beacon/tango → mosca-2.0.5/tests/bliss}/__init__.py +0 -0
  178. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/bliss_utils.py +0 -0
  179. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/test_calcformula.py +0 -0
  180. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/test_hdf5.py +0 -0
  181. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/test_mosca.py +0 -0
  182. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/utils.py +0 -0
  183. {mosca-2.0.2/tests/mosca → mosca-2.0.5/tests/bliss/v1}/__init__.py +0 -0
  184. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/v1/test_calcformula_v1.py +0 -0
  185. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/v1/test_dummy_v1.py +0 -0
  186. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/v1/test_hdf5.py +0 -0
  187. {mosca-2.0.2 → mosca-2.0.5}/tests/bliss/v1/test_simfx_v1.py +0 -0
  188. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/__init__.yml +0 -0
  189. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/mosca/counters.yml +0 -0
  190. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/mosca/dummy.yml +0 -0
  191. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/mosca/simdante.yml +0 -0
  192. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/mosca/simfx.yml +0 -0
  193. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/__init__.yml +0 -0
  194. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/session_simfx_w_counters_setup.py +0 -0
  195. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/session_simfx_with_counters.yml +0 -0
  196. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/test_dummy.yml +0 -0
  197. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/test_dummy_setup.py +0 -0
  198. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/test_dummy_v1.yml +0 -0
  199. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/test_dummy_v1_setup.py +0 -0
  200. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/test_simdante.yml +0 -0
  201. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/test_simdante_setup.py +0 -0
  202. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/test_simdante_v1.yml +0 -0
  203. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/test_simdante_v1_setup.py +0 -0
  204. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/test_simfx.yml +0 -0
  205. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/test_simfx_setup.py +0 -0
  206. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/test_simfx_v1.yml +0 -0
  207. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/sessions/test_simfx_v1_setup.py +0 -0
  208. {mosca-2.0.2/tests/mosca/control → mosca-2.0.5/tests/data/beacon/tango}/__init__.py +0 -0
  209. {mosca-2.0.2 → mosca-2.0.5}/tests/data/beacon/tango/nexus_writer.yml +0 -0
  210. {mosca-2.0.2 → mosca-2.0.5}/tests/data/dante/dante_16ch.hdf +0 -0
  211. {mosca-2.0.2 → mosca-2.0.5}/tests/data/dante/dante_1ch.hdf +0 -0
  212. {mosca-2.0.2 → mosca-2.0.5}/tests/data/falconx/falconx.ini +0 -0
  213. {mosca-2.0.2 → mosca-2.0.5}/tests/data/falconx/falconx_18ch.ini +0 -0
  214. {mosca-2.0.2 → mosca-2.0.5}/tests/data/falconx/falconx_1ch.ini +0 -0
  215. {mosca-2.0.2 → mosca-2.0.5}/tests/data/falconx/falconx_2ch.ini +0 -0
  216. {mosca-2.0.2 → mosca-2.0.5}/tests/data/falconx/falconx_6ch.ini +0 -0
  217. {mosca-2.0.2/tests/mosca/control/tasks → mosca-2.0.5/tests/mosca}/__init__.py +0 -0
  218. {mosca-2.0.2/tests/mosca/tango → mosca-2.0.5/tests/mosca/control}/__init__.py +0 -0
  219. {mosca-2.0.2 → mosca-2.0.5}/tests/mosca/control/common.py +0 -0
  220. {mosca-2.0.2/tests/mosca/tango/devices → mosca-2.0.5/tests/mosca/control/tasks}/__init__.py +0 -0
  221. {mosca-2.0.2 → mosca-2.0.5}/tests/mosca/control/tasks/test_tasks.py +0 -0
  222. {mosca-2.0.2 → mosca-2.0.5}/tests/mosca/control/tasks/test_writer.py +0 -0
  223. {mosca-2.0.2 → mosca-2.0.5}/tests/mosca/control/test_buffer.py +0 -0
  224. {mosca-2.0.2 → mosca-2.0.5}/tests/perf/test_writer.py +0 -0
@@ -3,6 +3,7 @@ stages:
3
3
  # - tests_bliss
4
4
  - coverage
5
5
  - testv1
6
+ - test_bliss23x
6
7
  # - build
7
8
 
8
9
 
@@ -45,8 +46,9 @@ test_server:
45
46
  test_bliss:
46
47
  # image: gitlab-registry.esrf.fr/bliss/bcu-dockerfiles/bliss-pixi-ci-runner:1.3.0
47
48
  stage: tests
49
+ timeout: 25m
48
50
  script:
49
- - pixi run -e testblissmaster cov_bliss
51
+ - pixi run -e testblissmosca cov_bliss
50
52
  # test_bliss
51
53
  artifacts:
52
54
  when: always
@@ -54,9 +56,16 @@ test_bliss:
54
56
  - .coverage*
55
57
  expire_in: 2 days
56
58
 
59
+ test_bliss23x:
60
+ # image: gitlab-registry.esrf.fr/bliss/bcu-dockerfiles/bliss-pixi-ci-runner:1.3.0
61
+ stage: tests
62
+ timeout: 25m
63
+ script:
64
+ - pixi run -e testblissmosca23 test_bliss
65
+
57
66
  coverage:
58
67
  stage: coverage
59
- script: pixi run -e testblissmaster coverage
68
+ script: pixi run -e testblissmosca coverage
60
69
  coverage: '/TOTAL.*\s+(\d+%)$/'
61
70
  # coverage: '/TOTAL.*\s+(\d+%)$/'
62
71
  artifacts:
@@ -72,7 +81,7 @@ coverage:
72
81
 
73
82
  testv1:
74
83
  stage: tests
75
- script: pixi run -e testv1master cov_v1
84
+ script: pixi run -e testbliss cov_v1
76
85
  # test_v1
77
86
  coverage: '/TOTAL.*\s+(\d+%)$/'
78
87
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: mosca
3
- Version: 2.0.2
3
+ Version: 2.0.5
4
4
  Summary: A library for the unified control of MCA detectors
5
5
  Project-URL: Homepage, https://gitlab.esrf.fr/bliss/mosca
6
6
  Project-URL: Bug Tracker, https://gitlab.esrf.fr/bliss/mosca/issues
@@ -20,6 +20,9 @@ Requires-Dist: lark
20
20
  Requires-Dist: numpy
21
21
  Requires-Dist: pytango
22
22
  Requires-Dist: ruamel-yaml
23
+ Provides-Extra: zarr
24
+ Requires-Dist: s3fs; extra == 'zarr'
25
+ Requires-Dist: zarr; extra == 'zarr'
23
26
  Description-Content-Type: text/x-rst
24
27
 
25
28
  Mosca 2
@@ -196,7 +196,7 @@ mosca.start_mosca()
196
196
  # mosca.start_acq()
197
197
 
198
198
  # wait ...
199
- while mosca.acq_status == "RUNNING":
199
+ while mosca.acquisition_status == "RUNNING":
200
200
  print("wait")
201
201
  time.sleep(0.5)
202
202
 
@@ -1,7 +1,7 @@
1
1
  [project]
2
2
  name = "bliss-mosca"
3
3
  requires-python = ">=3.10,<3.13"
4
- version = "2.0.2"
4
+ version = "2.0.5"
5
5
 
6
6
  dependencies = [
7
7
  "numpy",
@@ -8,6 +8,8 @@ import time
8
8
  import gevent
9
9
  import enum
10
10
 
11
+ import numpy as np
12
+
11
13
  from gevent import event
12
14
  from itertools import repeat, count
13
15
  from collections.abc import Generator
@@ -23,12 +25,18 @@ from bliss.common.tango import (
23
25
  ConnectionFailed,
24
26
  DevFailed
25
27
  )
28
+ from bliss.common.counter import Counter
26
29
  from bliss.shell.getval import getval_idx_list
27
30
  from bliss.common.utils import autocomplete_property, IterableNamespace
28
31
  from bliss.common.protocols import CounterContainer
29
32
  from bliss.controllers.counter import CounterController, counter_namespace
30
33
  from bliss.scanning.chain import AcquisitionMaster
31
34
  from bliss.scanning.channel import AcquisitionChannel
35
+ try:
36
+ from bliss.scanning.channel import ZarrAcquisitionChannel
37
+ except ImportError:
38
+ ZarrAcquisitionChannel = None
39
+
32
40
  from bliss.common.protocols import HasMetadataForScan
33
41
  from .counters import (SpecCounter, StatCounter, RoiCounter)
34
42
  from .calccounters import (
@@ -38,14 +46,16 @@ from .calccounters import (
38
46
  RoiCorrCC,
39
47
  # SumCorrSpecCC,
40
48
  SumCorrRoiCC,
49
+ SpecCorrCC,
50
+ CorrSpecCounter,
41
51
  # SumCorrSpecCounter,
42
52
  SumCorrRoiCounter
43
53
  )
44
54
 
45
-
46
55
  from .compat import McaCounterControllerBase
47
- from mosca_client.tango.mosca import Mosca, Poller
48
- from mosca_client.tango.rois import McaRoi
56
+ from mosca_client.tango.mosca import Mosca
57
+ from mosca_client.tango.readers import IncrementalReader, MixedReader
58
+ # from mosca_client.tango.rois import McaRoi
49
59
  from mosca_client.tango.utils import to_enum
50
60
  from .channel import MoscaAcquisitionChannel
51
61
 
@@ -78,6 +88,11 @@ class McaCounterController(McaCounterControllerBase):
78
88
  self._corrRoiCC = RoiCorrCC(f"{self.name}:roi_correction",
79
89
  self._mca.config)
80
90
 
91
+ # self._datacount_cnt = Counter("datacount", self, dtype=int)
92
+ self._corrSpecCC = SpecCorrCC(f"{self.name}:spec_correction",
93
+ self._mca.config)
94
+ # datacount=self._datacount_cnt)
95
+
81
96
  # unfortunately can't change roi_sum to the prefered roicorr_sum
82
97
  # because everything is hardcoded in bliss
83
98
  self._corrRoiSumCC = SumCorrRoiCC(f"{self.name}:roi_sum")
@@ -88,6 +103,8 @@ class McaCounterController(McaCounterControllerBase):
88
103
  def counters(self) -> IterableNamespace:
89
104
  self._mca.initialize()
90
105
  return super().counters
106
+ # return counter_namespace([cnt for cnt in super().counters
107
+ # if cnt is not self._datacount_cnt])
91
108
 
92
109
  @property
93
110
  def spectrum_counters(self) -> IterableNamespace:
@@ -113,6 +130,10 @@ class McaCounterController(McaCounterControllerBase):
113
130
  def corr_roi_counters(self) -> IterableNamespace:
114
131
  return self._corrRoiCC.outputs
115
132
 
133
+ @property
134
+ def corr_spec_counters(self) -> IterableNamespace:
135
+ return self._corrSpecCC.outputs
136
+
116
137
  @property
117
138
  def corr_roi_sum_counters(self) -> IterableNamespace:
118
139
  return self._corrRoiSumCC.outputs
@@ -173,11 +194,6 @@ class McaCounterController(McaCounterControllerBase):
173
194
  return {"name": self.name}
174
195
 
175
196
  def scan_metadata(self) -> dict:
176
- # def scan_metadata(self) -> dict:
177
- # return {
178
- # "@NX_class": "NXcollection",
179
- # "configuration_file": self.configuration_file,
180
- # }
181
197
  return {"type": "mca"}
182
198
 
183
199
  @property
@@ -193,6 +209,7 @@ class McaCounterController(McaCounterControllerBase):
193
209
  def clear(self) -> None:
194
210
  """clear all counters"""
195
211
  self._counters.clear()
212
+ # self._counters[self._datacount_cnt.name] = self._datacount_cnt
196
213
 
197
214
  def mca_changed(self):
198
215
  """ Updates the counters: spectra, rois, corrected rois """
@@ -230,9 +247,11 @@ class McaCounterController(McaCounterControllerBase):
230
247
 
231
248
  def _update_others(self, correction_formula=None):
232
249
  self._corrRoiCC.set_mca_counters(self.roi_counters, self.stat_counters)
250
+ # self._corrSpecCC.set_mca_counters(self.spectrum_counters, self.stat_counters)
233
251
  try:
234
252
  if correction_formula is not None:
235
253
  self._corrRoiCC.correction_formula = correction_formula
254
+ # self._corrSpecCC.correction_formula = correction_formula
236
255
  finally:
237
256
  self._corrRoiSumCC.set_mca_counters(self._corrRoiCC.outputs, [])
238
257
 
@@ -335,6 +354,10 @@ class McaAcquisitionMaster(AcquisitionMaster):
335
354
  acq_params["discard_mode"] = discard_mode
336
355
  acq_params.setdefault("n_triggers", n_triggers)
337
356
 
357
+ self._zarr_saving_available = False
358
+ # (ZarrAcquisitionChannel is not None
359
+ # and "zarr" in device._mca.saving.supported_modes())
360
+
338
361
  # start_once == True:
339
362
  # * detector is only started once
340
363
  # * used when detector is in mapping mode
@@ -359,6 +382,7 @@ class McaAcquisitionMaster(AcquisitionMaster):
359
382
  self._wait_next_point_iter = wait_frame_id_iter
360
383
  self._wait_next_point = None
361
384
  self._n_acquired_points = 0
385
+ # self._n_emitted = 0
362
386
 
363
387
  # number of acquired points over the whole acquisition
364
388
  self._expected_n_points = npoints
@@ -393,54 +417,121 @@ class McaAcquisitionMaster(AcquisitionMaster):
393
417
  def set_device_saving(self, directory, prefix, force_no_saving=False):
394
418
  """ Sets the saving parameters. """
395
419
  # TODO
396
- if not force_no_saving and self.trigger_type == AcquisitionMaster.SOFTWARE:
397
- print(f"Warning [{self.name}]. Remote saving is not yet available for SOFTWARE trigger.")
398
- force_no_saving = True
399
-
400
- if force_no_saving:
401
- # remote saving is disabled
402
- self.acq_params["remote_saving"] = False
403
- self.acq_params["local_directory"] = None
420
+ # if not force_no_saving and self.trigger_type == AcquisitionMaster.SOFTWARE:
421
+ # print(f"Warning [{self.name}]. Remote saving is not yet available for SOFTWARE trigger.")
422
+ # # force_no_saving = True
423
+ # if force_no_saving == True:
424
+ # raise RuntimeError("force_no_saving ")
425
+
426
+ self.acq_params["saving_enabled"] = not force_no_saving
427
+ if self._zarr_saving_available:
428
+ saving_mode = "zarr"
404
429
  else:
405
- self.acq_params["remote_saving"] = True
406
- # saving directory, local path
430
+ saving_mode = "hdf5"
431
+ self.acq_params["remote_saving"] = not force_no_saving
432
+ self.acq_params["file_prefix"] = prefix
407
433
  self.acq_params["local_directory"] = directory
408
- # saving directory, remote path
409
- remote_directory = self.mca_ctrl.saving.get_mapped_path(directory)
410
- self.acq_params["directory"] = remote_directory
411
- # prefix prepended to the file names
412
- self.acq_params.setdefault("file_prefix", prefix)
413
- # hdf5 dataset path in the saved file
414
- self.acq_params["data_path"] = f"/entry_0000/{self.name}/data"
434
+ self.acq_params["saving_mode"] = saving_mode
435
+
436
+ def get_acquisition_metadata(self, timing=None):
437
+ meta = super().get_acquisition_metadata(timing=timing)
438
+ if timing == self.META_TIMING.END:
439
+ this_meta = {self.device.name: self._poller.reader.metadata()}
440
+ if meta:
441
+ meta.update(this_meta)
442
+ else:
443
+ meta = this_meta
444
+ return meta
415
445
 
416
446
  def prepare(self) -> None:
417
447
  """ Prepares the detector """
448
+ # if self.spectrum_counters and not self.acq_params["remote_saving"]:
449
+ # log_warning(self,
450
+ # "Spectrum counters requested, but remote "
451
+ # "saving is disabled.")
452
+
418
453
  # acquisition already started
454
+ # always prepare_once, but keeping it there in case it changes some day
419
455
  if self._n_acquired_points > 0 and self.prepare_once:
420
456
  return
421
457
 
422
- # perform device specific preparation
423
458
  acq_params = copy.copy(self.acq_params)
459
+
460
+ # if self.acq_params["remote_saving"]:
461
+ if self._zarr_saving_available:
462
+ saving_mode = "zarr"
463
+ # endpoint=saving_config["endpoint"],
464
+ # bucket=saving_config["bucket"],
465
+ # prefix=saving_config["prefix"],
466
+ # access_key=saving_config["access_key"],
467
+ # secure=saving_config["secure"]
468
+ else:
469
+ saving_mode = "hdf5"
470
+ # saving directory, local path
471
+ directory = self.acq_params["local_directory"]
472
+ # saving directory, remote path
473
+ remote_directory = self.mca_ctrl.saving.get_mapped_path(directory)
474
+ acq_params["directory"] = remote_directory
475
+ # prefix prepended to the file names
476
+ assert "file_prefix" in acq_params
477
+ # hdf5 dataset path in the saved file
478
+ acq_params["data_path"] = f"/entry_0000/{self.name}/data"
479
+
480
+ # else:
481
+ # saving_mode = "off"
482
+
483
+ acq_params["saving_mode"] = saving_mode
484
+
485
+ # perform device specific preparation
424
486
  n_triggers = acq_params.get("n_triggers")
425
487
  if n_triggers is not None:
426
488
  acq_params["npoints"] = n_triggers
427
-
428
489
  # pass the parameters to the McaController
429
490
  self.mca_ctrl.set_parameters(acq_params)
430
491
 
492
+ acq_id = self.mca_ctrl.client.prepare_acq()
493
+
431
494
  # retrieving the saving parameters ...
495
+ # TODO: get them from the metadata, locked to acq_id
432
496
  saving_config = self.mca_ctrl.client.saving.saving_configuration()
497
+ #zarr_config = self.mca_ctrl.client.saving.zarr_saving_configuration()
498
+
499
+ metadata = self.mca_ctrl.client.metadata(acq_id)
500
+ spectrum_size = metadata["data"]["spectrum_size"]
501
+ dtype = np.dtype(metadata["data"]["spectrum_dtype"])
433
502
 
434
503
  # ... and passing them to spectra channels
435
504
  for channel in self.channels:
436
- if isinstance(channel, MoscaAcquisitionChannel):
505
+ if ZarrAcquisitionChannel and isinstance(channel, ZarrAcquisitionChannel):
506
+ # TODO: do better...
507
+ det_name = channel.name.rsplit(":")[-1]
508
+
509
+ channel.configure(
510
+ dtype,
511
+ (spectrum_size,),
512
+ endpoint=saving_config["endpoint"],
513
+ bucket=saving_config["bucket"],
514
+ prefix=saving_config["prefix"] + "/" + det_name, # TODO: do better...
515
+ access_key=saving_config["access_key"],
516
+ secret_key="minioadmin",
517
+ secure=saving_config["secure"])
518
+ elif isinstance(channel, MoscaAcquisitionChannel):
437
519
  file_format = "hdf5" if acq_params["remote_saving"] else None
438
520
  channel.configure_saving(
521
+ acq_id,
439
522
  saving_config["points_per_file"],
440
- file_format, #"hdf5",
523
+ file_format,
441
524
  self.acq_params["local_directory"],
442
525
  saving_config["file_prefix"],
443
- saving_config["hdf5_path"])
526
+ saving_config["hdf5_path"],
527
+ saving_config["saving_enabled"],
528
+ list(map(int, self.mca_ctrl.detectors)))
529
+
530
+ self._poller = self.mca_ctrl.client.poller(acq_id=acq_id)
531
+
532
+ reader = self.mca_ctrl.client.reader(acq_id=acq_id)
533
+ reader = IncrementalReader(reader=MixedReader(reader=reader))
534
+ self.device._corrSpecCC.set_reader(reader)
444
535
 
445
536
  def start(self) -> None:
446
537
  """ Starts the detector, if needed. """
@@ -455,6 +546,7 @@ class McaAcquisitionMaster(AcquisitionMaster):
455
546
  log_debug(self.device._mca, "Calling client.stop_acq...")
456
547
  self._stop_poll = True
457
548
  self.mca_ctrl.client.stop_acq()
549
+ # self.mca_ctrl.client.finalize_acq()
458
550
 
459
551
  def _init(self, devices: McaCounterController) -> None:
460
552
  """ ? """
@@ -462,21 +554,25 @@ class McaAcquisitionMaster(AcquisitionMaster):
462
554
 
463
555
  def _do_add_counter(self, counter: SpecCounter | StatCounter | RoiCounter) -> None:
464
556
  """ Redefinition of this class' parent method to handle MCA specific counters. """
465
-
466
557
  ctrl_name, _, cnt_name = counter.fullname.rpartition(":")
467
558
 
468
559
  if isinstance(counter, SpecCounter):
469
560
  chan_name = f"{ctrl_name}:spectrum:{cnt_name}"
470
- acqchan = MoscaAcquisitionChannel(chan_name,
471
- counter.det_num,
472
- counter.data_index,
473
- counter.shape,
474
- self.mca_ctrl.tango_name)
561
+ if self._zarr_saving_available:
562
+ acqchan = ZarrAcquisitionChannel(chan_name)
563
+ else:
564
+ acqchan = MoscaAcquisitionChannel(chan_name,
565
+ counter.det_num,
566
+ counter.data_index,
567
+ counter.shape,
568
+ self.mca_ctrl.tango_name)
475
569
  else:
476
570
  if isinstance(counter, StatCounter):
477
571
  chan_name = f"{ctrl_name}:stat:{cnt_name}"
478
572
  elif isinstance(counter, RoiCounter):
479
573
  chan_name = counter.fullname
574
+ # elif counter is self.device._datacount_cnt:
575
+ # chan_name = counter.fullname
480
576
  else:
481
577
  raise RuntimeError("Unknown counter type.")
482
578
 
@@ -522,6 +618,7 @@ class McaAcquisitionMaster(AcquisitionMaster):
522
618
  # TODO: put this check in the reading loop
523
619
  if (self.parent is None
524
620
  and self.n_acquired_points == self._expected_n_points):
621
+ # self.mca_ctrl.client.finalize_acq()
525
622
  return
526
623
 
527
624
  raise RuntimeError(
@@ -543,12 +640,18 @@ class McaAcquisitionMaster(AcquisitionMaster):
543
640
  def trigger(self) -> None:
544
641
  self.trigger_slaves()
545
642
  if self._n_iterations == 0:
546
- self.mca_ctrl.client.prepare_acq()
547
- self._poller = self.mca_ctrl.client.start_acq()
643
+ self.mca_ctrl.client.start_acq(acq_id=self._poller.reader.acq_id)
548
644
  else:
549
645
  if self.start_once:
550
646
  return
551
- self.mca_ctrl.client.resume_acq()
647
+ self.mca_ctrl.client.resume_acq(acq_id=self._poller.reader.acq_id)
648
+
649
+ # making sure the prepare and start acq_id match
650
+ # TODO: uncomment this when acq_id is implemented serverside
651
+ # if self._poller.reader.acq_id != acq_id:
652
+ # raise RuntimeError("Acq_id mismatch: "
653
+ # f"prepare_acq={self._poller.reader.acq_id} /"
654
+ # f"start_acq={acq_id} /")
552
655
 
553
656
  log_debug(self.device._mca, "proxy.startAcq")
554
657
  # TODO: this could be started only once
@@ -559,13 +662,17 @@ class McaAcquisitionMaster(AcquisitionMaster):
559
662
 
560
663
  poller = self._poller
561
664
 
562
- McaStatus = poller.McaStatus
665
+ McaStatus = poller.reader.McaStatus
563
666
  polling_time = self.acq_params.get("polling_time", 0.05)
564
- remote_saving = self.acq_params["remote_saving"]
565
667
 
566
668
  spectrum_counters = self.spectrum_counters
567
669
  stat_counters = self.stat_counters
568
670
  roi_counters = self.roi_counters
671
+ # datacount_chan = self._counters[self.device._datacount_cnt]
672
+ # if len(datacount_chan):
673
+ # datacount_chan = datacount_chan[0]
674
+ # else:
675
+ # datacount_chan = 0
569
676
 
570
677
  triggered = None
571
678
 
@@ -577,7 +684,6 @@ class McaAcquisitionMaster(AcquisitionMaster):
577
684
  results = poller.poll(read_spectra=False,
578
685
  read_stats=len(stat_counters) > 0,
579
686
  read_rois=len(roi_counters) > 0)
580
-
581
687
  if results.n_points:
582
688
  if results.stats is not None:
583
689
  for cnt in stat_counters:
@@ -585,9 +691,21 @@ class McaAcquisitionMaster(AcquisitionMaster):
585
691
  if results.rois is not None:
586
692
  for cnt in roi_counters:
587
693
  self._counters[cnt][0].emit(results.rois[cnt.roi.data_index, :])
694
+
695
+ # spectra_range = [self._n_emitted, self._n_emitted + results.n_points]
588
696
  for cnt in spectrum_counters:
589
- self._counters[cnt][0].emit({"last_read_index": results.n_read - 1,
590
- "last_saved_index": results.n_saved - 1})
697
+ channel = self._counters[cnt][0]
698
+ if ZarrAcquisitionChannel and isinstance(channel, ZarrAcquisitionChannel):
699
+ # the zarr stream only needs a progress count: the
700
+ # actual spectra are fetched straight from the store
701
+ channel.emit(np.uint32(results.n_saved))
702
+ else:
703
+ channel.emit({"last_read_index": results.n_read - 1,
704
+ "last_saved_index": results.n_saved - 1})
705
+ # self._n_emitted += results.n_points
706
+ # if datacount_chan:
707
+ # datacount_chan[0].emit(np.arange(self._n_emitted, self._n_emitted + results.n_points))
708
+
591
709
 
592
710
  # scan progress
593
711
  self.emit_progress_signal(
@@ -610,13 +728,13 @@ class McaAcquisitionMaster(AcquisitionMaster):
610
728
  f"(got {triggered}, expected "
611
729
  f"{wait_next} max).")
612
730
 
613
- if results.acq_status == McaStatus.READY and results.n_read == wait_next:
731
+ if results.acquisition_status == McaStatus.READY and results.n_read == wait_next:
614
732
  # state is READY when remote saving is done (if applicable)
615
733
  # so we can just check n_read
616
734
  # we have collected the expected number of points
617
735
  # for the current iteration
618
736
  break
619
- elif results.acq_status == McaStatus.RUNNING and results.n_triggered != triggered and self.start_once:
737
+ elif results.acquisition_status == McaStatus.RUNNING and results.n_triggered != triggered and self.start_once:
620
738
  # if start_once, we dont wait for READY
621
739
  triggered = results.n_triggered
622
740
  if results.n_triggered == wait_next:
@@ -686,7 +804,7 @@ class McaController(CounterContainer):
686
804
 
687
805
  # remove this when the initialization mess is sorted out
688
806
  # (eg counter created then roi manager then counters updated then ...)
689
- self.initialize()
807
+ # self.initialize()
690
808
 
691
809
  @property
692
810
  def mca(self):
@@ -751,6 +869,7 @@ class McaController(CounterContainer):
751
869
  tg_name,
752
870
  on_change_cb=self._on_change,
753
871
  settings=settings)
872
+ self._ds_start_time = self._client.start_epoch
754
873
 
755
874
  if self._rois is None:
756
875
  self._rois = self._client.rois
@@ -849,6 +968,7 @@ class McaController(CounterContainer):
849
968
  all_counters = self.ccontroller().counters
850
969
  all_counters += self.ccontroller().corr_roi_counters
851
970
  all_counters += self.ccontroller().corr_roi_sum_counters
971
+ all_counters += self.ccontroller().corr_spec_counters
852
972
  return all_counters
853
973
 
854
974
  @autocomplete_property
@@ -872,6 +992,9 @@ class McaController(CounterContainer):
872
992
  dct["roi_corr_sum"] = counter_namespace(
873
993
  [cnt for cnt in counters if isinstance(cnt, SumCorrRoiCounter)]
874
994
  )
995
+ dct["spec_corr"] = counter_namespace(
996
+ [cnt for cnt in self.counters if isinstance(cnt, CorrSpecCounter)]
997
+ )
875
998
 
876
999
  # Default grouped
877
1000
  dct["default"] = counter_namespace(
@@ -880,7 +1003,7 @@ class McaController(CounterContainer):
880
1003
  + list(dct["roi"])
881
1004
  + list(dct["roi_corr"])
882
1005
  + list(dct["roi_corr_sum"])
883
- )
1006
+ + list(dct["spec_corr"]))
884
1007
 
885
1008
  # Return namespace
886
1009
  return counter_namespace(dct)
@@ -4,6 +4,7 @@
4
4
  # Distributed under the GNU LGPLv3. See LICENSE for more info.
5
5
 
6
6
  import re
7
+ import weakref
7
8
  import numpy as np
8
9
  import numexpr
9
10
  from bliss import global_map
@@ -16,6 +17,8 @@ from bliss.release import version as bliss_version
16
17
 
17
18
 
18
19
  class McaCalcCounter(CalcCounter):
20
+ controller = property(lambda self: self._counter_controller)
21
+
19
22
  """ Base class for MCA counters """
20
23
  def __init__(self, controller, mca_counter, name=None):
21
24
  """ Init counters with the given input counters. """
@@ -69,6 +72,9 @@ class SumCorrRoiCounter(McaCalcCounter):
69
72
  for mca_counter in mca_counters:
70
73
  counter_name = cls.counter_name(mca_counter)
71
74
  groups.setdefault(counter_name, []).append(mca_counter.name)
75
+ groups = {counter_name:group
76
+ for counter_name, group in groups.items()
77
+ if len(group) > 1}
72
78
  return groups
73
79
 
74
80
  @classmethod
@@ -84,7 +90,10 @@ class CorrRoiCounter(CorrCounter):
84
90
 
85
91
  class CorrSpecCounter(CorrCounter):
86
92
  """ Spectra correction """
87
- pass
93
+ def __init__(self, controller, mca_counter, **kwargs):
94
+ self.det_num = mca_counter.det_num
95
+ super().__init__(controller, mca_counter, **kwargs)
96
+
88
97
 
89
98
 
90
99
  class McaCalcCC(CalcCounterController):
@@ -98,6 +107,7 @@ class McaCalcCC(CalcCounterController):
98
107
  def __init__(self, name: str, config: ConfigNode | dict = None) -> None:
99
108
  self._input_mapping = {}
100
109
  self._external_counters = {}
110
+ # TODO: tuple
101
111
  self._mca_counters = []
102
112
  self._stats_counters = []
103
113
 
@@ -108,6 +118,14 @@ class McaCalcCC(CalcCounterController):
108
118
  # ugh
109
119
  return self._tags
110
120
 
121
+ @property
122
+ def mca_counters(self):
123
+ return self._mca_counters
124
+
125
+ @property
126
+ def stats_counters(self):
127
+ return self._stats_counters
128
+
111
129
  def _apply_config(self, config: ConfigNode | dict = None):
112
130
  """
113
131
  Duplicating only half of the parent class code.
@@ -256,6 +274,43 @@ class McaFormulaCC(McaCalcCC):
256
274
  return output_dict
257
275
 
258
276
 
277
+ class McaSpecCorrCC:
278
+ def __init__(self, *args, datacount=None, **kwargs):
279
+ self._reader = None
280
+ self._detectors_mapping = {}
281
+ self._datacount = datacount
282
+ super().__init__(*args, **kwargs)
283
+
284
+ def set_reader(self, reader):
285
+ self._reader = reader
286
+
287
+ @property
288
+ def reader(self):
289
+ return self._reader
290
+
291
+ def clear(self):
292
+ self._detectors_mapping = {}
293
+ super().clear()
294
+
295
+ def set_mca_counters(self, *args, **kwargs):
296
+ ret = super().set_mca_counters(*args, **kwargs)
297
+ self._detectors_mapping = {counter.name:counter.data_index for counter in self.mca_counters}
298
+ return ret
299
+
300
+ def calc_function(self, input_dict):
301
+ input_name = self.inputs[0].name
302
+ # TODO: improve
303
+ n_points = input_dict[input_name].shape[0]
304
+ spectra = self.reader.read_next_spectra(n_points)
305
+
306
+ # copy so we dont pollute the incomming dict
307
+ input_dict = {k: v for k,v in input_dict.items()}
308
+ data_dict = {cntname: spectra[det_index, ...]
309
+ for cntname, det_index in self._detectors_mapping.items()}
310
+ input_dict.update(data_dict)
311
+ return super().calc_function(input_dict)
312
+
313
+
259
314
  class McaSumCorrCC(McaCalcCC):
260
315
  Output_Class = SumCorrRoiCounter
261
316
 
@@ -308,7 +363,8 @@ class McaCalcBliss23Mixin:
308
363
 
309
364
  class McaCalcBliss24Mixin:
310
365
  def clear(self):
311
- self._counters: dict[str, Counter] = {}
366
+ super().clear()
367
+ # self._counters: dict[str, Counter] = {}
312
368
  self._tags: dict[str, str] = {}
313
369
  self._input_counters: list[Counter] = []
314
370
 
@@ -356,11 +412,15 @@ def _get_klasses():
356
412
  McaCorrectionCC, SumCorrRoiCC = _get_klasses()
357
413
 
358
414
 
359
- class SpecCorrCC(McaCorrectionCC):
360
- """ Corrected spectra """
361
- Output_Class = CorrSpecCounter
415
+ # class SpecCorrCC(McaCorrectionCC):
416
+ # """ Corrected spectra """
417
+ # Output_Class = CorrSpecCounter
362
418
 
363
419
 
364
420
  class RoiCorrCC(McaCorrectionCC):
365
421
  """ Corrected rois """
366
422
  Output_Class = CorrRoiCounter
423
+
424
+
425
+ class SpecCorrCC(McaSpecCorrCC, McaCorrectionCC):
426
+ Output_Class = CorrSpecCounter