aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/examples/Eiger16M-binning2-nativefiles.geom55
-rw-r--r--doc/man/compare_hkl.14
2 files changed, 57 insertions, 2 deletions
diff --git a/doc/examples/Eiger16M-binning2-nativefiles.geom b/doc/examples/Eiger16M-binning2-nativefiles.geom
new file mode 100644
index 00000000..0a53a74e
--- /dev/null
+++ b/doc/examples/Eiger16M-binning2-nativefiles.geom
@@ -0,0 +1,55 @@
+; Example geometry file for Eiger 16M detector, using its native file format
+; and binning 2.
+
+; Camera length (in m) and photon energy (eV)
+clen = 0.1
+photon_energy = 22000
+
+; adu_per_photon needs a relatively recent CrystFEL version. If your version is
+; older, change it to adu_per_eV and set it to one over the photon energy in eV
+adu_per_photon = 1
+res = 13333.3 ; 75 micron pixel size
+
+; These lines describe the data layout for the Eiger native multi-event files
+dim0 = %
+dim1 = ss
+dim2 = fs
+data = /entry/data/data
+
+; Mask out strips between panels
+bad_v0/min_fs = 1030
+bad_v0/min_ss = 0
+bad_v0/max_fs = 1039
+bad_v0/max_ss = 2166
+
+bad_h0/min_fs = 0
+bad_h0/min_ss = 514
+bad_h0/max_fs = 2069
+bad_h0/max_ss = 550
+
+bad_h1/min_fs = 0
+bad_h1/min_ss = 1065
+bad_h1/max_fs = 2069
+bad_h1/max_ss = 1101
+
+bad_h2/min_fs = 0
+bad_h2/min_ss = 1616
+bad_h2/max_fs = 2069
+bad_h2/max_ss = 1652
+
+; Uncomment these lines if you have a separate bad pixel map (recommended!)
+;mask_file = eiger-badmap.h5
+;mask = /data/data
+;mask_good = 0x0
+;mask_bad = 0x1
+
+; corner_{x,y} set the position of the corner of the detector (in pixels)
+; relative to the beam
+panel0/min_fs = 0
+panel0/min_ss = 0
+panel0/max_fs = 2069
+panel0/max_ss = 2166
+panel0/corner_x = -1000.0
+panel0/corner_y = -1000.0
+panel0/fs = x
+panel0/ss = y
diff --git a/doc/man/compare_hkl.1 b/doc/man/compare_hkl.1
index 8e464d12..30fcd93e 100644
--- a/doc/man/compare_hkl.1
+++ b/doc/man/compare_hkl.1
@@ -72,9 +72,9 @@ Note that this figure of merit compares measurements within one data set, so it
The ratio of Rano to Rsplit, as defined above.
.IP "\fBd1sig\fR and \fBd2sig\fR"
.PD
-The fraction of differences between intensities which are within one times (for \fBd1sig\fR) and two times (for \fBd2sig\fR) the mean of the corresponding sigma(I) values.
+The fraction of differences between intensities which are within one times (for \fBd1sig\fR) and two times (for \fBd2sig\fR) the combination of the corresponding sigma(I) values.
.PP
-I1 and I2 are the intensities of the same reflection in both reflection lists. The scale factor, k, is given by sum(I1*i2) / sum(I2^2), unless you use \fB-u\fR.
+I1 and I2 are the intensities of the same reflection in both reflection lists. The two sets of reflections will be put on a common scale (linear and Debye-Waller terms) unless you use \fB-u\fR.
.RE
.PD 0