mimical 0.1.1__tar.gz → 0.1.3__tar.gz

{mimical-0.1.1 → mimical-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mimical
-Version: 0.1.1
+Version: 0.1.3
 Summary: Intesity modelling of multiply-imaged objects
 Author: Struan Stevenson
 Author-email: struan.stevenson@ed.ac.uk
@@ -17,7 +17,9 @@ Dynamic: description-content-type
 Dynamic: requires-dist
 Dynamic: summary
 
-# Mimical (Modelling the Intensity of Multiply-Imaged Celestial Ancient Light)
+** Mimical (Modelling the Intensity of Multiply-Imaged Celestial Ancient Light)
 
 
-#### Mimical is an intensity modelling code for multiply-imaged objects, performing simultaenous Bayseian inference of model parameters via the nested sampling algorithm. Mimical supports any astropy model, and supports user defined parameter polynomial depenency with image wavelength.
+Mimical is an intensity modelling code for multiply-imaged objects, performing simultaenous Bayseian inference of model parameters via the nested sampling algorithm. Mimical supports any astropy model, and supports user defined parameter polynomial depenency with image wavelength.
+
+.. image:: docs/mimical_workflow.pdf

mimical-0.1.3/README.rst

@@ -0,0 +1,6 @@
+** Mimical (Modelling the Intensity of Multiply-Imaged Celestial Ancient Light)
+
+
+Mimical is an intensity modelling code for multiply-imaged objects, performing simultaenous Bayseian inference of model parameters via the nested sampling algorithm. Mimical supports any astropy model, and supports user defined parameter polynomial depenency with image wavelength.
+
+.. image:: docs/mimical_workflow.pdf

{mimical-0.1.1 → mimical-0.1.3}/mimical/fitting/fitter.py

@@ -14,11 +14,15 @@ from ..plotting import Plotter
 
 from ..utils import filter_set
 
+from tqdm import tqdm
+
+
 dir_path = os.getcwd()
 if not os.path.isdir(dir_path + "/mimical"):
     os.system('mkdir ' + dir_path + "/mimical")
     os.system('mkdir ' + dir_path + "/mimical/plots")
     os.system('mkdir ' + dir_path + "/mimical/posteriors")
+    os.system('mkdir ' + dir_path + "/mimical/cats")
 
 
 
@@ -162,6 +166,7 @@ class mimical(object):
             self.samples = pd.read_csv(dir_path+'/mimical/posteriors' + f'/{self.id}.txt', delimiter=' ').to_numpy()
             fit_dic = dict(zip((np.array((list(self.fitter_prior.keys)))+"_50").tolist(), np.median(self.samples, axis=0).tolist()))
             print(f"Loading existing posterior at " + dir_path + '/mimical/posteriors' + f'/{self.id}.txt')
+            self.save_cat()
             print(" ")
             return fit_dic
 
@@ -200,7 +205,35 @@ class mimical(object):
             print("Sampling finished successfully.")
             print(" ")
 
+            self.save_cat()
+
             return fit_dic
+        
+    
+    def save_cat(self):
+
+        user_samples = np.zeros((self.samples.shape[0], len(self.wavs), len(self.user_prior.keys())))
+        # Get median Nautilus parameters and transalte into median model parameters.
+        for j in tqdm(range(self.samples.shape[0])):
+            # Get median Nautilus parameters and transalte into median model parameters.
+            param_dict = dict(zip(list(self.fitter_prior.keys), self.samples[j]))
+            pars = self.prior_handler.revert(param_dict, self.wavs)
+            user_samples[j] = pars
+
+        quantiles = np.percentile(user_samples, q=(16, 50, 84), axis=0)
+
+        dic = {}
+        for j in range(len(self.filter_names)):
+            for i in range(len(self.user_prior.keys())):
+                key = list(self.user_prior.keys())[i]
+                dic[key + "_" + self.filter_names[j] + "_16"] = [quantiles[0, j, i]]
+                dic[key + "_" + self.filter_names[j] + "_50"] = [quantiles[1, j, i]]
+                dic[key + "_" + self.filter_names[j] + "_84"] = [quantiles[2, j, i]]
+
+        df = pd.DataFrame(dic)
+        df.to_csv(dir_path+'/mimical/cats' + f'/{self.id}.csv', index=False)
+
+
     
 
     def plot_model(self, type='median'):

{mimical-0.1.1 → mimical-0.1.3}/mimical/plotting/plotting.py

@@ -82,9 +82,6 @@ class Plotter(object):
         fig.set_size_inches(images.shape[0],4, forward=True)
 
 
-
-
-
     def plot_median(self, images, wavs, convolved_models, samples, fitter_keys, prior_handler, filter_names):
 
         fig = plt.figure()

{mimical-0.1.1 → mimical-0.1.3}/mimical.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mimical
-Version: 0.1.1
+Version: 0.1.3
 Summary: Intesity modelling of multiply-imaged objects
 Author: Struan Stevenson
 Author-email: struan.stevenson@ed.ac.uk
@@ -17,7 +17,9 @@ Dynamic: description-content-type
 Dynamic: requires-dist
 Dynamic: summary
 
-# Mimical (Modelling the Intensity of Multiply-Imaged Celestial Ancient Light)
+** Mimical (Modelling the Intensity of Multiply-Imaged Celestial Ancient Light)
 
 
-#### Mimical is an intensity modelling code for multiply-imaged objects, performing simultaenous Bayseian inference of model parameters via the nested sampling algorithm. Mimical supports any astropy model, and supports user defined parameter polynomial depenency with image wavelength.
+Mimical is an intensity modelling code for multiply-imaged objects, performing simultaenous Bayseian inference of model parameters via the nested sampling algorithm. Mimical supports any astropy model, and supports user defined parameter polynomial depenency with image wavelength.
+
+.. image:: docs/mimical_workflow.pdf

{mimical-0.1.1 → mimical-0.1.3}/mimical.egg-info/SOURCES.txt

@@ -1,4 +1,4 @@
-README.md
+README.rst
 setup.py
 mimical/__init__.py
 mimical.egg-info/PKG-INFO

{mimical-0.1.1 → mimical-0.1.3}/setup.py

@@ -1,14 +1,16 @@
 import setuptools
 from setuptools import setup
-from pathlib import Path
+from os import path
 
-this_directory = Path(__file__).parent
-long_description = (this_directory / "README.md").read_text()
+here = path.abspath(path.dirname(__file__))
+# Get the long description from the README file
+with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
 
 setup(
     name='mimical',
 
-    version='0.1.1',
+    version='0.1.3',
 
     description='Intesity modelling of multiply-imaged objects',
 
@@ -22,7 +24,10 @@ setup(
 
     packages= setuptools.find_packages(),
 
-    package_data = {'': ['*.txt', '*.fits'],},  
+    package_data = {'': ['*.txt', '*.fits', '*.pdf'],},  
+
+    include_package_data=True,
+
 
     install_requires=["numpy", "astropy", "matplotlib", "nautilus-sampler", "petrofit"],
 

mimical-0.1.1/README.md

@@ -1,4 +0,0 @@
-# Mimical (Modelling the Intensity of Multiply-Imaged Celestial Ancient Light)
-
-
-#### Mimical is an intensity modelling code for multiply-imaged objects, performing simultaenous Bayseian inference of model parameters via the nested sampling algorithm. Mimical supports any astropy model, and supports user defined parameter polynomial depenency with image wavelength.