diff options
author | Thomas White <taw@physics.org> | 2021-09-03 14:11:33 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2021-09-03 14:11:33 +0200 |
commit | 229e384a98b3589734095b8bc8e48ad8118e7d2a (patch) | |
tree | 3286bd69adc296f99f789037b64ce51d918c1357 | |
parent | 7fea4dc8222825b0dde4bb059924d5a3eba20819 (diff) |
Fix typo and failing tests from previous commit
-rw-r--r-- | libcrystfel/src/datatemplate.c | 2 | ||||
-rw-r--r-- | tests/ev_enum1.geom | 2 | ||||
-rw-r--r-- | tests/ev_enum2.geom | 2 | ||||
-rw-r--r-- | tests/ev_enum3.geom | 2 | ||||
-rw-r--r-- | tests/wavelength_geom1.geom | 2 | ||||
-rw-r--r-- | tests/wavelength_geom10.geom | 2 | ||||
-rw-r--r-- | tests/wavelength_geom11.geom | 2 | ||||
-rw-r--r-- | tests/wavelength_geom12.geom | 2 | ||||
-rw-r--r-- | tests/wavelength_geom2.geom | 2 | ||||
-rw-r--r-- | tests/wavelength_geom3.geom | 2 | ||||
-rw-r--r-- | tests/wavelength_geom4.geom | 2 | ||||
-rw-r--r-- | tests/wavelength_geom5.geom | 2 | ||||
-rw-r--r-- | tests/wavelength_geom6.geom | 2 | ||||
-rw-r--r-- | tests/wavelength_geom7.geom | 2 | ||||
-rw-r--r-- | tests/wavelength_geom8.geom | 2 | ||||
-rw-r--r-- | tests/wavelength_geom9.geom | 2 |
16 files changed, 31 insertions, 1 deletions
diff --git a/libcrystfel/src/datatemplate.c b/libcrystfel/src/datatemplate.c index 9f14732b..7f7f24af 100644 --- a/libcrystfel/src/datatemplate.c +++ b/libcrystfel/src/datatemplate.c @@ -1268,7 +1268,7 @@ DataTemplate *data_template_new_from_string(const char *string_in) } if ( isnan(p->ssx) ) { - ERROR("Please specify the FS direction for panel %s\n", + ERROR("Please specify the SS direction for panel %s\n", dt->panels[i].name); reject = 1; } diff --git a/tests/ev_enum1.geom b/tests/ev_enum1.geom index 6c763e09..2eafb19e 100644 --- a/tests/ev_enum1.geom +++ b/tests/ev_enum1.geom @@ -2,6 +2,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/ev_enum2.geom b/tests/ev_enum2.geom index 6afe53b4..de21cd21 100644 --- a/tests/ev_enum2.geom +++ b/tests/ev_enum2.geom @@ -2,6 +2,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/ev_enum3.geom b/tests/ev_enum3.geom index 67424606..5b618a96 100644 --- a/tests/ev_enum3.geom +++ b/tests/ev_enum3.geom @@ -2,6 +2,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/wavelength_geom1.geom b/tests/wavelength_geom1.geom index 91b87385..280cc349 100644 --- a/tests/wavelength_geom1.geom +++ b/tests/wavelength_geom1.geom @@ -3,6 +3,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/wavelength_geom10.geom b/tests/wavelength_geom10.geom index a315c458..f0d7ca96 100644 --- a/tests/wavelength_geom10.geom +++ b/tests/wavelength_geom10.geom @@ -3,6 +3,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/wavelength_geom11.geom b/tests/wavelength_geom11.geom index 676dc68a..d0a49612 100644 --- a/tests/wavelength_geom11.geom +++ b/tests/wavelength_geom11.geom @@ -3,6 +3,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/wavelength_geom12.geom b/tests/wavelength_geom12.geom index b47eb243..81308932 100644 --- a/tests/wavelength_geom12.geom +++ b/tests/wavelength_geom12.geom @@ -3,6 +3,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/wavelength_geom2.geom b/tests/wavelength_geom2.geom index 73ef91cc..68d77ff2 100644 --- a/tests/wavelength_geom2.geom +++ b/tests/wavelength_geom2.geom @@ -3,6 +3,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/wavelength_geom3.geom b/tests/wavelength_geom3.geom index bcd890bd..5d989d48 100644 --- a/tests/wavelength_geom3.geom +++ b/tests/wavelength_geom3.geom @@ -3,6 +3,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/wavelength_geom4.geom b/tests/wavelength_geom4.geom index fa03b724..e3a70045 100644 --- a/tests/wavelength_geom4.geom +++ b/tests/wavelength_geom4.geom @@ -3,6 +3,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/wavelength_geom5.geom b/tests/wavelength_geom5.geom index de26de3b..bc5de6cf 100644 --- a/tests/wavelength_geom5.geom +++ b/tests/wavelength_geom5.geom @@ -3,6 +3,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/wavelength_geom6.geom b/tests/wavelength_geom6.geom index 9ee5dc87..da09f6cc 100644 --- a/tests/wavelength_geom6.geom +++ b/tests/wavelength_geom6.geom @@ -3,6 +3,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/wavelength_geom7.geom b/tests/wavelength_geom7.geom index a1c311cf..c22f89e8 100644 --- a/tests/wavelength_geom7.geom +++ b/tests/wavelength_geom7.geom @@ -3,6 +3,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/wavelength_geom8.geom b/tests/wavelength_geom8.geom index 00bdb45a..4bcf2c98 100644 --- a/tests/wavelength_geom8.geom +++ b/tests/wavelength_geom8.geom @@ -3,6 +3,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm diff --git a/tests/wavelength_geom9.geom b/tests/wavelength_geom9.geom index 9012b5d6..992c10a3 100644 --- a/tests/wavelength_geom9.geom +++ b/tests/wavelength_geom9.geom @@ -3,6 +3,8 @@ panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 panel/max_ss = 1 +panel/fs = x +panel/ss = y panel/corner_x = -100 panel/corner_y = -100 panel/clen = 50 mm |