Allow default values in geometry files, and set integration radius seperately

4 files changed, 21 insertions, 7 deletions

diff --git a/doc/examples/cspad-feb2011.geom b/doc/examples/cspad-feb2011.geom
index 3d821517..c51a9746 100644
--- a/doc/examples/cspad-feb2011.geom
+++ b/doc/examples/cspad-feb2011.geom
@@ -1,3 +1,6 @@
+; Parameters common to all panels
+integr_radius = 2.0
+
 ; Quadrant 0, asic 0
 q0a0/min_fs = 0
 q0a0/min_ss = 0
diff --git a/doc/examples/lcls-dec.geom b/doc/examples/lcls-dec.geom
index 349d2b16..f98b42fd 100644
--- a/doc/examples/lcls-dec.geom
+++ b/doc/examples/lcls-dec.geom
@@ -2,6 +2,10 @@ mask = /processing/hitfinder/masks
 mask_good = 0x07
 mask_bad = 0x00
 
+; These default values will be used unless overridden by the per-panel values
+peak_sep = 50.0
+integr_radius = 10.0
+
 upper/min_fs = 0
 upper/max_fs = 1023
 upper/min_ss = 512
@@ -13,7 +17,6 @@ upper/ss = y
 upper/clen = 67.8e-3
 upper/res = 13333.3  ; 75 micron pixel size
 upper/badrow_direction = y
-upper/peak_sep = 50
 
 lower/min_fs = 0
 lower/max_fs = 1023
@@ -26,7 +29,6 @@ lower/ss = y
 lower/clen = 70.8e-3
 lower/res = 13333.3  ; 75 micron pixel size
 lower/badrow_direction = y
-lower/peak_sep = 50
 
 bad_jetneartobeam/min_x = -15.0
 bad_jetneartobeam/max_x = +15.0
diff --git a/doc/examples/lcls-june-r0013-r0128.geom b/doc/examples/lcls-june-r0013-r0128.geom
index 730baf42..943b245f 100644
--- a/doc/examples/lcls-june-r0013-r0128.geom
+++ b/doc/examples/lcls-june-r0013-r0128.geom
@@ -2,6 +2,10 @@ mask = /processing/hitfinder/masks
 mask_good = 0x27
 mask_bad = 0x00
 
+; These default values will be used unless overridden by the per-panel values
+peak_sep = 50.0
+integr_radius = 10.0
+
 ; Upper panel (nearest the beam)
 0/min_fs = 0
 0/max_fs = 1023
@@ -14,7 +18,6 @@ mask_bad = 0x00
 0/clen = 64.78e-3
 0/res = 13333.3  ; 75 micron pixel size
 0/badrow_direction = y
-0/peak_sep = 50
 
 ; Lower panel (furthest from the beam)
 1/min_fs = 0
@@ -28,7 +31,6 @@ mask_bad = 0x00
 1/clen = 67.73e-3
 1/res = 13333.3  ; 75 micron pixel size
 1/badrow_direction = y
-1/peak_sep = 50
 
 bad_jetneartobeam/min_x = -15.0
 bad_jetneartobeam/max_x = +15.0
diff --git a/doc/geometry.txt b/doc/geometry.txt
index bf395e1c..c215d27c 100644
--- a/doc/geometry.txt
+++ b/doc/geometry.txt
@@ -56,10 +56,14 @@ panel0/badrow_direction = -
 ; The resolution (in pixels per metre) for this panel
 panel0/res = 9090.91
 
-; The characteristic peak separation.  The peak detection will assume that
-; genuine peaks are separated by at least this amount.
+; The characteristic peak separation in pixels.  The peak detection will assume
+; that genuine peaks are separated by at least this amount.
 panel0/peak_sep = 6.0
 
+; You need to specify the peak integration radius, which should be a little
+; larger than the actual radii of the peaks in pixels
+panel0/integr_radius = 2.0
+
 ; The camera length (in metres) for this panel
 ; You can also specify the HDF path to a scalar floating point value containing
 ; the camera length in millimetres.
@@ -100,6 +104,9 @@ mask = /processing/hitfinder/masks
 mask_good = 0x27
 mask_bad = 0x00
 
+; Any of the per-panel values can be given without a panel prefix, for example:
+peak_sep = 6.0
+; in which case the value will be used for all *subsequent* panels.
 
 
-See the "examples" folder for some examples.
+See the "examples" folder for some examples (look at the ones ending in .geom).