diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2012-07-02 09:44:01 +0200 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2012-07-02 09:44:01 +0200 |
| commit | 81d0cc926576519536d89af8f74272b00acd4fd5 (patch) | |
| tree | 41829ab0e2b7461446d1bad657cef44fad2ebde5 /libcrystfel/src/detector.h | |
| parent | a4ffb65ff4da923aabdb107cdaf59fccba30b409 (diff) | |
| parent | d7cacb7871a7d49057453b768e420dfb0ab52077 (diff) | |
Merge branch 'master' into tom/speed
Conflicts:
libcrystfel/src/peaks.c
src/indexamajig.c
Diffstat (limited to 'libcrystfel/src/detector.h')
| -rw-r--r-- | libcrystfel/src/detector.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libcrystfel/src/detector.h b/libcrystfel/src/detector.h index 2b4ac5c6..b740965c 100644 --- a/libcrystfel/src/detector.h +++ b/libcrystfel/src/detector.h @@ -62,7 +62,6 @@ struct panel double res; /* Resolution in pixels per metre */ char badrow; /* 'x' or 'y' */ int no_index; /* Don't index peaks in this panel if non-zero */ - double peak_sep; /* Characteristic peak separation */ char *rigid_group; /* Rigid group, or -1 for none */ double adu_per_eV; /* Number of ADU per eV */ double max_adu; /* Treat pixel as unreliable if higher than this */ |