pychemstation 0.5.13.dev5__py3-none-any.whl → 0.5.13.dev7__py3-none-any.whl

pychemstation/control/controllers/tables/method.py

@@ -316,7 +316,7 @@ class MethodController(TableController):
         folder_name = ""
         hplc_is_running = False
         tries = 0
-        while not hplc_is_running and tries < 10:
+        while tries < 10 and not hplc_is_running:
             timestamp = time.strftime(TIME_FORMAT)
             self.send(Command.RUN_METHOD_CMD.value.format(data_dir=self.data_dir,
                                                           experiment_name=experiment_name,
@@ -325,8 +325,8 @@ class MethodController(TableController):
             hplc_is_running = self.check_hplc_is_running()
             tries += 1
 
-        if hplc_is_running:
-            raise RuntimeError
+        if not hplc_is_running:
+            raise RuntimeError("Method failed to start.")
 
         self.data_files.append(os.path.join(self.data_dir, folder_name))
 

pychemstation/control/controllers/tables/table.py

@@ -11,11 +11,9 @@ from typing import Union, Optional
 
 import numpy as np
 import polling
-from polling import MaxCallException
+import rainbow as rb
 from rainbow import DataFile
 from result import Result, Ok, Err
-import pandas as pd
-import rainbow as rb
 
 from ....control.controllers.comm import CommunicationController
 from ....utils.chromatogram import AgilentHPLCChromatogram, AgilentChannelChromatogramData
@@ -211,7 +209,8 @@ class TableController(abc.ABC):
         try:
             started_running = polling.poll(lambda: isinstance(self.controller.get_status(), HPLCRunningStatus),
                                            step=3, max_tries=10)
-        except MaxCallException:
+        except Exception as e:
+            print(e)
             return False
         return started_running
 

{pychemstation-0.5.13.dev5.dist-info → pychemstation-0.5.13.dev7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.5.13.dev5
+Version: 0.5.13.dev7
 Summary: Library to interact with Chemstation software, primarily used in Hein lab
 Home-page: https://gitlab.com/heingroup/device-api/pychemstation
 Author: Lucy Hao

{pychemstation-0.5.13.dev5.dist-info → pychemstation-0.5.13.dev7.dist-info}/RECORD

@@ -16,9 +16,9 @@ pychemstation/control/controllers/devices/column.py,sha256=SCpCnVFZFUM9LM51MbWkV
 pychemstation/control/controllers/devices/device.py,sha256=SF1JK93FjmACnYrlKvldX3gEeA21qnXZegeNhc9QJGQ,738
 pychemstation/control/controllers/devices/pump.py,sha256=DJQh4lNXEraeC1CWrsKmsITOjuYlRI3tih_XRB3F1hg,1404
 pychemstation/control/controllers/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pychemstation/control/controllers/tables/method.py,sha256=zKry7ghUeCMoD2uqvBzO-mMkPo9BQgoj4cos9ZbTx78,16158
+pychemstation/control/controllers/tables/method.py,sha256=Woni_nAEWRZ79wf2WixLnJWZONNdGgZGGV9GG7m0qCQ,16189
 pychemstation/control/controllers/tables/sequence.py,sha256=vqwJeV38YWdFnaDXvZVOGYl-UCV9lmMbh8Fj5kQ3mqY,8815
-pychemstation/control/controllers/tables/table.py,sha256=56kvNb_U8ka_m1r4sk-6yzRiXTT3CuszP7aoX6-TIlE,11886
+pychemstation/control/controllers/tables/table.py,sha256=7HvjtpRlWBgV2rC0mweBeshWfIziyCQFfms9OUXJJyw,11848
 pychemstation/control/table/__init__.py,sha256=RgMN4uIWHdNUHpGRBWdzmzAbk7XEKl6Y-qtqWCxzSZU,124
 pychemstation/control/table/method.py,sha256=THVoGomSXff_CTU3eAYme0BYwkPzab5UgZKsiZ29QSk,12196
 pychemstation/control/table/sequence.py,sha256=Eri52AnbE3BGthfrRSvYKYciquUzvHKo0lYUTySYYE8,10542
@@ -43,8 +43,8 @@ tests/test_comm.py,sha256=EYOpVXzEMQLGhhKYDPO-KaLcJdPSMPTD9Y4jSI0yVQY,2516
 tests/test_inj.py,sha256=yaPGZoHiOC3ZSgsmrtiqp8QtSo2bMxB9FJhaFlOpad0,1412
 tests/test_method.py,sha256=r1Q1irqiVzs31QuTYLX3u_A0FpX8rIAQ1L4WOk9tLbk,2473
 tests/test_sequence.py,sha256=Nz2iqp1cJgw6kcQvnwSkfBmhxpOH62PoEu6o_5rO-PY,4929
-pychemstation-0.5.13.dev5.dist-info/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
-pychemstation-0.5.13.dev5.dist-info/METADATA,sha256=6tauo37M3ow0m1APJjTtVh3895TnKUhm2vn6OOU0P5M,4376
-pychemstation-0.5.13.dev5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pychemstation-0.5.13.dev5.dist-info/top_level.txt,sha256=zXfKu_4nYWwPHo3OsuhshMNC3SPkcoTGCyODjURaghY,20
-pychemstation-0.5.13.dev5.dist-info/RECORD,,
+pychemstation-0.5.13.dev7.dist-info/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
+pychemstation-0.5.13.dev7.dist-info/METADATA,sha256=0eZ3MqmbNwph2KwBSQUlRG3SKE9b8-WA7cY0q3JDUZ4,4376
+pychemstation-0.5.13.dev7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pychemstation-0.5.13.dev7.dist-info/top_level.txt,sha256=zXfKu_4nYWwPHo3OsuhshMNC3SPkcoTGCyODjURaghY,20
+pychemstation-0.5.13.dev7.dist-info/RECORD,,