Antoine/Atomizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(extractors): add annular aperture support to trajectory extractor

Browse Source
This commit is contained in:
Antoine
2026-01-29 17:39:47 +00:00
parent abdbe9a708
commit 7df18324b1
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
optimization_engine/extractors/extract_zernike_trajectory.py
View File

@@ -249,6 +249,7 @@ class ZernikeTrajectoryExtractor:
reference_angle: float = 20.0, reference_angle: float = 20.0,
unit: str = 'mm', unit: str = 'mm',
n_modes: int = DEFAULT_N_MODES, n_modes: int = DEFAULT_N_MODES,
inner_radius: Optional[float] = None, # Annular aperture inner radius (mm)
): ):
self.op2_path = Path(op2_file) self.op2_path = Path(op2_file)
self.focal_length = focal_length self.focal_length = focal_length
@@ -256,6 +257,7 @@ class ZernikeTrajectoryExtractor:
self.unit = unit self.unit = unit
self.nm_scale = UNIT_TO_NM.get(unit, 1e6) # Default mm -> nm self.nm_scale = UNIT_TO_NM.get(unit, 1e6) # Default mm -> nm
self.n_modes = n_modes self.n_modes = n_modes
self.inner_radius = inner_radius # For annular aperture
# Find geometry file # Find geometry file
if bdf_file: if bdf_file:
@@ -338,6 +340,18 @@ class ZernikeTrajectoryExtractor:
dy = disp[:, 1] dy = disp[:, 1]
dz = disp[:, 2] dz = disp[:, 2]
# Apply annular aperture mask if inner_radius specified
if self.inner_radius is not None:
r = np.sqrt(x**2 + y**2)
annular_mask = r >= self.inner_radius
x = x[annular_mask]
y = y[annular_mask]
z = z[annular_mask]
dx = dx[annular_mask]
dy = dy[annular_mask]
dz = dz[annular_mask]
node_ids = node_ids[annular_mask]
# Compute WFE (surface error * 2 for reflective surface) # Compute WFE (surface error * 2 for reflective surface)
# For now, use Z-displacement (can add OPD correction if focal_length provided) # For now, use Z-displacement (can add OPD correction if focal_length provided)
surface_error = dz # In original units (mm) surface_error = dz # In original units (mm)
@@ -542,6 +556,7 @@ def extract_zernike_trajectory(
focal_length: Optional[float] = None, focal_length: Optional[float] = None,
reference_angle: float = 20.0, reference_angle: float = 20.0,
unit: str = 'mm', unit: str = 'mm',
inner_radius: Optional[float] = None,
) -> Dict[str, Any]: ) -> Dict[str, Any]:
""" """
Extract Zernike trajectory metrics from OP2 file. Extract Zernike trajectory metrics from OP2 file.
@@ -556,6 +571,7 @@ def extract_zernike_trajectory(
focal_length: Parabola focal length for OPD correction (mm) focal_length: Parabola focal length for OPD correction (mm)
reference_angle: Reference angle (default 20°) reference_angle: Reference angle (default 20°)
unit: Displacement unit in OP2 ('mm', 'm', 'um', 'nm') unit: Displacement unit in OP2 ('mm', 'm', 'um', 'nm')
inner_radius: Inner radius for annular aperture (mm), excludes central hole
Returns: Returns:
Dict with trajectory analysis results including: Dict with trajectory analysis results including:
@@ -572,6 +588,7 @@ def extract_zernike_trajectory(
focal_length=focal_length, focal_length=focal_length,
reference_angle=reference_angle, reference_angle=reference_angle,
unit=unit, unit=unit,
inner_radius=inner_radius,
) )
return extractor.extract_trajectory(subcases=subcases, angles=angles) return extractor.extract_trajectory(subcases=subcases, angles=angles)