aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-03-20 16:20:02 +0100
committerThomas White <taw@physics.org>2020-07-29 18:42:57 +0200
commit4bbec7864eaa1a3752717f69202d1a622aff5217 (patch)
treeff77053d503a5b0e22c3ef8e41fd6a9a99b8cff9 /libcrystfel
parent926267d69531e5d1f936231f4e01971e7f31b8e9 (diff)
hdf5_peak_location -> peak_list
Diffstat (limited to 'libcrystfel')
-rw-r--r--libcrystfel/src/datatemplate.c6
-rw-r--r--libcrystfel/src/datatemplate_priv.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/libcrystfel/src/datatemplate.c b/libcrystfel/src/datatemplate.c
index bff8eccf..282e61a6 100644
--- a/libcrystfel/src/datatemplate.c
+++ b/libcrystfel/src/datatemplate.c
@@ -642,6 +642,9 @@ static void parse_toplevel(DataTemplate *dt,
/* Will be expanded when image is loaded */
dt->wavelength_from = strdup(val);
+ } else if ( strcmp(key, "peak_list") == 0 ) {
+ dt->peak_list = strdup(val);
+
} else if ( strcmp(key, "photon_energy_bandwidth") == 0 ) {
double v;
char *end;
@@ -655,9 +658,6 @@ static void parse_toplevel(DataTemplate *dt,
} else if ( strcmp(key, "photon_energy_scale") == 0 ) {
dt->photon_energy_scale = atof(val);
- } else if ( strcmp(key, "peak_info_location") == 0 ) {
- dt->hdf5_peak_path = strdup(val);
-
} else if (strncmp(key, "rigid_group", 11) == 0
&& strncmp(key, "rigid_group_collection", 22) != 0 ) {
diff --git a/libcrystfel/src/datatemplate_priv.h b/libcrystfel/src/datatemplate_priv.h
index 4c25bb49..8b51931a 100644
--- a/libcrystfel/src/datatemplate_priv.h
+++ b/libcrystfel/src/datatemplate_priv.h
@@ -183,7 +183,7 @@ struct _datatemplate
int path_dim;
int dim_dim;
- char *hdf5_peak_path;
+ char *peak_list;
struct panel_template defaults; /* FIXME: Shouldn't be stored */
};