diff options
author | Thomas White <taw@physics.org> | 2010-09-24 18:25:49 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2012-02-22 15:26:59 +0100 |
commit | 8bb2c7e3f5f4cfe9793256c009f62b0289607332 (patch) | |
tree | c00a292d572d268eb6a108105edb7154ab97deb4 /src/reintegrate.c | |
parent | 7b3e720829c62b63259b65ede4a4006e4417b32e (diff) |
Move stream handling functions to a separate module
Diffstat (limited to 'src/reintegrate.c')
-rw-r--r-- | src/reintegrate.c | 70 |
1 files changed, 1 insertions, 69 deletions
diff --git a/src/reintegrate.c b/src/reintegrate.c index af5f9e7a..3261ba72 100644 --- a/src/reintegrate.c +++ b/src/reintegrate.c @@ -28,6 +28,7 @@ #include "hdf5-file.h" #include "symmetry.h" #include "peaks.h" +#include "stream.h" #define MAX_THREADS (256) @@ -147,75 +148,6 @@ static void *worker_thread(void *pargsv) } -static UnitCell *read_orientation_matrix(FILE *fh) -{ - float u, v, w; - struct rvec as, bs, cs; - UnitCell *cell; - char line[1024]; - - if ( fgets(line, 1023, fh) == NULL ) return NULL; - if ( sscanf(line, "astar = %f %f %f", &u, &v, &w) != 3 ) { - ERROR("Couldn't read a-star\n"); - return NULL; - } - as.u = u*1e9; as.v = v*1e9; as.w = w*1e9; - if ( fgets(line, 1023, fh) == NULL ) return NULL; - if ( sscanf(line, "bstar = %f %f %f", &u, &v, &w) != 3 ) { - ERROR("Couldn't read b-star\n"); - return NULL; - } - bs.u = u*1e9; bs.v = v*1e9; bs.w = w*1e9; - if ( fgets(line, 1023, fh) == NULL ) return NULL; - if ( sscanf(line, "cstar = %f %f %f", &u, &v, &w) != 3 ) { - ERROR("Couldn't read c-star\n"); - return NULL; - } - cs.u = u*1e9; cs.v = v*1e9; cs.w = w*1e9; - cell = cell_new_from_axes(as, bs, cs); - - return cell; -} - - -static int find_chunk(FILE *fh, UnitCell **cell, char **filename) -{ - char line[1024]; - char *rval = NULL; - - do { - - rval = fgets(line, 1023, fh); - if ( rval == NULL ) continue; - - chomp(line); - - if ( strncmp(line, "Reflections from indexing", 25) != 0 ) { - continue; - } - - *filename = strdup(line+29); - - /* Skip two lines (while checking for errors) */ - rval = fgets(line, 1023, fh); - if ( rval == NULL ) continue; - rval = fgets(line, 1023, fh); - if ( rval == NULL ) continue; - - *cell = read_orientation_matrix(fh); - if ( *cell == NULL ) { - STATUS("Got filename but no cell for %s\n", *filename); - continue; - } - - return 0; - - } while ( rval != NULL ); - - return 1; -} - - static void integrate_all(int nthreads, struct detector *det, FILE *fh, int config_basename, const char *prefix) { |