From b59973fb1b1f38c0569b784a02f5f1898735ae85 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Fri, 19 May 2023 13:37:39 +0200
Subject: Move clen to top level in all examples and tests

---
 doc/examples/lcls-dec.geom              | 5 +++--
 doc/examples/lcls-june-r0013-r0128.geom | 5 +++--
 doc/examples/lcls-xpp-estimate.geom     | 2 +-
 doc/examples/simple.geom                | 3 +--
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'doc/examples')

diff --git a/doc/examples/lcls-dec.geom b/doc/examples/lcls-dec.geom
index 3ecf4b03..c0250faf 100644
--- a/doc/examples/lcls-dec.geom
+++ b/doc/examples/lcls-dec.geom
@@ -1,6 +1,7 @@
 mask = /processing/hitfinder/masks
 mask_good = 0x07
 mask_bad = 0x00
+clen = 67.8e-3
 
 ; These default values will be used unless overridden by the per-panel values
 adu_per_eV = 0.0835
@@ -13,7 +14,7 @@ upper/corner_x = -491.90
 upper/corner_y = 71.30
 upper/fs = x
 upper/ss = y
-upper/clen = 67.8e-3
+upper/coffset = 0.0
 upper/res = 13333.3  ; 75 micron pixel size
 upper/badrow_direction = y
 
@@ -25,7 +26,7 @@ lower/corner_x = -492.00
 lower/corner_y = -779.70
 lower/fs = x
 lower/ss = y
-lower/clen = 70.8e-3
+lower/coffset = 3e-3
 lower/res = 13333.3  ; 75 micron pixel size
 lower/badrow_direction = y
 
diff --git a/doc/examples/lcls-june-r0013-r0128.geom b/doc/examples/lcls-june-r0013-r0128.geom
index 64790daa..c466666b 100644
--- a/doc/examples/lcls-june-r0013-r0128.geom
+++ b/doc/examples/lcls-june-r0013-r0128.geom
@@ -1,6 +1,7 @@
 mask = /processing/hitfinder/masks
 mask_good = 0x27
 mask_bad = 0x00
+clen = 64.78e-3
 
 ; These default values will be used unless overridden by the per-panel values
 adu_per_eV = 0.01045
@@ -14,7 +15,7 @@ adu_per_eV = 0.01045
 0/corner_y = 53.00
 0/fs = x
 0/ss = y
-0/clen = 64.78e-3
+0/coffset = 0.0
 0/res = 13333.3  ; 75 micron pixel size
 0/badrow_direction = y
 0/rigid_group = 0
@@ -28,7 +29,7 @@ adu_per_eV = 0.01045
 1/corner_y = -901.00
 1/fs = x
 1/ss = y
-1/clen = 67.73e-3
+1/coffset = 2.95e-3
 1/res = 13333.3  ; 75 micron pixel size
 1/badrow_direction = y
 1/rigid_group = 1
diff --git a/doc/examples/lcls-xpp-estimate.geom b/doc/examples/lcls-xpp-estimate.geom
index d34dc3b3..6cbb63e3 100644
--- a/doc/examples/lcls-xpp-estimate.geom
+++ b/doc/examples/lcls-xpp-estimate.geom
@@ -1,3 +1,4 @@
+clen = 0.08  ; 8 cm camera length
 0/min_fs = 0
 0/max_fs = 1455
 0/min_ss = 0
@@ -6,7 +7,6 @@
 0/corner_y = -727.50
 0/fs = x
 0/ss = y
-0/clen = 0.08  ; 8 cm camera length
 0/res = 9090  ; 110 micron pixel size
 0/badrow_direction = x
 0/adu_per_eV = 1.0
diff --git a/doc/examples/simple.geom b/doc/examples/simple.geom
index 55dbd1cd..548e3344 100644
--- a/doc/examples/simple.geom
+++ b/doc/examples/simple.geom
@@ -1,4 +1,5 @@
 adu_per_eV = 1.0
+clen = 50.0e-3
 
 ; Upper panel
 0/min_fs = 0
@@ -9,7 +10,6 @@ adu_per_eV = 1.0
 0/corner_y = 10.00
 0/fs = x
 0/ss = y
-0/clen = 50.0e-3
 0/res = 13333.3  ; 75 micron pixel size
 
 ; Lower panel
@@ -21,5 +21,4 @@ adu_per_eV = 1.0
 1/corner_y = -522.00
 1/fs = x
 1/ss = y
-1/clen = 50.0e-3
 1/res = 13333.3  ; 75 micron pixel size
-- 
cgit v1.2.3