aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-09-08 16:00:27 +0200
committerThomas White <taw@physics.org>2020-09-08 16:16:48 +0200
commitb38aa96a8c10b0ba58342264ddbac26f854dfb33 (patch)
tree08d893765fb8351e00fbf9783950e1cc84393e68
parent70a7ad18ba3c5a1071b38222159c401704e6a2eb (diff)
Add integration radii to project
-rw-r--r--src/gui_project.c21
-rw-r--r--src/gui_project.h3
2 files changed, 24 insertions, 0 deletions
diff --git a/src/gui_project.c b/src/gui_project.c
index bdab54e3..e6a3746f 100644
--- a/src/gui_project.c
+++ b/src/gui_project.c
@@ -278,6 +278,18 @@ static void handle_var(const char *key, const char *val,
proj->indexing_params.push_res = parse_float(val);
}
+ if ( strcmp(key, "integration.ir_inn") == 0 ) {
+ proj->indexing_params.ir_inn = parse_float(val);
+ }
+
+ if ( strcmp(key, "integration.ir_mid") == 0 ) {
+ proj->indexing_params.ir_mid = parse_float(val);
+ }
+
+ if ( strcmp(key, "integration.ir_out") == 0 ) {
+ proj->indexing_params.ir_out = parse_float(val);
+ }
+
if ( strcmp(key, "show_peaks") == 0 ) {
proj->show_peaks = parse_int(val);
}
@@ -611,6 +623,12 @@ int save_project(struct crystfelproject *proj)
proj->indexing_params.overpredict);
fprintf(fh, "integration.push_res %f\n",
proj->indexing_params.push_res);
+ fprintf(fh, "integration.ir_inn %f\n",
+ proj->indexing_params.ir_inn);
+ fprintf(fh, "integration.ir_mid %f\n",
+ proj->indexing_params.ir_mid);
+ fprintf(fh, "integration.ir_out %f\n",
+ proj->indexing_params.ir_out);
fprintf(fh, "show_peaks %i\n", proj->show_peaks);
fprintf(fh, "show_refls %i\n", proj->show_refls);
@@ -718,6 +736,9 @@ void default_project(struct crystfelproject *proj)
proj->indexing_params.integration_method = strdup("rings");
proj->indexing_params.overpredict = 0;
proj->indexing_params.push_res = INFINITY;
+ proj->indexing_params.ir_inn = 4.0;
+ proj->indexing_params.ir_mid = 5.0;
+ proj->indexing_params.ir_out = 7.0;
proj->results = NULL;
proj->n_results = 0;
diff --git a/src/gui_project.h b/src/gui_project.h
index bcf261f8..7cd7145d 100644
--- a/src/gui_project.h
+++ b/src/gui_project.h
@@ -83,6 +83,9 @@ struct index_params {
char *integration_method;
int overpredict;
float push_res;
+ float ir_inn;
+ float ir_mid;
+ float ir_out;
};
struct crystfelproject;