Skip to content

Commit c3c4e84

Browse files
authored
Revert "REL-4792 Added 10s delay after F2 observe."
1 parent 68429ee commit c3c4e84

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

modules/server/src/main/scala/seqexec/server/flamingos2/Flamingos2ControllerEpics.scala

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ package seqexec.server.flamingos2
55

66
import java.util.concurrent.TimeUnit.MILLISECONDS
77
import java.util.concurrent.TimeUnit.SECONDS
8-
import scala.concurrent.duration.{ Duration, FiniteDuration }
8+
9+
import scala.concurrent.duration.FiniteDuration
10+
911
import cats.data.StateT
10-
import cats.effect.{ Async, Temporal }
12+
import cats.effect.Async
1113
import cats.syntax.all._
1214
import edu.gemini.spModel.gemini.flamingos2.Flamingos2.Decker
1315
import edu.gemini.spModel.gemini.flamingos2.Flamingos2.Filter
@@ -27,8 +29,6 @@ import seqexec.server.flamingos2.Flamingos2Controller._
2729
import squants.Time
2830
import squants.time.TimeConversions._
2931

30-
import java.util.concurrent.TimeUnit
31-
3232
trait Flamingos2Encoders {
3333
implicit val encodeReadoutMode: EncodeEpicsValue[ReadoutMode, String] = EncodeEpicsValue {
3434
case ReadoutMode.SCIENCE => "SCI"
@@ -156,14 +156,10 @@ object Flamingos2ControllerEpics extends Flamingos2Encoders {
156156
_ <- L.debug("Completed Flamingos2 configuration")
157157
} yield ()
158158

159-
private val paddingDelay: Duration = Duration(10.0, TimeUnit.SECONDS)
160159
override def observe(fileId: ImageFileId, expTime: Time): F[ObserveCommandResult] = for {
161160
_ <- L.debug(s"Send observe to Flamingos2, file id $fileId")
162161
_ <- sys.observeCmd.setLabel(fileId)
163162
_ <- sys.observeCmd.post(FiniteDuration(expTime.toMillis, MILLISECONDS) + ReadoutTimeout)
164-
_ <-
165-
L.debug(s"Flamingos2 reports observe completion. Start delay of $paddingDelay for REL-4792")
166-
_ <- Temporal[F].sleep(paddingDelay)
167163
_ <- L.debug("Completed Flamingos2 observe")
168164
} yield ObserveCommandResult.Success
169165

0 commit comments

Comments
 (0)