mimical 0.0.8__tar.gz → 0.1.0__tar.gz

{mimical-0.0.8 → mimical-0.1.0}/PKG-INFO

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

{mimical-0.0.8 → mimical-0.1.0}/mimical/fitting/fitter.py

@@ -39,7 +39,7 @@ class mimical(object):
         A 3D array of image data with slices for each filter. Each image
         must be the same shape.
 
-    filt_list : list - str
+    filt_list : str or list
         A list of path strings to the filter transmission curve files, relative
         to the current working directory. Must be in ascending order with effective wavelength.
 
@@ -60,6 +60,14 @@ class mimical(object):
 
     def __init__(self, id, images, filt_list, psfs, user_prior, astropy_model=models.Sersic2D(), pool=None, timeout=3600):
         
+        # Helper when only one image is passed
+        if len(images.shape)==2:
+            images = np.array(([images]))
+        if (type(filt_list).__name__=='str') | (type(filt_list).__name__=='str_'):
+            filt_list = [filt_list]
+        if len(psfs.shape)==2:
+            psfs = np.array(([psfs]))
+
         self.id = id
 
         print(f"Fitting object {id}")
@@ -88,6 +96,7 @@ class mimical(object):
 
 
 
+
     def lnlike(self, param_dict):
         """ Returns the log-likelihood for a given parameter vector. """
 
@@ -152,10 +161,11 @@ class mimical(object):
             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(f"Loading existing posterior at " + dir_path + '/mimical/posteriors' + f'/{self.id}.txt')
             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)
@@ -165,7 +175,7 @@ class mimical(object):
 
         if self.success != True:
 
-            print("Sampling failed (timeout error).")
+            print("Sampling failed (timeout).")
             print(" ")
             return {}
     
@@ -187,7 +197,7 @@ class mimical(object):
             # 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("Sampling finished successfully.")
             print(" ")
 
             return fit_dic
@@ -195,7 +205,7 @@ class mimical(object):
 
     def plot_model(self):
         if self.success != True:
-            print(f'Failed sampling, cannot plot model for {self.id}.')
+            print(f'Sampling failed, 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)

{mimical-0.0.8 → mimical-0.1.0}/mimical/plotting/plotting.py

@@ -57,16 +57,31 @@ class Plotter(object):
 
         median_models = np.median(models, axis=0)
 
-        for i in range(len(wavs)):
 
-            v = np.percentile(images[-1], 99.9)
+        if len(wavs)==1:
+            for i in range(len(wavs)):
+                v = np.percentile(images[-1], 99.9)
 
-            axes[0,i].imshow(images[i], vmax=v, vmin=-v)
-            axes[0,i].set_axis_off()
+                axes[0].imshow(images[i], vmax=v, vmin=-v)
+                axes[0].set_axis_off()
 
-            axes[1,i].imshow(median_models[i], vmax=v, vmin=-v)
-            axes[1,i].set_axis_off()
+                axes[1].imshow(median_models[i], vmax=v, vmin=-v)
+                axes[1].set_axis_off()
 
-            axes[2,i].imshow(images[i]-median_models[i], vmax=v, vmin=-v)
-            axes[2,i].set_axis_off()
+                axes[2].imshow(images[i]-median_models[i], vmax=v, vmin=-v)
+                axes[2].set_axis_off()
+
+        else:
+            for i in range(len(wavs)):
+
+                v = np.percentile(images[-1], 99.9)
+
+                axes[0,i].imshow(images[i], vmax=v, vmin=-v)
+                axes[0,i].set_axis_off()
+
+                axes[1,i].imshow(median_models[i], vmax=v, vmin=-v)
+                axes[1,i].set_axis_off()
+
+                axes[2,i].imshow(images[i]-median_models[i], vmax=v, vmin=-v)
+                axes[2,i].set_axis_off()
 

{mimical-0.0.8 → mimical-0.1.0}/mimical.egg-info/PKG-INFO

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

{mimical-0.0.8 → mimical-0.1.0}/setup.py

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