Commit e44c8a33 authored by rpi2.0's avatar rpi2.0
Browse files

renames nbr_meas into nb_meas (for consistency) - argument used in run_multiple_sequences only

Showing with 4 additions and 4 deletions
+4 -4
...@@ -110,7 +110,7 @@ class OhmPi(object): ...@@ -110,7 +110,7 @@ class OhmPi(object):
# default acquisition settings # default acquisition settings
self.settings = { self.settings = {
'injection_duration': 0.2, 'injection_duration': 0.2,
'nbr_meas': 1, 'nb_meas': 1,
'sequence_delay': 1, 'sequence_delay': 1,
'nb_stack': 1, 'nb_stack': 1,
'export_path': 'data/measurement.csv' 'export_path': 'data/measurement.csv'
...@@ -205,7 +205,7 @@ class OhmPi(object): ...@@ -205,7 +205,7 @@ class OhmPi(object):
Parameters can be: Parameters can be:
- nb_electrodes (number of electrode used, if 4, no MUX needed) - nb_electrodes (number of electrode used, if 4, no MUX needed)
- injection_duration (in seconds) - 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) - sequence_delay (delay in second between each sequence run)
- nb_stack (number of stack for each quadrupole measurement) - nb_stack (number of stack for each quadrupole measurement)
- export_path (path where to export the data, timestamp will be added to filename) - export_path (path where to export the data, timestamp will be added to filename)
...@@ -1249,7 +1249,7 @@ class OhmPi(object): ...@@ -1249,7 +1249,7 @@ class OhmPi(object):
'Increase the sequence delay') 'Increase the sequence delay')
# sleeping time between sequence # 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) time.sleep(sleep_time) # waiting for next measurement (time-lapse)
self.status = 'idle' self.status = 'idle'
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"nb_electrodes": 64, "nb_electrodes": 64,
"injection_duration": 0.2, "injection_duration": 0.2,
"nb_stack": 1, "nb_stack": 1,
"nb_meas" : 1, "nb_meas": 1,
"sequence_delay": 1, "sequence_delay": 1,
"export_path": "data/measurement.csv" "export_path": "data/measurement.csv"
} }
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