aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/beam-parameters.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2012-12-14 11:51:57 +0100
committerThomas White <taw@physics.org>2012-12-14 11:59:23 +0100
commitb22b9de18152c917d4e9f733c41402d9935ae93d (patch)
treece3019e93ef0c40e5d6988956bb1f1b894540847 /libcrystfel/src/beam-parameters.c
parente745af481e176834e804b2eec59b7170e260ce81 (diff)
Beam and detector geometry don't need to be copied
The did when this was all done with threads, but with separate processes each worker has its own copy of the structure already. It can be updated after every image and freed at the end.
Diffstat (limited to 'libcrystfel/src/beam-parameters.c')
-rw-r--r--libcrystfel/src/beam-parameters.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/libcrystfel/src/beam-parameters.c b/libcrystfel/src/beam-parameters.c
index 2236fddb..617f9061 100644
--- a/libcrystfel/src/beam-parameters.c
+++ b/libcrystfel/src/beam-parameters.c
@@ -149,11 +149,17 @@ struct beam_params *get_beam_parameters(const char *filename)
return b;
}
-void fill_in_beamParam(struct beam_params *beam, struct hdfile *f)
+
+void free_beam_parameters(struct beam_params *beam)
+{
+ free(beam->photon_energy_from);
+ free(beam);
+}
+
+
+void fill_in_beam_parameters(struct beam_params *beam, struct hdfile *f)
{
if ( beam->photon_energy_from != NULL ) {
- beam->photon_energy = get_value(f, beam->photon_energy_from );
- free(beam->photon_energy_from);
- beam->photon_energy_from = NULL;
+ beam->photon_energy = get_value(f, beam->photon_energy_from);
}
}