From 0d2fd58266f87fb20aceb017c68b0e455ab4baee Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Mon, 28 Feb 2011 15:39:53 +0100
Subject: Update geometry files

---
 doc/examples/lcls-dec.geom              | 28 ++++++++++++++++------------
 doc/examples/lcls-june-r0013-r0128.geom | 28 ++++++++++++++++------------
 doc/examples/lcls-xpp-estimate.geom     | 14 ++++++++------
 doc/examples/simple.geom                | 28 ++++++++++++++++------------
 4 files changed, 56 insertions(+), 42 deletions(-)

(limited to 'doc/examples')

diff --git a/doc/examples/lcls-dec.geom b/doc/examples/lcls-dec.geom
index 9ca0ea58..840796ad 100644
--- a/doc/examples/lcls-dec.geom
+++ b/doc/examples/lcls-dec.geom
@@ -1,24 +1,28 @@
 n_panels = 2
 
 ; Upper panel
-0/min_x = 0
-0/max_x = 1023
-0/min_y = 512
-0/max_y = 1023
-0/cx = 491.9
-0/cy = 440.7
+0/min_fs = 0
+0/max_fs = 1023
+0/min_ss = 512
+0/max_ss = 1023
+0/corner_x = -491.90
+0/corner_y = 71.30
+0/fs = x
+0/ss = y
 0/clen = 67.8e-3
 0/res = 13333.3  ; 75 micron pixel size
 0/badrow_direction = y
 0/peak_sep = 50
 
 ; Lower panel
-1/min_x = 0
-1/max_x = 1023
-1/min_y = 0
-1/max_y = 511
-1/cx = 492.0
-1/cy = 779.7
+1/min_fs = 0
+1/max_fs = 1023
+1/min_ss = 0
+1/max_ss = 511
+1/corner_x = -492.00
+1/corner_y = -779.70
+1/fs = x
+1/ss = y
 1/clen = 70.8e-3
 1/res = 13333.3  ; 75 micron pixel size
 1/badrow_direction = y
diff --git a/doc/examples/lcls-june-r0013-r0128.geom b/doc/examples/lcls-june-r0013-r0128.geom
index 73e1ceea..ef217d1a 100644
--- a/doc/examples/lcls-june-r0013-r0128.geom
+++ b/doc/examples/lcls-june-r0013-r0128.geom
@@ -1,24 +1,28 @@
 n_panels = 2
 
 ; Upper panel (nearest the beam)
-0/min_x = 0
-0/max_x = 1023
-0/min_y = 512
-0/max_y = 1023
-0/cx = 512.9
-0/cy = 459.0
+0/min_fs = 0
+0/max_fs = 1023
+0/min_ss = 512
+0/max_ss = 1023
+0/corner_x = -512.90
+0/corner_y = 53.00
+0/fs = x
+0/ss = y
 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_x = 0
-1/max_x = 1023
-1/min_y = 0
-1/max_y = 511
-1/cx = 519.0
-1/cy = 901.0
+1/min_fs = 0
+1/max_fs = 1023
+1/min_ss = 0
+1/max_ss = 511
+1/corner_x = -519.00
+1/corner_y = -901.00
+1/fs = x
+1/ss = y
 1/clen = 67.73e-3
 1/res = 13333.3  ; 75 micron pixel size
 1/badrow_direction = y
diff --git a/doc/examples/lcls-xpp-estimate.geom b/doc/examples/lcls-xpp-estimate.geom
index 8cef9ce9..7e53d3d9 100644
--- a/doc/examples/lcls-xpp-estimate.geom
+++ b/doc/examples/lcls-xpp-estimate.geom
@@ -1,11 +1,13 @@
 n_panels = 1
 
-0/min_x = 0
-0/max_x = 1455
-0/min_y = 0
-0/max_y = 1455
-0/cx = 727.5
-0/cy = 727.5
+0/min_fs = 0
+0/max_fs = 1455
+0/min_ss = 0
+0/max_ss = 1455
+0/corner_x = -727.50
+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
diff --git a/doc/examples/simple.geom b/doc/examples/simple.geom
index fe14a9d3..aa762b47 100644
--- a/doc/examples/simple.geom
+++ b/doc/examples/simple.geom
@@ -1,23 +1,27 @@
 n_panels = 2
 
 ; Upper panel
-0/min_x = 0
-0/max_x = 1023
-0/min_y = 512
-0/max_y = 1023
-0/cx = 512.0
-0/cy = 502.0
+0/min_fs = 0
+0/max_fs = 1023
+0/min_ss = 512
+0/max_ss = 1023
+0/corner_x = -512.00
+0/corner_y = 10.00
+0/fs = x
+0/ss = y
 0/clen = 50.0e-3
 0/res = 13333.3  ; 75 micron pixel size
 0/peak_sep = 50
 
 ; Lower panel
-1/min_x = 0
-1/max_x = 1023
-1/min_y = 0
-1/max_y = 511
-1/cx = 512.0
-1/cy = 522.0
+1/min_fs = 0
+1/max_fs = 1023
+1/min_ss = 0
+1/max_ss = 511
+1/corner_x = -512.00
+1/corner_y = -522.00
+1/fs = x
+1/ss = y
 1/clen = 50.0e-3
 1/res = 13333.3  ; 75 micron pixel size
 1/peak_sep = 50
-- 
cgit v1.2.3