moreniius 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

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/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/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.dist-info → moreniius-0.2.2.dist-info}/METADATA

@@ -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.dist-info → moreniius-0.2.2.dist-info}/RECORD

@@ -3,16 +3,16 @@ moreniius/additions.py,sha256=6Hhhc4LDUsnBj27Iil-EFFzQm1xd2M45hfcVQYEjxiI,17615
 moreniius/moreniius.py,sha256=cU3CrfMC1kOnHO77yq5sZfDqRuA38G5kA3RUXFNGP2U,1455
 moreniius/nexus_structure.py,sha256=i9CxYwJl4eKP9IIYR80MI3f54Yh0RPDFviZaulE5IOc,1709
 moreniius/nxoff.py,sha256=WHp9wYNn_4Hcx8Nzi9rpX1p8_iwI-AdgTQouSAEG8N4,3288
-moreniius/utils.py,sha256=3REIM3nJ3L0PVpIWqu0Kh-znK1ggNNYTCjXatoaAA34,8075
+moreniius/utils.py,sha256=3ix8lLQwzwdx_nm-YEoD17z7s4h4CGda5lzVdD8M8lA,8386
 moreniius/writer.py,sha256=DOwzpDqoXiDXdtV-hRZVtF5lNBBoYy0UO5_bq89d1lc,6325
 moreniius/mccode/__init__.py,sha256=1QiZdh90G3gp_WlVpdJB_ZGauoW0GJEQ13Nelaqa5JE,151
 moreniius/mccode/comp.py,sha256=uR1L5nLfYPHhMKd3XnDbqf5xhkfwfPLRnttREc3jqBg,7382
 moreniius/mccode/instance.py,sha256=4nqJ3ne6yXCEvsa3FIKUcGDYP_z7cAr46JhakDTB6qs,8055
-moreniius/mccode/instr.py,sha256=3BdfYzZnHhCokFQIwp7XUEy9nt6CclqAWunHXfGW228,4363
+moreniius/mccode/instr.py,sha256=8Thl4RuMi2X4ruNtI8-l8S_2OHtW_38F2Pv_FisuImc,4505
 moreniius/mccode/mccode.py,sha256=6NEXovuG-6itzlPgPklNOiZQ-MlldKF20p4TxV8n4BA,3228
-moreniius/mccode/orientation.py,sha256=_jyTtabo3ZHujuXead0elZzcCck_v8UwX5tIMp4dXwI,3199
-moreniius-0.2.1.dist-info/METADATA,sha256=IDriQtt4mIeEtG6mTYHH-i860X52N4IGuaO2Y04kGX0,625
-moreniius-0.2.1.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-moreniius-0.2.1.dist-info/entry_points.txt,sha256=Ga3k4P4fyBt5_dJ03Oapic2Qlgqv9jufQGdxWiz_j2A,63
-moreniius-0.2.1.dist-info/top_level.txt,sha256=RzMo23UfVhgQeuOYeS5P9I0qVbxx4Gbe6Roc29Mr02c,10
-moreniius-0.2.1.dist-info/RECORD,,
+moreniius/mccode/orientation.py,sha256=kfOTiHgG68huQdh_ojd2NXxyAxFQoCn6FavwSOulh5E,3923
+moreniius-0.2.2.dist-info/METADATA,sha256=3UH0RNB71wN-kUvb57Bdj9GLU1pKmudBgJ0iWExHoAo,625
+moreniius-0.2.2.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
+moreniius-0.2.2.dist-info/entry_points.txt,sha256=Ga3k4P4fyBt5_dJ03Oapic2Qlgqv9jufQGdxWiz_j2A,63
+moreniius-0.2.2.dist-info/top_level.txt,sha256=RzMo23UfVhgQeuOYeS5P9I0qVbxx4Gbe6Roc29Mr02c,10
+moreniius-0.2.2.dist-info/RECORD,,

{moreniius-0.2.1.dist-info → moreniius-0.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (74.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any