Skip to content

Commit dc862ed

Browse files
JacobTh98JacobTh98
committed
linting
1 parent 2ba641d commit dc862ed

6 files changed

Lines changed: 88 additions & 46 deletions

File tree

‎examples/EIT-16-256-MessageParser.ipynb‎

Lines changed: 74 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"import time\n",
2929
"from sciopy.sciopy import EIT_16_32_64_128, EitMeasurementSetup, available_serial_ports\n",
3030
"from sciopy.sciopy import make_results_folder\n",
31+
"\n",
3132
"# create a 'sciospec' EIT device\n",
3233
"n_el = 16\n",
3334
"sciospec = EIT_16_32_64_128(n_el)\n",
@@ -64,7 +65,7 @@
6465
" amplitude=0.01,\n",
6566
" inj_skip=n_el // 2,\n",
6667
" gain=1,\n",
67-
" adc_range=1\n",
68+
" adc_range=1,\n",
6869
")\n",
6970
"sciospec.SetMeasurementSetup(setup)\n",
7071
"# look inside the docstring of the function and manual\n",
@@ -109,43 +110,76 @@
109110
"execution_count": null,
110111
"source": [
111112
"# 1) With burstcount\n",
112-
"sciospec.update_BurstCount(3) \n",
113-
"data= sciospec.StartStopMeasurement(return_as=\"eitframe\", bSaveData=False, bDeleteData=False,\n",
114-
" sSavePath=savepath, bResultsFolder=False)\n",
113+
"sciospec.update_BurstCount(3)\n",
114+
"data = sciospec.StartStopMeasurement(\n",
115+
" return_as=\"eitframe\",\n",
116+
" bSaveData=False,\n",
117+
" bDeleteData=False,\n",
118+
" sSavePath=savepath,\n",
119+
" bResultsFolder=False,\n",
120+
")\n",
115121
"print(data.shape)\n",
116122
"\n",
117123
"# 2) Continuous measurement\n",
118124
"sciospec.update_BurstCount(0)\n",
119-
"data= sciospec.StartStopMeasurement(timeout= 5,return_as=\"eitframe\", bSaveData=False, bDeleteData=False,\n",
120-
" sSavePath=savepath,bResultsFolder=False) # measured for five seconds\n",
125+
"data = sciospec.StartStopMeasurement(\n",
126+
" timeout=5,\n",
127+
" return_as=\"eitframe\",\n",
128+
" bSaveData=False,\n",
129+
" bDeleteData=False,\n",
130+
" sSavePath=savepath,\n",
131+
" bResultsFolder=False,\n",
132+
") # measured for five seconds\n",
121133
"print(data.shape)\n",
122134
"\n",
123135
"\n",
124-
"\n",
125136
"# 3) Save data in real time and create an additional folder for storage\n",
126-
"data= sciospec.StartStopMeasurement(timeout= 5,return_as=\"eitframe\", bSaveData=True, bDeleteData=False,\n",
127-
" sSavePath=savepath,bResultsFolder=True) # measured for five seconds\n",
137+
"data = sciospec.StartStopMeasurement(\n",
138+
" timeout=5,\n",
139+
" return_as=\"eitframe\",\n",
140+
" bSaveData=True,\n",
141+
" bDeleteData=False,\n",
142+
" sSavePath=savepath,\n",
143+
" bResultsFolder=True,\n",
144+
") # measured for five seconds\n",
128145
"print(data.shape)\n",
129146
"\n",
130147
"\n",
131-
"\n",
132-
"\n",
133148
"# 4) For continuous saving results in the same folder, create a folder before and then pass it along\n",
134-
"sCurrPath= make_results_folder(bCreateResultsFolder=True, bSaveData=True, sSavePath=savepath)\n",
135-
"sciospec.StartStopMeasurement(timeout= 5,return_as=\"eitframe\", bSaveData=True, bDeleteData=True,\n",
136-
" sSavePath=sCurrPath,bResultsFolder=False) # measured for five seconds\n",
149+
"sCurrPath = make_results_folder(\n",
150+
" bCreateResultsFolder=True, bSaveData=True, sSavePath=savepath\n",
151+
")\n",
152+
"sciospec.StartStopMeasurement(\n",
153+
" timeout=5,\n",
154+
" return_as=\"eitframe\",\n",
155+
" bSaveData=True,\n",
156+
" bDeleteData=True,\n",
157+
" sSavePath=sCurrPath,\n",
158+
" bResultsFolder=False,\n",
159+
") # measured for five seconds\n",
137160
"time.sleep(3)\n",
138-
"sciospec.StartStopMeasurement(timeout= 5,return_as=\"eitframe\", bSaveData=True, bDeleteData=True,\n",
139-
" sSavePath=sCurrPath,bResultsFolder=False) # measured for five seconds\n",
161+
"sciospec.StartStopMeasurement(\n",
162+
" timeout=5,\n",
163+
" return_as=\"eitframe\",\n",
164+
" bSaveData=True,\n",
165+
" bDeleteData=True,\n",
166+
" sSavePath=sCurrPath,\n",
167+
" bResultsFolder=False,\n",
168+
") # measured for five seconds\n",
140169
"time.sleep(3)\n",
141-
"sciospec.StartStopMeasurement(timeout= 5,return_as=\"eitframe\", bSaveData=True, bDeleteData=True,\n",
142-
" sSavePath=sCurrPath,bResultsFolder=False) # measured for five seconds\n",
143-
"\n",
170+
"sciospec.StartStopMeasurement(\n",
171+
" timeout=5,\n",
172+
" return_as=\"eitframe\",\n",
173+
" bSaveData=True,\n",
174+
" bDeleteData=True,\n",
175+
" sSavePath=sCurrPath,\n",
176+
" bResultsFolder=False,\n",
177+
") # measured for five seconds\n",
144178
"\n",
145179
"\n",
146180
"# Arguments:\n",
147181
"# bDeleteData: Data is not returned but if bSaveData=True saved, and is deleted from an internal buffer. For False, data is returned according to return_as\n",
148-
"# bSaveData: if Data should be saved in-time with the measurements. Data is saved at sSavePath, \n"
182+
"# bSaveData: if Data should be saved in-time with the measurements. Data is saved at sSavePath,"
149183
],
150184
"id": "143a513757acfe71"
151185
},
@@ -169,11 +203,15 @@
169203
"source": [
170204
"# Standard setting \"singleended\" -> potential measurement\n",
171205
"sciospec.GetMeasurementSetup(2)\n",
172-
"sciospec.update_BurstCount(3) \n",
173-
"data= sciospec.StartStopMeasurement(return_as=\"eitframe\", bSaveData=False, bDeleteData=False,\n",
174-
" sSavePath=savepath, bResultsFolder=False)\n",
175-
"data_pot=np.abs(data[2])\n",
176-
"\n"
206+
"sciospec.update_BurstCount(3)\n",
207+
"data = sciospec.StartStopMeasurement(\n",
208+
" return_as=\"eitframe\",\n",
209+
" bSaveData=False,\n",
210+
" bDeleteData=False,\n",
211+
" sSavePath=savepath,\n",
212+
" bResultsFolder=False,\n",
213+
")\n",
214+
"data_pot = np.abs(data[2])"
177215
],
178216
"id": "5db0b9e7255bf10b"
179217
},
@@ -193,10 +231,15 @@
193231
"sciospec.GetMeasurementSetup(2)\n",
194232
"# look inside the docstring of the function and manual\n",
195233
"\n",
196-
"sciospec.update_BurstCount(3) \n",
197-
"data= sciospec.StartStopMeasurement(return_as=\"eitframe\", bSaveData=False, bDeleteData=False,\n",
198-
" sSavePath=savepath, bResultsFolder=False)\n",
199-
"data_skip4= np.abs(data[2])\n",
234+
"sciospec.update_BurstCount(3)\n",
235+
"data = sciospec.StartStopMeasurement(\n",
236+
" return_as=\"eitframe\",\n",
237+
" bSaveData=False,\n",
238+
" bDeleteData=False,\n",
239+
" sSavePath=savepath,\n",
240+
" bResultsFolder=False,\n",
241+
")\n",
242+
"data_skip4 = np.abs(data[2])\n",
200243
"\n",
201244
"\n",
202245
"fig, ax = plt.subplots(ncols=2)\n",
@@ -215,7 +258,6 @@
215258
"outputs": [],
216259
"execution_count": null,
217260
"source": [
218-
"\n",
219261
"# Alternatively,\n",
220262
"setup = EitMeasurementSetup(\n",
221263
" burst_count=4,\n",
@@ -227,12 +269,9 @@
227269
" gain=1,\n",
228270
" adc_range=1,\n",
229271
" mea_mode=\"skip2\",\n",
230-
" mea_mode_boundary=\"external\"\n",
272+
" mea_mode_boundary=\"external\",\n",
231273
")\n",
232-
"sciospec.SetMeasurementSetup(setup)\n",
233-
"\n",
234-
"\n",
235-
"\n"
274+
"sciospec.SetMeasurementSetup(setup)"
236275
],
237276
"id": "a026d514146eb1f0"
238277
}

‎sciopy/EIT_16_32_64_128.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ def StartStopMeasurement(
660660
bSaveData=bSaveData,
661661
bDeleteDataFrame=bDeleteData,
662662
sSavePath=sCurrentPath,
663-
bStartReset=False
663+
bStartReset=False,
664664
)
665665

666666
self.cMessageParser.clear_out_data()

‎sciopy/ISX_3.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
from .sciopy_dataclasses import EisMeasurementSetup
1313

14-
1514
msg_dict = {
1615
"0x01": "No message inside the message buffer",
1716
"0x02": "Timeout: Communication-timeout (less data than expected)",
@@ -62,8 +61,7 @@ def __init__(self, VID: hex = 0x0403, PID: hex = 0x89D0) -> None:
6261

6362
def info():
6463
print("ISX-3v2 EIT device specifications")
65-
print(
66-
"""
64+
print("""
6765
Frequency
6866
range: 100mHz to 10MHz
6967
resolution: <10mHz @ f<10kHz
@@ -103,8 +101,7 @@ def info():
103101
104102
[1] Sweep-Delay: Timing delay between two consecutive measurements of complete impedance spectra
105103
[2] Point-Delay: Timing delay between two consecutive measurements of single frequencies
106-
"""
107-
)
104+
""")
108105

109106
def list_usb_devices(self):
110107
"""

‎sciopy/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from .ISX_3 import ISX_3, EisMeasurementSetup
99
from .usb_message_parser import make_results_folder
1010

11-
1211
__all__ = [
1312
"available_serial_ports",
1413
"EIT_16_32_64_128",

‎sciopy/doteit.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import pickle
66
from .sciopy_dataclasses import SingleEitFrame
77

8-
98
header_keys = [
109
"number_of_header",
1110
"file_version_number",

‎sciopy/usb_message_parser.py‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,11 @@ def read_usb_for_seconds(
260260

261261
# ---------------------------------------------------------------------------------------------------------------- #
262262
def read_usb_till_timeout(
263-
self, bSaveData:bool =False, bDeleteDataFrame:bool =False, sSavePath:str="C/", bStartReset: bool=True
263+
self,
264+
bSaveData: bool = False,
265+
bDeleteDataFrame: bool = False,
266+
sSavePath: str = "C/",
267+
bStartReset: bool = True,
264268
):
265269
"""
266270
Reads out the USB connection until the connections times out, so for messages received + timeout. Data bytes are parsed,
@@ -341,7 +345,9 @@ def interpret_data_input(
341345
if (
342346
message[2] <= self.iMaxChannelGroups
343347
): # Necessary, since all four channel groups are send
344-
if message[2] == 1 and freq_group == 1: # todo or gleich 0, weil er nicht mitschreibt
348+
if (
349+
message[2] == 1 and freq_group == 1
350+
): # todo or gleich 0, weil er nicht mitschreibt
345351
self.CurrentFrame.excitation_stgs[self.iInjIndex] = [
346352
message[3],
347353
message[4],
@@ -354,7 +360,9 @@ def interpret_data_input(
354360

355361
# TIMESTAMP
356362
if self.iSaveCounter == 0:
357-
self.CurrentFrame.timestamp1 = message[7:11] #todo byteinarray_to_flaost
363+
self.CurrentFrame.timestamp1 = message[
364+
7:11
365+
] # todo byteinarray_to_flaost
358366
self.CurrentFrame.timestamp_pc = datetime.now().timestamp()
359367

360368
# Data Handling

0 commit comments

Comments
 (0)