aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2012-03-07 17:25:55 +0100
committerThomas White <taw@physics.org>2012-03-07 17:25:55 +0100
commit4d3b0a507dadcf84bb07fdad9b26e3cbe6e03a19 (patch)
tree9957dff45e9b34f3f51037bf770d5cb5eb6f1ae0
parente53c256447dd419159cb89ed9244daddeba34c9f (diff)
Update merging tests for new file format
-rwxr-xr-xtests/first_merge_check8
-rw-r--r--tests/first_merge_check.hkl4
-rwxr-xr-xtests/fourth_merge_check4
-rw-r--r--tests/fourth_merge_check.hkl4
-rwxr-xr-xtests/second_merge_check8
-rwxr-xr-xtests/third_merge_check12
-rw-r--r--tests/third_merge_check.hkl4
7 files changed, 22 insertions, 22 deletions
diff --git a/tests/first_merge_check b/tests/first_merge_check
index bfec2188..e96d5198 100755
--- a/tests/first_merge_check
+++ b/tests/first_merge_check
@@ -13,8 +13,8 @@ cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
I0 = 1.0 (arbitrary units)
photon_energy_eV = 2000.0
Reflections measured after indexing
- h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
- 1 0 0 100.00 - 0.00 1.0 1 938.0 629.0
+ h k l I phase sigma(I) counts fs/px ss/px
+ 1 0 0 100.00 - 0.00 1 938.0 629.0
End of reflections
----- End chunk -----
@@ -28,8 +28,8 @@ cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
I0 = 1.0 (arbitrary units)
photon_energy_eV = 2000.0
Reflections measured after indexing
- h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
- 1 0 0 200.00 - 0.00 1.0 1 938.0 629.0
+ h k l I phase sigma(I) counts fs/px ss/px
+ 1 0 0 200.00 - 0.00 1 938.0 629.0
End of reflections
----- End chunk -----
EOF
diff --git a/tests/first_merge_check.hkl b/tests/first_merge_check.hkl
index a57f7c9c..eeb0f455 100644
--- a/tests/first_merge_check.hkl
+++ b/tests/first_merge_check.hkl
@@ -1,3 +1,3 @@
- h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
- 1 0 0 150.00 - 35.36 - 2 0.0 0.0
+ h k l I phase sigma(I) counts fs/px ss/px
+ 1 0 0 150.00 - 35.36 2 0.0 0.0
End of reflections
diff --git a/tests/fourth_merge_check b/tests/fourth_merge_check
index 6e845657..08d2d291 100755
--- a/tests/fourth_merge_check
+++ b/tests/fourth_merge_check
@@ -13,8 +13,8 @@ cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
I0 = 1.0 (arbitrary units)
photon_energy_eV = 2000.0
Reflections measured after indexing
- h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
- 1 0 0 100.00 - 0.00 1.0 1 938.0 629.0
+ h k l I phase sigma(I) counts fs/px ss/px
+ 1 0 0 100.00 - 0.00 1 938.0 629.0
End of reflections
----- End chunk -----
EOF
diff --git a/tests/fourth_merge_check.hkl b/tests/fourth_merge_check.hkl
index 5b5a5a18..9c318920 100644
--- a/tests/fourth_merge_check.hkl
+++ b/tests/fourth_merge_check.hkl
@@ -1,3 +1,3 @@
- h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
- 1 0 0 100.00 - 0.00 - 1 0.0 0.0
+ h k l I phase sigma(I) counts fs/px ss/px
+ 1 0 0 100.00 - 0.00 1 0.0 0.0
End of reflections
diff --git a/tests/second_merge_check b/tests/second_merge_check
index ed002ebf..bda315e3 100755
--- a/tests/second_merge_check
+++ b/tests/second_merge_check
@@ -13,8 +13,8 @@ cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
I0 = 1.0 (arbitrary units)
photon_energy_eV = 2000.0
Reflections measured after indexing
- h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
- 1 0 0 100.00 - 0.00 1.0 1 938.0 629.0
+ h k l I phase sigma(I) counts fs/px ss/px
+ 1 0 0 100.00 - 0.00 1 938.0 629.0
End of reflections
----- End chunk -----
@@ -28,8 +28,8 @@ cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
I0 = 1.0 (arbitrary units)
photon_energy_eV = 2000.0
Reflections measured after indexing
- h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
- -1 0 0 200.00 - 0.00 1.0 1 938.0 629.0
+ h k l I phase sigma(I) counts fs/px ss/px
+ -1 0 0 200.00 - 0.00 1 938.0 629.0
End of reflections
----- End chunk -----
EOF
diff --git a/tests/third_merge_check b/tests/third_merge_check
index c5174c36..b0c90619 100755
--- a/tests/third_merge_check
+++ b/tests/third_merge_check
@@ -13,8 +13,8 @@ cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
I0 = 1.0 (arbitrary units)
photon_energy_eV = 2000.0
Reflections measured after indexing
- h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
- 1 0 0 100.00 - 0.00 1.0 1 938.0 629.0
+ h k l I phase sigma(I) counts fs/px ss/px
+ 1 0 0 100.00 - 0.00 1 938.0 629.0
End of reflections
----- End chunk -----
@@ -28,8 +28,8 @@ cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
I0 = 1.0 (arbitrary units)
photon_energy_eV = 2000.0
Reflections measured after indexing
- h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
- 1 0 0 200.00 - 0.00 1.0 1 938.0 629.0
+ h k l I phase sigma(I) counts fs/px ss/px
+ 1 0 0 200.00 - 0.00 1 938.0 629.0
End of reflections
----- End chunk -----
@@ -43,8 +43,8 @@ cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
I0 = 1.0 (arbitrary units)
photon_energy_eV = 2000.0
Reflections measured after indexing
- h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
- 1 0 0 100.00 - 0.00 1.0 1 938.0 629.0
+ h k l I phase sigma(I) counts fs/px ss/px
+ 1 0 0 100.00 - 0.00 1 938.0 629.0
End of reflections
----- End chunk -----
EOF
diff --git a/tests/third_merge_check.hkl b/tests/third_merge_check.hkl
index 540dc3f3..efeaa0f5 100644
--- a/tests/third_merge_check.hkl
+++ b/tests/third_merge_check.hkl
@@ -1,3 +1,3 @@
- h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
- 1 0 0 133.33 - 27.22 - 3 0.0 0.0
+ h k l I phase sigma(I) counts fs/px ss/px
+ 1 0 0 133.33 - 27.22 3 0.0 0.0
End of reflections