black

Author: Jammy2211

autoarray/abstract_ndarray.py

@@ -285,7 +285,7 @@ def output_to_fits(self, file_path: str, overwrite: bool = False):
             values=self.native.array,
             file_path=file_path,
             overwrite=overwrite,
-            header_dict=self.mask.pixel_scale_header
+            header_dict=self.mask.header_dict,
         )
 
     @property

autoarray/mask/abstract_mask.py

@@ -77,7 +77,7 @@ def pixel_scale(self) -> float:
         return self.pixel_scales[0]
 
     @property
-    def pixel_scale_header(self) -> Dict:
+    def header_dict(self) -> Dict:
         """
         Returns the pixel scale of the mask as a header dictionary, which can be written to a .fits file.
 
@@ -122,8 +122,8 @@ def output_to_fits(self, file_path, overwrite=False):
             values=self.astype("float"),
             file_path=file_path,
             overwrite=overwrite,
-            header_dict=self.pixel_scale_header,
-            ext_name="mask"
+            header_dict=self.header_dict,
+            ext_name="mask",
         )
 
     @property

autoarray/mask/mask_1d.py

@@ -161,7 +161,7 @@ def shape_slim(self) -> Tuple[int]:
         return self.shape
 
     @property
-    def pixel_scale_header(self) -> Dict:
+    def header_dict(self) -> Dict:
         """
         Returns the pixel scales of the mask as a header dictionary, which can be written to a .fits file.
 
@@ -174,4 +174,5 @@ def pixel_scale_header(self) -> Dict:
         """
         return {
             "PIXSCA": self.pixel_scales[0],
-        }
+            "ORIGIN": self.origin[0],
+        }

autoarray/mask/mask_2d.py

@@ -705,7 +705,7 @@ def unmasked_blurred_array_from(self, padded_array, psf, image_shape) -> Array2D
         )
 
     @property
-    def pixel_scale_header(self) -> Dict:
+    def header_dict(self) -> Dict:
         """
         Returns the pixel scales of the mask as a header dictionary, which can be written to a .fits file.
 
@@ -719,6 +719,8 @@ def pixel_scale_header(self) -> Dict:
         return {
             "PIXSCAY": self.pixel_scales[0],
             "PIXSCAX": self.pixel_scales[1],
+            "ORIGINY": self.origin[0],
+            "ORIGINX": self.origin[1],
         }
 
     @property

autoarray/structures/abstract_structure.py

@@ -60,8 +60,8 @@ def pixel_scale(self) -> float:
         return self.mask.pixel_scale
 
     @property
-    def pixel_scale_header(self) -> Dict:
-        return self.mask.pixel_scale_header
+    def header_dict(self) -> Dict:
+        return self.mask.header_dict
 
     @property
     def pixel_area(self):

autoarray/structures/arrays/array_1d_util.py

@@ -185,5 +185,3 @@ def array_1d_via_indexes_1d_from(
         ]
 
     return array_1d_native
-
-

autoarray/structures/arrays/array_2d_util.py

@@ -704,6 +704,3 @@ def array_2d_native_complex_via_indexes_from(
         ] = array_2d_slim[slim_index]
 
     return array_2d
-
-
-

autoarray/structures/arrays/kernel_2d.py

@@ -1,4 +1,3 @@
-from astropy.io import fits
 from astropy import units
 import numpy as np
 import scipy.signal

autoarray/structures/arrays/uniform_1d.py

@@ -1,4 +1,3 @@
-from astropy.io import fits
 import numpy as np
 from pathlib import Path
 from typing import Optional, Union, Tuple, List
@@ -217,9 +216,7 @@ def from_fits(
         origin
             The (x,) scaled units origin of the coordinate system.
         """
-        array_1d = ndarray_via_fits_from(
-            file_path=file_path, hdu=hdu
-        )
+        array_1d = ndarray_via_fits_from(file_path=file_path, hdu=hdu)
 
         header_sci_obj = header_obj_from(file_path=file_path, hdu=0)
         header_hdu_obj = header_obj_from(file_path=file_path, hdu=hdu)

autoarray/structures/arrays/uniform_2d.py

@@ -1,4 +1,3 @@
-from astropy.io import fits
 import logging
 import numpy as np
 from pathlib import Path
@@ -891,9 +890,7 @@ def from_fits(
                 pixel_scales=1.0,
             )
         """
-        array_2d = ndarray_via_fits_from(
-            file_path=file_path, hdu=hdu
-        )
+        array_2d = ndarray_via_fits_from(file_path=file_path, hdu=hdu)
 
         header_sci_obj = header_obj_from(file_path=file_path, hdu=0)
         header_hdu_obj = header_obj_from(file_path=file_path, hdu=hdu)