From 27f012b2e2181a8b4fa4f3044a8691739b74a869 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 30 Jul 2012 18:33:52 -0700 Subject: Update example files --- doc/examples/cspad-feb2011.geom | 128 -------------------------------- doc/examples/lcls-cxi-9keV.beam | 3 + doc/examples/lcls-dec.beam | 3 + doc/examples/lcls-dec.geom | 2 - doc/examples/lcls-june-r0013-r0128.geom | 2 - doc/examples/lcls-june.beam | 3 + doc/examples/lcls-xpp-estimate.beam | 3 + doc/examples/lcls-xpp-estimate.geom | 1 - doc/examples/simple.geom | 2 - 9 files changed, 12 insertions(+), 135 deletions(-) diff --git a/doc/examples/cspad-feb2011.geom b/doc/examples/cspad-feb2011.geom index 9ef79077..21adb022 100644 --- a/doc/examples/cspad-feb2011.geom +++ b/doc/examples/cspad-feb2011.geom @@ -6,13 +6,11 @@ q0a0/max_fs = 193 q0a0/max_ss = 184 q0a0/badrow_direction = - q0a0/res = 9090.91 -q0a0/peak_sep = 6 q0a0/clen = /LCLS/detectorPosition q0a0/fs = -0.0057225772x +0.9999836087y q0a0/ss = -0.9999836087x -0.0057225772y q0a0/corner_x = 424.384 q0a0/corner_y = -10.6473 -q0a0/integr_radius = 3 q0a0/no_index = 0 @@ -22,13 +20,11 @@ q0a1/max_fs = 387 q0a1/max_ss = 184 q0a1/badrow_direction = - q0a1/res = 9090.91 -q0a1/peak_sep = 6 q0a1/clen = /LCLS/detectorPosition q0a1/fs = -0.0057225772x +0.9999836087y q0a1/ss = -0.9999836087x -0.0057225772y q0a1/corner_x = 423.257 q0a1/corner_y = 186.349 -q0a1/integr_radius = 3 q0a1/no_index = 0 @@ -38,13 +34,11 @@ q1a0/max_fs = 581 q1a0/max_ss = 184 q1a0/badrow_direction = - q1a0/res = 9090.91 -q1a0/peak_sep = 6 q1a0/clen = /LCLS/detectorPosition q1a0/fs = -0.9999815226x +0.0060744919y q1a0/ss = -0.0060744919x -0.9999815226y q1a0/corner_x = 13.1196 q1a0/corner_y = 422.727 -q1a0/integr_radius = 3 q1a0/no_index = 0 @@ -54,13 +48,11 @@ q1a1/max_fs = 775 q1a1/max_ss = 184 q1a1/badrow_direction = - q1a1/res = 9090.91 -q1a1/peak_sep = 6 q1a1/clen = /LCLS/detectorPosition q1a1/fs = -0.9999815226x +0.0060744919y q1a1/ss = -0.0060744919x -0.9999815226y q1a1/corner_x = -183.877 q1a1/corner_y = 423.924 -q1a1/integr_radius = 3 q1a1/no_index = 0 @@ -70,13 +62,11 @@ q2a0/max_fs = 969 q2a0/max_ss = 184 q2a0/badrow_direction = - q2a0/res = 9090.91 -q2a0/peak_sep = 6 q2a0/clen = /LCLS/detectorPosition q2a0/fs = +0.0048825117x -0.9999880791y q2a0/ss = +0.9999880791x +0.0048825117y q2a0/corner_x = -428.519 q2a0/corner_y = 8.29208 -q2a0/integr_radius = 3 q2a0/no_index = 0 @@ -86,13 +76,11 @@ q2a1/max_fs = 1163 q2a1/max_ss = 184 q2a1/badrow_direction = - q2a1/res = 9090.91 -q2a1/peak_sep = 6 q2a1/clen = /LCLS/detectorPosition q2a1/fs = +0.0048825117x -0.9999880791y q2a1/ss = +0.9999880791x +0.0048825117y q2a1/corner_x = -427.557 q2a1/corner_y = -188.706 -q2a1/integr_radius = 3 q2a1/no_index = 0 @@ -102,13 +90,11 @@ q3a0/max_fs = 1357 q3a0/max_ss = 184 q3a0/badrow_direction = - q3a0/res = 9090.91 -q3a0/peak_sep = 6 q3a0/clen = /LCLS/detectorPosition q3a0/fs = +0.9999964833x +0.0026521713y q3a0/ss = -0.0026521713x +0.9999964833y q3a0/corner_x = -12.1295 q3a0/corner_y = -424.046 -q3a0/integr_radius = 3 q3a0/no_index = 0 @@ -118,13 +104,11 @@ q3a1/max_fs = 1551 q3a1/max_ss = 184 q3a1/badrow_direction = - q3a1/res = 9090.91 -q3a1/peak_sep = 6 q3a1/clen = /LCLS/detectorPosition q3a1/fs = +0.9999964833x +0.0026521713y q3a1/ss = -0.0026521713x +0.9999964833y q3a1/corner_x = 184.870 q3a1/corner_y = -423.523 -q3a1/integr_radius = 3 q3a1/no_index = 0 @@ -134,13 +118,11 @@ q0a2/max_fs = 193 q0a2/max_ss = 369 q0a2/badrow_direction = - q0a2/res = 9090.91 -q0a2/peak_sep = 6 q0a2/clen = /LCLS/detectorPosition q0a2/fs = -0.0003575958x +0.9999999404y q0a2/ss = -0.9999999404x -0.0003575958y q0a2/corner_x = 211.039 q0a2/corner_y = -10.9889 -q0a2/integr_radius = 3 q0a2/no_index = 0 @@ -150,13 +132,11 @@ q0a3/max_fs = 387 q0a3/max_ss = 369 q0a3/badrow_direction = - q0a3/res = 9090.91 -q0a3/peak_sep = 6 q0a3/clen = /LCLS/detectorPosition q0a3/fs = -0.0003575958x +0.9999999404y q0a3/ss = -0.9999999404x -0.0003575958y q0a3/corner_x = 210.969 q0a3/corner_y = 186.011 -q0a3/integr_radius = 3 q0a3/no_index = 0 @@ -166,13 +146,11 @@ q1a2/max_fs = 581 q1a2/max_ss = 369 q1a2/badrow_direction = - q1a2/res = 9090.91 -q1a2/peak_sep = 6 q1a2/clen = /LCLS/detectorPosition q1a2/fs = -0.9999999404x +0.0003117446y q1a2/ss = -0.0003117446x -0.9999999404y q1a2/corner_x = 13.3322 q1a2/corner_y = 208.973 -q1a2/integr_radius = 3 q1a2/no_index = 0 @@ -182,13 +160,11 @@ q1a3/max_fs = 775 q1a3/max_ss = 369 q1a3/badrow_direction = - q1a3/res = 9090.91 -q1a3/peak_sep = 6 q1a3/clen = /LCLS/detectorPosition q1a3/fs = -0.9999999404x +0.0003117446y q1a3/ss = -0.0003117446x -0.9999999404y q1a3/corner_x = -183.668 q1a3/corner_y = 209.034 -q1a3/integr_radius = 3 q1a3/no_index = 0 @@ -198,13 +174,11 @@ q2a2/max_fs = 969 q2a2/max_ss = 369 q2a2/badrow_direction = - q2a2/res = 9090.91 -q2a2/peak_sep = 6 q2a2/clen = /LCLS/detectorPosition q2a2/fs = -0.0004957085x -0.9999998808y q2a2/ss = +0.9999998808x -0.0004957085y q2a2/corner_x = -215.108 q2a2/corner_y = 8.41637 -q2a2/integr_radius = 3 q2a2/no_index = 0 @@ -214,13 +188,11 @@ q2a3/max_fs = 1163 q2a3/max_ss = 369 q2a3/badrow_direction = - q2a3/res = 9090.91 -q2a3/peak_sep = 6 q2a3/clen = /LCLS/detectorPosition q2a3/fs = -0.0004957085x -0.9999998808y q2a3/ss = +0.9999998808x -0.0004957085y q2a3/corner_x = -215.206 q2a3/corner_y = -188.584 -q2a3/integr_radius = 3 q2a3/no_index = 0 @@ -230,13 +202,11 @@ q3a2/max_fs = 1357 q3a2/max_ss = 369 q3a2/badrow_direction = - q3a2/res = 9090.91 -q3a2/peak_sep = 6 q3a2/clen = /LCLS/detectorPosition q3a2/fs = +1.0000000000x -0.0001447762y q3a2/ss = +0.0001447762x +1.0000000000y q3a2/corner_x = -12.1720 q3a2/corner_y = -210.466 -q3a2/integr_radius = 3 q3a2/no_index = 0 @@ -246,13 +216,11 @@ q3a3/max_fs = 1551 q3a3/max_ss = 369 q3a3/badrow_direction = - q3a3/res = 9090.91 -q3a3/peak_sep = 6 q3a3/clen = /LCLS/detectorPosition q3a3/fs = +1.0000000000x -0.0001447762y q3a3/ss = +0.0001447762x +1.0000000000y q3a3/corner_x = 184.828 q3a3/corner_y = -210.495 -q3a3/integr_radius = 3 q3a3/no_index = 0 @@ -262,13 +230,11 @@ q0a4/max_fs = 193 q0a4/max_ss = 554 q0a4/badrow_direction = - q0a4/res = 9090.91 -q0a4/peak_sep = 6 q0a4/clen = /LCLS/detectorPosition q0a4/fs = -0.9999362230x -0.0112929661y q0a4/ss = +0.0112929661x -0.9999362230y q0a4/corner_x = 840.468 q0a4/corner_y = 392.435 -q0a4/integr_radius = 3 q0a4/no_index = 0 @@ -278,13 +244,11 @@ q0a5/max_fs = 387 q0a5/max_ss = 554 q0a5/badrow_direction = - q0a5/res = 9090.91 -q0a5/peak_sep = 6 q0a5/clen = /LCLS/detectorPosition q0a5/fs = -0.9999362230x -0.0112929661y q0a5/ss = +0.0112929661x -0.9999362230y q0a5/corner_x = 643.481 q0a5/corner_y = 390.210 -q0a5/integr_radius = 3 q0a5/no_index = 1 @@ -294,13 +258,11 @@ q1a4/max_fs = 581 q1a4/max_ss = 554 q1a4/badrow_direction = - q1a4/res = 9090.91 -q1a4/peak_sep = 6 q1a4/clen = /LCLS/detectorPosition q1a4/fs = -0.0003113084x -0.9999999404y q1a4/ss = +0.9999999404x -0.0003113084y q1a4/corner_x = -387.060 q1a4/corner_y = 844.837 -q1a4/integr_radius = 3 q1a4/no_index = 0 @@ -310,13 +272,11 @@ q1a5/max_fs = 775 q1a5/max_ss = 554 q1a5/badrow_direction = - q1a5/res = 9090.91 -q1a5/peak_sep = 6 q1a5/clen = /LCLS/detectorPosition q1a5/fs = -0.0003113084x -0.9999999404y q1a5/ss = +0.9999999404x -0.0003113084y q1a5/corner_x = -387.121 q1a5/corner_y = 647.837 -q1a5/integr_radius = 3 q1a5/no_index = 0 @@ -326,13 +286,11 @@ q2a4/max_fs = 969 q2a4/max_ss = 554 q2a4/badrow_direction = - q2a4/res = 9090.91 -q2a4/peak_sep = 6 q2a4/clen = /LCLS/detectorPosition q2a4/fs = +0.9999818802x +0.0060196919y q2a4/ss = -0.0060196919x +0.9999818802y q2a4/corner_x = -849.683 q2a4/corner_y = -392.889 -q2a4/integr_radius = 3 q2a4/no_index = 0 @@ -342,13 +300,11 @@ q2a5/max_fs = 1163 q2a5/max_ss = 554 q2a5/badrow_direction = - q2a5/res = 9090.91 -q2a5/peak_sep = 6 q2a5/clen = /LCLS/detectorPosition q2a5/fs = +0.9999818802x +0.0060196919y q2a5/ss = -0.0060196919x +0.9999818802y q2a5/corner_x = -652.687 q2a5/corner_y = -391.703 -q2a5/integr_radius = 3 q2a5/no_index = 0 @@ -358,13 +314,11 @@ q3a4/max_fs = 1357 q3a4/max_ss = 554 q3a4/badrow_direction = - q3a4/res = 9090.91 -q3a4/peak_sep = 6 q3a4/clen = /LCLS/detectorPosition q3a4/fs = -0.0023373319x +0.9999972582y q3a4/ss = -0.9999972582x -0.0023373319y q3a4/corner_x = 388.452 q3a4/corner_y = -844.271 -q3a4/integr_radius = 3 q3a4/no_index = 1 @@ -374,13 +328,11 @@ q3a5/max_fs = 1551 q3a5/max_ss = 554 q3a5/badrow_direction = - q3a5/res = 9090.91 -q3a5/peak_sep = 6 q3a5/clen = /LCLS/detectorPosition q3a5/fs = -0.0023373319x +0.9999972582y q3a5/ss = -0.9999972582x -0.0023373319y q3a5/corner_x = 387.991 q3a5/corner_y = -647.271 -q3a5/integr_radius = 3 q3a5/no_index = 0 @@ -390,13 +342,11 @@ q0a6/max_fs = 193 q0a6/max_ss = 739 q0a6/badrow_direction = - q0a6/res = 9090.91 -q0a6/peak_sep = 6 q0a6/clen = /LCLS/detectorPosition q0a6/fs = -0.9999533892x -0.0096549187y q0a6/ss = +0.0096549187x -0.9999533892y q0a6/corner_x = 842.954 q0a6/corner_y = 182.508 -q0a6/integr_radius = 3 q0a6/no_index = 0 @@ -406,13 +356,11 @@ q0a7/max_fs = 387 q0a7/max_ss = 739 q0a7/badrow_direction = - q0a7/res = 9090.91 -q0a7/peak_sep = 6 q0a7/clen = /LCLS/detectorPosition q0a7/fs = -0.9999533892x -0.0096549187y q0a7/ss = +0.0096549187x -0.9999533892y q0a7/corner_x = 645.963 q0a7/corner_y = 180.606 -q0a7/integr_radius = 3 q0a7/no_index = 0 @@ -422,13 +370,11 @@ q1a6/max_fs = 581 q1a6/max_ss = 739 q1a6/badrow_direction = - q1a6/res = 9090.91 -q1a6/peak_sep = 6 q1a6/clen = /LCLS/detectorPosition q1a6/fs = +0.0007214849x -0.9999997616y q1a6/ss = +0.9999997616x +0.0007214849y q1a6/corner_x = -174.672 q1a6/corner_y = 844.923 -q1a6/integr_radius = 3 q1a6/no_index = 0 @@ -438,13 +384,11 @@ q1a7/max_fs = 775 q1a7/max_ss = 739 q1a7/badrow_direction = - q1a7/res = 9090.91 -q1a7/peak_sep = 6 q1a7/clen = /LCLS/detectorPosition q1a7/fs = +0.0007214849x -0.9999997616y q1a7/ss = +0.9999997616x +0.0007214849y q1a7/corner_x = -174.530 q1a7/corner_y = 647.923 -q1a7/integr_radius = 3 q1a7/no_index = 0 @@ -454,13 +398,11 @@ q2a6/max_fs = 969 q2a6/max_ss = 739 q2a6/badrow_direction = - q2a6/res = 9090.91 -q2a6/peak_sep = 6 q2a6/clen = /LCLS/detectorPosition q2a6/fs = +0.9999990463x +0.0013817062y q2a6/ss = -0.0013817062x +0.9999990463y q2a6/corner_x = -850.035 q2a6/corner_y = -179.939 -q2a6/integr_radius = 3 q2a6/no_index = 0 @@ -470,13 +412,11 @@ q2a7/max_fs = 1163 q2a7/max_ss = 739 q2a7/badrow_direction = - q2a7/res = 9090.91 -q2a7/peak_sep = 6 q2a7/clen = /LCLS/detectorPosition q2a7/fs = +0.9999990463x +0.0013817062y q2a7/ss = -0.0013817062x +0.9999990463y q2a7/corner_x = -653.035 q2a7/corner_y = -179.667 -q2a7/integr_radius = 3 q2a7/no_index = 0 @@ -486,13 +426,11 @@ q3a6/max_fs = 1357 q3a6/max_ss = 739 q3a6/badrow_direction = - q3a6/res = 9090.91 -q3a6/peak_sep = 6 q3a6/clen = /LCLS/detectorPosition q3a6/fs = -0.0021083837x +0.9999977946y q3a6/ss = -0.9999977946x -0.0021083837y q3a6/corner_x = 175.688 q3a6/corner_y = -844.681 -q3a6/integr_radius = 3 q3a6/no_index = 0 @@ -502,13 +440,11 @@ q3a7/max_fs = 1551 q3a7/max_ss = 739 q3a7/badrow_direction = - q3a7/res = 9090.91 -q3a7/peak_sep = 6 q3a7/clen = /LCLS/detectorPosition q3a7/fs = -0.0021083837x +0.9999977946y q3a7/ss = -0.9999977946x -0.0021083837y q3a7/corner_x = 175.273 q3a7/corner_y = -647.681 -q3a7/integr_radius = 3 q3a7/no_index = 1 @@ -518,13 +454,11 @@ q0a8/max_fs = 193 q0a8/max_ss = 924 q0a8/badrow_direction = - q0a8/res = 9090.91 -q0a8/peak_sep = 6 q0a8/clen = /LCLS/detectorPosition q0a8/fs = +0.0078456579x -0.9999692440y q0a8/ss = +0.9999692440x +0.0078456579y q0a8/corner_x = 440.576 q0a8/corner_y = 811.780 -q0a8/integr_radius = 3 q0a8/no_index = 0 @@ -534,13 +468,11 @@ q0a9/max_fs = 387 q0a9/max_ss = 924 q0a9/badrow_direction = - q0a9/res = 9090.91 -q0a9/peak_sep = 6 q0a9/clen = /LCLS/detectorPosition q0a9/fs = +0.0078456579x -0.9999692440y q0a9/ss = +0.9999692440x +0.0078456579y q0a9/corner_x = 442.122 q0a9/corner_y = 614.786 -q0a9/integr_radius = 3 q0a9/no_index = 0 @@ -550,13 +482,11 @@ q1a8/max_fs = 581 q1a8/max_ss = 924 q1a8/badrow_direction = - q1a8/res = 9090.91 -q1a8/peak_sep = 6 q1a8/clen = /LCLS/detectorPosition q1a8/fs = +0.9999817014x +0.0060460833y q1a8/ss = -0.0060460833x +0.9999817014y q1a8/corner_x = -808.912 q1a8/corner_y = 453.082 -q1a8/integr_radius = 3 q1a8/no_index = 0 @@ -566,13 +496,11 @@ q1a9/max_fs = 775 q1a9/max_ss = 924 q1a9/badrow_direction = - q1a9/res = 9090.91 -q1a9/peak_sep = 6 q1a9/clen = /LCLS/detectorPosition q1a9/fs = +0.9999817014x +0.0060460833y q1a9/ss = -0.0060460833x +0.9999817014y q1a9/corner_x = -611.915 q1a9/corner_y = 454.273 -q1a9/integr_radius = 3 q1a9/no_index = 0 @@ -582,13 +510,11 @@ q2a8/max_fs = 969 q2a8/max_ss = 924 q2a8/badrow_direction = - q2a8/res = 9090.91 -q2a8/peak_sep = 6 q2a8/clen = /LCLS/detectorPosition q2a8/fs = -0.0027005512x +0.9999963641y q2a8/ss = -0.9999963641x -0.0027005512y q2a8/corner_x = -451.888 q2a8/corner_y = -813.482 -q2a8/integr_radius = 3 q2a8/no_index = 0 @@ -598,13 +524,11 @@ q2a9/max_fs = 1163 q2a9/max_ss = 924 q2a9/badrow_direction = - q2a9/res = 9090.91 -q2a9/peak_sep = 6 q2a9/clen = /LCLS/detectorPosition q2a9/fs = -0.0027005512x +0.9999963641y q2a9/ss = -0.9999963641x -0.0027005512y q2a9/corner_x = -452.420 q2a9/corner_y = -616.482 -q2a9/integr_radius = 3 q2a9/no_index = 0 @@ -614,13 +538,11 @@ q3a8/max_fs = 1357 q3a8/max_ss = 924 q3a8/badrow_direction = - q3a8/res = 9090.91 -q3a8/peak_sep = 6 q3a8/clen = /LCLS/detectorPosition q3a8/fs = -0.9999983311x -0.0018213630y q3a8/ss = +0.0018213630x -0.9999983311y q3a8/corner_x = 806.687 q3a8/corner_y = -442.882 -q3a8/integr_radius = 3 q3a8/no_index = 0 @@ -630,13 +552,11 @@ q3a9/max_fs = 1551 q3a9/max_ss = 924 q3a9/badrow_direction = - q3a9/res = 9090.91 -q3a9/peak_sep = 6 q3a9/clen = /LCLS/detectorPosition q3a9/fs = -0.9999983311x -0.0018213630y q3a9/ss = +0.0018213630x -0.9999983311y q3a9/corner_x = 609.687 q3a9/corner_y = -443.241 -q3a9/integr_radius = 3 q3a9/no_index = 0 @@ -646,13 +566,11 @@ q0a10/max_fs = 193 q0a10/max_ss = 1109 q0a10/badrow_direction = - q0a10/res = 9090.91 -q0a10/peak_sep = 6 q0a10/clen = /LCLS/detectorPosition q0a10/fs = +0.0069182217x -0.9999760985y q0a10/ss = +0.9999760985x +0.0069182217y q0a10/corner_x = 653.083 q0a10/corner_y = 813.670 -q0a10/integr_radius = 3 q0a10/no_index = 0 @@ -662,13 +580,11 @@ q0a11/max_fs = 387 q0a11/max_ss = 1109 q0a11/badrow_direction = - q0a11/res = 9090.91 -q0a11/peak_sep = 6 q0a11/clen = /LCLS/detectorPosition q0a11/fs = +0.0069182217x -0.9999760985y q0a11/ss = +0.9999760985x +0.0069182217y q0a11/corner_x = 654.445 q0a11/corner_y = 616.674 -q0a11/integr_radius = 3 q0a11/no_index = 0 @@ -678,13 +594,11 @@ q1a10/max_fs = 581 q1a10/max_ss = 1109 q1a10/badrow_direction = - q1a10/res = 9090.91 -q1a10/peak_sep = 6 q1a10/clen = /LCLS/detectorPosition q1a10/fs = +0.9999817014x +0.0060461056y q1a10/ss = -0.0060461056x +0.9999817014y q1a10/corner_x = -808.912 q1a10/corner_y = 658.082 -q1a10/integr_radius = 3 q1a10/no_index = 0 @@ -694,13 +608,11 @@ q1a11/max_fs = 775 q1a11/max_ss = 1109 q1a11/badrow_direction = - q1a11/res = 9090.91 -q1a11/peak_sep = 6 q1a11/clen = /LCLS/detectorPosition q1a11/fs = +0.9999817014x +0.0060461056y q1a11/ss = -0.0060461056x +0.9999817014y q1a11/corner_x = -611.915 q1a11/corner_y = 659.273 -q1a11/integr_radius = 3 q1a11/no_index = 0 @@ -710,13 +622,11 @@ q2a10/max_fs = 969 q2a10/max_ss = 1109 q2a10/badrow_direction = - q2a10/res = 9090.91 -q2a10/peak_sep = 6 q2a10/clen = /LCLS/detectorPosition q2a10/fs = -0.0027005058x +0.9999963641y q2a10/ss = -0.9999963641x -0.0027005058y q2a10/corner_x = -656.888 q2a10/corner_y = -813.482 -q2a10/integr_radius = 3 q2a10/no_index = 0 @@ -726,13 +636,11 @@ q2a11/max_fs = 1163 q2a11/max_ss = 1109 q2a11/badrow_direction = - q2a11/res = 9090.91 -q2a11/peak_sep = 6 q2a11/clen = /LCLS/detectorPosition q2a11/fs = -0.0027005058x +0.9999963641y q2a11/ss = -0.9999963641x -0.0027005058y q2a11/corner_x = -657.420 q2a11/corner_y = -616.482 -q2a11/integr_radius = 3 q2a11/no_index = 0 @@ -742,13 +650,11 @@ q3a10/max_fs = 1357 q3a10/max_ss = 1109 q3a10/badrow_direction = - q3a10/res = 9090.91 -q3a10/peak_sep = 6 q3a10/clen = /LCLS/detectorPosition q3a10/fs = -0.9999980927x -0.0019562324y q3a10/ss = +0.0019562324x -0.9999980927y q3a10/corner_x = 806.906 q3a10/corner_y = -655.522 -q3a10/integr_radius = 3 q3a10/no_index = 0 @@ -758,13 +664,11 @@ q3a11/max_fs = 1551 q3a11/max_ss = 1109 q3a11/badrow_direction = - q3a11/res = 9090.91 -q3a11/peak_sep = 6 q3a11/clen = /LCLS/detectorPosition q3a11/fs = -0.9999980927x -0.0019562324y q3a11/ss = +0.0019562324x -0.9999980927y q3a11/corner_x = 609.906 q3a11/corner_y = -655.907 -q3a11/integr_radius = 3 q3a11/no_index = 0 @@ -774,13 +678,11 @@ q0a12/max_fs = 193 q0a12/max_ss = 1294 q0a12/badrow_direction = - q0a12/res = 9090.91 -q0a12/peak_sep = 6 q0a12/clen = /LCLS/detectorPosition q0a12/fs = -0.9999986887x -0.0016366633y q0a12/ss = +0.0016366633x -0.9999986887y q0a12/corner_x = 416.434 q0a12/corner_y = 791.587 -q0a12/integr_radius = 3 q0a12/no_index = 0 @@ -790,13 +692,11 @@ q0a13/max_fs = 387 q0a13/max_ss = 1294 q0a13/badrow_direction = - q0a13/res = 9090.91 -q0a13/peak_sep = 6 q0a13/clen = /LCLS/detectorPosition q0a13/fs = -0.9999986887x -0.0016366633y q0a13/ss = +0.0016366633x -0.9999986887y q0a13/corner_x = 219.435 q0a13/corner_y = 791.265 -q0a13/integr_radius = 3 q0a13/no_index = 0 @@ -806,13 +706,11 @@ q1a12/max_fs = 581 q1a12/max_ss = 1294 q1a12/badrow_direction = - q1a12/res = 9090.91 -q1a12/peak_sep = 6 q1a12/clen = /LCLS/detectorPosition q1a12/fs = +0.0016421415x -0.9999986291y q1a12/ss = +0.9999986291x +0.0016421415y q1a12/corner_x = -781.411 q1a12/corner_y = 419.856 -q1a12/integr_radius = 3 q1a12/no_index = 0 @@ -822,13 +720,11 @@ q1a13/max_fs = 775 q1a13/max_ss = 1294 q1a13/badrow_direction = - q1a13/res = 9090.91 -q1a13/peak_sep = 6 q1a13/clen = /LCLS/detectorPosition q1a13/fs = +0.0016421415x -0.9999986291y q1a13/ss = +0.9999986291x +0.0016421415y q1a13/corner_x = -781.088 q1a13/corner_y = 222.856 -q1a13/integr_radius = 3 q1a13/no_index = 0 @@ -838,13 +734,11 @@ q2a12/max_fs = 969 q2a12/max_ss = 1294 q2a12/badrow_direction = - q2a12/res = 9090.91 -q2a12/peak_sep = 6 q2a12/clen = /LCLS/detectorPosition q2a12/fs = +0.9999987483x -0.0015812991y q2a12/ss = +0.0015812991x +0.9999987483y q2a12/corner_x = -423.530 q2a12/corner_y = -793.420 -q2a12/integr_radius = 3 q2a12/no_index = 0 @@ -854,13 +748,11 @@ q2a13/max_fs = 1163 q2a13/max_ss = 1294 q2a13/badrow_direction = - q2a13/res = 9090.91 -q2a13/peak_sep = 6 q2a13/clen = /LCLS/detectorPosition q2a13/fs = +0.9999987483x -0.0015812991y q2a13/ss = +0.0015812991x +0.9999987483y q2a13/corner_x = -226.531 q2a13/corner_y = -793.732 -q2a13/integr_radius = 3 q2a13/no_index = 0 @@ -870,13 +762,11 @@ q3a12/max_fs = 1357 q3a12/max_ss = 1294 q3a12/badrow_direction = - q3a12/res = 9090.91 -q3a12/peak_sep = 6 q3a12/clen = /LCLS/detectorPosition q3a12/fs = +0.0000857039x +1.0000000000y q3a12/ss = -1.0000000000x +0.0000857039y q3a12/corner_x = 787.680 q3a12/corner_y = -418.886 -q3a12/integr_radius = 3 q3a12/no_index = 0 @@ -886,13 +776,11 @@ q3a13/max_fs = 1551 q3a13/max_ss = 1294 q3a13/badrow_direction = - q3a13/res = 9090.91 -q3a13/peak_sep = 6 q3a13/clen = /LCLS/detectorPosition q3a13/fs = +0.0000857039x +1.0000000000y q3a13/ss = -1.0000000000x +0.0000857039y q3a13/corner_x = 787.697 q3a13/corner_y = -221.886 -q3a13/integr_radius = 3 q3a13/no_index = 0 @@ -902,13 +790,11 @@ q0a14/max_fs = 193 q0a14/max_ss = 1479 q0a14/badrow_direction = - q0a14/res = 9090.91 -q0a14/peak_sep = 6 q0a14/clen = /LCLS/detectorPosition q0a14/fs = -0.9999981523x -0.0019349456y q0a14/ss = +0.0019349456x -0.9999981523y q0a14/corner_x = 416.424 q0a14/corner_y = 579.070 -q0a14/integr_radius = 3 q0a14/no_index = 0 @@ -918,13 +804,11 @@ q0a15/max_fs = 387 q0a15/max_ss = 1479 q0a15/badrow_direction = - q0a15/res = 9090.91 -q0a15/peak_sep = 6 q0a15/clen = /LCLS/detectorPosition q0a15/fs = -0.9999981523x -0.0019349456y q0a15/ss = +0.0019349456x -0.9999981523y q0a15/corner_x = 219.424 q0a15/corner_y = 578.689 -q0a15/integr_radius = 3 q0a15/no_index = 0 @@ -934,13 +818,11 @@ q1a14/max_fs = 581 q1a14/max_ss = 1479 q1a14/badrow_direction = - q1a14/res = 9090.91 -q1a14/peak_sep = 6 q1a14/clen = /LCLS/detectorPosition q1a14/fs = +0.0016421643x -0.9999986291y q1a14/ss = +0.9999986291x +0.0016421643y q1a14/corner_x = -576.411 q1a14/corner_y = 419.856 -q1a14/integr_radius = 3 q1a14/no_index = 0 @@ -950,13 +832,11 @@ q1a15/max_fs = 775 q1a15/max_ss = 1479 q1a15/badrow_direction = - q1a15/res = 9090.91 -q1a15/peak_sep = 6 q1a15/clen = /LCLS/detectorPosition q1a15/fs = +0.0016421643x -0.9999986291y q1a15/ss = +0.9999986291x +0.0016421643y q1a15/corner_x = -576.088 q1a15/corner_y = 222.856 -q1a15/integr_radius = 3 q1a15/no_index = 0 @@ -966,13 +846,11 @@ q2a14/max_fs = 969 q2a14/max_ss = 1479 q2a14/badrow_direction = - q2a14/res = 9090.91 -q2a14/peak_sep = 6 q2a14/clen = /LCLS/detectorPosition q2a14/fs = +0.9999768734x -0.0068050129y q2a14/ss = +0.0068050129x +0.9999768734y q2a14/corner_x = -423.430 q2a14/corner_y = -582.404 -q2a14/integr_radius = 3 q2a14/no_index = 0 @@ -982,13 +860,11 @@ q2a15/max_fs = 1163 q2a15/max_ss = 1479 q2a15/badrow_direction = - q2a15/res = 9090.91 -q2a15/peak_sep = 6 q2a15/clen = /LCLS/detectorPosition q2a15/fs = +0.9999768734x -0.0068050129y q2a15/ss = +0.0068050129x +0.9999768734y q2a15/corner_x = -226.435 q2a15/corner_y = -583.745 -q2a15/integr_radius = 3 q2a15/no_index = 0 @@ -998,13 +874,11 @@ q3a14/max_fs = 1357 q3a14/max_ss = 1479 q3a14/badrow_direction = - q3a14/res = 9090.91 -q3a14/peak_sep = 6 q3a14/clen = /LCLS/detectorPosition q3a14/fs = -0.0010058292x +0.9999995232y q3a14/ss = -0.9999995232x -0.0010058292y q3a14/corner_x = 575.673 q3a14/corner_y = -418.865 -q3a14/integr_radius = 3 q3a14/no_index = 0 @@ -1014,11 +888,9 @@ q3a15/max_fs = 1551 q3a15/max_ss = 1479 q3a15/badrow_direction = - q3a15/res = 9090.91 -q3a15/peak_sep = 6 q3a15/clen = /LCLS/detectorPosition q3a15/fs = -0.0010058292x +0.9999995232y q3a15/ss = -0.9999995232x -0.0010058292y q3a15/corner_x = 575.475 q3a15/corner_y = -221.866 -q3a15/integr_radius = 3 q3a15/no_index = 0 diff --git a/doc/examples/lcls-cxi-9keV.beam b/doc/examples/lcls-cxi-9keV.beam index bf4a32bd..b53c5166 100644 --- a/doc/examples/lcls-cxi-9keV.beam +++ b/doc/examples/lcls-cxi-9keV.beam @@ -14,3 +14,6 @@ beam/bandwidth = 0.001 ; Beam divergence in radians beam/divergence = 0.008 + +; Reciprocal space profile radius in m^-1 +profile_radius = 0.001e9 diff --git a/doc/examples/lcls-dec.beam b/doc/examples/lcls-dec.beam index f277b729..1f9fe3f6 100644 --- a/doc/examples/lcls-dec.beam +++ b/doc/examples/lcls-dec.beam @@ -14,3 +14,6 @@ beam/bandwidth = 0.001 ; Beam divergence in radians beam/divergence = 0.001 + +; Reciprocal space profile radius in m^-1 +profile_radius = 0.001e9 diff --git a/doc/examples/lcls-dec.geom b/doc/examples/lcls-dec.geom index ef6bcbb7..3ecf4b03 100644 --- a/doc/examples/lcls-dec.geom +++ b/doc/examples/lcls-dec.geom @@ -3,8 +3,6 @@ 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 adu_per_eV = 0.0835 upper/min_fs = 0 diff --git a/doc/examples/lcls-june-r0013-r0128.geom b/doc/examples/lcls-june-r0013-r0128.geom index ff1fab87..64790daa 100644 --- a/doc/examples/lcls-june-r0013-r0128.geom +++ b/doc/examples/lcls-june-r0013-r0128.geom @@ -3,8 +3,6 @@ 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 adu_per_eV = 0.01045 ; Upper panel (nearest the beam) diff --git a/doc/examples/lcls-june.beam b/doc/examples/lcls-june.beam index 30f05813..7d95c820 100644 --- a/doc/examples/lcls-june.beam +++ b/doc/examples/lcls-june.beam @@ -14,3 +14,6 @@ beam/bandwidth = 0.01 ; Beam divergence in radians beam/divergence = 0.0087 + +; Reciprocal space profile radius in m^-1 +profile_radius = 0.001e9 diff --git a/doc/examples/lcls-xpp-estimate.beam b/doc/examples/lcls-xpp-estimate.beam index d20d2809..ac4dd3c3 100644 --- a/doc/examples/lcls-xpp-estimate.beam +++ b/doc/examples/lcls-xpp-estimate.beam @@ -14,3 +14,6 @@ beam/bandwidth = 0.001 ; Beam divergence in radians beam/divergence = 0.001 + +; Reciprocal space profile radius in m^-1 +profile_radius = 0.001e9 diff --git a/doc/examples/lcls-xpp-estimate.geom b/doc/examples/lcls-xpp-estimate.geom index 7c4d21a8..d34dc3b3 100644 --- a/doc/examples/lcls-xpp-estimate.geom +++ b/doc/examples/lcls-xpp-estimate.geom @@ -9,5 +9,4 @@ 0/clen = 0.08 ; 8 cm camera length 0/res = 9090 ; 110 micron pixel size 0/badrow_direction = x -0/peak_sep = 4 0/adu_per_eV = 1.0 diff --git a/doc/examples/simple.geom b/doc/examples/simple.geom index 65769883..55dbd1cd 100644 --- a/doc/examples/simple.geom +++ b/doc/examples/simple.geom @@ -11,7 +11,6 @@ adu_per_eV = 1.0 0/ss = y 0/clen = 50.0e-3 0/res = 13333.3 ; 75 micron pixel size -0/peak_sep = 50 ; Lower panel 1/min_fs = 0 @@ -24,4 +23,3 @@ adu_per_eV = 1.0 1/ss = y 1/clen = 50.0e-3 1/res = 13333.3 ; 75 micron pixel size -1/peak_sep = 50 -- cgit v1.2.3