diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index 58a7d272..3f876f57 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -535,8 +535,9 @@ class AareDAQ: logger.error(f"Failed to park and dry: {e}") raise e - def __magnet_position_sensor_check(self, timeout: float = 360.0, repeat: bool = True): + def __magnet_position_sensor_check(self, timeout: float = 10.0, repeat: bool = True): #TODO check this works, add beamstop z controls and test. + #There is a problem with the amgent sensor pvs # logger.info("checking beamstop") # if self.__devs.beamstop_z.value < 24.0: @@ -544,8 +545,8 @@ class AareDAQ: if not self.__devs.magnet_position_sensor_state or self.__devs.magnet_position_sensor_state.value == 0: logger.warning("!!!!!!!!!!!!!!!!!!!!!magnet position sensor not connected!!!!!!!!!!!!!!!!!!") raise MagnetPositionSensorErorr("Magnet position sensor not connected") - - if self.__devs.magnet_position_sensor.value != 0: + logger.warning("THERE IS A PROBLEM WITH THE MAGNET SENSOR PVS PLEASE FIX") + if self.__devs.magnet_position_sensor_readout.value != 0: time.sleep(1) logger.warning("!!!!!!!!!!!!!!!!!!!!!magnet position sensor readout not 0!!!!!!!!!!!!!!!!!!") logger.debug(f"Checking magnet position sensor positon: {self.__devs.magnet_position_sensor_readout.value}")