From 78917049b09ece78834d6309eb3f035e83537d1d Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 8 Jun 2020 14:18:13 +0200 Subject: Remove more references to old detector structure --- libcrystfel/src/geometry.c | 2 +- libcrystfel/src/image.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'libcrystfel/src') 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; } -- cgit v1.2.3