horiba-sdk 0.3.3__py3-none-any.whl → 0.5.2__py3-none-any.whl

horiba_sdk/__init__.py

@@ -1,11 +1,11 @@
 # mypy: disable-error-code="attr-defined"
 """'horiba-sdk' is a package that provides source code for the development with Horiba devices"""
 
+from loguru import logger
+
 __version__ = '0.2.0'  # It MUST match the version in pyproject.toml file
 from importlib import metadata as importlib_metadata
 
-from pint import UnitRegistry
-
 
 def get_version() -> str:
     try:
@@ -16,4 +16,6 @@ def get_version() -> str:
 
 version: str = get_version()
 
-ureg = UnitRegistry()
+# it is good practice to disable the logging for a library, this is done here.
+# on initialization of a device manager, this can be enabled.
+logger.disable(__name__)

horiba_sdk/communication/websocket_communicator.py

@@ -166,13 +166,13 @@ class WebsocketCommunicator(AbstractCommunicator):
 
     def register_binary_message_callback(self, callback: Callable[[bytes], Any]) -> None:
         """Registers a callback to be called with every incoming binary message."""
-        logger.info('Binary message callback registered.')
+        logger.debug('Binary message callback registered.')
         self.binary_message_callback = callback
 
     async def _receive_data(self) -> None:
         try:
             async for message in self.websocket:  # type: ignore
-                logger.info(f'Received message: {message!r}')
+                logger.debug(f'Received message: {message!r}')
                 if isinstance(message, str):
                     await self.json_message_queue.put(message)
                 elif isinstance(message, bytes):

horiba_sdk/core/acquisition_format.py

@@ -0,0 +1,20 @@
+from enum import Enum
+from typing import final
+
+
+@final
+class AcquisitionFormat(Enum):
+    """Formats for the acquisition.
+
+    Attributes:
+        SPECTRA: X axis in nm, Y axis in counts
+        IMAGE: X axis in pixels, Y axis in counts
+        CROP: TBD
+        FAST_KINETICS: TBD
+
+    """
+
+    SPECTRA = 0
+    IMAGE = 1
+    CROP = 2
+    FAST_KINETICS = 3

horiba_sdk/core/clean_count_mode.py

@@ -0,0 +1,13 @@
+from enum import Enum
+from typing import final
+
+
+@final
+class CleanCountMode(Enum):
+    """TODO"""
+
+    NEVER = 0
+    FIRST_ONLY = 1
+    BETWEEN_ONLY = 2
+    EACH = 3
+    UNKNOWN = 238

horiba_sdk/core/timer_resolution.py

@@ -0,0 +1,14 @@
+from enum import Enum
+from typing import final
+
+
+@final
+class TimerResolution(Enum):
+    """Resolution for the timer for the acquisition time.
+
+    .. note:: The timer resolution value MICROSECONDS is not supported by all CCDs.
+    """
+
+    MILLISECONDS = 0
+    MICROSECONDS = 1
+    NOTHING_EVAL = 2

horiba_sdk/core/x_axis_conversion_type.py

@@ -0,0 +1,18 @@
+from enum import Enum
+from typing import final
+
+
+@final
+class XAxisConversionType(Enum):
+    """
+    Conversion types for the x axis of acquired data.
+
+    Attributes:
+        NONE: No conversion.
+        FROM_CCD_FIRMWARE: CCD FIT parameters contained in the CCD firmware.
+        FROM_ICL_SETTINGS_INI: Mono Wavelength parameters contained in the icl_settings.ini file
+    """
+
+    NONE = 0
+    FROM_CCD_FIRMWARE = 1
+    FROM_ICL_SETTINGS_INI = 2

horiba_sdk/devices/ccd_discovery.py

@@ -1,4 +1,3 @@
-import re
 from typing import Any, final
 
 from loguru import logger
@@ -32,24 +31,23 @@ class ChargeCoupledDevicesDiscovery(AbstractDeviceDiscovery):
         response: Response = await self._communicator.request_with_response(Command('ccd_discover', {}))
         if response.results.get('count', 0) == 0 and error_on_no_device:
             raise Exception('No CCDs connected')
+
         response = await self._communicator.request_with_response(Command('ccd_list', {}))
 
         raw_device_list = response.results
         self._charge_coupled_devices = self._parse_ccds(raw_device_list)
-        logger.info(f'Found {len(self._charge_coupled_devices)} CCD devices: {self._charge_coupled_devices}')
+        logger.info(f'Found {len(self._charge_coupled_devices)} CCD devices')
 
     def _parse_ccds(self, raw_device_list: dict[str, Any]) -> list[ChargeCoupledDevice]:
         detected_ccds: list[ChargeCoupledDevice] = []
-        for key, value in raw_device_list.items():
-            logger.debug(f'Parsing CCD: {key} - {value}')
-            ccd_index: int = int(key.split(':')[0].replace('index', '').strip())
-            ccd_type_match = re.search(r'deviceType: (.*?),', value)
-            if not ccd_type_match:
-                raise Exception(f'Failed to find ccd type "deviceType" in string "{value}"')
-            ccd_type: str = str(ccd_type_match.group(1).strip())
-
-            logger.info(f'Detected CCD: {ccd_type}')
-            detected_ccds.append(ChargeCoupledDevice(ccd_index, self._communicator, self._error_db))
+        for device in raw_device_list['devices']:
+            try:
+                logger.debug(f'Parsing CCD: {device}')
+                ccd = ChargeCoupledDevice(device['index'], self._communicator, self._error_db)
+                logger.info(f'Detected CCD: {device["deviceType"]}')
+                detected_ccds.append(ccd)
+            except Exception as e:
+                logger.error(f'Error while parsing ChargeCoupledDevice: {e}')
 
         return detected_ccds
 

horiba_sdk/devices/device_manager.py

@@ -63,27 +63,34 @@ class DeviceManager(AbstractDeviceManager):
     def __init__(
         self,
         start_icl: bool = True,
-        websocket_ip: str = '127.0.0.1',
-        websocket_port: str = '25010',
+        icl_ip: str = '127.0.0.1',
+        icl_port: str = '25010',
         enable_binary_messages: bool = True,
+        enable_logging: bool = False
     ):
         """
         Initializes the DeviceManager with the specified communicator class.
 
         Args:
             start_icl (bool) = True: If True, the ICL software is started and communication is established.
-            websocket_ip (str) = '127.0.0.1': websocket IP
-            websocket_port (str) = '25010': websocket port
+            icl_ip (str) = '127.0.0.1': websocket IP
+            icl_port (str) = '25010': websocket port
             enable_binary_messages (bool) = True: If True, binary messages are enabled.
+            enable_logging (bool) = True: If True, logging with the loguru library is enabled.
         """
+        # By default, logging is disabled for a library, so if desired it can be enabled
+        root_name_space: str = __name__.split('.')[0]
+        if enable_logging:
+            logger.info(f"Initializing logger for namespace: {root_name_space}")
+            logger.enable(root_name_space)
+        else:
+            logger.disable(root_name_space)
         super().__init__()
         self._start_icl = start_icl
-        self._icl_communicator: WebsocketCommunicator = WebsocketCommunicator(
-            'ws://' + websocket_ip + ':' + str(websocket_port)
-        )
+        self._icl_communicator: WebsocketCommunicator = WebsocketCommunicator('ws://' + icl_ip + ':' + str(icl_port))
         self._icl_communicator.register_binary_message_callback(self._binary_message_callback)
-        self._icl_websocket_ip: str = websocket_ip
-        self._icl_websocket_port: str = websocket_port
+        self._icl_websocket_ip: str = icl_ip
+        self._icl_websocket_port: str = icl_port
         self._icl_process: Optional[asyncio.subprocess.Process] = None
         self._binary_messages: bool = enable_binary_messages
         self._charge_coupled_devices: list[ChargeCoupledDevice] = []
@@ -109,7 +116,12 @@ class DeviceManager(AbstractDeviceManager):
 
     @override
     async def stop(self) -> None:
-        await self.stop_icl()
+        if self._start_icl:
+            await self.stop_icl()
+            return
+
+        if self._icl_communicator.opened():
+            await self._icl_communicator.close()
 
     async def start_icl(self) -> None:
         """
@@ -126,6 +138,8 @@ class DeviceManager(AbstractDeviceManager):
             logger.info('icl not running, starting it...')
             # subprocess.Popen([r'C:\Program Files\HORIBA Scientific\SDK\icl.exe'])
             self._icl_process = await asyncio.create_subprocess_exec(r'C:\Program Files\HORIBA Scientific\SDK\icl.exe')
+            await asyncio.sleep(4)
+
         # except subprocess.CalledProcessError:
         #    logger.error('Failed to start ICL software.')
         # TODO: [saga] is this the best way handle exceptions?

horiba_sdk/devices/fake_responses/ccd.json

@@ -8,12 +8,19 @@
     "errors": []
   },
   "ccd_list": {
-    "id": 1234,
     "command": "ccd_list",
+    "errors": [],
+    "id": 1234,
     "results": {
-      "index0: %2" : "{ productId: 13, deviceType: HORIBA Scientific Syncerity, serialNumber: Camera SN:  2244}"
-    },
-    "errors": []
+      "devices": [
+        {
+          "deviceType": "HORIBA Scientific Syncerity",
+          "index":0,
+          "productId":13,
+          "serialNumber": "Camera SN:  2244"
+        }
+      ]
+    }
   },
   "ccd_listCount": {
     "id": 1234,
@@ -45,7 +52,190 @@
     ]
   },
   "ccd_restart": {},
-  "ccd_getConfig": {},
+  "ccd_getConfig": {
+    "command": "ccd_getConfig",
+    "errors": [],
+    "id": 1234,
+    "results": {
+      "configuration": {
+        "centerWavelength": 0,
+        "chipHSpacing": 260,
+        "chipHeight": 256,
+        "chipName": "CCD30-11-1-275",
+        "chipSerialNumber": "20091-22-21",
+        "chipVSpacing": 260,
+        "chipWidth": 1024,
+        "deviceType": "HORIBA Scientific Syncerity",
+        "fitParameters": [
+          0,
+          1,
+          0,
+          0,
+          0
+        ],
+        "gains": [
+          {
+            "info": "High Sensitivity",
+            "token": 2
+          },
+          {
+            "info": "High Light",
+            "token": 0
+          },
+          {
+            "info": "Best Dynamic Range",
+            "token": 1
+          }
+        ],
+        "hardwareAvgAvailable": "false",
+        "lineScan": "false",
+        "productId": "13",
+        "serialNumber": "Camera SN:  2244",
+        "signals": [
+          {
+            "events": [
+              {
+                "name": "Reserved-DO NOT USE",
+                "token": 2,
+                "types": [
+                  {
+                    "name": "TTL Active High",
+                    "token": 0
+                  },
+                  {
+                    "name": "TTL Active Low",
+                    "token": 1
+                  }
+                ]
+              },
+              {
+                "name": "Shutter Open",
+                "token": 3,
+                "types": [
+                  {
+                    "name": "TTL Active High",
+                    "token": 0
+                  },
+                  {
+                    "name": "TTL Active Low",
+                    "token": 1
+                  }
+                ]
+              },
+              {
+                "name": "Start Experiment",
+                "token": 0,
+                "types": [
+                  {
+                    "name": "TTL Active High",
+                    "token": 0
+                  },
+                  {
+                    "name": "TTL Active Low",
+                    "token": 1
+                  }
+                ]
+              },
+              {
+                "name": "Ready For Trigger",
+                "token": 1,
+                "types": [
+                  {
+                    "name": "TTL Active High",
+                    "token": 0
+                  },
+                  {
+                    "name": "TTL Active Low",
+                    "token": 1
+                  }
+                ]
+              }
+            ],
+            "name": "Signal Output",
+            "token": 0
+          }
+        ],
+        "speeds": [
+          {
+            "info": " 1 MHz Ultra ",
+            "token": 2
+          },
+          {
+            "info": "500 kHz Wrap",
+            "token": 127
+          },
+          {
+            "info": "45 kHz       ",
+            "token": 0
+          },
+          {
+            "info": " 1 MHz       ",
+            "token": 1
+          }
+        ],
+        "supportedFeatures": {
+          "cf_3PositionSlit": "false",
+          "cf_CMOSOffsetCorrection": "false",
+          "cf_Cleaning": "true",
+          "cf_DSP": "false",
+          "cf_DSPBin2X": "false",
+          "cf_DelayAfterTrigger": "false",
+          "cf_Delays": "false",
+          "cf_EMCCD": "false",
+          "cf_EShutter": "false",
+          "cf_HDR": "false",
+          "cf_Image": "true",
+          "cf_MemorySlots": "true",
+          "cf_Metadata": "false",
+          "cf_MultipleExposeTimes": "false",
+          "cf_MultipleSensors": "false",
+          "cf_PulseSummation": "false",
+          "cf_ROIs": "true",
+          "cf_Signals": "true",
+          "cf_Spectra": "true",
+          "cf_TriggerQualifier": "false",
+          "cf_Triggers": "true"
+        },
+        "triggers": [
+          {
+            "events": [
+              {
+                "name": "Once - Start All",
+                "token": 0,
+                "types": [
+                  {
+                    "name": "TTL Falling Edge",
+                    "token": 0
+                  },
+                  {
+                    "name": "TTL Rising  Edge",
+                    "token": 1
+                  }
+                ]
+              },
+              {
+                "name": "Each - For Each Acq",
+                "token": 1,
+                "types": [
+                  {
+                    "name": "TTL Falling Edge",
+                    "token": 0
+                  },
+                  {
+                    "name": "TTL Rising  Edge",
+                    "token": 1
+                  }
+                ]
+              }
+            ],
+            "name": "Trigger Input",
+            "token": 0
+          }
+        ],
+        "version": "Syncerity Ver 1.001.7.1"
+      }
+    }
+  },
   "ccd_getChipSize": {
     "id": 1234,
     "command": "ccd_getChipSize",
@@ -90,7 +280,7 @@
     "command": "ccd_getFitParams",
     "errors": [],
     "results": {
-      "params": "0,1,0,0,0"
+      "fitParameters": [0,1,0,0,0]
     }
   },
   "ccd_setFitParams": {},
@@ -108,7 +298,7 @@
     "command": "ccd_getTimerResolution",
     "errors": [],
     "results": {
-      "resolution": 1000
+      "resolutionToken": 0
     }
   },
   "ccd_setTimerResolution": {},
@@ -133,6 +323,40 @@
       "count": 1
     }
   },
+  "ccd_getAcquisitionData": {
+    "command":"ccd_getAcquisitionData",
+    "errors":[],
+    "id":0,
+    "results": {
+      "acquisition":
+      [
+        {
+          "acqIndex":1,
+          "roi":
+          [
+            {
+              "roiIndex":1,
+              "xBinning":1,
+              "xData":
+              [
+                [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,615,616,617,618,619,620,621,622,623,624,625,626,627,628,629,630,631,632,633,634,635,636,637,638,639,640,641,642,643,644,645,646,647,648,649,650,651,652,653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,672,673,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,728,729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,750,751,752,753,754,755,756,757,758,759,760,761,762,763,764,765,766,767,768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,862,863,864,865,866,867,868,869,870,871,872,873,874,875,876,877,878,879,880,881,882,883,884,885,886,887,888,889,890,891,892,893,894,895,896,897,898,899,900,901,902,903,904,905,906,907,908,909,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,930,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980,981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999]
+
+              ],
+              "xOrigin":0,
+              "xSize":1000,
+              "yBinning":200,
+              "yData": [
+                [607,605,609,608,605,604,606,607,608,607,606,604,604,606,608,605,606,608,608,606,605,608,607,608,606,607,607,605,608,607,607,607,605,608,608,605,607,606,610,605,605,605,604,606,605,604,604,604,607,606,607,606,605,609,603,607,604,605,603,607,603,606,606,606,606,606,606,604,603,606,606,607,604,607,604,606,605,605,604,607,608,606,605,606,605,603,606,606,607,605,607,608,605,604,607,604,606,607,606,604,606,604,604,606,604,608,603,606,605,606,608,603,604,606,605,607,607,605,606,604,606,606,606,606,606,608,605,606,605,607,607,606,607,607,606,604,604,607,602,605,604,606,606,607,606,605,606,606,608,608,607,605,604,607,606,606,605,605,606,604,606,605,603,606,606,608,607,603,606,605,606,604,605,606,603,607,602,604,606,606,605,606,606,604,606,607,603,603,609,605,605,605,606,606,606,605,605,607,605,608,608,606,606,607,607,608,604,608,604,606,607,605,608,604,605,607,603,607,607,607,606,607,606,605,609,606,603,607,605,605,605,606,604,608,608,607,608,608,606,606,605,611,609,605,604,605,606,608,607,604,607,605,607,604,606,604,609,608,606,606,606,607,605,608,605,606,606,605,607,604,606,606,608,606,606,607,605,604,606,606,606,606,607,608,607,605,604,604,605,606,607,608,604,605,607,606,608,607,606,604,606,605,609,605,608,607,608,608,606,608,608,607,606,607,608,607,606,605,607,607,609,606,605,607,607,606,606,607,607,607,606,607,605,607,608,607,606,609,609,607,607,605,607,609,603,608,607,605,608,605,608,607,607,607,608,607,607,606,609,607,609,608,607,608,605,605,606,607,608,607,608,607,605,606,609,608,606,607,607,606,608,606,606,608,606,607,608,607,606,606,606,606,605,609,607,608,608,610,605,608,609,607,606,605,609,607,608,606,606,609,606,607,609,606,608,607,606,604,608,606,605,606,608,609,604,604,605,607,607,608,607,610,605,606,606,608,606,607,606,605,606,607,606,606,609,607,606,606,607,607,607,606,606,609,609,607,606,607,607,607,605,606,607,606,605,605,607,608,607,605,608,608,603,606,606,607,607,607,608,607,607,607,606,605,608,608,607,604,606,607,608,607,609,605,608,605,606,607,606,607,607,606,607,606,605,604,607,605,608,605,607,606,605,608,605,607,606,607,607,605,606,608,606,607,606,609,605,607,608,606,606,608,604,606,606,608,605,604,605,607,607,609,604,605,607,603,608,604,605,608,607,609,603,609,606,607,606,608,605,606,605,608,606,606,605,606,605,606,605,606,605,607,608,609,607,606,606,609,607,606,604,606,607,607,606,606,608,607,608,605,606,609,610,606,609,606,606,606,607,610,606,607,607,604,605,606,607,606,612,606,605,606,607,608,604,606,608,608,607,607,609,609,605,607,605,607,606,607,606,607,607,607,605,606,605,605,605,607,605,608,606,608,607,607,608,605,607,607,605,608,609,606,604,606,608,606,607,604,605,606,607,607,607,607,605,606,605,606,606,608,607,604,607,609,606,608,606,606,608,606,608,605,604,606,606,604,607,607,605,606,605,605,607,607,606,604,607,608,604,608,605,607,606,605,607,608,603,606,607,606,609,606,609,606,607,607,607,606,605,605,606,606,608,605,605,606,606,607,608,606,606,605,604,603,604,608,606,609,608,606,606,609,607,606,604,606,607,607,605,606,605,609,605,606,606,606,609,608,607,606,608,607,607,608,609,609,604,603,606,607,607,606,605,606,608,607,605,605,602,606,609,607,605,607,604,606,606,607,607,606,606,608,606,607,608,606,607,607,608,607,607,606,607,608,606,606,608,607,606,607,608,607,605,608,606,606,605,605,606,606,606,604,607,608,604,605,606,604,605,605,608,608,605,604,607,606,604,606,608,609,606,605,606,605,606,606,608,608,607,608,608,607,607,609,606,606,607,608,604,605,607,606,606,607,606,605,606,606,607,607,607,608,604,606,605,604,608,606,607,608,606,606,607,608,608,604,606,607,607,608,605,605,604,605,603,607,605,606,607,608,606,604,606,606,608,605,607,609,606,606,606,607,609,606,606,607,605,605,608,606,607,603,605,607,604,606,606,605,607,609,607,608,607,606,606,603,605,605,606,605,608,606,606,607,609,609,604,606,604,608,605,605,607,607,606,605,606,605,605,605,607,606,606,603,606,605,608,607,607,604,605,606,608,605,607,606,608,606,614,608,605,608,604,606,608,607,606,607,607,608,605,610,607,607,607,609,605,609,607,607]
+              ],
+              "yOrigin":0,
+              "ySize":200
+            }
+          ]
+        }
+      ],
+      "timestamp":"2024.04.22 15:07:50.096"
+    }
+  },
   "ccd_setAcqCount": {},
   "ccd_getCleanCount": {
     "command": "ccd_getCleanCount",
@@ -157,12 +381,37 @@
     "errors": [],
     "id": 0,
     "results": {
-      "addressWhere": -1,
-      "eventWhen": -1,
-      "sigTypeHow": -1
+      "address": -1,
+      "event": -1,
+      "signalType": -1
     }
   },
   "ccd_setTriggerIn": {},
-  "ccd_getSignalOut": {},
-  "ccd_setSignalOut": {}
+  "ccd_getSignalOut": {
+    "command": "ccd_getSignalOut",
+    "errors": [],
+    "id": 1234,
+    "results": {
+      "address": 0,
+      "event": 0,
+      "signalType":0
+    }
+  },
+  "ccd_setSignalOut": {},
+  "ccd_getAcquisitionReady": {
+    "command": "ccd_getAcquisitionReady",
+    "errors": [],
+    "id": 1234,
+    "results": {
+      "ready": true
+    }
+  },
+  "ccd_getAcquisitionBusy": {
+    "command": "ccd_getAcquisitionBusy",
+    "errors": [],
+    "id": 1234,
+    "results": {
+      "isBusy": false
+    }
+  }
 }

horiba_sdk/devices/fake_responses/monochromator.json

@@ -9,15 +9,19 @@
     "errors": []
   },
   "mono_list": {
-    "id": 1234,
     "command": "mono_list",
-    "results": {
-      "list": [
-        "0;iHR550;sn12345",
-        "1;iHR320;snabscde"
+    "errors": [],
+    "id": 0,
+    "results":
+    {
+      "devices": [
+        {
+          "deviceType": "HORIBA Scientific iHR",
+          "index": 0,
+          "serialNumber":"1745B-2017-iHR320       "
+        }
       ]
-    },
-    "errors": []
+    }
   },
   "mono_listCount": {
     "id": 1234,
@@ -61,10 +65,33 @@
   "mono_getConfig": {
     "id": 1234,
     "command": "mono_getConfig",
-    "results":{
+    "results": {
+      "configuration": {
+        "filterWheels": [
+          {"location":1},
+          {"location":2}
+        ],
+        "gratings": [
+          {"blaze":0,"grooveDensity":1800,"positionIndex":0},
+          {"blaze":0,"grooveDensity":1200,"positionIndex":1},
+          {"blaze":0,"grooveDensity":300,"positionIndex":2}
+        ],
+        "mirrors": [
+          {"blaze":0,"grooveDensity":1800,"positionIndex":0},
+          {"blaze":0,"grooveDensity":1200,"positionIndex":1},
+          {"blaze":0,"grooveDensity":300,"positionIndex":2}
+        ],
+        "monoModel":"iHR320",
+        "ports": [
+          {"monoPortLocation":1,"slitType":2},
+          {"monoPortLocation":2,"slitType":2},
+          {"monoPortLocation":4,"slitType":2}
+        ],
+        "procuctId":"257",
+        "serialNumber":""
+      }
     },
     "errors": []
-
   },
   "mono_setConfig": {},
   "mono_getPosition": {
@@ -160,7 +187,8 @@
     "id": 1234,
     "command": "mono_getShutterStatus",
     "results": {
-      "position": 0
+      "shutter 1": 0,
+      "shutter 2": 1
     },
     "errors": []
   },

horiba_sdk/devices/monochromator_discovery.py

@@ -20,6 +20,10 @@ class MonochromatorsDiscovery(AbstractDeviceDiscovery):
     async def execute(self, error_on_no_device: bool = False) -> None:
         """
         Discovers the connected Monochromators and saves them internally.
+
+        Raises:
+            Exception: When no Monochromators are discovered and that `error_on_no_device` is set. Or when there is an
+            issue parsing the Monochromators list
         """
         if not self._communicator.opened():
             await self._communicator.open()
@@ -29,18 +33,21 @@ class MonochromatorsDiscovery(AbstractDeviceDiscovery):
             raise Exception('No Monochromators connected')
 
         response = await self._communicator.request_with_response(Command('mono_list', {}))
-        raw_device_list = response.results['list']
+
+        raw_device_list = response.results
         self._monochromators = self._parse_monos(raw_device_list)
-        logger.info(f'Found {len(self._monochromators)} Monochromator devices: {self._monochromators}')
+        logger.info(f'Found {len(self._monochromators)} Monochromator devices')
 
     def _parse_monos(self, raw_device_list: dict[str, Any]) -> list[Monochromator]:
-        detected_monos = []
-        for device_string in raw_device_list:
-            mono_index: int = int(device_string.split(';')[0])
-            mono_type: str = device_string.split(';')[1]
-
-            logger.info(f'Detected Monochromator: {mono_type}')
-            detected_monos.append(Monochromator(mono_index, self._communicator, self._error_db))
+        detected_monos: list[Monochromator] = []
+        for device in raw_device_list['devices']:
+            try:
+                logger.debug(f'Parsing Monochromator: {device}')
+                mono = Monochromator(device['index'], self._communicator, self._error_db)
+                logger.info(f'Detected Monochromator: {device["deviceType"]}')
+                detected_monos.append(mono)
+            except Exception as e:
+                logger.error(f'Error while parsing Monochromator: {e}')
 
         return detected_monos