Skip to content

Commit 4c1819c

Browse files
committed
Use abbreviations in more places
1 parent b5a99f9 commit 4c1819c

File tree

11 files changed

+26
-26
lines changed

11 files changed

+26
-26
lines changed

doc/architectural_decisions/003-run-in-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Current
88

99
`bluesky` code can be run in several ways:
1010
- By the user at an interactive shell, directly calling the run engine in-process.
11-
- Underneath {py:obj}`run_plan()<ibex_bluesky_core.run_engine.run_plan>` if a plan/plan stub is to be run programmatically, which in turn calls the run engine.
11+
- Underneath {py:obj}`~ibex_bluesky_core.run_engine.run_plan` if a plan/plan stub is to be run programmatically, which in turn calls the run engine.
1212
- By a central worker process, to which the user would "submit" plans to run.
1313
- See DLS's `blueapi` for an example of a REST API for submitting plans to the run engine.
1414

doc/architectural_decisions/007-output-file-archiving.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ Accepted
77
## Context
88

99
Our bluesky implementation contains bluesky callbacks which produce scientist-facing output files, for example:
10-
- [Human-readable scan result files](/callbacks/file_writing): {py:obj}`HumanReadableFileCallback <ibex_bluesky_core.callbacks.HumanReadableFileCallback>`
11-
- [Fitting results](/callbacks/fitting/livefit_logger): {py:obj}`LiveFitLogger <ibex_bluesky_core.callbacks.LiveFitLogger>`
12-
- [Plot PNGs](#plot_png_saver): {py:obj}`PlotPNGSaver <ibex_bluesky_core.callbacks.PlotPNGSaver>`
10+
- [Human-readable scan result files](/callbacks/file_writing): {py:obj}`~ibex_bluesky_core.callbacks.HumanReadableFileCallback`
11+
- [Fitting results](/callbacks/fitting/livefit_logger): {py:obj}`~ibex_bluesky_core.callbacks.LiveFitLogger`
12+
- [Plot PNGs](#plot_png_saver): {py:obj}`~ibex_bluesky_core.callbacks.PlotPNGSaver`
1313

1414
In addition, we have a {ref}`developer-facing callback for diagnostics <event_doc_cb>`,
15-
{py:obj}`DocLoggingCallback <ibex_bluesky_core.callbacks.DocLoggingCallback>`.
15+
{py:obj}`~ibex_bluesky_core.callbacks.DocLoggingCallback`.
1616

1717
The above callbacks produce files on disk in response to a bluesky scan. These files contain valuable data and so we
1818
need to consider how these files are archived for the long term. This must align with the
@@ -268,7 +268,7 @@ unachievable - it would require too much work relative to using the existing `au
268268

269269
At present, our scan file output format is explicitly designed to be "human-readable" (and, in fact, the callback which
270270
generates these files is explicitly called
271-
{py:obj}`HumanReadableFileCallback <ibex_bluesky_core.callbacks.HumanReadableFileCallback>`).
271+
{py:obj}`~ibex_bluesky_core.callbacks.HumanReadableFileCallback`).
272272

273273
We have [issue 26](https://github.com/ISISComputingGroup/ibex_bluesky_core/issues/26) which will implement
274274
machine-readable files, using a format such as `.hdf5` or `.nxs`. These files will sit alongside the existing

doc/architectural_decisions/008-centre-of-mass.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ A decision needs to be made about whether to make changes to upstream Bluesky so
1010

1111
## Decision
1212

13-
We will be making our own {py:obj}`CentreOfMass <ibex_bluesky_core.callbacks.CentreOfMass>` callback.
13+
We will be making our own {py:obj}`~ibex_bluesky_core.callbacks.CentreOfMass` callback.
1414

1515
## Justification & Consequences
1616

1717
[We attempted to make changes to upstream Bluesky which were rejected](https://github.com/bluesky/bluesky/pull/1878), as it adds limits to the functionality of the callback. We also found other limitations with using their callback, such as not being able to have disordered and non-continuous data sent to it without it skewing the calculated value - we need it to work with disordered and non-continuous data as we need to be able to run continuous scans.
1818

19-
We currently only need to support positive peaks, but in future a toggle could be added to {py:obj}`CentreOfMass <ibex_bluesky_core.callbacks.CentreOfMass>` to allow for negative peaks.
19+
We currently only need to support positive peaks, but in future a toggle could be added to {py:obj}`~ibex_bluesky_core.callbacks.CentreOfMass` to allow for negative peaks.
2020

2121
This will mean that...
2222
- Our version of the callback will not be supported by Bluesky and may need changes as Bluesky updates.

doc/callbacks/centre_of_mass.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- `min(y)`
77
- Straight-line segments joining `(x, y)` data points with their nearest neighbours along the x axis
88

9-
{py:obj}`~ibex_bluesky_core.callbacks.CentreOfMass` stores its result in the {py:obj}`result <ibex_bluesky_core.callbacks.CentreOfMass.result>` property.
9+
{py:obj}`~ibex_bluesky_core.callbacks.CentreOfMass` stores its result in the {py:obj}`~ibex_bluesky_core.callbacks.CentreOfMass.result` property.
1010

1111
:::{note}
1212
This will return **different** results from the `com` property available from {py:obj}`bluesky.callbacks.fitting.PeakStats` in the following cases:

doc/callbacks/fitting/fitting.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Fitting (`LiveFit`)
1+
# Fitting ({py:obj}`~ibex_bluesky_core.callbacks.LiveFit`)
22

33
Similar to [`LivePlot`](/callbacks/plotting.md), {py:obj}`ibex_bluesky_core.callbacks.LiveFit` provides a thin wrapper around Bluesky's {py:obj}`bluesky.callbacks.LiveFit` class, enhancing it with additional functionality to better support real-time data fitting. This wrapper not only offers a wide selection of models to fit your data on, but also introduces guess generation for fit parameters. As new data points are acquired, the wrapper refines these guesses dynamically, improving the accuracy of the fit with each additional piece of data, allowing for more efficient and adaptive real-time fitting workflows.
44

@@ -10,7 +10,7 @@ from ibex_bluesky_core.callbacks import LiveFit
1010

1111
## Configuration
1212

13-
Below is a full example showing how to use standard {external+matplotlib:doc}`matplotlib <index>` & {external+bluesky:doc}`bluesky <index>` functionality to apply fitting to a scan, using {py:obj}`~ibex_bluesky_core.callbacks.LivePlot` and {py:obj}`~ibex_bluesky_core.callbacks.LiveFit`. The fitting callback is set to expect data to take the form of a Gaussian, using the {py:obj}`ibex_bluesky_core.fitting.Gaussian` model.
13+
Below is a full example showing how to use standard {external+matplotlib:doc}`matplotlib <index>` & {external+bluesky:doc}`bluesky <index>` functionality to apply fitting to a scan, using {py:obj}`~ibex_bluesky_core.callbacks.LivePlot` and {py:obj}`~ibex_bluesky_core.callbacks.LiveFit`. The fitting callback is set to expect data to take the form of a Gaussian, using the {py:obj}`~ibex_bluesky_core.fitting.Gaussian` model.
1414

1515
```python
1616
import matplotlib.pyplot as plt
@@ -78,7 +78,7 @@ Bluesky additionally provides a {py:obj}`bluesky.callbacks.fitting.PeakStats` ca
7878

7979
-------
8080

81-
Each of the above fit classes has a `.fit()` which returns an object of type {py:obj}`ibex_bluesky_core.fitting.FitMethod`. This tells {py:obj}`~ibex_bluesky_core.callbacks.LiveFit` how to perform fitting on the data.
81+
Each of the above fit classes has a `.fit()` which returns an object of type {py:obj}`~ibex_bluesky_core.fitting.FitMethod`. This tells {py:obj}`~ibex_bluesky_core.callbacks.LiveFit` how to perform fitting on the data.
8282

8383
There are *two* ways that you can choose how to fit a model to your data:
8484

doc/callbacks/isiscallbacks.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ Plotting is enabled by default and running a plan with {py:obj}`~ibex_bluesky_co
2828

2929
If a {ref}`fitting method <standard_fitting_models>` is given via the `fit` argument (this is optional), fitting will be enabled. By default, this fit will be shown on a plot.
3030

31-
After a scan has run you can get the fitting results by using the {py:obj}`live_fit <ibex_bluesky_core.callbacks.ISISCallbacks.live_fit>` property.
31+
After a scan has run you can get the fitting results by using the {py:obj}`~ibex_bluesky_core.callbacks.ISISCallbacks.live_fit` property.
3232

3333
## Centre of mass and Peak Stats
3434

35-
These are both enabled by default. To access {py:obj}`~ibex_bluesky_core.callbacks.CentreOfMass` information after a plan, use the {py:obj}`com <ibex_bluesky_core.callbacks.ISISCallbacks.com>` property.
35+
These are both enabled by default. To access {py:obj}`~ibex_bluesky_core.callbacks.CentreOfMass` information after a plan, use the {py:obj}`~ibex_bluesky_core.callbacks.ISISCallbacks.com` property.
3636

37-
To access {external+bluesky:py:obj}`Peak Stats <bluesky.callbacks.fitting.PeakStats>` after a plan use the {py:obj}`peak_stats <ibex_bluesky_core.callbacks.ISISCallbacks.peak_stats>` property.
37+
To access {external+bluesky:py:obj}`~bluesky.callbacks.fitting.PeakStats` after a plan, use the {py:obj}`~ibex_bluesky_core.callbacks.ISISCallbacks.peak_stats` property.
3838

3939
## File output
4040

doc/dev/rbnumberpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RB Number injection preprocessor
22

3-
A {external+bluesky:ref}`plan preprocessor <preprocessors>` exists for the run engine to inject the current RB number into all bluesky start documents. This is added to the run engine by default, but to remove this from the {py:obj}`bluesky.run_engine.RunEngine` use:
3+
A {external+bluesky:ref}`plan preprocessor <preprocessors>` exists for the run engine to inject the current RB number into all bluesky start documents. This is added to the run engine by default, but to remove this from the {py:obj}`~bluesky.run_engine.RunEngine`, use:
44

55
```python
66
RE.preprocessors.pop()

doc/dev/troubleshooting.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,23 @@ Scientist-facing output files are written to `<isis share>\inst$\NDX<inst>\user\
5050
default.
5151

5252
Custom file-output paths can be specified by passing extra arguments to
53-
{py:obj}`HumanReadableFileCallback<ibex_bluesky_core.callbacks.HumanReadableFileCallback>`
53+
{py:obj}`~ibex_bluesky_core.callbacks.HumanReadableFileCallback`
5454
for the "human-readable" files, or
55-
{py:obj}`LiveFitLogger<ibex_bluesky_core.callbacks.LiveFitLogger>`
55+
{py:obj}`~ibex_bluesky_core.callbacks.LiveFitLogger`
5656
for the fit output files. These callbacks may be hidden behind
57-
{py:obj}`ISISCallbacks<ibex_bluesky_core.callbacks.ISISCallbacks>` which also allows specifying output paths.
57+
{py:obj}`~ibex_bluesky_core.callbacks.ISISCallbacks` which also allows specifying output paths.
5858

5959
See [dae_scan manual system test](https://github.com/ISISComputingGroup/ibex_bluesky_core/blob/main/manual_system_tests/dae_scan.py)
60-
for an example of how to configure these output paths using {py:obj}`ISISCallbacks<ibex_bluesky_core.callbacks.ISISCallbacks>`.
60+
for an example of how to configure these output paths using {py:obj}`~ibex_bluesky_core.callbacks.ISISCallbacks`.
6161

6262
### Raw diagnostic data
6363

6464
Raw documents emitted by bluesky are stored in `C:\Instrument\Var\logs\bluesky\raw_documents` - these show the raw
6565
data emitted by bluesky scans. The filenames in this directory correspond to bluesky's scan ID, which is printed to
6666
the console at the end of each scan, and is also included as metadata in the scientist-facing output files.
6767

68-
These files are written by {py:obj}`ibex_bluesky_core.callbacks.DocLoggingCallback`, which is subscribed
69-
to the run engine by default in {py:obj}`ibex_bluesky_core.run_engine.get_run_engine`.
68+
These files are written by {py:obj}`~ibex_bluesky_core.callbacks.DocLoggingCallback`, which is subscribed
69+
to the run engine by default in {py:obj}`~ibex_bluesky_core.run_engine.get_run_engine`.
7070

7171
```{note}
7272
Older raw documents will be moved by the log rotation script to

doc/plan_stubs/polling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ for our usual plotting and fitting callbacks.
66

77
Updates from the readable may be dropped if they occur at a higher rate than updates from the motor position.
88

9-
{py:obj}`ibex_bluesky_core.plans.polling_plan` does not start a bluesky run, so you will need to use a {py:obj}`~bluesky.preprocessors.run_decorator` on an outer plan which calls this plan stub. This is so that _multiple_ continuous moves can be done as part of the same bluesky run.
9+
{py:obj}`~ibex_bluesky_core.plans.polling_plan` does not start a bluesky run, so you will need to use a {py:obj}`~bluesky.preprocessors.run_decorator` on an outer plan which calls this plan stub. This is so that _multiple_ continuous moves can be done as part of the same bluesky run.

doc/plan_stubs/redefining.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ occurs, but the reported position changes to the given position.
55

66
## {py:obj}`~ibex_bluesky_core.plan_stubs.redefine_motor`
77

8-
The {py:obj}`ibex_bluesky_core.plan_stubs.redefine_motor` plan stub can be used to redefine the current
8+
The {py:obj}`~ibex_bluesky_core.plan_stubs.redefine_motor` plan stub can be used to redefine the current
99
position of a motor (for example a {py:obj}`~ibex_bluesky_core.devices.block.BlockMot`) to a new value.
1010

1111
The motor does not physically move, but after this plan stub executes, the current position will be defined
@@ -37,7 +37,7 @@ This behaviour can be controlled with the `sleep` keyword argument to
3737

3838
## {py:obj}`~ibex_bluesky_core.plan_stubs.redefine_refl_parameter`
3939

40-
The {py:obj}`ibex_bluesky_core.plan_stubs.redefine_refl_parameter` plan stub can be used to redefine the current
40+
The {py:obj}`~ibex_bluesky_core.plan_stubs.redefine_refl_parameter` plan stub can be used to redefine the current
4141
position of a {py:obj}`~ibex_bluesky_core.devices.reflectometry.ReflParameter` to a new value.
4242

4343
:::{note}

0 commit comments

Comments
 (0)