Skip to content

Commit

Permalink
deploy: bluesky/ophyd@789c39f
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrakitin
mrakitin committed Dec 3, 2024
1 parent 013c4a2 commit 3389fb2
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 46 deletions.
Binary file modified ophyd/.doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified ophyd/.doctrees/user/reference/release_notes.doctree
View file
Binary file not shown.
Binary file modified ophyd/.doctrees/user/tutorials/device.doctree
View file
Binary file not shown.
Binary file modified ophyd/.doctrees/user/tutorials/single-PV.doctree
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ophyd/_sources/user/reference/release_notes.rst.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Release History
=================

1.10.0 (2024-11-21)
1.10.0 (2024-12-03)
===================

Added
Expand Down
Binary file modified ophyd/objects.inv
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ophyd/searchindex.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ophyd/user/reference/release_notes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@
<section id="release-history">
<h1>Release History<a class="headerlink" href="#release-history" title="Permalink to this heading">#</a></h1>
<section id="id1">
<h2>1.10.0 (2024-11-21)<a class="headerlink" href="#id1" title="Permalink to this heading">#</a></h2>
<h2>1.10.0 (2024-12-03)<a class="headerlink" href="#id1" title="Permalink to this heading">#</a></h2>
<section id="added">
<h3>Added<a class="headerlink" href="#added" title="Permalink to this heading">#</a></h3>
<ul class="simple">
Expand Down Expand Up @@ -1832,7 +1832,7 @@ <h2>v0.2.0 (2016-02-10)<a class="headerlink" href="#v0-2-0-2016-02-10" title="Pe
</div>
<nav class="bd-toc-nav page-toc">
<ul class="visible nav section-nav flex-column">
<li class="toc-h2 nav-item toc-entry"><a class="reference internal nav-link" href="#id1">1.10.0 (2024-11-21)</a><ul class="nav section-nav flex-column">
<li class="toc-h2 nav-item toc-entry"><a class="reference internal nav-link" href="#id1">1.10.0 (2024-12-03)</a><ul class="nav section-nav flex-column">
<li class="toc-h3 nav-item toc-entry"><a class="reference internal nav-link" href="#added">Added</a></li>
<li class="toc-h3 nav-item toc-entry"><a class="reference internal nav-link" href="#fixes">Fixes</a></li>
</ul>
Expand Down
28 changes: 14 additions & 14 deletions ophyd/user/tutorials/device.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -667,14 +667,14 @@ <h2>Use it with the Bluesky RunEngine<a class="headerlink" href="#use-it-with-th
<span class="go">+-----------+------------+---------------------+</span>
<span class="go">| seq_num | time | random_walk_horiz_x |</span>
<span class="go">+-----------+------------+---------------------+</span>
<span class="go">| 1 | 22:01:59.3 | -1 |</span>
<span class="go">| 2 | 22:02:00.3 | -1 |</span>
<span class="go">| 3 | 22:02:01.3 | -1 |</span>
<span class="go">| 1 | 23:36:22.5 | 1 |</span>
<span class="go">| 2 | 23:36:23.5 | 1 |</span>
<span class="go">| 3 | 23:36:24.5 | 1 |</span>
<span class="go">+-----------+------------+---------------------+</span>
<span class="go">generator count [&#39;780371fe&#39;] (scan num: 1)</span>
<span class="go">generator count [&#39;f310e1f5&#39;] (scan num: 1)</span>


<span class="gh">Out[14]: </span><span class="go">(&#39;780371fe-9817-4df8-91a3-190a225e2ef5&#39;,)</span>
<span class="gh">Out[14]: </span><span class="go">(&#39;f310e1f5-6a41-4e62-8825-cb9fa4e9dcdc&#39;,)</span>
</pre></div>
</div>
<p>We can also read <code class="docutils literal notranslate"><span class="pre">random_walk_horiz</span></code> in its entirety as a unit, treating it as
Expand All @@ -685,14 +685,14 @@ <h2>Use it with the Bluesky RunEngine<a class="headerlink" href="#use-it-with-th
<span class="go">+-----------+------------+---------------------+----------------------+</span>
<span class="go">| seq_num | time | random_walk_horiz_x | random_walk_horiz_dt |</span>
<span class="go">+-----------+------------+---------------------+----------------------+</span>
<span class="go">| 1 | 22:02:02.4 | -1 | 3 |</span>
<span class="go">| 2 | 22:02:03.4 | -1 | 3 |</span>
<span class="go">| 3 | 22:02:04.4 | -1 | 3 |</span>
<span class="go">| 1 | 23:36:25.6 | 1 | 3 |</span>
<span class="go">| 2 | 23:36:26.6 | 2 | 3 |</span>
<span class="go">| 3 | 23:36:27.6 | 2 | 3 |</span>
<span class="go">+-----------+------------+---------------------+----------------------+</span>
<span class="go">generator count [&#39;3deab98e&#39;] (scan num: 2)</span>
<span class="go">generator count [&#39;bf477aae&#39;] (scan num: 2)</span>


<span class="gh">Out[15]: </span><span class="go">(&#39;3deab98e-7ab4-40bc-8c64-d75875638a0e&#39;,)</span>
<span class="gh">Out[15]: </span><span class="go">(&#39;bf477aae-f48c-4c55-8bd0-63d9158ae67d&#39;,)</span>
</pre></div>
</div>
</section>
Expand All @@ -704,9 +704,9 @@ <h2>Assign a “Kind” to Components<a class="headerlink" href="#assign-a-kind-
<div class="highlight-ipython notranslate"><div class="highlight"><pre><span></span><span class="gp">In [16]: </span><span class="n">random_walk_horiz</span><span class="o">.</span><span class="n">read</span><span class="p">()</span>
<span class="gh">Out[16]: </span>
<span class="go">OrderedDict([(&#39;random_walk_horiz_x&#39;,</span>
<span class="go"> {&#39;value&#39;: -0.6436202683204355, &#39;timestamp&#39;: 1732226523.156793}),</span>
<span class="go"> {&#39;value&#39;: 1.592070018422536, &#39;timestamp&#39;: 1733268986.316304}),</span>
<span class="go"> (&#39;random_walk_horiz_dt&#39;,</span>
<span class="go"> {&#39;value&#39;: 3.0, &#39;timestamp&#39;: 1732226517.134323})])</span>
<span class="go"> {&#39;value&#39;: 3.0, &#39;timestamp&#39;: 1733268980.293581})])</span>
</pre></div>
</div>
<p>This is probably not necessary. Unless we have some reason to expect that it
Expand Down Expand Up @@ -738,12 +738,12 @@ <h2>Assign a “Kind” to Components<a class="headerlink" href="#assign-a-kind-
<div class="highlight-ipython notranslate"><div class="highlight"><pre><span></span><span class="gp">In [21]: </span><span class="n">random_walk_horiz</span><span class="o">.</span><span class="n">read</span><span class="p">()</span>
<span class="gh">Out[21]: </span>
<span class="go">OrderedDict([(&#39;random_walk_horiz_x&#39;,</span>
<span class="go"> {&#39;value&#39;: -0.6436202683204355, &#39;timestamp&#39;: 1732226523.156793})])</span>
<span class="go"> {&#39;value&#39;: 1.592070018422536, &#39;timestamp&#39;: 1733268986.316304})])</span>

<span class="gp">In [22]: </span><span class="n">random_walk_horiz</span><span class="o">.</span><span class="n">read_configuration</span><span class="p">()</span>
<span class="gh">Out[22]: </span>
<span class="go">OrderedDict([(&#39;random_walk_horiz_dt&#39;,</span>
<span class="go"> {&#39;value&#39;: 3.0, &#39;timestamp&#39;: 1732226517.134323})])</span>
<span class="go"> {&#39;value&#39;: 3.0, &#39;timestamp&#39;: 1733268980.293581})])</span>
</pre></div>
</div>
<div class="admonition note">
Expand Down
56 changes: 28 additions & 28 deletions ophyd/user/tutorials/single-PV.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -650,28 +650,28 @@ <h2>Use it with the Bluesky RunEngine<a class="headerlink" href="#use-it-with-th
<span class="go">+-----------+------------+------------+</span>
<span class="go">| seq_num | time | time_delta |</span>
<span class="go">+-----------+------------+------------+</span>
<span class="go">| 1 | 22:02:06.7 | 3 |</span>
<span class="go">| 1 | 23:36:29.9 | 3 |</span>
<span class="go">+-----------+------------+------------+</span>
<span class="go">generator count [&#39;27db16fd&#39;] (scan num: 1)</span>
<span class="go">generator count [&#39;097b3906&#39;] (scan num: 1)</span>


<span class="gh">Out[10]: </span><span class="go">(&#39;27db16fd-c01b-4f09-af46-5799e3bf2c2f&#39;,)</span>
<span class="gh">Out[10]: </span><span class="go">(&#39;097b3906-d6a9-43b3-a235-86b87fa58ef8&#39;,)</span>

<span class="gp">In [11]: </span><span class="n">RE</span><span class="p">(</span><span class="n">list_scan</span><span class="p">([],</span> <span class="n">time_delta</span><span class="p">,</span> <span class="p">[</span><span class="mf">0.1</span><span class="p">,</span> <span class="mf">0.3</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="mi">3</span><span class="p">]))</span> <span class="c1"># Use as &quot;motor&quot;.</span>


<span class="go">+-----------+------------+------------+</span>
<span class="go">| seq_num | time | time_delta |</span>
<span class="go">+-----------+------------+------------+</span>
<span class="go">| 1 | 22:02:06.8 | 0 |</span>
<span class="go">| 2 | 22:02:06.8 | 0 |</span>
<span class="go">| 3 | 22:02:06.8 | 1 |</span>
<span class="go">| 4 | 22:02:06.8 | 3 |</span>
<span class="go">| 1 | 23:36:30.0 | 0 |</span>
<span class="go">| 2 | 23:36:30.0 | 0 |</span>
<span class="go">| 3 | 23:36:30.0 | 1 |</span>
<span class="go">| 4 | 23:36:30.0 | 3 |</span>
<span class="go">+-----------+------------+------------+</span>
<span class="go">generator list_scan [&#39;4fbad057&#39;] (scan num: 2)</span>
<span class="go">generator list_scan [&#39;da473233&#39;] (scan num: 2)</span>


<span class="gh">Out[11]: </span><span class="go">(&#39;4fbad057-51ff-456f-aed4-bf75c71f282d&#39;,)</span>
<span class="gh">Out[11]: </span><span class="go">(&#39;da473233-11d9-4796-a9e3-925849aeca07&#39;,)</span>
</pre></div>
</div>
<p>For the following example, set <code class="docutils literal notranslate"><span class="pre">time_delta</span></code> to <code class="docutils literal notranslate"><span class="pre">1</span></code>.</p>
Expand All @@ -689,16 +689,16 @@ <h2>Use it with the Bluesky RunEngine<a class="headerlink" href="#use-it-with-th
<span class="go">+-----------+------------+------------+------------+</span>
<span class="go">| seq_num | time | time_delta | x |</span>
<span class="go">+-----------+------------+------------+------------+</span>
<span class="go">| 1 | 22:02:06.9 | | -0 |</span>
<span class="go">| 2 | 22:02:07.4 | | -0 |</span>
<span class="go">| 3 | 22:02:07.9 | | -0 |</span>
<span class="go">| 4 | 22:02:08.4 | | -0 |</span>
<span class="go">| 5 | 22:02:08.9 | | -1 |</span>
<span class="go">| 1 | 23:36:30.1 | | -0 |</span>
<span class="go">| 2 | 23:36:30.6 | | -0 |</span>
<span class="go">| 3 | 23:36:31.1 | | -0 |</span>
<span class="go">| 4 | 23:36:31.6 | | -0 |</span>
<span class="go">| 5 | 23:36:32.1 | | -0 |</span>
<span class="go">+-----------+------------+------------+------------+</span>
<span class="go">generator count [&#39;901f7d4c&#39;] (scan num: 3)</span>
<span class="go">generator count [&#39;057f9682&#39;] (scan num: 3)</span>


<span class="gh">Out[14]: </span><span class="go">(&#39;901f7d4c-3a39-48f4-993b-f19ac6ff62fe&#39;,)</span>
<span class="gh">Out[14]: </span><span class="go">(&#39;057f9682-e20b-4b2f-a865-0113b39dd98d&#39;,)</span>
</pre></div>
</div>
<p>but this required us to choose an update frequency (<code class="docutils literal notranslate"><span class="pre">0.5</span></code>). It’s often better
Expand All @@ -723,16 +723,16 @@ <h2>Use it with the Bluesky RunEngine<a class="headerlink" href="#use-it-with-th
<span class="go">+-----------+------------+------------+</span>
<span class="go">| seq_num | time | x |</span>
<span class="go">+-----------+------------+------------+</span>
<span class="go">| 1 | 22:02:09.6 | -1 |</span>
<span class="go">| 2 | 22:02:09.6 | -1 |</span>
<span class="go">| 3 | 22:02:09.8 | -0 |</span>
<span class="go">| 4 | 22:02:10.8 | 0 |</span>
<span class="go">| 5 | 22:02:11.8 | -1 |</span>
<span class="go">| 1 | 23:36:32.8 | -0 |</span>
<span class="go">| 2 | 23:36:32.8 | -0 |</span>
<span class="go">| 3 | 23:36:33.0 | -1 |</span>
<span class="go">| 4 | 23:36:34.0 | -1 |</span>
<span class="go">| 5 | 23:36:35.0 | -1 |</span>
<span class="go">+-----------+------------+------------+</span>
<span class="go">generator monitor_x_for [&#39;d081afba&#39;] (scan num: 4)</span>
<span class="go">generator monitor_x_for [&#39;eccc2b08&#39;] (scan num: 4)</span>


<span class="gh">Out[18]: </span><span class="go">(&#39;d081afba-d558-43d8-89b6-a1817285a7ee&#39;,)</span>
<span class="gh">Out[18]: </span><span class="go">(&#39;eccc2b08-4640-44fb-af33-c11ef3b555f6&#39;,)</span>
</pre></div>
</div>
<p>If you are a scientist aiming to use Ophyd with the Bluesky Run Engine, you may
Expand All @@ -754,7 +754,7 @@ <h3>Read<a class="headerlink" href="#read" title="Permalink to this heading">#</
containing the <code class="docutils literal notranslate"><span class="pre">value</span></code> and the <code class="docutils literal notranslate"><span class="pre">timestamp</span></code> of the reading from the control
system (in this case, EPICS).</p>
<div class="highlight-ipython notranslate"><div class="highlight"><pre><span></span><span class="gp">In [19]: </span><span class="n">time_delta</span><span class="o">.</span><span class="n">read</span><span class="p">()</span>
<span class="gh">Out[19]: </span><span class="go">{&#39;time_delta&#39;: {&#39;value&#39;: 1.0, &#39;timestamp&#39;: 1732226526.941342}}</span>
<span class="gh">Out[19]: </span><span class="go">{&#39;time_delta&#39;: {&#39;value&#39;: 1.0, &#39;timestamp&#39;: 1733268990.154099}}</span>
</pre></div>
</div>
</section>
Expand Down Expand Up @@ -861,10 +861,10 @@ <h3>Subscribe<a class="headerlink" href="#subscribe" title="Permalink to this he
items in it.</p>
<div class="highlight-ipython notranslate"><div class="highlight"><pre><span></span><span class="gp">In [30]: </span><span class="n">readings</span>
<span class="gh">Out[30]: </span>
<span class="go">deque([{&#39;x&#39;: {&#39;value&#39;: -0.5635026556509564, &#39;timestamp&#39;: 1732226531.839315}},</span>
<span class="go"> {&#39;x&#39;: {&#39;value&#39;: -1.1288910936898935, &#39;timestamp&#39;: 1732226532.840343}},</span>
<span class="go"> {&#39;x&#39;: {&#39;value&#39;: -1.898038831595069, &#39;timestamp&#39;: 1732226533.841579}},</span>
<span class="go"> {&#39;x&#39;: {&#39;value&#39;: -1.096650234609581, &#39;timestamp&#39;: 1732226534.843428}}],</span>
<span class="go">deque([{&#39;x&#39;: {&#39;value&#39;: -0.9410902531690315, &#39;timestamp&#39;: 1733268995.047089}},</span>
<span class="go"> {&#39;x&#39;: {&#39;value&#39;: -0.9661907918551453, &#39;timestamp&#39;: 1733268996.04836}},</span>
<span class="go"> {&#39;x&#39;: {&#39;value&#39;: -0.4738633303106927, &#39;timestamp&#39;: 1733268997.049465}},</span>
<span class="go"> {&#39;x&#39;: {&#39;value&#39;: -0.7382240357400207, &#39;timestamp&#39;: 1733268998.051461}}],</span>
<span class="go"> maxlen=5)</span>
</pre></div>
</div>
Expand Down

0 comments on commit 3389fb2

Please sign in to comment.