Commit dedfb64d authored by Lars Bittrich's avatar Lars Bittrich

small cleanup in WITecCOM

parent 910bc09a
......@@ -34,7 +34,6 @@ from socket import gethostname
class WITecCOM(RamanBase):
CLSID = "{C45E77CE-3D66-489A-B5E2-159F443BD1AA}"
hostname = "unknown"
def __init__(self, hostname=None):
super().__init__()
if hostname is None:
......@@ -56,7 +55,7 @@ class WITecCOM(RamanBase):
self.PosYCurInterface = IBUCSCore.GetSubSystemDefaultInterface("Status|Software|SamplePositioner|CurrentPositionY")
self.PosZCurInterface = IBUCSCore.GetSubSystemDefaultInterface("Status|Software|SamplePositioner|CurrentPositionZ")
self.PosZCurUserInterface = IBUCSCore.GetSubSystemDefaultInterface("Status|Hardware|Controller|DataChannels|StepperMotorPosition")
# Get Float Manipulators
self.PosXFloatMan = win32com.client.CastTo(self.PosXInterface, 'IBUCSFloat')
self.PosYFloatMan = win32com.client.CastTo(self.PosYInterface, 'IBUCSFloat')
self.PosZFloatMan = win32com.client.CastTo(self.PosZInterface, 'IBUCSFloat')
......@@ -138,8 +137,7 @@ class WITecCOM(RamanBase):
rx = .5-self.RamanRelativeXMan.GetValue() # current assumption is, that image center is current position
ry = self.RamanRelativeYMan.GetValue()-.5
width, height = self.ImageWidthMan.GetValue(), self.ImageHeightMan.GetValue()
return rx*width, ry*height
return rx*width, ry*height
def disconnect(self):
if self.connected:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment