Commits · dee44cc4f77cc853f42b4dd5c19a4f7e28d70e71 · Institute of Experimental Physics / Quantum Circuits / python-repo

29 Mar, 2018 1 commit
- Progress on data_grid · dee44cc4
  Christian Schneider authored Mar 29, 2018
  
  dee44cc4
28 Mar, 2018 5 commits
- Cleaned plotting function · 9574b8cf
  Christian Schneider authored Mar 28, 2018
  
  9574b8cf
- Merged data_xy to data_table · 81676722
  Christian Schneider authored Mar 28, 2018
  
  81676722
- Updated version to __version__ · 43c7dd04
  Christian Schneider authored Mar 28, 2018
  
  43c7dd04
- Implemented setter for x and y · c2bfc619
  Christian Schneider authored Mar 28, 2018
  
  c2bfc619
- Added name_x and name_y variable · dfdfcde0
  Christian Schneider authored Mar 28, 2018
  
  dfdfcde0
21 Mar, 2018 9 commits
- Bugfix in legend · 2dd90a10
  Christian Schneider authored Mar 21, 2018
  
  2dd90a10
- Implemented plot_multiple function · 6c49525e
  Christian Schneider authored Mar 21, 2018
  
  6c49525e
- Bugfix · 992c147e
  Christian Schneider authored Mar 21, 2018
  
  992c147e
- Merge branch 'master' into MonitorLocal · d46015ca
  Christian Schneider authored Mar 21, 2018
```
# Conflicts:
#	DataModule/data_complex.py
#	DataModule/functions.py
#	DataModule/version.py
#	IQCALIBRATION.py
#	Instruments/SA.py
#	Monitor/main.py
#	Monitor/static/dashboard.css
#	QUBEXP-v1.py
#	QUBEXP.py
#	QUBEXPOLDDEV.py
#	QUBEXPSDR.py
```
  d46015ca
- Added delay plot when delay is given manually. · 45ab95ba
  Christian Schneider authored Mar 21, 2018
  
  45ab95ba
- Modularized plot_steps function. Now every function/plot can acquired itself. · 61969294
  Christian Schneider authored Mar 21, 2018
  
  61969294
- Merge remote-tracking branch 'origin/master' · 2c3bb107
  Christian Schneider authored Mar 21, 2018
  
  2c3bb107
- Updated get_no_of_photons and get_no_of_photons_full_info · 3e4e8fbf
  Christian Schneider authored Mar 21, 2018
  
  3e4e8fbf
- Implemented data_c (as replacement for data_complex) · d3ba288a
  Christian Schneider authored Mar 21, 2018
  
  d3ba288a
20 Mar, 2018 4 commits
- Implemented data_c (as replacement for data_complex) · ba446a3d
  Christian Schneider authored Mar 20, 2018
  
  ba446a3d
- Implemented smooth and improved import function · ff506988
  Christian Schneider authored Mar 20, 2018
  
  ff506988
- Merge branch 'oscar_dev' into 'master' · 4f2420f3
  User expired authored Mar 20, 2018
```
Oscar dev

See merge request !70
```
  4f2420f3
- Fixed BSOD under windows · e43a3091
  User expired authored Mar 20, 2018
  
  e43a3091
19 Mar, 2018 8 commits
- Merge branch 'master' into oscar_dev · f388e6af
  User expired authored Mar 19, 2018
  
  f388e6af
- updates to QUBEXP · 3391bb3f
  User expired authored Mar 19, 2018
  
  3391bb3f
- added extract_y · 4ceb62b1
  Christian Schneider authored Mar 19, 2018
  
  4ceb62b1
- added extract_y · ab6b1a84
  Christian Schneider authored Mar 19, 2018
  
  ab6b1a84
- Implemented extract functions for data_grid · 286158c9
  Christian Schneider authored Mar 19, 2018
  
  286158c9
- Implemented Plot Function · 21c7e5d6
  Christian Schneider authored Mar 19, 2018
  
  21c7e5d6
- Xarray implementation for data_grid · 42fb1066
  Christian Schneider authored Mar 19, 2018
  
  42fb1066
- Implementing holoviews datashader for datamodule · 0f857872
  Christian Schneider authored Mar 19, 2018
  
  0f857872
11 Mar, 2018 3 commits
- Adapted data_line for data_table structure · 4e9057a1
  Christian Schneider authored Mar 11, 2018
  
  4e9057a1
- Work on data_table structure · b54045fc
  Christian Schneider authored Mar 11, 2018
  
  b54045fc
- Mitigrating to data_table/data_grid structure · db41e639
  Christian Schneider authored Mar 11, 2018
  
  db41e639
09 Mar, 2018 7 commits
- Merge branch 'oscar_dev' into 'master' · 8e8b623e
  User expired authored Mar 09, 2018
```
Oscar dev

See merge request !69
```
  8e8b623e
- corrected lorentzian function · bff27bde
  User expired authored Mar 09, 2018
  
  bff27bde
- Merge branch 'master' into oscar_dev · 709fc507
  User expired authored Mar 09, 2018
  
  709fc507
- Several updates to QUBEXP and added some function to UtilitiesLib · c40ec3e6
  User expired authored Mar 09, 2018
  
  c40ec3e6
- Changed Oscar changes to lazy variables · a91e6ee5
  Christian Schneider authored Mar 09, 2018
  
  a91e6ee5
- Merge branch 'oscar_dev' into 'master' · d1fd5528
  Christian Schneider authored Mar 09, 2018
```
Oscar dev

See merge request !68
```
  d1fd5528
- Merge branch 'master' into 'oscar_dev' · e0315c7e
  Christian Schneider authored Mar 09, 2018
```
# Conflicts:
#   DataModule/version.py
```
  e0315c7e
08 Mar, 2018 3 commits
- Changed version number · 3e6a5cbc
  Christian Schneider authored Mar 08, 2018
  
  3e6a5cbc
- Changed colors again · e4b3cb6d
  Christian Schneider authored Mar 08, 2018
  
  e4b3cb6d
- Bugfix · 55a0801d
  Christian Schneider authored Mar 08, 2018
  
  55a0801d