pychemstation 0.5.6__tar.gz → 0.5.7.dev1__tar.gz

{pychemstation-0.5.6 → pychemstation-0.5.7.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.5.6
+Version: 0.5.7.dev1
 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.6 → pychemstation-0.5.7.dev1}/pychemstation/control/controllers/method.py

@@ -21,6 +21,14 @@ class MethodController(TableController):
     def __init__(self, controller: CommunicationController, src: str, data_dir: str, table: Table):
         super().__init__(controller, src, data_dir, table)
 
+    def check_loaded_method(self):
+        time.sleep(2)
+        self.send(Command.GET_METHOD_CMD)
+        time.sleep(2)
+        res = self.receive()
+        if res.is_ok():
+            return res.ok_value.string_response
+
     def get_method_params(self) -> HPLCMethodParams:
         return HPLCMethodParams(organic_modifier=self.controller.get_num_val(
             cmd=TableOperation.GET_OBJ_HDR_VAL.value.format(
@@ -50,8 +58,12 @@ class MethodController(TableController):
     def load(self) -> MethodTimetable:
         rows = self.get_num_rows()
         if rows.is_ok():
+            self.send(Command.GET_METHOD_CMD)
+            res = self.receive()
+            method_name = res.ok_value.string_response
             timetable_rows = [self.get_row(r + 1) for r in range(int(rows.ok_value.num_response))]
             self.table_state = MethodTimetable(
+                name=method_name,
                 first_row=self.get_method_params(),
                 subsequent_rows=timetable_rows)
             return self.table_state
@@ -124,8 +136,7 @@ class MethodController(TableController):
                 first_row=HPLCMethodParams(
                     organic_modifier=organic_modifier.percentage,
                     flow=method.flow,
-                    maximum_run_time=method.stop_time,
-                    temperature=-1),
+                    maximum_run_time=method.stop_time),
                 subsequent_rows=[
                     TimeTableEntry(
                         start_time=tte.time,

{pychemstation-0.5.6 → pychemstation-0.5.7.dev1}/pychemstation/control/hplc.py

@@ -138,6 +138,9 @@ class HPLCController:
         """
         return self.sequence_controller.get_data()
 
+    def check_loaded_method(self) -> str:
+        return self.method_controller.check_loaded_method()
+
     def load_method(self) -> MethodTimetable:
         """
         Returns the currently loaded method, including its timetable.

{pychemstation-0.5.6 → pychemstation-0.5.7.dev1}/pychemstation/utils/method_types.py

@@ -6,6 +6,7 @@ from .table_types import RegisterFlag
 from ..generated import Signal, SolventElement
 
 
+
 class PType(Enum):
     STR = "str"
     NUM = "num"
@@ -34,6 +35,7 @@ class TimeTableEntry:
 
 @dataclass
 class MethodTimetable:
+    name: str
     first_row: HPLCMethodParams
     subsequent_rows: list[TimeTableEntry]
     dad_wavelengthes: Optional[list[Signal]] = None

{pychemstation-0.5.6 → pychemstation-0.5.7.dev1}/pychemstation/utils/table_types.py

@@ -46,6 +46,9 @@ class RegisterFlag(Enum):
 
     # for Method Timetable
     SOLVENT_COMPOSITION = "SolventComposition"
+    PRESSURE = "Pressure"
+    EXTERNAL_CONTACT = "ExternalContact"
+
 
     # for Sequence
     VIAL_LOCATION = "Vial"

{pychemstation-0.5.6 → pychemstation-0.5.7.dev1}/pychemstation.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.5.6
+Version: 0.5.7.dev1
 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.6 → pychemstation-0.5.7.dev1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="pychemstation",
-    version="0.5.6",
+    version="0.5.7.dev1",
     author="Lucy Hao",
     author_email="lhao03@student.ubc.ca",
     description="Library to interact with Chemstation software, primarily used in Hein lab",