Merge pull request #1639 from sraaphorst/ot/REL-3632

REL-3632: Backporting Andy's changes to the 2019A release branch.
gemini-hlsw · Mar 4, 2019 · 3446c3e · 3446c3e
2 parents 3cfec27 + 28ec5c6
commit 3446c3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bundle/jsky.app.ot/src/main/scala/jsky/app/ot/editor/seq/ItcTable.scala b/bundle/jsky.app.ot/src/main/scala/jsky/app/ot/editor/seq/ItcTable.scala
@@ -262,7 +262,7 @@ class ItcImagingTable(val parameters: ItcParametersProvider) extends ItcTable {
 
     } yield {
       val uniqueConfigs = ItcUniqueConfig.imagingConfigs(seq)
-      val inputs        = uniqueConfigs.map(uc => extractInputs(instrument, parameters.schedulingBlockStart, uc, frac => ImagingS2N(uc.count * uc.coadds.getOrElse(1), uc.coadds, uc.singleExposureTime, frac, 0.0)))
+      val inputs        = uniqueConfigs.map(uc => extractInputs(instrument, parameters.schedulingBlockStart, uc, frac => ImagingS2N(uc.count, uc.coadds, uc.singleExposureTime, frac, 0.0)))
       val results       = uniqueConfigs.zip(inputs).map { case (uc, i) => doServiceCall(peer, i) }
 
       instrument.getType match {
@@ -298,7 +298,7 @@ class ItcSpectroscopyTable(val parameters: ItcParametersProvider) extends ItcTab
 
     } yield {
       val uniqueConfigs = ItcUniqueConfig.spectroscopyConfigs(seq)
-      val inputs        = uniqueConfigs.map(uc => extractInputs(instrument, parameters.schedulingBlockStart, uc, frac => SpectroscopyS2N(uc.count * uc.coadds.getOrElse(1), uc.coadds, uc.singleExposureTime, frac, 0.0)))
+      val inputs        = uniqueConfigs.map(uc => extractInputs(instrument, parameters.schedulingBlockStart, uc, frac => SpectroscopyS2N(uc.count, uc.coadds, uc.singleExposureTime, frac, 0.0)))
       val results       = uniqueConfigs.zip(inputs).map { case (uc, i) => doServiceCall(peer, i) }
 
       instrument.getType match {

diff --git a/bundle/jsky.app.ot/src/main/scala/jsky/app/ot/editor/seq/ItcTableModel.scala b/bundle/jsky.app.ot/src/main/scala/jsky/app/ot/editor/seq/ItcTableModel.scala
@@ -38,8 +38,8 @@ sealed trait ItcTableModel extends AbstractTableModel {
   val PeakPixelColumn     = Column("Peak\n(e-)",       (_, _, r) => maxPeakPixelFlux(r),          tooltip = ItcTableModel.PeakPixelETooltip)
   val PeakADUColumn       = Column("Peak\n(ADU)",      (_, _, r) => maxImgAdu(r),                 tooltip = ItcTableModel.PeakPixelAduTooltip)
   val PeakFullWellColumn  = Column("Peak\n(%FW)",      (_, _, r) => maxImgPercentWell(r),         tooltip = ItcTableModel.PeakPixelFWTooltip)
-  val SNSingleColumn      = Column("S/N Single Coadd", (_, _, r) => maxSingleSNRatio(r),            tooltip = "Signal / Noise for one exposure with one coadd")
-  val SNTotalColumn       = Column("S/N Total",        (_, _, r) => maxTotalSNRatio(r),            tooltip = "Total Signal / Noise for all exposures and coadds")
+  val SNSingleColumn      = Column("S/N Single",       (_, _, r) => maxSingleSNRatio(r),          tooltip = "Signal / Noise for one exposure")
+  val SNTotalColumn       = Column("S/N Total",        (_, _, r) => maxTotalSNRatio(r),           tooltip = "Total Signal / Noise for all exposures")
 
   // Define different sets of columns as headers
   val PeakColumns       = List(PeakPixelColumn, PeakADUColumn, PeakFullWellColumn)