Skip to content

23 signal and axes not in scannables#24

Merged
DanPorter merged 2 commits intomasterfrom
23-signal-and-axes-not-in-scannables
Jun 30, 2025
Merged

23 signal and axes not in scannables#24
DanPorter merged 2 commits intomasterfrom
23-signal-and-axes-not-in-scannables

Conversation

@DanPorter
Copy link
Copy Markdown
Collaborator

fix scannables from volume file & fix default_entry error

Fix for #22 where specifying default_entry_only would give an infinite loop, caused by looping over re-populated entry list.

Fix for issue #23 where axes and signal attributes are not named in scannables. This is evident in msmapper processed files where volume is present.

hdfmap_class.py

  • change behaviour of generate_scannables_from_group() to set scannables to empty if there are less than two paths named.
  • changed first_last_scannables to correct error where names were not removed from the list.

nexus.py

  • added values to generate_scannables_from_nxdata to add axes to scannables.
  • refactored generate_image_data_from_nxdetector to search NXdata if NXdetector not present.
  • added check in populate() to empty scannables if there are less scannables than dimensions (shape).
  • populate() now loops over non-duplicated entries with default first.
  • generate_scannables_from_scan_fields_or_nxdata() now defaults to nxdata if scan_fields is empty.

test_files.json

  • added msmapper volume file to test
  • added xas_notebook file to test

Fix for issue #23 where axes and signal attributes are not named in scannables. This is evident in msmapper processed files where volume is present.

hdfmap_class.py
 - change behaviour of generate_scannables_from_group() to set scannables to empty if there are less than two paths named.
 - changed first_last_scannables to correct error where names were not removed from the list.

nexus.py
 - added values to generate_scannables_from_nxdata to add axes to scannables.
 - refactored generate_image_data_from_nxdetector to search NXdata if NXdetector not present.
 - added check in populate() to empty scannables if there are less scannables than dimensions (shape).

test_files.json
 - added msmapper volume file to test

All tests completed and passed.
Fix for #22 where specifying default_entry_only would give an infinite loop, caused by looping over re-populated entry list.

nexus.py
 - populate() now loops over non-duplicated entries with default first.
 - generate_scannables_from_scan_fields_or_nxdata() now defaults to nxdata if scan_fields is empty.

test_files.json
 - added xas_notebook file to test

All tests completed and passed.
@DanPorter DanPorter linked an issue Jun 30, 2025 that may be closed by this pull request
@DanPorter DanPorter merged commit 1c93e7e into master Jun 30, 2025
10 checks passed
@DanPorter DanPorter deleted the 23-signal-and-axes-not-in-scannables branch June 30, 2025 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

signal and axes not in scannables

1 participant