diff --git a/dataset/imaging/extra_galaxies/data.fits b/dataset/imaging/extra_galaxies/data.fits index 5eba2b1d..f97fb7c9 100644 Binary files a/dataset/imaging/extra_galaxies/data.fits and b/dataset/imaging/extra_galaxies/data.fits differ diff --git a/dataset/imaging/extra_galaxies/galaxies.json b/dataset/imaging/extra_galaxies/galaxies.json index f16a7246..7ac00cc3 100644 --- a/dataset/imaging/extra_galaxies/galaxies.json +++ b/dataset/imaging/extra_galaxies/galaxies.json @@ -11,22 +11,22 @@ "type": "instance", "class_path": "autogalaxy.profiles.light.standard.sersic.Sersic", "arguments": { - "sersic_index": 3.0, - "centre": { + "intensity": 1.0, + "ell_comps": { "type": "tuple", "values": [ - 0.0, - 0.0 + 0.05263157894736841, + 3.2227547345982974e-18 ] }, - "ell_comps": { + "sersic_index": 3.0, + "centre": { "type": "tuple", "values": [ - 0.05263157894736841, - 3.2227547345982974e-18 + 0.0, + 0.0 ] }, - "intensity": 1.0, "effective_radius": 0.6 } }, @@ -34,7 +34,6 @@ "type": "instance", "class_path": "autogalaxy.profiles.light.standard.exponential.Exponential", "arguments": { - "effective_radius": 1.6, "centre": { "type": "tuple", "values": [ @@ -42,14 +41,15 @@ 0.0 ] }, - "intensity": 0.5, "ell_comps": { "type": "tuple", "values": [ 0.152828012432548, 0.08823529411764709 ] - } + }, + "intensity": 0.5, + "effective_radius": 1.6 } } } @@ -64,7 +64,6 @@ "type": "instance", "class_path": "autogalaxy.profiles.light.standard.exponential.ExponentialSph", "arguments": { - "effective_radius": 0.5, "centre": { "type": "tuple", "values": [ @@ -72,6 +71,7 @@ 3.5 ] }, + "effective_radius": 0.5, "intensity": 2.0 } } @@ -87,7 +87,6 @@ "type": "instance", "class_path": "autogalaxy.profiles.light.standard.exponential.ExponentialSph", "arguments": { - "effective_radius": 0.8, "centre": { "type": "tuple", "values": [ @@ -95,6 +94,7 @@ -3.5 ] }, + "effective_radius": 0.8, "intensity": 2.0 } } diff --git a/dataset/imaging/extra_galaxies/noise_map.fits b/dataset/imaging/extra_galaxies/noise_map.fits index 3892e79a..b1ae2d0d 100644 Binary files a/dataset/imaging/extra_galaxies/noise_map.fits and b/dataset/imaging/extra_galaxies/noise_map.fits differ diff --git a/dataset/imaging/sersic_x2/data.fits b/dataset/imaging/sersic_x2/data.fits index b4b11372..4637ddc6 100644 Binary files a/dataset/imaging/sersic_x2/data.fits and b/dataset/imaging/sersic_x2/data.fits differ diff --git a/dataset/imaging/sersic_x2/galaxies.json b/dataset/imaging/sersic_x2/galaxies.json index 35a653c2..06a4926f 100644 --- a/dataset/imaging/sersic_x2/galaxies.json +++ b/dataset/imaging/sersic_x2/galaxies.json @@ -11,7 +11,7 @@ "type": "instance", "class_path": "autogalaxy.profiles.light.standard.sersic.Sersic", "arguments": { - "effective_radius": 0.8, + "sersic_index": 2.5, "centre": { "type": "tuple", "values": [ @@ -20,7 +20,7 @@ ] }, "intensity": 0.1, - "sersic_index": 2.5, + "effective_radius": 0.8, "ell_comps": { "type": "tuple", "values": [ @@ -42,7 +42,7 @@ "type": "instance", "class_path": "autogalaxy.profiles.light.standard.sersic.Sersic", "arguments": { - "effective_radius": 0.6, + "sersic_index": 3.0, "centre": { "type": "tuple", "values": [ @@ -51,7 +51,7 @@ ] }, "intensity": 0.1, - "sersic_index": 3.0, + "effective_radius": 0.6, "ell_comps": { "type": "tuple", "values": [ diff --git a/dataset/imaging/sersic_x2/galaxy_subtracted_data.fits b/dataset/imaging/sersic_x2/galaxy_subtracted_data.fits index 80390fa5..c5550eb7 100644 Binary files a/dataset/imaging/sersic_x2/galaxy_subtracted_data.fits and b/dataset/imaging/sersic_x2/galaxy_subtracted_data.fits differ diff --git a/dataset/imaging/sersic_x2/noise_map.fits b/dataset/imaging/sersic_x2/noise_map.fits index d776d195..48162a3d 100644 Binary files a/dataset/imaging/sersic_x2/noise_map.fits and b/dataset/imaging/sersic_x2/noise_map.fits differ diff --git a/dataset/imaging/simulated_galaxy/data.fits b/dataset/imaging/simulated_galaxy/data.fits index 53b3aced..678f841d 100644 Binary files a/dataset/imaging/simulated_galaxy/data.fits and b/dataset/imaging/simulated_galaxy/data.fits differ diff --git a/dataset/imaging/simulated_galaxy/noise_map.fits b/dataset/imaging/simulated_galaxy/noise_map.fits index 17dd8bc0..483e0bcc 100644 Binary files a/dataset/imaging/simulated_galaxy/noise_map.fits and b/dataset/imaging/simulated_galaxy/noise_map.fits differ diff --git a/dataset/interferometer/simple/data.fits b/dataset/interferometer/simple/data.fits index 1b29df07..44b641bf 100644 Binary files a/dataset/interferometer/simple/data.fits and b/dataset/interferometer/simple/data.fits differ diff --git a/dataset/interferometer/simple/galaxies.json b/dataset/interferometer/simple/galaxies.json index 283def68..a7b4f7f3 100644 --- a/dataset/interferometer/simple/galaxies.json +++ b/dataset/interferometer/simple/galaxies.json @@ -11,8 +11,13 @@ "type": "instance", "class_path": "autogalaxy.profiles.light.standard.sersic.Sersic", "arguments": { - "effective_radius": 0.6, - "intensity": 1.0, + "centre": { + "type": "tuple", + "values": [ + 0.0, + 0.0 + ] + }, "ell_comps": { "type": "tuple", "values": [ @@ -21,33 +26,28 @@ ] }, "sersic_index": 3.0, - "centre": { - "type": "tuple", - "values": [ - 0.0, - 0.0 - ] - } + "intensity": 1.0, + "effective_radius": 0.6 } }, "disk": { "type": "instance", "class_path": "autogalaxy.profiles.light.standard.exponential.Exponential", "arguments": { - "intensity": 0.5, - "ell_comps": { + "centre": { "type": "tuple", "values": [ - 0.152828012432548, - 0.08823529411764709 + 0.0, + 0.0 ] }, "effective_radius": 1.6, - "centre": { + "intensity": 0.5, + "ell_comps": { "type": "tuple", "values": [ - 0.0, - 0.0 + 0.152828012432548, + 0.08823529411764709 ] } } diff --git a/dataset/interferometer/simulated_galaxy/data.fits b/dataset/interferometer/simulated_galaxy/data.fits index 4a1951bc..f25b8f76 100644 Binary files a/dataset/interferometer/simulated_galaxy/data.fits and b/dataset/interferometer/simulated_galaxy/data.fits differ diff --git a/dataset/multi/imaging/simple/g_data.fits b/dataset/multi/imaging/simple/g_data.fits index f8719db0..ad15dba9 100644 Binary files a/dataset/multi/imaging/simple/g_data.fits and b/dataset/multi/imaging/simple/g_data.fits differ diff --git a/dataset/multi/imaging/simple/g_galaxies.json b/dataset/multi/imaging/simple/g_galaxies.json index 4a86bbb1..3713cdda 100644 --- a/dataset/multi/imaging/simple/g_galaxies.json +++ b/dataset/multi/imaging/simple/g_galaxies.json @@ -5,51 +5,51 @@ "type": "instance", "class_path": "autogalaxy.galaxy.galaxy.Galaxy", "arguments": { - "redshift": 0.5, "label": null, + "redshift": 0.5, "bulge": { "type": "instance", "class_path": "autogalaxy.profiles.light.standard.sersic.Sersic", "arguments": { "sersic_index": 3.0, - "ell_comps": { - "type": "tuple", - "values": [ - 0.05263157894736841, - 3.2227547345982974e-18 - ] - }, "intensity": 0.2, - "effective_radius": 0.6, "centre": { "type": "tuple", "values": [ 0.0, 0.0 ] - } + }, + "ell_comps": { + "type": "tuple", + "values": [ + 0.05263157894736841, + 3.2227547345982974e-18 + ] + }, + "effective_radius": 0.6 } }, "disk": { "type": "instance", "class_path": "autogalaxy.profiles.light.standard.exponential.Exponential", "arguments": { - "effective_radius": 1.6, - "ell_comps": { + "centre": { "type": "tuple", "values": [ - 0.152828012432548, - 0.08823529411764709 + 0.0, + 0.0 ] }, "intensity": 0.2, - "centre": { + "ell_comps": { "type": "tuple", "values": [ - 0.0, - 0.0 + 0.152828012432548, + 0.08823529411764709 ] - } + }, + "effective_radius": 1.6 } } } diff --git a/dataset/multi/imaging/simple/g_noise_map.fits b/dataset/multi/imaging/simple/g_noise_map.fits index 6c368a10..144698e9 100644 Binary files a/dataset/multi/imaging/simple/g_noise_map.fits and b/dataset/multi/imaging/simple/g_noise_map.fits differ diff --git a/dataset/multi/imaging/simple/r_data.fits b/dataset/multi/imaging/simple/r_data.fits index d68a056b..0764a14e 100644 Binary files a/dataset/multi/imaging/simple/r_data.fits and b/dataset/multi/imaging/simple/r_data.fits differ diff --git a/dataset/multi/imaging/simple/r_galaxies.json b/dataset/multi/imaging/simple/r_galaxies.json index 4917932e..248e9675 100644 --- a/dataset/multi/imaging/simple/r_galaxies.json +++ b/dataset/multi/imaging/simple/r_galaxies.json @@ -5,51 +5,51 @@ "type": "instance", "class_path": "autogalaxy.galaxy.galaxy.Galaxy", "arguments": { - "redshift": 0.5, "label": null, + "redshift": 0.5, "bulge": { "type": "instance", "class_path": "autogalaxy.profiles.light.standard.sersic.Sersic", "arguments": { "sersic_index": 3.0, - "ell_comps": { - "type": "tuple", - "values": [ - 0.05263157894736841, - 3.2227547345982974e-18 - ] - }, "intensity": 0.4, - "effective_radius": 0.6, "centre": { "type": "tuple", "values": [ 0.0, 0.0 ] - } + }, + "ell_comps": { + "type": "tuple", + "values": [ + 0.05263157894736841, + 3.2227547345982974e-18 + ] + }, + "effective_radius": 0.6 } }, "disk": { "type": "instance", "class_path": "autogalaxy.profiles.light.standard.exponential.Exponential", "arguments": { - "effective_radius": 1.6, - "ell_comps": { + "centre": { "type": "tuple", "values": [ - 0.152828012432548, - 0.08823529411764709 + 0.0, + 0.0 ] }, "intensity": 0.5, - "centre": { + "ell_comps": { "type": "tuple", "values": [ - 0.0, - 0.0 + 0.152828012432548, + 0.08823529411764709 ] - } + }, + "effective_radius": 1.6 } } } diff --git a/dataset/multi/imaging/simple/r_noise_map.fits b/dataset/multi/imaging/simple/r_noise_map.fits index 98387c3b..9c770a76 100644 Binary files a/dataset/multi/imaging/simple/r_noise_map.fits and b/dataset/multi/imaging/simple/r_noise_map.fits differ diff --git a/output/.gitignore b/output/.gitignore deleted file mode 100644 index d6b7ef32..00000000 --- a/output/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/scripts/ellipse/database.py b/scripts/ellipse/database.py index 432b0c47..86328a07 100644 --- a/scripts/ellipse/database.py +++ b/scripts/ellipse/database.py @@ -28,10 +28,9 @@ **Multipoles:** Loading and inspecting multipole model-fit results from the database. """ -# from autoconf import setup_notebook; setup_notebook() +# from autoconf import setup_notebook; setup_notebook() import os -from os import path from pathlib import Path import autofit as af diff --git a/scripts/guides/hpc/example_cpu_and_gpu.py b/scripts/guides/hpc/example_cpu_and_gpu.py index e5695618..6a6e9ada 100644 --- a/scripts/guides/hpc/example_cpu_and_gpu.py +++ b/scripts/guides/hpc/example_cpu_and_gpu.py @@ -59,7 +59,6 @@ You will need to update `hpc_username` to your hpc username below. """ -from os import path from pathlib import Path hpc_output_path = Path(path.sep) / "hpc" / "data" / "hpc_username" / "output" @@ -205,7 +204,7 @@ """ dataset_path = Path(hpc_dataset_path, dataset_type, dataset_name) -if not dataset_path.exists(): +if not dataset_Path().exists(): local_dataset_path = Path.cwd() dataset_type = "imaging" dataset_path = Path(local_dataset_path, "dataset", dataset_type, dataset_name) @@ -240,7 +239,7 @@ dataset_path = Path(hpc_dataset_path, dataset_folder, dataset_name) -if not dataset_path.exists(): +if not dataset_Path().exists(): local_dataset_path = Path.cwd() dataset_folder = "imaging" dataset_path = Path(local_dataset_path, "dataset", dataset_folder, dataset_name) @@ -252,7 +251,7 @@ If the dataset does not already exist on your system, it will be created by running the corresponding simulator script. This ensures that all example scripts can be run without manually simulating data first. """ -if not dataset_path.exists(): +if not dataset_Path().exists(): import subprocess import sys diff --git a/scripts/guides/modeling/bug_fix.py b/scripts/guides/modeling/bug_fix.py index d6649074..1f41e454 100644 --- a/scripts/guides/modeling/bug_fix.py +++ b/scripts/guides/modeling/bug_fix.py @@ -47,7 +47,6 @@ def fit(): # from autoconf import setup_notebook; setup_notebook() - from os import path from pathlib import Path import autofit as af import autogalaxy as ag @@ -57,7 +56,7 @@ def fit(): __Dataset__ """ dataset_name = "simple" - dataset_path = path.join("dataset", "imaging", dataset_name) + dataset_path = Path("dataset") / "imaging" / dataset_name """ __Dataset Auto-Simulation__ @@ -75,9 +74,9 @@ def fit(): ) dataset = ag.Imaging.from_fits( - data_path=path.join(dataset_path, "data.fits"), - psf_path=path.join(dataset_path, "psf.fits"), - noise_map_path=path.join(dataset_path, "noise_map.fits"), + data_path=Path(dataset_path) / "data.fits", + psf_path=Path(dataset_path) / "psf.fits", + noise_map_path=Path(dataset_path) / "noise_map.fits", pixel_scales=0.1, ) diff --git a/scripts/imaging/data_preparation/examples/optional/info.py b/scripts/imaging/data_preparation/examples/optional/info.py index 01636f4a..b585b37b 100644 --- a/scripts/imaging/data_preparation/examples/optional/info.py +++ b/scripts/imaging/data_preparation/examples/optional/info.py @@ -62,7 +62,7 @@ with open(info_file, "w+") as f: json.dump(info, f, indent=4) -if os.path.exists(Path(dataset_path, "info.json")): +if Path(dataset_path, "info.json").exists(): os.remove(Path(dataset_path, "info.json")) diff --git a/scripts/interferometer/casa_reduction.py b/scripts/interferometer/casa_reduction.py index 68c57bda..ef7ab654 100644 --- a/scripts/interferometer/casa_reduction.py +++ b/scripts/interferometer/casa_reduction.py @@ -64,7 +64,7 @@ # # def getcol_wrapper(ms, table, colname): # -# if os.path.isdir(ms): +# if Path(ms).is_dir(): # tb.open( # "{}/{}".format(ms, table) # ) @@ -83,7 +83,7 @@ # # def get_visibilities(ms): # -# if os.path.isdir(ms): +# if Path(ms).is_dir(): # data = getcol_wrapper( # ms=ms, # table="", @@ -118,7 +118,7 @@ # # return array_converted # -# if os.path.isdir(ms): +# if Path(ms).is_dir(): # uvw = getcol_wrapper( # ms=ms, # table="", diff --git a/start_here.py b/start_here.py index b298fd51..e00c07d9 100644 --- a/start_here.py +++ b/start_here.py @@ -60,7 +60,7 @@ import autogalaxy.plot as aplt import matplotlib.pyplot as plt -from os import path +from pathlib import Path """ Lets illustrate a simple galaxy structure calculations creating an an image of a galaxy using a light profile.