From 5bacc28e1c6da0caf61b79036621b6f53618e721 Mon Sep 17 00:00:00 2001
From: jkl <sagitta1618@gmail.com>
Date: Sat, 2 Mar 2024 21:21:36 +0100
Subject: [PATCH] Update test
---
.dev/test_mb_2024_4_mux_2023_dps5005.py | 10 +++++-----
ohmpi/ohmpi.py | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.dev/test_mb_2024_4_mux_2023_dps5005.py b/.dev/test_mb_2024_4_mux_2023_dps5005.py
index 1eaccef6..d2877b14 100644
--- a/.dev/test_mb_2024_4_mux_2023_dps5005.py
+++ b/.dev/test_mb_2024_4_mux_2023_dps5005.py
@@ -81,11 +81,11 @@ if within_ohmpi:
print('Starting test with OhmPi.')
k = OhmPi()
# A, B, M, N = (32, 29, 31, 30)
- k.reset_mux()
- k.create_sequence(nelec=6, params=[('wenner', 1)], ireciprocal=True)
- print(k.sequence)
- k.run_sequence(cycles=1, tx_vold=5, cycle_duration=0.2)
- k.plot_last_fw()
+ # k.reset_mux()
+ # k.create_sequence(nelec=6, params=[('wenner', 1)], ireciprocal=True)
+ # print(k.sequence)
+ # k.run_sequence(cycles=1, tx_vold=5, cycle_duration=0.2)
+ # k.plot_last_fw()
k.export(ftype='bert')
# k.export(fnames=['data/measurements_20240226T180635.csv'], ftype='bert')
# k.download_data()
diff --git a/ohmpi/ohmpi.py b/ohmpi/ohmpi.py
index fffa5024..b06a25ef 100644
--- a/ohmpi/ohmpi.py
+++ b/ohmpi/ohmpi.py
@@ -1140,7 +1140,7 @@ class OhmPi(object):
# handle parameters default values
if fnames is None:
datadir = os.path.join(os.path.dirname(__file__), '../data/')
- fnames = [os.path.join(datadir, f) for f in os.listdir(datadir) if f[-4:] == '.csv']
+ fnames = [os.path.join(datadir, f) for f in os.listdir(datadir) if (f[-4:] == '.csv' and f[-7:] != '_rs.csv')]
if outputdir is None:
outputdir = os.path.join(os.path.dirname(__file__), '../output/')
if os.path.exists(outputdir) is False:
--
GitLab