pychemstation 0.8.0__py3-none-any.whl → 0.8.2__py3-none-any.whl

pychemstation/control/controllers/tables/method.py

@@ -2,18 +2,22 @@ import os
 import time
 from typing import List
 
-from result import Result, Ok, Err
+from result import Err, Ok, Result
 from xsdata.formats.dataclass.parsers import XmlParser
 
-from .table import TableController
-from ..devices.injector import InjectorController
 from ....analysis.process_report import AgilentReport, ReportType
 from ....control.controllers import CommunicationController
-from ....generated import PumpMethod, DadMethod, SolventElement
-from ....utils.chromatogram import TIME_FORMAT, AgilentChannelChromatogramData, AgilentHPLCChromatogram
+from ....generated import DadMethod, PumpMethod, SolventElement
+from ....utils.chromatogram import (
+    TIME_FORMAT,
+    AgilentChannelChromatogramData,
+    AgilentHPLCChromatogram,
+)
 from ....utils.macro import *
 from ....utils.method_types import *
 from ....utils.table_types import *
+from ..devices.injector import InjectorController
+from .table import TableController
 
 
 class MethodController(TableController):
@@ -369,8 +373,8 @@ class MethodController(TableController):
 
     def get_report(self, custom_path: Optional[str] = None,
                    report_type: ReportType = ReportType.TXT) -> List[AgilentReport]:
-        metd_report = self.get_report_details(self.data_files[-1] if not custom_path else custom_path,
-                                              report_type)
+        custom_path = self.data_files[-1] if not custom_path else custom_path
+        metd_report = self.get_report_details(custom_path, report_type)
         chrom_data: List[AgilentHPLCChromatogram] = list(self.get_data(custom_path).__dict__.values())
         for i, signal in enumerate(metd_report.signals):
             possible_data = chrom_data[i]

pychemstation/control/controllers/tables/table.py

@@ -262,10 +262,12 @@ class TableController(abc.ABC):
 
     def get_uv_spectrum(self, path: str):
         data_uv = rb.agilent.chemstation.parse_file(os.path.join(path, "DAD1.UV"))
-        zipped_data = zip(data_uv.ylabels, data_uv.data)
-        for (wavelength, data) in zipped_data:
-            self.uv[wavelength] = AgilentHPLCChromatogram()
-            self.uv[wavelength].attach_spectrum(data_uv.xlabels, data)
+        times = data_uv.xlabels
+        wavelengthes = data_uv.ylabels
+        data = data_uv.data.transpose()
+        for (i, w) in enumerate(wavelengthes):
+            self.uv[w] = AgilentHPLCChromatogram()
+            self.uv[w].attach_spectrum(times, data[i])
 
     def get_report_details(self, path: str,
                            report_type: ReportType = ReportType.TXT) -> AgilentReport:

{pychemstation-0.8.0.dist-info → pychemstation-0.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pychemstation
-Version: 0.8.0
+Version: 0.8.2
 Author-email: lucyhao <hao.lucyy@gmail.com>
 License-File: LICENSE
 Requires-Python: >=3.8

{pychemstation-0.8.0.dist-info → pychemstation-0.8.2.dist-info}/RECORD

@@ -16,10 +16,10 @@ pychemstation/control/controllers/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 pychemstation/control/controllers/devices/device.py,sha256=d9SwasjXTXplkRK5eH3asrNPo3BBZmAz6CKBYAuKSIc,1249
 pychemstation/control/controllers/devices/injector.py,sha256=ynPQtvMFt1iK0LQBf4ZEYdxJCyavmashXwyCQbmRjuw,5542
 pychemstation/control/controllers/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pychemstation/control/controllers/tables/method.py,sha256=UMLwzsMYsZx53PMgmKIe6LcK4JjAUpuK41x9VMJObNw,17709
+pychemstation/control/controllers/tables/method.py,sha256=sX83sHlnaAm8Wop_d28RDAk4DBPvQWduH3Atodtmw4A,17714
 pychemstation/control/controllers/tables/ms.py,sha256=JFD-tOhu8uRyKdl-E3-neRssii8MNqVRIlsrnFhNY_M,682
 pychemstation/control/controllers/tables/sequence.py,sha256=UT0KUDnn8A-19V24ZgW3KduSulvtbdvsJF9NJBUrz9M,13109
-pychemstation/control/controllers/tables/table.py,sha256=L7OECX502lk2o88hu5Sdb3O4cJxsNGic2193oSz7urI,12298
+pychemstation/control/controllers/tables/table.py,sha256=Adis9584LJqP4yjLj5XrIxqq1jzdBiDieOG4vc90EIU,12327
 pychemstation/generated/__init__.py,sha256=GAoZFAYbPVEJDkcOw3e1rgOqd7TCW0HyKNPM8OMehMg,1005
 pychemstation/generated/dad_method.py,sha256=zfS9op450CRSGPKkUr9qUyPBbND06b9N8SUU9j4cosM,8408
 pychemstation/generated/pump_method.py,sha256=c_FB14rgODZyH5eDb3kxZAI77xRj1HMpQkE2R6MypNA,12180
@@ -33,7 +33,7 @@ pychemstation/utils/pump_types.py,sha256=HWQHxscGn19NTrfYBwQRCO2VcYfwyko7YfBO5uD
 pychemstation/utils/sequence_types.py,sha256=x2EClcq6ROdzeLZg63XcXXTknwl2aZ48Vuyru0xZjgA,1086
 pychemstation/utils/table_types.py,sha256=7txqW_oNpkh4venSkGEtreVe6UV9dzNB1DTrIeTkQHA,3217
 pychemstation/utils/tray_types.py,sha256=eOO-muUjadyvCM8JnYAZVyxJeyYBlENP1zXiFskAFbs,5049
-pychemstation-0.8.0.dist-info/METADATA,sha256=7cSMnoyDeOne85r2n7Bh3IsBeC5xWGVhuu4I0hNTeCo,4491
-pychemstation-0.8.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pychemstation-0.8.0.dist-info/licenses/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
-pychemstation-0.8.0.dist-info/RECORD,,
+pychemstation-0.8.2.dist-info/METADATA,sha256=qZhsTmXFCAoPshKfuw2zMvF76XBHChffCFOefP0t1fw,4491
+pychemstation-0.8.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pychemstation-0.8.2.dist-info/licenses/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
+pychemstation-0.8.2.dist-info/RECORD,,