SEQNG-123: Base implementation of FITS keywords. #161
Conversation
| @@ -0,0 +1,1046 @@ | |||
| <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | |||
There was a problem hiding this comment.
This is the import of the Channel Access definition file used for the DHS keywords in the old Seqexec. Not yet used, but still included for future work.
| def buildBoolean(get: SeqAction[Boolean], name: String ): KeywordBag => SeqAction[KeywordBag] = buildKeyword(get, name, BooleanKeyword) | ||
| def buildString(get: SeqAction[String], name: String ): KeywordBag => SeqAction[KeywordBag] = buildKeyword(get, name, StringKeyword) | ||
|
|
||
| private def bundleKeywords(inst: String, ks: Seq[KeywordBag => SeqAction[KeywordBag]]): SeqAction[KeywordBag] = { |
There was a problem hiding this comment.
I'm sure that in a month, I will not understand this code.
There was a problem hiding this comment.
It may not be pretty, but it can be guessed what it does. Why the the get parameter and the result of build... are wrapped in a SeqAction?
There was a problem hiding this comment.
Because most of the time the action of retrieving a value involves reading from an EPICS channel, and it can fail.
There was a problem hiding this comment.
You may need some shapeless there 😄
| * Created by jluhrs on 1/31/17. | ||
| */ | ||
|
|
||
| trait TcsKeywordsReader { |
There was a problem hiding this comment.
More values to come. It is not yet used.
There was a problem hiding this comment.
Did you consider to have a single get[A](name: String):A type of method instead?
There was a problem hiding this comment.
Yes, but decided against it. The implementation of get[A](name: String):A would still need to switch between all the possible values of name, so it is not less code. And misspelling a name would be a run time error instead of a compile time error.
| def buildBoolean(get: SeqAction[Boolean], name: String ): KeywordBag => SeqAction[KeywordBag] = buildKeyword(get, name, BooleanKeyword) | ||
| def buildString(get: SeqAction[String], name: String ): KeywordBag => SeqAction[KeywordBag] = buildKeyword(get, name, StringKeyword) | ||
|
|
||
| private def bundleKeywords(inst: String, ks: Seq[KeywordBag => SeqAction[KeywordBag]]): SeqAction[KeywordBag] = { |
There was a problem hiding this comment.
It may not be pretty, but it can be guessed what it does. Why the the get parameter and the result of build... are wrapped in a SeqAction?
| @@ -0,0 +1,1046 @@ | |||
| <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | |||
There was a problem hiding this comment.
Is this XML machine generated?
There was a problem hiding this comment.
It was created running a program over the file that defined the channels in the old Seqexec. Then I had to change the types by hand, because the old format doesn't have type information. So yes, the file is machine generated, but not in the sense that it can be generated at build time, if that is what you were thinking.
| for { | ||
| id <- client.createImage(DhsClient.ImageParameters(DhsClient.Permanent, List("flamingos2", "dhs-http"))) | ||
| id <- dhs.createImage(DhsClient.ImageParameters(DhsClient.Permanent, List(instContributorName, "dhs-http"))) | ||
| _ <- headers.map(_.sendBefore(id, dhsInstrumentName)).sequenceU |
There was a problem hiding this comment.
Is this a call to the dhs for each header?
| _ <- EitherT(Task { | ||
| Log.log(Level.INFO, name + ": starting observation " + id) | ||
| Thread.sleep(5000) | ||
| Log.log(Level.INFO, name + ": observation completed") | ||
| TrySeq(()) | ||
| }) | ||
| _ <- client.setKeywords(id, DhsClient.KeywordBag( | ||
| _ <- dhs.setKeywords(id, DhsClient.KeywordBag( |
There was a problem hiding this comment.
Why are these keywords hardcoded?
There was a problem hiding this comment.
No reason. That GMOS code is just a place holder.
| def buildBoolean(get: SeqAction[Boolean], name: String ): KeywordBag => SeqAction[KeywordBag] = buildKeyword(get, name, BooleanKeyword) | ||
| def buildString(get: SeqAction[String], name: String ): KeywordBag => SeqAction[KeywordBag] = buildKeyword(get, name, StringKeyword) | ||
|
|
||
| private def bundleKeywords(inst: String, ks: Seq[KeywordBag => SeqAction[KeywordBag]]): SeqAction[KeywordBag] = { |
There was a problem hiding this comment.
You may need some shapeless there 😄
| @@ -9,7 +9,7 @@ import scalaz.concurrent.Task | |||
| trait Instrument extends System { | |||
| // The name used for this instrument in the science fold configuration | |||
| val sfName: String | |||
| def observe(config: Config): SeqObserve[DhsClient, ObserveResult] | |||
| def observe(config: Config): SeqObserve[(DhsClient, List[Header]), ObserveResult] | |||
There was a problem hiding this comment.
I guess we need to link this to the client level request to, to send client headers
There was a problem hiding this comment.
Not here. There is an ObsKeywordsReader trait used to get those values. The concrete must get them from the client.
| * Created by jluhrs on 1/31/17. | ||
| */ | ||
|
|
||
| trait TcsKeywordsReader { |
There was a problem hiding this comment.
Did you consider to have a single get[A](name: String):A type of method instead?
jluhrs
force-pushed
the
feature/SEQNG-123
branch
from
52be423
to
11cd78d
Compare
I had to scale down the scope of the task. Now it only include the infrastructure that will allow me to add the keywords.
I separated the writing of the keywords to the DHS from the reading of the values. That way I can test without accessing the EPICS systems.