diff --git a/doped/utils/plotting.py b/doped/utils/plotting.py index b6da6621..cf57ad6e 100644 --- a/doped/utils/plotting.py +++ b/doped/utils/plotting.py @@ -84,9 +84,11 @@ def get_colormap(colormap: Optional[Union[str, Colormap]] = None, default: str = f"(https://matplotlib.org/stable/users/explain/colors/colormaps) colormaps. " f"Defaulting to '{default}' colormap." ) - cmap = cmc.cmaps.get(default, colormaps.get(default, cmc.batlow)) + cmap = cmc.cmaps.get(default, colormaps.get(default, cmc.batlow)) - return cmap + colormap = cmap + + return colormap def _get_TLD_plot_setup(colormap, xy): @@ -667,8 +669,7 @@ def _get_defect_name(defect_entry_name, site_info): legend_txt = [ ( site_info_name - if legend_txt.count(non_site_info_name) > 1 - and site_info_entry_names.count(site_info_name) == 1 + if site_info_entry_names.count(site_info_name) < legend_txt.count(non_site_info_name) else non_site_info_name ) for site_info_name, non_site_info_name in zip(site_info_entry_names, legend_txt) diff --git a/tests/data/remote_baseline_plots/CdTe_FNV_all_default_Te_rich_old_names.png b/tests/data/remote_baseline_plots/CdTe_FNV_all_default_Te_rich_old_names.png index 773724d1..c9d4e849 100644 Binary files a/tests/data/remote_baseline_plots/CdTe_FNV_all_default_Te_rich_old_names.png and b/tests/data/remote_baseline_plots/CdTe_FNV_all_default_Te_rich_old_names.png differ diff --git a/tests/data/remote_baseline_plots/CdTe_LZ_all_Te_rich_dist_tol_2.png b/tests/data/remote_baseline_plots/CdTe_LZ_all_Te_rich_dist_tol_2.png index 2bc3a782..add7269f 100644 Binary files a/tests/data/remote_baseline_plots/CdTe_LZ_all_Te_rich_dist_tol_2.png and b/tests/data/remote_baseline_plots/CdTe_LZ_all_Te_rich_dist_tol_2.png differ diff --git a/tests/data/remote_baseline_plots/CdTe_LZ_all_Te_rich_site_info.png b/tests/data/remote_baseline_plots/CdTe_LZ_all_Te_rich_site_info.png new file mode 100644 index 00000000..e40ecfd4 Binary files /dev/null and b/tests/data/remote_baseline_plots/CdTe_LZ_all_Te_rich_site_info.png differ diff --git a/tests/data/remote_baseline_plots/CdTe_duplicate_entry_names.png b/tests/data/remote_baseline_plots/CdTe_duplicate_entry_names.png index bd918e74..e9d4ae99 100644 Binary files a/tests/data/remote_baseline_plots/CdTe_duplicate_entry_names.png and b/tests/data/remote_baseline_plots/CdTe_duplicate_entry_names.png differ diff --git a/tests/data/remote_baseline_plots/CdTe_example_defects_plot.png b/tests/data/remote_baseline_plots/CdTe_example_defects_plot.png index 6c4da0fb..c637af53 100644 Binary files a/tests/data/remote_baseline_plots/CdTe_example_defects_plot.png and b/tests/data/remote_baseline_plots/CdTe_example_defects_plot.png differ diff --git a/tests/data/remote_baseline_plots/CdTe_example_defects_plot_Cd_rich.png b/tests/data/remote_baseline_plots/CdTe_example_defects_plot_Cd_rich.png index 6696a8fa..ad86c6e2 100644 Binary files a/tests/data/remote_baseline_plots/CdTe_example_defects_plot_Cd_rich.png and b/tests/data/remote_baseline_plots/CdTe_example_defects_plot_Cd_rich.png differ diff --git a/tests/data/remote_baseline_plots/CdTe_example_defects_plot_listed_colormap.png b/tests/data/remote_baseline_plots/CdTe_example_defects_plot_listed_colormap.png index c153a014..e141856a 100644 Binary files a/tests/data/remote_baseline_plots/CdTe_example_defects_plot_listed_colormap.png and b/tests/data/remote_baseline_plots/CdTe_example_defects_plot_listed_colormap.png differ diff --git a/tests/data/remote_baseline_plots/CdTe_example_defects_plot_no_chempots.png b/tests/data/remote_baseline_plots/CdTe_example_defects_plot_no_chempots.png index 96f030ec..75c05aa3 100644 Binary files a/tests/data/remote_baseline_plots/CdTe_example_defects_plot_no_chempots.png and b/tests/data/remote_baseline_plots/CdTe_example_defects_plot_no_chempots.png differ diff --git a/tests/data/remote_baseline_plots/CdTe_example_defects_plot_viridis.png b/tests/data/remote_baseline_plots/CdTe_example_defects_plot_viridis.png index 1078d4cb..dd38454f 100644 Binary files a/tests/data/remote_baseline_plots/CdTe_example_defects_plot_viridis.png and b/tests/data/remote_baseline_plots/CdTe_example_defects_plot_viridis.png differ diff --git a/tests/data/remote_baseline_plots/CdTe_manual_Te_rich_plot.png b/tests/data/remote_baseline_plots/CdTe_manual_Te_rich_plot.png index aed71c3e..47d76daf 100644 Binary files a/tests/data/remote_baseline_plots/CdTe_manual_Te_rich_plot.png and b/tests/data/remote_baseline_plots/CdTe_manual_Te_rich_plot.png differ diff --git a/tests/data/remote_baseline_plots/Sb2O5_default_TLD.png b/tests/data/remote_baseline_plots/Sb2O5_default_TLD.png index eb6226df..66ca31f3 100644 Binary files a/tests/data/remote_baseline_plots/Sb2O5_default_TLD.png and b/tests/data/remote_baseline_plots/Sb2O5_default_TLD.png differ diff --git a/tests/data/remote_baseline_plots/Sb2O5_merged_dist_tol_TLD.png b/tests/data/remote_baseline_plots/Sb2O5_merged_dist_tol_TLD.png index adb218aa..1be295a0 100644 Binary files a/tests/data/remote_baseline_plots/Sb2O5_merged_dist_tol_TLD.png and b/tests/data/remote_baseline_plots/Sb2O5_merged_dist_tol_TLD.png differ diff --git a/tests/data/remote_baseline_plots/Se_duplicate_entry_names_old.png b/tests/data/remote_baseline_plots/Se_duplicate_entry_names_old_plot.png similarity index 100% rename from tests/data/remote_baseline_plots/Se_duplicate_entry_names_old.png rename to tests/data/remote_baseline_plots/Se_duplicate_entry_names_old_plot.png diff --git a/tests/data/remote_baseline_plots/Se_pnictogen_site_info_plot.png b/tests/data/remote_baseline_plots/Se_pnictogen_site_info_plot.png new file mode 100644 index 00000000..5393a35b Binary files /dev/null and b/tests/data/remote_baseline_plots/Se_pnictogen_site_info_plot.png differ diff --git a/tests/data/remote_baseline_plots/Se_site_info_old_names_plot.png b/tests/data/remote_baseline_plots/Se_site_info_old_names_plot.png new file mode 100644 index 00000000..fc37583b Binary files /dev/null and b/tests/data/remote_baseline_plots/Se_site_info_old_names_plot.png differ diff --git a/tests/data/remote_baseline_plots/YTOS_example_defects_plot.png b/tests/data/remote_baseline_plots/YTOS_example_defects_plot.png index 68532aca..c085d207 100644 Binary files a/tests/data/remote_baseline_plots/YTOS_example_defects_plot.png and b/tests/data/remote_baseline_plots/YTOS_example_defects_plot.png differ diff --git a/tests/data/remote_baseline_plots/neutral_v_O_plot.png b/tests/data/remote_baseline_plots/neutral_v_O_plot.png index 3fd90386..8931fb41 100644 Binary files a/tests/data/remote_baseline_plots/neutral_v_O_plot.png and b/tests/data/remote_baseline_plots/neutral_v_O_plot.png differ diff --git a/tests/data/remote_baseline_plots/neutral_v_O_plot_all_entries.png b/tests/data/remote_baseline_plots/neutral_v_O_plot_all_entries.png index 1b0b2686..89a12d00 100644 Binary files a/tests/data/remote_baseline_plots/neutral_v_O_plot_all_entries.png and b/tests/data/remote_baseline_plots/neutral_v_O_plot_all_entries.png differ diff --git a/tests/data/remote_baseline_plots/neutral_v_O_plot_faded.png b/tests/data/remote_baseline_plots/neutral_v_O_plot_faded.png index ae23c708..5e3d71a7 100644 Binary files a/tests/data/remote_baseline_plots/neutral_v_O_plot_faded.png and b/tests/data/remote_baseline_plots/neutral_v_O_plot_faded.png differ