Commit f136b266 authored by Arnaud WATLET's avatar Arnaud WATLET
Browse files

Adds pwr_state on tx to switch dps on and off

Showing with 27 additions and 27 deletions
+27 -27
...@@ -241,7 +241,7 @@ class Rx(RxAbstract): ...@@ -241,7 +241,7 @@ class Rx(RxAbstract):
self.exec_logger.event(f'{self.model}\trx_init\tend\t{datetime.datetime.utcnow()}') self.exec_logger.event(f'{self.model}\trx_init\tend\t{datetime.datetime.utcnow()}')
@property @property
def gain(self): def gain(self): #TODO: should be in abstract_hardware_components
return self._adc_gain return self._adc_gain
@gain.setter @gain.setter
......
...@@ -99,30 +99,30 @@ class Tx(Tx_mb_2023): ...@@ -99,30 +99,30 @@ class Tx(Tx_mb_2023):
Tx_mb_2023.inject(self, polarity=polarity, injection_duration=injection_duration) Tx_mb_2023.inject(self, polarity=polarity, injection_duration=injection_duration)
self.pin6.value = False self.pin6.value = False
# @property @property
# def pwr_state(self): def pwr_state(self):
# return self._pwr_state return self._pwr_state
#
# @pwr_state.setter @pwr_state.setter
# def pwr_state(self, state, latency=4.): def pwr_state(self, state, latency=4.):
# """Switches pwr on or off. """Switches pwr on or off.
#
# Parameters Parameters
# ---------- ----------
# state : str state : str
# 'on', 'off' 'on', 'off'
# """ """
# if state == 'on': if state == 'on':
# self.pin2.value = True self.pin2.value = True
# self.pin3.value = True self.pin3.value = True
# self.exec_logger.debug(f'Switching DPS on') self.exec_logger.debug(f'Switching DPS on')
# self._pwr_state = 'on' self._pwr_state = 'on'
# time.sleep(latency) # from pwr specs time.sleep(latency) # from pwr specs
# elif state == 'off': elif state == 'off':
# self.pin2.value = False self.pin2.value = False
# self.pin3.value = False self.pin3.value = False
# self.exec_logger.debug(f'Switching DPS off') self.exec_logger.debug(f'Switching DPS off')
# self._pwr_state = 'off' self._pwr_state = 'off'
class Rx(Rx_mb_2023): class Rx(Rx_mb_2023):
......
...@@ -446,13 +446,13 @@ class OhmPiHardware: ...@@ -446,13 +446,13 @@ class OhmPiHardware:
if not append: if not append:
self._clear_values() self._clear_values()
if self.tx.pwr_state == 'off': if self.tx.pwr_state == 'off':
self.tx.pwr_state('on') self.tx.pwr_state = 'on'
switch_pwr_off = True switch_pwr_off = True
for i in range(n_pulses): for i in range(n_pulses):
self._vab_pulse(vab=vab, duration=durations[i], sampling_rate=sampling_rate, polarity=polarities[i], self._vab_pulse(vab=vab, duration=durations[i], sampling_rate=sampling_rate, polarity=polarities[i],
append=True) append=True)
if switch_pwr_off: if switch_pwr_off:
self.tx.pwr_state('off') self.tx.pwr_state = 'off'
def switch_mux(self, electrodes, roles=None, state='off', **kwargs): def switch_mux(self, electrodes, roles=None, state='off', **kwargs):
"""Switches on multiplexer relays for given quadrupole. """Switches on multiplexer relays for given quadrupole.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment