Skip to content

Commit 0e22859

Browse files
authored
Dev (#16)
* new example * v=0.4.3 * inserted n_el 16 and 32 save dicts * updated example scripts * new example for converting measurement directorys to csv * first implementation of npz to csv * corrected plot angle * fixed position error of measurement * 0.4.4 * added logo * deleted section * new release of 0.4.2 * added 0.5.0 * linting * appended ScioSpecMeasurementConfig * update examples * linting * flake * Update README.md * updated docstring and resolved import error * linting * deleted old docs * added excitation frequency * Inserted exc_freq to dependent files. * v==0.5.2 * prep for pytest publish * pctr * updated picture * v==0.6.0 * changed logo * Update README.md * v==0.6.1 * Update README.md * angle correction * inserted daytime and temperature * docstring and data format * temperature visualization * linting * new visualization and black linting==23.1.0 * updated black==23.1.0 * pypitest==0.6.1.4 * pypi test == 0.6.1.5 * pypi test == 0.6.1.5 * v==0.6.2 * implemented visualization, not added to init * linting * linting#2 * linting #3 * meshing * inserted citation cff * added citation cff * zenodo doi * inserted absolute valued potential data * Implemented mesh generation * gitignore .vscode * inserted raw string for fixing error. * changed function names and inserted v computation * linting * docstring and function descriptions. * linting * skipping first measured value * changed absolute label at potential matrix * init. mesh for import * first try to use pyvista * pyvisa changes * changed prepare for ml routine * merge dev to 3d * updated function * added file in ignore * modified configurations and added an example for 32 electrodes measurement * modified burst count * deleted prototyping functions. * ignored .vsc settings * updated reqs * fixed npz to csv conversion error * changed names of example measurements * deleted unspecified measurement example. * Adjusting the configurations * Ready for test measurements using 32 electrodes. * Inserted Issue marker in npz_to_csv.npz * working example measurement scripts * updated setup_m * linting and ignore * linting and updates * new example script * pypi test release * new release v==0.6.4 * updated readme * Updated Readme TDB * preperations for Ethernet connection * new pytest version and typos * linting * updated and undo some changes from pytest 0.6.4.7 * release==0.6.4.8 * channel group repeated bug resolved. * Added further information, optimized the .gitignore. * fixed current computation configuration bug.
1 parent 919e738 commit 0e22859

4 files changed

Lines changed: 10 additions & 8 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dist/
44
.eggs/
55
sciopy.egg-info/
66
.ipynb_checkpoints
7-
.ipynb
7+
*.ipynb
88
developing.ipynb
99
update_package.sh
1010
update_test_pypi.sh

examples/custom_measurement.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
total_meas_num=10,
2222
n_el=16,
2323
channel_group=[1],
24-
exc_freq=10_000,
24+
exc_freq=10_000, # 10,000Hz = 10kHz
2525
framerate=5,
26-
amplitude=10,
26+
amplitude=0.01, # 0.01A = 10mA (maximum)
2727
inj_skip=0,
2828
gain=1,
29-
adc_range=1,
29+
adc_range=1, # +/- 1V
3030
notes="None",
3131
configured=False,
3232
)

sciopy/configurations.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ def clTbt_dp(val: float) -> list:
6161
# Excitation amplitude double precision
6262
# A_min = 100nA
6363
# A_max = 10mA
64-
if ssms.amplitude > 0.001:
65-
print(f"Divide {ssms.amplitude}/1000. Out of available range")
66-
ssms.amplitude = ssms.amplitude / 1000
64+
if ssms.amplitude > 0.01:
65+
print(
66+
f"Amplitude {ssms.amplitude}A is out of available range.\nSet amplitude to 10mA."
67+
)
68+
ssms.amplitude = 0.01
6769
serial.write(
6870
bytearray(list(np.concatenate([[176, 9, 5], clTbt_dp(ssms.amplitude), [176]])))
6971
)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setuptools.setup(
44
name="sciopy",
5-
version="0.6.4.8",
5+
version="0.6.4.9",
66
author="Jacob Peter Thönes",
77
author_email="jacob.thoenes@uni-rostock.de",
88
description="Python based interface module for communication with the ScioSpec Electrical Impedance Tomography (EIT) device.",

0 commit comments

Comments
 (0)