Rename probeGuide to probeGuideMode

gemini-hlsw · Jan 30, 2024 · 7f12dc5 · 7f12dc5
1 parent ba5fbe8
commit 7f12dc5
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/...cala/navigate/server/tcs/ProbeGuide.scala → .../navigate/server/tcs/ProbeGuideMode.scala b/...cala/navigate/server/tcs/ProbeGuide.scala → .../navigate/server/tcs/ProbeGuideMode.scala
@@ -9,7 +9,7 @@ import cats.derived.*
 import lucuma.ags.GuideProbe
 
 /** Data type for guide config. */
-case class ProbeGuide(
+case class ProbeGuideMode(
   from: GuideProbe,
   to:   GuideProbe
 ) derives Eq,

diff --git a/modules/server/src/main/scala/navigate/server/tcs/TcsEpicsSystem.scala b/modules/server/src/main/scala/navigate/server/tcs/TcsEpicsSystem.scala
@@ -902,7 +902,7 @@ object TcsEpicsSystem {
 
     override val guideModeCommand: GuideModeCommand[F, TcsCommands[F]] =
       new GuideModeCommand[F, TcsCommands[F]] {
-        override def setMode(pg: Option[ProbeGuide]): TcsCommands[F] =
+        override def setMode(pg: Option[ProbeGuideMode]): TcsCommands[F] =
           pg.fold(
             addParam(tcsEpics.guideModeCmd.setParam1(BinaryOnOff.Off))
           )(pg =>
@@ -1540,7 +1540,7 @@ object TcsEpicsSystem {
   }
 
   trait GuideModeCommand[F[_], +S] {
-    def setMode(pg: Option[ProbeGuide]): S
+    def setMode(pg: Option[ProbeGuideMode]): S
   }
 
   trait WfsSignalProcConfigCommand[F[_], +S] {

diff --git a/modules/server/src/main/scala/navigate/server/tcs/TelescopeGuideConfig.scala b/modules/server/src/main/scala/navigate/server/tcs/TelescopeGuideConfig.scala
@@ -13,6 +13,6 @@ case class TelescopeGuideConfig(
   m1Guide:     M1GuideConfig,
   m2Guide:     M2GuideConfig,
   dayTimeMode: Boolean,
-  probeGuide:  Option[ProbeGuide]
+  probeGuide:  Option[ProbeGuideMode]
 ) derives Eq,
       Show
diff --git a/modules/server/src/test/scala/navigate/server/tcs/TcsBaseControllerEpicsSuite.scala b/modules/server/src/test/scala/navigate/server/tcs/TcsBaseControllerEpicsSuite.scala
@@ -821,7 +821,7 @@ class TcsBaseControllerEpicsSuite extends CatsEffectSuite {
       m1Guide = M1GuideConfig.M1GuideOn(M1Source.Oiwfs),
       m2Guide = M2GuideOn(true, Set(TipTiltSource.Oiwfs)),
       dayTimeMode = false,
-      probeGuide = ProbeGuide(GuideProbe.GmosOiwfs, GuideProbe.GmosOiwfs).some
+      probeGuide = ProbeGuideMode(GuideProbe.GmosOiwfs, GuideProbe.GmosOiwfs).some
     )
 
     for {
@@ -846,7 +846,7 @@ class TcsBaseControllerEpicsSuite extends CatsEffectSuite {
       m1Guide = M1GuideConfig.M1GuideOn(M1Source.Oiwfs),
       m2Guide = M2GuideOn(true, Set(TipTiltSource.Oiwfs)),
       dayTimeMode = false,
-      probeGuide = ProbeGuide(GuideProbe.Pwfs1, GuideProbe.Pwfs2).some
+      probeGuide = ProbeGuideMode(GuideProbe.Pwfs1, GuideProbe.Pwfs2).some
     )
 
     for {

diff --git a/modules/web/server/src/main/resources/NewTCC.graphql b/modules/web/server/src/main/resources/NewTCC.graphql
@@ -157,10 +157,10 @@ input GuideConfigurationInput {
     """Flag for day time tests. It sets all gains to 0"""
     daytimeMode: Boolean!
     """Probe names to be used for guiding"""
-    probeGuide: ProbeGuideInput
+    probeGuideMode: ProbeGuideModeInput
 }
 
-input ProbeGuideInput {
+input ProbeGuideModeInput {
     from: GuideProbe
     to: GuideProbe
 }

diff --git a/modules/web/server/src/main/scala/navigate/web/server/http4s/NavigateMappings.scala b/modules/web/server/src/main/scala/navigate/web/server/http4s/NavigateMappings.scala
@@ -56,7 +56,7 @@ import navigate.server.tcs.M1GuideConfig.M1GuideOn
 import navigate.server.tcs.M2GuideConfig
 import navigate.server.tcs.Origin
 import navigate.server.tcs.ParkStatus
-import navigate.server.tcs.ProbeGuide
+import navigate.server.tcs.ProbeGuideMode
 import navigate.server.tcs.ResetPointing
 import navigate.server.tcs.RotatorTrackConfig
 import navigate.server.tcs.RotatorTrackingMode
@@ -650,10 +650,10 @@ object NavigateMappings extends GrackleParsers {
     rc <- l.collectFirst { case ("rotator", ObjectValue(v)) => parseRotatorConfig(v) }.flatten
   } yield TcsConfig(t, in, oi, rc)
 
-  def parseProbeGuide(l: List[(String, Value)]): Option[ProbeGuide] = for {
+  private def parseProbeGuideMode(l: List[(String, Value)]): Option[ProbeGuideMode] = for {
     f <- l.collectFirst { case ("from", EnumValue(v)) => parseEnumerated[GuideProbe](v) }.flatten
     t <- l.collectFirst { case ("to", EnumValue(v)) => parseEnumerated[GuideProbe](v) }.flatten
-  } yield ProbeGuide(f, t)
+  } yield ProbeGuideMode(f, t)
 
   def parseGuideConfig(l: List[(String, Value)]): Option[TelescopeGuideConfig] = {
     val m2: List[TipTiltSource] = l.collectFirst { case ("m2Inputs", ListValue(v)) =>
@@ -669,7 +669,7 @@ object NavigateMappings extends GrackleParsers {
     val dayTimeMode = l.collectFirst { case ("daytimeMode", BooleanValue(v)) => v }.exists(identity)
 
     val probeGuide =
-      l.collectFirst { case ("probeGuide", ObjectValue(v)) => parseProbeGuide(v) }.flatten
+      l.collectFirst { case ("probeGuideMode", ObjectValue(v)) => parseProbeGuideMode(v) }.flatten
 
     l.collectFirst { case ("mountOffload", BooleanValue(v)) => v }
       .map { mount =>

diff --git a/modules/web/server/src/test/scala/navigate/web/server/http4s/NavigateMappingsTest.scala b/modules/web/server/src/test/scala/navigate/web/server/http4s/NavigateMappingsTest.scala
@@ -629,7 +629,7 @@ class NavigateMappingsTest extends CatsEffectSuite {
           |    m1Input: OIWFS
           |    mountOffload: true
           |    daytimeMode: false
-          |    probeGuide: {
+          |    probeGuideMode: {
           |      from: GMOS_OIWFS
           |      to: GMOS_OIWFS
           |    }
@@ -658,7 +658,7 @@ class NavigateMappingsTest extends CatsEffectSuite {
           |    m1Input: OIWFS
           |    mountOffload: true
           |    daytimeMode: false
-          |    probeGuide: {
+          |    probeGuideMode: {
           |      from: PWFS_1
           |      to: PWFS_2
           |    }