Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pulse_lib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
QuTech QDLabs
pulse_lib
Commits
7e75ce48
Commit
7e75ce48
authored
2 years ago
by
Sander Snoo
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into dev
parents
74c2c830
a056ccd6
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
pulse_lib/__init__.py
+1
-1
1 addition, 1 deletion
pulse_lib/__init__.py
pulse_lib/acquisition/measurement_converter.py
+1
-1
1 addition, 1 deletion
pulse_lib/acquisition/measurement_converter.py
setup.cfg
+1
-1
1 addition, 1 deletion
setup.cfg
setup.py
+1
-1
1 addition, 1 deletion
setup.py
with
4 additions
and
4 deletions
pulse_lib/__init__.py
+
1
−
1
View file @
7e75ce48
__version__
=
"
1.5.
5
"
__version__
=
"
1.5.
6
"
This diff is collapsed.
Click to expand it.
pulse_lib/acquisition/measurement_converter.py
+
1
−
1
View file @
7e75ce48
...
...
@@ -340,7 +340,7 @@ class MeasurementConverter:
if
total_selected
>
0
:
self
.
_values
=
[
np
.
sum
(
result
*
accepted_mask
)
/
total_selected
for
result
in
values_unfiltered
]
else
:
self
.
_values
=
np
.
full
(
len
(
values_unfiltered
),
np
.
nan
)
self
.
_values
=
[
np
.
full
(
len
(
values_unfiltered
),
np
.
nan
)
]
def
set_channel_data
(
self
,
data
):
self
.
_channel_raw
=
data
...
...
This diff is collapsed.
Click to expand it.
setup.cfg
+
1
−
1
View file @
7e75ce48
[bumpversion]
current_version
=
1.5.
5
current_version
=
1.5.
6
commit
=
True
tag
=
True
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
1
−
1
View file @
7e75ce48
...
...
@@ -6,7 +6,7 @@ print('packages: %s' % packages)
setup
(
name
=
"
pulse_lib
"
,
version
=
"
1.5.
5
"
,
version
=
"
1.5.
6
"
,
packages
=
find_packages
(),
python_requires
=
"
>=3.7
"
,
install_requires
=
[
'
si_prefix
'
,
'
qcodes>=0.27.0
'
],
...
...
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