From b493440b312b1d08b3f70277fe9b78ce33a8e033 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 30 Sep 2010 17:55:17 +0200 Subject: pattern_sim: Get image size from detector geometry --- src/pattern_sim.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/pattern_sim.c') diff --git a/src/pattern_sim.c b/src/pattern_sim.c index d39dea7b..371a4ef5 100644 --- a/src/pattern_sim.c +++ b/src/pattern_sim.c @@ -338,9 +338,16 @@ int main(int argc, char *argv[]) delete_items(items); } + image.det = get_detector_geometry(geometry); + if ( image.det == NULL ) { + ERROR("Failed to read detector geometry from '%s'\n", geometry); + return 1; + } + free(geometry); + /* Define image parameters */ - image.width = 1024; - image.height = 1024; + image.width = image.det->max_x + 1; + image.height = image.det->max_y + 1; image.lambda = ph_en_to_lambda(eV_to_J(PHOTON_ENERGY)); /* Wavelength */ cell = load_cell_from_pdb(filename); if ( cell == NULL ) { @@ -352,13 +359,6 @@ int main(int argc, char *argv[]) image.f0 = 1.0; image.f0_available = 1; - image.det = get_detector_geometry(geometry); - if ( image.det == NULL ) { - ERROR("Failed to read detector geometry from '%s'\n", geometry); - return 1; - } - free(geometry); - powder = calloc(image.width*image.height, sizeof(*powder)); /* Splurge a few useful numbers */ -- cgit v1.2.3