aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel
diff options
context:
space:
mode:
authorHelen Ginn <helen@strubi.ox.ac.uk>2018-04-22 01:39:52 +0100
committerThomas White <taw@physics.org>2018-05-02 09:46:14 +0200
commit8401b8ee23a80ad2258fac28fe7644c6f4b27976 (patch)
tree38acdbd8357fb5819b95f5c3807db11f5ec767e5 /libcrystfel
parent480d6349dc1c2f517e7fd653199f4952da367edf (diff)
Different limitations for making new seeds
Diffstat (limited to 'libcrystfel')
-rw-r--r--libcrystfel/src/taketwo.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/libcrystfel/src/taketwo.c b/libcrystfel/src/taketwo.c
index bc74a13e..93f348de 100644
--- a/libcrystfel/src/taketwo.c
+++ b/libcrystfel/src/taketwo.c
@@ -673,12 +673,6 @@ static int obs_vecs_match_angles(int her, int his,
for ( j=0; j<his_obs->match_num; j++ ) {
double score = 0;
- if (her_obs->matches[i].asym == 0 &&
- his_obs->matches[j].asym == 0)
- {
- continue;
- }
-
struct rvec *her_match = &her_obs->matches[i].vec;
struct rvec *his_match = &his_obs->matches[j].vec;
@@ -1214,14 +1208,21 @@ static int find_seeds(struct TakeTwoCell *cell)
int i, j;
for ( i=0; i<obs_vec_count; i++ ) {
+
for ( j=0; j<i; j++ ) {
+ /** Only check distances which are accumulatively less than
+ * the limit */
+ if (obs_vecs[j].distance + obs_vecs[i].distance >
+ MAX_RECIP_DISTANCE) {
+ continue;
+ }
+
/** Check to see if there is a shared spot - opportunity
* for optimisation by generating a look-up table
* by spot instead of by vector.
*/
int shared = obs_vecs_share_spot(&obs_vecs[i], &obs_vecs[j]);
-
if ( !shared ) continue;
/* cell vector index matches stored in i, j and total
@@ -1272,6 +1273,10 @@ static int find_seeds(struct TakeTwoCell *cell)
qsort(cell->seeds, cell->seed_count, sizeof(struct Seed), sort_seed_by_score);
+ if (cell->seed_count > 1000) {
+ cell->seed_count = 1000;
+ }
+
return 1;
}