aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2011-02-11 22:36:16 -0800
committerThomas White <taw@physics.org>2012-02-22 15:27:14 +0100
commit94495fe2d0319c12061739f5a2d2762d08702075 (patch)
treece4f644a164bc9344d34c631d6873c94dfa83f93
parentcced355ae4a78b099aafdd6273ee7e7dbb438bca (diff)
indexamajig: Use beam parameters for integration
-rw-r--r--src/indexamajig.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c
index b3008232..9b8f66c0 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -76,7 +76,7 @@ struct static_index_args
int gpu_dev;
int peaks;
int cellr;
- double nominal_photon_energy;
+ struct beam_params *beam;
/* Output stream */
pthread_mutex_t *output_mutex; /* Protects the output stream */
@@ -317,6 +317,7 @@ static void process_image(void *pp, int cookie)
const unsigned char *flags = pargs->static_args.flags;
struct gpu_context *gctx = pargs->static_args.gctx;
const char *sym = pargs->static_args.sym;
+ const struct beam_params *beam = pargs->static_args.beam;
image.features = NULL;
image.data = NULL;
@@ -338,7 +339,7 @@ static void process_image(void *pp, int cookie)
}
hdf5_read(hdfile, &image, pargs->static_args.config_satcorr,
- pargs->static_args.nominal_photon_energy);
+ beam->photon_energy);
if ( config_cmfilter ) {
filter_cm(&image);
@@ -397,10 +398,14 @@ static void process_image(void *pp, int cookie)
RefList *reflections;
- //reflections = find_intersections(&image, image.indexed_cell,
- // 0);
- reflections = find_projected_peaks(&image, image.indexed_cell,
- 0, 0.1);
+ image.div = beam->divergence;
+ image.bw = beam->bandwidth;
+ image.profile_radius = 0.005e9;
+
+ reflections = find_intersections(&image, image.indexed_cell,
+ 0);
+ //reflections = find_projected_peaks(&image, image.indexed_cell,
+ // 0, 0.1);
output_intensities(&image, image.indexed_cell, reflections,
pargs->static_args.output_mutex,
@@ -888,7 +893,7 @@ int main(int argc, char *argv[])
qargs.static_args.peaks = peaks;
qargs.static_args.output_mutex = &output_mutex;
qargs.static_args.ofh = ofh;
- qargs.static_args.nominal_photon_energy = nominal_photon_energy;
+ qargs.static_args.beam = beam;
qargs.fh = fh;
qargs.prefix = prefix;