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.

Sign up for GitHub

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

REL 4347: Support guide camera and SV camera exposure time overrides #2553

Merged
merged 5 commits into from
Feb 7, 2024
Merged

REL 4347: Support guide camera and SV camera exposure time overrides #2553

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b17310d
REL-4347 Support overriding SV camera times
cquiroz Feb 5, 2024
51e958a
REL-4347 Support overriding AG exposure time
cquiroz Feb 5, 2024
fbdb52c
REL-4347 Add unit tests
cquiroz Feb 5, 2024
7d2e25a
REL-4347 Don't set guide camera override after all
cquiroz Feb 6, 2024
2205354
REL-4347 Use the overriden values for the keywords
cquiroz Feb 7, 2024
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
18 changes: 15 additions & 3 deletions modules/server/src/main/scala/seqexec/server/ghost/Ghost.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,20 @@ object Ghost extends GhostConfigUtil {
.map(_.doubleValue().some)
.recoverWith(_ => none.asRight)

gMag <-
gMag <-
config
.extractInstAs[JDouble](SPGhost.MAG_G_PROP)
.map(_.doubleValue().some)
.recoverWith(_ => none.asRight)
config <- {
guideCameraExposureTime =
config
.extractInstAs[JDouble](SPGhost.GUIDE_CAMERA_EXPOSURE_TIME_PROP)
.map(_.doubleValue)
svExposureTime =
config
.extractInstAs[JDouble](SPGhost.SLIT_VIEWING_CAMERA_EXPOSURE_TIME_PROP)
.map(_.doubleValue)
config <- {
if (isScience && rm.toOption.isEmpty) {
Left(ContentError("Science steps need a resolution mode defined"))
} else {
Expand Down Expand Up @@ -293,7 +301,11 @@ object Ghost extends GhostConfigUtil {
userTargets = userTargets.flatten,
rm.toOption,
conditions,
vMag.orElse(gMag)
vMag.orElse(gMag),
guideCameraExposureTime.toOption.map(x =>
FiniteDuration((x * 1000).toLong, MILLISECONDS)
),
svExposureTime.toOption.map(x => FiniteDuration((x * 1000).toLong, MILLISECONDS))
)
} else {
val isHR = hrifu1RAHMS.isDefined || hrifu2RAHMS.isDefined
Expand Down
Loading
Loading