Xrdml file format update #25
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Our xrdml file format has ``` <counts unit="counts"> ``` instead of intensities, so I added an option to look for counts first to avoid this error. Will happily accept another solution!
This is an example file format with the new labeling for counts for Panalytical.
…__15-120_026step_30min_1.xrdml
RLumSK
reviewed
Sep 20, 2023
Contributor
There was a problem hiding this comment.
I suggest the following changes to avoid compiler warnings/errors because of a two times defined ycol.
// check of the nodes, they differ for different versions
// valid are intensities or counts
if(data_points.count(node) == 0)
node = "counts";
string inten_str = data_points.get<string>(node);
ycol->add_values_from_str(inten_str);
if (ycol->get_point_count() < 2)
throw FormatError("intensities/counts do not look correct");
RLumSK
reviewed
Sep 20, 2023
Contributor
There was a problem hiding this comment.
I've tested the example file (OK) and have a single change to avoid compiler warnings.
The issue here was also reported for rxylib: R-Lum/rxylib#5
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've modified the code reading the xrdml files for Panalytical instruments, as currently I have to edit the information on your instruments files to read intensities string instead of the counts. This is seen in the example file as:
Happy to accept other solutions!