aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/fromfile.h
diff options
context:
space:
mode:
authorPascal Hogan-Lamarre <pascal.hogan@gmail.com>2020-09-16 02:45:55 -0400
committerPascal Hogan-Lamarre <pascal.hogan@gmail.com>2020-09-16 02:45:55 -0400
commit689d86d0937332aa8577329d007b0dd31a2b73c4 (patch)
tree008ac07fc1d766c1c3387680ca8ab3c6f16024f4 /libcrystfel/src/fromfile.h
parentb11033a649afff30254804d9035ee9ccb67f044d (diff)
cleaning, remove double statements
Diffstat (limited to 'libcrystfel/src/fromfile.h')
-rw-r--r--libcrystfel/src/fromfile.h32
1 files changed, 3 insertions, 29 deletions
diff --git a/libcrystfel/src/fromfile.h b/libcrystfel/src/fromfile.h
index dda976b5..29d31aee 100644
--- a/libcrystfel/src/fromfile.h
+++ b/libcrystfel/src/fromfile.h
@@ -27,40 +27,14 @@
#ifndef FROMFILE_H
#define FROMFILE_H
+struct fromfile_keys;
+struct fromfile_entries;
+struct fromfile_private;
#include "image.h"
#include "cell.h"
#include "uthash.h"
-/* There are 9 vector components,
- * 2 detector shifts, 1 profile radius,
- * 1 resolution limit */
-#define NPARAMS_PER_LINE 13
-/* The keys are the filename,
- * event path, event dim and crystal number */
-#define NKEYS_PER_LINE 4
-
-struct fromfile_private
-{
- UnitCell *cellTemplate;
- struct fromfile_entries *sol_hash;
-};
-
-struct fromfile_keys
-{
- char filename[100];
- char event_path[100];
- int event_dim;
- int crystal_number;
-};
-
-struct fromfile_entries
-{
- struct fromfile_keys key;
- float solution[NPARAMS_PER_LINE];
- UT_hash_handle hh;
-};
-
extern void print_struct(struct fromfile_entries *sol_hash);
extern void full_print_struct(struct fromfile_entries *sol_hash);