aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2012-07-02 09:44:01 +0200
committerThomas White <taw@bitwiz.org.uk>2012-07-02 09:44:01 +0200
commit81d0cc926576519536d89af8f74272b00acd4fd5 (patch)
tree41829ab0e2b7461446d1bad657cef44fad2ebde5 /doc
parenta4ffb65ff4da923aabdb107cdaf59fccba30b409 (diff)
parentd7cacb7871a7d49057453b768e420dfb0ab52077 (diff)
Merge branch 'master' into tom/speed
Conflicts: libcrystfel/src/peaks.c src/indexamajig.c
Diffstat (limited to 'doc')
-rw-r--r--doc/man/crystfel_geometry.54
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/man/crystfel_geometry.5 b/doc/man/crystfel_geometry.5
index 006af722..68abb341 100644
--- a/doc/man/crystfel_geometry.5
+++ b/doc/man/crystfel_geometry.5
@@ -47,7 +47,7 @@ of pixel values in the HDF5 file, defined in terms only of the "fast scan" and
+x completes the right-handed coordinate system.
.PP
-Naively speaking, this means that CrystFEL at the images from the "into the
+Naively speaking, this means that CrystFEL looks at the images from the "into the
beam" perspective, but please avoid thinking of things in this way. It's much
better to consider the precise way in which the coordinates are mapped.
@@ -116,6 +116,8 @@ panel0/ss = -x
.br
; the HDF5 file, is now given a position in the lab coordinate system.
.br
+; Units are pixels.
+.br
; Note that "first point in the panel" is a conceptual simplification. We refer
.br
; to that corner, and to the very corner of the pixel - NOT, for example, to the