aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2010-09-08 16:28:48 +0200
committerThomas White <taw@physics.org>2012-02-22 15:26:57 +0100
commit5c98edbec82f8f5a301bdced5d7531f09711766c (patch)
treedf24687acd3d116268531bd44ece4b269c623452
parent0ae49f9ad195ad65758ac21e146691edaeeb2512 (diff)
Update LCLS June geometry (runs 13-128)
-rw-r--r--examples/lcls-june-r0013-r0128.geom28
-rw-r--r--examples/lcls-june.geom23
2 files changed, 14 insertions, 37 deletions
diff --git a/examples/lcls-june-r0013-r0128.geom b/examples/lcls-june-r0013-r0128.geom
index b72c1837..1e3834d8 100644
--- a/examples/lcls-june-r0013-r0128.geom
+++ b/examples/lcls-june-r0013-r0128.geom
@@ -1,23 +1,23 @@
n_panels = 2
-; Upper panel (found to the "right" in the HDF5, nearest the beam)
-0/min_x = 512
+; Upper panel (nearest the beam)
+0/min_x = 0
0/max_x = 1023
-0/min_y = 0
+0/min_y = 512
0/max_y = 1023
-0/cx = 459.0
-0/cy = 511.0
-0/clen = 64.6e-3
+0/cx = 512.9
+0/cy = 459.0
+0/clen = 64.78e-3
0/res = 13333.3 ; 75 micron pixel size
-0/badrow_direction = x
+0/badrow_direction = y
-; Lower panel (found to the "left" in the HDF5, furthest from the beam)
+; Lower panel (furthest from the beam)
1/min_x = 0
-1/max_x = 511
+1/max_x = 1023
1/min_y = 0
-1/max_y = 1023
-1/cx = 901.0
-1/cy = 519.0
-1/clen = 67.4e-3
+1/max_y = 511
+1/cx = 519.0
+1/cy = 901.0
+1/clen = 67.73e-3
1/res = 13333.3 ; 75 micron pixel size
-1/badrow_direction = x
+1/badrow_direction = y
diff --git a/examples/lcls-june.geom b/examples/lcls-june.geom
deleted file mode 100644
index 315fb504..00000000
--- a/examples/lcls-june.geom
+++ /dev/null
@@ -1,23 +0,0 @@
-n_panels = 2
-
-; Upper panel (found to the "right" in the HDF5, nearest the beam)
-0/min_x = 512
-0/max_x = 1023
-0/min_y = 0
-0/max_y = 1023
-0/cx = 461.0
-0/cy = 512.0
-0/clen = 66.0e-3
-0/res = 13333.3 ; 75 micron pixel size
-0/badrow_direction = x
-
-; Lower panel (found to the "left" in the HDF5, furthest from the beam)
-1/min_x = 0
-1/max_x = 511
-1/min_y = 0
-1/max_y = 1023
-1/cx = 870.0
-1/cy = 512.0
-1/clen = 69.0e-3
-1/res = 13333.3 ; 75 micron pixel size
-1/badrow_direction = x