From dedfb64dfc8cfb45bbc31b1bcf20655b865abfae Mon Sep 17 00:00:00 2001 From: Lars Bittrich Date: Mon, 15 Oct 2018 09:38:04 +0200 Subject: [PATCH] small cleanup in WITecCOM --- WITecCOM.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/WITecCOM.py b/WITecCOM.py index 9400671..3f75c5a 100644 --- a/WITecCOM.py +++ b/WITecCOM.py @@ -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: -- 2.24.2