mimical 0.0.5__py3-none-any.whl → 0.0.7__py3-none-any.whl

mimical/fitting/fitter.py

@@ -149,16 +149,27 @@ 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.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()
 
@@ -169,20 +180,25 @@ 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)
 
+            # 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()))
 
-        # 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')
+            print("Finished.")
+            print(" ")
 
-        # Return the median-parameter model
-        fit_dic = dict(zip((np.array((list(self.fitter_prior.keys)))+"_50").tolist(), np.median(samples, axis=0).tolist()))
+            return fit_dic
+    
 
-        print("Finished.")
-        print(" ")
+    def plot_model(self):
+        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')
 
-        return fit_dic
    

{mimical-0.0.5.dist-info → mimical-0.0.7.dist-info}/METADATA

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

{mimical-0.0.5.dist-info → mimical-0.0.7.dist-info}/RECORD

@@ -1,12 +1,12 @@
 mimical/__init__.py,sha256=cBuyDtPwn6KcIkjlT7oct36jigvYDJmbZNmnt1I1QJU,75
 mimical/fitting/__init__.py,sha256=xcnLoeBDtt4Le5NhD6GhJe2ZRPNSsEySRHFYNuJyNEQ,69
-mimical/fitting/fitter.py,sha256=dzPbsJ6DkllZHFil-rZNFXzFKsEX_3kyVGjyt6_nm2M,7741
+mimical/fitting/fitter.py,sha256=snF9OS6enzjBvcmFPyS5NmVljRRL54So4JN9QfE-SQY,8309
 mimical/fitting/prior_handler.py,sha256=yXvxbohS6f94CMRyeIViFc83hRYAj82IZNA5mzhMSRw,4193
 mimical/plotting/__init__.py,sha256=I1ZpQA48g-YPkqwrDGgTrqaTxDUgR8n0mbBX0MdbZtU,30
 mimical/plotting/plotting.py,sha256=OWTR-uOT4UpBw0XcKpl_uFSODuEdcfw7nIk3Sf1cOGY,2646
 mimical/utils/__init__.py,sha256=yolMgYFpvXoHuyV-ijGo26SQ0_niw0gz__iAFgdiQiY,35
 mimical/utils/filter_set.py,sha256=EITLa2c3FG3n1-v7KatKRwHCRyfZ4TTjsi_WM7Bz64k,6819
-mimical-0.0.5.dist-info/METADATA,sha256=7urHqR68dVp4-X8i-DOj5BRjoQ7apWHVytNwm99yen8,831
-mimical-0.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mimical-0.0.5.dist-info/top_level.txt,sha256=z6HTYpsoNjLUFayXjn8WyjX8C1mIbZw8Arb334cUbwc,8
-mimical-0.0.5.dist-info/RECORD,,
+mimical-0.0.7.dist-info/METADATA,sha256=KMd6HC02m-F7FQ64pHZi_aHBjyOG__rL-Lpc-mUwUvk,831
+mimical-0.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mimical-0.0.7.dist-info/top_level.txt,sha256=z6HTYpsoNjLUFayXjn8WyjX8C1mIbZw8Arb334cUbwc,8
+mimical-0.0.7.dist-info/RECORD,,