cgse 2023.36.0__tar.gz → 2023.38.0__tar.gz

{cgse-2023.36.0/src/cgse.egg-info → cgse-2023.38.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cgse
-Version: 2023.36.0
+Version: 2023.38.0
 Summary: PLATO Common-EGSE
 Author-email: Rik Huygen <rik.huygen@kuleuven.be>, Sara Regibo <sara.regibo@kuleuven.be>
 Maintainer: Pierre Royer, Nicolas Beraud, Sena Gomashie, Jesus Saiz
@@ -13,12 +13,63 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
+License-File: COPYING
+License-File: COPYING.LESSER
+Requires-Dist: apscheduler
+Requires-Dist: astropy
+Requires-Dist: click
+Requires-Dist: deepdiff
+Requires-Dist: distro
+Requires-Dist: ginga
+Requires-Dist: gitpython>=3
+Requires-Dist: h5py>=3.5
+Requires-Dist: invoke
+Requires-Dist: matplotlib>=3.5
+Requires-Dist: natsort
+Requires-Dist: numpy==1.22.4
+Requires-Dist: openpyxl
+Requires-Dist: pandas
+Requires-Dist: paramiko
+Requires-Dist: persist-queue
+Requires-Dist: prometheus-client
+Requires-Dist: psutil
+Requires-Dist: pyqtgraph
+Requires-Dist: pytz
+Requires-Dist: pyyaml
+Requires-Dist: pyzmq
+Requires-Dist: qled
+Requires-Dist: requests
+Requires-Dist: rich
+Requires-Dist: scipy
+Requires-Dist: sshtunnel
+Requires-Dist: sympy
+Requires-Dist: textual
+Requires-Dist: transforms3d
+Requires-Dist: transitions
+Requires-Dist: typing_extensions
+Requires-Dist: pylibftdi
+Requires-Dist: pyserial
+Requires-Dist: pylzma
+Requires-Dist: pyusb
+Requires-Dist: PyVISA
+Requires-Dist: PyVISA-py
+Requires-Dist: ThorlabsPM100
 Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-mock; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pipdeptree; extra == "dev"
+Requires-Dist: pdoc3; extra == "dev"
 Provides-Extra: pyqt5
+Requires-Dist: pyqt5>=5.15; extra == "pyqt5"
+Requires-Dist: PyQtWebEngine>=5.15; extra == "pyqt5"
 Provides-Extra: pyqt6
+Requires-Dist: pyqt6>=6.5; extra == "pyqt6"
+Requires-Dist: PyQtWebEngine>=6.5; extra == "pyqt6"
 Provides-Extra: tools
-License-File: COPYING
-License-File: COPYING.LESSER
+Requires-Dist: cutelog; extra == "tools"
+Requires-Dist: gui-executor; extra == "tools"
+Requires-Dist: visidata; extra == "tools"
 
 <p align="center">
 <a href="https://ivs-kuleuven.github.io/plato-common-egse/"><img src="MKDOCS/docs/img/cgse-logo-200x200.png"/></a>

{cgse-2023.36.0 → cgse-2023.38.0}/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 
 dependencies = [
     "apscheduler",
-    "astropy == 4.0",  # see issue #1306
+    "astropy",
     "click",
     "deepdiff",
     "distro",

{cgse-2023.36.0 → cgse-2023.38.0/src/cgse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cgse
-Version: 2023.36.0
+Version: 2023.38.0
 Summary: PLATO Common-EGSE
 Author-email: Rik Huygen <rik.huygen@kuleuven.be>, Sara Regibo <sara.regibo@kuleuven.be>
 Maintainer: Pierre Royer, Nicolas Beraud, Sena Gomashie, Jesus Saiz
@@ -13,12 +13,63 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
+License-File: COPYING
+License-File: COPYING.LESSER
+Requires-Dist: apscheduler
+Requires-Dist: astropy
+Requires-Dist: click
+Requires-Dist: deepdiff
+Requires-Dist: distro
+Requires-Dist: ginga
+Requires-Dist: gitpython>=3
+Requires-Dist: h5py>=3.5
+Requires-Dist: invoke
+Requires-Dist: matplotlib>=3.5
+Requires-Dist: natsort
+Requires-Dist: numpy==1.22.4
+Requires-Dist: openpyxl
+Requires-Dist: pandas
+Requires-Dist: paramiko
+Requires-Dist: persist-queue
+Requires-Dist: prometheus-client
+Requires-Dist: psutil
+Requires-Dist: pyqtgraph
+Requires-Dist: pytz
+Requires-Dist: pyyaml
+Requires-Dist: pyzmq
+Requires-Dist: qled
+Requires-Dist: requests
+Requires-Dist: rich
+Requires-Dist: scipy
+Requires-Dist: sshtunnel
+Requires-Dist: sympy
+Requires-Dist: textual
+Requires-Dist: transforms3d
+Requires-Dist: transitions
+Requires-Dist: typing_extensions
+Requires-Dist: pylibftdi
+Requires-Dist: pyserial
+Requires-Dist: pylzma
+Requires-Dist: pyusb
+Requires-Dist: PyVISA
+Requires-Dist: PyVISA-py
+Requires-Dist: ThorlabsPM100
 Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-mock; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pipdeptree; extra == "dev"
+Requires-Dist: pdoc3; extra == "dev"
 Provides-Extra: pyqt5
+Requires-Dist: pyqt5>=5.15; extra == "pyqt5"
+Requires-Dist: PyQtWebEngine>=5.15; extra == "pyqt5"
 Provides-Extra: pyqt6
+Requires-Dist: pyqt6>=6.5; extra == "pyqt6"
+Requires-Dist: PyQtWebEngine>=6.5; extra == "pyqt6"
 Provides-Extra: tools
-License-File: COPYING
-License-File: COPYING.LESSER
+Requires-Dist: cutelog; extra == "tools"
+Requires-Dist: gui-executor; extra == "tools"
+Requires-Dist: visidata; extra == "tools"
 
 <p align="center">
 <a href="https://ivs-kuleuven.github.io/plato-common-egse/"><img src="MKDOCS/docs/img/cgse-logo-200x200.png"/></a>

{cgse-2023.36.0 → cgse-2023.38.0}/src/cgse.egg-info/SOURCES.txt

@@ -633,7 +633,6 @@ src/scripts/n_fee_supply_voltage_calculation.py
 src/scripts/playground.py
 src/scripts/print_hdf5_hk_data.py
 src/scripts/print_register_map.py
-src/scripts/update_operational_cgse 2.py
 src/scripts/update_operational_cgse.py
 src/scripts/update_operational_cgse_old.py
 src/scripts/alerts/cold.yaml

{cgse-2023.36.0 → cgse-2023.38.0}/src/cgse.egg-info/requires.txt

@@ -1,5 +1,5 @@
 apscheduler
-astropy==4.0
+astropy
 click
 deepdiff
 distro

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/alert/__init__.py

@@ -394,11 +394,14 @@ class Alert:
     def mask_check(self, value):
         """ Masks a bitmap and check the state of a single bit
         """
-        self.value = value
+        if isinstance(value, str):
+            value = eval(value)
+        
+        self.value = int(value)
         
-        if (int(value) >> self.configuration.limits['mask']) & 0b1:
+        if (self.value >> self.configuration.limits['mask']) & 0b1:
             self.timed_out = time.time() if self.timed_out == 0.0 else self.timed_out
-            if (time() - self.timed_out) > self.configuration.maximum_age:
+            if (time.time() - self.timed_out) > self.configuration.maximum_age:
                 self.trigger_alert()
         else:
             self.clear_alert()
@@ -452,7 +455,7 @@ class ControlServerWorker:
         
         for process_name, process_info in self.devices.items():
             
-            if ('alert' in process_name.lower())or ('fdir' in process_name.lower()):
+            if ('alert' in process_name.lower()) or ('fdir' in process_name.lower()) or ('dpu' in process_name.lower()):
                 continue
             
             self.monitors[process_name] = {'name' : process_name,

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/config.py

@@ -262,7 +262,7 @@ def get_common_egse_root(path: Union[str, PurePath] = None) -> Optional[PurePath
     Returns:
         Path: the absolute path to the Common-EGSE installation directory or None
     """
-    _TEST_NAMES = ("setup.py", "MKDOCS")
+    _TEST_NAMES = ("pyproject.toml", "setup.py")
     if path is not None:
         return find_root(path, tests=_TEST_NAMES)
 

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/confman/__init__.py

@@ -111,7 +111,6 @@ from __future__ import annotations
 
 import logging
 import operator
-import os
 import subprocess
 import textwrap
 import threading
@@ -120,9 +119,10 @@ from typing import NamedTuple
 from typing import Optional
 from typing import Union
 
-import rich
 import git
+import rich
 from git import GitCommandError
+from prometheus_client import Gauge
 
 from egse.command import ClientServerCommand
 from egse.command import stringify_function_call
@@ -145,16 +145,12 @@ from egse.settings import SettingsError
 from egse.setup import Setup
 from egse.setup import load_last_setup_id
 from egse.setup import save_last_setup_id
-from egse.storage import StorageProxy
-from egse.storage import is_storage_manager_active
-from egse.storage.persistence import TXT
 from egse.system import filter_by_attr
 from egse.system import format_datetime
 from egse.system import replace_environment_variable
 from egse.version import VERSION
 from egse.zmq_ser import bind_address
 from egse.zmq_ser import connect_address
-from prometheus_client import Gauge
 
 LOGGER = logging.getLogger(__name__)
 
@@ -521,6 +517,15 @@ class ConfigurationManagerController(ConfigurationManagerInterface):
     """
 
     def __init__(self):
+
+        # Import these modules here as to optimize the import of classes and functions in other parts of the CGSE.
+        # The CongifurationManagerController is only used by the CM CS and these Storage imports are only used in
+        # this class and take too much loading time...
+
+        from egse.storage import StorageProxy
+        from egse.storage import is_storage_manager_active
+        from egse.storage.persistence import TXT
+
         self._obsid: ObservationIdentifier | None = None
         self._setup_id: int | None = None
         self._camera_name: str | None = None

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/dpu/__init__.py

@@ -1,5 +1,29 @@
 """
-This module defines the commanding interfaces for the DPU-FEE interaction.
+This module defines the commanding interfaces for the DPU—N-FEE interaction.
+
+
+On the *client/user side*, the `DPUProxy` class shall be used for user interactions and commanding with both
+the DPU simulator and the N-FEE. This class connects to the DPU control server which must be running before
+any commands can be processed.
+
+On the *server side*, the `DPUControlServer` class is located in the module `dpu_cs`.
+
+The top-level classes that are of interest to the developer when inspecting this module are:
+
+* `DPUController` which puts the requested commands on the command queue for the `DPUProcessor`
+* `DPUProcessor` is the work horse of the DPU simulator and runs in a separate process. This process communicates
+  directly with the N-FEE through the SpaceWire interface.
+* `DPUInternals` keeps critical information about the DPU and provides information on the status of the
+  readout progress, i.e. where we are in the readout cycle.
+* `DPUMonitoring` provides methods to run a function at a certain time, e.g. right after a long pulse, or to wait
+  for an event, e.g. when an HDF5 file is ready for processing.
+
+The actual commanding is done in `dpu` module. That module also defines the `NFEEState` which acts as a
+mirror of the FPGA status.
+
+This module also defines a number of functions, but they all are for internal use and are not of any interest
+unless you are maintaining this module.
+
 """
 
 import logging
@@ -103,22 +127,18 @@ DATA_TYPE: Dict[str, Type[PersistenceLayer]] = {
     "FITS": FITS,
 }
 
-try:
-    CCD_ID_TO_BIN = GlobalState.setup.camera.fee.ccd_numbering.CCD_ID_TO_BIN
-except AttributeError as exc:
-    LOGGER.error(f"Could not load CCD_ID_TO_BIN from Setup: {exc}")
-    raise
-
 CCD_NUMBERS = [1, 2, 3, 4]
 
+
 def rotate_list(seq, n):
     if (size := len(seq)) < 2:
         return seq
     n = n % len(seq)
     return seq[n:] + seq[:n]
 
-def _get_ccd_readout_order(order_list: list):
-    return sum(CCD_ID_TO_BIN[ccd] << idx * 2 for idx, ccd in enumerate(order_list))
+
+def _get_ccd_readout_order(order_list: list, ccd_id_mapping: list):
+    return sum(ccd_id_mapping[ccd] << idx * 2 for idx, ccd in enumerate(order_list))
 
 
 class NoDataPacketError(Exception):
@@ -1337,6 +1357,9 @@ class DPUInternals:
     # Enumeration with the sensor_sel
     sensor_sel_enum: Enum = None
 
+    # Mapping of the CCD identifier to the binary representation (loaded from the Setup)
+    ccd_id_to_bin: List[int] = None
+
     # The clear_error_flags shall be executed on every readout, i.e. every 200ms and 400ms pulse.
     clear_error_flags = False
 
@@ -1438,14 +1461,17 @@ class DPUProcessor(multiprocessing.Process):
 
     def run(self):
 
+        setup = GlobalState.setup
+
         self._dpu_internals = DPUInternals(
             num_cycles=-1,
             expected_last_packet_flags=[False, False, False, False],
             dump_mode=False,
             internal_sync=False,
             frame_number=-1,
-            ccd_sides_enum=GlobalState.setup.camera.fee.ccd_sides.enum,
-            sensor_sel_enum=GlobalState.setup.camera.fee.sensor_sel.enum,
+            ccd_sides_enum=setup.camera.fee.ccd_sides.enum,
+            sensor_sel_enum=setup.camera.fee.sensor_sel.enum,
+            ccd_id_to_bin=setup.camera.fee.ccd_numbering.CCD_ID_TO_BIN,
         )
 
         # The DPU Processor runs in a different process and since ZeroMQ Sockets are not
@@ -1651,7 +1677,9 @@ class DPUProcessor(multiprocessing.Process):
                             internals = self._dpu_internals
                             internals.current_ccd_readout_order = rotate_list(internals.current_ccd_readout_order, 1)
                             internals.cycle_count += 1
-                            ccd_readout_order = _get_ccd_readout_order(internals.current_ccd_readout_order)
+                            ccd_readout_order = _get_ccd_readout_order(
+                                internals.current_ccd_readout_order, internals.ccd_id_to_bin
+                            )
                             # LOGGER.info(f"{internals.current_ccd_readout_order = }, {ccd_readout_order = }, "
                             #              f"{internals.cycle_count = }")
                             _ = command_set_readout_order(self._transport, self.register_map, ccd_readout_order)

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/dpu/ccd_ui.py

@@ -1,3 +1,4 @@
+"""This module defines widgets that are common to the DPU GUI and the HDF5 GUI."""
 import logging
 from datetime import datetime
 from typing import Optional

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/dpu/dpu_cs.py

@@ -5,12 +5,15 @@ the DPU Controller.
 Start the DPU Control Server from the terminal as follows when you have the real hardware
 connected via a Diagnostic SpaceWire Interface (DSI):
 ```bash
-$ python -m egse.dpu.dpu_cs -a <DSI address> -p <dsi port>
+$ dpu_cs start [-a <IP address of DSI>] [-p <dsi port>]
 ```
 Alternatively, when you want to run the FEE Simulator, start the DPU Control Server as follows:
 ```bash
-$ python -m egse.dpu.dpu_cs --zeromq
+$ dpu_cs start --zeromq
 ```
+This last command will try to connect to an N-FEE simulator that is also started with the `--zeromq` option.
+See the `feesim` module in `egse.fee` for more information.
+
 Please note that software simulators are intended for simple test purposes and will not simulate
 all device behavior correctly, e.g. timing, error conditions, etc.
 

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/dpu/dpu_ui.py

@@ -1,3 +1,11 @@
+"""
+This module implements the image display for the N-FEE data and housekeeping.
+
+The DPU GUI can be started from the command line with the `dpu_ui` command. The GUI will connect to the
+data distribution port of the DPU Processor. For this to work, you will need to have at least a DPU control server
+running.
+
+"""
 import contextlib
 import logging
 import multiprocessing

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/dpu/fitsgen.py

@@ -1,3 +1,11 @@
+"""
+This module define the FITS generation process.
+
+The FITS generation process connects to the monitoring channel of the DPU control server and starts processing
+HDF5 files as soon as they are available. The FITS generation can also be started off-line to process a list
+of HDF5 files or to process a given Observation (OBSID).
+
+"""
 import glob
 import logging
 import multiprocessing

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/env.py

@@ -123,6 +123,8 @@ if __name__ == "__main__":
     import sys
     import rich
 
+    from egse.config import get_common_egse_root
+
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "--full",
@@ -180,6 +182,14 @@ if __name__ == "__main__":
     rich.print("Generated locations and filenames")
 
     with all_logging_disabled():
+        try:
+            rich.print(f"    {get_common_egse_root() = !s}", flush=True)
+            location = get_common_egse_root()
+            if not Path(location).exists():
+                rich.print("[red]ERROR: The generated Common-EGSE location doesn't exist![/]")
+        except ValueError as exc:
+            rich.print(f"    get_common_egse_path() = [red]{exc}[/]")
+
         try:
             rich.print(f"    {get_data_storage_location() = }", flush=True)
             location = get_data_storage_location()
@@ -207,6 +217,7 @@ if __name__ == "__main__":
     if args.full:
         rich.print()
         rich.print(f"    PYTHONPATH=[default]{os.environ.get('PYTHONPATH')}")
+        rich.print(f"    PYTHONSTARTUP=[default]{os.environ.get('PYTHONSTARTUP')}")
         rich.print()
         python_path_msg = "\n      ".join(sys.path)
         rich.print(f"    sys.path=[\n      {python_path_msg}\n    ]")

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/fov/fov_hk.py

@@ -374,25 +374,27 @@ class SronFovHk(FovHk):
                     rotx = radians(monitoring_info["alpha"])    # [radians]
                     roty = radians(monitoring_info["beta"])     # [radians]
 
+                    if isinstance(roty, float):
+                        rotx = np.array([rotx])
+                        roty = np.array([roty])
+
                     tolerance = 1.e-5
 
-                    # Gnomonic distance to optical axis and in-field angle [degrees]
+                    # Corrections based on #598
+                    # Copied from camtest.commanding.function.sron_functions.gimbal_rotations_to_fov_angles
+                    theta = np.arccos(np.cos(rotx) * np.cos(roty))
+
+                    phi = np.zeros_like(roty)
 
-                    theta = degrees(acos(cos(rotx) * cos(roty)))    # [degrees]
+                    sel = np.where(np.abs(roty) < tolerance)
 
-                    phi = 0.0
-                    if abs(roty) < tolerance:
-                        phi = sign(rotx) * pi / 2.
-                    elif abs(roty) > tolerance:
-                        phi = atan(sign(roty) * tan(rotx) / sin(roty))
+                    phi[sel] = np.sign(rotx[sel]) * np.pi/2.
 
-                    phi = degrees(phi)      # [degrees]
+                    sel = np.where(np.abs(roty) > tolerance)
 
-                    if roty < 0:
-                        phi = -180. - phi
+                    phi[sel] = np.arctan2(-np.sin(-rotx[sel]) * np.cos(roty[sel]), np.sin(roty[sel]))
 
-                    if phi < -180:
-                        phi += 360.
+                    theta, phi = np.rad2deg(theta), np.rad2deg(phi)
 
                     store_actual_fov_position(theta, phi)
 

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/logger/__init__.py

@@ -211,7 +211,7 @@ def set_all_logger_levels(level: int):
     #     handler.setLevel(level)
 
 
-if "__main__" == __name__:
+if __name__ == "__main__":
 
     import egse.logger
 

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/settings.yaml

@@ -1,6 +1,6 @@
 Common-EGSE:
-    VERSION:                 2023.36.0+CGSE    # bump version here and below
-    RELEASE:                 September 2023, 2023.36.0+CGSE
+    VERSION:                 2023.38.0+CGSE    # bump version here and below
+    RELEASE:                 September 2023, 2023.38.0+CGSE
 
 SITE:
     ID:                            XXX

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/setup.py

@@ -113,11 +113,8 @@ from typing import Any
 from typing import Optional
 from typing import Union
 
-import pandas
 import rich
 import yaml
-from deepdiff import DeepDiff
-from numpy import genfromtxt
 from rich.tree import Tree
 
 from egse.control import Failure
@@ -154,6 +151,8 @@ def _load_class(class_name: str):
 
 def _load_csv(resource_name: str):
     """Find and return the content of a CSV file."""
+    from numpy import genfromtxt
+
     parts = resource_name[5:].rsplit("/", 1)
     [in_dir, fn] = parts if len(parts) > 1 else [None, parts[0]]
     conf_location = os.environ['PLATO_CONF_DATA_LOCATION']
@@ -216,6 +215,8 @@ def _load_pandas(resource_name: str, separator: str):
         - resource_name: Filename, preceded by "pandas//".
         - separator: Column separator.
     """
+    import pandas
+
     parts = resource_name[8:].rsplit("/", 1)
     [in_dir, fn] = parts if len(parts) > 1 else [None, parts[0]]
     conf_location = os.environ['PLATO_CONF_DATA_LOCATION']
@@ -722,6 +723,7 @@ class Setup(NavigableDict):
     def compare(setup_1: NavigableDict, setup_2: NavigableDict):
         from egse.device import DeviceInterface
         from egse.dpu import DPUSimulator
+        from deepdiff import DeepDiff
 
         return DeepDiff(setup_1, setup_2, exclude_types={DeviceInterface, DPUSimulator})
 

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/stages/arun/smd3_controller.py

@@ -319,11 +319,11 @@ class Smd3Controller(SerialDevice, Smd3Interface):
     
     def configure_homing(self):
         self.select_mode(Smd3Mode.HOME)
-        self.target_frequency(100)
+        self.target_frequency(500)
     
     def configure_remote(self):
         self.select_mode(Smd3Mode.REMOTE)
-        self.target_frequency(500)
+        self.target_frequency(1000)
     
     def save_status(self, status_word):
         for bits, name in SFLAGS.items():
@@ -371,15 +371,10 @@ class Smd3Controller(SerialDevice, Smd3Interface):
         # Home negative side
         self.home('-')
 
-        # Wait until we stat moving
-        time.sleep(0.1)
-        _, _, velocity = self.actual_frequency()
-        while float(velocity) != 0.0:
-            _, _, velocity = self.actual_frequency()
-            time.sleep(1)
+        while not int(self.actual_position()[0], 16) >> 1 & 0x1:
+            time.sleep(0.5)
         
-        # Wait a little bit until we actually stopped    
-        time.sleep(0.1)
+        time.sleep(.5)
         
          # Reset actual position
         self.actual_position(0.0)

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/tempcontrol/beaglebone/beaglebone.py

@@ -9,8 +9,6 @@ from egse.command import ClientServerCommand
 from egse.confman import ConfigurationManagerProxy
 from egse.zmq_ser import connect_address
 
-from gssw.lib.errors import GsswTimeoutError, PeerException
-
 logger = logging.getLogger(__name__)
 
 CTRL_SETTINGS = Settings.load("BeagleBone Heater Control Server")
@@ -291,7 +289,7 @@ class BeagleboneHeaterController(BeagleboneInterface):
         return False
 
     def is_connected(self):
-        return all([heater.connected for heater in self.heaters])
+        return all([heater.connected for heater in self.heaters.values()])
 
     def connect(self):
         for heater in self.heaters.values():

{cgse-2023.36.0 → cgse-2023.38.0}/src/egse/tempcontrol/beaglebone/beaglebone_protocol.py

@@ -13,8 +13,6 @@ from egse.tempcontrol.beaglebone.beaglebone import BeagleboneCommand
 from egse.system import format_datetime
 from egse.zmq_ser import bind_address
 
-from gssw.lib.errors import GsswTimeoutError, PeerException, CommunicationError
-
 COMMAND_SETTINGS = Settings.load(filename='beaglebone.yaml')
 
 logger = logging.getLogger(__name__)
@@ -22,7 +20,7 @@ logger = logging.getLogger(__name__)
 
 class BeagleboneProtocol(CommandProtocol):
 
-
+    from gssw.lib.errors import GsswTimeoutError, PeerException, CommunicationError
 
     def __init__(self, control_server:ControlServer):
         super().__init__()
@@ -73,10 +71,10 @@ class BeagleboneProtocol(CommandProtocol):
                         duty_cycle.append(heater.get_duty_cycle(channel))
     
                     htr_connected[i] = True
-                except CommunicationError as ex:
+                except self.CommunicationError as ex:
                     logger.error("Could not connect to heater %s: %s", i, ex)
                     heater.disconnected()
-                except PeerException as ex:
+                except self.PeerException as ex:
                     logger.warning("Could not retrieve housekeeping from heater %s: %s", i, ex)      
                     
             if not heater.connected:
@@ -110,10 +108,10 @@ class BeagleboneProtocol(CommandProtocol):
                         hk_dict[f"GSRON_HTR_R_{i}_{channel}"] = hk_dict[f"GSRON_HTR_V_{i}_{channel}"] / hk_dict[f"GSRON_HTR_I_{i}_{channel}"] \
                                                                     if hk_dict[f"GSRON_HTR_I_{i}_{channel}"] else 0
                         hk_dict[f"GSRON_HTR_P_{i}_{channel}"] = hk_dict[f"GSRON_HTR_V_{i}_{channel}"] * hk_dict[f"GSRON_HTR_I_{i}_{channel}"]
-                except GsswTimeoutError as ex:
+                except self.GsswTimeoutError as ex:
                     logger.error("Could not connect with Beaglebone heater %s: %s", i, ex)
                     heater.disconnected()
-                except PeerException as ex:
+                except self.PeerException as ex:
                     logger.warning("Could not retrieve housekeeping from heater %s: %s", i, ex)
                     heater.disconnected()
                     

{cgse-2023.36.0 → cgse-2023.38.0}/src/scripts/print_register_map.py

@@ -10,7 +10,11 @@ from egse.reg import RegisterMap
 @click.command()
 @click.argument('filename')
 def print_register_map(filename: str | Path):
-    """Prints the Register Map that is saved in the HDF5 file."""
+    """
+    Prints the Register Map that is saved in the HDF5 file.
+
+    The FILENAME argument shall be the full path to the HDF5 file from which the register map is requested.
+    """
 
     filename = Path(filename)