diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2010-09-30 17:55:17 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:00 +0100 |
| commit | b493440b312b1d08b3f70277fe9b78ce33a8e033 (patch) | |
| tree | 7a4aa4f0ba8dd423c433cfdeafdeeca4061e1107 /src/pattern_sim.c | |
| parent | 8679d7a1977239c98b0f296e9d5b71eb08e4434b (diff) | |
pattern_sim: Get image size from detector geometry
Diffstat (limited to 'src/pattern_sim.c')
| -rw-r--r-- | src/pattern_sim.c | 18 |
1 files changed, 9 insertions, 9 deletions
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 */ |