Skip to content

Commit 3613330

Browse files
committed
Update version, docs. Fix whitespace in Figure5
1 parent 30070ea commit 3613330

24 files changed

+251
-141
lines changed

.idea/code.iml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

REPRODUCEME.md

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ and store as an instance of `src.get_data.RawData`.
1212

1313
The data for
1414
each replicate plate
15-
possessing single-stranded DNA with $D_k=1\times10^{-6}$ mol/L is
15+
possessing single-stranded DNA with $B_d=22\times10^{-6}$ mol nucleobases/L is
1616
input into the following structures
1717

1818
>>> kwargs = dict(t="SS", B_d=22e-6, N=22)
@@ -22,7 +22,7 @@ input into the following structures
2222

2323
The data for
2424
each replicate plate
25-
possessing single-stranded DNA with $D_k=2\times10^{-6}$ mol/L is
25+
possessing single-stranded DNA with $B_d=44\times10^{-6}$ mol nucleobases/L is
2626
input into the following structures
2727

2828
>>> kwargs = dict(t="SS", B_d=44e-6, N=22)
@@ -31,7 +31,7 @@ input into the following structures
3131

3232
The data for
3333
each replicate plate
34-
possessing double-stranded DNA with $D_k=1\times10^{-6}$ mol/L is
34+
possessing double-stranded DNA with $B_d=22\times10^{-6}$ mol nucleobases/L is
3535
input into the following structures
3636

3737
>>> kwargs = dict(t="DS", B_d=22e-6, N=22)
@@ -40,7 +40,7 @@ input into the following structures
4040

4141
The data for
4242
each replicate plate
43-
possessing double-stranded DNA with $D_k=2\times10^{-6}$ mol/L is
43+
possessing double-stranded DNA with $B_d=44\times10^{-6}$ mol nucleobases/L is
4444
input into the following structures
4545

4646
>>> kwargs = dict(t="DS", B_d=44e-6, N=22)
@@ -109,6 +109,7 @@ The value for $F_\mathrm{min}$ is
109109
>>> F_min
110110
231432.0
111111

112+
(see Section S1.2 in the Supporting Material),
112113
while the average fluorescence for low dye concentrations is
113114

114115
>>> F_min_avg
@@ -154,15 +155,15 @@ each combination via
154155
... tuple(F_hats),
155156
... (SS_1.T, SS_2.T, DS_1.T, DS_2.T),
156157
... "figure4.pdf",
157-
... sname=r"$\widehat{\mathbf{F}}_{j,i}^\mathrm{LS}$")
158+
... sname=r"\widehat{\mathbf{F}}_{j,i}^\mathrm{LS}")
158159
...
159160

160161
This is Figure 4 of the main text, which can be found [here](out/figure4.pdf).
161162

162163
Subsequently, Equation (18) is solved
163164
using `src.noise_removal.predictor_corrector`
164165
and $V(\mathbf{M})$ and $V(\mathbf{C})$
165-
are calulated
166+
are calulated (see Section S1.3 in the SM)
166167

167168

168169
>>> from src.noise_removal import predictor_corrector
@@ -200,7 +201,7 @@ The results are plotted via Figure 5
200201
... (SS_1.Fhat_tls, SS_2.Fhat_tls, DS_1.Fhat_tls, DS_2.Fhat_tls),
201202
... (SS_1.T, SS_2.T, DS_1.T, DS_2.T),
202203
... "figure5.pdf",
203-
... sname=r"$\widehat{\mathbf{F}}_{j,i}^\mathrm{TLS}$")
204+
... sname=r"\widehat{\mathbf{F}}_{j,i}^\mathrm{TLS}")
204205
...
205206

206207
which can be found [here](out/figure5.pdf),
@@ -251,7 +252,6 @@ we can readily plot the Figure 8 as
251252
...
252253

253254
which looks like [this](out/figure8.pdf).
254-
255255
The association constant is calculated as
256256

257257
>>> K_a = DS.get_K()/2/C_REF/DS.N*1e-6
@@ -273,22 +273,25 @@ which looks like [this](out/figure9.pdf).
273273

274274
## Supplementary Figures
275275

276-
Figure S1 and S2 are made via
276+
Figures [S1](out/figureS1.pdf), [S2](out/figureS2.pdf), [S3](out/figureS3.pdf),
277+
[S4](out/figureS4.pdf), and [S5](out/figureS5.pdf) are made via
277278

278-
>>> from src.plot_raw_data import make_figure_S1, make_figure_S3
279+
>>> from src.plot_raw_data import make_figure_S1
279280
>>> make_figure_S1()
281+
282+
>>> from src.plot_params import plot_figure_S2
283+
>>> plot_figure_S2(SS_1, SS_2, DS_1, DS_2)
284+
285+
>>> from src.plot_raw_data import make_figure_S3
280286
>>> make_figure_S3()
281287
Maximum change from 6/15 to 6/16: 32841
282288
Minimum change from 6/15 to 6/16: -4525
283289
Average change from 6/15 to 6/16: 4085
284290

285-
286-
Figure S2, S4, and S5 are made via
287-
288-
>>> from src.plot_params import plot_figure_S2, plot_figure_S4, \
289-
... plot_figure_S5
290-
>>> plot_figure_S2(SS_1, SS_2, DS_1, DS_2)
291+
>>> from src.plot_params import plot_figure_S4
291292
>>> plot_figure_S4(SS, DS)
293+
294+
>>> from src.plot_params import plot_figure_S5
292295
>>> from src.parameter_extraction import calculate_relative_brightness, \
293296
... calculate_relative_brightness_err
294297
>>> rb = calculate_relative_brightness(SS.get_f(), DS.get_f())

doc/manual.pdf

9.65 KB
Binary file not shown.

doc/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
author = 'Robert F. DeJaco'
2525

2626
# The short X.Y version
27-
version = 'v2.1.0'
27+
version = 'v2.2.0'
2828
# The full version, including alpha/beta/rc tags
29-
release = 'v2.1.0'
29+
release = 'v2.2.0'
3030

3131

3232
# -- General configuration ---------------------------------------------------

doc/source/modules.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Get Data
1414
.. automodule:: src.get_data
1515
:members:
1616

17-
Noise Removal
18-
-------------
17+
Quantifying Noise and Linearity
18+
-------------------------------
1919

2020
.. automodule:: src.noise_removal
2121
:members:
@@ -35,8 +35,8 @@ Raw Data
3535
.. automodule:: src.plot_raw_data
3636
:members:
3737

38-
Noise Removal
39-
.............
38+
Quantifying Noise and Linearity
39+
................................
4040

4141
.. automodule:: src.plot_noise_removal
4242
:members:

out/figure2.pdf

0 Bytes
Binary file not shown.

out/figure4.pdf

-7 Bytes
Binary file not shown.

out/figure5.pdf

-4 Bytes
Binary file not shown.

out/figure6.pdf

0 Bytes
Binary file not shown.

out/figure7.pdf

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)