fix: remove 'reflectometry' submodule

docs/examples/amor.ipynb

@@ -20,7 +20,7 @@
  "import scipp as sc\n",
  "import sciline\n",
  "from essreflectometry.amor import providers, default_parameters\n",
- "from essreflectometry.reflectometry.types import *\n",
+ "from essreflectometry.types import *\n",
  "from essreflectometry.amor.types import SampleRotation"
  ]
  },
@@ -102,7 +102,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "from essreflectometry.reflectometry.types import ThetaData\n",
+ "from essreflectometry.types import ThetaData\n",
  "pipeline.compute(ThetaData[Sample])\\\n",
  " .bins.concat('detector_number')\\\n",
  " .hist(\n",

src/essreflectometry/__init__.py

@@ -1,10 +1,20 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
 
-# flake8: noqa
+# flake8: noqa: F401
 import importlib.metadata
+from itertools import chain
 
 try:
  __version__ = importlib.metadata.version(__package__ or __name__)
 except importlib.metadata.PackageNotFoundError:
  __version__ = "0.0.0"
+
+from . import conversions, corrections, io
+
+providers = list(
+ chain(
+ conversions.providers,
+ corrections.providers,
+ )
+)

src/essreflectometry/amor/__init__.py

@@ -4,13 +4,11 @@
 from itertools import chain
 
 import scipp as sc
-from scipp.constants import g
 
-from ..reflectometry import providers as reflectometry_providers
-from ..reflectometry.types import Run
-from . import beamline, calibrations, conversions, load, normalize, resolution, tools
-
-# from .beamline import instrument_view_components
+from .. import providers as reflectometry_providers
+from ..types import Run
+from . import beamline, calibrations, conversions, load, normalize, resolution
+from .beamline import instrument_view_components
 from .instrument_view import instrument_view
 from .types import *
 
@@ -33,7 +31,7 @@
  BeamSize[Run]: 2.0 * sc.units.mm,
  SampleSize[Run]: 10.0 * sc.units.mm,
  DetectorSpatialResolution[Run]: 0.0025 * sc.units.m,
- Gravity: sc.vector(value=[0, -1, 0]) * g,
+ Gravity: sc.vector(value=[0, -1, 0]) * sc.constants.g,
  ChopperFrequency[Run]: sc.scalar(20 / 3, unit='Hz'),
  ChopperPhase[Run]: sc.scalar(-8.0, unit='deg'),
  Chopper1Position[Run]: sc.vector(value=[0, 0, -15.5], unit='m'),

src/essreflectometry/amor/beamline.py

@@ -4,7 +4,7 @@
 
 from ..choppers import make_chopper
 from ..logging import log_call
-from ..reflectometry.types import BeamlineParams, Run
+from ..types import BeamlineParams, Run
 from .types import (
  BeamSize,
  Chopper1Position,

src/essreflectometry/amor/calibrations.py

@@ -3,7 +3,7 @@
 import scipp as sc
 
 # from ..reflectometry import orso
-from ..reflectometry.types import CalibratedReference, Histogrammed, Reference
+from ..types import CalibratedReference, Histogrammed, Reference
 from .types import Alpha, CriticalEdge, MValue, Supermirror
 
 

src/essreflectometry/amor/conversions.py

@@ -2,8 +2,8 @@
 # Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
 import scipp as sc
 
-from ..reflectometry.conversions import specular_reflection as spec_relf_graph
-from ..reflectometry.types import SpecularReflectionCoordTransformGraph
+from ..conversions import specular_reflection as spec_relf_graph
+from ..types import SpecularReflectionCoordTransformGraph
 
 
 def incident_beam(

src/essreflectometry/amor/load.py

@@ -7,7 +7,7 @@
 import scippnexus as snx
 
 from ..logging import get_logger
-from ..reflectometry.types import BeamlineParams, Filename, Raw, Run
+from ..types import BeamlineParams, Filename, Raw, Run
 from .data import get_path
 
 

src/essreflectometry/amor/normalize.py

@@ -3,7 +3,7 @@
 import scipp as sc
 
 # from ..reflectometry import orso
-from ..reflectometry.types import Normalized, NormalizedIOfQ, Reference, Sample
+from ..types import Normalized, NormalizedIOfQ, Reference, Sample
 
 
 def normalize_by_supermirror(

src/essreflectometry/amor/resolution.py

@@ -2,7 +2,8 @@
 # Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
 import scipp as sc
 
-from ..reflectometry.types import (
+from ..tools import fwhm_to_std
+from ..types import (
  AngularResolution,
  QBins,
  QData,
@@ -11,7 +12,6 @@
  SampleSizeResolution,
  WavelengthResolution,
 )
-from .tools import fwhm_to_std
 
 
 def wavelength_resolution(da: QData[Sample]) -> WavelengthResolution:

src/essreflectometry/amor/types.py

@@ -3,7 +3,7 @@
 import sciline
 import scipp as sc
 
-from ..reflectometry.types import Run
+from ..types import Run
 
 # TODO What do they mean?
 # Supermirror parameters

src/essreflectometry/reflectometry/corrections.py → src/essreflectometry/corrections.py

@@ -3,7 +3,7 @@
 import numpy as np
 import scipp as sc
 
-from ..amor.tools import fwhm_to_std
+from .tools import fwhm_to_std
 
 # from . import orso
 from .types import (

tests/amor/tools_test.py

@@ -4,7 +4,7 @@
 import pytest
 import scipp as sc
 
-from essreflectometry.amor import tools
+from essreflectometry import tools
 
 
 def test_linlogspace_linear():