nanophotonics / nplab

Core functions and instrument scripts for the Nanophotonics lab experimental scripts
GNU General Public License v3.0
38 stars 15 forks source link

Merge j-Griffo and wdeacon Thorlabs ELL18K stages #77

Open J-Griffo opened 5 years ago

J-Griffo commented 5 years ago

I have commited a lightweight class for the ELL18K rotation stage. This was adapted from code running locally in lab 5.

wdeacon committed a class for this a while ago (Named ELL8K.py. Assume this is a typo. If not and the stage version name has changed we are in the clear). I need to liase with him, as the stage has been updated with a new version (the original stages were essentially prototypes). We have 2 of the old stages and now 5 of the new ones.

Main changes noticed between the stages:

These are accounted for in my code but a merge is probably the best idea.

wdeacon commented 5 years ago

Most probably a typo. This code was actually written by Iliya, not sure why its under my commits, but anyway. Is this code going to break the old stages we have? if so is it possible to detect if the stage is the new/old styles and then can one run class that runs for both? or have you already implemented this?

Thank for flagging this! and ten gold stars if you've already implemented this!

J-Griffo commented 5 years ago

ELL18K.py now requests the number of pulses per revolution from the stage.

Now just need to add in functionality\inheritance you would like @wdeacon :)