moreniius 0.6.0__tar.gz → 0.6.1__tar.gz

moreniius-0.6.1/.github/dependabot.yml

@@ -0,0 +1,17 @@
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    groups:
+      python-packages:
+        patterns:
+          - "*"

{moreniius-0.6.0 → moreniius-0.6.1}/.github/workflows/pip.yml

@@ -15,24 +15,19 @@ jobs:
       fail-fast: false
       matrix:
         platform: [windows-latest, macos-latest, ubuntu-latest]
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Set min macOS version
-      if: runner.os == 'macOS'
-      run: |
-        echo "MACOS_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV
-
     - name: Build and install
       run: pip install --verbose .
 
     - name: Test
       run: |
-        python -m pip install pytest git+https://github.com/g5t/mccode-to-kafka.git
+        python -m pip install pytest mccode-to-kafka
         python -m pytest

{moreniius-0.6.0 → moreniius-0.6.1}/.github/workflows/wheels.yml

@@ -15,7 +15,7 @@ jobs:
     name: Build SDist and Wheel
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
         submodules: true
@@ -26,7 +26,7 @@ jobs:
     - name: Check metadata
       run: pipx run twine check dist/*
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         path: dist/*
 
@@ -42,9 +42,9 @@ jobs:
     if: github.event_name == 'release' && github.event.action == 'published'
 
     steps:
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
 
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v7
       with:
         name: artifact
         path: dist

{moreniius-0.6.0/src/moreniius.egg-info → moreniius-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moreniius
-Version: 0.6.0
+Version: 0.6.1
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Development Status :: 2 - Pre-Alpha
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Description-Content-Type: text/markdown
 Requires-Dist: zenlog>=1.1
 Requires-Dist: platformdirs>=3.11

{moreniius-0.6.0 → moreniius-0.6.1}/pyproject.toml

@@ -24,6 +24,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 dynamic = ["version"]
 
@@ -37,6 +38,7 @@ legacy_tox_ini = """
     [tox]
     min_version = 4.0
     env_list =
+        py314
         py313
         py312
         py311

{moreniius-0.6.0 → moreniius-0.6.1}/src/moreniius/mccode/comp.py

@@ -95,27 +95,41 @@ def diskchopper_translator(nxinstance):
     return nxinstance.make_nx(NXdisk_chopper, slit_edges=NXfield(nx_slit_edges, units='degrees'), **resolve_parameter_links(pars))
 
 
-def elliptic_guide_gravity_translator(nxinstance):
-    from nexusformat.nexus import NXguide
+def _ellipse_vertices_faces(major_x, minor_x, offset_x, major_y, minor_y, offset_y, l, n=10):
+    """
+    Create vertices and faces for an elliptical guide with given parameters.
+
+    Parameters
+    ----------
+    major_x : float
+        Major axis half-length in the x-direction.
+    minor_x : float
+        Minor axis half-length in the x-direction.
+    offset_x : float
+        Offset from the end of the ellipse to the guide entrance in the x-direction.
+    major_y : float
+        Major axis half-length in the y-direction.
+    minor_y : float
+        Minor axis half-length in the y-direction.
+    offset_y : float
+        Offset from the end of the ellipse to the guide entrance in the y-direction.
+    l : float
+        Length of the guide. l <= 2*major_x - offset_x and l <= 2*major_y - offset_y
+    n : int, optional
+        Number of segments along the length of the guide. Default is 10.
+    """
     from numpy import arange, sqrt
-    from moreniius.nxoff import NXoff
-    if not '"mid"' == nxinstance.obj.get_parameter('dimensionsAt'):
-        log.warn('Only midpoint geometry supported by Elliptic_guide_gravity translator')
-        log.info(f'The current guide has {nxinstance.obj.get_parameter("dimensionsAt")} specified')
 
-    def ellipse_width(minor, distance, at):
-        major = sqrt((distance / 2) ** 2 + minor ** 2)
+    def ellipse_width(minor, major, at):
         return 0 if abs(at) > major else minor * sqrt(1 - (at / major) ** 2)
 
-    pars = dict(xw='xwidth', xi='linxw', xo='loutxw', yw='yheight', yi='linyh', yo='loutyh', l='l')
-    p = {k: nxinstance.parameter(v) for k, v in pars.items()}
-    n = 10
     rings = arange(n + 1) / n
     faces, vertices = [], []
     for x in rings:
-        w = ellipse_width(p['xw'] / 2, p['xi'] + p['l'] + p['xo'], p['xi'] / 2 + (x - 0.5) * p['l'] - p['xo'] / 2)
-        h = ellipse_width(p['yw'] / 2, p['yi'] + p['l'] + p['yo'], p['yi'] / 2 + (x - 0.5) * p['l'] - p['yo'] / 2)
-        z = x * p['l']
+        z = x * l
+        w = ellipse_width(minor_x, major_x, offset_x - minor_x + z)
+        h = ellipse_width(minor_y, major_y, offset_y - minor_y + x)
+
         vertices.extend([[-w, -h, z], [-w, h, z], [w, h, z], [w, -h, z]])
 
     # These are only the guide faces (that is, the inner faces of the sides of the guide housing)
@@ -124,6 +138,55 @@ def elliptic_guide_gravity_translator(nxinstance):
         j0, j1, j2, j3, j4, j5, j6, j7 = [4 * i + k for k in range(8)]
         faces.extend([[j0, j1, j5, j4], [j1, j2, j6, j5], [j2, j3, j7, j6], [j3, j0, j4, j7]])
 
+    return vertices, faces
+
+def _ellipse_parameters_from_widths(nxinstance):
+    from numpy import sqrt
+
+    def parameters(which, w, i, o, l):
+        foci = i + l + o
+        offset = foci / 2 - i
+        if 'mid' in which:
+            minor = w / 2
+            major = sqrt(foci ** 2 + minor ** 2) / 2
+        else:
+            t, b = (o, i) if 'entrance' in which else (i, o)
+            t += l
+            w /= 2
+            b = sqrt(b * b + w * w / 4) + sqrt(t * t + w * w / 4)
+            major = b / 2
+            minor = sqrt(b * b - foci * foci) / 2
+        return major, minor, offset
+
+    pars = dict(xw='xwidth', xi='linxw', xo='loutxw', yw='yheight', yi='linyh', yo='loutyh', l='l')
+    p = {k: nxinstance.parameter(v) for k, v in pars.items()}
+
+    dim_at = str(nxinstance.obj.get_parameter('dimensionsAt').value)
+    major_x, minor_x, offset_x = parameters(dim_at, p['xw'], p['xi'], p['xo'], p['l'])
+    major_y, minor_y, offset_y = parameters(dim_at, p['yw'], p['yi'], p['yo'], p['l'])
+
+    return major_x, minor_x, offset_x, major_y, minor_y, offset_y, p['l']
+
+
+def elliptic_guide_gravity_translator(nxinstance):
+    from nexusformat.nexus import NXguide
+    from moreniius.nxoff import NXoff
+
+    ellipse_pars = [f'{f}{s}' for f in ('majorAxis', 'minorAxis', 'majorAxisOffset') for s in ('xw', 'yh')]
+    if all(nxinstance.obj.defines_parameter(p) for p in ellipse_pars):
+        # we can use the specified ellipse parameters directly
+        major_x = nxinstance.parameter('majorAxisxw')
+        minor_x = nxinstance.parameter('minorAxisxw')
+        offset_x = nxinstance.parameter('majorAxisOffsetxw')
+        major_y = nxinstance.parameter('majorAxisyh')
+        minor_y = nxinstance.parameter('minorAxisyh')
+        offset_y = nxinstance.parameter('majorAxisOffsetyh')
+        l = nxinstance.parameter('l')
+    else:
+        major_x, minor_x, offset_x, major_y, minor_y, offset_y, l = _ellipse_parameters_from_widths(nxinstance)
+
+    vertices, faces = _ellipse_vertices_faces(major_x, minor_x, offset_x, major_y, minor_y, offset_y, l, n=10)
+
     nx_vertices = [[nxinstance.expr2nx(expr) for expr in vector] for vector in vertices]
     nx_faces = [[nxinstance.expr2nx(expr) for expr in face] for face in faces]
 

{moreniius-0.6.0 → moreniius-0.6.1/src/moreniius.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moreniius
-Version: 0.6.0
+Version: 0.6.1
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Development Status :: 2 - Pre-Alpha
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Description-Content-Type: text/markdown
 Requires-Dist: zenlog>=1.1
 Requires-Dist: platformdirs>=3.11

{moreniius-0.6.0 → moreniius-0.6.1}/src/moreniius.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 .gitignore
 README.md
 pyproject.toml
+.github/dependabot.yml
 .github/workflows/pip.yml
 .github/workflows/wheels.yml
 src/moreniius/__init__.py
@@ -22,5 +23,6 @@ src/moreniius/mccode/instance.py
 src/moreniius/mccode/instr.py
 src/moreniius/mccode/mccode.py
 src/moreniius/mccode/orientation.py
+tests/test_elliptic_guide_gravity.py
 tests/test_motorized_positions.py
 tests/test_nexus_structure.py

moreniius-0.6.1/tests/test_elliptic_guide_gravity.py

@@ -0,0 +1,179 @@
+import pytest
+from nexusformat.nexus import NXguide
+
+
+def make_elliptic_guide_instrument(use_explicit_ellipse_pars=False):
+    """Create an instrument with an Elliptic_guide_gravity component."""
+    from mccode_antlr import Flavor
+    from mccode_antlr.assembler import Assembler
+
+    inst = Assembler('elliptic_guide_test', flavor=Flavor.MCSTAS)
+
+    inst.component('origin', 'Arm', at=(0, 0, 0))
+    inst.component('source', 'Source_simple', at=[(0, 0, 0), 'origin'])
+
+    if use_explicit_ellipse_pars:
+        # Use explicit ellipse axis parameters
+        inst.component(
+            'elliptic_guide', 'Elliptic_guide_gravity',
+            at=[(0, 0, 1), 'source'],
+            parameters={
+                'l': 2.0,
+                'majorAxisxw': 1.5,
+                'minorAxisxw': 0.05,
+                'majorAxisoffsetxw': 0.5,
+                'majorAxisyh': 1.5,
+                'minorAxisyh': 0.06,
+                'majorAxisoffsetyh': 0.5,
+            }
+        )
+    else:
+        # Use width/height based parameters with dimensionsAt
+        inst.component(
+            'elliptic_guide', 'Elliptic_guide_gravity',
+            at=[(0, 0, 1), 'source'],
+            parameters={
+                'l': 2.0,
+                'xwidth': 0.06,
+                'yheight': 0.08,
+                'linxw': 1.0,
+                'loutxw': 1.0,
+                'linyh': 1.0,
+                'loutyh': 1.0,
+                'dimensionsAt': '"mid"',
+            }
+        )
+
+    return inst.instrument
+
+
+def test_elliptic_guide_gravity_translator_from_widths():
+    """Test the elliptic guide translator using width/height parameters."""
+    import moreniius
+
+    instr = make_elliptic_guide_instrument(use_explicit_ellipse_pars=False)
+    me = moreniius.MorEniius.from_mccode(
+        instr, origin='origin', only_nx=False, absolute_depends_on=True
+    )
+
+    assert me is not None
+    assert 'elliptic_guide' in me.nx
+
+    guide = me.nx['elliptic_guide']
+    assert isinstance(guide, NXguide)
+
+    # Should have OFF_GEOMETRY
+    assert 'OFF_GEOMETRY' in guide
+
+
+def test_elliptic_guide_gravity_translator_explicit_pars():
+    """Test the elliptic guide translator using explicit ellipse axis parameters."""
+    import moreniius
+
+    instr = make_elliptic_guide_instrument(use_explicit_ellipse_pars=True)
+    me = moreniius.MorEniius.from_mccode(
+        instr, origin='origin', only_nx=False, absolute_depends_on=True
+    )
+
+    assert me is not None
+    assert 'elliptic_guide' in me.nx
+
+    guide = me.nx['elliptic_guide']
+    assert isinstance(guide, NXguide)
+
+    # Should have OFF_GEOMETRY
+    assert 'OFF_GEOMETRY' in guide
+
+
+def test_elliptic_guide_geometry_has_vertices_and_faces():
+    """Test that the generated geometry has vertices and faces."""
+    import moreniius
+
+    instr = make_elliptic_guide_instrument(use_explicit_ellipse_pars=True)
+    me = moreniius.MorEniius.from_mccode(
+        instr, origin='origin', only_nx=False, absolute_depends_on=True
+    )
+
+    guide = me.nx['elliptic_guide']
+    geometry = guide['OFF_GEOMETRY']
+
+    # NXoff_geometry should have vertices, faces, and winding_order
+    assert 'vertices' in geometry
+    assert 'faces' in geometry
+    assert 'winding_order' in geometry
+
+    # Vertices should be a 2D array (n_vertices, 3)
+    vertices = geometry['vertices'].nxdata
+    assert vertices.ndim == 2
+    assert vertices.shape[1] == 3
+
+    # With n=10 segments, we should have 11 rings of 4 vertices each = 44 vertices
+    assert vertices.shape[0] == 44
+
+
+def test_elliptic_guide_nexus_structure():
+    """Test that the elliptic guide is correctly represented in NeXus structure output."""
+    import moreniius
+
+    instr = make_elliptic_guide_instrument(use_explicit_ellipse_pars=True)
+    me = moreniius.MorEniius.from_mccode(
+        instr, origin='origin', only_nx=False, absolute_depends_on=True
+    )
+
+    ns = me.to_nexus_structure()
+
+    # Navigate to the instrument level
+    assert 'children' in ns
+    entry = ns['children'][0]
+    assert entry['name'] == 'entry'
+
+    instrument = entry['children'][0]
+    assert instrument['name'] == 'instrument'
+
+    # Find the elliptic_guide component
+    guide_groups = [c for c in instrument['children'] if c.get('name') == 'elliptic_guide']
+    assert len(guide_groups) == 1
+
+    guide = guide_groups[0]
+    assert guide['type'] == 'group'
+
+    # Check that it has the NXguide class attribute
+    guide_attrs = guide.get('attributes', [])
+    class_attrs = [a for a in guide_attrs if a.get('name') == 'NX_class']
+    assert len(class_attrs) == 1
+    assert class_attrs[0]['values'] == 'NXguide'
+
+
+def test_ellipse_vertices_faces_function():
+    """Test the _ellipse_vertices_faces helper function directly."""
+    from moreniius.mccode.comp import _ellipse_vertices_faces
+
+    major_x, minor_x, offset_x = 1.5, 0.05, 0.5
+    major_y, minor_y, offset_y = 1.5, 0.06, 0.5
+    l = 2.0
+    n = 5
+
+    vertices, faces = _ellipse_vertices_faces(
+        major_x, minor_x, offset_x,
+        major_y, minor_y, offset_y,
+        l, n=n
+    )
+
+    # Should have (n+1) rings of 4 vertices each
+    assert len(vertices) == (n + 1) * 4
+
+    # Each ring creates 4 faces (top, bottom, left, right of guide)
+    # For n segments, we have n * 4 faces
+    assert len(faces) == n * 4
+
+    # Each vertex should have 3 coordinates
+    assert all(len(v) == 3 for v in vertices)
+
+    # Each face should reference 4 vertex indices
+    assert all(len(f) == 4 for f in faces)
+
+    # z-coordinates should range from 0 to l
+    z_coords = [v[2] for v in vertices]
+    assert min(z_coords) == pytest.approx(0.0)
+    assert max(z_coords) == pytest.approx(l)
+