mimical 0.0.4__tar.gz → 0.0.6__tar.gz

{mimical-0.0.4 → mimical-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mimical
-Version: 0.0.4
+Version: 0.0.6
 Summary: Intesity modelling of multiply-imaged objects
 Author: Struan Stevenson
 Author-email: struan.stevenson@ed.ac.uk

{mimical-0.0.4 → mimical-0.0.6}/mimical/fitting/fitter.py

@@ -58,7 +58,7 @@ class mimical(object):
     """
 
 
-    def __init__(self, id, images, filt_list, psfs, user_prior, astropy_model=models.Sersic2D(), pool=None):
+    def __init__(self, id, images, filt_list, psfs, user_prior, astropy_model=models.Sersic2D(), pool=None, timeout=3600):
         
         self.id = id
 
@@ -82,6 +82,7 @@ class mimical(object):
         self.t0 = time.time()
         self.calls = 0
 
+        self.timeout=timeout
         self.pool = pool
 
 
@@ -148,14 +149,14 @@ class mimical(object):
         
 
         if os.path.isfile(dir_path+'/mimical/posteriors' + f'/{self.id}.txt'):
-            samples = pd.read_csv(dir_path+'/mimical/posteriors' + f'/{self.id}.txt', delimiter=' ').to_numpy()
+            self.samples = pd.read_csv(dir_path+'/mimical/posteriors' + f'/{self.id}.txt', delimiter=' ').to_numpy()
         
         else:
             # Run sampler
             t0 = time.time()
             #sampler = Sampler(self.fitter_prior, self.lnlike, n_live=400, filepath= dir_path+'/bogout'+f'/{self.id}.hdf5', resume=True, pool=self.pool)
             sampler = Sampler(self.fitter_prior, self.lnlike, n_live=400, pool=self.pool)
-            sampler.run(verbose=True, timeout=2700)
+            sampler.run(verbose=True, timeout=self.timeout)
             print(f"Sampling time (minutes): {(time.time()-t0)/60}")
 
             # Sample the posterior information
@@ -168,20 +169,22 @@ class mimical(object):
             # Sample an appropriately weighted posterior for representative samples.
             n_post = 10000
             indices = np.random.choice(np.arange(points.shape[0]), size = n_post, p=np.exp(log_w))
-            samples = points[indices]
-            samples_df = pd.DataFrame(data=samples, columns=self.fitter_prior.keys)
+            self.samples = points[indices]
+            samples_df = pd.DataFrame(data=self.samples, columns=self.fitter_prior.keys)
             samples_df.to_csv(dir_path+'/mimical/posteriors' + f'/{self.id}.txt', sep=' ', index=False)
 
-
-        # Plot and save the median-parameter fit
-        Plotter().plot_median(self.images, self.wavs, self.convolved_models, samples, list(self.fitter_prior.keys), self.prior_handler)
-        plt.savefig(dir_path+'/mimical/plots' + f'/{self.id}_best_model.pdf', bbox_inches='tight')
-
         # Return the median-parameter model
-        fit_dic = dict(zip((np.array((list(self.fitter_prior.keys)))+"_50").tolist(), np.median(samples, axis=0).tolist()))
+        fit_dic = dict(zip((np.array((list(self.fitter_prior.keys)))+"_50").tolist(), np.median(self.samples, axis=0).tolist()))
 
         print("Finished.")
         print(" ")
 
         return fit_dic
+    
+
+    def plot_model(self):
+        # Plot and save the median-parameter fit
+        Plotter().plot_median(self.images, self.wavs, self.convolved_models, self.samples, list(self.fitter_prior.keys), self.prior_handler)
+        plt.savefig(dir_path+'/mimical/plots' + f'/{self.id}_best_model.pdf', bbox_inches='tight')
+
    

{mimical-0.0.4 → mimical-0.0.6}/mimical.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mimical
-Version: 0.0.4
+Version: 0.0.6
 Summary: Intesity modelling of multiply-imaged objects
 Author: Struan Stevenson
 Author-email: struan.stevenson@ed.ac.uk

{mimical-0.0.4 → mimical-0.0.6}/setup.py

@@ -8,7 +8,7 @@ long_description = (this_directory / "README.md").read_text()
 setup(
     name='mimical',
 
-    version='0.0.4',
+    version='0.0.6',
 
     description='Intesity modelling of multiply-imaged objects',