esbo_ds/ESBO-ETC
esbo_ds/ESBO-ETC
11
0
Fork 1
Code Issues 1 Pull Requests Releases 1 Wiki Activity

Bugfix: check photometric aperture shape parameter in any case

Browse Source
This commit is contained in:
Lukas Klass 2020-10-15 08:38:51 +02:00
parent 0b059aa33c
commit e7483f2d31
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
esbo_etc/classes/sensor/Imager.py
View File

@ -554,16 +554,16 @@ class Imager(ASensor):
if not hasattr(sensor, "photometric_aperture"): if not hasattr(sensor, "photometric_aperture"):
setattr(sensor, "photometric_aperture", Entry(shape=Entry(val="circle"), setattr(sensor, "photometric_aperture", Entry(shape=Entry(val="circle"),
contained_energy=Entry(val="FWHM"))) contained_energy=Entry(val="FWHM")))
if hasattr(sensor.photometric_aperture, "aperture_size"):
mes = sensor.photometric_aperture.aperture_size.check_quantity("val", u.pix)
if mes is not None:
return "photometric_aperture -> aperture_size: " + mes
else:
if not hasattr(sensor.photometric_aperture, "shape"): if not hasattr(sensor.photometric_aperture, "shape"):
return "Missing container 'shape'." return "Missing container 'shape'."
mes = sensor.photometric_aperture.shape.check_selection("val", ["square", "circle"]) mes = sensor.photometric_aperture.shape.check_selection("val", ["square", "circle"])
if mes is not None: if mes is not None:
return "photometric_aperture -> shape: " + mes return "photometric_aperture -> shape: " + mes
if hasattr(sensor.photometric_aperture, "aperture_size"):
mes = sensor.photometric_aperture.aperture_size.check_quantity("val", u.pix)
if mes is not None:
return "photometric_aperture -> aperture_size: " + mes
else:
if not hasattr(sensor.photometric_aperture, "contained_energy"): if not hasattr(sensor.photometric_aperture, "contained_energy"):
return "Missing container 'contained_energy'." return "Missing container 'contained_energy'."
mes = sensor.photometric_aperture.contained_energy.check_float("val") mes = sensor.photometric_aperture.contained_energy.check_float("val")