moreniius 0.2.1__tar.gz → 0.2.2__tar.gz

{moreniius-0.2.1/src/moreniius.egg-info → moreniius-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moreniius
-Version: 0.2.1
+Version: 0.2.2
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Development Status :: 2 - Pre-Alpha

{moreniius-0.2.1 → moreniius-0.2.2}/src/moreniius/mccode/instr.py

@@ -83,7 +83,8 @@ class NXInstr:
                 'expression' in nx_args[0]:
             not_expr = [x for x in nx_args[0] if x != 'expression']
             if len(not_expr) == 1:
-                return nx_args[0][not_expr[0]]
+                # TODO make this return an nx_class once we're sure that nx_kwargs is parseable (no mccode_antlr.Expr)
+                return nx_class(nx_args[0][not_expr[0]], **nx_kwargs)
             else:
                 raise RuntimeError('Not sure what I should do here')
         return nx_class(*nx_args, **nx_kwargs)

{moreniius-0.2.1 → moreniius-0.2.2}/src/moreniius/mccode/orientation.py

@@ -17,14 +17,28 @@ class NXPart:
     def make_nx(self, nx_class, *args, **kwargs):
         return self.instr.make_nx(nx_class, *args, **kwargs)
 
-    def translation(self, dep: str) -> NXfield:
+    def make_translation(self, norm, vec, dep):
+        return self.make_nx(NXfield, norm, vector=vec, depends_on=dep, transformation_type='translation', units='m')
+
+    def translations(self, dep: str, name: str) -> list[tuple[str, NXfield]]:
         from mccode_antlr.instr import RotationPart
+        from mccode_antlr.common import Expr, Value
         if isinstance(self.o, RotationPart):
             raise RuntimeError('Part is a rotation!')
         pos = self.o.position()
+        if any(isinstance(c, (Expr, Value)) for c in (pos.x, pos.y, pos.z)):
+            translations = []
+            print(f'{pos.x=} {pos.y=} {pos.z=}')
+            for n, c, v in (('x', pos.x, [1, 0, 0]), ('y', pos.y, [0, 1, 0]), ('z', pos.z, [0, 0, 1])):
+                if c != Expr.parse('0'):
+                    next_name = f'{name}_{n}'
+                    translations.append((next_name, self.make_translation(c, v, dep)))
+                    dep = next_name
+            return translations
+        # vector is all constants, hopefully
         norm = pos.length()
-        vec = pos if norm.is_zero else pos / norm
-        return self.make_nx(NXfield, norm, vector=vec, depends_on=dep, transformation_type='translation', units='m')
+        vec = pos if norm.is_zero else pos/norm
+        return [(name, self.make_translation(norm, vec, dep))]
 
     def rotation(self, dep: str) -> NXfield:
         from mccode_antlr.instr import TranslationPart
@@ -43,11 +57,11 @@ class NXPart:
 
     def transformations(self, name: str, dep: str | None = None) -> list[tuple[str, NXfield]]:
         if self.o.is_translation and self.o.is_rotation:
-            trans = self.translation(dep)
-            rot = self.rotation(f'{name}_t')
-            return [(f'{name}_t', trans), (f'{name}_r', rot)]
+            ops = self.translations(dep, name)
+            rot = self.rotation(ops[-1][0])
+            return [*ops, (f'{name}_r', rot)]
         elif self.o.is_translation:
-            return [(name, self.translation(dep))]
+            return self.translations(dep, name)
         elif self.o.is_rotation:
             return [(name, self.rotation(dep))]
         else:

{moreniius-0.2.1 → moreniius-0.2.2}/src/moreniius/utils.py

@@ -32,7 +32,14 @@ def outer_transform_dependency(transformations):
     names = list(transformations)
     if len(names) == 1:
         return names[0]
-    depends = {name: getattr(transformations, name).depends_on for name in names}
+    def depends_on_per(name):
+        obj = getattr(transformations, name)
+        if not hasattr(obj, 'depends_on'):
+            raise ValueError(f'{name} in {names} dependency chain missing "depends_on" attribute')
+        return obj.depends_on
+
+    # depends = {name: getattr(transformations, name).depends_on for name in names}
+    depends = {name: depends_on_per(name) for name in names}
     externals = [v for k, v in depends.items() if v not in depends]
     if len(externals) != 1:
         raise RuntimeError(f"Dependency chain {depends} should have one absolute dependency, found {externals} instead")

{moreniius-0.2.1 → moreniius-0.2.2/src/moreniius.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moreniius
-Version: 0.2.1
+Version: 0.2.2
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Development Status :: 2 - Pre-Alpha

{moreniius-0.2.1 → moreniius-0.2.2}/src/moreniius.egg-info/SOURCES.txt

@@ -22,4 +22,5 @@ src/moreniius/mccode/instance.py
 src/moreniius/mccode/instr.py
 src/moreniius/mccode/mccode.py
 src/moreniius/mccode/orientation.py
+tests/test_motorized_positions.py
 tests/test_nexus_structure.py

moreniius-0.2.2/tests/test_motorized_positions.py

@@ -0,0 +1,24 @@
+
+def make_motorized_instrument():
+    from mccode_antlr.assembler import Assembler
+    from mccode_antlr.reader import MCSTAS_REGISTRY, LocalRegistry
+    from mccode_to_kafka.writer import da00_dataarray_config, da00_variable_config
+
+    inst = Assembler('inst', registries=[MCSTAS_REGISTRY])
+    inst.parameter('double ex/"m"=0')
+    inst.parameter('double phi/"degree"=0')
+
+    inst.component('origin', 'Arm', at=(0, 0, 0))
+    inst.component('source', 'Source_simple', at=[(0, 0, 0), 'origin'])
+    inst.component('xpos', 'Arm', at=[('ex', 0, 0), 'source'])
+    inst.component('zrot', 'Arm', at=[(0, 0, 0), 'xpos'], rotate=[(0, 0, 'phi'), 'xpos'])
+
+    return inst.instrument
+
+
+def test_motorized_instrument():
+    import moreniius
+    motorized = make_motorized_instrument()
+    nx = moreniius.MorEniius.from_mccode(motorized, origin='origin', only_nx=False, absolute_depends_on=True)
+    assert nx is not None
+    #TODO add actual tests for the contents of, e.g., the dumped NeXus Structure