Merge pull request #4150 from gemini-hlsw/sc-3493-make-ags-work-prope…

…rly-for-calibrations Handle AGS differently for different types of calibrations
gemini-hlsw · Sep 16, 2024 · eca9f0d · eca9f0d
2 parents 00dd7f9 + b9da518
commit eca9f0d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 11 deletions.
diff --git a/common/src/main/scala/explore/model/ObsConfiguration.scala b/common/src/main/scala/explore/model/ObsConfiguration.scala
@@ -28,7 +28,8 @@ case class ObsConfiguration(
   scienceOffsets:     Option[NonEmptyList[Offset]],
   acquisitionOffsets: Option[NonEmptyList[Offset]],
   averagePA:          Option[AveragePABasis],
-  obsDuration:        Option[Duration]
+  obsDuration:        Option[Duration],
+  needGuideStar:      Boolean
 ) derives Eq:
   // In case there is no guide star we still want to have a posAngle equivalent
   // To draw visualization

diff --git a/explore/src/main/scala/explore/tabs/ObsTabTiles.scala b/explore/src/main/scala/explore/tabs/ObsTabTiles.scala
@@ -388,7 +388,8 @@ object ObsTabTiles:
                 sequenceOffsets.toOption.flatMap(_.science),
                 sequenceOffsets.toOption.flatMap(_.acquisition),
                 averagePA,
-                obsDuration.map(_.toDuration)
+                obsDuration.map(_.toDuration),
+                props.observation.get.needsAGS
               )
 
             def getObsInfo(obsId: Observation.Id)(targetId: Target.Id): TargetEditObsInfo =

diff --git a/explore/src/main/scala/explore/tabs/TargetTabContents.scala b/explore/src/main/scala/explore/tabs/TargetTabContents.scala
@@ -399,7 +399,7 @@ object TargetTabContents extends TwoPanels:
               case Some(id) =>
                 props.programSummaries.get.observations.values
                   .collect:
-                    case Observation(
+                    case o @ Observation(
                           obsId,
                           _,
                           _,
@@ -421,14 +421,15 @@ object TargetTabContents extends TwoPanels:
                           _,
                           _
                         ) if obsId === id =>
-                      (const, conf.toBasicConfiguration, posAngle, wavelength)
+                      (const, conf.toBasicConfiguration, posAngle, wavelength, o.needsAGS)
                   .headOption
               case _        => None
             }
 
             val constraints                               = obsConf.map(_._1)
             val configuration: Option[BasicConfiguration] = obsConf.map(_._2)
             val wavelength                                = obsConf.map(_._4)
+            val needsAGS                                  = obsConf.exists(_._5)
 
             def setCurrentTarget(oids: Option[ObsIdSet])(
               tid: Option[Target.Id],
@@ -520,7 +521,8 @@ object TargetTabContents extends TwoPanels:
                   none,
                   none,
                   none,
-                  none
+                  none,
+                  needsAGS
                 ),
                 none,
                 props.focused.target,

diff --git a/explore/src/main/scala/explore/targeteditor/AladinCell.scala b/explore/src/main/scala/explore/targeteditor/AladinCell.scala
@@ -65,6 +65,9 @@ case class AladinCell(
   fullScreen:        View[AladinFullScreen],
   globalPreferences: View[GlobalPreferences]
 ) extends ReactFnProps(AladinCell.component):
+  val needsAGS: Boolean =
+    obsConf.exists(_.needGuideStar)
+
   val anglesToTest: Option[NonEmptyList[Angle]] =
     for {
       conf          <- obsConf
@@ -244,9 +247,11 @@ object AladinCell extends ModelOptics with AladinCommon:
                               CatalogMessage.GSRequest(baseTracking, vizTime)
                             )
             _          <- gs.setStateAsync(candidates)
-          } yield ()).guarantee(
-            props.obsConf.flatMap(_.agsState).foldMap(_.async.set(AgsState.Idle))
-          )
+          } yield ())
+            .guarantee(
+              props.obsConf.flatMap(_.agsState).foldMap(_.async.set(AgsState.Idle))
+            )
+            .whenA(props.needsAGS)
       }
       // Reference to root
       .useMemo(())(_ => domRoot)
@@ -309,7 +314,7 @@ object AladinCell extends ModelOptics with AladinCommon:
                 vizTime,
                 observingMode,
                 candidates
-              ) =>
+              ) if props.needsAGS =>
             import ctx.given
 
             val runAgs = (positions,
@@ -478,7 +483,7 @@ object AladinCell extends ModelOptics with AladinCommon:
 
           val renderAgsOverlay: AsterismVisualOptions => VdomNode =
             (t: AsterismVisualOptions) =>
-              if (props.globalPreferences.get.agsOverlay.isVisible) {
+              if (props.needsAGS && props.globalPreferences.get.agsOverlay.isVisible) {
                 props.obsConf
                   .flatMap(_.agsState)
                   .map(agsState =>

diff --git a/explore/src/main/scala/explore/targeteditor/AladinContainer.scala b/explore/src/main/scala/explore/targeteditor/AladinContainer.scala
@@ -287,7 +287,7 @@ object AladinContainer extends AladinCommon {
 
         def includeSvg(v: JsAladin): Callback =
           v.onZoom(onZoom) *> // re render on zoom
-            v.onPositionChanged(u => onPositionChanged(u)) *>
+            v.onPositionChanged(onPositionChanged) *>
             v.onMouseMove(s =>
               props
                 .updateMouseCoordinates(Coordinates(s.ra, s.dec))

diff --git a/model/shared/src/main/scala/explore/model/Observation.scala b/model/shared/src/main/scala/explore/model/Observation.scala
@@ -10,6 +10,7 @@ import cats.syntax.all.*
 import eu.timepit.refined.cats.*
 import eu.timepit.refined.types.numeric.NonNegShort
 import eu.timepit.refined.types.string.NonEmptyString
+import explore.model.syntax.all.*
 import explore.modes.GmosSpectroscopyOverrides
 import explore.modes.InstrumentOverrides
 import io.circe.Decoder
@@ -79,6 +80,8 @@ case class Observation(
       case _                                                              =>
         none
 
+  val needsAGS: Boolean = calibrationRole.forall(_.needsAGS)
+
   val toModeOverride: Option[InstrumentOverrides] = observingMode.map {
     case ObservingMode.GmosNorthLongSlit(
           _,

diff --git a/model/shared/src/main/scala/explore/model/syntax/package.scala b/model/shared/src/main/scala/explore/model/syntax/package.scala
@@ -9,6 +9,7 @@ import eu.timepit.refined.types.numeric.NonNegInt
 import eu.timepit.refined.types.numeric.NonNegShort
 import explore.model.*
 import explore.model.enums.PosAngleOptions
+import lucuma.core.enums.CalibrationRole
 import lucuma.core.enums.Site
 import lucuma.core.math.Angle
 import lucuma.core.math.Declination
@@ -125,3 +126,9 @@ object all:
   extension (e: GroupTree.Value) def id: GroupTree.Key = e.bimap(_.id, _.id)
 
   extension (e: NonNegShort) def toNonNegInt: NonNegInt = NonNegInt.unsafeFrom(e.value)
+
+  extension (cr: CalibrationRole)
+    def needsAGS: Boolean = cr match
+      case CalibrationRole.SpectroPhotometric => true
+      case CalibrationRole.Twilight           => false
+      case _                                  => true