Homec4science

Merge remote-tracking branch 'origin/master'

Authored by mikhail.churaev on Oct 29 2020, 00:07.

Description

Merge remote-tracking branch 'origin/master'

  1. Conflicts:
  2. LibGDSpy/Devices/CoupledResonators/TetragonLattice.py

Details

Committed
mikhail.churaevOct 29 2020, 00:07
Pushed
mikhail.churaevOct 29 2020, 00:07
Parents
rGDSPYf81dc7ed21c4: Trimers update
rGDSPY2ac08be48296: harmonic tapered waveguide image
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
2ac08be48296snigirev
harmonic tapered waveguide image 
Oct 28 2020
849671e309dcsnigirev
single resonator with a tapered region coupled to a tapered bus 
Oct 28 2020
6f5544ba7034snigirev
waveguide with a tapered section 
Oct 28 2020
d8f0d98d3021snigirev
ring with a tapered section 
Oct 28 2020
b12edadf01f2snigirev
filled heater and donut heater 
Oct 28 2020
eb6a3a419fd2snigirev
racetrack 
Oct 28 2020
7efca78037e9snigirev
Merge branch 'master' of https://c4science.ch/source/KLab_GDS_Lib into master 
Oct 27 2020
63ed4db331e2snigirev
tetragon lattice added 
Oct 26 2020