From 6058d156e663a2ce209b20671408b3d9b950d7e4 Mon Sep 17 00:00:00 2001 From: su530201 <olivier.kaufmann@umons.ac.be> Date: Wed, 3 May 2023 10:21:49 +0200 Subject: [PATCH] Improves run_measurement --- hardware_system.py | 2 +- ohmpi.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hardware_system.py b/hardware_system.py index 431d1cdd..6cecf5bf 100644 --- a/hardware_system.py +++ b/hardware_system.py @@ -181,7 +181,7 @@ class OhmPiHardware: self.tx.polarity = 1 self.tx.turn_on() if self.rx.sampling_rate*1000 > best_tx_injtime: - sampling_rate = best_tx_injtime + sampling_rate = best_tx_injtime # TODO: check this... else: sampling_rate = self.tx.sampling_rate self._vab_pulse(vab=vab, length=best_tx_injtime, sampling_rate=sampling_rate) diff --git a/ohmpi.py b/ohmpi.py index d4d5e18d..c588508c 100644 --- a/ohmpi.py +++ b/ohmpi.py @@ -420,7 +420,7 @@ class OhmPi(object): Quadrupole to measure, just for labelling. Only switch_mux_on/off really create the route to the electrodes. nb_stack : int, optional - Number of stacks. A stack is considered two half-cycles (one + Number of stacks. A stack is considered two pulses (one positive, one negative). injection_duration : int, optional Injection time in seconds. @@ -502,7 +502,7 @@ class OhmPi(object): self.switch_mux_off(quad, cmd_id) return d - def run_multiple_sequences(self, cmd_id=None, sequence_delay=None, nb_meas=None, **kwargs): + def run_multiple_sequences(self, cmd_id=None, sequence_delay=None, nb_meas=None, **kwargs): # NOTE : could be renamed repeat_sequence """Runs multiple sequences in a separate thread for monitoring mode. Can be stopped by 'OhmPi.interrupt()'. Additional arguments are passed to run_measurement(). -- GitLab