Skip to content

Commit e2241ec

Browse files
committed
merged
2 parents 1409c0e + a3bc3f9 commit e2241ec

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

baddata/BadFiles.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ bad_25.xdi file read(4) Y No extra version given
3232
bad_26.xdi file read(5) Y No user comment
3333
bad_27.xdi file read(5) Y Line of '////', but no user comment
3434
bad_28.xdi error msg Y incorrectly format date-time
35+
bad_29.xdi error msg Y date-time has invalid range (month > 12)
3536

3637
Notes:
3738
1. files read, return value > 0, indicating Warning
3839
2. extra column labels ignored, unspecified column labels set to 'colN' (N=1...)
3940
3. keys are allowed to start with a number...
4041
4. extra version is left as empty string ''
4142
5. user comment is left as empty string ''
42-

baddata/bad_29.xdi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Facility.name: APS
1616
# Facility.energy: 7.00 GeV
1717
# Facility.xray_source: APS Undulator A
18-
# Scan.start_time: 2001-06-26T22:27:31
18+
# Scan.start_time: 2001-26-6T22:27:31
1919
# Detector.I0: 10cm N2
2020
# Detector.I1: 10cm N2
2121
# Sample.name: Cu

c/xdifile.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ static char *ValidElems[] =
9494

9595

9696
/* error codes
97-
98-
< 1 error in data file
99-
> 0 data is valid but may be incomplete as XAFS data
97+
< 1 data file is not valid
98+
= 0 all OK.
99+
> 0 data file is valid but may be incomplete as XAFS data
100100
*/
101101
#define ERR_NOELEM 1
102102
#define ERR_NOEDGE 2

0 commit comments

Comments
 (0)