Skip to content

Commit eec1286

Browse files
author
Henry Lloyd-Laney
committedJun 10, 2020
added kinetic dispersion comparison figure as figure SX
1 parent e502682 commit eec1286

13 files changed

+813
-541
lines changed
 

‎figures/figure1.py

+24-7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
upper_level=("/").join(upper_level_list)
1111
class_loc=upper_level+"/src"
1212
sys.path.insert(0, class_loc)
13+
try:
14+
from PIL import Image
15+
resize=True
16+
except:
17+
resize=False
1318
from single_e_class_unified import single_electron
1419
from harmonics_plotter import harmonics
1520
import pints.plot
@@ -64,7 +69,7 @@
6469
fourier_times=[ramp_time_results, time_results]
6570
fourier_currents=[ramped_cmaes_time, cmaes_time]
6671
harm_xlabels=["Time(s)", "Voltage(V)"]
67-
fig=multiplot(2, 4, **{"harmonic_position":3, "num_harmonics":num_harms, "fourier_position":2,"orientation":"portrait", "plot_width":6, "col_spacing":2})
72+
fig=multiplot(2, 4, **{"harmonic_position":3, "num_harmonics":num_harms, "fourier_position":2,"orientation":"portrait", "plot_width":6, "col_spacing":2, "font_size":15})
6873
keys=sorted(fig.axes_dict.keys())
6974

7075
fig.axes_dict["col1"][0].plot(ramp_time_results, ramp_voltage_results)
@@ -82,7 +87,8 @@
8287
for i in range(0, 2):
8388
for j in range(0, 2):
8489
pos=(i*2)+j
85-
fig.axes_dict["col3"][pos].set_xlabel("Frequency(Hz)")
90+
if j==1:
91+
fig.axes_dict["col3"][pos].set_xlabel("Frequency(Hz)")
8692
fig.axes_dict["col3"][pos].set_ylabel(fourier_ylabels[j])
8793
if j==0:
8894
fig.axes_dict["col3"][pos].set_xticks([])
@@ -91,19 +97,25 @@
9197
for j in range(0, num_harms):
9298
if i==0:
9399
x=ramp_time_results
100+
if j==3:
101+
fig.axes_dict["col4"][pos].set_ylabel("Current($\\mu A$)")
94102
else:
95103
x=voltage_results
104+
if j==4:
105+
fig.axes_dict["col4"][pos].set_ylabel("Current($\\mu A$)")
96106
pos=(i*num_harms)+j
97107
fig.axes_dict["col4"][pos].plot(x, all_harms[i][j,:]*1e3)
108+
98109
twiny=fig.axes_dict["col4"][pos].twinx()
99110
twiny.set_ylabel(j+1, rotation=0)
100-
twiny.set_yticks([])
111+
twiny.set_yticklabels([])
101112
if j==num_harms-1:
102113
fig.axes_dict["col4"][pos].set_xlabel(harm_xlabels[i])
103114
else:
104115
fig.axes_dict["col4"][pos].set_xticks([])
105-
if j==num_harms//2:
106-
fig.axes_dict["col4"][pos].set_ylabel("Current($\\mu A$)")
116+
ticks=fig.axes_dict["col4"][pos].get_yticks()
117+
fig.axes_dict["col4"][pos].set_yticks([ticks[1], ticks[-2]])
118+
107119
letter_count=0
108120
y_pos=[1.1, 1.1, 1.195, 1.58]
109121
for i in range(0, len(keys)):
@@ -120,5 +132,10 @@
120132
plt.subplots_adjust(left=0.05, bottom=0.05, right=0.99, top=0.94, wspace=0.29, hspace=0.2)
121133
plt.show()
122134
save_path="experiment_comparison.png"
123-
#fig.savefig(save_path, dpi=500)
124-
plt.show()
135+
fig.savefig(save_path, dpi=500)
136+
img = Image.open(save_path)
137+
basewidth = float(img.size[0])//2
138+
wpercent = (basewidth/float(img.size[0]))
139+
hsize = int((float(img.size[1])*float(wpercent)))
140+
img = img.resize((int(basewidth),hsize), Image.ANTIALIAS)
141+
img.save(save_path, "PNG", quality=95, dpi=(500, 500))

‎figures/figure2.py

-164
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.