Skip to content

Commit

Permalink
fix 12 once and for all!
Browse files Browse the repository at this point in the history
  • Loading branch information
pierre-24 committed Jun 7, 2024
1 parent aa9aa5c commit 0b9f9e0
Show file tree
Hide file tree
Showing 14 changed files with 241 additions and 241 deletions.
2 changes: 1 addition & 1 deletion TODO.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# TODOs

- [ ] **12**!!
- [x] **12**!!
- [ ] 62 → 61
- [ ] Use $E^f$ in Fig. 15 (and check discussion, especially **4**)
- [x] Fig. 16 $E_{SHE}$ → $E^0_{abs}$
Expand Down
4 changes: 2 additions & 2 deletions analyses/plot_pot_exp.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def plot_exp_vs_theo(ax, data: pandas.DataFrame, solvent: str, family: str, colo
e = EXCLUDE.copy()

if solvent == 'acetonitrile':
e += [12, 4]
e += [4]

ax.plot(subdata[~subdata['compound'].isin(e)]['E_ox_theo_{}'.format(solvent)], subdata[~subdata['compound'].isin(e)]['E_ox_exp_{}'.format(solvent)], 'o', color=color, label=family.replace('Family.', ''))
ax.plot(subdata[subdata['compound'].isin(e)]['E_ox_theo_{}'.format(solvent)], subdata[subdata['compound'].isin(e)]['E_ox_exp_{}'.format(solvent)], '^', color=color)
Expand All @@ -76,7 +76,7 @@ def plot_corr(ax, data: pandas.DataFrame, solvent: str):
e = EXCLUDE.copy()

if solvent == 'acetonitrile':
e += [12, 4]
e += [4]

x, y = data[~data['compound'].isin(e)]['E_ox_theo_{}'.format(solvent)], data[~data['compound'].isin(e)]['E_ox_exp_{}'.format(solvent)]
result = scipy.stats.linregress(x, y)
Expand Down
8 changes: 4 additions & 4 deletions analyses/plot_pot_matsui.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def prepare_data(data: pandas.DataFrame, data_exp: pandas.DataFrame, solvent):
e = EXCLUDE.copy()

if solvent == 'acetonitrile':
e += [12, 4]
e += [4]

subdata['E_ox_exp_{}'.format(solvent)] /= 1000

Expand All @@ -53,7 +53,7 @@ def plot_exp_vs_matsui(ax, data: pandas.DataFrame, solvent: str, family: str, co
e = EXCLUDE.copy()

if solvent == 'acetonitrile':
e += [12, 4]
e += [4]

ax.plot(subdata[~subdata['compound'].isin(e)]['E_ox_theo_{}'.format(solvent)], subdata[~subdata['compound'].isin(e)]['E_ox_exp_{}'.format(solvent)], 'o', color=color, label=family.replace('Family.', ''))
ax.plot(subdata[subdata['compound'].isin(e)]['E_ox_theo_{}'.format(solvent)], subdata[subdata['compound'].isin(e)]['E_ox_exp_{}'.format(solvent)], '^', color=color)
Expand Down Expand Up @@ -95,7 +95,7 @@ def plot_corr(ax, data: pandas.DataFrame, solvent: str):

subdata_wa, param_matsui_wa = prepare_data(data, data_exp, 'water')

ax1.text(.72, .95, '$E_{{abs}}^0(\\text{{SHE}})$ = {:.2f} V, $f$ = {:.3f}, $\\mu$ = {:.5f} a$_0^{{-1}}$'.format(*param_matsui_wa))
ax1.text(.72, .95, '$E_{{abs}}^0(\\text{{SHE}})$ = {:.2f} V, $f$ = {:.3f}, $\\mu$ = {:.4f} a$_0^{{-1}}$'.format(*param_matsui_wa))

plot_exp_vs_matsui(ax1, subdata_wa, 'water', 'Family.P6O', 'tab:blue')
plot_exp_vs_matsui(ax1, subdata_wa, 'water', 'Family.P5O', 'black')
Expand All @@ -117,7 +117,7 @@ def plot_corr(ax, data: pandas.DataFrame, solvent: str):

subdata_ac, param_matsui_ac = prepare_data(data, data_exp, 'acetonitrile')

ax2.text(.8, 1.18, '$E_{{abs}}^0(\\text{{SHE}})$ = {:.2f} V, $f$ = {:.3f}, $\\mu$ = {:.5f} a$_0^{{-1}}$'.format(*param_matsui_ac))
ax2.text(.8, 1.18, '$E_{{abs}}^0(\\text{{SHE}})$ = {:.2f} V, $f$ = {:.3f}, $\\mu$ = {:.4f} a$_0^{{-1}}$'.format(*param_matsui_ac))

plot_exp_vs_matsui(ax2, subdata_ac, 'acetonitrile', 'Family.P6O', 'tab:blue')
plot_exp_vs_matsui(ax2, subdata_ac, 'acetonitrile', 'Family.P5O', 'black')
Expand Down
38 changes: 19 additions & 19 deletions analyses/pot_exp_acetonitrile.pos
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
,label,x,y
0,2,0.47107081656256083,0.8626264562847373
1,3,0.6230082353797602,0.9097436873361786
2,4,0.5150577324929498,1.0777505761329897
3,6,0.57622874744584,0.8621035654793175
4,12,1.0268763344908078,1.0491506684024725
5,15,0.6886598816640135,0.965439278848284
6,58,0.6751958417970293,1.0764762306693323
7,59,0.6280358102900123,1.1212636224600396
8,23,0.7336737985377431,1.0461970279475303
9,24,0.7316620174253338,1.0750174779414738
10,25,0.6292338759738931,0.9800426591338034
11,26,0.661703136896908,1.043490004299524
12,27,0.7227473476140649,1.0152558467884893
13,33,0.7572007640617795,1.1371366491138988
14,60,0.7240714710440453,1.1078034374927888
15,36,0.6312510424732102,1.013406601014792
16,51,0.5937250173093498,1.0869825136490716
17,54,0.8203968994456231,1.0858583165511493
18,55,0.8439753693864817,1.165234303933909
0,2,0.4663101266619584,0.8357267096992606
1,3,0.6084555387852632,0.9386733692066789
2,4,0.5199938685189629,1.0779033662424182
3,6,0.5911628619980221,0.8905475324035602
4,12,0.7690399212038179,1.0274210462142426
5,15,0.6926786265343476,0.967588536669288
6,58,0.6742445746315999,1.0750194511312918
7,59,0.6296290049635557,1.1201146297970068
8,23,0.7307176738071747,1.0482013370520902
9,24,0.7293125659760725,1.0758314406220157
10,25,0.6278334930236895,0.9809249019985121
11,26,0.662320205889347,1.043588992720294
12,27,0.718516609942202,1.0118854846883651
13,33,0.7621976556546368,1.136168983855862
14,60,0.7247157288568086,1.1083889316397038
15,36,0.632806151936669,1.0138185433167624
16,51,0.5938455635370463,1.0876208875150226
17,54,0.8288033809337171,1.098856555474357
18,55,0.8569689613619252,1.1894641598736704
24 changes: 12 additions & 12 deletions analyses/pot_exp_water.pos
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
,label,x,y
0,2,0.8124121697934003,0.7465247830424631
1,3,0.891946961740928,0.7959117676668113
2,4,0.8357142595897417,0.8199954910719995
3,6,0.910057900275304,0.8231421924373752
4,11,0.9889085505132582,0.8992988790020404
5,12,1.0206408835824246,0.9096848828819359
6,13,0.8517600630200663,0.7862212525596723
7,15,0.9616440515077036,0.8728792246412183
8,18,0.8681894571043665,0.8239660968167094
9,56,0.9096805893995387,0.8710278641417291
10,57,0.7795159782062109,0.8458979417174098
11,58,1.0325533195111207,0.9526216912921555
0,2,0.8146283846602969,0.7418313709025305
1,3,0.8926787768327565,0.7963689707708904
2,4,0.8350603308326259,0.8165332842429055
3,6,0.9099875418205107,0.8269506107416862
4,11,0.9863625664970901,0.8954342253828291
5,12,1.0222334063409073,0.9110111613869104
6,13,0.8505768350028303,0.7867664597527622
7,15,0.9618806425102788,0.8667523823075493
8,18,0.8661494666785456,0.8240118684187091
9,56,0.9032941670606478,0.8765849750428748
10,57,0.7810261190340981,0.8614382456309775
11,58,1.0312274299374853,0.9493179169925247
40 changes: 20 additions & 20 deletions analyses/pot_matsui_acetonitrile.pos
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
,label,x,y
0,2,0.7719213354156457,0.8588353154407806
1,3,0.9678526673446216,0.9104759477869078
2,4,0.8502360116588318,1.0762111553428024
3,6,0.8918614454722418,0.8834112358681666
4,12,1.383122652351279,1.01954420505193
5,61,0.9301404451710953,1.0033869638898798
6,15,1.0258175538877192,0.9631049259687304
7,58,1.0167869505047478,1.07247866025521
8,59,0.9664222931447453,1.12205617967743
9,23,1.0691893518725388,1.0531246034915076
10,24,1.0378814160952519,1.1008661539687596
11,25,0.9709848914853363,0.9789612617826964
12,26,0.9985054319747365,1.0413697621694076
13,27,1.0673862893716253,1.0208911090456274
14,33,1.078899958535133,1.1375535241430488
15,60,1.085412372687642,1.0833348413675072
16,36,1.0218451833840505,0.9987901989521533
17,51,0.9356872941713336,1.0872766547586852
18,54,1.1629114517262755,1.0870426003435425
19,55,1.2061553783217351,1.160394325364748
0,2,0.7790057830806217,0.8628472025562879
1,3,0.9490561866369548,0.9387598943957725
2,4,0.864477061021585,1.0480030746754458
3,6,0.9275455617262816,0.8907854376560402
4,12,1.1070826299393757,1.0270576839571264
5,61,0.9230913701009252,0.9946635538756636
6,15,1.0334342190208217,0.9678716174815154
7,58,1.0123597325071425,1.0749916080920945
8,59,0.96525328781157,1.1215643197244352
9,23,1.0691678842974146,1.047984859117479
10,24,1.0681482947376755,1.0756138723376696
11,25,0.9750804402807908,0.9768566576125046
12,26,1.0005317662464805,1.0436578003528152
13,27,1.056731407133404,1.0124231547792317
14,33,1.1041811040200502,1.134336920239147
15,60,1.0635269944637897,1.108492326772298
16,36,0.9704687060681395,1.0140136700300368
17,51,0.9003838850850974,1.095944295768635
18,54,1.1507451216030202,1.0827941315321066
19,55,1.2069263548097748,1.160325940794643
24 changes: 12 additions & 12 deletions analyses/pot_matsui_water.pos
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
,label,x,y
0,2,0.7284818477542623,0.7388309002510224
1,3,0.8243282220490439,0.7953767730605454
2,4,0.7707575595404491,0.8232337386945031
3,6,0.842198023757423,0.8305582345106642
4,11,0.8826519918252073,0.8951499030888557
5,12,0.942269519530426,0.9101000894132119
6,13,0.7896691823351146,0.7849479216607305
7,15,0.9056887963469589,0.8601312983745463
8,18,0.7917423252494046,0.8092483050640338
9,56,0.8421703097272158,0.872888371517752
10,57,0.7185519742559625,0.8431127030401928
11,58,0.947530829832312,0.9503415367091917
0,2,0.7317522488533128,0.7475348994234288
1,3,0.825241187360119,0.7959288524319228
2,4,0.7697181380993,0.8212392626081266
3,6,0.8401091553332187,0.832691015522909
4,11,0.8838598450754033,0.8980001631915052
5,12,0.9495543784042751,0.9080061185255789
6,13,0.7892076913827715,0.7849089386212346
7,15,0.8955977653454654,0.8660758055682654
8,18,0.791745800567328,0.8093548483189891
9,56,0.838522031743388,0.8759842460158962
10,57,0.7106871839375065,0.8490729188849583
11,58,0.9464609647842366,0.953756411856792
40 changes: 20 additions & 20 deletions analyses/pot_solv_ox.pos
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
,label,x,y
0,2,5.069044186616881,4.988867663655389
1,3,5.148485746808864,5.145698312049011
2,4,5.109989228734856,5.061199946921185
3,6,5.195591905528455,5.081766340529698
4,12,5.306443670387608,5.587582421437132
5,61,5.176646433160563,5.16958007763798
6,15,5.273843516084135,5.172249665733277
7,58,5.326210858384679,5.227830570476628
8,59,5.219341776003891,5.132243074655671
9,23,5.277046920533296,5.212478381321698
10,24,5.2939876734687195,5.246590491412495
11,25,5.208305811173612,5.181543660496942
12,26,5.208741591995593,5.228797306083863
13,27,5.247489111264665,5.254173747156993
14,33,5.361956838591107,5.281962705895874
15,60,5.298013040575566,5.298357619356411
16,36,5.240560410073123,5.168546628116629
17,51,5.1687108428404205,5.109790464588093
18,54,5.327854938630806,5.355415643210364
19,55,5.4211133823587305,5.377687384441262
0,2,5.109071407881913,4.988167427601449
1,3,5.14886065823441,5.147108882318436
2,4,5.11540367455438,5.0735552201725325
3,6,5.195178891733841,5.0815867737145215
4,12,5.336845375350123,5.241469952244499
5,61,5.177830384848462,5.170839566883878
6,15,5.277520763730576,5.184854429771056
7,58,5.313687924733662,5.21134223541371
8,59,5.219743903017708,5.131008468545965
9,23,5.282746286191585,5.227325745048664
10,24,5.274326012295091,5.27926841331151
11,25,5.210962708525401,5.175506361994565
12,26,5.207610518608375,5.223865602032651
13,27,5.239671839635325,5.253541967587066
14,33,5.363913461311146,5.276418875849778
15,60,5.329724055621888,5.2868882437779945
16,36,5.245738201056901,5.167309402322551
17,51,5.16856040112808,5.110516697937863
18,54,5.34549183297037,5.3490042051528
19,55,5.398145591089407,5.3787324706800295
40 changes: 20 additions & 20 deletions analyses/pot_solv_red.pos
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
,label,x,y
0,2,2.877768939932039,2.4208341021013173
1,3,3.053765112807816,2.393298404851447
2,4,2.9499732198427644,2.4032729556921804
3,6,2.9748852711361566,2.469738889220201
4,12,3.1914073371330653,2.488084835010525
5,61,3.1320734310267446,2.426725061652989
6,15,2.8395121591415866,2.2932691274680073
7,58,2.7383497486149775,2.1006689395787266
8,59,2.87401404173508,2.211836237430379
9,23,2.892620179647466,2.348489624312958
10,24,3.1449952548377516,2.347479435627401
11,25,2.963199460438442,2.211512397706242
12,26,2.92267805185025,2.2778834927074256
13,27,3.0064106637256662,2.276428533547236
14,33,3.0151728399314286,2.5322529932974134
15,60,3.0742230684771203,2.314017403915685
16,36,3.084335397626258,2.5809928726103375
17,51,3.095135102277169,2.4988271454495443
18,54,3.219066777285786,2.5845971162314676
19,55,3.206718408702885,2.72714966939508
0,2,2.9424446268817555,2.401896732438739
1,3,2.9796383803893383,2.4653835012968033
2,4,3.0627314941514396,2.283469439410205
3,6,2.904683022631906,2.4634857354433732
4,12,3.208346752660261,2.4389402778071045
5,61,3.12853225376786,2.4261634106118466
6,15,2.842238946667606,2.3067539516677855
7,58,2.735222980161306,2.1099619256859907
8,59,2.951324493317565,2.193736653206261
9,23,2.8672952140873766,2.3838095760716524
10,24,3.128414663714447,2.3400330093310715
11,25,2.89950409971152,2.250537846864461
12,26,2.9173099793107906,2.326013595532057
13,27,2.9826509582948764,2.2717148970093017
14,33,3.010914573991902,2.532997776497929
15,60,3.054202834197929,2.386878713693924
16,36,3.161232389271534,2.5068621632046004
17,51,3.08257761408716,2.500655306315176
18,54,3.133998024892176,2.6223107378603436
19,55,3.2204211747343594,2.73315449475698
Loading

0 comments on commit 0b9f9e0

Please sign in to comment.