Skip to content

[03/29] Integrate the adopted upstream instrument baseline - #12

Open
baileyji wants to merge 69 commits into
dev_masterfrom
review/xs-03-upstream-baseline
Open

baileyji wants to merge 69 commits into
dev_masterfrom
review/xs-03-upstream-baseline

Conversation

@baileyji

@baileyji baileyji commented Oct 23, 2026 •

Copy link
Copy Markdown
Member

Merge the already-adopted IRDB baseline through 518f19b and retain the HAWKI default-mode and MOSAIC instrument-header repairs.

Part 03/29 of the Caltech review series. Review the diff against dev_master; the final destination is dev_master.

Merge after series 02: scopesim.

Review focus: HAWKI/default.yaml; MOSAIC/default.yaml; adopted upstream package changes.

Validation: Adopted merge ancestry and final package differences inspected. Retained HAWKI/MOSAIC executed evidence is included in series 26.

Source commits/snapshots: 518f19b, b2cb0c9, 72d360a (HAWKI), 8be3e2c.

Use a merge commit to preserve the stack ancestry and pinned commits. After this merges, retarget the next PR in this repository to its default branch. Do not squash/rebase an earlier stack entry without rebuilding its descendants and dependency pins.

astronomyk and others added 30 commits September 29, 2022 11:59
Update Master for compiliing new MICADO package
Mostly adaption following the off-by-one fix
Merge dev_master in preparation for release
Merge dev_master in preparation for release
Merge dev_master in preparation for release
Using best-guess values for MICADO, for METIS taken from:
AstarVienna#356 (comment)

Closes AstarVienna#356, except the LMS extended mode, which is not yet implemented
anyway (also set the status to concept for that).
The additional diff comes from stripped whitespace or newlines.
These allow the "full detector array" mode to be a "first-order-
configurable", i.e. can be set via `properties`, instead of having to
switch the `.include` on the two effects after instantiating the optical
train. The latter still works, so this is fully backwards compatible.
oczoske and others added 28 commits September 18, 2026 20:07
Doesn't work yet anyway...
Move notebook tests to separate conftest
Otherwise build hangs...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants