diff options
author | Thomas White <taw@physics.org> | 2024-04-18 14:32:14 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2024-04-18 14:32:14 +0200 |
commit | 52bde38abbcb53d163355a71fc9e99332ffe3dee (patch) | |
tree | 54bf334103708bcbf0b821c583b06f66769edf22 /libcrystfel/src/crystfel-mille.c | |
parent | 536d1a563e5c93cbbefb3556ea897acaf8fa70ce (diff) | |
parent | 62a2fdee1b7e69a1fe1ecb58e286866c41b6bb81 (diff) |
Merge branch 'julia'
Diffstat (limited to 'libcrystfel/src/crystfel-mille.c')
-rw-r--r-- | libcrystfel/src/crystfel-mille.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libcrystfel/src/crystfel-mille.c b/libcrystfel/src/crystfel-mille.c index 8eacaa60..3d02e527 100644 --- a/libcrystfel/src/crystfel-mille.c +++ b/libcrystfel/src/crystfel-mille.c @@ -106,8 +106,8 @@ static void mille_add_measurement(Mille *m, new_max_entries *= 2; } - new_float_arr = realloc(m->float_arr, new_max_entries*sizeof(float)); - new_int_arr = realloc(m->int_arr, new_max_entries*sizeof(int)); + new_float_arr = cfrealloc(m->float_arr, new_max_entries*sizeof(float)); + new_int_arr = cfrealloc(m->int_arr, new_max_entries*sizeof(int)); if ( (new_float_arr == NULL) || (new_int_arr == NULL) ) return; m->float_arr = new_float_arr; @@ -266,17 +266,17 @@ void write_mille(Mille *mille, int n, UnitCell *cell, mille_add_measurement(mille, nl, local_gradients_fs, j, global_gradients_fs, labels, - fs_dev(&rps[i], image->detgeom), 0.22); + fs_dev(&rps[i], image->detgeom), 0.3); /* Add ss measurement */ mille_add_measurement(mille, nl, local_gradients_ss, j, global_gradients_ss, labels, - ss_dev(&rps[i], image->detgeom), 0.22); + ss_dev(&rps[i], image->detgeom), 0.3); /* Add excitation error "measurement" (local-only) */ mille_add_measurement(mille, nl, local_gradients_r, - 0, NULL, NULL, r_dev(&rps[i]), 1.0); + 0, NULL, NULL, r_dev(&rps[i]), 0.2); } } @@ -285,7 +285,7 @@ Mille *crystfel_mille_new(const char *outFileName) { Mille *m; - m = malloc(sizeof(Mille)); + m = cfmalloc(sizeof(Mille)); if ( m == NULL ) return NULL; m->max_entries = 0; @@ -296,7 +296,7 @@ Mille *crystfel_mille_new(const char *outFileName) m->fh = fopen(outFileName, "wb"); if ( m->fh == NULL ) { ERROR("Failed to open Mille file '%s'\n", outFileName); - free(m); + cffree(m); return NULL; } @@ -309,9 +309,9 @@ void crystfel_mille_free(Mille *m) { if ( m == NULL ) return; fclose(m->fh); - free(m->float_arr); - free(m->int_arr); - free(m); + cffree(m->float_arr); + cffree(m->int_arr); + cffree(m); } |