Skip to content

Commit 732f57a

Browse files
lukaspieLukas Pielsticker
andauthored
align with main, groupings in manual (#411)
* bring in changes from nexusformat/1428 * typo fix * fix links in manual * CI/CD: install tools for SVG vector graphics support * use sphinx.ext.imgconverter * bring in changes from main * bring in groupings in manual * nyaml-nxdl conversion * found unintentional nameType in NXstm * cleanup for groupings in manual * adjust custom dict for spellcheck * nyaml-nxdl consistency * formatting * review comments * fix start date in NXelectron_detector --------- Co-authored-by: Lukas Pielsticker <you@example.com>
1 parent 6cfc2d2 commit 732f57a

File tree

118 files changed

+10425
-1465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+10425
-1465
lines changed

.cspell/custom-dictionary.txt

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ DCOM
6161
DFM
6262
DXRD
6363
Defocus
64-
Delocalization,
64+
Delocalization
65+
EASI
6566
EBSD
6667
EBSP
6768
ECCI
@@ -109,6 +110,7 @@ ISSN
109110
IVAS
110111
Idev
111112
Inconel
113+
INDU
112114
Inplane
113115
Iontype
114116
Iontypes
@@ -144,6 +146,7 @@ Raman
144146
Ronchigram
145147
SAS
146148
SAXS
149+
SENB
147150
SERS
148151
SNSnxtranslate
149152
SPIE
@@ -173,6 +176,7 @@ WWPDB
173176
XDMF
174177
XFEL
175178
XPCS
179+
Xtranslation
176180
Zincblende
177181
Zirconate
178182
aabb
@@ -254,6 +258,7 @@ detectorn
254258
deuterated
255259
diagionalized
256260
diffractogram
261+
diffractograms
257262
disclination
258263
disorientations
259264
dispersoids
@@ -313,7 +318,6 @@ hydroxonium
313318
hyperslab
314319
hyperspectral
315320
ibeam
316-
illuminatable
317321
infty
318322
inplane
319323
interconvert
@@ -491,6 +495,7 @@ underconstrained
491495
underload
492496
undulator
493497
unvalidated
498+
varepsilon
494499
vibropolishing
495500
voxelated
496501
voxelization
@@ -633,6 +638,7 @@ Ophus
633638
PANalytical
634639
Patala
635640
Pauly
641+
Pawley
636642
Pedersen
637643
Peltier
638644
Pennycock
@@ -646,6 +652,7 @@ Reichmann
646652
Reimer
647653
Remmele
648654
Rielli
655+
Rietveld
649656
Rochon
650657
Rollett
651658
Romaner
@@ -723,6 +730,21 @@ paraprobe-parmsetup-nanochem
723730
pynxtools
724731
pyxem
725732

733+
# Data plotting
734+
azim
735+
DAXIS
736+
edgecolors
737+
facecolors
738+
figsize
739+
fontsize
740+
mplot
741+
toolkits
742+
verts
743+
XAXIS
744+
xlim
745+
ylim
746+
zlim
747+
726748
# other languages
727749
Institut
728750

@@ -767,6 +789,16 @@ recreatable
767789
speciality
768790
timeslot
769791
timestamping
792+
tracability
770793
unlooped
771794
unranged
772-
weared
795+
weared
796+
797+
# to fix in future releases (all in NXstress)
798+
acquistion
799+
acquistions
800+
asscociated
801+
dimensioness
802+
folowing
803+
reproducability
804+
Uncentrainties

.github/workflows/ci.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ jobs:
8181
texlive-fonts-recommended
8282
tex --version
8383
84+
- name: Install tools for SVG vector graphics support
85+
run: |
86+
sudo apt-get update -y && \
87+
sudo apt-get install -y \
88+
inkscape \
89+
imagemagick
90+
8491
- name: Generate build files
8592
env:
8693
GH_TOKEN: ${{ (env.python_version == env.python_deploy_version && (github.event.inputs.deploy || github.event.inputs.upload)) && secrets.GITHUB_TOKEN || 'NONE' }}

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77

88
## NeXus definition developers
99

10+
After making a change to the NeXus class definitions there are two important checks
11+
to be made before commiting the change:
12+
13+
1. check whether the change does not violate any syntax rules
14+
2. verify whether the change looks as intended in the HTML documentation
15+
1016
First install the test and build requirements with this command (only run once)
1117

1218
make install

applications/NXapm.nxdl.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
is considered as a narrow synonym for crystal defects.
8585

8686
The aim of the NXapm application definition is to provide a general yet specific enough
87-
solution to serialize artifacts for virtually all atom probe and field-ion microcopy experiments.
87+
solution to serialize artifacts for virtually all atom probe and field-ion microscopy experiments.
8888

8989
Before summarizing the design of the base classes and the parts of the NXapm application definition,
9090
it is worthwhile to recall and distinguish concepts that are related to atom extraction
@@ -187,7 +187,7 @@
187187
NXapm defines constraints on the existence and cardinality of concepts and its concept branches but seeks to
188188
offer a compromise. The key design pattern followed is that most branches are made optional or at most recommended
189189
but their child concepts are conditionally required. Thereby, NXapm can cover a variety of simple but also complex
190-
use cases. An example of this parent-optional-but-childs-stronger-restricted design is the combination of the
190+
use cases. An example of this parent-optional-but-children-stronger-restricted design is the combination of the
191191
optional group ``measurement`` with its required child ``measurement/instrument``:
192192
Users which report simulations are not forced to document the instrument but users which have characterized
193193
a specimen are motivated to report about the instrument. They are though not necessarily required to report all
@@ -215,7 +215,7 @@
215215
considered best practice by AMETEK/Cameca, ``raw_data`` for delay-line timing data, ``hit_finding`` for details of the
216216
hit finding algorithm, ``hit_spatial_filtering`` a process that filters hits of too low quality and those laying outside the about
217217
to be computed reconstruction volume. Furthermore, group ``voltage_and_bowl`` offers a place for documenting calibrations
218-
and processing non-linearities. Group ``mass_to_charge_conversion`` is used to document the mass calibration and the
218+
and processing nonlinearities. Group ``mass_to_charge_conversion`` is used to document the mass calibration and the
219219
conversion from time-of-flight to mass-to-charge-state-ratio values.
220220

221221
Finally, the groups ``reconstruction`` and ``ranging`` were designed to match and document the classical approaches how
@@ -984,7 +984,7 @@
984984

985985
In the case of an open-source instrument, like P. Felfer's Oxcart or G. Schmitz's
986986
M-TAP instruments, also use program1, program2, ... with program1 representing
987-
the control software e.g. `M. Monajem and P. Felfer pyCCAPT &lt;https://pyccapt.readthedocs.io/en/latest/&gt;`_.
987+
the control software e.g. `M. Monajem and P. Felfer PYCCAPT &lt;https://pyccapt.readthedocs.io/en/latest/&gt;`_.
988988
Further instances (program2, ...) can be used to list the dependencies, the
989989
python virtual environment.
990990
</doc>

applications/NXcanSAS.nxdl.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
* NXcanSAS is for reduced SAS data and metadata to be stored together in one file.
7373
* *Reduced* SAS data consists of :math:`I(\vec{Q})` or :math:`I(|\vec{Q}|)`
7474
* External file links are not to be used for the reduced data.
75-
* A good practice/practise is, at least, to include a reference to how the data was acquired and processed. Yet this is not a requirement.
75+
* A good practice is, at least, to include a reference to how the data was acquired and processed. Yet this is not a requirement.
7676
* There is no need for NXcanSAS to refer to any raw data.
7777

7878
The canSAS data format has a structure similar to NeXus, not identical.

applications/NXellipsometry.nxdl.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
<doc>
281281
Spectral values (e.g. wavelength or energy) used for the measurement.
282282
An array of 1 or more elements. Length defines N_spectrum. Replace
283-
'SPECTRUM' by the physical quantity that is used, e.g. wavelength.
283+
'NAME' by the physical quantity that is used, e.g. wavelength.
284284
</doc>
285285
<dimensions rank="1">
286286
<dim index="1" value="N_spectrum"/>

applications/NXem.nxdl.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
relevant. NXem defines constraints on the existence and cardinality of concepts and its concept branches
9090
but seeks to offer a compromise. The key design pattern followed is that most branches are made optional
9191
or at most recommended but their child concepts conditional required. Thereby, NXem can cover a variety
92-
of simple but also complex use cases. An example of this parent-optional-but-childs-stronger-restricted design
92+
of simple but also complex use cases. An example of this parent-optional-but-children-stronger-restricted design
9393
is the combination of the optional group ``measurement`` with its required child
9494
``measurement/instrument``: Users which report simulations are not forced to document the instrument
9595
but users which have characterized a sample are motivated to report about the instrument. They are though not
@@ -414,8 +414,8 @@
414414

415415
The information is recorded to qualify if the beam used was likely
416416
able to shine through the specimen. For scanning electron microscopy,
417-
in many cases the specimen is typically thicker than what is
418-
illuminatable by the electron beam.
417+
in many cases the specimen is typically thicker than what is illuminable
418+
by the electron beam.
419419

420420
In this case the value should be set to the actual thickness of the specimen
421421
viewed for an illumination situation where the nominal surface normal of the

0 commit comments

Comments
 (0)