From a89cf7c5a1ea5b30d8503cd1f13f4b06ca102e14 Mon Sep 17 00:00:00 2001 From: Alexis Simon Date: Thu, 29 Jun 2023 11:07:59 -0700 Subject: [PATCH] small changes --- workflow/envs/popgensim.yaml | 2 +- workflow/scripts/main_figure.py | 2 +- workflow/scripts/plot_europe_uk.py | 2 +- workflow/scripts/plot_simple_scenarios.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/workflow/envs/popgensim.yaml b/workflow/envs/popgensim.yaml index 86283a3..77bafb7 100644 --- a/workflow/envs/popgensim.yaml +++ b/workflow/envs/popgensim.yaml @@ -18,4 +18,4 @@ dependencies: - sgkit=0.6.0 - pip - pip: - - git+https://github.com/alxsimon/py-admixcov.git@fb0e7da + - git+https://github.com/alxsimon/py-admixcov.git@v1.0.0 diff --git a/workflow/scripts/main_figure.py b/workflow/scripts/main_figure.py index 8438342..1bb2b4e 100644 --- a/workflow/scripts/main_figure.py +++ b/workflow/scripts/main_figure.py @@ -49,7 +49,7 @@ for x in [150, 130, 110, 50, 30, 10]: _ = axs[k, l].annotate("", xy=(x, 0.1), xytext=(x, 0), arrowprops=dict(arrowstyle="->")) axs[k, l].set_xlim(times[0] + time_padding, times[-1] - time_padding) -axs[k, l].set_ylabel("Mean ancestry") +axs[k, l].set_ylabel("Mean ancestry proportion") axs[k, l].set_xlabel("Time (gen. BP)") axs[k, l].legend(loc="center left") axs[k, l].set_title('$A$', loc='left', fontdict={'fontweight': 'bold'}) diff --git a/workflow/scripts/plot_europe_uk.py b/workflow/scripts/plot_europe_uk.py index bb5625e..d9563dd 100644 --- a/workflow/scripts/plot_europe_uk.py +++ b/workflow/scripts/plot_europe_uk.py @@ -63,7 +63,7 @@ _ = axs[k, l].axvspan(x1, x2, facecolor='grey', alpha=0.10) axs[k, l].set_xlim(times[0] + time_padding, times[-1] - time_padding) axs[k, l].set_ylim(top=1) -axs[k, l].set_ylabel("Mean ancestry") +axs[k, l].set_ylabel("Mean ancestry proportion") axs[k, l].set_xlabel("Time (years BP)") axs[k, l].legend(loc='upper center', bbox_to_anchor=(0.5, -0.15), ncol=3) axs[k, l].set_title("B", loc='left', fontdict={'fontweight': 'bold'}) diff --git a/workflow/scripts/plot_simple_scenarios.py b/workflow/scripts/plot_simple_scenarios.py index 7d0a4f1..15c3a31 100644 --- a/workflow/scripts/plot_simple_scenarios.py +++ b/workflow/scripts/plot_simple_scenarios.py @@ -45,7 +45,7 @@ ac.plot_ci_line(x=times, CI=Q_CIs[i], ax=axs[0,0], color=colors_oi[i], label=f"Pop{i}", marker='o') axs[k, l].set_xlim(times[0] + time_padding, times[-1] - time_padding) axs[k, l].set_ylim((0,1)) -axs[k, l].set_ylabel("Mean ancestry") +axs[k, l].set_ylabel("Mean ancestry proportion") axs[k, l].set_xlabel("Time point") axs[k, l].legend(loc="upper right") axs[k, l].set_title('$A$', loc='left', fontdict={'fontweight': 'bold'})