Skip to content

Commit 6f3b4af

Browse files
paulneves77PaulSharp
paulneves77
authored and
PaulSharp
committed
fixed minor error in reference output for nxcansas_1Dand2D_multisasdata and nxcansas_1Dand2D_multisasentry where the detector distance was read wrong because of the difference between node.astype(float)[0] and float(node[0].astype(str))
1 parent 82a1607 commit 6f3b4af

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎sasdata/temp_hdf5_reader.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
test_file = "./example_data/2d_data/BAM_2D.h5"
3434
# test_file = "./example_data/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5"
3535
# test_file = "./example_data/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5"
36-
test_file = "./test/sasdataloader/data/nxcansas_1Dand2D_multisasentry_multisasdata.h5"
36+
test_file = "./test/sasdataloader/data/nxcansas_1Dand2D_multisasdata.h5"
3737

3838
logger = logging.getLogger(__name__)
3939

‎test/sasdataloader/reference/nxcansas_1Dand2D_multisasdata.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ Collimation:
2323
Length: None
2424
Detector:
2525
Name: front-detector
26-
Distance: 2845.260009765625 mm
26+
Distance: 2845.26 mm
2727
Offset: None
2828
Orientation: None
2929
Beam center: None
3030
Pixel size: None
3131
Slit length: None
3232
Detector:
3333
Name: rear-detector
34-
Distance: 4385.27978515625 mm
34+
Distance: 4385.28 mm
3535
Offset: None
3636
Orientation: None
3737
Beam center: None

‎test/sasdataloader/reference/nxcansas_1Dand2D_multisasentry.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ Collimation:
2323
Length: None
2424
Detector:
2525
Name: front-detector
26-
Distance: 2845.260009765625 mm
26+
Distance: 2845.26 mm
2727
Offset: None
2828
Orientation: None
2929
Beam center: None
3030
Pixel size: None
3131
Slit length: None
3232
Detector:
3333
Name: rear-detector
34-
Distance: 4385.27978515625 mm
34+
Distance: 4385.28 mm
3535
Offset: None
3636
Orientation: None
3737
Beam center: None
@@ -70,15 +70,15 @@ Collimation:
7070
Length: None
7171
Detector:
7272
Name: front-detector
73-
Distance: 2845.260009765625 mm
73+
Distance: 2845.26 mm
7474
Offset: None
7575
Orientation: None
7676
Beam center: None
7777
Pixel size: None
7878
Slit length: None
7979
Detector:
8080
Name: rear-detector
81-
Distance: 4385.27978515625 mm
81+
Distance: 4385.28 mm
8282
Offset: None
8383
Orientation: None
8484
Beam center: None

0 commit comments

Comments
 (0)