diff options
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -37,11 +37,11 @@ void main_do_reconstruction(ControlContext *ctx) { if ( ctx->cache_filename ) { - prealign_sum_stack(ctx); + prealign_sum_stack(ctx->images, ctx->have_centres); ctx->reflectionlist = cache_load(ctx->cache_filename); printf("Loading cached reflections from '%s'\n", ctx->cache_filename); } else if ( ctx->inputfiletype != INPUT_DRX ) { - prealign_sum_stack(ctx); + prealign_sum_stack(ctx->images, ctx->have_centres); mapping_create(ctx); } @@ -63,10 +63,9 @@ static gint main_method_window_response(GtkWidget *method_window, gint response, switch ( gtk_combo_box_get_active(GTK_COMBO_BOX(ctx->combo_peaksearch)) ) { case 0 : ctx->psmode = PEAKSEARCH_THRESHOLD; break; case 1 : ctx->psmode = PEAKSEARCH_ADAPTIVE_THRESHOLD; break; - case 2 : ctx->psmode = PEAKSEARCH_LSQ; break; - case 3 : ctx->psmode = PEAKSEARCH_ZAEFFERER; break; - case 4 : ctx->psmode = PEAKSEARCH_STAT; break; - case 5 : ctx->psmode = PEAKSEARCH_CACHED; break; + case 2 : ctx->psmode = PEAKSEARCH_ZAEFFERER; break; + case 3 : ctx->psmode = PEAKSEARCH_STAT; break; + case 4 : ctx->psmode = PEAKSEARCH_CACHED; break; default: ctx->psmode = PEAKSEARCH_NONE; break; /* This happens when reading from a cache file */ } @@ -112,7 +111,7 @@ static gint main_method_window_response(GtkWidget *method_window, gint response, static gint main_peaksearch_changed(GtkWidget *method_window, ControlContext *ctx) { - if ( gtk_combo_box_get_active(GTK_COMBO_BOX(ctx->combo_peaksearch)) == 5 ) { + if ( gtk_combo_box_get_active(GTK_COMBO_BOX(ctx->combo_peaksearch)) == 4 ) { gtk_widget_set_sensitive(GTK_WIDGET(ctx->cache_file_selector), TRUE); } else { gtk_widget_set_sensitive(GTK_WIDGET(ctx->cache_file_selector), FALSE); @@ -149,7 +148,6 @@ void main_method_dialog_open(ControlContext *ctx) { ctx->combo_peaksearch = gtk_combo_box_new_text(); gtk_combo_box_append_text(GTK_COMBO_BOX(ctx->combo_peaksearch), "Simple Thresholding"); gtk_combo_box_append_text(GTK_COMBO_BOX(ctx->combo_peaksearch), "Adaptive Thresholding"); - gtk_combo_box_append_text(GTK_COMBO_BOX(ctx->combo_peaksearch), "Least-Squares Fit"); gtk_combo_box_append_text(GTK_COMBO_BOX(ctx->combo_peaksearch), "Zaefferer Gradient Search"); gtk_combo_box_append_text(GTK_COMBO_BOX(ctx->combo_peaksearch), "Iterative Statistical Analysis"); gtk_combo_box_append_text(GTK_COMBO_BOX(ctx->combo_peaksearch), "Get From Cache File"); |