From 6a477d0edf97aaf63bfd359b13fffe7ef0858d68 Mon Sep 17 00:00:00 2001
From: sambit-giri <sambit.giri@gmail.com>
Date: Fri, 23 Aug 2024 15:45:29 +0200
Subject: [PATCH] PantheonPlus

---
 setup.py                                         |  2 +-
 src/AstronomyCalc/create_data.py                 | 16 ++++++++--------
 .../{Pantheon+SH0ES.README => README.md}         |  0
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename src/AstronomyCalc/input_data/PantheonPlus/{Pantheon+SH0ES.README => README.md} (100%)

diff --git a/setup.py b/setup.py
index e76a63a..54bb21d 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
       author_email='sambit.giri@gmail.com',
       packages=find_packages("src"),
       package_dir={"": "src"},
-      package_data={'AstronomyCalc': ['input_data/*']},
+      package_data={'AstronomyCalc': ['input_data/*', 'input_data/**/*']},
       install_requires=requirements,
       include_package_data=True,
       long_description=open('README.md').read(),
diff --git a/src/AstronomyCalc/create_data.py b/src/AstronomyCalc/create_data.py
index eec1831..51ae2ce 100644
--- a/src/AstronomyCalc/create_data.py
+++ b/src/AstronomyCalc/create_data.py
@@ -83,14 +83,14 @@ def Hubble1929_data(data_link=None):
     # print(df.head())
     return np.array(df['distance']), np.array(df['velocity'])
 
-def DES_5YR_distance_modulus():
-    try:
-        from dessndr import data, utils
-    except:
-        print('dessndr package is needed to get DES 5YR data.')
-        print('Homepage: https://des-sn-dr.readthedocs.io/en/latest/index.html')
-        print('GitHub repo: https://github.com/BrunoSanchez/DES-SN-DR.git')
-        return None
+def PantheonPlus_distance_modulus():
+    package_folder = str(pkg_resources.files('AstronomyCalc').joinpath('input_data'))
+    data_folder = os.path.join(package_folder, "PantheonPlus")
+    mean_file = os.path.join(data_folder, "Pantheon+SH0ES.dat")
+    cov_file = os.path.join(data_folder, "Pantheon+SH0ES_STAT+SYS.cov")
+    mean = np.loadtxt(mean_file)
+    cov  = np.loadtxt(cov_file)
+    return {'mean': mean, 'cov': cov}
 
 def SPARC_galaxy_rotation_curves_data(filename=None, name=None):
     """
diff --git a/src/AstronomyCalc/input_data/PantheonPlus/Pantheon+SH0ES.README b/src/AstronomyCalc/input_data/PantheonPlus/README.md
similarity index 100%
rename from src/AstronomyCalc/input_data/PantheonPlus/Pantheon+SH0ES.README
rename to src/AstronomyCalc/input_data/PantheonPlus/README.md