aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel
diff options
context:
space:
mode:
authorHelen Ginn <helen@strubi.ox.ac.uk>2018-04-22 01:09:43 +0100
committerThomas White <taw@physics.org>2018-05-02 09:46:14 +0200
commit2c6b2bde551748616e0f25908bed6f790e700a5b (patch)
tree59799b6eb95572ccbc4c920dbfeefc3439d9b40e /libcrystfel
parent596cd5f5199367e7634e0568abe9dede854fefb8 (diff)
Remove some shouty messages
Diffstat (limited to 'libcrystfel')
-rw-r--r--libcrystfel/src/taketwo.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/libcrystfel/src/taketwo.c b/libcrystfel/src/taketwo.c
index add0b099..5d09a3a6 100644
--- a/libcrystfel/src/taketwo.c
+++ b/libcrystfel/src/taketwo.c
@@ -1144,12 +1144,14 @@ static int grow_network(gsl_matrix *rot, int obs_idx1, int obs_idx2,
*max_members = member_num;
}
+ /*
int n;
for (n = 0; n < member_num; n++)
{
STATUS("*");
}
STATUS("\n");
+ */
/* If member_num is high enough, we want to return a yes */
if ( member_num > cell->member_thresh ) break;
@@ -1170,7 +1172,6 @@ static int start_seed(int i, int j, int i_match, int j_match,
gsl_matrix **rotation, int *max_members,
struct TakeTwoCell *cell)
{
- STATUS("Start seed\n");
struct SpotVec *obs_vecs = cell->obs_vecs;
gsl_matrix *rot_mat;
@@ -1210,8 +1211,6 @@ static int find_seeds(struct TakeTwoCell *cell)
*/
int i, j;
- STATUS("Total vectors: %i\n", obs_vec_count);
-
for ( i=0; i<obs_vec_count; i++ ) {
for ( j=0; j<i; j++ ) {
@@ -1271,13 +1270,6 @@ static int find_seeds(struct TakeTwoCell *cell)
qsort(cell->seeds, cell->seed_count, sizeof(struct Seed), sort_seed_by_score);
- for (int i = 0; i < 10; i++)
- {
- struct Seed seed = cell->seeds[i];
- STATUS("%i %i %i %i %.3f\n", seed.idx1, seed.idx2,
- seed.obs1, seed.obs2, seed.score);
- }
-
return 1;
}
@@ -1538,7 +1530,6 @@ static int gen_observed_vecs(struct rvec *rlps, int rlp_count,
qsort(cell->obs_vecs, count, sizeof(struct SpotVec), compare_spot_vecs);
cell->obs_vec_count = count;
- STATUS("Generated observed vectors.\n");
return 1;
}
@@ -1728,7 +1719,6 @@ static UnitCell *run_taketwo(UnitCell *cell, const struct taketwo_options *opts,
if ( !success ) return NULL;
- STATUS("Find seeds\n");
find_seeds(&ttCell);
start_seeds(&solution, &ttCell);
@@ -1736,8 +1726,6 @@ static UnitCell *run_taketwo(UnitCell *cell, const struct taketwo_options *opts,
return NULL;
}
- STATUS("Returning something.\n");
-
result = transform_cell_gsl(cell, solution);
gsl_matrix_free(solution);
cleanup_taketwo_cell(&ttCell);