Skip to content

Commit 9c341fc

Browse files
newvillenewville
committed
Merge pull request #38 from XraySpectroscopy/validation
Great!!
2 parents a901ed9 + 1b7a614 commit 9c341fc

Some content is hidden

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

48 files changed

+1798
-1141
lines changed

‎baddata/BadFiles.txt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@ bad_24.xdi error msg Y Header 'Family.Key: Value' -- Family starts wi
3131
bad_25.xdi file read(5) Y No extra version given
3232
bad_26.xdi file read(6) Y No user comment
3333
bad_27.xdi file read(6) Y Line of '////', but no user comment
34-
bad_28.xdi error msg Y incorrectly format date-time
35-
bad_29.xdi error msg Y date-time has invalid range (month > 12)
34+
bad_28.xdi file read(1) Y incorrectly format date-time
35+
bad_29.xdi file read(1) Y date-time has invalid range (month > 12)
36+
bad_30.xdi file read(1) Y Invalid element.edge and element.symbol, test accumulation in XDI_required_metadata
37+
bad_31.xdi file read(1) Y Invalid value for d-spacing, trigger error in XDI_required_metadata
38+
bad_32.xdi file read(7) Y Missing recommended fields
3639

3740
Notes:
3841
1. files read, return value > 0, indicating Warning
@@ -41,3 +44,4 @@ Notes:
4144
4. keys are allowed to start with a number...
4245
5. extra version is left as empty string ''
4346
6. user comment is left as empty string ''
47+
7. files read, XDI_recommended_metadata returns non-0

‎baddata/bad_30.xdi‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# XDI/1.0 GSE/1.0
2+
# Column.1: energy eV
3+
# Column.2: i0
4+
# Column.3: itrans
5+
# Column.4: mutrans
6+
# Element.edge: Bar
7+
# Element.symbol: Foo
8+
# Scan.edge_energy: 8980.0
9+
# Mono.name: Si 111
10+
# Mono.d_spacing: 3.13553
11+
# Beamline.name: 13ID
12+
# Beamline.collimation: none
13+
# Beamline.focusing: yes
14+
# Beamline.harmonic_rejection: rhodium-coated mirror
15+
# Facility.name: APS
16+
# Facility.energy: 7.00 GeV
17+
# Facility.xray_source: APS Undulator A
18+
# Scan.start_time: 2001-06-26T22:27:31
19+
# Detector.I0: 10cm N2
20+
# Detector.I1: 10cm N2
21+
# Sample.name: Cu
22+
# Sample.prep: Cu metal foil
23+
# GSE.EXTRA: config 1
24+
# ///
25+
# Cu foil Room Temperature
26+
# measured at beamline 13-ID
27+
#----
28+
# energy i0 itrans mutrans
29+
8779.0 149013.7 550643.089065 -1.3070486
30+
8789.0 144864.7 531876.119084 -1.3006104
31+
8799.0 132978.7 489591.10592 -1.3033816
32+
8809.0 125444.7 463051.104096 -1.3059724
33+
8819.0 121324.7 449969.103983 -1.3107085
34+
8829.0 119447.7 444386.117562 -1.3138152
35+
8839.0 119100.7 440176.091039 -1.3072055
36+
8849.0 117707.7 440448.106567 -1.3195882
37+
8859.0 117754.7 442302.10637 -1.3233895
38+
8869.0 117428.7 441944.116528 -1.3253521
39+
8879.0 117383.7 442810.120466 -1.327693
40+
8889.0 117185.7 443658.11566 -1.3312944

‎baddata/bad_31.xdi‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# XDI/1.0 GSE/1.0
2+
# Column.1: energy eV
3+
# Column.2: i0
4+
# Column.3: itrans
5+
# Column.4: mutrans
6+
# Element.edge: K
7+
# Element.symbol: Cu
8+
# Scan.edge_energy: 8980.0
9+
# Mono.name: Si 111
10+
# Mono.d_spacing: three point one three five five three
11+
# Beamline.name: 13ID
12+
# Beamline.collimation: none
13+
# Beamline.focusing: yes
14+
# Beamline.harmonic_rejection: rhodium-coated mirror
15+
# Facility.name: APS
16+
# Facility.energy: 7.00 GeV
17+
# Facility.xray_source: APS Undulator A
18+
# Scan.start_time: 2001-06-26T22:27:31
19+
# Detector.I0: 10cm N2
20+
# Detector.I1: 10cm N2
21+
# Sample.name: Cu
22+
# Sample.prep: Cu metal foil
23+
# GSE.EXTRA: config 1
24+
# ///
25+
# Cu foil Room Temperature
26+
# measured at beamline 13-ID
27+
#----
28+
# energy i0 itrans mutrans
29+
8779.0 149013.7 550643.089065 -1.3070486
30+
8789.0 144864.7 531876.119084 -1.3006104
31+
8799.0 132978.7 489591.10592 -1.3033816
32+
8809.0 125444.7 463051.104096 -1.3059724
33+
8819.0 121324.7 449969.103983 -1.3107085
34+
8829.0 119447.7 444386.117562 -1.3138152
35+
8839.0 119100.7 440176.091039 -1.3072055
36+
8849.0 117707.7 440448.106567 -1.3195882
37+
8859.0 117754.7 442302.10637 -1.3233895
38+
8869.0 117428.7 441944.116528 -1.3253521
39+
8879.0 117383.7 442810.120466 -1.327693
40+
8889.0 117185.7 443658.11566 -1.3312944

‎baddata/bad_32.xdi‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# XDI/1.0 GSE/1.0
2+
# Column.1: Energie eV
3+
# Column.2: i0
4+
# Column.3: itrans
5+
# Column.4: mutrans
6+
# Element.edge: K
7+
# Element.symbol: Cu
8+
# Scan.edge_energy: 8980.0
9+
# Mono.name: Si 111
10+
# Mono.d_spacing: 3.13553
11+
# Beamline.collimation: none
12+
# Beamline.focusing: yes
13+
# Beamline.harmonic_rejection: rhodium-coated mirror
14+
# Facility.energy: 7.00 GeV
15+
# Facility.xray_source: APS Undulator A
16+
# Scan.start_time: 2001-06-26T22:27:31
17+
# Detector.I0: 10cm N2
18+
# Detector.I1: 10cm N2
19+
# Sample.name: Cu
20+
# Sample.prep: Cu metal foil
21+
# GSE.EXTRA: config 1
22+
# ///
23+
# Cu foil Room Temperature
24+
# measured at beamline 13-ID
25+
#----
26+
# energy i0 itrans mutrans
27+
8779.0 149013.7 550643.089065 -1.3070486
28+
8789.0 144864.7 531876.119084 -1.3006104
29+
8799.0 132978.7 489591.10592 -1.3033816
30+
8809.0 125444.7 463051.104096 -1.3059724
31+
8819.0 121324.7 449969.103983 -1.3107085
32+
8829.0 119447.7 444386.117562 -1.3138152
33+
8839.0 119100.7 440176.091039 -1.3072055
34+
8849.0 117707.7 440448.106567 -1.3195882
35+
8859.0 117754.7 442302.10637 -1.3233895
36+
8869.0 117428.7 441944.116528 -1.3253521
37+
8879.0 117383.7 442810.120466 -1.327693
38+
8889.0 117185.7 443658.11566 -1.3312944

‎c/LICENSE‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
The xdifile library and its consitutuent source code (xdifile.c,
2+
xdifile.h, strutil.f, strutils.h) are free and unencumbered software
3+
released into the public domain.
4+
5+
Anyone is free to copy, modify, publish, use, compile, sell, or
6+
distribute this software, either in source code form or as a compiled
7+
binary, for any purpose, commercial or non-commercial, and by any
8+
means.
9+
10+
In jurisdictions that recognize copyright laws, the author or authors
11+
of this software dedicate any and all copyright interest in the
12+
software to the public domain.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
17+
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
18+
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20+
OTHER DEALINGS IN THE SOFTWARE.

‎c/LICENSE.slre‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Copyright (c) 2004-2013 Sergey Lyubka <[email protected]>
2+
Copyright (c) 2013 Cesanta Software Limited
3+
All rights reserved
4+
5+
This code is dual-licensed: you can redistribute it and/or modify
6+
it under the terms of the GNU General Public License version 2 as
7+
published by the Free Software Foundation. For the terms of this
8+
license, see <http://www.gnu.org/licenses/>.
9+
10+
You are free to use this code under the terms of the GNU General
11+
Public License, but WITHOUT ANY WARRANTY; without even the implied
12+
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13+
See the GNU General Public License for more details.
14+
15+
Alternatively, you can license this code under a commercial
16+
license, as set out in <http://cesanta.com/>.

0 commit comments

Comments
 (0)