Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified esis.flights.f1.optics.models.design_full() to include the grating efficiency model. #8

Merged
merged 1 commit into from
Jul 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion esis/flights/f1/optics/gratings/rulings/_rulings.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def ruling_design(
width=0.1,
num_distribution=num_distribution,
),
diffraction_order=1,
diffraction_order=-1,
)


Expand Down
7 changes: 4 additions & 3 deletions esis/flights/f1/optics/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import optika
import esis
from . import primaries
from . import gratings

__all__ = [
"design_full",
Expand Down Expand Up @@ -144,7 +145,7 @@ def design_full(
angle_output=8.057 * u.deg,
sag=optika.sags.SphericalSag(
radius=na.UniformUncertainScalarArray(
nominal=radius_grating,
nominal=-radius_grating,
width=radius_grating * error_radius_grating,
num_distribution=num_distribution,
),
Expand All @@ -161,8 +162,8 @@ def design_full(
period_max=2 * u.um,
),
),
material=optika.materials.Mirror(),
rulings=esis.flights.f1.optics.gratings.rulings.ruling_design(
material=gratings.materials.multilayer_design(),
rulings=gratings.rulings.ruling_design(
num_distribution=num_distribution,
),
num_folds=num_folds,
Expand Down
5 changes: 5 additions & 0 deletions esis/optics/_gratings.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ def width_border_inner(self) -> u.Quantity | na.AbstractScalar:
def clearance(self) -> u.Quantity | na.AbstractScalar:
"""minimum distance between adjacent physical gratings"""

@property
def transformation(self) -> na.transformations.AbstractTransformation:
rotation = na.transformations.Cartesian3dRotationX(180 * u.deg)
return super().transformation @ rotation

@property
def surface(self) -> optika.surfaces.Surface:
angle_aperture = self.angle_aperture
Expand Down
2 changes: 1 addition & 1 deletion esis/optics/_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def _wavelength_test_grid(self) -> na.AbstractScalar:
d = grating.rulings.spacing_(position).length
a = self.angle_grating_input
b = self.angle_grating_output
result = (np.sin(a) + np.sin(b)) * d / m
result = np.abs((np.sin(a) + np.sin(b)) * d / m)
return result.to(u.AA)

@property
Expand Down
Loading