diff --git a/CITATION.cff b/CITATION.cff index 4092df64c..06308d586 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -4,7 +4,7 @@ message: If you use this software, please cite it using the metadata from this file. type: software -version: 0.11.0 +version: 0.11.1 authors: - given-names: Sherjeel family-names: Shabih diff --git a/docs/learn/pynxtools/multi-format-reader.md b/docs/learn/pynxtools/multi-format-reader.md index c64cabcdb..f795afae1 100644 --- a/docs/learn/pynxtools/multi-format-reader.md +++ b/docs/learn/pynxtools/multi-format-reader.md @@ -266,13 +266,13 @@ Here, `key` is the config dict key (e.g., `"/ENTRY[my-entry]/data/data"`) and pa The same wildcard notation can also be used within a name to repeat entries with different names (e.g., field_*{my, name, etc} is converted into three keys with * replaced by my, name, etc, respectively). As an example, for multiple lenses and their voltage readouts, one could write: ```json - "LENS_EM[lens_*{A,B,Foc}]": { + "ELECTROMAGNETIC_LENS[lens_*{A,B,Foc}]": { "name": "*", "voltage": "@attrs:metadata/file/Lens:*:V", "voltage/@units": "V" }, ``` - which would write `NXlens_em` instances named `lens_A`, `lens_B`, and `lens_Foc`. + which would write `NXelectromagnetic_lens` instances named `lens_A`, `lens_B`, and `lens_Foc`. - **Required fields in optional groups**: There will sometimes be the situation that there is an optional NeXus group in an application definition, that (if implemented) requires some sub-element. As an example, for the instrument's energy resolution, the only value expected to come from a data source is the `resolution`, whereas other fields are hardcoded. ```json diff --git a/src/pynxtools/definitions b/src/pynxtools/definitions index c0f643aca..b4acce96a 160000 --- a/src/pynxtools/definitions +++ b/src/pynxtools/definitions @@ -1 +1 @@ -Subproject commit c0f643aca32315ed471287e3cabe403e1c182836 +Subproject commit b4acce96a000268251848b5a68e0e4b977574157 diff --git a/src/pynxtools/nexus-version.txt b/src/pynxtools/nexus-version.txt index 9f0fe4a7c..55b1df232 100644 --- a/src/pynxtools/nexus-version.txt +++ b/src/pynxtools/nexus-version.txt @@ -1 +1 @@ -v2024.02-1989-gc0f643ac \ No newline at end of file +v2024.02-1990-gb4acce96 \ No newline at end of file