state as of 01.07.2026, fixing merge conflicts

cfg/lakeshore370_test_cfg.py

@@ -6,7 +6,6 @@ Node('ls370test.psi.ch',
 # IO('io_treg', 'dil2-ts:3001')
 # IO('io_tmon', 'dil2-ts:3003')
 
-
 ### temperature monitoring lakeshore (tmon) ###
 
 IO('io_tmon', 'linse-6837-ts:3001')
@@ -159,3 +158,4 @@ Mod('ch11',
 #     channel = 5,
 #     switcher = 'switcher',
 # )
+

frappy_psi/lakeshore.py

@@ -257,7 +257,7 @@ class Device(HasLscIO, Module):
 
     def get_calib_state(self, sensor):
         if not self.io.is_connected:
-            return CommunicationError('no connection')
+            return CommunicationFailedError('no connection')
         req = self._requests.get(sensor.calcurve)
         if req:
             if req.loading:
@@ -716,6 +716,7 @@ class Sensor(SensorBase):
     def read_raw(self):
         self.status, value, raw = self.get_data()
         self.announceUpdate('value', value, self._value_error)
+
         if self._raw_error:
             raise self._raw_error
         return raw

frappy_psi/lakeshore370.py

@@ -22,7 +22,6 @@
 import time
 from math import sqrt
 from frappy.datatypes import BoolType, EnumType, FloatRange, IntRange, StatusType
-from frappy.lib import formatStatusBits
 from frappy.core import Done, Drivable, Parameter, Property, CommonReadHandler, CommonWriteHandler, Writable, \
     IDLE, ERROR, DISABLED, Command, Attached
 from frappy_psi.channelswitcher import Channel, ChannelSwitcher
@@ -536,6 +535,7 @@ class MainOutput(ls.MainOutput):
         icurrent, htr_range = self.get_best_power_idx(self._desired_max_power, 1.1)
         self._power_scale = self.max_currents[icurrent] ** 2 * self.heater_ranges[htr_range] / 1e4
         self._htr_range = htr_range
+
         control_loop = self.get_control_loop()
         if control_loop is None:
             mode = self.query(f'CMODE?', int)