From e2004e65a76bec12f32dcc457bc5293aa4691e3a Mon Sep 17 00:00:00 2001 From: awatlet <arnaud.watlet@umons.ac.be> Date: Wed, 22 Nov 2023 09:27:47 +0100 Subject: [PATCH] Temporary fixes fulldata in csv but will be changed soon (issue #108) --- ohmpi/ohmpi.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ohmpi/ohmpi.py b/ohmpi/ohmpi.py index 6e5dda19..891887cb 100644 --- a/ohmpi/ohmpi.py +++ b/ohmpi/ohmpi.py @@ -190,16 +190,16 @@ class OhmPi(object): # TODO need to make all the full data of the same size (pre-populate # readings with NaN in hardware_system.OhmPiHardware.read_values()) if 'fulldata' in last_measurement: - # d = last_measurement['fulldata'] - # n = d.shape[0] - # if n > 1: - # idic = dict(zip(['i' + str(i) for i in range(n)], d[:, 0])) - # udic = dict(zip(['u' + str(i) for i in range(n)], d[:, 1])) - # tdic = dict(zip(['t' + str(i) for i in range(n)], d[:, 2])) - # last_measurement.update(idic) - # last_measurement.update(udic) - # last_measurement.update(tdic) - last_measurement.pop('fulldata') + d = last_measurement['fulldata'] + n = d.shape[0] + if n > 1: + idic = dict(zip(['i' + str(i) for i in range(n)], d[:, 0])) + udic = dict(zip(['u' + str(i) for i in range(n)], d[:, 1])) + tdic = dict(zip(['t' + str(i) for i in range(n)], d[:, 2])) + last_measurement.update(idic) + last_measurement.update(udic) + last_measurement.update(tdic) + # last_measurement.pop('fulldata') if os.path.isfile(filename): # Load data file and append data to it -- GitLab