From e44c8a33137e9fec51bef4bc89f820a70adc0ca2 Mon Sep 17 00:00:00 2001
From: "rpi2.0" <rpi2.0>
Date: Fri, 28 Oct 2022 14:14:32 +0200
Subject: [PATCH] renames nbr_meas into nb_meas (for consistency) - argument
used in run_multiple_sequences only
---
ohmpi.py | 6 +++---
ohmpi_settings.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ohmpi.py b/ohmpi.py
index 86e92232..ed1f456c 100644
--- a/ohmpi.py
+++ b/ohmpi.py
@@ -110,7 +110,7 @@ class OhmPi(object):
# default acquisition settings
self.settings = {
'injection_duration': 0.2,
- 'nbr_meas': 1,
+ 'nb_meas': 1,
'sequence_delay': 1,
'nb_stack': 1,
'export_path': 'data/measurement.csv'
@@ -205,7 +205,7 @@ class OhmPi(object):
Parameters can be:
- nb_electrodes (number of electrode used, if 4, no MUX needed)
- injection_duration (in seconds)
- - nbr_meas (total number of times the sequence will be run)
+ - nb_meas (total number of times the sequence will be run)
- sequence_delay (delay in second between each sequence run)
- nb_stack (number of stack for each quadrupole measurement)
- export_path (path where to export the data, timestamp will be added to filename)
@@ -1249,7 +1249,7 @@ class OhmPi(object):
'Increase the sequence delay')
# sleeping time between sequence
- if self.settings["nbr_meas"] > 1:
+ if self.settings["nb_meas"] > 1:
time.sleep(sleep_time) # waiting for next measurement (time-lapse)
self.status = 'idle'
diff --git a/ohmpi_settings.json b/ohmpi_settings.json
index 800f0421..8d4907d7 100644
--- a/ohmpi_settings.json
+++ b/ohmpi_settings.json
@@ -2,7 +2,7 @@
"nb_electrodes": 64,
"injection_duration": 0.2,
"nb_stack": 1,
- "nb_meas" : 1,
+ "nb_meas": 1,
"sequence_delay": 1,
"export_path": "data/measurement.csv"
}
--
GitLab