Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ classes. Heritage: Euclid VIS CTI calibration; also HST ACS
(`autocti/instruments/acs`).

Dependency direction: autocti may import **autoarray** (data structures),
**autofit** (model-fitting), and **autoconf** (config). Nothing in the PyAuto
**autofit** (model-fitting), and **autonerves** (config). Nothing in the PyAuto
stack imports autocti — it is a leaf like PyAutoLens.

## Resurrection status (2026-07)
Expand Down Expand Up @@ -85,13 +85,13 @@ import autocti as ac

## Key rules / footguns

- Import direction: autoarray / autofit / autoconf only — never autogalaxy or
- Import direction: autoarray / autofit / autonerves only — never autogalaxy or
autolens.
- Unit tests are numpy-only; there is no JAX in this library (arctic is C++).
- Slicing an autoarray `Mask2D` returns a plain ndarray — rebuild a `Mask2D`
with the parent's `pixel_scales` before constructing an `Array2D` from it
(see `autocti/extract/two_d/abstract.py`).
- Fits I/O goes through `autoconf.fitsable` (`ndarray_via_fits_from`,
- Fits I/O goes through `autonerves.fitsable` (`ndarray_via_fits_from`,
`output_to_fits`, `hdu_list_for_output_from`) — instance `.output_to_fits`
methods no longer exist on autoarray structures.
- All files use Unix line endings (LF, `\n`) — never `\r\n`.
Expand Down
26 changes: 13 additions & 13 deletions autocti/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from autoconf.dictable import from_dict, from_json, output_to_json, to_dict
from autonerves.dictable import from_dict, from_json, output_to_json, to_dict

from autoarray.mask.mask_1d import Mask1D
from autoarray.layout.region import Region1D
Expand Down Expand Up @@ -74,35 +74,35 @@
from . import plot
from . import mock as m # noqa

from autoconf import conf
from autonerves import conf

conf.instance.register(__file__)

__version__ = "2024.11.13.2"

# ---------------------------------------------------------------------------
# Public re-export of the autoconf configuration / serialization surface.
# Public re-export of the autonerves configuration / serialization surface.
#
# Workspaces, tutorials and downstream code import these names from the science
# library (e.g. ``from autolens import conf``) rather than depending on the
# ``autoconf`` package directly, so the underlying configuration / serialization
# ``autonerves`` package directly, so the underlying configuration / serialization
# layer stays an implementation detail of the library.
# ---------------------------------------------------------------------------
from autoconf import conf
from autoconf import jax_wrapper
from autoconf import fitsable
from autoconf import setup_colab
from autoconf import setup_notebook
from autoconf.conf import with_config
from autoconf.dictable import from_dict, from_json, to_dict, output_to_json
from autoconf.fitsable import (
from autonerves import conf
from autonerves import jax_wrapper
from autonerves import fitsable
from autonerves import setup_colab
from autonerves import setup_notebook
from autonerves.conf import with_config
from autonerves.dictable import from_dict, from_json, to_dict, output_to_json
from autonerves.fitsable import (
output_to_fits,
hdu_list_for_output_from,
ndarray_via_fits_from,
ndarray_via_hdu_from,
header_obj_from,
)
from autoconf.test_mode import (
from autonerves.test_mode import (
with_test_mode_segment,
skip_visualization,
skip_fit_output,
Expand Down
2 changes: 1 addition & 1 deletion autocti/aggregator/dataset_1d.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import autofit as af
import autoarray as aa
from autoconf.fitsable import ndarray_via_hdu_from
from autonerves.fitsable import ndarray_via_hdu_from

from autocti.dataset_1d.dataset_1d.dataset_1d import Dataset1D

Expand Down
2 changes: 1 addition & 1 deletion autocti/aggregator/imaging_ci.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from functools import partial

import autoarray as aa
from autoconf.fitsable import ndarray_via_hdu_from
from autonerves.fitsable import ndarray_via_hdu_from
import autofit as af

from autocti.charge_injection.imaging.imaging import ImagingCI
Expand Down
2 changes: 1 addition & 1 deletion autocti/charge_injection/imaging/imaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import Optional, List, Dict, Union

import autoarray as aa
from autoconf import fitsable
from autonerves import fitsable

from autocti.charge_injection.imaging.settings import SettingsImagingCI
from autocti.charge_injection.layout import Layout2DCI
Expand Down
6 changes: 3 additions & 3 deletions autocti/charge_injection/model/analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
import logging
from typing import List, Optional

from autoconf import conf
from autoconf.dictable import to_dict
from autonerves import conf
from autonerves.dictable import to_dict

import autoarray as aa
import autofit as af
from autoconf.fitsable import hdu_list_for_output_from
from autonerves.fitsable import hdu_list_for_output_from

from autocti.charge_injection.imaging.imaging import ImagingCI
from autocti.charge_injection.fit import FitImagingCI
Expand Down
2 changes: 1 addition & 1 deletion autocti/charge_injection/model/visualizer.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from autoconf import conf
from autonerves import conf

import logging

Expand Down
2 changes: 1 addition & 1 deletion autocti/charge_injection/plot/fit_ci_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import numpy as np

from autoconf.fitsable import hdu_list_for_output_from
from autonerves.fitsable import hdu_list_for_output_from
from autoarray.plot.array import plot_array
from autoarray.plot.utils import (
subplots,
Expand Down
2 changes: 1 addition & 1 deletion autocti/charge_injection/plot/imaging_ci_plots.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import copy
from typing import List, Optional

from autoconf import conf
from autonerves import conf

from autoarray.plot.array import plot_array
from autoarray.plot.utils import (
Expand Down
2 changes: 1 addition & 1 deletion autocti/clocker/abstract.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from arcticpy import CCD
from arcticpy import CCDPhase

from autoconf.dictable import from_json, output_to_json
from autonerves.dictable import from_json, output_to_json


class AbstractClocker:
Expand Down
2 changes: 1 addition & 1 deletion autocti/dataset_1d/dataset_1d/dataset_1d.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import Optional, Dict, Union

import autoarray as aa
from autoconf import fitsable
from autonerves import fitsable

from autocti import exc
from autocti.extract.settings import SettingsExtract
Expand Down
4 changes: 2 additions & 2 deletions autocti/dataset_1d/model/analysis.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import numpy as np
from typing import List, Optional

from autoconf.dictable import to_dict
from autonerves.dictable import to_dict

import autofit as af
from autoconf.fitsable import hdu_list_for_output_from
from autonerves.fitsable import hdu_list_for_output_from

from autocti.dataset_1d.dataset_1d.dataset_1d import Dataset1D
from autocti.dataset_1d.fit import FitDataset1D
Expand Down
2 changes: 1 addition & 1 deletion autocti/dataset_1d/plot/fit_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import numpy as np

from autoconf.fitsable import hdu_list_for_output_from
from autonerves.fitsable import hdu_list_for_output_from
from autoarray.plot.utils import (
subplots,
subplot_save,
Expand Down
2 changes: 1 addition & 1 deletion autocti/instruments/acs/array_2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from autoarray.layout import layout_util

from autocti.instruments.acs import acs_util
from autoconf import fitsable
from autonerves import fitsable

logging.basicConfig()
logger = logging.getLogger()
Expand Down
2 changes: 1 addition & 1 deletion autocti/instruments/acs/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from autocti.instruments.acs.header import HeaderACS

from autocti.instruments.acs import acs_util
from autoconf import fitsable
from autonerves import fitsable

logging.basicConfig()
logger = logging.getLogger()
Expand Down
2 changes: 1 addition & 1 deletion autocti/mask/mask_2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from typing import List, Tuple

import autoarray as aa
from autoconf import fitsable
from autonerves import fitsable

from autoarray import exc

Expand Down
4 changes: 2 additions & 2 deletions autocti/model/analysis.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import List, Optional, Union

from autoconf import conf
from autoconf.dictable import output_to_json
from autonerves import conf
from autonerves.dictable import output_to_json

import autoarray as aa
import autofit as af
Expand Down
2 changes: 1 addition & 1 deletion autocti/model/model_util.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Optional, List

from autoconf.dictable import from_json
from autonerves.dictable import from_json

from arcticpy import CCDPhase
from arcticpy import PixelBounce
Expand Down
2 changes: 1 addition & 1 deletion autocti/model/plotter.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from pathlib import Path
from typing import List, Union

from autoconf import conf
from autonerves import conf


def setting(section: Union[List[str], str], name: str):
Expand Down
2 changes: 1 addition & 1 deletion autocti/model/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from arcticpy import TrapInstantCapture

from autoconf.dictable import from_json, output_to_json
from autonerves.dictable import from_json, output_to_json

from autocti import exc

Expand Down
2 changes: 1 addition & 1 deletion docs/general/configs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ command (the path to the ``output`` folder where the results of a non-linear sea

.. code-block:: bash

from autoconf import conf
from autonerves import conf

conf.instance.push(
config_path="path/to/config",
Expand Down
2 changes: 1 addition & 1 deletion docs/installation/arctic.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ You should get the following text:
Author-email: Richard Massey <[email protected]>
License:
Location: /mnt/c/Users/Jammy/Code/PyAuto/arctic/python
Requires: autoconf, numpy
Requires: autonerves, numpy
Required-by:

If an error is raised when trying to install **arCTIc** you should first try to install it via `pip`:
Expand Down
4 changes: 2 additions & 2 deletions docs/installation/source.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Next, install the **PyAuto** parent projects via pip:

.. code-block:: bash

pip install autoconf
pip install autonerves
pip install autofit
pip install autoarray

Expand Down Expand Up @@ -102,7 +102,7 @@ Next, install **PyAutoConf** via pip:

.. code-block:: bash

pip install autoconf
pip install autonerves

Next, install the source build dependencies of each project via pip:

Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
arcticpy==2.6
autoconf==2024.11.6.1
autonerves==2024.11.6.1
numpydoc>=1.0.0
pyprojroot==0.2.0
sphinx
Expand Down
4 changes: 2 additions & 2 deletions test_autocti/aggregator/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import os
import shutil

from autoconf import conf
from autonerves import conf
import autofit as af
import autocti as ac
from autoconf.conf import with_config
from autonerves.conf import with_config
from autofit.non_linear.samples import Sample


Expand Down
2 changes: 1 addition & 1 deletion test_autocti/clocker/test_dict.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pytest

from autoconf.dictable import output_to_json, from_dict, from_json
from autonerves.dictable import output_to_json, from_dict, from_json
from autocti import Clocker2D


Expand Down
2 changes: 1 addition & 1 deletion test_autocti/instruments/acs/test_image.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import numpy as np
from autoconf import fitsable
from autonerves import fitsable
from astropy.io import fits
import copy
import shutil
Expand Down
2 changes: 1 addition & 1 deletion test_autocti/mask/test_mask_2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import shutil

import numpy as np
from autoconf import fitsable
from autonerves import fitsable
import pytest
import autocti as ac
from autocti import exc
Expand Down
2 changes: 1 addition & 1 deletion test_autocti/model/test_model_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from os import path

import autocti as ac
from autoconf.dictable import output_to_json, from_json
from autonerves.dictable import output_to_json, from_json


def test__trap_all_list():
Expand Down
4 changes: 2 additions & 2 deletions test_autocti/model/test_settings_dict.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from autoconf.dictable import from_dict
from autonerves.dictable import from_dict

import autocti as ac
from autoconf.dictable import from_dict, output_to_json, from_json
from autonerves.dictable import from_dict, output_to_json, from_json


@pytest.fixture(name="settings_dict")
Expand Down
Loading