diff options
| author | Thomas White <taw@physics.org> | 2010-10-29 17:11:20 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:04 +0100 |
| commit | 7b65c4e12698c8c7dedd55b0e0038421ed4db094 (patch) | |
| tree | d0c7f146ce44039bd5d3f83638c73f67f21c25e8 | |
| parent | 9895fe095c82519dbe22b81b449731362df8c26a (diff) | |
facetron: Use symmetry when merging
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 4 | ||||
| -rw-r--r-- | src/facetron.c | 11 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e2062d15..dc048526 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -60,7 +60,7 @@ calibrate_detector_LDADD = @LIBS@ facetron_SOURCES = facetron.c cell.c hdf5-file.c utils.c detector.c peaks.c \ image.c geometry.c reflections.c stream.c thread-pool.c \ - beam-parameters.c + beam-parameters.c symmetry.c facetron_LDADD = @LIBS@ cubeit_SOURCES = cubeit.c cell.c hdf5-file.c utils.c detector.c render.c \ diff --git a/src/Makefile.in b/src/Makefile.in index 54dff463..5805bef2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -79,7 +79,7 @@ am_facetron_OBJECTS = facetron.$(OBJEXT) cell.$(OBJEXT) \ hdf5-file.$(OBJEXT) utils.$(OBJEXT) detector.$(OBJEXT) \ peaks.$(OBJEXT) image.$(OBJEXT) geometry.$(OBJEXT) \ reflections.$(OBJEXT) stream.$(OBJEXT) thread-pool.$(OBJEXT) \ - beam-parameters.$(OBJEXT) + beam-parameters.$(OBJEXT) symmetry.$(OBJEXT) facetron_OBJECTS = $(am_facetron_OBJECTS) facetron_DEPENDENCIES = am_get_hkl_OBJECTS = get_hkl.$(OBJEXT) sfac.$(OBJEXT) cell.$(OBJEXT) \ @@ -313,7 +313,7 @@ calibrate_detector_SOURCES = calibrate_detector.c utils.c hdf5-file.c image.c \ calibrate_detector_LDADD = @LIBS@ facetron_SOURCES = facetron.c cell.c hdf5-file.c utils.c detector.c peaks.c \ image.c geometry.c reflections.c stream.c thread-pool.c \ - beam-parameters.c + beam-parameters.c symmetry.c facetron_LDADD = @LIBS@ cubeit_SOURCES = cubeit.c cell.c hdf5-file.c utils.c detector.c render.c \ diff --git a/src/facetron.c b/src/facetron.c index 806ce54f..c4470411 100644 --- a/src/facetron.c +++ b/src/facetron.c @@ -121,6 +121,7 @@ static void integrate_image(int mytask, void *tasks) for ( j=0; j<n; j++ ) { signed int h, k, l; + signed int ha, ka, la; float i_partial; float xc, yc; float i_full_est; @@ -143,11 +144,13 @@ static void integrate_image(int mytask, void *tasks) i_full_est = i_partial * spots[j].p; + get_asymm(h, k, l, &ha, &ka, &la, pargs->sym); + pthread_mutex_lock(pargs->list_lock); - integrate_intensity(pargs->i_full, h, k, l, i_full_est); - integrate_count(pargs->cts, h, k, l, 1); - if ( !find_item(pargs->obs, h, k, l) ) { - add_item(pargs->obs, h, k, l); + integrate_intensity(pargs->i_full, ha, ka, la, i_full_est); + integrate_count(pargs->cts, ha, ka, la, 1); + if ( !find_item(pargs->obs, ha, ka, la) ) { + add_item(pargs->obs, ha, ka, la); } pthread_mutex_unlock(pargs->list_lock); |