moreniius 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

moreniius/mccode/instr.py

@@ -2,7 +2,7 @@ from zenlog import log
 from dataclasses import dataclass, field
 from mccode_antlr.instr import Instr
 from mccode_antlr.common import Expr
-from nexusformat.nexus import NXfield, NXcollection
+from nexusformat.nexus import NXfield, NXgroup, NXcollection
 
 
 @dataclass
@@ -15,7 +15,8 @@ class NXInstr:
         """Start the C translation to ensure McCode-oddities are handled before any C-code parsing."""
         from mccode_antlr.common import ShapeType, DataType, Value
         from mccode_antlr.translators.target import MCSTAS_GENERATOR
-        from mccode_antlr.translators.c import CTargetVisitor, CDeclaration
+        from mccode_antlr.translators.c import CTargetVisitor
+        from mccode_antlr.translators.c_listener import CDeclarator
         from mccode_antlr.translators.c_listener import evaluate_c_defined_expressions
         config = dict(default_main=True, enable_trace=False, portable=False, include_runtime=True,
                       embed_instrument_file=False, verbose=False, output=None)
@@ -25,9 +26,9 @@ class NXInstr:
         # translator.component_uservars is a dictionary of lists for each component type of `CDeclaration` objects.
 
         # only worry about instrument level variables for the moment, and convert the CDeclarations into Expr objects
-        def c_declaration_to_expr(dec: CDeclaration) -> Expr:
+        def c_declaration_to_expr(dec: CDeclarator) -> Expr:
             expr = Expr(Value(None)) if dec.init is None else Expr.parse(dec.init)
-            expr.data_type = DataType.from_name(dec.type)
+            expr.data_type = DataType.from_name(dec.dtype)
             if dec.is_pointer or dec.is_array:
                 expr.shape_type = ShapeType.vector
             return expr
@@ -83,8 +84,29 @@ class NXInstr:
                 'expression' in nx_args[0]:
             not_expr = [x for x in nx_args[0] if x != 'expression']
             if len(not_expr) == 1:
+                not_expr_arg = nx_args[0][not_expr[0]]
+                # if isinstance(not_expr_arg, NXfield):
+                #     # We have and want an NXfield, but it might be missing attributes specified in the nx_kwargs
+                #     # Passing the keywords to the NXfield constructor versus this method is not identical,
+                #     # since some keyword arguments are reserved (and only some of which are noted)
+                #     #   Explicit keywords, used in the constructor:
+                #     #       value, name, shape, dtype, group, attrs
+                #     #   Keywords extracted from the kwargs dict, if present (and all controlling HDF5 file attributes?):
+                #     #       chunks, compression, compression_opts, fillvalue, fletcher32, maxshape, scaleoffset, shuffle
+                #     # For now, just assume all keywords provided here are _actually_ attributes for the NXfield
+                #     # which is an extension of a dict, but can *not* use the update method, since the __setitem__
+                #     # method is overridden to wrap inputs in NXattr objects :/
+                #     for k, v in nx_kwargs.items():
+                #         not_expr_arg.attrs[k] = v
+                #     return not_expr_arg
+
                 # 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)
+                if all(x in not_expr_arg for x in ('module', 'config')):
+                    # This is a file-writer stream directive? So make a group
+                    return NXgroup(entries={not_expr[0]: not_expr_arg}, **nx_kwargs)
+                print('!!')
+                print(not_expr_arg)
+                return nx_class(not_expr_arg, **nx_kwargs)
             else:
                 raise RuntimeError('Not sure what I should do here')
         return nx_class(*nx_args, **nx_kwargs)

moreniius/mccode/orientation.py

@@ -18,6 +18,7 @@ class NXPart:
         return self.instr.make_nx(nx_class, *args, **kwargs)
 
     def make_translation(self, norm, vec, dep):
+        # if `norm` is a link or NXlog, we should make a group not an NXfield
         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]]:
@@ -28,7 +29,6 @@ class NXPart:
         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}'
@@ -51,7 +51,6 @@ class NXPart:
             print(repr(self.o))
             raise NotImplementedError()
 
-        # print(f'rotation {axis}, {angle}')
         # handle the case where angle is not a constant?
         return self.make_nx(NXfield, angle, vector=axis, depends_on=dep, transformation_type='rotation', units=angle_unit)
 

moreniius/utils.py

@@ -1,5 +1,5 @@
 from mccode_antlr.instr import Instance
-from nexusformat.nexus import NXevent_data
+from nexusformat.nexus import NXevent_data, NXfield
 
 class NotNXdict:
     """Wrapper class to prevent NXfield-parsing of the held dictionary"""
@@ -12,6 +12,10 @@ class NotNXdict:
     def __repr__(self):
         return f"NotNXdict<{self.value}>"
 
+    def __str__(self):
+        from json import dumps
+        return dumps(self.value)
+
 
 def outer_transform_dependency(transformations):
     """For a NXtransformations group, find the most-dependent transformation name
@@ -36,7 +40,20 @@ def outer_transform_dependency(transformations):
         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
+        if isinstance(obj.depends_on, NXfield):
+            # obj.depends_on is an NXfield object; which has a number of properties
+            #   nxgroup - the parent group
+            #   dtype - string or numpy dtype
+            #   shape - list or tuple of ints
+            #   attrs - dict of attributes
+            #   nxdata - a scalar or numpy array or string
+            #   nxpath - string, where this object is in the tree
+            #   nxroot - the root NXgroup object containing this object
+            # I _think_ we *always* want the data stored in this object
+            return obj.depends_on.nxdata
+        elif isinstance(obj.depends_on, str):
+            return obj.depends_on
+        raise ValueError(f"depends_on attribute of {name} is not an NXfield or str")
 
     # depends = {name: getattr(transformations, name).depends_on for name in names}
     depends = {name: depends_on_per(name) for name in names}

moreniius/writer.py

@@ -113,7 +113,6 @@ class Writer:
                 if absolute_depends_on and 'depends_on' == name and not obj.nxdata.startswith('/'):
                     obj.nxdata = _to_absolute(top_obj.nxpath, obj.nxdata)
                 if obj.nxclass == 'NXfield':
-                    # print(f'to_json_dict for NXfield {name=}')
                     typ, val = convert_types(obj.nxdata, only_nx)
                     # typ is None if obj.nxdata is a NotNXdict (such that val _is_ the contained dict)
                     entry = dict(module='dataset', config=dict(name=name, values=val, type=typ)) if typ else val
@@ -123,7 +122,6 @@ class Writer:
                     if len(list(obj)):
                         entry['children'] = self._to_json_dict(obj, only_nx=only_nx, absolute_depends_on=absolute_depends_on)
                 for n, v in obj.attrs.items():
-                    # print(f'to_json_dict for attribute of {name=}, named {n=}')
                     typ, val = convert_types(v, only_nx)
                     if absolute_depends_on and n == 'depends_on' and '/' != val[0]:
                         val = _to_absolute(top_obj.nxpath, val)

{moreniius-0.2.3.dist-info → moreniius-0.2.5.dist-info}/METADATA

@@ -1,15 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: moreniius
-Version: 0.2.3
+Version: 0.2.5
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Development Status :: 2 - Pre-Alpha
 Description-Content-Type: text/markdown
-Requires-Dist: zenlog >=1.1
-Requires-Dist: platformdirs >=3.11
-Requires-Dist: mccode-antlr[hdf5] >=0.7.1
-Requires-Dist: nexusformat >=1.0.6
-Requires-Dist: importlib-metadata ; python_version < "3.8"
+Requires-Dist: zenlog>=1.1
+Requires-Dist: platformdirs>=3.11
+Requires-Dist: importlib_metadata; python_version < "3.8"
+Requires-Dist: mccode-antlr[hdf5]>=0.9.2
+Requires-Dist: nexusformat>=1.0.6
 
 # moreniius
 A project to contain custom components required to use `eniius` to produce `NeXus Structure` `JSON` from `mccode-antlr` simulated instruments.

{moreniius-0.2.3.dist-info → moreniius-0.2.5.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=3ix8lLQwzwdx_nm-YEoD17z7s4h4CGda5lzVdD8M8lA,8386
-moreniius/writer.py,sha256=DOwzpDqoXiDXdtV-hRZVtF5lNBBoYy0UO5_bq89d1lc,6325
+moreniius/utils.py,sha256=R81eHjc0EWjMsP-Z8WI9sZkc_QY357z_aYziflQAUEU,9238
+moreniius/writer.py,sha256=rZSOpSmCAiY1KS3YAWKBXZUWTJFLyrkZT-zeZfyENV8,6178
 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=8Thl4RuMi2X4ruNtI8-l8S_2OHtW_38F2Pv_FisuImc,4505
+moreniius/mccode/instr.py,sha256=q0NS2hH7eWaHu4xzdcPRRx4M-9WHA2IcElgO__PXjiQ,6138
 moreniius/mccode/mccode.py,sha256=6NEXovuG-6itzlPgPklNOiZQ-MlldKF20p4TxV8n4BA,3228
-moreniius/mccode/orientation.py,sha256=kfOTiHgG68huQdh_ojd2NXxyAxFQoCn6FavwSOulh5E,3923
-moreniius-0.2.3.dist-info/METADATA,sha256=RlDqZin-stzGUdk_yKxBbxIFtYzLmSfnAsm7Rtwimpw,625
-moreniius-0.2.3.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
-moreniius-0.2.3.dist-info/entry_points.txt,sha256=Ga3k4P4fyBt5_dJ03Oapic2Qlgqv9jufQGdxWiz_j2A,63
-moreniius-0.2.3.dist-info/top_level.txt,sha256=RzMo23UfVhgQeuOYeS5P9I0qVbxx4Gbe6Roc29Mr02c,10
-moreniius-0.2.3.dist-info/RECORD,,
+moreniius/mccode/orientation.py,sha256=khT0jTMXyXkPCoEpDg-eLKulF-J2wIqNhUi1NzFWvto,3907
+moreniius-0.2.5.dist-info/METADATA,sha256=9d8qeZuOv6YNkojoOPY41lTdhv7tVycA2m5XM6ytqdk,620
+moreniius-0.2.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+moreniius-0.2.5.dist-info/entry_points.txt,sha256=Ga3k4P4fyBt5_dJ03Oapic2Qlgqv9jufQGdxWiz_j2A,63
+moreniius-0.2.5.dist-info/top_level.txt,sha256=RzMo23UfVhgQeuOYeS5P9I0qVbxx4Gbe6Roc29Mr02c,10
+moreniius-0.2.5.dist-info/RECORD,,

{moreniius-0.2.3.dist-info → moreniius-0.2.5.dist-info}/WHEEL

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