aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2011-04-07 19:37:03 +0200
committerThomas White <taw@physics.org>2012-02-22 15:27:24 +0100
commit3346edad408d3597b9b1c3f04f693182eebfccb0 (patch)
treed9c19e3290646b610b4acd0be3f602d170aad5c6 /src
parent46e994d788451cd890151ee6a3b6245f78235ea5 (diff)
More fussiness / tidy up
Diffstat (limited to 'src')
-rw-r--r--src/calibrate_detector.c8
-rw-r--r--src/detector.c1
2 files changed, 5 insertions, 4 deletions
diff --git a/src/calibrate_detector.c b/src/calibrate_detector.c
index 649eef44..82580e16 100644
--- a/src/calibrate_detector.c
+++ b/src/calibrate_detector.c
@@ -43,9 +43,9 @@ static void show_help(const char *s)
" -h, --help Display this help message.\n"
" -g. --geometry=<file> Get detector geometry from file.\n"
" -i, --input=<file> Input filename.\n"
-" -m, --method=<method> The calibration method.\n"
+" -m, --method=<method> The calibration method. Choose from:\n"
" xy Determine panel shifts in plane of detector\n"
-" -o, --output=<file> Output results here"
+" -o, --output=<file> Name of output geometry file.\n"
" -n, --npeaks=<number> Don't refine unless this many peaks are found\n"
" in the whole stream.\n"
"\n");
@@ -106,8 +106,8 @@ static struct rvec nearest_bragg(struct image *image, struct rvec q)
/* Miller indices of nearest Bragg reflection */
cell_get_cartesian(image->indexed_cell, &ax, &ay, &az,
- &bx, &by, &bz,
- &cx, &cy, &cz);
+ &bx, &by, &bz,
+ &cx, &cy, &cz);
hd = q.u * ax + q.v * ay + q.w * az;
kd = q.u * bx + q.v * by + q.w * bz;
diff --git a/src/detector.c b/src/detector.c
index da57c658..0b4bf2fa 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -507,6 +507,7 @@ static void parse_toplevel(struct detector *det, const char *key,
}
}
+
struct detector *get_detector_geometry(const char *filename)
{
FILE *fh;