Set version for 2025A.1.1.1

gemini-hlsw · Dec 3, 2024 · d18d429 · d18d429
1 parent a9b8d5e
commit d18d429
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -5,7 +5,7 @@ name := "ocs"
 organization in Global := "edu.gemini.ocs"
 
 // true indicates a test release, and false indicates a production release
-ocsVersion in ThisBuild := OcsVersion("2025A", true, 1, 1, 1)
+ocsVersion in ThisBuild := OcsVersion("2025A", false, 1, 1, 1)
 
 pitVersion in ThisBuild := OcsVersion("2025A", true, 1, 1, 1)
 

diff --git a/bundle/edu.gemini.itc.shared/src/main/scala/edu/gemini/itc/shared/ItcService.scala b/bundle/edu.gemini.itc.shared/src/main/scala/edu/gemini/itc/shared/ItcService.scala
@@ -166,11 +166,11 @@ final case class SpcChartData(chartType: SpcChartType, title: String, xAxis: Cha
   def allSeriesAsJava(t: SpcDataType): java.util.List[SpcSeriesData] = series.filter(_.dataType == t)
 }
 
-case class ExposureCalculation(exposureTime: Double, exposures: Int, signalToNoise: Double)
+case class ExposureCalculation(exposureTime: Double, exposures: Int, totalSignalToNoise: Double, singleSignalToNoise: Double)
 
 object ExposureCalculation {
-  def option(exposureTime: Double, exposures: Int, signalToNoise: Double): Option[ExposureCalculation] = 
-    Some(ExposureCalculation(exposureTime, exposures, signalToNoise))
+  def option(exposureTime: Double, exposures: Int, totalToNoise: Double, singleSignalToNoise: Double): Option[ExposureCalculation] =
+    Some(ExposureCalculation(exposureTime, exposures, totalToNoise, singleSignalToNoise))
 }
 
 /** The result of a spectroscopy ITC calculation contains some numbers per CCD and a set of groups of charts.

diff --git a/bundle/edu.gemini.itc/src/main/java/edu/gemini/itc/gmos/GmosRecipe.java b/bundle/edu.gemini.itc/src/main/java/edu/gemini/itc/gmos/GmosRecipe.java
@@ -560,7 +560,7 @@ private ImagingResult calculateImagingDo(final Gmos instrument) {
         // Calculate the Peak Pixel Flux
         final double peak_pixel_count = PeakPixelFlux.calculate(instrument, _sdParameters, exposureTime, SFcalc, im_qual, sed_integral, sky_integral);
 
-        return new ImagingResult(p, instrument, IQcalc, SFcalc, peak_pixel_count, IS2Ncalc, Recipe$.MODULE$.noAOSystem(), ExposureCalculation$.MODULE$.option(IS2Ncalc.getExposureTime(), numberExposures, IS2Ncalc.totalSNRatio()));
+        return new ImagingResult(p, instrument, IQcalc, SFcalc, peak_pixel_count, IS2Ncalc, Recipe$.MODULE$.noAOSystem(), ExposureCalculation$.MODULE$.option(IS2Ncalc.getExposureTime(), numberExposures, IS2Ncalc.totalSNRatio(), IS2Ncalc.singleSNRatio()));
 
     }