mimical 0.0.6__tar.gz → 0.0.7__tar.gz

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

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

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

@@ -149,16 +149,27 @@ class mimical(object):
         
 
         if os.path.isfile(dir_path+'/mimical/posteriors' + f'/{self.id}.txt'):
+            self.success = True
             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("Finished.")
+            print(" ")
+            return fit_dic
+
+        # 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)
+        self.success = sampler.run(verbose=True, timeout=self.timeout)
+        print(f"Sampling time (minutes): {(time.time()-t0)/60}")
+
+        if self.success != True:
+
+            print("Sampling failed (timout).")
+            print(" ")
+            return {}
+    
         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=self.timeout)
-            print(f"Sampling time (minutes): {(time.time()-t0)/60}")
-
             # Sample the posterior information
             points, log_w, log_l = sampler.posterior()
 
@@ -173,18 +184,21 @@ class mimical(object):
             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)
 
-        # Return the median-parameter model
-        fit_dic = dict(zip((np.array((list(self.fitter_prior.keys)))+"_50").tolist(), np.median(self.samples, axis=0).tolist()))
+            # Return the median-parameter model
+            fit_dic = dict(zip((np.array((list(self.fitter_prior.keys)))+"_50").tolist(), np.median(self.samples, axis=0).tolist()))
 
-        print("Finished.")
-        print(" ")
+            print("Finished.")
+            print(" ")
 
-        return fit_dic
+            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')
+        if self.success != True:
+            print(f'Failed sampling - cannot plot model for {self.id}.')
+        else:
+            # 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.6 → mimical-0.0.7}/mimical.egg-info/PKG-INFO

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

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

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