From f6b242af5fe35803c63dace372f7331252f5c7eb Mon Sep 17 00:00:00 2001
From: Johannes Kasimir <johanneskasimir@gmail.com>
Date: Wed, 25 Oct 2023 14:05:02 +0200
Subject: [PATCH] fix: remove 'reflectometry' submodule

---
 docs/examples/amor.ipynb                           |  4 ++--
 src/essreflectometry/__init__.py                   | 12 +++++++++++-
 src/essreflectometry/amor/__init__.py              | 12 +++++-------
 src/essreflectometry/amor/beamline.py              |  2 +-
 src/essreflectometry/amor/calibrations.py          |  2 +-
 src/essreflectometry/amor/conversions.py           |  4 ++--
 src/essreflectometry/amor/load.py                  |  2 +-
 src/essreflectometry/amor/normalize.py             |  2 +-
 src/essreflectometry/amor/resolution.py            |  4 ++--
 src/essreflectometry/amor/types.py                 |  2 +-
 .../{reflectometry => }/conversions.py             |  0
 .../{reflectometry => }/corrections.py             |  2 +-
 src/essreflectometry/{reflectometry => }/io.py     |  0
 src/essreflectometry/{reflectometry => }/orso.py   |  0
 src/essreflectometry/reflectometry/__init__.py     | 14 --------------
 src/essreflectometry/{amor => }/tools.py           |  0
 src/essreflectometry/{reflectometry => }/types.py  |  0
 tests/amor/tools_test.py                           |  2 +-
 18 files changed, 29 insertions(+), 35 deletions(-)
 rename src/essreflectometry/{reflectometry => }/conversions.py (100%)
 rename src/essreflectometry/{reflectometry => }/corrections.py (99%)
 rename src/essreflectometry/{reflectometry => }/io.py (100%)
 rename src/essreflectometry/{reflectometry => }/orso.py (100%)
 delete mode 100644 src/essreflectometry/reflectometry/__init__.py
 rename src/essreflectometry/{amor => }/tools.py (100%)
 rename src/essreflectometry/{reflectometry => }/types.py (100%)

diff --git a/docs/examples/amor.ipynb b/docs/examples/amor.ipynb
index 750a768..e1933ac 100644
--- a/docs/examples/amor.ipynb
+++ b/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",
diff --git a/src/essreflectometry/__init__.py b/src/essreflectometry/__init__.py
index 12c1916..f304467 100644
--- a/src/essreflectometry/__init__.py
+++ b/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,
+    )
+)
diff --git a/src/essreflectometry/amor/__init__.py b/src/essreflectometry/amor/__init__.py
index d4122e7..9c7af88 100644
--- a/src/essreflectometry/amor/__init__.py
+++ b/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'),
diff --git a/src/essreflectometry/amor/beamline.py b/src/essreflectometry/amor/beamline.py
index 133f807..8a66298 100644
--- a/src/essreflectometry/amor/beamline.py
+++ b/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,
diff --git a/src/essreflectometry/amor/calibrations.py b/src/essreflectometry/amor/calibrations.py
index 38f95c4..5cc8b55 100644
--- a/src/essreflectometry/amor/calibrations.py
+++ b/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
 
 
diff --git a/src/essreflectometry/amor/conversions.py b/src/essreflectometry/amor/conversions.py
index cf8e0e3..f3ed443 100644
--- a/src/essreflectometry/amor/conversions.py
+++ b/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(
diff --git a/src/essreflectometry/amor/load.py b/src/essreflectometry/amor/load.py
index 4116f2a..448eb27 100644
--- a/src/essreflectometry/amor/load.py
+++ b/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
 
 
diff --git a/src/essreflectometry/amor/normalize.py b/src/essreflectometry/amor/normalize.py
index 81b2330..4452840 100644
--- a/src/essreflectometry/amor/normalize.py
+++ b/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(
diff --git a/src/essreflectometry/amor/resolution.py b/src/essreflectometry/amor/resolution.py
index 909dfa4..e591dd1 100644
--- a/src/essreflectometry/amor/resolution.py
+++ b/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:
diff --git a/src/essreflectometry/amor/types.py b/src/essreflectometry/amor/types.py
index df9c6ac..1997963 100644
--- a/src/essreflectometry/amor/types.py
+++ b/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
diff --git a/src/essreflectometry/reflectometry/conversions.py b/src/essreflectometry/conversions.py
similarity index 100%
rename from src/essreflectometry/reflectometry/conversions.py
rename to src/essreflectometry/conversions.py
diff --git a/src/essreflectometry/reflectometry/corrections.py b/src/essreflectometry/corrections.py
similarity index 99%
rename from src/essreflectometry/reflectometry/corrections.py
rename to src/essreflectometry/corrections.py
index e7f73b4..1443c55 100644
--- a/src/essreflectometry/reflectometry/corrections.py
+++ b/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 (
diff --git a/src/essreflectometry/reflectometry/io.py b/src/essreflectometry/io.py
similarity index 100%
rename from src/essreflectometry/reflectometry/io.py
rename to src/essreflectometry/io.py
diff --git a/src/essreflectometry/reflectometry/orso.py b/src/essreflectometry/orso.py
similarity index 100%
rename from src/essreflectometry/reflectometry/orso.py
rename to src/essreflectometry/orso.py
diff --git a/src/essreflectometry/reflectometry/__init__.py b/src/essreflectometry/reflectometry/__init__.py
deleted file mode 100644
index e5328ac..0000000
--- a/src/essreflectometry/reflectometry/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
-
-# flake8: noqa: F401
-from itertools import chain
-
-from . import conversions, corrections, io
-
-providers = list(
-    chain(
-        conversions.providers,
-        corrections.providers,
-    )
-)
diff --git a/src/essreflectometry/amor/tools.py b/src/essreflectometry/tools.py
similarity index 100%
rename from src/essreflectometry/amor/tools.py
rename to src/essreflectometry/tools.py
diff --git a/src/essreflectometry/reflectometry/types.py b/src/essreflectometry/types.py
similarity index 100%
rename from src/essreflectometry/reflectometry/types.py
rename to src/essreflectometry/types.py
diff --git a/tests/amor/tools_test.py b/tests/amor/tools_test.py
index 31eb753..2d0e25e 100644
--- a/tests/amor/tools_test.py
+++ b/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():