Commit e43923a0 authored by Daniel Brown's avatar Daniel Brown
Browse files

Merge branch 'master' of gitmaster.atlas.aei.uni-hannover.de:pykat/pykat

parents c8935b52 820aebfa
...@@ -46,19 +46,22 @@ def init_pykat_plotting(mode="display", dpi=100): ...@@ -46,19 +46,22 @@ def init_pykat_plotting(mode="display", dpi=100):
pgf_with_pdflatex = { pgf_with_pdflatex = {
"pgf.texsystem": "pdflatex", "pgf.texsystem": "pdflatex",
"pgf.preamble": [ "pgf.preamble": [
r"\usepackage{amsmath, amssymb}", r"\\usepackage{amsmath, amssymb}",
r"\usepackage{mathtools, siunitx}" , r"\\usepackage{mathtools, siunitx}" ,
r"\usepackage{amsmath}", r"\\usepackage{amsmath}",
r"\usepackage[utf8x]{inputenc}", r"\\usepackage[utf8x]{inputenc}",
r"\usepackage[T1]{fontenc}" r"\\usepackage[T1]{fontenc}"
] ]
} }
mpl.rcParams.update(pgf_with_pdflatex) mpl.rcParams.update(pgf_with_pdflatex)
else: else:
raise(BaseException("Plotting mode must be either 'display' or 'paper'.")) raise(BaseException("Plotting mode must be either 'display' or 'paper'."))
mpl.rcParams['axes.color_cycle'] = ['b', 'r', 'k', 'g', 'c', 'm', 'y'] if (mpl.__version__ < '1.5'):
mpl.rcParams['axes.color_cycle'] = ['b', 'r', 'k', 'g', 'c', 'm', 'y']
else:
mpl.rcParams['axes.prop_cycle']=mpl.cycler('color', ['b', 'r', 'k', 'g', 'c', 'm', 'y'])
mpl.rcParams['lines.linewidth'] = 1.2 mpl.rcParams['lines.linewidth'] = 1.2
mpl.rcParams.update({"figure.figsize": (6, 3.708)}) mpl.rcParams.update({"figure.figsize": (6, 3.708)})
mpl.rcParams.update({'font.size': 11}) mpl.rcParams.update({'font.size': 11})
...@@ -98,4 +101,4 @@ def figure(width="full", height=0.618, textwidth=6, **kwargs): ...@@ -98,4 +101,4 @@ def figure(width="full", height=0.618, textwidth=6, **kwargs):
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment