mimical 0.0.8__tar.gz → 0.0.9__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mimical
3
- Version: 0.0.8
3
+ Version: 0.0.9
4
4
  Summary: Intesity modelling of multiply-imaged objects
5
5
  Author: Struan Stevenson
6
6
  Author-email: struan.stevenson@ed.ac.uk
@@ -39,7 +39,7 @@ class mimical(object):
39
39
  A 3D array of image data with slices for each filter. Each image
40
40
  must be the same shape.
41
41
 
42
- filt_list : list - str
42
+ filt_list : str or list
43
43
  A list of path strings to the filter transmission curve files, relative
44
44
  to the current working directory. Must be in ascending order with effective wavelength.
45
45
 
@@ -60,6 +60,14 @@ class mimical(object):
60
60
 
61
61
  def __init__(self, id, images, filt_list, psfs, user_prior, astropy_model=models.Sersic2D(), pool=None, timeout=3600):
62
62
 
63
+ # Helper when only one image is passed
64
+ if len(images.shape)==2:
65
+ images = np.array(([images]))
66
+ if (type(filt_list).__name__=='str') | (type(filt_list).__name__=='str_'):
67
+ filt_list = [filt_list]
68
+ if len(psfs.shape)==2:
69
+ psfs = np.array(([psfs]))
70
+
63
71
  self.id = id
64
72
 
65
73
  print(f"Fitting object {id}")
@@ -88,6 +96,7 @@ class mimical(object):
88
96
 
89
97
 
90
98
 
99
+
91
100
  def lnlike(self, param_dict):
92
101
  """ Returns the log-likelihood for a given parameter vector. """
93
102
 
@@ -165,7 +174,7 @@ class mimical(object):
165
174
 
166
175
  if self.success != True:
167
176
 
168
- print("Sampling failed (timeout error).")
177
+ print("Sampling failed (timeout).")
169
178
  print(" ")
170
179
  return {}
171
180
 
@@ -57,16 +57,31 @@ class Plotter(object):
57
57
 
58
58
  median_models = np.median(models, axis=0)
59
59
 
60
- for i in range(len(wavs)):
61
60
 
62
- v = np.percentile(images[-1], 99.9)
61
+ if len(wavs)==1:
62
+ for i in range(len(wavs)):
63
+ v = np.percentile(images[-1], 99.9)
63
64
 
64
- axes[0,i].imshow(images[i], vmax=v, vmin=-v)
65
- axes[0,i].set_axis_off()
65
+ axes[0].imshow(images[i], vmax=v, vmin=-v)
66
+ axes[0].set_axis_off()
66
67
 
67
- axes[1,i].imshow(median_models[i], vmax=v, vmin=-v)
68
- axes[1,i].set_axis_off()
68
+ axes[1].imshow(median_models[i], vmax=v, vmin=-v)
69
+ axes[1].set_axis_off()
69
70
 
70
- axes[2,i].imshow(images[i]-median_models[i], vmax=v, vmin=-v)
71
- axes[2,i].set_axis_off()
71
+ axes[2].imshow(images[i]-median_models[i], vmax=v, vmin=-v)
72
+ axes[2].set_axis_off()
73
+
74
+ else:
75
+ for i in range(len(wavs)):
76
+
77
+ v = np.percentile(images[-1], 99.9)
78
+
79
+ axes[0,i].imshow(images[i], vmax=v, vmin=-v)
80
+ axes[0,i].set_axis_off()
81
+
82
+ axes[1,i].imshow(median_models[i], vmax=v, vmin=-v)
83
+ axes[1,i].set_axis_off()
84
+
85
+ axes[2,i].imshow(images[i]-median_models[i], vmax=v, vmin=-v)
86
+ axes[2,i].set_axis_off()
72
87
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mimical
3
- Version: 0.0.8
3
+ Version: 0.0.9
4
4
  Summary: Intesity modelling of multiply-imaged objects
5
5
  Author: Struan Stevenson
6
6
  Author-email: struan.stevenson@ed.ac.uk
@@ -8,7 +8,7 @@ long_description = (this_directory / "README.md").read_text()
8
8
  setup(
9
9
  name='mimical',
10
10
 
11
- version='0.0.8',
11
+ version='0.0.9',
12
12
 
13
13
  description='Intesity modelling of multiply-imaged objects',
14
14
 
File without changes
File without changes
File without changes