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

Bugfix: accept contained energy as percentage

Browse Source
This commit is contained in:
Lukas Klass 2020-05-11 13:51:08 +02:00
parent ef825ec43b
commit ce0ae58f29
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esbo_etc/classes/psf/Zemax.py
View File

@ -92,7 +92,7 @@ class Zemax(IPSF):
except ValueError: except ValueError:
error("Could not convert encircled energy to float.") error("Could not convert encircled energy to float.")
elif type(contained_energy) in [int, float]: elif type(contained_energy) in [int, float]:
contained_energy = contained_energy * u.dimensionless_unscaled contained_energy = contained_energy / 100 * u.dimensionless_unscaled
# Calculate the osf for the PSF based on the current resolution of the PSF # Calculate the osf for the PSF based on the current resolution of the PSF
psf_osf = np.ceil(max(self.__grid_delta) / (2 * self.__pixel_size / self.__osf)).value * 2 psf_osf = np.ceil(max(self.__grid_delta) / (2 * self.__pixel_size / self.__osf)).value * 2