diff options
26 files changed, 30 insertions, 29 deletions
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 diff --git a/tests/ev_enum1.geom b/tests/ev_enum1.geom index 9189727f..0afc500c 100644 --- a/tests/ev_enum1.geom +++ b/tests/ev_enum1.geom @@ -1,4 +1,5 @@ photon_energy = 10000 eV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/dim0 = ss diff --git a/tests/ev_enum2.geom b/tests/ev_enum2.geom index ce0aeacc..c27fb49c 100644 --- a/tests/ev_enum2.geom +++ b/tests/ev_enum2.geom @@ -1,4 +1,5 @@ photon_energy = 10000 eV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/dim0 = % diff --git a/tests/ev_enum3.geom b/tests/ev_enum3.geom index 3a83848e..2e08f383 100644 --- a/tests/ev_enum3.geom +++ b/tests/ev_enum3.geom @@ -1,4 +1,5 @@ photon_energy = 10000 eV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/dim0 = ss diff --git a/tests/partialator_merge_check_1 b/tests/partialator_merge_check_1 index 4ed03785..221a9327 100755 --- a/tests/partialator_merge_check_1 +++ b/tests/partialator_merge_check_1 @@ -7,6 +7,7 @@ CrystFEL stream format 2.3 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn ----- Begin geometry file ----- photon_energy = 9000 eV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 0 panel/max_fs = 1023 @@ -15,7 +16,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/partialator_merge_check_2 b/tests/partialator_merge_check_2 index 2ebcd74e..e392b82e 100755 --- a/tests/partialator_merge_check_2 +++ b/tests/partialator_merge_check_2 @@ -7,6 +7,7 @@ CrystFEL stream format 2.3 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn ----- Begin geometry file ----- photon_energy = 9000 eV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 0 panel/max_fs = 1023 @@ -15,7 +16,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/partialator_merge_check_3 b/tests/partialator_merge_check_3 index 8c998258..9f5fa350 100755 --- a/tests/partialator_merge_check_3 +++ b/tests/partialator_merge_check_3 @@ -7,6 +7,7 @@ CrystFEL stream format 2.3 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn ----- Begin geometry file ----- photon_energy = 9000 eV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 0 panel/max_fs = 1023 @@ -15,7 +16,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/process_hkl_check_1 b/tests/process_hkl_check_1 index 7cd29335..464fd528 100755 --- a/tests/process_hkl_check_1 +++ b/tests/process_hkl_check_1 @@ -7,6 +7,7 @@ CrystFEL stream format 2.3 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn ----- Begin geometry file ----- photon_energy = 9000 eV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 0 panel/max_fs = 1023 @@ -15,7 +16,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/process_hkl_check_2 b/tests/process_hkl_check_2 index 1ce4bc3c..2a523d1b 100755 --- a/tests/process_hkl_check_2 +++ b/tests/process_hkl_check_2 @@ -7,6 +7,7 @@ CrystFEL stream format 2.3 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn ----- Begin geometry file ----- photon_energy = 9000 eV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 0 panel/max_fs = 1023 @@ -15,7 +16,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/process_hkl_check_3 b/tests/process_hkl_check_3 index 4e884ad2..2440ae79 100755 --- a/tests/process_hkl_check_3 +++ b/tests/process_hkl_check_3 @@ -7,6 +7,7 @@ CrystFEL stream format 2.3 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn ----- Begin geometry file ----- photon_energy = 9000 eV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 0 panel/max_fs = 1023 @@ -15,7 +16,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/process_hkl_check_4 b/tests/process_hkl_check_4 index bfca3b80..63048dd4 100755 --- a/tests/process_hkl_check_4 +++ b/tests/process_hkl_check_4 @@ -7,6 +7,7 @@ CrystFEL stream format 2.3 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn ----- Begin geometry file ----- photon_energy = 9000 eV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 0 panel/max_fs = 1023 @@ -15,7 +16,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/wavelength_geom1.geom b/tests/wavelength_geom1.geom index 280cc349..59567ecd 100644 --- a/tests/wavelength_geom1.geom +++ b/tests/wavelength_geom1.geom @@ -1,4 +1,5 @@ wavelength = /LCLS/wavelength m +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/wavelength_geom10.geom b/tests/wavelength_geom10.geom index f0d7ca96..2ad31d19 100644 --- a/tests/wavelength_geom10.geom +++ b/tests/wavelength_geom10.geom @@ -1,4 +1,5 @@ photon_energy = 9e3 eV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/wavelength_geom11.geom b/tests/wavelength_geom11.geom index d0a49612..873ba099 100644 --- a/tests/wavelength_geom11.geom +++ b/tests/wavelength_geom11.geom @@ -1,4 +1,5 @@ wavelength = 1.125 A +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/wavelength_geom12.geom b/tests/wavelength_geom12.geom index 81308932..832467c8 100644 --- a/tests/wavelength_geom12.geom +++ b/tests/wavelength_geom12.geom @@ -1,4 +1,5 @@ wavelength = 1.125e-10 m +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/wavelength_geom2.geom b/tests/wavelength_geom2.geom index 68d77ff2..911b62fb 100644 --- a/tests/wavelength_geom2.geom +++ b/tests/wavelength_geom2.geom @@ -1,4 +1,5 @@ photon_energy = /LCLS/photon_energy +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/wavelength_geom3.geom b/tests/wavelength_geom3.geom index 5d989d48..a3a540c6 100644 --- a/tests/wavelength_geom3.geom +++ b/tests/wavelength_geom3.geom @@ -1,4 +1,5 @@ photon_energy = /LCLS/photon_energyK keV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/wavelength_geom4.geom b/tests/wavelength_geom4.geom index e3a70045..d3e8fce8 100644 --- a/tests/wavelength_geom4.geom +++ b/tests/wavelength_geom4.geom @@ -1,4 +1,5 @@ electron_voltage = /LCLS/electron_energy2 kV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/wavelength_geom5.geom b/tests/wavelength_geom5.geom index bc5de6cf..13b02bef 100644 --- a/tests/wavelength_geom5.geom +++ b/tests/wavelength_geom5.geom @@ -1,4 +1,5 @@ electron_voltage = /LCLS/electron_energy V +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/wavelength_geom6.geom b/tests/wavelength_geom6.geom index da09f6cc..59b342c5 100644 --- a/tests/wavelength_geom6.geom +++ b/tests/wavelength_geom6.geom @@ -1,4 +1,5 @@ photon_energy = /LCLS/photon_energy eV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/wavelength_geom7.geom b/tests/wavelength_geom7.geom index c22f89e8..7756475f 100644 --- a/tests/wavelength_geom7.geom +++ b/tests/wavelength_geom7.geom @@ -1,4 +1,5 @@ photon_energy = 9000 +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/wavelength_geom8.geom b/tests/wavelength_geom8.geom index 4bcf2c98..f8b3a413 100644 --- a/tests/wavelength_geom8.geom +++ b/tests/wavelength_geom8.geom @@ -1,4 +1,5 @@ electron_voltage = 300 kV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array diff --git a/tests/wavelength_geom9.geom b/tests/wavelength_geom9.geom index 992c10a3..94394163 100644 --- a/tests/wavelength_geom9.geom +++ b/tests/wavelength_geom9.geom @@ -1,4 +1,5 @@ photon_energy = 9 keV +clen = 50 mm panel/min_fs = 0 panel/min_ss = 1 panel/max_fs = 0 @@ -7,7 +8,6 @@ panel/fs = x panel/ss = y panel/corner_x = -100 panel/corner_y = -100 -panel/clen = 50 mm panel/res = 1000000 panel/adu_per_photon = 1 panel/data = /data/data_array |