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

Tickets/DM-47497 Adding CBP to MTCalsys #177

Draft
wants to merge 10 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions doc/news/DM-47497.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add CBP to MTCalsys.
22 changes: 21 additions & 1 deletion python/lsst/ts/observatory/control/data/mtcalsys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,28 @@ laser_functional:
use_camera: false
optical_configuration: SCU
wavelength: 500.0
use_electrometer: false
use_flatfieldelectrometer: false
use_fiberspectrograph_red: false
use_fiberspectrograph_blue: false
exposure_times:
- 15.0

cbp_calibration:
calib_type: Mono
use_cbp: true
use_camera: false
wavelength: 700
wavelength_width: 800
wavelength_resolution: 50
use_flatfieldelectrometer: false
use_cbpelectrometer: true
Copy link
Contributor

Choose a reason for hiding this comment

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

I suppose we should rename the other electrometer to be flatfieldelectrometer or something like that.

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, use_electrometer is required currently. You'll have to add these two new ones to mtcalsys_schema.yaml

use_cbpcalelectrometer: true
use_fiberspectrograph_red: false
use_fiberspectrograph_blue: false
electrometer_integration_time: 0.001
electrometer_mode: CHARGE
electrometer_range: 0.000002
laser_mode: 2
optical_configuration: F1_SCU
exposure_times:
- 30.0
42 changes: 39 additions & 3 deletions python/lsst/ts/observatory/control/data/mtcalsys_schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,22 @@ properties:
focus the laser light from the fiber.
type: number
default: 15.380
use_electrometer:
description: Identifies if the electrometer will be used in the exposure.
use_cbp:
description: Identifies if the CBP will be used.
type: boolean
default: false
use_flatfieldelectrometer:
description: Identifies if the flatfield electrometer will be used in the exposure.
type: boolean
default: true
use_cbpelectrometer:
description: Identifies if the cbp electrometer will be used in the exposure.
type: boolean
default: false
use_cbpcalelectrometer:
description: Identifies if the cbpcal electrometer will be used in the exposure.
type: boolean
default: false
use_fiberspectrograph_red:
description: >-
Identifies if the fiberspectrograph for red color will be used in the
Expand Down Expand Up @@ -138,11 +150,35 @@ properties:
- F2_SCU
- F2_NO_SCU
- F1_NO_SCU
cbp_elevation:
description: CBP elevation in degrees.
type: number
default: 0
cbp_azimuth:
description: CBP azimuth in degrees.
type: number
default: 0
cbp_mask:
description: CBP azimuth in degrees.
type: integer
default: 3
minimum: 1
maximum: 5
cbp_rotation:
description: CBP mask rotator angle in degrees.
type: number
default: 0
cbp_focus:
description: CBP focus position in um.
type: number
default: 6000
minimum: 0
maximum: 13000
required:
- calib_type
- wavelength
- use_camera
- use_electrometer
- use_flatfieldelectrometer
- use_fiberspectrograph_red
- use_fiberspectrograph_blue
- exposure_times
Expand Down
Loading
Loading