Use ADU per eV in geometry file, rather than ADU per photon in beam file

Conflicts:

	src/get_hkl.c
	tests/morphology_check.c

2 files changed, 5 insertions, 2 deletions

diff --git a/tests/gpu_sim_check.c b/tests/gpu_sim_check.c
index 4557b551..5b6f6da7 100644
--- a/tests/gpu_sim_check.c
+++ b/tests/gpu_sim_check.c
@@ -115,6 +115,7 @@ int main(int argc, char *argv[])
 	det->panels[0].cny = -512.0-sep;
 	det->panels[0].clen = 100.0e-3;
 	det->panels[0].res = 9090.91;
+	det->panels[0].adu_per_eV = 1.0;
 
 	det->panels[1].min_fs = 0;
 	det->panels[1].max_fs = 1023;
@@ -132,6 +133,7 @@ int main(int argc, char *argv[])
 	det->panels[1].cny = sep;
 	det->panels[1].clen = 100.0e-3;
 	det->panels[1].res = 9090.91;
+	det->panels[0].adu_per_eV = 1.0;
 
 	cpu_image.det = det;
 	gpu_image.det = det;
@@ -142,8 +144,6 @@ int main(int argc, char *argv[])
 	beam->photon_energy = 9000.0;
 	beam->bandwidth = 0.1 / 100.0;
 	beam->divergence = 0.0;
-	beam->dqe = 1.0;
-	beam->adu_per_photon = 1.0;
 	cpu_image.beam = beam;
 	gpu_image.beam = beam;
 
diff --git a/tests/integration_check.c b/tests/integration_check.c
index 1e439611..80a214d1 100644
--- a/tests/integration_check.c
+++ b/tests/integration_check.c
@@ -291,6 +291,8 @@ int main(int argc, char *argv[])
 
 	image.data = malloc(128*128*sizeof(float));
 	image.flags = NULL;
+	image.beam = NULL;
+	image.lambda = ph_eV_to_lambda(1000.0);
 
 	image.det = calloc(1, sizeof(struct detector));
 	image.det->n_panels = 1;
@@ -313,6 +315,7 @@ int main(int argc, char *argv[])
 	image.det->panels[0].clen = 1.0;
 	image.det->panels[0].res = 1.0;
 	image.det->panels[0].integr_radius = 10.0;
+	image.det->panels[0].adu_per_eV = 1.0;
 
 	image.width = 128;
 	image.height = 128;