Skip to content

Commit 790a3fa

Browse files
author
paulmueller
committed
more fixes for unicode on Windows
1 parent ae376f2 commit 790a3fa

11 files changed

+157
-121
lines changed

‎pycorrfit/models/MODEL_TIRF_1C.py‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,16 @@ def MoreInfo_6010(parms, countrate):
211211
# 2D Model Square
212212
m_twodsq6000 = [6000, u"2D", u"2D diffusion w/ square pinhole",
213213
CF_Gxy_TIR_square]
214-
labels_6000 = [u"D [10 µm²/s]", u"σ [100 nm]", "a [100 nm]", u"C_2D [100 /µm²]"]
214+
labels_6000 = [u"D [10 µm²/s]",
215+
u"σ [100 nm]",
216+
u"a [100 nm]",
217+
u"C_2D [100 /µm²]"]
215218
values_6000 = [0.054, 2.3, 7.5, .6] # [D,lamb,NA,a,conc]
216219
# For user comfort we add values that are human readable.
217220
# Theese will be used for output that only humans can read.
218-
labels_human_readable_6000 = [u"D [µm²/s]", u"σ [nm]", "a [nm]",
221+
labels_human_readable_6000 = [u"D [µm²/s]",
222+
u"σ [nm]",
223+
u"a [nm]",
219224
u"C_2D [1/µm²]"]
220225
values_factor_human_readable_6000 = [10, 100, 100, 100]
221226
valuestofit_6000 = [True, False, False, True] # Use as fit parameter?
@@ -225,12 +230,18 @@ def MoreInfo_6010(parms, countrate):
225230
# 3D Model TIR square
226231
m_3dtirsq6010 = [6010, u"3D", "Simple 3D diffusion w/ TIR",
227232
CF_Gxyz_TIR_square]
228-
labels_6010 = [u"D [10 µm²/s]", u"σ [100 nm]","a [100 nm]", "d_eva [100 nm]",
233+
labels_6010 = [u"D [10 µm²/s]",
234+
u"σ [100 nm]",
235+
u"a [100 nm]",
236+
u"d_eva [100 nm]",
229237
u"C_3D [1000 /µm³]"]
230238
values_6010 = [0.520, 2.3, 7.5, 1.0, .0216]
231239
# For user comfort we add values that are human readable.
232240
# Theese will be used for output that only humans can read.
233-
labels_human_readable_6010 = [u"D [µm²/s]", u"σ [nm]", "a [nm]", "d_eva [nm]",
241+
labels_human_readable_6010 = [u"D [µm²/s]",
242+
u"σ [nm]",
243+
u"a [nm]",
244+
u"d_eva [nm]",
234245
u"C_3D [1/µm³]"]
235246
values_factor_human_readable_6010 = [10, 100, 100, 100, 1000]
236247
valuestofit_6010 = [True, False, False, False, True]

‎pycorrfit/models/MODEL_TIRF_2D2D.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ def CF_Gxy_TIR_square_2d2d(parms, tau, wixi=wixi):
9494
# 2D-2D Model TIR
9595
m_tir_2d_2d_mix_6022 = [6022, u"2D+2D","Separate 2D diffusion, TIR",
9696
CF_Gxy_TIR_square_2d2d]
97-
labels_6022 = [ "D"+u"\u2081"+u" [10 µm²/s]",
98-
"D"+u"\u2082"+u" [10 µm²/s]",
97+
labels_6022 = [ u"D"+u"\u2081"+u" [10 µm²/s]",
98+
u"D"+u"\u2082"+u" [10 µm²/s]",
9999
u"σ [100 nm]",
100-
"a [100 nm]",
101-
"C"+u"\u2081"+u" [100 /µm²]",
102-
"C"+u"\u2082"+u" [100 /µm²]",
100+
u"a [100 nm]",
101+
u"C"+u"\u2081"+u" [100 /µm²]",
102+
u"C"+u"\u2082"+u" [100 /µm²]",
103103
u"\u03b1"+" (q"+u"\u2082"+"/q"+u"\u2081"+")"
104104
]
105105
values_6022 = [
@@ -114,12 +114,12 @@ def CF_Gxy_TIR_square_2d2d(parms, tau, wixi=wixi):
114114
# For user comfort we add values that are human readable.
115115
# Theese will be used for output that only humans can read.
116116
labels_human_readable_6022 = [
117-
"D"+u"\u2081"+u" [µm²/s]",
118-
"D"+u"\u2082"+u" [µm²/s]",
117+
u"D"+u"\u2081"+u" [µm²/s]",
118+
u"D"+u"\u2082"+u" [µm²/s]",
119119
u"σ [nm]",
120-
"a [nm]",
121-
"C"+u"\u2081"+u" [1/µm²]",
122-
"C"+u"\u2082"+u" [1/µm²]",
120+
u"a [nm]",
121+
u"C"+u"\u2081"+u" [1/µm²]",
122+
u"C"+u"\u2082"+u" [1/µm²]",
123123
u"\u03b1"+" (q"+u"\u2082"+"/q"+u"\u2081"+")"
124124
]
125125
values_factor_human_readable_6022 = [

‎pycorrfit/models/MODEL_TIRF_3D2D.py‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ def CF_Gxyz_TIR_square_3d2d(parms, tau, wixi=wixi):
103103
"Separate 3D and 2D diffusion, 3D TIR",
104104
CF_Gxyz_TIR_square_3d2d]
105105
labels_6020 = [u"D_3D [10 µm²/s]",
106-
u"D_2D [10 µm²/s]",
107-
u"σ [100 nm]",
108-
"a [100 nm]",
109-
"d_eva [100 nm]",
110-
u"C_3D [1000 /µm³]",
111-
u"C_2D [100 /µm²]",
112-
u"\u03b1"+" (q3D/q2D)"
106+
u"D_2D [10 µm²/s]",
107+
u"σ [100 nm]",
108+
u"a [100 nm]",
109+
u"d_eva [100 nm]",
110+
u"C_3D [1000 /µm³]",
111+
u"C_2D [100 /µm²]",
112+
u"\u03b1"+" (q3D/q2D)"
113113
]
114114
values_6020 = [
115115
50.0, # D_3D [10 µm²/s]
@@ -123,11 +123,12 @@ def CF_Gxyz_TIR_square_3d2d(parms, tau, wixi=wixi):
123123
]
124124
# For user comfort we add values that are human readable.
125125
# Theese will be used for output that only humans can read.
126-
labels_human_readable_6020 = ["D_3D [µm²/s]",
126+
labels_human_readable_6020 = [
127+
u"D_3D [µm²/s]",
127128
u"D_2D [µm²/s]",
128129
u"σ [nm]",
129-
"a [nm]",
130-
"d_eva [nm]",
130+
u"a [nm]",
131+
u"d_eva [nm]",
131132
u"C_3D [1/µm³]",
132133
u"C_2D [1/µm²]",
133134
u"\u03b1"+" (q3D/q2D)"

‎pycorrfit/models/MODEL_TIRF_3D2Dkin_Ries.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -353,16 +353,16 @@ def CF_Gxyz_TIR_square_ubibi(parms, tau,
353353
"Surface binding and unbinding, 3D TIR",
354354
CF_Gxyz_TIR_square_ubibi]
355355
labels_6021 = [u"D_3D [10 µm²/s]",
356-
u"D_2D [10 µm²/s]",
357-
u"σ [100 nm]",
358-
"a [100 nm]",
359-
"d_eva [100 nm]",
360-
u"C_3D [1000 /µm³]",
361-
u"C_2D[100 /µm²]",
362-
u"η_3D",
363-
u"η_2D",
364-
u"k_a [µm³/s]",
365-
u"k_d [10³ /s]"
356+
u"D_2D [10 µm²/s]",
357+
u"σ [100 nm]",
358+
u"a [100 nm]",
359+
u"d_eva [100 nm]",
360+
u"C_3D [1000 /µm³]",
361+
u"C_2D[100 /µm²]",
362+
u"η_3D",
363+
u"η_2D",
364+
u"k_a [µm³/s]",
365+
u"k_d [10³ /s]"
366366
]
367367
values_6021 = [
368368
9.0, # D_3D [10 µm²/s]
@@ -385,14 +385,14 @@ def CF_Gxyz_TIR_square_ubibi(parms, tau,
385385
u"D_3D [µm²/s]",
386386
u"D_2D [µm²/s]",
387387
u"σ [nm]",
388-
"a [nm]",
389-
"d_eva [nm]",
388+
u"a [nm]",
389+
u"d_eva [nm]",
390390
u"C_3D [1/µm³]",
391391
u"C_2D [1/µm²]",
392392
u"η_3D",
393393
u"η_2D",
394394
u"k_a [µm³/s]",
395-
"k_d [1/s]"
395+
u"k_d [1/s]"
396396
]
397397
values_factor_human_readable_6021 = [10, # "D_3D [µm²/s]",
398398
10, # D_2D [10 µm²/s]

‎pycorrfit/models/MODEL_TIRF_3D3D.py‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ def CF_Gxyz_TIR_square_3d3d(parms, tau, wixi=wixi):
108108
m_tir_3d_3d_mix_6023 = [6023, u"3D+3D",
109109
"Separate 3D diffusion, 3D TIR",
110110
CF_Gxyz_TIR_square_3d3d]
111-
labels_6023 = ["D"+u"\u2081"+u" [10 µm²/s]",
112-
"D"+u"\u2082"+u" [10 µm²/s]",
111+
labels_6023 = [u"D"+u"\u2081"+u" [10 µm²/s]",
112+
u"D"+u"\u2082"+u" [10 µm²/s]",
113113
u"σ [100 nm]",
114-
"a [100 nm]",
115-
"d_eva [100 nm]",
114+
u"a [100 nm]",
115+
u"d_eva [100 nm]",
116116
u"C"+u"\u2081"+u" [1000 /µm³]",
117117
u"C"+u"\u2082"+u" [1000 /µm³]",
118118
u"\u03b1"+" (q"+u"\u2082"+"/q"+u"\u2081"+")"
@@ -129,13 +129,14 @@ def CF_Gxyz_TIR_square_3d3d(parms, tau, wixi=wixi):
129129
]
130130
# For user comfort we add values that are human readable.
131131
# Theese will be used for output that only humans can read.
132-
labels_human_readable_6023 = ["D"+u"\u2081"+u" [µm²/s]",
133-
"D"+u"\u2082"+u" [µm²/s]",
132+
labels_human_readable_6023 = [
133+
u"D"+u"\u2081"+u" [µm²/s]",
134+
u"D"+u"\u2082"+u" [µm²/s]",
134135
u"σ [nm]",
135-
"a [nm]",
136-
"d_eva [nm]",
137-
"C"+u"\u2081"+u" [1/µm³]",
138-
"C"+u"\u2082"+u" [1/µm³]",
136+
u"a [nm]",
137+
u"d_eva [nm]",
138+
u"C"+u"\u2081"+u" [1/µm³]",
139+
u"C"+u"\u2082"+u" [1/µm³]",
139140
u"\u03b1"+" (q"+u"\u2082"+"/q"+u"\u2081"+")"
140141
]
141142
values_factor_human_readable_6023 = [10, # "D_3D₁ [µm²/s]",

‎pycorrfit/models/MODEL_TIRF_gaussian_3D2D.py‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -187,32 +187,32 @@ def MoreInfo(parms, countrate):
187187
C2D = n*(1-F) / ( np.pi*r0**2 )
188188
# Correlation function at tau = 0
189189
G_0 = CF_Gxyz_3d2dT_gauss(parms, 0)
190-
Info.append(["G(0)", G_0])
191-
Info.append(["V_eff [al]", Veff])
192-
Info.append(["C_2D [1/µm²]", C2D * 100])
193-
Info.append(["C_3D [nM]", C3D * 10000/6.0221415])
190+
Info.append([u"G(0)", G_0])
191+
Info.append([u"V_eff [al]", Veff])
192+
Info.append([u"C_2D [1/µm²]", C2D * 100])
193+
Info.append([u"C_3D [nM]", C3D * 10000/6.0221415])
194194

195195
if countrate is not None:
196196
# CPP
197197
cpp = countrate/n
198-
Info.append(["cpp [kHz]", cpp])
198+
Info.append([u"cpp [kHz]", cpp])
199199
return Info
200200

201201

202202
# 3D + 3D + T model gauss
203203
m_gauss_3d_2d_t = [6033, "T+3D+2D",
204204
"Separate 3D and 2D diffusion + triplet w/ TIR",
205205
CF_Gxyz_3d2dT_gauss]
206-
labels = ["n",
207-
u"D_2D [10 µm²/s]",
208-
u"D_3D [10 µm²/s]",
209-
"F_3D",
210-
u"r₀ [100 nm]",
211-
"d_eva [100 nm]",
212-
u"\u03b1"+" (q_3D/q_2D)",
213-
u"τ_trip [ms]",
214-
"T",
215-
"offset"
206+
labels = [ u"n",
207+
u"D_2D [10 µm²/s]",
208+
u"D_3D [10 µm²/s]",
209+
u"F_3D",
210+
u"r₀ [100 nm]",
211+
u"d_eva [100 nm]",
212+
u"\u03b1"+" (q_3D/q_2D)",
213+
u"τ_trip [ms]",
214+
u"T",
215+
u"offset"
216216
]
217217
values = [
218218
25, # n
@@ -227,16 +227,16 @@ def MoreInfo(parms, countrate):
227227
0.0 # offset
228228
]
229229
# Human readable stuff
230-
labelshr = ["n",
231-
u"D_2D [µm²/s]",
232-
u"D_3D [µm²/s]",
233-
"F_3D",
234-
u"r₀ [nm]",
235-
"d_eva [nm]",
236-
u"\u03b1"+" (q_3D/q_2D)",
237-
u"τ_trip [µs]",
238-
"T",
239-
"offset"
230+
labelshr = [u"n",
231+
u"D_2D [µm²/s]",
232+
u"D_3D [µm²/s]",
233+
u"F_3D",
234+
u"r₀ [nm]",
235+
u"d_eva [nm]",
236+
u"\u03b1"+" (q_3D/q_2D)",
237+
u"τ_trip [µs]",
238+
u"T",
239+
u"offset"
240240
]
241241
valueshr = [
242242
1., # n

‎pycorrfit/models/MODEL_TIRF_gaussian_3D3D.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,16 @@ def MoreInfo(parms, countrate):
220220
m_gauss_3d_3d_t = [6034, "T+3D+3D",
221221
"Combined 3D diffusion + triplet w/ TIR",
222222
CF_Gxyz_3D3DT_gauss]
223-
labels = ["n",
224-
u"D"+u"\u2081"+" [10 µm²/s]",
225-
u"D"+u"\u2082"+" [10 µm²/s]",
226-
"F"+u"\u2081",
227-
u"r₀ [100 nm]",
228-
"d_eva [100 nm]",
229-
u"\u03b1"+" (q"+u"\u2082"+"/q"+u"\u2081"+")",
230-
u"τ_trip [ms]",
231-
"T",
232-
"offset"
223+
labels = [u"n",
224+
u"D"+u"\u2081"+" [10 µm²/s]",
225+
u"D"+u"\u2082"+" [10 µm²/s]",
226+
u"F"+u"\u2081",
227+
u"r₀ [100 nm]",
228+
u"d_eva [100 nm]",
229+
u"\u03b1"+" (q"+u"\u2082"+"/q"+u"\u2081"+")",
230+
u"τ_trip [ms]",
231+
u"T",
232+
u"offset"
233233
]
234234
values = [
235235
25, # n
@@ -244,16 +244,16 @@ def MoreInfo(parms, countrate):
244244
0.0 # offset
245245
]
246246
# Human readable stuff
247-
labelshr = ["n",
247+
labelshr = [ u"n",
248248
u"D"+u"\u2081"+u" [µm²/s]",
249249
u"D"+u"\u2082"+u" [µm²/s]",
250-
"F"+u"\u2081",
251-
"r₀ [nm]",
252-
"d_eva [nm]",
250+
u"F"+u"\u2081",
251+
u"r₀ [nm]",
252+
u"d_eva [nm]",
253253
u"\u03b1"+" (q"+u"\u2082"+"/q"+u"\u2081"+")",
254254
u"τ_trip [µs]",
255-
"T",
256-
"offset"
255+
u"T",
256+
u"offset"
257257
]
258258
valueshr = [
259259
1., # n

‎pycorrfit/models/MODEL_classic_gaussian_2D.py‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,9 @@ def MoreInfo_6031(parms, countrate):
222222

223223
# 2D Model Gauss
224224
m_twodga6001 = [6001, u"2D", u"2D confocal diffusion", CF_Gxy_gauss]
225-
labels_6001 = ["n", u"τ_diff [ms]", "offset"]
225+
labels_6001 = [u"n",
226+
u"τ_diff [ms]",
227+
u"offset"]
226228
values_6001 = [4.0, 0.4, 0.0]
227229
valuestofit_6001 = [True, True, False]
228230
parms_6001 = [labels_6001, values_6001, valuestofit_6001]
@@ -231,9 +233,17 @@ def MoreInfo_6031(parms, countrate):
231233
# 2D Model Gauss with Triplet
232234
m_twodga6002 = [6002, u"T+2D", u"2D confocal diffusion with triplet",
233235
CF_Gxy_T_gauss]
234-
labels_6002 = ["n", u"τ_diff [ms]", u"τ_trip [ms]", u"T", u"offset"]
236+
labels_6002 = [u"n",
237+
u"τ_diff [ms]",
238+
u"τ_trip [ms]",
239+
u"T",
240+
u"offset"]
235241
values_6002 = [4.0, 0.4, 0.001, 0.01, 0.0]
236-
labels_hr_6002 = ["n", u"τ_diff [ms]", u"τ_trip [µs]", u"T", u"offset"]
242+
labels_hr_6002 = [u"n",
243+
u"τ_diff [ms]",
244+
u"τ_trip [µs]",
245+
u"T",
246+
u"offset"]
237247
factors_hr_6002 = [1., 1., 1000., 1., 1.]
238248
valuestofit_6002 = [True, True, True, True, False]
239249
parms_6002 = [labels_6002, values_6002, valuestofit_6002,

0 commit comments

Comments
 (0)