Skip to content

Commit 4e96458

Browse files
committed
scatter_da uses scatter_burst_data
1 parent 6b05a68 commit 4e96458

File tree

3 files changed

+5
-145
lines changed

3 files changed

+5
-145
lines changed

fretbursts/burst_plot.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2129,14 +2129,15 @@ def scatter_fret_width(d, i=0, ax=None):
21292129

21302130

21312131
@_ax_intercept
2132-
def scatter_da(d, i=0, alpha=0.3, ax=None):
2132+
def scatter_da(d, i=0, alpha=0.3, ax=None, **kwargs):
21332133
"""Scatterplot of donor vs acceptor photons (nd, vs na) in each burst."""
2134-
nd = np.concatenate(d.nd) if i is None else d.nd[i]
2135-
na = np.concatenate(d.na) if i is None else d.na[i]
2136-
ax.plot(nd, na, 'o', mew=0, ms=3, alpha=alpha, color='blue')
2134+
plot_kwargs = _normalize_kwargs(dict(lw=0, s=17, alpha=alpha, c='blue'), kind='scatter')
2135+
plot_kwargs.update(_normalize_kwargs(kwargs, kind='scatter'))
2136+
scat = scatter_burst_data(d, 'nd', 'na', ax=ax, **plot_kwargs)
21372137
ax.set_xlabel('# donor ph.'); ax.set_ylabel('# acceptor ph.')
21382138
ax.set_xlim(-5, 200)
21392139
ax.set_ylim(-5, 120)
2140+
return scat
21402141

21412142

21422143
@_ax_intercept

fretbursts/utils/git.py

Lines changed: 0 additions & 140 deletions
This file was deleted.

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ requires-python = ">= 3.7"
3131
dependencies = [
3232
"importlib_metadata;python_version<='3.9'",
3333
"numpy>=1.19",
34-
"matplotlib>=3.0.1",
3534
"scipy>=1.2",
3635
"pandas >= 0.23",
3736
"seaborn>=0.11.1",

0 commit comments

Comments
 (0)