Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docs #213

Merged
merged 42 commits into from
Oct 1, 2024
Merged

Docs #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
a91f4cb
linked nb to root folder, deleted dupes
plesiopterys Apr 4, 2024
7e8c458
added requirements nbsphinx-link pytest
plesiopterys Apr 4, 2024
36c96da
renamed example 6 in notebooks.rst so file gets included
plesiopterys Apr 4, 2024
cdd0b0b
new branch
plesiopterys Apr 9, 2024
7bdc4ac
Merge branch 'main' of https://github.com/sandialabs/pyscan into plot…
plesiopterys Apr 9, 2024
b773f5c
testing in progress
plesiopterys Apr 11, 2024
9d28493
feature: plot generator handles 3D data for 2D plots
plesiopterys Apr 25, 2024
638c4dc
update from main
plesiopterys Apr 25, 2024
591b497
docstrings fixed to not have Properties (breaking the docs build)
plesiopterys Apr 25, 2024
e55062c
trying to make docs build
plesiopterys Apr 25, 2024
d4c25be
flake8 fix
plesiopterys Apr 25, 2024
352e68f
flake8 fix
plesiopterys Apr 25, 2024
0b746f6
Update __init__.py
plesiopterys Apr 25, 2024
2ad8630
Merge branch 'main' of https://github.com/sandialabs/pyscan into plot…
rsbrost May 13, 2024
d9b9796
implemented experiment killswitch into live_plot_funtion so that user…
rsbrost May 13, 2024
dba302d
added note for using this new feature.
rsbrost May 13, 2024
241fee2
additionally implemented killswitch in experiment.py. May want to onl…
rsbrost May 14, 2024
1e39892
added killswitch ability to experiments that can run liveplots while …
rsbrost May 14, 2024
e717e33
including the killswitch demo_nb in this commit since I moved it out …
rsbrost May 14, 2024
cd2b930
fix: tried updating killswitch example notebook to skip last cell on …
rsbrost May 14, 2024
1be0de8
deleting extranneous files
rsbrost May 23, 2024
f36280f
merged from main
rsbrost May 23, 2024
a7af1f8
updated keithley2260b doc string to match other syntax for documentat…
rsbrost May 23, 2024
3e204d1
updated syntax to be kill_switch rather than killswitch
rsbrost May 23, 2024
63205b9
removing kill switch from plotting branch.
rsbrost May 23, 2024
37c1fc6
cleaning up...
rsbrost May 23, 2024
c66064a
cleaning up...
rsbrost May 23, 2024
f999285
chore: pulled from main.
rsbrost Jun 10, 2024
3502a7d
feat: Added live_multi_plot function
plesiopterys Aug 6, 2024
9897f3a
fixed live multiplot display issues
plesiopterys Aug 7, 2024
72be5b8
fix get_pyscan_version in run_info to work without -e install
plesiopterys Aug 9, 2024
f953665
added -e to installation instructions in docs
plesiopterys Aug 9, 2024
f92dcc3
Added advanced notebooks to docs
plesiopterys Aug 12, 2024
fe68b3f
2 levels shown on secondary sidebar
plesiopterys Aug 12, 2024
254047a
docs: renaming advanced demo notebooks to begin with an a so their nu…
rsbrost Sep 18, 2024
b341479
revert(general): restoring main version of get_pyscan_version.
rsbrost Sep 18, 2024
9d3558e
revert(measurement): restoring main version of run_info.py.
rsbrost Sep 18, 2024
b28d2c7
Merge branch 'main' of https://github.com/sandialabs/pyscan into docs
rsbrost Sep 26, 2024
21d088c
chore: incrementally removing plotting PR changes from docs branch.
rsbrost Sep 26, 2024
b5f7cb4
chore: incrementally removing plotting PR changes from docs branch - …
rsbrost Sep 26, 2024
98e3580
chore: incrementally removing plotting PR changes from docs branch - …
rsbrost Sep 26, 2024
a39196e
Merge branch 'main' of https://github.com/sandialabs/pyscan into docs
rsbrost Oct 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion docs/source/advanced_usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,12 @@ Advanced Usage
:maxdepth: 2

advanced/writing_a_driver
advanced/nested_experiments
advanced/nested_experiments

Demo Notebooks
==============

.. toctree::
:maxdepth: 2

advanced/advanced_notebooks
2 changes: 1 addition & 1 deletion docs/source/api_index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ API
===

.. toctree::
:maxdepth: 3
:maxdepth: 4

api/general
api/measurement
Expand Down
4 changes: 3 additions & 1 deletion docs/source/basics/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ git clone https://github.com/sandialabs/pyscan
3. Install pyscan with

```
pip install .
pip install -e .
```

The `-e` makes the package editable, so that if you make modifications to your drivers, for example, you don't need to reinstall the package. This is the recommended method of installation since pyscan is largely intended to be modified when you add drivers for new instruments.

## Additional Requirements

Some instruments require extra installations in order to use them. For example, Ocean Optics (now known as Ocean Insight) spectrometers require the python package `seabreeze`. Thorlabs drivers may also require the installation of proprietary .dll files available on their website by installing Thorlabs Kinesis.
8 changes: 1 addition & 7 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
# "collapse_navigation": not is_release_build,
"show_prev_next": True,
"navbar_align": "left",
"show_toc_level": 2,
# social media links
"icon_links": [
{
Expand All @@ -91,7 +92,6 @@
"icon": "fab fa-github-square",
}
],
"primary_sidebar_end": [],
"use_edit_page_button": True,
}

Expand All @@ -103,9 +103,3 @@
"github_repo": "https://github.com/sandialabs/pyscan",
"github_version": "main",
}

html_sidebars = {
# default is
# "**": ["sidebar-nav-bs", "sidebar-ethical-ads"],
"**": ["sidebar-nav-bs"]
}
1 change: 0 additions & 1 deletion pyscan/measurement/experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class Experiment(AbstractExperiment):
The path to save the data, defaults to './backup'
verbose: bool, optional
Indicates whether to print status updates, defaults to `False`

'''

def __init__(self, runinfo, devices, data_dir=None, verbose=False, time=False):
Expand Down
Loading