Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 533: add --copy-map-error and --group-map-error to nxsfileinfo #534

Merged
merged 2 commits into from
Nov 28, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
add --copy-map-error and --group-map-error to nxsfileinfo
jkotan committed Nov 28, 2023

Verified

This commit was signed with the committer’s verified signature.
Doctor-wu Doctor Wu
commit b2f141f87a0d13a09c22591aaf89274902b15ff7
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2023-11-28 Jan Kotanski <jankotan@gmail.com>
* add --copy-map-error to nxsfileinfo metadata (#534)
* add --group-map-error to nxsfileinfo metadata (#534)
* tagged as v3.53.0

2023-11-23 Jan Kotanski <jankotan@gmail.com>
* add --keywords to nxsfileinfo metadata (#529)
* add --raw to nxsfileinfo groupmetadata (#529)
7 changes: 5 additions & 2 deletions doc/nxsfileinfo.rst
Original file line number Diff line number Diff line change
@@ -149,6 +149,7 @@ Options:
field json or yaml with map {output: input} or [[output, input],]
or a text file list to re-arrange metadata. The default:
'scientificMetadata.nxsfileinfo_parameters.copymap.value'
--copy-map-error Raise an error when the copy map file does not exist
--copy-map-file COPYMAPFILE
json or yaml file containing the copy map, see also --copy-map
-f FILEFORMAT, --file-format FILEFORMAT
@@ -362,8 +363,8 @@ Example
nxsfileinfo attachment -b p00 -i 2342342 -t 'HH water' -o ~/at2.json myscan_00124.fio


nxsfileinfo metadata
--------------------
nxsfileinfo groupmetadata
-------------------------

It groups scan metadata to one dataset

@@ -387,6 +388,8 @@ Options:
-g GROUPMAP, --group-map GROUPMAP
json or yaml map of {output: input} or [[output,
input],] or a text file list to re-arrange metadata
-e, --group-map-error
Raise an error when the group map file does not exist
-r GROUPMAPFILE, --group-map-file GROUPMAPFILE
json or yaml file containing the copy map, see also
-m METADATAFILE, --metadata METADATAFILE
38 changes: 19 additions & 19 deletions man/nxscollect.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.\" Man page generated from reStructuredText.
.
.TH "NXSCOLLECT" "1" "Nov 28, 2023" "3.53" "NXSTools"
.SH NAME
nxscollect \- upload external images into NeXus/HDF5 file
.
.nr rst2man-indent-level 0
.
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
.TH "NXSCOLLECT" "1" "Nov 22, 2023" "3.52" "NXSTools"
.SH NAME
nxscollect \- upload external images into NeXus/HDF5 file
.SH DESCRIPTION
.sp
The nxscollect is a command\-line tool dedicated to collect detector images.
@@ -61,7 +61,7 @@ nexus_file nexus files to be collected
.B Options:
.INDENT 7.0
.TP
.B \-h\fP,\fB \-\-help
.B \-h\fP,\fB \-\-help
show this help message and exit
.TP
.BI \-c \ COMPRESSION\fR,\fB \ \-\-compression \ COMPRESSION
@@ -88,20 +88,20 @@ datatype of input data \- only for raw data, e.g.
shape of input data \- only for raw data, e.g.
\(aq[4096,2048]\(aq
.TP
.B \-s\fP,\fB \-\-skip_missing
.B \-s\fP,\fB \-\-skip_missing
skip missing files
.TP
.B \-r\fP,\fB \-\-replace_nexus_file
.B \-r\fP,\fB \-\-replace_nexus_file
if it is set the old file is not copied into a file
with .__nxscollect__old__* extension
.TP
.B \-\-test
.B \-\-test
execute in the test mode
.TP
.B \-\-h5py
.B \-\-h5py
use h5py module as a nexus reader/writer
.TP
.B \-\-h5cpp
.B \-\-h5cpp
use h5cpp module as a nexus reader/writer
.UNINDENT
.UNINDENT
@@ -142,7 +142,7 @@ nexus_file_path nexus files with the nexus directory to place the link
.B Options:
.INDENT 7.0
.TP
.B \-h\fP,\fB \-\-help
.B \-h\fP,\fB \-\-help
show this help message and exit
.TP
.BI \-n \ NAME\fR,\fB \ \-\-name \ NAME
@@ -151,17 +151,17 @@ link name
.BI \-t \ TARGET\fR,\fB \ \-\-target \ TARGET
link target with the file name if external
.TP
.B \-r\fP,\fB \-\-replace_nexus_file
.B \-r\fP,\fB \-\-replace_nexus_file
if it is set the old file is not copied into a file
with .__nxscollect__old__* extension
.TP
.B \-\-test
.B \-\-test
execute in the test mode
.TP
.B \-\-h5py
.B \-\-h5py
use h5py module as a nexus reader/writer
.TP
.B \-\-h5cpp
.B \-\-h5cpp
use h5cpp module as a nexus reader
.UNINDENT
.UNINDENT
@@ -205,7 +205,7 @@ Options:
.INDENT 3.5
.INDENT 0.0
.TP
.B \-h\fP,\fB \-\-help
.B \-h\fP,\fB \-\-help
show this help message and exit
.TP
.BI \-t \ DTYPE\fR,\fB \ \-\-dtype \ DTYPE
@@ -304,17 +304,17 @@ sepatated by \(aq,\(aq and different fields separated by \(aq;\(aq
or spaces e.g. \(aq:,0:50,: :,0:50,:\(aq where U means span
along the layout
.TP
.B \-r\fP,\fB \-\-replace\-nexus\-file
.B \-r\fP,\fB \-\-replace\-nexus\-file
if it is set the old file is not copied into a file
with .__nxscollect__old__* extension
.TP
.B \-\-test
.B \-\-test
execute in the test mode
.TP
.B \-\-h5cpp
.B \-\-h5cpp
use h5cpp module as a nexus reader
.TP
.B \-\-h5py
.B \-\-h5py
use h5py module as a nexus reader/writer
.UNINDENT
.UNINDENT
18 changes: 9 additions & 9 deletions man/nxsconfig.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.\" Man page generated from reStructuredText.
.
.TH "NXSCONFIG" "1" "Nov 28, 2023" "3.53" "NXSTools"
.SH NAME
nxsconfig \- read NeXus Configuration Server settings
.
.nr rst2man-indent-level 0
.
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
.TH "NXSCONFIG" "1" "Nov 22, 2023" "3.52" "NXSTools"
.SH NAME
nxsconfig \- read NeXus Configuration Server settings
.SH DESCRIPTION
.sp
The nxsconfig program
@@ -132,25 +132,25 @@ show transformation parameters of given components
.B Options:
.INDENT 7.0
.TP
.B \-h\fP,\fB \-\-help
.B \-h\fP,\fB \-\-help
show this help message and exit
.TP
.BI \-s \ SERVER\fR,\fB \ \-\-server\fB= SERVER
configuration server device name
.TP
.B \-d\fP,\fB \-\-datasources
.B \-d\fP,\fB \-\-datasources
perform operation on datasources
.TP
.B \-m\fP,\fB \-\-mandatory
.B \-m\fP,\fB \-\-mandatory
make use mandatory components as well
.TP
.B \-p\fP,\fB \-\-private
.B \-p\fP,\fB \-\-private
make use private components, i.e. starting with \(aq__\(aq
.TP
.B \-n\fP,\fB \-\-no\-newlines
.B \-n\fP,\fB \-\-no\-newlines
split result with space characters
.TP
.B \-f\fP,\fB \-\-force
.B \-f\fP,\fB \-\-force
do not ask
.UNINDENT
.UNINDENT
Loading