Merge pull request #4171 from gemini-hlsw/separate-binning

Separate X and Y binning
gemini-hlsw · Sep 26, 2024 · 0553a80 · 0553a80
2 parents 12dd435 + 87c141d
commit 0553a80
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/common/src/main/scala/explore/model/reusability.scala b/common/src/main/scala/explore/model/reusability.scala
@@ -149,7 +149,8 @@ object reusability:
        x.filter,
        x.fpu,
        x.centralWavelength,
-       (x.explicitXBin, x.explicitYBin).tupled,
+       x.explicitXBin,
+       x.explicitYBin,
        x.explicitAmpReadMode.getOrElse(x.defaultAmpReadMode),
        x.explicitAmpGain.getOrElse(x.defaultAmpGain),
        x.explicitRoi.getOrElse(x.defaultRoi),
@@ -162,7 +163,8 @@ object reusability:
        x.filter,
        x.fpu,
        x.centralWavelength,
-       (x.explicitXBin, x.explicitYBin).tupled,
+       x.explicitXBin,
+       x.explicitYBin,
        x.explicitAmpReadMode.getOrElse(x.defaultAmpReadMode),
        x.explicitAmpGain.getOrElse(x.defaultAmpGain),
        x.explicitRoi.getOrElse(x.defaultRoi),

diff --git a/model/shared/src/main/scala/explore/model/Observation.scala b/model/shared/src/main/scala/explore/model/Observation.scala
@@ -106,9 +106,9 @@ case class Observation(
             _,
             _,
             _,
-            explicitXBin,
+            explicitXBinning,
             _,
-            explicitYBin,
+            explicitYBinning,
             defaultAmpReadMode,
             explicitAmpReadMode,
             defaultAmpGain,
@@ -121,14 +121,14 @@ case class Observation(
             _
           ) =>
         profiles(targets).map: ps =>
-          val (xBinning, yBinning): (GmosXBinning, GmosYBinning) =
-            (explicitXBin, explicitYBin).tupled.getOrElse:
-              if (fpu.isIFU) (GmosXBinning.One, GmosYBinning.One)
-              else asterismBinning(ps.map(northBinning(fpu, _, constraints.imageQuality, grating)))
+          val (defaultXBinning, defaultYBinning) =
+            if (fpu.isIFU) (GmosXBinning.One, GmosYBinning.One)
+            else asterismBinning(ps.map(northBinning(fpu, _, constraints.imageQuality, grating)))
+
           GmosSpectroscopyOverrides(
             GmosCcdMode(
-              xBinning,
-              yBinning,
+              explicitXBinning.getOrElse(defaultXBinning),
+              explicitYBinning.getOrElse(defaultYBinning),
               GmosAmpCount.Twelve,
               explicitAmpGain.getOrElse(defaultAmpGain),
               explicitAmpReadMode.getOrElse(defaultAmpReadMode)
@@ -145,9 +145,9 @@ case class Observation(
             _,
             _,
             _,
-            explicitXBin,
+            explicitXBinning,
             _,
-            explicitYBin,
+            explicitYBinning,
             defaultAmpReadMode,
             explicitAmpReadMode,
             defaultAmpGain,
@@ -160,14 +160,14 @@ case class Observation(
             _
           ) =>
         profiles(targets).map: ps =>
-          val (xBinning, yBinning): (GmosXBinning, GmosYBinning) =
-            (explicitXBin, explicitYBin).tupled.getOrElse:
-              if (fpu.isIFU) (GmosXBinning.One, GmosYBinning.One)
-              else asterismBinning(ps.map(southBinning(fpu, _, constraints.imageQuality, grating)))
+          val (defaultXBinning, defaultYBinning) =
+            if (fpu.isIFU) (GmosXBinning.One, GmosYBinning.One)
+            else asterismBinning(ps.map(southBinning(fpu, _, constraints.imageQuality, grating)))
+
           GmosSpectroscopyOverrides(
             GmosCcdMode(
-              xBinning,
-              yBinning,
+              explicitXBinning.getOrElse(defaultXBinning),
+              explicitYBinning.getOrElse(defaultYBinning),
               GmosAmpCount.Twelve,
               explicitAmpGain.getOrElse(defaultAmpGain),
               explicitAmpReadMode.getOrElse(defaultAmpReadMode)