Merge pull request #448 from gemini-hlsw/lucuma-core-71

Update to lucuma-core 0.71.0
gemini-hlsw · Mar 20, 2023 · 3b21143 · 3b21143
2 parents 7297769 + ab79a38
commit 3b21143
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/build.sbt b/build.sbt
@@ -12,7 +12,7 @@ val http4sVersion               = "0.23.18"
 val http4sJdkHttpClientVersion  = "0.9.0"
 val fs2Version                  = "3.6.1"
 val kindProjectorVersion        = "0.13.2"
-val lucumaCoreVersion           = "0.70.0"
+val lucumaCoreVersion           = "0.71.0"
 val lucumaRefinedVersion        = "0.1.1"
 val slf4jVersion                = "2.0.7"
 val log4catsVersion             = "2.5.0"

diff --git a/modules/itc/src/main/scala/lucuma/itc/legacy/syntax/InstrumentSyntax.scala b/modules/itc/src/main/scala/lucuma/itc/legacy/syntax/InstrumentSyntax.scala
@@ -97,6 +97,7 @@ trait GmosNorthFilterSyntax:
         case ZPrime           => "z_G0304"
         case Z                => "Z_G0322"
         case Y                => "Y_G0323"
+        case Ri               => "ri_G0349"
         case GG455            => "GG455_G0305"
         case OG515            => "OG515_G0306"
         case RG610            => "RG610_G0307"
@@ -109,6 +110,8 @@ trait GmosNorthFilterSyntax:
         case OIIIC            => "OIIIC_G0319"
         case HeII             => "HeII_G0320"
         case HeIIC            => "HeIIC_G0321"
+        case OVI              => "OVI_G0345"
+        case OVIC             => "OVIC_G0346"
         case HartmannA_RPrime => "HartmannA_G0313_r_G0303"
         case HartmannB_RPrime => "HartmannB_G0314_r_G0303"
         case GPrime_GG455     => "g_G0301_GG455_G0305"

diff --git a/modules/itc/src/main/scala/lucuma/itc/search/syntax/GmosNorthFilter.scala b/modules/itc/src/main/scala/lucuma/itc/search/syntax/GmosNorthFilter.scala
@@ -30,18 +30,19 @@ extension (self: GmosNorthFilter)
       case ZPrime => cov(848000)
       case Z      => cov(830000, 925000)
       case Y      => cov(970000, 1070000)
-      // ri -- not in OCS3 … need to add
+      case Ri     => cov(560000, 850000)
 
       // Narrow Band Imaging Filters
-      case HeII   => cov(464000, 472000)
-      case HeIIC  => cov(474000, 482000)
-      case OIII   => cov(496500, 501500)
-      case OIIIC  => cov(509000, 519000)
-      case Ha     => cov(654000, 661000)
-      case HaC    => cov(659000, 665000)
-      case SII    => cov(669400, 673700)
-      // OVIC? OVI? -- these aren't in OCS3 … need to add
-      case DS920  => cov(912800, 931400)
+      case HeII  => cov(464000, 472000)
+      case HeIIC => cov(474000, 482000)
+      case OIII  => cov(496500, 501500)
+      case OIIIC => cov(509000, 519000)
+      case Ha    => cov(654000, 661000)
+      case HaC   => cov(659000, 665000)
+      case SII   => cov(669400, 673700)
+      case OVI   => cov(681600, 686500)
+      case OVIC  => cov(676100, 680900)
+      case DS920 => cov(912800, 931400)
 
       // Spectroscopy Blocking Filters
       case GG455 => cov(460000)