Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
OpenQlab
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
las-nq
OpenQlab
Commits
1ac40d7e
Commit
1ac40d7e
authored
5 years ago
by
Christian Darsow-Fromm
Browse files
Options
Downloads
Plain Diff
Merge tag 'v0.1.10.1' into develop
nqlab version update fix
parents
f06c9e5c
a99931ca
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+2
-3
2 additions, 3 deletions
.gitlab-ci.yml
Pipfile.lock
+70
-70
70 additions, 70 deletions
Pipfile.lock
src/openqlab/analysis/gaussian_beam.py
+5
-5
5 additions, 5 deletions
src/openqlab/analysis/gaussian_beam.py
with
77 additions
and
78 deletions
.gitlab-ci.yml
+
2
−
3
View file @
1ac40d7e
...
@@ -157,11 +157,10 @@ update nqlab version:
...
@@ -157,11 +157,10 @@ update nqlab version:
-
git checkout master
-
git checkout master
# change openqlab version in requirements
# change openqlab version in requirements
-
sed -i '/openqlab.*/d' requirements.txt
-
sed -i "s/openqlab.*/openqlab = \">=$VERSION\"/" Pipfile
-
echo "openqlab>=$VERSION" >> requirements.txt
# push changes
# push changes
-
git add
requirements.txt
-
git add
Pipfile
-
git commit -m "openqlab version $VERSION"
-
git commit -m "openqlab version $VERSION"
-
git push
-
git push
...
...
This diff is collapsed.
Click to expand it.
Pipfile.lock
+
70
−
70
View file @
1ac40d7e
...
@@ -308,30 +308,30 @@
...
@@ -308,30 +308,30 @@
},
},
"scipy"
:
{
"scipy"
:
{
"hashes"
:
[
"hashes"
:
[
"sha256:
00e54b1097e4dc91347977874cfabd4bcc8285b2c3fee176e538588c0f84035c
"
,
"sha256:
1b51721e5792c4d722e0cab4daf82187d5f22f2e42c56cd247398a16e4d2f48d
"
,
"sha256:
04e10d4a758ddc6b83fa62469510b807901883760306d86db37921180d8366b7
"
,
"sha256:
1e46825a4b810e2c36cfebecbad09edfd14b74a43f6146343ec96c62659e4573
"
,
"sha256:
08da7047f1
7e38
d45e09bda565512a62808b1c896edb54abbcd2e39dfa0588f4
"
,
"sha256:
203ba7ab52270e392e
7e
4
38
34ffbe94fae09ca7f03113a11170cd36d0826eece
"
,
"sha256:
19ab29d38c3e574d631fc42487a1edc19c7f970269389a4debf7d8b12d808e20
"
,
"sha256:
204667ab336e9087a9bcd2be37b540703aef7b6f9a4fd776186d18b8b972f24a
"
,
"sha256:
1b2a564ea79da573cf9a481c71e70a7d6898ec59ab802b7fc46ce886baa4dbbf
"
,
"sha256:
2d5b67afa5f5e0cf60dc747327c5be15cde434bed9c96743019886f86bfe0918
"
,
"sha256:
2eb614a45a4bc35c1fd01602743b73c4b0798e46080f7099b8c247cabedba3bf
"
,
"sha256:
31f7cfa93b01507c935c12b535e24812594002a02a56803d7cd063e9920d25e8
"
,
"sha256:3
31d2bac603479ad845e6df136b1fab8c086eaef9da73c84cf22cd59ac9b2a14
"
,
"sha256:3
9e9571ae080c149f4b5324836e7ee06a7e331e77f0d6d55f9c6ab7266cd875a
"
,
"sha256:
37a2faa3aa6d9783e07aa52409bed0ba8bfc6e3e750ae7987bc038f1ee6854a6
"
,
"sha256:
4061d71c0f143f3985d2ea9ebc4c1d86eff6df79318f265a5fdb23527811f5b2
"
,
"sha256:4
33a549ad92d4ba96b3c11ca3b6a43346a50303f7b9423acd92d9fb2d43b9534
"
,
"sha256:4
61ca398ac6cb46bc89bdbc9f6a81c0302ee370cebe8be682c84a51977e21ded
"
,
"sha256:6
dc2634ddc7968b55665b65f1e4fa970a7acdc44b0b8ec710c616d03018fe80b
"
,
"sha256:6
fcc1e8b47c332bb0a558d7529ede0990ea5ff822a9a4392b003adad8e0b31b8
"
,
"sha256:7
f84cd16a13423e5caf1d1c6265d4075313eff421251da7dbc9116c102f962c3
"
,
"sha256:7
2e644285a39aa64aaef7373fcbbed998aa7a550dc073d910d712a9380eba8b1
"
,
"sha256:
86ac119d107371194a9158b4d940a325de1d6f997acc70497b691f58e227e3c8
"
,
"sha256:
ab35718a2dd58089fbbdf3bcf1bb368a2ec99314de58f65d5d9a1cc8a1f49419
"
,
"sha256:
885f60ad9166acead66afb40d36b6c7f5bcc6ad495333e8a1eb5f2afdb4da09
8"
,
"sha256:
b51597ed8c1d3f2f07e537fb492a2c3659e477c502ad93c7e241f39ae9e21a7
8"
,
"sha256:
acd81d06cc3c8ab3a0e514db3b844abccfbf455f77dc79b969431fd61f2b29c
e"
,
"sha256:
bbb21e998e136e1fdfd77e808abf16c72e75c6ffbb87f4b5a41f19c9a4b3e2d
e"
,
"sha256:
bd05f8a0c7e773a7e6102cbf6984f54e74f2f41af95cb007e81e7a313347a
63
9
"
,
"sha256:
c1fe5826d26b684d5a690099d56f010a4bdd916e32f9fc0e0898c22551fdc
63
5
"
,
"sha256:
d07ea1bbe4e77835c266ea0e9108e6e3dc31327b734c003c203c6164f9c116cb
"
,
"sha256:
c2722813ff63bb1f0fb3c75253a85a16c2b0ecc8c4f999f666a7788bf7c6e4c3
"
,
"sha256:
d45319e0c2218f50bce99b3c887fe6394f6a823786fd5b343de29be122efc253
"
,
"sha256:
cdbcfbe97a21fc6b3c55991a7bcd6a278a38bd197e2d274a45611cdc91beb5c0
"
,
"sha256:
db023118e60ed5a5b41e8851bb294d24196f01677a66f8b41b917f7e9fca3f6f
"
,
"sha256:
e47f4d0be4fc6985c789d24898ad65daec781c7f5da4a3d4c76ed9af285306ba
"
,
"sha256:
dc86610b8386e1a2f927271d0815eed2d27a498ee79a9729c50372f87e1eca2a
"
,
"sha256:
e588454fd6899d93b73d648d4d90d3d1285c91d08530a6ab94826676c862cabc
"
,
"sha256:
e29cf828929f1aadba8fb93a5dccc03703da139e5366fb57dc69f14417258bcd
"
,
"sha256:
fa39935d7db5066a1b88575fdb196bb576474a17987637430df6bede311906be
"
,
"sha256:f
ceb14784f3bc7471f9fb43474956fdf7e2d14357a07fba9ba90b7a7aa91e5f2
"
"sha256:f
b4b6c26e39375e0cb56d05508c1b43515589725f903c9250940fca906e909fd
"
],
],
"index"
:
"pypi"
,
"index"
:
"pypi"
,
"version"
:
"==1.4.0
rc2
"
"version"
:
"==1.4.0"
},
},
"six"
:
{
"six"
:
{
"hashes"
:
[
"hashes"
:
[
...
@@ -582,39 +582,39 @@
...
@@ -582,39 +582,39 @@
},
},
"coverage"
:
{
"coverage"
:
{
"hashes"
:
[
"hashes"
:
[
"sha256:0
18e74df50a58fd2aaa7efeb301d1599d8fd3cc5c92388506e45a2bd0154c003
"
,
"sha256:0
cd13a6e98c37b510a2d34c8281d5e1a226aaf9b65b7d770ef03c63169965351
"
,
"sha256:
0e08415f35cc57b6eb93fb31ec48a2a169ab838e12ac22106cf9baee4938e46
d"
,
"sha256:
1a4b6b6a2a3a6612e6361130c2cc3dc4378d8c221752b96167ccbad94b47f3c
d"
,
"sha256:
1f9c1d9692339a7ec5cf3ba4475fb648675f438db3413b3d98e2c9ed30ac956c
"
,
"sha256:
2ee55e6dba516ddf6f484aa83ccabbb0adf45a18892204c23486938d12258cde
"
,
"sha256:
2643ec874d3aa30a65a36e42042424ce08f80a948e1c942d3d78
7489
ae318a64
"
,
"sha256:
3be5338a2eb4ef03c57f20917e1d12a1fd10e3853fed060b6d6b677cb3
74
5
89
8
"
,
"sha256:
28a19392a6c4616a76e059a03118c8cca28af46d9e72032590ce329e6b30ac4
0"
,
"sha256:
44b783b02db03c4777d8cf71bae19eadc171a6f2a96777d916b2c30a1eb3d07
0"
,
"sha256:
32c6be8ba90aa885a4900a0187de44f51730c0660c45de3b943c40f1547d47c2
"
,
"sha256:
475bf7c4252af0a56e1abba9606f1e54127cdf122063095c75ab04f6f99cf45e
"
,
"sha256:4
a8b839c3a5579502ffecd4519533d406ad2bec1488724cee4b2c79dd6cbea79
"
,
"sha256:4
7c81ee687eafc2f1db7f03fbe99aab81330565ebc62fb3b61edfc2216a550c8
"
,
"sha256:
5061a8c4bba83b7613077d6cfa8e81381c80f134dc7f02853c3235b38f76b8a6
"
,
"sha256:
4a7f8e72b18f2aca288ff02255ce32cc830bc04d993efbc87abf6beddc9e56c0
"
,
"sha256:5
4770fe39bb4718b5a07665e1f4c676382d6927299ab736149618f0d37d72e85
"
,
"sha256:5
0197163a22fd17f79086e087a787883b3ec9280a509807daf158dfc2a7ded02
"
,
"sha256:5
a237fa332721721545e88fbed42e79acbe9c77be8310c167ec5449df44dac7c
"
,
"sha256:5
6b13000acf891f700f5067512b804d1ec8c301d627486c678b903859d07f798
"
,
"sha256:
607ed848b1373b161629d0c8228d90dd47ecb342f1f800dc41ebd0bce2432e24
"
,
"sha256:
79388ae29c896299b3567965dbcd93255f175c17c6c7bca38614d12718c47466
"
,
"sha256:
65929e8d15999450d09117114ee185948bc77637e868daff5f5ab47219e1e7b6
"
,
"sha256:
79fd5d3d62238c4f583b75d48d53cdae759fe04d4fb18fe8b371d88ad2b6f8be
"
,
"sha256:
67a0f5c50503a6226e28fb7ee3c3aa1a104681460d5123eeb80e6afb65ba46a5
"
,
"sha256:
7fe3e2fde2bf1d7ce25ebcd2d3de3650b8d60d9a73ce6dcef36e20191291613d
"
,
"sha256:
6a70362452ea9c09efe1a7faa365f6603f4a0ef54306a6e5a46e6e32913536fc
"
,
"sha256:
81042a24f67b96e4287774014fa27220d8a4d91af1043389e4d73892efc89ac6
"
,
"sha256:
6cf4502b0087f06906059a718e02b231a9f611ae34794a955baa2e443d5064ad
"
,
"sha256:
81326f1095c53111f8afc95da281e1414185f4a538609a77ca50bdfa39a6c207
"
,
"sha256:
73f596fcd93d76579b4aefa53b7cf5df90d953a8fd94ebfc9b36d0ba47db4236
"
,
"sha256:
8873dc0d8f42142ea9f20c27bbdc485190fff93823c6795be661703369e5877d
"
,
"sha256:
77c90b0a221e6355c771f1b9a6ed45c384f9dff00836823a732f5fe4224cb43a
"
,
"sha256:
88d2cbcb0a112f47eef71eb95460b6995da18e6f8ca50c264585abc2c473154b
"
,
"sha256:
8524e47b78fc7eea96a25717e
77
9
c5
e
66
57536515dd57dfd1110aff34dc747b6
"
,
"sha256:
91f2491aeab9599956c45a
77c566
6d323efdec790bfe23fcceafcd91105d585a
"
,
"sha256:
85b8db2e8c7e9bdf44e4b5859be2cbeaf73e54cf7cecd6c6705f010110581840
"
,
"sha256:
979daa8655ae5a51e8e7a24e7d34e250ae8309fd9719490df92cbb2fe2b0422b
"
,
"sha256:9
0389fea98570dc1f155ceae40972fcf798954467c69d810e385b170c34205cd
"
,
"sha256:9
c871b006c878a890c6e44a5b2f3c6291335324b298c904dc0402ee92ee1f0be
"
,
"sha256:
9e48182563c7861c47593a4b931a6d57e4e499027913e5fdc61efc0d368e804a
"
,
"sha256:
a6d092545e5af53e960465f652e00efbf5357adad177b2630d63978d85e46a72
"
,
"sha256:
a5a5f3a9167a5316d675932e455925e136b1e33d15ce48692b94af746736260e
"
,
"sha256:
b5ed7837b923d1d71c4f587ae1539ccd96bfd6be9788f507dbe94dab5febbb5d
"
,
"sha256:
a7f3be4952f25a0cb8c275cdf064c3ba1765e370f337b015e84a00bb6244c
86
b
"
,
"sha256:
ba259f68250f16d2444cbbfaddaa0bb20e1560a4fdaad50bece25c199e6af
86
4
"
,
"sha256:b
2de4918d6d4aea7fe2b6ef778190f60ff4355248045d7b1fbb35922e0ceb39e
"
,
"sha256:b
e1d89614c6b6c36d7578496dc8625123bda2ff44f224cf8b1c45b810ee7383f
"
,
"sha256:
b72f1b6f27cf67b74370cc9df6b7f47546669861aad660587a7c6f2a01728840
"
,
"sha256:
c1b030a79749aa8d1f1486885040114ee56933b15ccfc90049ba266e4aa2139f
"
,
"sha256:
b9b8189f6f8c4a2a09142d95a11f91dff2cac30c9c0b5ab61e3e0a785e960b94
"
,
"sha256:
c95bb147fab76f2ecde332d972d8f4138b8f2daee6c466af4ff3b4f29bd4c19e
"
,
"sha256:
bd31b194b42e0de4c29fd2c56ad0c493639bcb792c48b694b18568f65f0c2c6d
"
,
"sha256:
d52c1c2d7e856cecc05aa0526453cb14574f821b7f413cc279b9514750d795c1
"
,
"sha256:
be732dcc0e9ca31a15ab5ba116ed7af9b5a046d035a00555ad593f4ddfeb7a00
"
,
"sha256:
d609a6d564ad3d327e9509846c2c47f170456344521462b469e5cb39e48ba31c
"
,
"sha256:
bf4131b04dc2bf35e091b2c759d9e741876a235427c001c6d20147cf29797691
"
,
"sha256:
e1bad043c12fb58e8c7d92b3d7f2f49977dcb80a08a6d1e7a5114a11bf819fca
"
,
"sha256:
d3021b26f86118c447afccbd53b443dc25b4848f9ae49ffb4b9588cb5110d360
"
,
"sha256:
e5a675f6829c53c87d79117a8eb656cc4a5f8918185a32fc93ba09778e90f6db
"
,
"sha256:
d500eb1db73cd5cfe28755c790fcb4e3c653b70d30d0ddf79fde3cc603d3789f
"
"sha256:
fec32646b98baf4a22fdceb08703965bd16dea09051fbeb31a04b5b6e72b846c
"
],
],
"version"
:
"==5.0
b2
"
"version"
:
"==5.0"
},
},
"cryptography"
:
{
"cryptography"
:
{
"hashes"
:
[
"hashes"
:
[
...
@@ -679,11 +679,11 @@
...
@@ -679,11 +679,11 @@
},
},
"ipython"
:
{
"ipython"
:
{
"hashes"
:
[
"hashes"
:
[
"sha256:
c66c7e27239855828a764b1e8fc72c24a6f4498a2637572094a78c5551fb9d51
"
,
"sha256:
190a279bd3d4fc585a611e9358a88f1048cc57fd688254a86f9461889ee152a6
"
,
"sha256:
f186b01b36609e0c5d0de27c7ef8e80c990c70478f8c880863004b3489a9030e
"
"sha256:
762d79a62b6aa96b04971e920543f558dfbeedc0468b899303c080c8068d4ac2
"
],
],
"index"
:
"pypi"
,
"index"
:
"pypi"
,
"version"
:
"==7.10.
1
"
"version"
:
"==7.10.
2
"
},
},
"ipython-genutils"
:
{
"ipython-genutils"
:
{
"hashes"
:
[
"hashes"
:
[
...
@@ -850,10 +850,10 @@
...
@@ -850,10 +850,10 @@
},
},
"parso"
:
{
"parso"
:
{
"hashes"
:
[
"hashes"
:
[
"sha256:
63854233e1fadb5da97f2744b6b24346d2750b85965e7e399bec1620232797dc
"
,
"sha256:
55cf25df1a35fd88b878715874d2c4dc1ad3f0eebd1e0266a67e1f55efccfbe1
"
,
"sha256:
666b0ee4a7a1220f65d367617f2cd3ffddff3e205f3f16a0284df30e774c2a9c
"
"sha256:
5c1f7791de6bd5dbbeac8db0ef5594b36799de198b3f7f7014643b0c5536b9d3
"
],
],
"version"
:
"==0.5.
1
"
"version"
:
"==0.5.
2
"
},
},
"pathspec"
:
{
"pathspec"
:
{
"hashes"
:
[
"hashes"
:
[
...
@@ -966,11 +966,11 @@
...
@@ -966,11 +966,11 @@
},
},
"pytest"
:
{
"pytest"
:
{
"hashes"
:
[
"hashes"
:
[
"sha256:6
3344a2e3bce2e4d522fd62b4fdebb647c019f1f9e4ca075debbd13219db4418
"
,
"sha256:6
b571215b5a790f9b41f19f3531c53a45cf6bb8ef2988bc1ff9afb38270b25fa
"
,
"sha256:
f67403f33b2b1d25a6756184077394167fe5e2f9d8bdaab30707d19ccec35427
"
"sha256:
e41d489ff43948babd0fad7ad5e49b8735d5d55e26628a58673c39ff61d95de4
"
],
],
"index"
:
"pypi"
,
"index"
:
"pypi"
,
"version"
:
"==5.3.
1
"
"version"
:
"==5.3.
2
"
},
},
"pytest-cov"
:
{
"pytest-cov"
:
{
"hashes"
:
[
"hashes"
:
[
...
@@ -1092,11 +1092,11 @@
...
@@ -1092,11 +1092,11 @@
},
},
"sphinx"
:
{
"sphinx"
:
{
"hashes"
:
[
"hashes"
:
[
"sha256:
3b16e48e791a322d584489ab28d8800652123d1fbfdd173e2965a31d40bf22d7
"
,
"sha256:
0a11e2fd31fe5c7e64b4fc53c2c022946512f021d603eb41ac6ae51d5fcbb574
"
,
"sha256:
559c1a8ed1365a982f77650720b41114414139a635692a23c2990824d0a84cf2
"
"sha256:
138e39aa10f28d52aa5759fc6d1cba2be6a4b750010974047fa7d0e31addcf63
"
],
],
"index"
:
"pypi"
,
"index"
:
"pypi"
,
"version"
:
"==2.
2.2
"
"version"
:
"==2.
3.0
"
},
},
"sphinx-markdown-tables"
:
{
"sphinx-markdown-tables"
:
{
"hashes"
:
[
"hashes"
:
[
...
@@ -1227,10 +1227,10 @@
...
@@ -1227,10 +1227,10 @@
},
},
"virtualenv"
:
{
"virtualenv"
:
{
"hashes"
:
[
"hashes"
:
[
"sha256:
116655188441670978117d0ebb6451eb6a7526f9ae0796cc0dee6bd7356909b0
"
,
"sha256:
0d62c70883c0342d59c11d0ddac0d954d0431321a41ab20851facf2b222598f3
"
,
"sha256:
b57776b44f91511866594e477dd10e76a6eb44439cdd7f06dcd30ba4c5bd854f
"
"sha256:
55059a7a676e4e19498f1aad09b8313a38fcc0cdbe4fdddc0e9b06946d21b4bb
"
],
],
"version"
:
"==16.7.
8
"
"version"
:
"==16.7.
9
"
},
},
"virtualenv-clone"
:
{
"virtualenv-clone"
:
{
"hashes"
:
[
"hashes"
:
[
...
...
This diff is collapsed.
Click to expand it.
src/openqlab/analysis/gaussian_beam.py
+
5
−
5
View file @
1ac40d7e
...
@@ -16,7 +16,7 @@ class GaussianBeam:
...
@@ -16,7 +16,7 @@ class GaussianBeam:
def
__init__
(
self
,
q
=
0
+
1j
,
wavelength
=
1.064e-6
):
def
__init__
(
self
,
q
=
0
+
1j
,
wavelength
=
1.064e-6
):
if
wavelength
<=
0
:
if
wavelength
<=
0
:
raise
ValueError
(
"
Wavelength must be a positiv number
"
)
raise
ValueError
(
"
Wavelength must be a positiv number
"
)
self
.
_
lambda
=
wavelength
self
.
_
wavelength
=
wavelength
self
.
_q
=
q
self
.
_q
=
q
@classmethod
@classmethod
...
@@ -42,7 +42,7 @@ class GaussianBeam:
...
@@ -42,7 +42,7 @@ class GaussianBeam:
"""
"""
Returns the beam parameter after free-space propagation of d
Returns the beam parameter after free-space propagation of d
"""
"""
return
GaussianBeam
(
self
.
_q
+
d
,
self
.
_
lambda
)
return
GaussianBeam
(
self
.
_q
+
d
,
self
.
_
wavelength
)
def
get_profile
(
self
,
zpoints
):
def
get_profile
(
self
,
zpoints
):
"""
"""
...
@@ -53,7 +53,7 @@ class GaussianBeam:
...
@@ -53,7 +53,7 @@ class GaussianBeam:
@property
@property
def
wavelength
(
self
)
->
float
:
def
wavelength
(
self
)
->
float
:
return
self
.
_
lambda
return
self
.
_
wavelength
@property
@property
def
w0
(
self
)
->
float
:
def
w0
(
self
)
->
float
:
...
@@ -63,7 +63,7 @@ class GaussianBeam:
...
@@ -63,7 +63,7 @@ class GaussianBeam:
-------
-------
"""
"""
return
np
.
sqrt
(
self
.
_q
.
imag
*
self
.
_
lambda
/
np
.
pi
)
return
np
.
sqrt
(
self
.
_q
.
imag
*
self
.
_
wavelength
/
np
.
pi
)
@property
@property
def
z0
(
self
)
->
float
:
def
z0
(
self
)
->
float
:
...
@@ -92,7 +92,7 @@ class GaussianBeam:
...
@@ -92,7 +92,7 @@ class GaussianBeam:
"""
"""
Beam divergence (in radian).
Beam divergence (in radian).
"""
"""
return
np
.
arctan
(
self
.
_
lambda
/
np
.
pi
/
self
.
w0
)
return
np
.
arctan
(
self
.
_
wavelength
/
np
.
pi
/
self
.
w0
)
def
__repr__
(
self
):
def
__repr__
(
self
):
return
"
w0={w0} @ z0={z0}
"
.
format
(
return
"
w0={w0} @ z0={z0}
"
.
format
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment