Merge pull request #57 from cosimoNigro/reorganise_data

reorganised data files location, now included in the package resources
cosimoNigro · Dec 8, 2020 · 4557264 · 4557264
2 parents 535e20a + 5c3851a
commit 4557264
Show file tree

Hide file tree

Showing 60 changed files with 29 additions and 15 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-include LICENSE
+include LICENSE
diff --git a/agnpy/absorption/absorption.py b/agnpy/absorption/absorption.py
@@ -13,7 +13,7 @@
 
 __all__ = ["sigma", "tau_disk_finke_2016", "Absorption", "ebl_files_dict", "EBL"]
 
-agnpy_dir = Path(__file__).parent.parent.parent
+agnpy_dir = Path(__file__).parent.parent
 ebl_files_dict = {
     "franceschini": f"{agnpy_dir}/data/ebl_models/ebl_franceschini08.fits.gz",
     "dominguez": f"{agnpy_dir}/data/ebl_models/ebl_dominguez11.fits.gz",

diff --git a/data/ebl_models/ebl_dominguez11.fits.gz → ...y/data/ebl_models/ebl_dominguez11.fits.gz b/data/ebl_models/ebl_dominguez11.fits.gz → ...y/data/ebl_models/ebl_dominguez11.fits.gz
diff --git a/data/ebl_models/ebl_finke10.fits.gz → agnpy/data/ebl_models/ebl_finke10.fits.gz b/data/ebl_models/ebl_finke10.fits.gz → agnpy/data/ebl_models/ebl_finke10.fits.gz
diff --git a/data/ebl_models/ebl_franceschini08.fits.gz → ...ata/ebl_models/ebl_franceschini08.fits.gz b/data/ebl_models/ebl_franceschini08.fits.gz → ...ata/ebl_models/ebl_franceschini08.fits.gz
diff --git a/data/mwl_sed/Mrk421_2011.ecsv → agnpy/data/mwl_seds/Mrk421_2011.ecsv b/data/mwl_sed/Mrk421_2011.ecsv → agnpy/data/mwl_seds/Mrk421_2011.ecsv
diff --git a/...pled_seds/ec_blr_figure_10_finke_2016.txt → ...pled_seds/ec_blr_figure_10_finke_2016.txt b/...pled_seds/ec_blr_figure_10_finke_2016.txt → ...pled_seds/ec_blr_figure_10_finke_2016.txt
diff --git a/...pled_seds/ec_disk_figure_8_finke_2016.txt → ...pled_seds/ec_disk_figure_8_finke_2016.txt b/...pled_seds/ec_disk_figure_8_finke_2016.txt → ...pled_seds/ec_disk_figure_8_finke_2016.txt
diff --git a/...mpled_seds/ec_dt_figure_11_finke_2016.txt → ...mpled_seds/ec_dt_figure_11_finke_2016.txt b/...mpled_seds/ec_dt_figure_11_finke_2016.txt → ...mpled_seds/ec_dt_figure_11_finke_2016.txt
diff --git a/data/sampled_seds/jetset_ssa_seds.py → agnpy/data/sampled_seds/jetset_ssa_seds.py b/data/sampled_seds/jetset_ssa_seds.py → agnpy/data/sampled_seds/jetset_ssa_seds.py
diff --git a/...seds/ssc_figure_7_4_dermer_menon_2009.txt → ...seds/ssc_figure_7_4_dermer_menon_2009.txt b/...seds/ssc_figure_7_4_dermer_menon_2009.txt → ...seds/ssc_figure_7_4_dermer_menon_2009.txt
diff --git a/...ds/synch_figure_7_4_dermer_menon_2009.txt → ...ds/synch_figure_7_4_dermer_menon_2009.txt b/...ds/synch_figure_7_4_dermer_menon_2009.txt → ...ds/synch_figure_7_4_dermer_menon_2009.txt
diff --git a/...pled_seds/synch_ssa_bpwl_jetset_1.1.2.txt → ...pled_seds/synch_ssa_bpwl_jetset_1.1.2.txt b/...pled_seds/synch_ssa_bpwl_jetset_1.1.2.txt → ...pled_seds/synch_ssa_bpwl_jetset_1.1.2.txt
diff --git a/...ampled_seds/synch_ssa_lp_jetset_1.1.2.txt → ...ampled_seds/synch_ssa_lp_jetset_1.1.2.txt b/...ampled_seds/synch_ssa_lp_jetset_1.1.2.txt → ...ampled_seds/synch_ssa_lp_jetset_1.1.2.txt
diff --git a/...mpled_seds/synch_ssa_pwl_jetset_1.1.2.txt → ...mpled_seds/synch_ssa_pwl_jetset_1.1.2.txt b/...mpled_seds/synch_ssa_pwl_jetset_1.1.2.txt → ...mpled_seds/synch_ssa_pwl_jetset_1.1.2.txt
diff --git a/..._blr_lyman_alpha_figure_14_finke_2016.txt → ..._blr_lyman_alpha_figure_14_finke_2016.txt b/..._blr_lyman_alpha_figure_14_finke_2016.txt → ..._blr_lyman_alpha_figure_14_finke_2016.txt
diff --git a/...ed_taus/tau_disk_figure_14_finke_2016.txt → ...ed_taus/tau_disk_figure_14_finke_2016.txt b/...ed_taus/tau_disk_figure_14_finke_2016.txt → ...ed_taus/tau_disk_figure_14_finke_2016.txt
diff --git a/...pled_taus/tau_dt_figure_14_finke_2016.txt → ...pled_taus/tau_dt_figure_14_finke_2016.txt b/...pled_taus/tau_dt_figure_14_finke_2016.txt → ...pled_taus/tau_dt_figure_14_finke_2016.txt
diff --git a/agnpy/tests/test_absorption.py b/agnpy/tests/test_absorption.py
@@ -16,11 +16,12 @@
 import matplotlib.pyplot as plt
 
 
-agnpy_dir = Path(__file__).parent.parent.parent
+agnpy_dir = Path(__file__).parent.parent
 # where to read sampled files
-data_dir = f"{agnpy_dir}/data"
+data_dir = agnpy_dir / "data"
 # where to save figures
-figures_dir = f"{data_dir}/crosscheck_figures/absorption"
+figures_dir = agnpy_dir.parent / "crosschecks/figures/absorption"
+figures_dir.mkdir(parents=True, exist_ok=True)
 
 # variables with _test are global and meant to be used in all tests
 # here as a default we use the same parameters of Figure 7.4 in Dermer Menon 2009

diff --git a/agnpy/tests/test_compton.py b/agnpy/tests/test_compton.py
@@ -12,11 +12,13 @@
 from .utils import make_comparison_plot, extract_columns_sample_file, check_deviation
 from agnpy.utils.math import trapz_loglog
 
-agnpy_dir = Path(__file__).parent.parent.parent
+
+agnpy_dir = Path(__file__).parent.parent
 # where to read sampled files
-data_dir = f"{agnpy_dir}/data"
+data_dir = agnpy_dir / "data"
 # where to save figures
-figures_dir = f"{data_dir}/crosscheck_figures/compton"
+figures_dir = agnpy_dir.parent / "crosschecks/figures/compton"
+figures_dir.mkdir(parents=True, exist_ok=True)
 
 # variables with _test are global and meant to be used in all tests
 pwl_spectrum_norm_test = 1e48 * u.Unit("erg")
@@ -49,7 +51,7 @@
 bpwl_blob_test = Blob(
     1e16 * u.cm, 1, 40, 40, 0.56 * u.G, bpwl_spectrum_norm_test, bpwl_dict_test,
 )
-bpwl_blob_test.set_gamma_size(400)
+bpwl_blob_test.set_gamma_size(350)
 # global disk
 M_BH = 1.2 * 1e9 * M_sun.cgs
 L_disk = 2e46 * u.Unit("erg s-1")

diff --git a/agnpy/tests/test_synchrotron.py b/agnpy/tests/test_synchrotron.py
@@ -14,11 +14,14 @@
     check_deviation,
 )
 
-agnpy_dir = Path(__file__).parent.parent.parent
+
+agnpy_dir = Path(__file__).parent.parent
 # where to read sampled files
-data_dir = f"{agnpy_dir}/data"
+data_dir = agnpy_dir / "data"
 # where to save figures
-figures_dir = f"{data_dir}/crosscheck_figures/synchrotron"
+figures_dir = agnpy_dir.parent / "crosschecks/figures/synchrotron"
+figures_dir.mkdir(parents=True, exist_ok=True)
+
 
 # variables with _test are global and meant to be used in all tests
 # here as a default we use the same parameters of Figure 7.4 in Dermer Menon 2009

diff --git a/agnpy/tests/utils.py b/agnpy/tests/utils.py
@@ -130,3 +130,5 @@ def make_comparison_plot(
         ax[1].axvline(comparison_range[0], ls="--", color="k")
         ax[1].axvline(comparison_range[1], ls="--", color="k")
     fig.savefig(f"{fig_path}")
+    # avoid RuntimeWarning: More than 20 figures have been opened.
+    plt.close(fig)
diff --git a/agnpy/utils/plot.py b/agnpy/utils/plot.py
@@ -46,7 +46,6 @@ def plot_sed(nu, sed, ax=None, **kwargs):
     comparison_range : list of float
         plot the range over which the residuals were checked 
     """
-    load_mpl_rc()
     ax = plt.gca() if ax is None else ax
 
     ax.loglog(nu, sed, **kwargs)

diff --git a/...abs_interp_comparison_dominguez_z_0.5.png → ...abs_interp_comparison_dominguez_z_0.5.png b/...abs_interp_comparison_dominguez_z_0.5.png → ...abs_interp_comparison_dominguez_z_0.5.png
diff --git a/...abs_interp_comparison_dominguez_z_1.5.png → ...abs_interp_comparison_dominguez_z_1.5.png b/...abs_interp_comparison_dominguez_z_1.5.png → ...abs_interp_comparison_dominguez_z_1.5.png
diff --git a/...ebl_abs_interp_comparison_finke_z_0.5.png → ...ebl_abs_interp_comparison_finke_z_0.5.png b/...ebl_abs_interp_comparison_finke_z_0.5.png → ...ebl_abs_interp_comparison_finke_z_0.5.png
diff --git a/...ebl_abs_interp_comparison_finke_z_1.5.png → ...ebl_abs_interp_comparison_finke_z_1.5.png b/...ebl_abs_interp_comparison_finke_z_1.5.png → ...ebl_abs_interp_comparison_finke_z_1.5.png
diff --git a/..._interp_comparison_franceschini_z_0.5.png → ..._interp_comparison_franceschini_z_0.5.png b/..._interp_comparison_franceschini_z_0.5.png → ..._interp_comparison_franceschini_z_0.5.png
diff --git a/..._interp_comparison_franceschini_z_1.5.png → ..._interp_comparison_franceschini_z_1.5.png b/..._interp_comparison_franceschini_z_1.5.png → ..._interp_comparison_franceschini_z_1.5.png
diff --git a/...alpha_comparison_figure_14_finke_2016.png → ...alpha_comparison_figure_14_finke_2016.png b/...alpha_comparison_figure_14_finke_2016.png → ...alpha_comparison_figure_14_finke_2016.png
diff --git a/...ption/tau_blr_point_source_comparison.png → ...ption/tau_blr_point_source_comparison.png b/...ption/tau_blr_point_source_comparison.png → ...ption/tau_blr_point_source_comparison.png
diff --git a/..._disk_comaprison_figure_14_finke_2016.png → ..._disk_comaprison_figure_14_finke_2016.png b/..._disk_comaprison_figure_14_finke_2016.png → ..._disk_comaprison_figure_14_finke_2016.png
diff --git a/...au_dt_comparison_figure_14_finke_2016.png → ...au_dt_comparison_figure_14_finke_2016.png b/...au_dt_comparison_figure_14_finke_2016.png → ...au_dt_comparison_figure_14_finke_2016.png
diff --git a/...rption/tau_dt_point_source_comparison.png → ...rption/tau_dt_point_source_comparison.png b/...rption/tau_dt_point_source_comparison.png → ...rption/tau_dt_point_source_comparison.png
diff --git a/crosschecks/figures/compton/ec_blr_comparison_figure_10_finke_2016.png b/crosschecks/figures/compton/ec_blr_comparison_figure_10_finke_2016.png
diff --git a/crosschecks/figures/compton/ec_blr_comparison_integration_methods.png b/crosschecks/figures/compton/ec_blr_comparison_integration_methods.png
diff --git a/crosschecks/figures/compton/ec_blr_point_source_comparison.png b/crosschecks/figures/compton/ec_blr_point_source_comparison.png
diff --git a/crosschecks/figures/compton/ec_disk_comparison_figure_8_finke_2016.png b/crosschecks/figures/compton/ec_disk_comparison_figure_8_finke_2016.png
diff --git a/crosschecks/figures/compton/ec_disk_comparison_integration_methods.png b/crosschecks/figures/compton/ec_disk_comparison_integration_methods.png
diff --git a/crosschecks/figures/compton/ec_dt_comparison_figure_11_finke_2016.png b/crosschecks/figures/compton/ec_dt_comparison_figure_11_finke_2016.png
diff --git a/crosschecks/figures/compton/ec_dt_comparison_integration_methods.png b/crosschecks/figures/compton/ec_dt_comparison_integration_methods.png
diff --git a/crosschecks/figures/compton/ec_dt_point_source_comparison.png b/crosschecks/figures/compton/ec_dt_point_source_comparison.png
diff --git a/...mparison_figure_7_4_dermer_menon_2009.png → ...mparison_figure_7_4_dermer_menon_2009.png b/...mparison_figure_7_4_dermer_menon_2009.png → ...mparison_figure_7_4_dermer_menon_2009.png
diff --git a/...on/ssc_comparison_integration_methods.png → ...on/ssc_comparison_integration_methods.png b/...on/ssc_comparison_integration_methods.png → ...on/ssc_comparison_integration_methods.png
diff --git a/...tron/ssa_bpwl_comparison_jetset_1.1.2.png → ...tron/ssa_bpwl_comparison_jetset_1.1.2.png b/...tron/ssa_bpwl_comparison_jetset_1.1.2.png → ...tron/ssa_bpwl_comparison_jetset_1.1.2.png
diff --git a/...rotron/ssa_lp_comparison_jetset_1.1.2.png → ...rotron/ssa_lp_comparison_jetset_1.1.2.png b/...rotron/ssa_lp_comparison_jetset_1.1.2.png → ...rotron/ssa_lp_comparison_jetset_1.1.2.png
diff --git a/...otron/ssa_pwl_comparison_jetset_1.1.2.png → ...otron/ssa_pwl_comparison_jetset_1.1.2.png b/...otron/ssa_pwl_comparison_jetset_1.1.2.png → ...otron/ssa_pwl_comparison_jetset_1.1.2.png
diff --git a/...synch_comparison_delta_aprproximation.png → ...synch_comparison_delta_aprproximation.png b/...synch_comparison_delta_aprproximation.png → ...synch_comparison_delta_aprproximation.png
diff --git a/...mparison_figure_7_4_dermer_menon_2009.png → ...mparison_figure_7_4_dermer_menon_2009.png b/...mparison_figure_7_4_dermer_menon_2009.png → ...mparison_figure_7_4_dermer_menon_2009.png
diff --git a/.../synch_comparison_integration_methods.png → .../synch_comparison_integration_methods.png b/.../synch_comparison_integration_methods.png → .../synch_comparison_integration_methods.png
diff --git a/data/crosscheck_figures/compton/ec_blr_comparison_figure_10_finke_2016.png b/data/crosscheck_figures/compton/ec_blr_comparison_figure_10_finke_2016.png
diff --git a/data/crosscheck_figures/compton/ec_blr_comparison_integration_methods.png b/data/crosscheck_figures/compton/ec_blr_comparison_integration_methods.png
diff --git a/data/crosscheck_figures/compton/ec_blr_point_source_comparison.png b/data/crosscheck_figures/compton/ec_blr_point_source_comparison.png
diff --git a/data/crosscheck_figures/compton/ec_disk_comparison_figure_8_finke_2016.png b/data/crosscheck_figures/compton/ec_disk_comparison_figure_8_finke_2016.png
diff --git a/data/crosscheck_figures/compton/ec_disk_comparison_integration_methods.png b/data/crosscheck_figures/compton/ec_disk_comparison_integration_methods.png
diff --git a/data/crosscheck_figures/compton/ec_dt_comparison_figure_11_finke_2016.png b/data/crosscheck_figures/compton/ec_dt_comparison_figure_11_finke_2016.png
diff --git a/data/crosscheck_figures/compton/ec_dt_comparison_integration_methods.png b/data/crosscheck_figures/compton/ec_dt_comparison_integration_methods.png
diff --git a/data/crosscheck_figures/compton/ec_dt_point_source_comparison.png b/data/crosscheck_figures/compton/ec_dt_point_source_comparison.png
diff --git a/docs/conf.py b/docs/conf.py
@@ -22,7 +22,7 @@
 author = "Cosimo Nigro"
 
 # The full version, including alpha/beta/rc tags
-release = "0.0.7.9"
+release = "0.0.8"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/setup.py b/setup.py
@@ -5,14 +5,21 @@
 
 setuptools.setup(
     name="agnpy",
-    version="0.0.7.9",
+    version="0.0.8",
     author="Cosimo Nigro",
     author_email="cosimonigro2@gmail.com.com",
     description="Modelling jetted Active Galactic Nuclei radiative processes with python",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/cosimoNigro/agnpy",
     packages=setuptools.find_packages(),
+    package_data={
+        "agnpy": [
+            "data/sampled_seds/*.txt",
+            "data/sampled_taus/*.txt",
+            "data/ebl_models/*.fits.gz",
+        ]
+    },
     include_package_data=True,
     classifiers=[
         "Programming Language :: Python :: 3",