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.

Sign up for GitHub

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 use esis.flights.f1.optics.primaries.materials.multilayer_design(). #7

Merged
merged 1 commit into from
Jul 20, 2024
Merged

Modified esis.flights.f1.optics.models.design_full() to use esis.flights.f1.optics.primaries.materials.multilayer_design(). #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions esis/flights/f1/optics/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import named_arrays as na
import optika
import esis
from . import primaries

__all__ = [
"design_full",
Expand Down Expand Up @@ -61,7 +62,7 @@ def design_full(
radius_primary_clear = 77.9 * u.mm
primary = esis.optics.PrimaryMirror(
sag=optika.sags.ParabolicSag(
focal_length=1000 * u.mm,
focal_length=-1000 * u.mm,
parameters_slope_error=optika.metrology.SlopeErrorParameters(
step_size=4 * u.mm,
kernel_size=2 * u.mm,
Expand All @@ -78,7 +79,7 @@ def design_full(
num_folds=8,
width_clear=2 * radius_primary_clear * cos_per_channel,
width_border=(83.7 * u.mm - radius_primary_clear) * cos_per_channel,
material=optika.materials.Mirror(),
material=primaries.materials.multilayer_design(),
translation=na.Cartesian3dVectorArray(
x=na.UniformUncertainScalarArray(
nominal=0 * u.mm,
Expand All @@ -98,7 +99,7 @@ def design_full(
translation=na.Cartesian3dVectorArray(
x=0 * u.mm,
y=0 * u.mm,
z=-(primary.sag.focal_length + 500 * u.mm),
z=primary.sag.focal_length - 500 * u.mm,
),
)

Expand All @@ -121,7 +122,7 @@ def design_full(
translation=na.Cartesian3dVectorArray(
x=primary.translation.x.copy(),
y=primary.translation.y.copy(),
z=-primary.sag.focal_length,
z=primary.sag.focal_length,
),
)

Expand Down Expand Up @@ -184,7 +185,7 @@ def design_full(
num_distribution=num_distribution,
),
z=na.UniformUncertainScalarArray(
nominal=-(primary.sag.focal_length + 374.7 * u.mm),
nominal=primary.sag.focal_length - 374.7 * u.mm,
width=error_grating_z,
num_distribution=num_distribution,
),
Expand Down
5 changes: 0 additions & 5 deletions esis/optics/_primary_mirrors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,6 @@ def radius_mechanical(self) -> u.Quantity | na.AbstractScalar:
def material(self) -> None | optika.materials.AbstractMaterial:
"""optical material of this component"""

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

@property
def surface(self) -> optika.surfaces.Surface:
return optika.surfaces.Surface(
Expand Down
Loading