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

more improvements to ASi stage #299

Open
carandraug opened this issue Jan 9, 2024 · 8 comments
Open

more improvements to ASi stage #299

carandraug opened this issue Jan 9, 2024 · 8 comments

Comments

@carandraug
Copy link
Collaborator

carandraug commented Jan 9, 2024

@joris-afk and @aasmaa11 (from Mike Strauss) have made improvements to the ASI stage. Not sure what but they are tangled with initial support for PCO cameras (see #118). Merging this work will likely cause conflicts since they diverged before the ASi improvements done in #283 .

@iandobbie
Copy link
Collaborator

I have had a quick look and their code is an edit of the stage/asi code that I originally checked in but moved to controller and expanded to cope with more than stages. I think it will take some time to work through the changes and decide on the best way to merge the two branches.

I will start trying to decide how best to merge. They also have a config file which should allow us to understand exactly how they were using the setup.

I think I will separate the asi changes from the pco ones and try to work through the asi changes.

@iandobbie
Copy link
Collaborator

I have had more of a look through the repository and there are quite a few wrinkles.

They seem to have merged and then deleted a whole load of changes from the main microscope repository so we have a few commits which change like 50 files.

They have added a couple of directories at the root level of the repository.

I think the only way to integrate any of this into the main repository with a reasonable amount of work is to just pull the final pco.py an asi.py files and look at them, I dont think the hsitory has much useful going forward.

@iandobbie
Copy link
Collaborator

Ok a quick comparison between the asi controller code from me and Julio and the stuff from McGill shows there are totally separate code bases with no common code.

Our code is more in the microscope style, however their code has some functionality which our lacks, like setting velocity and acceleration etc...

I need to go through the code and compare features. Then copy the missing and useful features from their code into the asi.py in the controllers directory.

@iandobbie
Copy link
Collaborator

List of missing functionality in controllers implementation:

  1. axis acceleration
  2. axis settle time
  3. axis screw pitches and matching to resolution and speed
  4. axis min and max limits from config, still probably needs homing on initialization for absolute positioning.
  5. LEDs, seem to have 3 ttl modes - on, off and pwm, need to check manual.
  6. get and set pwm intensity

@carandraug
Copy link
Collaborator Author

When copying things over, don't forget their tests. They wrote a lot of testing code.

@iandobbie
Copy link
Collaborator

Yes, but probably needs to be rewritten to match up with the different code if we are using the base code inthe controller directory.

Should this test code go into testsuite, or is that just for simulated devices?

@carandraug
Copy link
Collaborator Author

Should this test code go into testsuite, or is that just for simulated devices?

I would argue for a new module under microscope.testsuite

@iandobbie
Copy link
Collaborator

Ok, I will start working on that. Not looked at the test code at all yet.

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

No branches or pull requests

2 participants