Skip to content

Commit 6495882

Browse files
Jammy2211Jammy2211
authored andcommitted
failed
1 parent 5d0a586 commit 6495882

File tree

1 file changed

+33
-35
lines changed

1 file changed

+33
-35
lines changed

autoarray/dataset/imaging/dataset.py

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -92,48 +92,46 @@ def __init__(
9292
self.pad_for_psf = pad_for_psf
9393

9494
if pad_for_psf and psf is not None:
95-
try:
96-
data.mask.derive_mask.blurring_from(
97-
kernel_shape_native=psf.shape_native
98-
)
99-
except exc.MaskException:
100-
over_sample_size_lp = (
101-
over_sample_util.over_sample_size_convert_to_array_2d_from(
102-
over_sample_size=over_sample_size_lp, mask=data.mask
103-
)
95+
96+
pad_shape = (300, 300)
97+
98+
over_sample_size_lp = (
99+
over_sample_util.over_sample_size_convert_to_array_2d_from(
100+
over_sample_size=over_sample_size_lp, mask=data.mask
104101
)
105-
over_sample_size_lp = (
106-
over_sample_size_lp.padded_before_convolution_from(
107-
kernel_shape=psf.shape_native, mask_pad_value=1
108-
)
102+
)
103+
over_sample_size_lp = (
104+
over_sample_size_lp.resized_from(
105+
new_shape=pad_shape, mask_pad_value=1
109106
)
107+
)
110108

111-
over_sample_size_pixelization = (
112-
over_sample_util.over_sample_size_convert_to_array_2d_from(
113-
over_sample_size=over_sample_size_pixelization, mask=data.mask
114-
)
109+
over_sample_size_pixelization = (
110+
over_sample_util.over_sample_size_convert_to_array_2d_from(
111+
over_sample_size=over_sample_size_pixelization, mask=data.mask
115112
)
116-
over_sample_size_pixelization = (
117-
over_sample_size_pixelization.padded_before_convolution_from(
118-
kernel_shape=psf.shape_native, mask_pad_value=1
119-
)
113+
)
114+
over_sample_size_pixelization = (
115+
over_sample_size_pixelization.resized_from(
116+
new_shape=pad_shape, mask_pad_value=1
120117
)
118+
)
121119

122-
data = data.padded_before_convolution_from(
123-
kernel_shape=psf.shape_native, mask_pad_value=1
124-
)
125-
if noise_map is not None:
126-
noise_map = noise_map.padded_before_convolution_from(
127-
kernel_shape=psf.shape_native, mask_pad_value=1
128-
)
129-
logger.info(
130-
f"The image and noise map of the `Imaging` objected have been padded to the dimensions"
131-
f"{data.shape}. This is because the blurring region around the mask (which defines where"
132-
f"PSF flux may be convolved into the masked region) extended beyond the edge of the image."
133-
f""
134-
f"This can be prevented by using a smaller mask, smaller PSF kernel size or manually padding"
135-
f"the image and noise-map yourself."
120+
data = data.resized_from(
121+
new_shape=pad_shape, mask_pad_value=1
122+
)
123+
if noise_map is not None:
124+
noise_map = noise_map.resized_from(
125+
new_shape=pad_shape, mask_pad_value=1
136126
)
127+
logger.info(
128+
f"The image and noise map of the `Imaging` objected have been padded to the dimensions"
129+
f"{data.shape_native}. This is because the blurring region around the mask (which defines where"
130+
f"PSF flux may be convolved into the masked region) extended beyond the edge of the image."
131+
f""
132+
f"This can be prevented by using a smaller mask, smaller PSF kernel size or manually padding"
133+
f"the image and noise-map yourself."
134+
)
137135

138136
super().__init__(
139137
data=data,

0 commit comments

Comments
 (0)