From 9ed0071d93ce9ae487224d9d712bf1df6e7efbf4 Mon Sep 17 00:00:00 2001 From: Roy Smart Date: Fri, 19 Jul 2024 19:36:04 -0600 Subject: [PATCH] Modified `esis.optics.AbstractDetector.surface` to use the new `optika.sensors.ImagingSensor` class --- esis/optics/_detectors.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/esis/optics/_detectors.py b/esis/optics/_detectors.py index b422024..ce1cb51 100644 --- a/esis/optics/_detectors.py +++ b/esis/optics/_detectors.py @@ -86,13 +86,14 @@ def clearance(self) -> u.Quantity | na.AbstractScalar: """minimum distance between this component and other components""" @property - def surface(self) -> optika.surfaces.Surface: - return optika.surfaces.Surface( + def surface(self) -> optika.sensors.ImagingSensor: + return optika.sensors.ImagingSensor( name="detector", - aperture=optika.apertures.RectangularAperture( - half_width=self.width_clear / 2, - active=False, - ), + width_pixel=self.width_pixels, + axis_pixel=na.Cartesian2dVectorArray("detector_x", "detector_y"), + num_pixel=self.shape_pixels, + timedelta_exposure=self.time_exposure, + material=optika.sensors.E2VCCDAIAMaterial(), aperture_mechanical=optika.apertures.RectangularAperture( half_width=self.width_mechanical / 2 ),