refactoring

autoarray/config/visualize/mat_wrap/Figure.ini

@@ -1,5 +1,5 @@
 [figure]
-figsize=(7, 7)
+figsize=(7,7)
 aspect=square
 
 [subplot]

autoarray/config/visualize/mat_wrap_2d/IndexScatter.ini

@@ -1,9 +1,9 @@
 [figure]
 s=20
 marker=.
-c=r, g, b, m, y, k
+c=r,g,b,m,y,k
 
 [subplot]
 s=20
 marker=.
-c=r, g, b, m, y, k
+c=r,g,b,m,y,k

autoarray/config/visualize/mat_wrap_2d/PositionsScatter.ini

@@ -1,9 +1,9 @@
 [figure]
 s=16
 marker=.
-c=k, m, y, b, r, g
+c=k,m,y,b,r,g
 
 [subplot]
 s=16
 marker=.
-c=k, m, y, b, r, g
+c=k,m,y,b,r,g

eden.ini

@@ -1,3 +1,3 @@
 [eden]
-name = autoarray
-prefix = aa
+name=autoarray
+prefix=aa

files/eden.ini

@@ -1,3 +1,3 @@
 [eden]
-name = autoarray
-prefix = aa
+name=autoarray
+prefix=aa

test_autoarray/config/general.ini

@@ -1,31 +1,31 @@
 [output]
-log_every_update = 50
-log_file = output.log
+log_every_update=50
+log_file=output.log
 log_level=INFO
 
-model_results_every_update = 100
-model_results_decimal_places = 3
-backup_every_update = 10
-grid_results_interval = 100
+model_results_every_update=100
+model_results_decimal_places=3
+backup_every_update=10
+grid_results_interval=100
 
-remove_files = False
+remove_files=False
 
 [fits]
 flip_for_ds9=False
 
 [numba]
-nopython = True
-cache = True
-parallel = False
+nopython=True
+cache=True
+parallel=False
 
 [calculation_grid]
-convergence_threshold = 0.2
-pixels = 401
+convergence_threshold=0.2
+pixels=401
 
 [inversion]
-interpolated_grid_shape = image_grid
-stochastic_histogram_samples = 100
-stochastic_histogram_bins = 10
+interpolated_grid_shape=image_grid
+stochastic_histogram_samples=100
+stochastic_histogram_bins=10
 
 [hyper]
 hyper_minimum_percent=0.01

test_autoarray/config/grids/interpolate.ini

@@ -1,13 +1,13 @@
 [func]
-MockInterpolateClass = True
+MockInterpolateClass=True
 
 [func_off]
-MockInterpolateClass = False
+MockInterpolateClass=False
 
 [ndarray_1d_from_grid]
-MockInterpolateObj = True
-MockGridLikeIteratorObj = True
+MockInterpolateObj=True
+MockGridLikeIteratorObj=True
 
 [ndarray_2d_from_grid]
-MockInterpolateObj = True
-MockGridLikeIteratorObj = True
+MockInterpolateObj=True
+MockGridLikeIteratorObj=True

test_autoarray/config/grids/radial_minimum.ini

@@ -1,36 +1,35 @@
 [radial_minimum]
-EllipticalProfile = 1e-8
-MockGridRadialMinimum = 2.5
-SphericalIsothermal = 1e-8
-SphericalSersic = 1e-8
-EllipticalSersic = 1e-8
-ExternalShear = 1e-8
-EllipticalGaussian = 1e-8
-EllipticalIsothermal = 1e-8
-EllipticalExponential = 1e-8
-EllipticalCoreSersic = 1e-8
-SphericalCoreSersic = 1e-8
-EllipticalDevVaucouleurs = 1e-8
-SphericalDevVaucouleurs = 1e-8
-SphericalExponential = 1e-8
-SphericalGaussian = 1e-8
-MassSheet = 1e-8
-SphericalSersicRadialGradient = 1e-8
-EllipticalSersicRadialGradient = 1e-8
-SphericalGeneralizedNFW = 1e-8
-EllipticalMassProfile = 1e-8
-EllipticalBrokenPowerLaw = 1e-8
-SphericalBrokenPowerLaw = 1e-8
-EllipticalCoredPowerLaw = 1e-8
-SphericalCoredPowerLaw = 1e-8
-EllipticalPowerLaw = 1e-8
-SphericalPowerLaw = 1e-8
-EllipticalCoredIsothermal = 1e-8
-SphericalCoredIsothermal = 1e-8
-EllipticalGeneralizedNFW = 1e-8
-SphericalTruncatedNFW = 1e-8
-SphericalTruncatedNFWMCR = 1e-8
-SphericalTruncatedNFWChallenge = 1e-8
-EllipticalNFW = 1e-8
-SphericalNFW = 1e-8
-PointMass = 0.0
+EllProfile=1e-8
+MockGridRadialMinimum=2.5
+SphIsothermal=1e-8
+SphSersic=1e-8
+EllSersic=1e-8
+ExternalShear=1e-8
+EllGaussian=1e-8
+EllIsothermal=1e-8
+EllExponential=1e-8
+EllSersicCore=1e-8
+SphSersicCore=1e-8
+EllDevVaucouleurs=1e-8
+SphDevVaucouleurs=1e-8
+SphExponential=1e-8
+SphGaussian=1e-8
+MassSheet=1e-8
+SphSersicRadialGradient=1e-8
+EllSersicRadialGradient=1e-8
+SphNFWGeneralized=1e-8
+EllMassProfile=1e-8
+EllPowerLawBroken=1e-8
+SphPowerLawBroken=1e-8
+EllPowerLawCored=1e-8
+SphPowerLawCored=1e-8
+EllPowerLaw=1e-8
+SphPowerLaw=1e-8
+EllIsothermalCored=1e-8
+SphIsothermalCored=1e-8
+EllNFWGeneralized=1e-8
+SphNFWTruncated=1e-8
+SphNFWTruncatedMCR=1e-8
+EllNFW=1e-8
+SphNFW=1e-8
+PointMass=0.0

test_autoarray/config/visualize/mat_wrap/Figure.ini

@@ -1,5 +1,5 @@
 [figure]
-figsize=(7, 7)
+figsize=(7,7)
 aspect=square
 
 [subplot]

test_autoarray/config/visualize/mat_wrap_2d/IndexScatter.ini

@@ -1,9 +1,9 @@
 [figure]
 s=20
 marker=.
-c=r, g, b, y, k, w
+c=r,g,b,y,k,w
 
 [subplot]
 s=21
 marker=+
-c=r, g, b, y, w, k
+c=r,g,b,y,w,k

test_autoarray/config/visualize/mat_wrap_2d/PositionsScatter.ini

@@ -1,7 +1,7 @@
 [figure]
 s=15
 marker=o
-c=r, g, b
+c=r,g,b
 
 [subplot]
 s=5

test_autoarray/inversion/files/inversion_image_grid/general.ini

@@ -1,33 +1,33 @@
 [output]
 
-log_every_update = 50
-log_file = output.log
+log_every_update=50
+log_file=output.log
 log_level=INFO
 
-backup_every_update = 10
-grid_results_interval = 100
+backup_every_update=10
+grid_results_interval=100
 
-model_results_every_update = 100
-model_results_decimal_places = 3
+model_results_every_update=100
+model_results_decimal_places=3
 
-remove_files = False
+remove_files=False
 
 [fits]
 flip_for_ds9=False
 
 [numba]
-nopython = True
-cache = True
-parallel = False
+nopython=True
+cache=True
+parallel=False
 
 [calculation_grid]
-convergence_threshold = 0.2
-pixels = 2001
+convergence_threshold=0.2
+pixels=2001
 
 [inversion]
-interpolated_grid_shape = image_grid
-stochastic_histogram_samples = 100
-stochastic_histogram_bins = 10
+interpolated_grid_shape=image_grid
+stochastic_histogram_samples=100
+stochastic_histogram_bins=10
 
 [hyper]
 hyper_minimum_percent=0.01

test_autoarray/inversion/files/inversion_source_grid/general.ini

@@ -1,31 +1,31 @@
 [output]
 
-log_every_update = 50
-log_file = output.log
+log_every_update=50
+log_file=output.log
 log_level=INFO
 
-backup_every_update = 10
-grid_results_interval = 100
+backup_every_update=10
+grid_results_interval=100
 
-model_results_every_update = 100
-model_results_decimal_places = 3
+model_results_every_update=100
+model_results_decimal_places=3
 
-remove_files = False
+remove_files=False
 
 [fits]
 flip_for_ds9=False
 
 [numba]
-nopython = True
-cache = True
-parallel = False
+nopython=True
+cache=True
+parallel=False
 
 [calculation_grid]
-convergence_threshold = 0.2
-pixels = 2001
+convergence_threshold=0.2
+pixels=2001
 
 [inversion]
-interpolated_grid_shape = source_grid
+interpolated_grid_shape=source_grid
 
 [hyper]
 hyper_minimum_percent=0.01

test_autoarray/mask/test_mask_2d_util.py

@@ -641,7 +641,7 @@ def test__origin_shift__diagonal_shift(self):
         ).all()
 
 
-class TestMaskElliptical:
+class TestMaskEll:
     def test__input_circular_params__small_medium_and_large_masks(self):
 
         mask = util.mask_2d.mask_2d_elliptical_from(
@@ -978,7 +978,7 @@ def test__3x3_mask__shifts_dowwards__right__diagonal(self):
         ).all()
 
 
-class TestMaskEllipticalAnnular:
+class TestMaskEllAnnular:
     def test__mask_inner_radius_zero_outer_radius_small_medium_and_large__mask__all_circular_parameters(
         self,
     ):

test_autoarray/structures/files/config_flip/general.ini

@@ -1,31 +1,31 @@
 [output]
-log_every_update = 50
-log_file = output.log
+log_every_update=50
+log_file=output.log
 log_level=INFO
 
-model_results_every_update = 100
-model_results_decimal_places = 3
-backup_every_update = 10
-grid_results_interval = 100
+model_results_every_update=100
+model_results_decimal_places=3
+backup_every_update=10
+grid_results_interval=100
 
-remove_files = False
+remove_files=False
 
 [fits]
 flip_for_ds9=True
 
 [numba]
-nopython = True
-cache = True
-parallel = False
+nopython=True
+cache=True
+parallel=False
 
 [calculation_grid]
-convergence_threshold = 0.2
-pixels = 401
+convergence_threshold=0.2
+pixels=401
 
 [inversion]
-interpolated_grid_shape = image_grid
-stochastic_histogram_samples = 100
-stochastic_histogram_bins = 10
+interpolated_grid_shape=image_grid
+stochastic_histogram_samples=100
+stochastic_histogram_bins=10
 
 [hyper]
 hyper_minimum_percent=0.01