diff --git a/studies/M1_Mirror/SAT3_Trajectory/1_setup/model/M1_Blank.prt b/studies/M1_Mirror/SAT3_Trajectory/1_setup/model/M1_Blank.prt index 430bf9f9..255b8a0f 100644 Binary files a/studies/M1_Mirror/SAT3_Trajectory/1_setup/model/M1_Blank.prt and b/studies/M1_Mirror/SAT3_Trajectory/1_setup/model/M1_Blank.prt differ diff --git a/studies/M1_Mirror/SAT3_Trajectory/1_setup/optimization_config.json b/studies/M1_Mirror/SAT3_Trajectory/1_setup/optimization_config.json index 56664c6a..8d275bef 100644 --- a/studies/M1_Mirror/SAT3_Trajectory/1_setup/optimization_config.json +++ b/studies/M1_Mirror/SAT3_Trajectory/1_setup/optimization_config.json @@ -29,7 +29,7 @@ "expression_name": "lateral_inner_angle", "min": 20.0, "max": 30.0, - "baseline": 26.79, + "baseline": 30.18, "units": "degrees", "enabled": true, "notes": "Inner lateral support angle" @@ -39,7 +39,7 @@ "expression_name": "lateral_outer_angle", "min": 11.0, "max": 17.0, - "baseline": 14.64, + "baseline": 15.09, "units": "degrees", "enabled": true, "notes": "Outer lateral support angle" @@ -47,29 +47,29 @@ { "name": "lateral_outer_pivot", "expression_name": "lateral_outer_pivot", - "min": 4, - "max": 9, - "baseline": 5.5, + "min": 4.0, + "max": 9.0, + "baseline": 6.036, "units": "mm", "enabled": true, - "notes": "Outer lateral pivot position" + "notes": "Outer lateral pivot position (computed: lateral_outer_u * lateral_outer_angle)" }, { "name": "lateral_inner_pivot", "expression_name": "lateral_inner_pivot", "min": 5.0, - "max": 11.0, - "baseline": 10.07, + "max": 13.0, + "baseline": 12.072, "units": "mm", "enabled": true, - "notes": "Inner lateral pivot position" + "notes": "Inner lateral pivot position (computed: lateral_inner_u * lateral_inner_angle)" }, { "name": "lateral_middle_pivot", "expression_name": "lateral_middle_pivot", "min": 12.0, "max": 25.0, - "baseline": 20.73, + "baseline": 14.0, "units": "mm", "enabled": true, "notes": "Middle lateral pivot position" @@ -77,9 +77,9 @@ { "name": "lateral_closeness", "expression_name": "lateral_closeness", - "min": 9.5, + "min": 5.0, "max": 12.5, - "baseline": 11.02, + "baseline": 7.89, "units": "mm", "enabled": true, "notes": "Lateral support closeness parameter" @@ -89,7 +89,7 @@ "expression_name": "whiffle_min", "min": 30.0, "max": 72.0, - "baseline": 40.55, + "baseline": 56.7, "units": "mm", "enabled": true, "notes": "Whiffle tree minimum radius" @@ -129,7 +129,7 @@ "expression_name": "inner_circular_rib_dia", "min": 480.0, "max": 620.0, - "baseline": 534.00, + "baseline": 537.86, "units": "mm", "enabled": false, "notes": "Inner circular rib diameter" diff --git a/studies/M1_Mirror/SAT3_Trajectory/README.md b/studies/M1_Mirror/SAT3_Trajectory/README.md index 3ea3efba..891a8553 100644 --- a/studies/M1_Mirror/SAT3_Trajectory/README.md +++ b/studies/M1_Mirror/SAT3_Trajectory/README.md @@ -31,19 +31,19 @@ First production implementation of the **Zernike Trajectory Method** for M1 mirr | Parameter | Min | Max | Baseline | Units | Category | |-----------|-----|-----|----------|-------|----------| -| lateral_inner_angle | 20.0 | 30.0 | 26.79 | deg | Lateral Support | -| lateral_outer_angle | 11.0 | 17.0 | 14.64 | deg | Lateral Support | -| lateral_outer_pivot | 4.0 | 9.0 | 5.5 | mm | Lateral Support | -| lateral_inner_pivot | 5.0 | 11.0 | 10.07 | mm | Lateral Support | -| lateral_middle_pivot | 12.0 | 25.0 | 20.73 | mm | Lateral Support | -| lateral_closeness | 9.5 | 12.5 | 11.02 | mm | Lateral Support | -| whiffle_min | 30.0 | 72.0 | 40.55 | mm | Whiffle Tree | +| lateral_inner_angle | 20.0 | 30.0 | 30.18 | deg | Lateral Support | +| lateral_outer_angle | 11.0 | 17.0 | 15.09 | deg | Lateral Support | +| lateral_outer_pivot | 4.0 | 9.0 | 6.036 | mm | Lateral Support | +| lateral_inner_pivot | 5.0 | 13.0 | 12.072 | mm | Lateral Support | +| lateral_middle_pivot | 12.0 | 25.0 | 14.0 | mm | Lateral Support | +| lateral_closeness | 5.0 | 12.5 | 7.89 | mm | Lateral Support | +| whiffle_min | 30.0 | 72.0 | 56.7 | mm | Whiffle Tree | | whiffle_outer_to_vertical | 60.0 | 80.0 | 75.67 | deg | Whiffle Tree | | whiffle_triangle_closeness | 50.0 | 80.0 | 60.00 | mm | Whiffle Tree | **Disabled (fixed at baseline):** - blank_backface_angle = 4.00 deg -- inner_circular_rib_dia = 534.00 mm +- inner_circular_rib_dia = 537.86 mm ### Optimizer Configuration - **Algorithm:** TPE (Tree-Parzen Estimator) diff --git a/studies/M1_Mirror/SAT3_Trajectory/STUDY_REPORT.md b/studies/M1_Mirror/SAT3_Trajectory/STUDY_REPORT.md index 05c70f26..85f36807 100644 --- a/studies/M1_Mirror/SAT3_Trajectory/STUDY_REPORT.md +++ b/studies/M1_Mirror/SAT3_Trajectory/STUDY_REPORT.md @@ -39,19 +39,19 @@ | Parameter | Best Value | Baseline | Delta | |-----------|------------|----------|-------| -| lateral_inner_angle | _pending_ deg | 26.79 deg | _pending_ | -| lateral_outer_angle | _pending_ deg | 14.64 deg | _pending_ | -| lateral_outer_pivot | _pending_ mm | 5.5 mm | _pending_ | -| lateral_inner_pivot | _pending_ mm | 10.07 mm | _pending_ | -| lateral_middle_pivot | _pending_ mm | 20.73 mm | _pending_ | -| lateral_closeness | _pending_ mm | 11.02 mm | _pending_ | -| whiffle_min | _pending_ mm | 40.55 mm | _pending_ | +| lateral_inner_angle | _pending_ deg | 30.18 deg | _pending_ | +| lateral_outer_angle | _pending_ deg | 15.09 deg | _pending_ | +| lateral_outer_pivot | _pending_ mm | 6.036 mm | _pending_ | +| lateral_inner_pivot | _pending_ mm | 12.072 mm | _pending_ | +| lateral_middle_pivot | _pending_ mm | 14.0 mm | _pending_ | +| lateral_closeness | _pending_ mm | 7.89 mm | _pending_ | +| whiffle_min | _pending_ mm | 56.7 mm | _pending_ | | whiffle_outer_to_vertical | _pending_ deg | 75.67 deg | _pending_ | | whiffle_triangle_closeness | _pending_ mm | 60.00 mm | _pending_ | **Fixed parameters (not optimized):** - blank_backface_angle = 4.00 deg -- inner_circular_rib_dia = 534.00 mm +- inner_circular_rib_dia = 537.86 mm ---