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

Extend QCoDeS-Station to be configurable through yaml file #1560

Merged
merged 102 commits into from
May 15, 2019
Merged
Show file tree
Hide file tree
Changes from 95 commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
e6ac534
initial commit from code from qdev wrappers
Dominik-Vogel Sep 3, 2018
f51c327
add ruamel to environment
Dominik-Vogel Sep 3, 2018
fa3715c
add revive option
Dominik-Vogel Sep 3, 2018
3c36b6d
Merge branch 'master' into station_configurator
jenshnielsen Sep 5, 2018
1ac4d60
Merge branch 'master' of git://github.com/QCoDeS/Qcodes into station_…
Dominik-Vogel Sep 7, 2018
6e5d8cb
add ruamel.yaml dependency the right way
Dominik-Vogel Sep 7, 2018
31b3239
fix dynamic method creation in load_file
Dominik-Vogel Sep 7, 2018
1d4c53d
Merge branch 'station_configurator' of github.com:Dominik-Vogel/Qcode…
Dominik-Vogel Sep 7, 2018
97a587a
add as partial not method type, remove methods on the fly
Dominik-Vogel Sep 7, 2018
94053da
Treat monitor parameters as list again
Dominik-Vogel Sep 7, 2018
7ff32f9
move station configurator to station
Dominik-Vogel Sep 7, 2018
ef30daf
fixing get_raw/set_raw ci for `Parameter`
Dominik-Vogel Sep 10, 2018
1201efe
disable warning of hidden method get_raw, set_raw
Dominik-Vogel Sep 10, 2018
0a2ba5f
revert changes to get/set wrapping and make comment explicit
Dominik-Vogel Sep 10, 2018
d291a92
Merge branch 'master' into station_configurator
Dominik-Vogel Sep 10, 2018
1470363
comment pylint disable
Dominik-Vogel Sep 10, 2018
df697a7
enable creation of station without config
Dominik-Vogel Sep 10, 2018
28dc9e4
Merge branch 'station_configurator' of github.com:Dominik-Vogel/Qcode…
Dominik-Vogel Sep 10, 2018
313a8a3
fix additional `.station.`
Dominik-Vogel Sep 11, 2018
a24adac
include Mikails changes for snapshotting and validation
astafan8 Sep 11, 2018
cbed36c
add DRYness
Dominik-Vogel Sep 11, 2018
c5a47fb
Merge branch 'master' into station_configurator
Dominik-Vogel Sep 11, 2018
1aad9dd
remove whitespace
Dominik-Vogel Sep 11, 2018
4889013
Merge branch 'master' of https://github.com/QCoDeS/Qcodes into statio…
Dominik-Vogel Apr 25, 2019
629ed82
remove pyyaml
Dominik-Vogel Apr 25, 2019
4986b29
extract YAML importer to qcodes utils
Dominik-Vogel Apr 25, 2019
ad03d8e
give station some code love
Dominik-Vogel Apr 25, 2019
b447456
refactor load_config_file
Dominik-Vogel Apr 26, 2019
e4adf76
load config dynamically, extract load_config (from string)
Dominik-Vogel Apr 30, 2019
1156e8b
fix enable_forced_reconnect bug
Dominik-Vogel Apr 30, 2019
c1844f9
add tests: instatiation, snapshot, forced_reconnect
Dominik-Vogel Apr 30, 2019
36d8fe5
fix delegate parameter
Dominik-Vogel Apr 30, 2019
f3617f2
improve error message for instrument not found in config
Dominik-Vogel Apr 30, 2019
e43ccf1
enable to change instrument name on init
Dominik-Vogel Apr 30, 2019
960ff0f
add a bunch of tests
Dominik-Vogel Apr 30, 2019
cb33d85
Merge branch 'master' into station_configurator
Dominik-Vogel Apr 30, 2019
8b1adb0
Introduce `get_qcodes_path` which is ci save
Dominik-Vogel May 1, 2019
22489dc
Fix typing
Dominik-Vogel May 1, 2019
b9492d6
Merge branch 'station_configurator' of github.com:Dominik-Vogel/Qcode…
Dominik-Vogel May 1, 2019
56065c4
Apply fixes from codacy
Dominik-Vogel May 2, 2019
c4a1438
Remove unused import
Dominik-Vogel May 2, 2019
8cef3b0
Fix signatures of `get_raw` and `set_raw`
Dominik-Vogel May 2, 2019
011492a
Add `ruamel.yaml` to requirements
Dominik-Vogel May 2, 2019
f7b52b0
Exclusively use ruamel.yaml i.e pip version
Dominik-Vogel May 2, 2019
3d5c269
Use `get_qcodes_path` in all tests
Dominik-Vogel May 2, 2019
b9b9be7
Add separator at the end of `get_qcodes_path`
Dominik-Vogel May 2, 2019
b132a76
Fix case for sims file
Dominik-Vogel May 3, 2019
eb08805
Reformulate comment `StationConfigurator->Station`
astafan8 May 3, 2019
b277193
Apply suggestions from code review
astafan8 May 3, 2019
55c2230
Make station adhere to pep8
Dominik-Vogel May 6, 2019
050c5e0
Update qcodes/tests/test_station.py
astafan8 May 6, 2019
64285d4
Operate on copy of options when adding parameter
Dominik-Vogel May 6, 2019
0978122
Merge branch 'station_configurator' of github.com:Dominik-Vogel/Qcode…
Dominik-Vogel May 6, 2019
2710531
Rename `station_configurator` to station everywhere including config
Dominik-Vogel May 6, 2019
77c142f
Fix indent `assert` for `pytest.raises`
Dominik-Vogel May 6, 2019
3629aa5
Use `Optional` over `Union[x, None]`
Dominik-Vogel May 6, 2019
f6cfa6a
Rename to `station_config_has_been_loaded`
Dominik-Vogel May 6, 2019
05822ce
Fix indentation
Dominik-Vogel May 6, 2019
e87fed2
Add comments to path resolution test
Dominik-Vogel May 6, 2019
0c95182
Fix `simple_mock_station` dependency on example_config
Dominik-Vogel May 6, 2019
b692d43
Update qcodes/tests/test_station.py
astafan8 May 6, 2019
d2e1889
Rename component from `Station` to `Config`
Dominik-Vogel May 6, 2019
bb315dc
Update qcodes/station.py
astafan8 May 7, 2019
a91a44f
Implement Mikhails suggestions
Dominik-Vogel May 7, 2019
502bd7e
Merge branch 'station_configurator' of github.com:Dominik-Vogel/Qcode…
Dominik-Vogel May 7, 2019
723c3c8
Add test for revive instance
Dominik-Vogel May 7, 2019
0c17813
Extract method: `close_and_remove_instrument`
Dominik-Vogel May 7, 2019
2cf7a0f
Refactor `load_instrument`
Dominik-Vogel May 7, 2019
bc5882b
Refactor `load_instrument`
Dominik-Vogel May 7, 2019
c0bca08
Add `test_dynamic_reload_of_file`
Dominik-Vogel May 7, 2019
191b8c9
Add tests for DelegateParameter
Dominik-Vogel May 7, 2019
658ff3c
Export DelegateParameter to qcodes root init
astafan8 May 8, 2019
9b4a7d0
DelegateParameter to parameter.py module docstring
astafan8 May 8, 2019
63702c4
Add example notebook about Station
astafan8 May 8, 2019
e34d72b
Refer Station example notebook in community guide
astafan8 May 8, 2019
acded1e
Refer to Station notebook in snapshots notebook
astafan8 May 8, 2019
6f3a94f
Make `Monitor` optional
Dominik-Vogel May 9, 2019
ebbbe6d
Merge branch 'station_configurator' of github.com:Dominik-Vogel/Qcode…
Dominik-Vogel May 9, 2019
7d343f9
Remove trailing whitespaces
Dominik-Vogel May 9, 2019
aa63d5b
Fix typing, add `checked_getattr`
Dominik-Vogel May 9, 2019
b351b7f
Clean up comment
Dominik-Vogel May 9, 2019
2f52bdf
Remove warning when creating station without default config
Dominik-Vogel May 9, 2019
ea3e8df
Dont convert non-grid dataframe to xarray - slow
astafan8 May 9, 2019
fc000c6
Fix link to Station example notebook in RST docs
astafan8 May 9, 2019
20befaf
Fix lists and links sphinx rendering
astafan8 May 9, 2019
bdc38a8
Fix lists and link rendering in sphinx again
astafan8 May 9, 2019
23d9e3b
Use 'station' qcodes config entry
astafan8 May 9, 2019
d32badd
Improve qcodes config schema for 'station' field
astafan8 May 9, 2019
bfc1574
Add proper fix for slicing multiindex dataframe
astafan8 May 9, 2019
6329a17
Remove warnings from station notebook, minor fixes
astafan8 May 9, 2019
33ebe86
Add important clarifications on add_parameter and exponential numbers…
astafan8 May 9, 2019
b7608cb
Note exponental numbers formal in station notebook
astafan8 May 10, 2019
a1713e0
Note simulated instrument in station notebook
astafan8 May 10, 2019
3768f2f
Fix style in station.py
astafan8 May 10, 2019
d0ceb72
Merge branch 'master' into station_configurator
astafan8 May 10, 2019
7278a53
Implement Jens' commnents
Dominik-Vogel May 15, 2019
36f7846
Make `load_config` public again, as it is used in tests and handy.
Dominik-Vogel May 15, 2019
6c77dde
Fix docstring for :class:`~.Instrument`
Dominik-Vogel May 15, 2019
0d5ec55
Merge branch 'master' into station_configurator
jenshnielsen May 15, 2019
e028a6b
Remove unused import.
Dominik-Vogel May 15, 2019
e4b9260
Merge branch 'station_configurator' of github.com:Dominik-Vogel/Qcode…
Dominik-Vogel May 15, 2019
2e18e2f
Add unused import, that is actually used...
Dominik-Vogel May 15, 2019
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
7 changes: 6 additions & 1 deletion docs/community/objects.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@ to use. Normal text shows the container includes and uses of this object.
Station
-------

Read more about :ref:`station_api`.
A convenient container for instruments, parameters, and more.

More information:

- `Station example notebook <../examples/Station.ipynb>`_
- :ref:`station_api` API reference

.. todo:: is this how we want it ? or like the one below ?
jenshnielsen marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
6 changes: 3 additions & 3 deletions docs/examples/Configuring_QCoDeS.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
" 'defaultcolormap': 'hot'},\n",
" 'user': {'scriptfolder': 'c:\\\\Users\\\\jenielse\\\\myscripts\\\\',\n",
" 'mainfolder': 'c:\\\\Users\\\\jenielse\\\\mymainfolder\\\\'},\n",
" 'station_configurator': {'enable_forced_reconnect': False,\n",
" 'station': {'enable_forced_reconnect': False,\n",
" 'default_folder': 'c:\\\\Users\\\\jenielse\\\\mymainfolder\\\\',\n",
" 'default_file': 'instrument_config.yaml'}}"
]
Expand Down Expand Up @@ -82,7 +82,7 @@
" 'pyqtmaxplots': 100,\n",
" 'defaultcolormap': 'hot'},\n",
" 'user': {'scriptfolder': '.', 'mainfolder': '.'},\n",
" 'station_configurator': {'enable_forced_reconnect': False,\n",
" 'station': {'enable_forced_reconnect': False,\n",
" 'default_folder': '.',\n",
" 'default_file': 'instrument_config.yml'}}"
]
Expand Down Expand Up @@ -235,7 +235,7 @@
" 'defaultcolormap': 'hot'},\n",
" 'user': {'scriptfolder': 'c:\\\\Users\\\\jenielse\\\\myscripts\\\\',\n",
" 'mainfolder': 'c:\\\\Users\\\\jenielse\\\\mymainfolder\\\\'},\n",
" 'station_configurator': {'enable_forced_reconnect': False,\n",
" 'station': {'enable_forced_reconnect': False,\n",
" 'default_folder': 'c:\\\\Users\\\\jenielse\\\\mymainfolder\\\\',\n",
" 'default_file': 'instrument_config.yaml'}}"
]
Expand Down
4 changes: 3 additions & 1 deletion docs/examples/DataSet/Dataset Context Manager.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -6706,7 +6706,9 @@
}
],
"source": [
"datasaver.dataset.get_data_as_pandas_dataframe()['dmm_v1'][0:10].to_xarray()"
"#df_sliced = datasaver.dataset.get_data_as_pandas_dataframe()['dmm_v1'].sort_index()[0:10]\n",
"#df_sliced.index = df_sliced.index.remove_unused_levels()\n",
"#df_sliced.to_xarray()"
]
},
{
Expand Down
17 changes: 9 additions & 8 deletions docs/examples/DataSet/Working with snapshots.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
"# Working with snapshots\n",
"\n",
"Here, the following topics are going to be covered:\n",
"* What is a snapshot\n",
"* How to create it\n",
"* How it is saved next to the measurement data\n",
"* How to extract snapshot from the dataset"
"\n",
"- What is a snapshot\n",
"- How to create it\n",
"- How it is saved next to the measurement data\n",
"- How to extract snapshot from the dataset"
]
},
{
Expand Down Expand Up @@ -272,9 +273,9 @@
"\n",
"Experimental setups are large, and instruments tend to be quite complex in that they comprise many parameters and other stateful parts. It would be very time-consuming for the user to manually go through every instrument and parameter, and collect the snapshot data.\n",
"\n",
"Here is where the concept of station comes into play. Instruments, parameters, and other submodules can be added to a station. In turn, the station has its `snapshot` method that allows to create a collective, single snapshot of all the instruments, parameters, and submodules.\n",
"Here is where the concept of station comes into play. Instruments, parameters, and other submodules can be added to a [Station object](../Station.ipynb) ([nbviewer.jupyter.org link](https://nbviewer.jupyter.org/github/QCoDeS/Qcodes/tree/master/docs/examples/Station.ipynb)). In turn, the station has its `snapshot` method that allows to create a collective, single snapshot of all the instruments, parameters, and submodules.\n",
"\n",
"Note that in this article the focus is on the snapshot feature of the QCoDeS `Station`, while it has some other (mostly legacy) features."
"Note that in this article the focus is on the snapshot feature of the QCoDeS `Station`, while it has some other features (also some legacy once)."
]
},
{
Expand Down Expand Up @@ -799,7 +800,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python [default]",
"language": "python",
"name": "python3"
},
Expand All @@ -813,7 +814,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.6"
"version": "3.6.8"
},
"toc": {
"base_numbering": 1,
Expand Down
Loading