diff options
| author | Thomas White <taw@physics.org> | 2020-06-08 14:18:13 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-29 18:53:44 +0200 |
| commit | 78917049b09ece78834d6309eb3f035e83537d1d (patch) | |
| tree | 2978af9d4e9fd1fb5b94caa036bce1d7c6298f8f | |
| parent | 9aac978cbe89adc784aeb049f80bb465b80dfbc0 (diff) | |
Remove more references to old detector structure
| -rw-r--r-- | libcrystfel/src/geometry.c | 2 | ||||
| -rw-r--r-- | libcrystfel/src/image.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libcrystfel/src/geometry.c b/libcrystfel/src/geometry.c index b6ede348..8518d026 100644 --- a/libcrystfel/src/geometry.c +++ b/libcrystfel/src/geometry.c @@ -393,7 +393,7 @@ static Reflection *check_reflection(struct image *image, Crystal *cryst, /* otherwise, calculate position if we have a detector structure, and * if we don't then just make do with partiality calculation */ - if ( (image->det != NULL) && (updateme == NULL) ) { + if ( (image->detgeom != NULL) && (updateme == NULL) ) { double fs, ss; /* position on detector */ signed int p; /* panel number */ diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c index 57a73cbc..4b698534 100644 --- a/libcrystfel/src/image.c +++ b/libcrystfel/src/image.c @@ -581,8 +581,6 @@ void image_free(struct image *image) if ( image->detgeom != NULL ) { np = image->detgeom->n_panels; detgeom_free(image->detgeom); - } else if ( image->det != NULL ) { - np = image->det->n_panels; } else { np = 0; } |