From f87b3df23c163ee06cc089167972b9d5db6c555b Mon Sep 17 00:00:00 2001 From: fordprefect Date: Thu, 6 Jul 2023 16:52:00 +0200 Subject: [PATCH] U- and Z-plot properly done --- plots_für_johann.py | 63 ++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 35 deletions(-) diff --git a/plots_für_johann.py b/plots_für_johann.py index 996d508..bcc774d 100644 --- a/plots_für_johann.py +++ b/plots_für_johann.py @@ -3,8 +3,6 @@ import matplotlib.pyplot as pp import numpy as np import data_ternary import data_udiagram -import data_zdiagram - def plotTdiagram(): scale = 100 @@ -80,34 +78,34 @@ def plotUdiagram(): figures = {} figures["E11-9a_amph_E11_ab"] = pp.subplots(1) figures["Fro5-2_amph_Fro_i"] = pp.subplots(1) - figures["Fro5-2_amph_Fro_j"] = figures["Fro5-2_amph_Fro_i"] #pp.subplots(1) - figures["Fro5-2_amph_Fro_k"] = figures["Fro5-2_amph_Fro_i"] #pp.subplots(1) - figures["Fro5-2_amph_Fro_l"] = figures["Fro5-2_amph_Fro_i"] #pp.subplots(1) - figures["Fro5-2_amph_Fro_m"] = figures["Fro5-2_amph_Fro_i"] #pp.subplots(1) - figures["Fro5-2_amph_Fro_o"] = figures["Fro5-2_amph_Fro_i"] #pp.subplots(1) + figures["Fro5-2_amph_Fro_j"] = pp.subplots(1) + figures["Fro5-2_amph_Fro_k"] = pp.subplots(1) + figures["Fro5-2_amph_Fro_l"] = pp.subplots(1) + figures["Fro5-2_amph_Fro_m"] = pp.subplots(1) + figures["Fro5-2_amph_Fro_o"] = pp.subplots(1) figures["Fro12-4_amph_Fro_ad"] = pp.subplots(1) - figures["Fro12-4_amph_Fro_ah"] = figures["Fro12-4_amph_Fro_ad"] #pp.subplots(1) - figures["Fro12-4_amph_Fro_ai"] = figures["Fro12-4_amph_Fro_ad"] #pp.subplots(1) - figures["Fro12-4_amph_Fro_aj"] = figures["Fro12-4_amph_Fro_ad"] #pp.subplots(1) + figures["Fro12-4_amph_Fro_ah"] = pp.subplots(1) + figures["Fro12-4_amph_Fro_ai"] = pp.subplots(1) + figures["Fro12-4_amph_Fro_aj"] = pp.subplots(1) figures["Fro1312b1_amph_Fro_bb"] = pp.subplots(1) - figures["Fro1312b1_amph_Fro_be"] = figures["Fro1312b1_amph_Fro_bb"] #pp.subplots(1) - figures["Fro1312b1_amph_Fro_bi"] = figures["Fro1312b1_amph_Fro_bb"] #pp.subplots(1) + figures["Fro1312b1_amph_Fro_be"] = pp.subplots(1) + figures["Fro1312b1_amph_Fro_bi"] = pp.subplots(1) figures["Rane10-3_amph_Rane_a"] = pp.subplots(1) - figures["Rane10-3_amph_Rane_b"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1) - figures["Rane10-3_amph_Rane_c"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1) - figures["Rane10-3_amph_Rane_e"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1) - figures["Rane10-3_amph_Rane_f"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1) - figures["Rane10-4_amph_Rane_g"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1) - figures["Rane10-4_amph_Rane_l"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1) - figures["Rane10-4_amph_Rane_m"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1) + figures["Rane10-3_amph_Rane_b"] = pp.subplots(1) + figures["Rane10-3_amph_Rane_c"] = pp.subplots(1) + figures["Rane10-3_amph_Rane_e"] = pp.subplots(1) + figures["Rane10-3_amph_Rane_f"] = pp.subplots(1) + figures["Rane10-4_amph_Rane_g"] = pp.subplots(1) + figures["Rane10-4_amph_Rane_l"] = pp.subplots(1) + figures["Rane10-4_amph_Rane_m"] = pp.subplots(1) figures["Rane10-10_amph_Rane_p"] = pp.subplots(1) - figures["Rane10-10_amph_Rane_q"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1) - figures["Rane10-10_amph_Rane_r"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1) - figures["Rane10-10_amph_Rane_s"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1) - figures["Rane10-10_amph_Rane_t"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1) - figures["Rane10-10_amph_Rane_u"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1) - figures["Rane10-10_amph_Rane_v"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1) - figures["Rane10-10_amph_Rane_w"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1) + figures["Rane10-10_amph_Rane_q"] = pp.subplots(1) + figures["Rane10-10_amph_Rane_r"] = pp.subplots(1) + figures["Rane10-10_amph_Rane_s"] = pp.subplots(1) + figures["Rane10-10_amph_Rane_t"] = pp.subplots(1) + figures["Rane10-10_amph_Rane_u"] = pp.subplots(1) + figures["Rane10-10_amph_Rane_v"] = pp.subplots(1) + figures["Rane10-10_amph_Rane_w"] = pp.subplots(1) for g in data_udiagram.data.keys(): @@ -118,17 +116,12 @@ def plotUdiagram(): ax.plot(dat['index'][i], dat['al4'][i], label="Al(IV)", color="blue", marker=".") ax.plot(dat['index'][i], dat['al6'][i], label="Al(VI)", color="orange", marker=".") ax.set_xlabel("No.") - ax.set_ylabel("value") + ax.set_ylabel("pfu") ax.set_title(f"{g}: {zone}") ax.legend(frameon=False) ax.xaxis.get_major_locator().set_params(integer=True) - figs = list(set([figures[i] for i in figures])) - for key in figures: - if key not in figs: continue - fig, ax = figures[key] - pp.gcf() - pp.savefig(f"uplot_{key}.png") + fig.savefig(f"uplot_{g}_{zone}.png") pp.show() @@ -150,7 +143,7 @@ def plotZdiagram(): ax.legend(frameon=False) #ax.xaxis.get_major_locator().set_params(integer=True) - pp.savefig(f"zplot_{g}.png") + fig.savefig(f"zplot_{g}.png") pp.show() @@ -159,5 +152,5 @@ if __name__ == "__main__": pass #plotTdiagram() - #plotUdiagram() + plotUdiagram() plotZdiagram()