From d9fc791021317d6823078a3f3779a79aa3bc84b4 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 6 Feb 2013 20:39:01 +0100 Subject: Fix process_hkl --- src/partial_sim.c | 5 +++++ src/process_hkl.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/partial_sim.c b/src/partial_sim.c index 502e7028..e48c51fa 100644 --- a/src/partial_sim.c +++ b/src/partial_sim.c @@ -287,6 +287,8 @@ static void run_job(void *vwargs, int cookie) /* Give a slightly incorrect cell in the stream */ mess_up_cell(cr, qargs->cnoise); + + image_add_crystal(&wargs->image, cr); } @@ -523,8 +525,11 @@ int main(int argc, char *argv[]) image.lambda = ph_en_to_lambda(eV_to_J(beam->photon_energy)); image.div = beam->divergence; image.bw = beam->bandwidth; + image.beam = beam; image.filename = malloc(256); image.copyme = NULL; + image.crystals = NULL; + image.n_crystals = 0; if ( random_intensities ) { full = reflist_new(); diff --git a/src/process_hkl.c b/src/process_hkl.c index e9a8daa5..4ba901e6 100644 --- a/src/process_hkl.c +++ b/src/process_hkl.c @@ -327,8 +327,6 @@ static int merge_all(Stream *st, RefList *model, RefList *reference, } while ( rval == 0 ); - if ( rval ) return 1; - for ( refl = first_refl(model, &iter); refl != NULL; refl = next_refl(refl, iter) ) -- cgit v1.2.3