PySigmaKoki 2.1.7__py3-none-any.whl → 2.1.8__py3-none-any.whl

{pysigmakoki-2.1.7.dist-info → pysigmakoki-2.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySigmaKoki
-Version: 2.1.7
+Version: 2.1.8
 Summary: Python Interface for Instruments by Sigma Koki
 Author-email: Akira Okumura <oxon@mac.com>
 License: BSD License

pysigmakoki-2.1.8.dist-info/RECORD

@@ -0,0 +1,5 @@
+sigma_koki.py,sha256=be_BC6AE8jCVeUU5o-VH9mV6S771BBKeuhBHFjPiwsQ,11691
+pysigmakoki-2.1.8.dist-info/METADATA,sha256=6U9Au55zTn230LzdLgRccxX4BZtmAq9E8Em4ls5d6BA,958
+pysigmakoki-2.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pysigmakoki-2.1.8.dist-info/top_level.txt,sha256=Zbq-FJdx-r0smE3UcnxNBcJ2wVwCX8pGfow0rejSOWk,11
+pysigmakoki-2.1.8.dist-info/RECORD,,

{pysigmakoki-2.1.7.dist-info → pysigmakoki-2.1.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

sigma_koki.py

@@ -110,9 +110,18 @@ class BaseStageController(object):
             else:
                 return
 
-    def move(self, stage1, stage2):
+    def move(self, stage1_pulses, stage2_pulses):
+        self.move_relative(stage1_pulses, stage2_pulses)
+
+    def move_relative(self, stage1_pulses, stage2_pulses):
+        self.move_common(stage1_pulses, stage2_pulses, True)
+
+    def move_absolute(self, stage1_pulses, stage2_pulses):
+        self.move_common(stage1_pulses, stage2_pulses, False)
+
+    def move_common(self, stage1_pulses, stage2_pulses, relative:bool = True):
         """
-        Moves the stages with the specified values. Since GSC-02 is a half-step
+        Moves the stages by the specified values. Since GSC-02 is a half-step
         stepping driver, 1 pulse corresponds to "half-step movement" in the
         stage catalogues.
         """
@@ -121,22 +130,26 @@ class BaseStageController(object):
         elif self.__product == 'SHOT-702':
             limit = 268435455
 
-        if not (-limit <= stage1 <= limit):
+        if not (-limit <= stage1_pulses <= limit):
             raise ValueError('stage1 must be between -%d and %d.' % (limit, limit))
 
-        if not (-limit <= stage2 <= limit):
+        if not (-limit <= stage2_pulses <= limit):
             raise ValueError('stage2 must be between -%d and %d.' % (limit, limit))
 
-        command = 'M:W'
-        if stage1 >= 0:
-            command += '+P%d' % stage1
+        if relative
+            command = 'M:W' # relative
+        else:
+            command = 'A:W' # absolute
+
+        if stage1_pulses >= 0:
+            command += '+P%d' % stage1_pulses
         else:
-            command += '-P%d' % -stage1
+            command += '-P%d' % -stage1_pulses
 
-        if stage2 >= 0:
-            command += '+P%d' % stage2
+        if stage2_pulses >= 0:
+            command += '+P%d' % stage2_pulses
         else:
-            command += '-P%d' % -stage2
+            command += '-P%d' % -stage2_pulses
 
         self.write(command)
         self.go()
@@ -325,4 +338,3 @@ class SHOT702(BaseStageController):
         self.write('D:WS%dF%dR%dS%dF%dR%d' % (minSpeed1, maxSpeed1, accelerationTime1, minSpeed2, maxSpeed2, accelerationTime2))
 
     # Some query commands, ?:P, ?:S, ?:D, and ?:B, are not implemented yet
-    

pysigmakoki-2.1.7.dist-info/RECORD

@@ -1,5 +0,0 @@
-sigma_koki.py,sha256=FW8QZzhgdjCyM8HXrJrPrRKcUR2Y049Rg19cJkHh9FY,11159
-pysigmakoki-2.1.7.dist-info/METADATA,sha256=iGpkSvgLLkjI-2O55oRSAXjlKHYOJODFhOihxU0rwrQ,958
-pysigmakoki-2.1.7.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-pysigmakoki-2.1.7.dist-info/top_level.txt,sha256=Zbq-FJdx-r0smE3UcnxNBcJ2wVwCX8pGfow0rejSOWk,11
-pysigmakoki-2.1.7.dist-info/RECORD,,