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

add slope threshold parameter #384

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Conversation

edumur
Copy link
Contributor

@edumur edumur commented Nov 22, 2024

Dear qcodes people,

I hope to have done the git things correctly this time.
This pull request simply add two parameters to control the slope threshold.

Thanks.

Étienne.

@edumur
Copy link
Contributor Author

edumur commented Nov 28, 2024

Dear all,

Should I do something else about this pull request?

Thanks.

@@ -3,7 +3,7 @@
from typing import Any, Tuple
from qcodes.instrument import VisaInstrument
from qcodes.parameters import MultiParameter, Parameter, ParameterWithSetpoints
from qcodes.validators import Arrays, Ints
from qcodes.utils.validators import Arrays, Ints
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changes the import from the current official location to a deprecated legacy location. Could you change this back

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@@ -86,8 +79,8 @@ def get_raw(self) -> np.ndarray:
"""
assert isinstance(self.instrument, FCA3100)
self.instrument.write('CALCulate:AVERage:STATe 0')
self.instrument.write('ARM:COUN {}'.format(self.instrument.samples_number.get_latest()))
data_str=self.instrument.ask("READ:ARRay? {}".format(self.instrument.samples_number.get_latest()))
self._instrument.write('ARM:COUN {}'.format(self._instrument.samples_number.get_latest()))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change (from instrument to _instrument)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No reason, fixed it.


def startread(self):
self.ask("Read?")
return
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks partially complete? Should this return the value from ask or is it really meant to discard that and return None

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leftover from debugging.
I removed it

@jenshnielsen
Copy link
Collaborator

@edumur Sorry for the delay. Has been very busy with other stuff. Left some comments inline. Would you also be able to look into why the tests are failing in CI

auto-merge was automatically disabled December 11, 2024 14:53

Head branch was pushed to by a user without write access

@edumur
Copy link
Contributor Author

edumur commented Dec 11, 2024

@jenshnielsen No worries ;)

Copy link

codecov bot commented Dec 11, 2024

Codecov Report

Attention: Patch coverage is 0% with 3 lines in your changes missing coverage. Please review.

Project coverage is 10.48%. Comparing base (988100c) to head (4dcc99f).
Report is 6 commits behind head on main.

Files with missing lines Patch % Lines
...codes_contrib_drivers/drivers/Tektronix/FCA3100.py 0.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #384      +/-   ##
==========================================
- Coverage   10.49%   10.48%   -0.01%     
==========================================
  Files         138      138              
  Lines       18378    18380       +2     
==========================================
  Hits         1928     1928              
- Misses      16450    16452       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants