Skip to content

Commit fd3fd4f

Browse files
committed
Merge branch 'release/1.5.1' into main
2 parents 0ae3c2a + 59dbb44 commit fd3fd4f

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

endaq/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
import endaq.batch
66

77

8-
__version__ = "1.5.0"
8+
__version__ = "1.5.1"

endaq/calc/integrate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def _integrate(
1919
dt = utils.sample_spacing(df)
2020

2121
result = df.apply(
22-
functools.partial(scipy.integrate.cumulative_trapezoid, dx=dt, initial=0),
22+
functools.partial(scipy.integrate.cumtrapz, dx=dt, initial=0),
2323
axis=0,
2424
raw=True,
2525
)

endaq/plot/plots.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,9 +1425,9 @@ def table_plot_from_ide(
14251425
fig_table = table_plot(table=table, **kwargs)
14261426

14271427
# Add Title
1428-
recorder_name = doc.recorderInfo['RecorderName']
1429-
serial = doc.recorderInfo['RecorderSerial']
1430-
part_no = doc.recorderInfo['PartNumber']
1428+
recorder_name = doc.recorderInfo.get('RecorderName', '')
1429+
serial = doc.recorderInfo.get('RecorderSerial', '')
1430+
part_no = doc.recorderInfo.get('PartNumber', '')
14311431
date = pd.to_datetime(doc.lastUtcTime, unit='s')
14321432
table_title = f'{recorder_name} (# {serial}, a {part_no})<br>Recorded on {date}'
14331433
text_size = fig_table.layout.template.layout.font.size

0 commit comments

Comments
 (0)