pytrms 0.9.5__py3-none-any.whl → 0.9.6__py3-none-any.whl

pytrms/__init__.py

@@ -1,4 +1,4 @@
-_version = '0.9.5'
+_version = '0.9.6'
 
 __all__ = ['load', 'connect']
 

pytrms/clients/db_api.py

@@ -123,6 +123,7 @@ class IoniConnect(IoniClientBase):
             'high':   lambda p: p.borders[1],
             'shift':  attrgetter('shift'),
             'multiplier': attrgetter('multiplier'),
+            'resolution': attrgetter('resolution'),
         }
         # normalize the input argument and create a hashable set:
         updates = dict()

pytrms/instrument.py

@@ -7,6 +7,8 @@ from .measurement import (
         FinishedMeasurement,
 )
 
+__all__ = ['Instrument']
+
 
 class Instrument(ABC):
     '''
@@ -27,25 +29,26 @@ class Instrument(ABC):
         self.__class__ = newstate
 
     def __new__(cls, backend):
-        # make this class a singleton..
+        # Note (reminder): If __new__() does not return an instance of cls,
+        #  then the new instance’s __init__() method will *not* be invoked!
+        #
+        # This aside, we override the __new__ method to make this class a
+        #  singleton that reflects the PTR-instrument state and dispatches
+        #  to one of its subclass implementations.
         if cls._Instrument__instance is not None:
-            # quick reminder: If __new__() does not return an instance of cls, then the
-            # new instance’s __init__() method will *not* be invoked:
             return cls._Instrument__instance
 
-        # ..that is synchronized with the PTR-instrument state:
         if backend.is_running:
-            cls = RunningInstrument
+            inst = object.__new__(_RunningInstrument)
         else:
-            cls = IdleInstrument
+            inst = object.__new__(_IdleInstrument)
 
-        inst = object.__new__(cls)
         Instrument._Instrument__instance = inst
 
         return inst
 
     def __init__(self, backend):
-        # dispatch all blocking calls to the client
+        # Note: this will be called *once* per Python process!
         self.backend = backend
 
     @property
@@ -84,7 +87,7 @@ class Instrument(ABC):
         raise RuntimeError("can't stop %s" % self.__class__)
 
 
-class IdleInstrument(Instrument):
+class _IdleInstrument(Instrument):
 
     def start_measurement(self, filename=''):
         dirname = os.path.dirname(filename)
@@ -113,7 +116,7 @@ class IdleInstrument(Instrument):
         return RunningMeasurement(self)
 
 
-class RunningInstrument(Instrument):
+class _RunningInstrument(Instrument):
 
     def stop_measurement(self):
         self.backend.stop_measurement()

pytrms/measurement.py

@@ -125,7 +125,7 @@ class RunningMeasurement(Measurement):
             raise Exception("no connection to instrument")
 
         timeout_s = 15
-        ssd_s = 1e-3 * self.ptr.get('ACQ_SRV_SpecTime_ms')
+        ssd_s = 1e-3 * float(self.ptr.get('ACQ_SRV_SpecTime_ms'))
         last_rel_cycle = -1
         sourcefile = ''
         for specdata in self.ptr.backend.iter_specdata(timeout_s=timeout_s+ssd_s, buffer_size=300):

{pytrms-0.9.5.dist-info → pytrms-0.9.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pytrms
-Version: 0.9.5
+Version: 0.9.6
 Summary: Python bundle for proton-transfer reaction mass-spectrometry (PTR-MS).
 License: GPL-2.0
 Author: Moritz Koenemann

{pytrms-0.9.5.dist-info → pytrms-0.9.6.dist-info}/RECORD

@@ -1,10 +1,10 @@
-pytrms/__init__.py,sha256=mpfREDA7-ju1LSdP74W_oI1huuS-03gjpj1U0zZRyS4,1126
+pytrms/__init__.py,sha256=nJvtCWmSmVhGJbZy4HURNLFLov1K7w-KjFzjpzdjH1c,1126
 pytrms/_base/__init__.py,sha256=antvp0cUKidEa1MGhM_kK1MrVl3LtY6Yt0P3KGB6McE,812
 pytrms/_base/ioniclient.py,sha256=OHIZ6qpnNJvbKftbxH2_TF_BcTc7YalCfw3k_bem5rc,794
 pytrms/_base/mqttclient.py,sha256=ZWGAE2xgORQP0PCNJ-wUsYvs43wWm6TX5oHkELJt4j0,5038
 pytrms/_version.py,sha256=yRCN1kvPaX0FHycK0NBHTluhkf5euj8U7WNTKdVQafg,828
 pytrms/clients/__init__.py,sha256=4m2tOQQs5urPyZ_Yqmh431JXnWbdWVUV6aAMpRidPdg,1382
-pytrms/clients/db_api.py,sha256=pLbFSf0oWWvzdjisi_EGwpQMbeT4OErEdB4uEm4Shz0,8295
+pytrms/clients/db_api.py,sha256=8a0-2tiarET3TK_1-5mJQ7aMH2KM7QYuPDXMgbjmCfY,8347
 pytrms/clients/ioniclient.py,sha256=cp37XSoCzLamjDzcUCrKbp530YMstQ0Eoj81r5tClL8,2390
 pytrms/clients/modbus.py,sha256=7KyLBQrSPRvKO81iFRxhEpofXF9FFyNrCtqQR7iidzI,20285
 pytrms/clients/mqtt.py,sha256=8-jyTb3CGXZxh4os1B721pe_LQ-G_uv9dqgbevIxGg4,31522
@@ -14,14 +14,14 @@ pytrms/compose/composition.py,sha256=RXwM1w2yujKIcrz0ir8l6uj0zqQCd_O10GTIT97Gmbw
 pytrms/data/IoniTofPrefs.ini,sha256=BGyTijnmtdGqa-kGbAuB1RysG4MPK9nlF9TR069tKwE,1887
 pytrms/data/ParaIDs.csv,sha256=H4ssQixGYvGMcYSdRcycmGbIrO2J8imh6FGwUNsmmM4,27395
 pytrms/helpers.py,sha256=YK2WjhQIwF5SdXM1A-lTp0hDfXnPSnaNDbGjbkjMUBU,5070
-pytrms/instrument.py,sha256=adBkZg-oWcpJOgd00esQRrjCeMUQDnP1PICNevE2cLg,4292
-pytrms/measurement.py,sha256=KbELu41tZhRDXIm1S8U9angVzIbyrHbHWcNDPb0CSbg,7622
+pytrms/instrument.py,sha256=jO37ZUlCkItXNzjT9Hh-mx6Eyt4VD4DBQATEiKUEb4M,4432
+pytrms/measurement.py,sha256=iHsEWmJhCSFxMON_N-5mtCmFqigBqGQM4AImqE7pS44,7629
 pytrms/peaktable.py,sha256=Axa7EQs9UKVfypsysT69PqKejfVqmQB08nS71TpbVcU,17007
 pytrms/plotting/__init__.py,sha256=sfL4k2PeBmzIf-5Z_2rnkeM8As3psbPxaVvmpi1T48Q,62
 pytrms/plotting/plotting.py,sha256=WzP4Is2PSu_NdhY73HsCU8iEHmLgnIgNY-opsxwIjH8,675
 pytrms/readers/__init__.py,sha256=2r9dXwPRqYkIGpM0EjY-m_Ti3qtxE0jeC9FnudDDoXc,72
 pytrms/readers/ionitof_reader.py,sha256=c8W5aglrY1bmuljnaAqx6TGWAPGXXMkuHjJ1aRw3Wrc,17624
-pytrms-0.9.5.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-pytrms-0.9.5.dist-info/METADATA,sha256=UFCLeJJ55taSuvQzMzpaMjKYoe3x9rWsIhfj-3ikgnY,812
-pytrms-0.9.5.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pytrms-0.9.5.dist-info/RECORD,,
+pytrms-0.9.6.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+pytrms-0.9.6.dist-info/METADATA,sha256=GlVG3GDVyqDiNjre3O2y5sKo25xfoRXvBOd9ClLeEMo,812
+pytrms-0.9.6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pytrms-0.9.6.dist-info/RECORD,,