diff options
| author | Thomas White <taw@physics.org> | 2014-05-22 13:58:06 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2014-05-22 13:58:06 +0200 |
| commit | 97af6be432dee3eeb396ab015515ef3b3883c883 (patch) | |
| tree | e5da7dbfa9b63ad4d748399c79ec540e0984132c | |
| parent | 1ab22e9f2961ff6f674c58d56459922dbbfea8e7 (diff) | |
partialator: Load data more quickly
| -rw-r--r-- | src/partialator.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/partialator.c b/src/partialator.c index e6069057..3137a0c2 100644 --- a/src/partialator.c +++ b/src/partialator.c @@ -526,19 +526,11 @@ int main(int argc, char *argv[]) cur->div = NAN; cur->bw = NAN; cur->det = NULL; - if ( read_chunk(st, cur) != 0 ) { + if ( read_chunk_2(st, cur, STREAM_READ_REFLECTIONS + | STREAM_READ_UNITCELL) != 0 ) { break; } - /* Won't be needing this, if it exists */ - image_feature_list_free(cur->features); - cur->features = NULL; - cur->width = 0; - cur->height = 0; - cur->data = NULL; - cur->flags = NULL; - cur->beam = NULL; - if ( isnan(cur->div) || isnan(cur->bw) ) { ERROR("Chunk doesn't contain beam parameters.\n"); return 1; @@ -587,9 +579,12 @@ int main(int argc, char *argv[]) } - display_progress(n_images, n_crystals); + if ( n_images % 100 == 0 ) { + display_progress(n_images, n_crystals); + } } while ( 1 ); + display_progress(n_images, n_crystals); fprintf(stderr, "\n"); close_stream(st); |