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

Support for obstruction factor added

Browse Source
This commit is contained in:
Lukas Klass 2020-05-11 10:38:34 +02:00
parent 3637fa9492
commit ef825ec43b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esbo_etc/classes/psf/IPSF.py
View File

@ -10,7 +10,7 @@ class IPSF(ABC):
""" """
@abstractmethod @abstractmethod
def calcReducedObservationAngle(self, contained_energy: Union[str, int, float, u.Quantity], def calcReducedObservationAngle(self, contained_energy: Union[str, int, float, u.Quantity],
jitter_sigma: u.Quantity = None) -> u.Quantity: jitter_sigma: u.Quantity = None, obstruction: float = 0.0) -> u.Quantity:
""" """
Calculate the reduced observation angle in lambda / d_ap for the given contained energy. Calculate the reduced observation angle in lambda / d_ap for the given contained energy.
@ -20,6 +20,8 @@ class IPSF(ABC):
The percentage of energy to be contained within a circle with the diameter reduced observation angle. The percentage of energy to be contained within a circle with the diameter reduced observation angle.
jitter_sigma : Quantity jitter_sigma : Quantity
Sigma of the telescope's jitter in arcsec Sigma of the telescope's jitter in arcsec
obstruction : float
The central obstruction as ratio A_ob / A_ap
Returns Returns
------- -------

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

@ -67,7 +67,7 @@ class Zemax(IPSF):
# @u.quantity_input(jitter_sigma=u.arcsec) # @u.quantity_input(jitter_sigma=u.arcsec)
def calcReducedObservationAngle(self, contained_energy: Union[str, int, float, u.Quantity], def calcReducedObservationAngle(self, contained_energy: Union[str, int, float, u.Quantity],
jitter_sigma: u.Quantity = None) -> u.Quantity: jitter_sigma: u.Quantity = None, obstruction: float = 0.0) -> u.Quantity:
""" """
Calculate the reduced observation angle in lambda / d_ap for the given contained energy. Calculate the reduced observation angle in lambda / d_ap for the given contained energy.
@ -77,6 +77,8 @@ class Zemax(IPSF):
The percentage of energy to be contained within a circle with the diameter reduced observation angle. The percentage of energy to be contained within a circle with the diameter reduced observation angle.
jitter_sigma : Quantity jitter_sigma : Quantity
Sigma of the telescope's jitter in arcsec Sigma of the telescope's jitter in arcsec
obstruction : float
The central obstruction as ratio A_ob / A_ap
Returns Returns
------- -------