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

DM-40426: Add new LATISS filters collimator and cyl_lens, and new gratings holo4_001 and pinhole mask options. #467

Merged
merged 3 commits into from
Aug 18, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 32 additions & 1 deletion python/lsst/obs/lsst/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,41 @@ def addFilter(filter_dict, band, physical_filter):
band="z"),
FilterDefinition(physical_filter="SDSSy_65mm",
band="y"),
FilterDefinition(physical_filter="collimator",
band="white"),
FilterDefinition(physical_filter="cyl_lens",
band="white"),
)

# Form a new set of filter definitions from all the explicit gratings
_latiss_gratings = ("ronchi90lpmm", "ronchi170lpmm", "empty", "unknown", "holo4_003", "blue300lpmm_qn1")
_latiss_gratings = ("ronchi90lpmm",
"ronchi170lpmm",
"empty",
"unknown",
"holo4_003",
"blue300lpmm_qn1",
"holo4_001",
"pinhole_1_1000",
"pinhole_1_0500",
"pinhole_1_0200",
"pinhole_1_0100",
"pinhole_2_1_1000",
"pinhole_2_1_0500",
"pinhole_2_1_0200",
"pinhole_2_1_0100",
"pinhole_2_2_1000",
"pinhole_2_2_0500",
"pinhole_2_2_0200",
"pinhole_2_2_0100",
"pinhole_2_3_1000",
"pinhole_2_3_0500",
"pinhole_2_3_0200",
"pinhole_2_3_0100",
"pinhole_2_4_1000",
"pinhole_2_4_0500",
"pinhole_2_4_0200",
"pinhole_2_4_0100",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the gratings turning up in files with these names or is there a requirement to derive the names from multiple FITS headers in the metadata translator?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The gratings should be turning up in files with one of these names at a time.

To expand a bit, the plan is to install the pinhole mask into the grating stage instrument with one of these names depending on the pinhole configuration we setup outside of the instrument, before the mask is installed. We chose this list of names to cover all possible configurations as we expect it to change over time. However, that change is always done as part of a grating swap.

)

# Include the filters without the grating in case someone wants
# to retrieve a filter by an actual filter name
Expand Down