diff options
| author | Thomas White <taw@physics.org> | 2015-02-20 15:17:52 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2015-02-20 15:18:46 +0100 |
| commit | ffc7de490021605d1b818ae2917146dad5a1cb2c (patch) | |
| tree | 5a8e4dec179466a54b0f6a393d467b162e388e3c /libcrystfel | |
| parent | a388a84d3377812332194c134e404c94d20c7706 (diff) | |
get_value() -> hdfile_get_value()
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/src/detector.c | 4 | ||||
| -rw-r--r-- | libcrystfel/src/hdf5-file.c | 14 | ||||
| -rw-r--r-- | libcrystfel/src/hdf5-file.h | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c index 635aa5e2..4d1a15e5 100644 --- a/libcrystfel/src/detector.c +++ b/libcrystfel/src/detector.c @@ -568,8 +568,8 @@ void fill_in_values(struct detector *det, struct hdfile *f, struct event* ev) double val; int r; - r = get_value(f, p->clen_from, ev, &val, - H5T_NATIVE_DOUBLE); + r = hdfile_get_value(f, p->clen_from, ev, &val, + H5T_NATIVE_DOUBLE); if ( r ) { ERROR("Failed to read '%s'\n", p->clen_from); } else { diff --git a/libcrystfel/src/hdf5-file.c b/libcrystfel/src/hdf5-file.c index 5f34a3c8..5ac6e9c9 100644 --- a/libcrystfel/src/hdf5-file.c +++ b/libcrystfel/src/hdf5-file.c @@ -1335,7 +1335,7 @@ static int get_ev_based_value(struct hdfile *f, const char *name, } -int get_value(struct hdfile *f, const char *name, +int hdfile_get_value(struct hdfile *f, const char *name, struct event *ev, void *val, hid_t memtype) { if ( ev == NULL ) { @@ -1360,8 +1360,8 @@ void fill_in_beam_parameters(struct beam_params *beam, struct hdfile *f, int r; - r = get_value(f, beam->photon_energy_from, ev, &eV, - H5T_NATIVE_DOUBLE); + r = hdfile_get_value(f, beam->photon_energy_from, ev, &eV, + H5T_NATIVE_DOUBLE); if ( r ) { ERROR("Failed to read '%s'\n", beam->photon_energy_from); @@ -1938,8 +1938,8 @@ char *hdfile_get_string_value(struct hdfile *f, const char *name, switch ( class ) { case H5T_FLOAT : - r = get_value(f, subst_name, ev, &buf_f, - H5T_NATIVE_DOUBLE); + r = hdfile_get_value(f, subst_name, ev, &buf_f, + H5T_NATIVE_DOUBLE); if ( r == 0 ) { tmp = malloc(256); snprintf(tmp, 255, "%f", buf_f); @@ -1947,8 +1947,8 @@ char *hdfile_get_string_value(struct hdfile *f, const char *name, break; case H5T_INTEGER : - r = get_value(f, subst_name, ev, &buf_i, - H5T_NATIVE_INT); + r = hdfile_get_value(f, subst_name, ev, &buf_i, + H5T_NATIVE_INT); if ( r == 0 ) { tmp = malloc(256); snprintf(tmp, 255, "%d", buf_i); diff --git a/libcrystfel/src/hdf5-file.h b/libcrystfel/src/hdf5-file.h index 721c1eea..8c89eb93 100644 --- a/libcrystfel/src/hdf5-file.h +++ b/libcrystfel/src/hdf5-file.h @@ -76,9 +76,6 @@ extern char **hdfile_read_group(struct hdfile *f, int *n, const char *parent, extern int hdfile_set_first_image(struct hdfile *f, const char *group); extern void hdfile_close(struct hdfile *f); -extern int hdfile_is_scalar(struct hdfile *f, const char *name, int verbose); -char *hdfile_get_string_value(struct hdfile *f, const char *name, - struct event* ev); extern int get_peaks(struct image *image, struct hdfile *f, const char *p); extern int get_peaks_cxi(struct image *image, struct hdfile *f, const char *p, @@ -95,8 +92,11 @@ extern void add_copy_hdf5_field(struct copy_hdf5_field *copyme, extern struct event_list *fill_event_list(struct hdfile* hdfile, struct detector* det); -extern int get_value(struct hdfile *f, const char *name, - struct event *ev, void *val, hid_t memtype); +extern int hdfile_get_value(struct hdfile *f, const char *name, + struct event *ev, void *val, hid_t memtype); +extern int hdfile_is_scalar(struct hdfile *f, const char *name, int verbose); +extern char *hdfile_get_string_value(struct hdfile *f, const char *name, + struct event *ev); #ifdef __cplusplus } |