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.

Sign up for GitHub

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

Jump to bottom

Triton fixes #576

Merged
merged 8 commits into from
Apr 19, 2017
Merged

Triton fixes #576

merged 8 commits into from
Apr 19, 2017

Conversation

jenshnielsen
Copy link
Collaborator

@MerlinSmiles I think this is mainly your driver does this make sense to you?

@MerlinSmiles
Copy link
Contributor

@jenshnielsen dont i just cross checked on T12, and the channel numbering as i wrote it seems to be correct?
Cant comment on the reg files, you are probably right :)

image

@jenshnielsen
Copy link
Collaborator Author

Yes I see that too. But if i Ask the api for T0 I get nonsense such as (1.6e123) If I ask for T1 I get the value that matches chan[0] So in the regedit plus default names are chan[0] ... chan[n-1] where as in the api I need to ask for T1 ... TN

@jenshnielsen
Copy link
Collaborator Author

This seems to match section 5.11.11 in the triton manual

<UID> [T1 ... Tn]

@MerlinSmiles
Copy link
Contributor

argh i missed that I used a modified version, so I guess you are right. Sorry for that... lets have a quick chat on slack

jenshnielsen
jenshnielsen commented Apr 19, 2017
View reviewed changes
qcodes/instrument_drivers/oxford/triton.py Outdated

def _get_temp_channels(self):
self.chan_temps = []
for i in range(1, 16):
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This should probably be range(1,17) so that all 16 channels are included. We are not using T16 at Triton 10 but anyway

@jenshnielsen
Copy link
Collaborator Author

Discussed with @MerlinSmiles on Slack and made some modifications based on his suggestions. The reg file is now optional and a few bugs fixed

@jenshnielsen jenshnielsen merged commit 0035a77 into microsoft:master Apr 19, 2017
@jenshnielsen jenshnielsen deleted the triton_fixes branch April 19, 2017 13:45
giulioungaretti pushed a commit that referenced this pull request Apr 19, 2017
Generated gh-pages for commit 0035a77
6fb84a0 
Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>

    Triton fixes (#576)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jenshnielsen @MerlinSmiles