From e4a1563572d4abec1d4786d1f29269a9b5ff47b5 Mon Sep 17 00:00:00 2001
From: Maximilian Schmidt <max.schmidt@fz-juelich.de>
Date: Fri, 8 Jun 2018 09:09:56 +0900
Subject: [PATCH] Remove unneccesary pyx and LaTeX-related code from figure
scripts
---
figures/Schmidt2018/Fig3_construction.py | 3 ---
figures/Schmidt2018/Fig5_cc_laminar_pattern.py | 3 ---
figures/Schmidt2018_dyn/Fig2_bistability.py | 3 ---
figures/Schmidt2018_dyn/Fig4_metastability.py | 3 ---
figures/Schmidt2018_dyn/Fig7_temporal_hierarchy.py | 3 ---
figures/Schmidt2018_dyn/Fig8_interactions.py | 3 ---
figures/SchueckerSchmidt2017/Fig2_EE_example.py | 6 ++----
figures/SchueckerSchmidt2017/Fig3_bistability.py | 3 ---
figures/SchueckerSchmidt2017/Fig4_meanfield_mam.py | 3 ---
9 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/figures/Schmidt2018/Fig3_construction.py b/figures/Schmidt2018/Fig3_construction.py
index f2d8204..e981789 100644
--- a/figures/Schmidt2018/Fig3_construction.py
+++ b/figures/Schmidt2018/Fig3_construction.py
@@ -94,9 +94,6 @@ p.savefig('Fig3_construction_mpl.eps')
"""
Merge with syntypes figure
"""
-pyx.text.set(cls=pyx.text.LatexRunner)
-pyx.text.preamble(r"\usepackage{helvet}")
-
c = pyx.canvas.canvas()
c.insert(pyx.epsfile.epsfile(
0.4, 0., "Fig3_construction_mpl.eps", width=8.3))
diff --git a/figures/Schmidt2018/Fig5_cc_laminar_pattern.py b/figures/Schmidt2018/Fig5_cc_laminar_pattern.py
index 15bf87f..a78bfa3 100644
--- a/figures/Schmidt2018/Fig5_cc_laminar_pattern.py
+++ b/figures/Schmidt2018/Fig5_cc_laminar_pattern.py
@@ -300,9 +300,6 @@ if NEURON_DENSITIES_AVAILABLE:
"""
Merge with syn_illustration figure
"""
- pyx.text.set(cls=pyx.text.LatexRunner)
- pyx.text.preamble(r"\usepackage{helvet}")
-
c = pyx.canvas.canvas()
c.insert(pyx.epsfile.epsfile(
0., 0., "Fig5_cc_laminar_pattern_mpl.eps", width=17.3))
diff --git a/figures/Schmidt2018_dyn/Fig2_bistability.py b/figures/Schmidt2018_dyn/Fig2_bistability.py
index 44c35af..e9e4f21 100644
--- a/figures/Schmidt2018_dyn/Fig2_bistability.py
+++ b/figures/Schmidt2018_dyn/Fig2_bistability.py
@@ -92,9 +92,6 @@ pl.savefig('Fig2_bistability_mpl.eps')
"""
Merging files
"""
-pyx.text.set(cls=pyx.text.LatexRunner)
-pyx.text.preamble(r"\usepackage{helvet}")
-
c = pyx.canvas.canvas()
c.insert(pyx.epsfile.epsfile(0.5, 0.5, "Fig2_bistability_mpl.eps", width=17.6))
c.insert(pyx.epsfile.epsfile(
diff --git a/figures/Schmidt2018_dyn/Fig4_metastability.py b/figures/Schmidt2018_dyn/Fig4_metastability.py
index 755089a..95846c8 100644
--- a/figures/Schmidt2018_dyn/Fig4_metastability.py
+++ b/figures/Schmidt2018_dyn/Fig4_metastability.py
@@ -302,9 +302,6 @@ pl.savefig('Fig4_metastability_mpl.eps')
"""
Merge with sketch figure
"""
-pyx.text.set(cls=pyx.text.LatexRunner)
-pyx.text.preamble(r"\usepackage{helvet}")
-
c = pyx.canvas.canvas()
c.insert(pyx.epsfile.epsfile(
0.5, 0.5, "Fig4_metastability_mpl.eps", width=17.6))
diff --git a/figures/Schmidt2018_dyn/Fig7_temporal_hierarchy.py b/figures/Schmidt2018_dyn/Fig7_temporal_hierarchy.py
index 2b9bac7..79c98d7 100644
--- a/figures/Schmidt2018_dyn/Fig7_temporal_hierarchy.py
+++ b/figures/Schmidt2018_dyn/Fig7_temporal_hierarchy.py
@@ -632,9 +632,6 @@ pl.savefig('Fig7_temporal_hierarchy_mpl.eps')
"""
Merge surface plots
"""
-pyx.text.set(cls=pyx.text.LatexRunner)
-pyx.text.preamble(r"\usepackage{helvet}")
-
c = pyx.canvas.canvas()
c.insert(pyx.epsfile.epsfile(
diff --git a/figures/Schmidt2018_dyn/Fig8_interactions.py b/figures/Schmidt2018_dyn/Fig8_interactions.py
index 841af43..c586586 100644
--- a/figures/Schmidt2018_dyn/Fig8_interactions.py
+++ b/figures/Schmidt2018_dyn/Fig8_interactions.py
@@ -365,9 +365,6 @@ f.close()
"""
Merge with alluvial plot
"""
-pyx.text.set(cls=pyx.text.LatexRunner)
-pyx.text.preamble(r"\usepackage{helvet}")
-
c = pyx.canvas.canvas()
c.fill(pyx.path.rect(0, 0., 17.9, 17.), [pyx.color.rgb.white])
diff --git a/figures/SchueckerSchmidt2017/Fig2_EE_example.py b/figures/SchueckerSchmidt2017/Fig2_EE_example.py
index 4f8b6ab..ce97181 100644
--- a/figures/SchueckerSchmidt2017/Fig2_EE_example.py
+++ b/figures/SchueckerSchmidt2017/Fig2_EE_example.py
@@ -289,14 +289,14 @@ ax.hlines(0., 0., 70., linestyles='dashed')
a.hlines(0., 0., 70., linestyles='dashed')
fp_base = net.fsolve(([18.]))['rates'][0][0]
-# Normal network with rate_ext = 160.
+# Normal network with rate_ext = 161.
net = network1D(network_params_inc)
y = np.fromiter([net.Phi(x[j])[0] for j in range(len(x))], dtype=np.float)
ax.plot(x, y - x, color=myblue)
a.plot(x, y - x, color=myblue, lw=4.)
fp_inc = net.fsolve(([18.]))['rates'][0][0]
-# Normal network with rate_ext = 160.
+# Stabilized network with rate_ext = 161.
deltaK = -1. * network_params['K'] * (161. - 160.) / fp_base
print(network_params['K'] + deltaK)
network_params_stab.update({'K_stable': network_params['K'] + deltaK})
@@ -402,8 +402,6 @@ Save and merge figure
"""
pl.savefig('Fig2_EE_example_mpl.eps')
-pyx.text.set(mode='latex')
-pyx.text.preamble(r"\usepackage{helvet}")
c = pyx.canvas.canvas()
c.insert(pyx.epsfile.epsfile(0, 0., "Fig2_EE_example_mpl.eps"))
diff --git a/figures/SchueckerSchmidt2017/Fig3_bistability.py b/figures/SchueckerSchmidt2017/Fig3_bistability.py
index ae940c3..22a452e 100644
--- a/figures/SchueckerSchmidt2017/Fig3_bistability.py
+++ b/figures/SchueckerSchmidt2017/Fig3_bistability.py
@@ -140,9 +140,6 @@ pl.savefig(os.path.join(base_dir,
"""
Merge figures
"""
-pyx.text.set(mode='latex')
-pyx.text.preamble(r"\usepackage{helvet}")
-
c = pyx.canvas.canvas()
c.insert(pyx.epsfile.epsfile(0, 0, "Fig3_bistability_mpl.eps"))
diff --git a/figures/SchueckerSchmidt2017/Fig4_meanfield_mam.py b/figures/SchueckerSchmidt2017/Fig4_meanfield_mam.py
index 68dcb59..506780a 100644
--- a/figures/SchueckerSchmidt2017/Fig4_meanfield_mam.py
+++ b/figures/SchueckerSchmidt2017/Fig4_meanfield_mam.py
@@ -177,9 +177,6 @@ pl.savefig('Fig4_meanfield_mam_mpl.eps')
"""
Merge figures
"""
-pyx.text.set(mode='latex')
-pyx.text.preamble(r"\usepackage{helvet}")
-
c = pyx.canvas.canvas()
c.insert(pyx.epsfile.epsfile(0, 0, "Fig4_meanfield_mam_mpl.eps"))
--
GitLab