aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2012-03-09 15:58:15 +0100
committerThomas White <taw@physics.org>2012-03-09 15:58:15 +0100
commite38375cb0af448c3a7f3667594cf06d1117132c7 (patch)
treef23e49509f032a84d3f774846106755beea64160 /doc
parentbe33bf078a8ed1ec4c5439095285add97b823fd1 (diff)
Use ADU per eV in geometry file, rather than ADU per photon in beam file
Conflicts: src/get_hkl.c tests/morphology_check.c
Diffstat (limited to 'doc')
-rw-r--r--doc/examples/cspad-feb2011.geom2
-rw-r--r--doc/examples/lcls-cxi-9keV.beam7
-rw-r--r--doc/examples/lcls-dec.beam7
-rw-r--r--doc/examples/lcls-dec.geom1
-rw-r--r--doc/examples/lcls-june-r0013-r0128.geom1
-rw-r--r--doc/examples/lcls-june.beam7
-rw-r--r--doc/examples/lcls-xpp-estimate.beam7
-rw-r--r--doc/examples/lcls-xpp-estimate.geom1
-rw-r--r--doc/examples/simple.geom2
9 files changed, 7 insertions, 28 deletions
diff --git a/doc/examples/cspad-feb2011.geom b/doc/examples/cspad-feb2011.geom
index 7eaedda0..9ef79077 100644
--- a/doc/examples/cspad-feb2011.geom
+++ b/doc/examples/cspad-feb2011.geom
@@ -1,3 +1,5 @@
+adu_per_eV = 1.0
+
q0a0/min_fs = 0
q0a0/min_ss = 0
q0a0/max_fs = 193
diff --git a/doc/examples/lcls-cxi-9keV.beam b/doc/examples/lcls-cxi-9keV.beam
index fb1f94bb..bf4a32bd 100644
--- a/doc/examples/lcls-cxi-9keV.beam
+++ b/doc/examples/lcls-cxi-9keV.beam
@@ -14,10 +14,3 @@ beam/bandwidth = 0.001
; Beam divergence in radians
beam/divergence = 0.008
-
-
-; Detector's quantum efficiency
-detector/dqe = 1.0
-
-; Number of detector ADU per photon
-detector/adu_per_photon = 1.0
diff --git a/doc/examples/lcls-dec.beam b/doc/examples/lcls-dec.beam
index b52f30e1..f277b729 100644
--- a/doc/examples/lcls-dec.beam
+++ b/doc/examples/lcls-dec.beam
@@ -14,10 +14,3 @@ beam/bandwidth = 0.001
; Beam divergence in radians
beam/divergence = 0.001
-
-
-; Detector's quantum efficiency
-detector/dqe = 0.9
-
-; Number of detector ADU per photon
-detector/adu_per_photon = 167.0
diff --git a/doc/examples/lcls-dec.geom b/doc/examples/lcls-dec.geom
index f98b42fd..ef6bcbb7 100644
--- a/doc/examples/lcls-dec.geom
+++ b/doc/examples/lcls-dec.geom
@@ -5,6 +5,7 @@ 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
upper/max_fs = 1023
diff --git a/doc/examples/lcls-june-r0013-r0128.geom b/doc/examples/lcls-june-r0013-r0128.geom
index 7e4be71c..ff1fab87 100644
--- a/doc/examples/lcls-june-r0013-r0128.geom
+++ b/doc/examples/lcls-june-r0013-r0128.geom
@@ -5,6 +5,7 @@ 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)
0/min_fs = 0
diff --git a/doc/examples/lcls-june.beam b/doc/examples/lcls-june.beam
index 8a263024..30f05813 100644
--- a/doc/examples/lcls-june.beam
+++ b/doc/examples/lcls-june.beam
@@ -14,10 +14,3 @@ beam/bandwidth = 0.01
; Beam divergence in radians
beam/divergence = 0.0087
-
-
-; Detector's quantum efficiency
-detector/dqe = 0.9
-
-; Number of detector ADU per photon
-detector/adu_per_photon = 20.9
diff --git a/doc/examples/lcls-xpp-estimate.beam b/doc/examples/lcls-xpp-estimate.beam
index af9bb6ec..23ad560d 100644
--- a/doc/examples/lcls-xpp-estimate.beam
+++ b/doc/examples/lcls-xpp-estimate.beam
@@ -14,10 +14,3 @@ beam/bandwidth = 0.001
; Beam divergence in radians
beam/divergence = 0.001
-
-
-; Detector's quantum efficiency
-detector/dqe = 1.0
-
-; Number of detector ADU per photon
-detector/adu_per_photon = 1.0
diff --git a/doc/examples/lcls-xpp-estimate.geom b/doc/examples/lcls-xpp-estimate.geom
index c64c985a..7c4d21a8 100644
--- a/doc/examples/lcls-xpp-estimate.geom
+++ b/doc/examples/lcls-xpp-estimate.geom
@@ -10,3 +10,4 @@
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 62ee53db..65769883 100644
--- a/doc/examples/simple.geom
+++ b/doc/examples/simple.geom
@@ -1,3 +1,5 @@
+adu_per_eV = 1.0
+
; Upper panel
0/min_fs = 0
0/max_fs = 1023