barsukov 1.3.1__py3-none-any.whl → 1.3.4__py3-none-any.whl

barsukov/logger.py

@@ -73,7 +73,7 @@ class Logger:
             full_folder_path = self.full_folder_path
 
         ### Create a file name like log_timeStamp_description_.txt ###
-        if not (description is None or description == ''):
+        if description is not None and description != '':
             description = f"_{description}"
         else:
             description = ''
@@ -104,10 +104,11 @@ class Logger:
 
     def write_to_file(self, msg):
         if self.file:
+            #add lock here
             self.file.write(msg)
             ### flushing the log file to make sure it's written ###
             self.file.flush()
-            os.fsync(self.file)
+            #os.fsync(self.file) ##.fileno()
         else:
             self.file_error = True
             print(f'{time_stamp()} Logger is trying to write to a closed or non-existent file.')
@@ -119,7 +120,7 @@ class Logger:
             log = 'screen'
         elif log == 'important' and self.log_mode == 'file':
             log = 'both'
-        elif (log == 'important') or(log == 'default') or (log is None):
+        elif (log == 'important') or (log == 'default') or (log is None):
             log = self.log_mode
 
         decorated_message = self.decorated_msg(msg)

barsukov/script.py

@@ -64,11 +64,10 @@ class Script():
         os.makedirs(self.full_folder_path, exist_ok=True)
 
         ### Logger Attributes
-        self.start_logger = True
         self.log_mode = log
         self.log_full_folder_path = log_full_folder_path
         self.log_full_file_path = log_full_file_path
-        self.init_logger(start=self.start_logger)
+        self.init_logger(start=True)
         self.logger_name = self.logger.full_file_path
 
         ### Equipment Attributes
@@ -130,6 +129,20 @@ class Script():
         """
         from barsukov.exp.mwHP import mwHP as eq
         return eq(gpib, logger=self.logger, script=self, **kwargs)
+
+    def smKE(self, gpib=None, **kwargs):
+        """
+        Initializes and returns a mwHP equipment object with the specified parameters.
+
+        Args:
+            gpib (str): gpib number of equipment. Defaults to 'None'.
+            **kwargs: Additional keyword arguments passed to the mwHP equipment initialization.
+
+        Returns:
+            mwHP: A mwHP equipment object.
+        """
+        from barsukov.exp.smKE import smKE as eq
+        return eq(gpib, logger=self.logger, script=self, **kwargs)
 ### END: Equipment devices
 
 
@@ -138,7 +151,6 @@ class Script():
         # Prepares the Script object for serialization by removing non-seriable attributes (e.g. logger and rm).
         # Returns a dict: A dictionary representing the serializable state of the Script object.
         seriable_data = self.__dict__.copy()
-        seriable_data['start_log'] = False
         del seriable_data['logger']
         del seriable_data['rm']
         return seriable_data
@@ -148,6 +160,6 @@ class Script():
         # Restores the Script object from its serialized state, including reinitializing the logger and rm.
         # Args: seriable_data (dict): A dictionary representing the serialized state of the Script object
         self.__dict__.update(seriable_data)
-        self.init_logger(self.start_logger)
+        self.init_logger(start=False)
         if self.equipment is True: self.init_rm()
 ### END: OBJ2FILE TOOLS:

barsukov/time.py

@@ -21,7 +21,7 @@ def time_stamp():
     return formatted_datetime
 
 
-def date(): 
+def date():
     """
     Generates the current date in the format 'YYYY-MM-DD'.
 

{barsukov-1.3.1.dist-info → barsukov-1.3.4.dist-info}/METADATA

@@ -1,31 +1,25 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: barsukov
-Version: 1.3.1
+Version: 1.3.4
 Summary: Experiment Automation Package
-Home-page: https://barsukov.ucr.edu
-Author: Igor Barsukov, Steven Castaneda
-Author-email: igorb@ucr.edu, scast206@ucr.edu}
+Author-email: Igor Barsukov <igorb@ucr.edu>, Steven Castaneda <scast206@ucr.edu>
+Project-URL: Homepage, https://barsukov.ucr.edu
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Requires-Dist: pytz>=2014.10
-Requires-Dist: numpy>1.0.0
+Requires-Dist: numpy>=1.0.0
 Requires-Dist: scipy>=0.9.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # Barsukov
 
 Barsukov is a Python library for experiment automation.
 
+## For Developers
+
+To push to PyPi, commit to main on Github Desktop, click the history tab, right click and create tag, format the tag v\*.\*.\* and push to the repository (ctrl+p).
+
 ## Installation
 
 Use the package manager [pip](https://pip.pypa.io/en/stable/) to install barsukov.

barsukov-1.3.4.dist-info/RECORD

@@ -0,0 +1,20 @@
+barsukov/__init__.py,sha256=7frhJ1d67SdEKCZKmi4Zr-2QnQzFA-YK2Pki4IQYKEw,202
+barsukov/logger.py,sha256=BBqeid3kX7RJLKmHS4E1jH3KmlIrU3vaR4udSkk4gd4,6529
+barsukov/obj2file.py,sha256=nivCmCEpmOSaG4VpQgIDb-7hsvdEq45Iuu5HOfRxbcw,3923
+barsukov/script.py,sha256=JdTL-w-4FLh5k6T1IHnxX3zT4CQzDUfAs6usHHMUE30,6775
+barsukov/time.py,sha256=apjdgwCXDNBAMyVfsAvfcORz4BkU2--d1BDLHIl_ar4,1038
+barsukov/app/lock_in_emulator_app.py,sha256=47TSN80a7Z8A1sSKEaWBtAS-ECsoa6Nig8bJDQ9B9-E,11483
+barsukov/data/Change_phase.py,sha256=jOCjO4vvk39PEWhOTnLwaPZd769gCDz71nfKwIgSz6I,6998
+barsukov/data/Lock_in_emulator.py,sha256=FvySLcpf19d0sW1EGEisNGzBsN2Wq4N1CoqHvtJRtkI,7509
+barsukov/data/__init__.py,sha256=VkLvw8f14P1bTTgTEzICzRzbmdGtRDE3U7MwegAn2Ak,148
+barsukov/data/constants.py,sha256=SsnqLCjD1M_To7vpr2yXLE4djw4Yc7302t8cKhPWLgQ,156
+barsukov/data/fft.py,sha256=C-PRVySyMYmSJva_S8OwjJBB26pp45ttndjgcaYXZkE,5655
+barsukov/data/noise.py,sha256=MsLifk1Uyq6mjMcYq8ovuskOTRwsrZNqYRRs37IONOc,10504
+barsukov/exp/__init__.py,sha256=DBzvcR0flW6ouWFdmOxngPzyFx_6t5ECztspJ8uX89M,39
+barsukov/exp/exp_utils.py,sha256=7qVQJbJGbsNW0JZQ7A1cmI73J6vi_aN8Zu6WMq2-7LE,4789
+barsukov/exp/mwHP.py,sha256=KAaQPeNI67_xxx-6JesfViHRkWPUqkufdrkwoVZzBnY,12591
+barsukov/exp/smKE.py,sha256=EAhl1WjNv5dP_eZDPfQ-4qdtH8KOvLhNLM666VIvLuM,6107
+barsukov-1.3.4.dist-info/METADATA,sha256=CcTkRswvBIp-oc7owcxsLnWal_D1J39rJ81XxKO8fC0,975
+barsukov-1.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+barsukov-1.3.4.dist-info/top_level.txt,sha256=Js5sHbNjP0UNMB9O5HtCHZqlfHabuNS8nTsHbg-1DDQ,9
+barsukov-1.3.4.dist-info/RECORD,,

{barsukov-1.3.1.dist-info → barsukov-1.3.4.dist-info}/WHEEL

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

barsukov-1.3.1.dist-info/RECORD

@@ -1,14 +0,0 @@
-barsukov/__init__.py,sha256=GVsEnM_uD4x1XN_PIKdD-VSRMNUnvPr2iCWuEHwM6sU,293
-barsukov/logger.py,sha256=nrkS1Pg3WGEjRJQ5MbplhyGYGbfFGkgyxgx1qdSu1x0,6489
-barsukov/obj2file.py,sha256=nivCmCEpmOSaG4VpQgIDb-7hsvdEq45Iuu5HOfRxbcw,3923
-barsukov/script.py,sha256=nrKwEl60u9ces3B8FwRfY4VmlEx5bNvk_hoPaylldP0,6359
-barsukov/time.py,sha256=fSf5JKqr6Pd5691qQcFuBsjDd9alMrfASnndlstLits,1039
-barsukov/data/__init__.py,sha256=IMnOEliXsRMPWeCTprPSddRKg9kwfV-neQiwUwHdpqs,19
-barsukov/data/fft.py,sha256=f9aPLeusVpWiWmXO5n4XwkfQ9xJQhZVFdyhFoT9DB2A,4365
-barsukov/exp/__init__.py,sha256=urLfGpap40kN9ULi53JB0NT-iMsZDSFdBmdSq3ckB0E,19
-barsukov/exp/exp_utils.py,sha256=7qVQJbJGbsNW0JZQ7A1cmI73J6vi_aN8Zu6WMq2-7LE,4789
-barsukov/exp/mwHP.py,sha256=eoX82jon5nIsExvRHO1PIOQAWWWhJYY4N21VtoLXuSw,12136
-barsukov-1.3.1.dist-info/METADATA,sha256=RVnlyzDLELYNJnOw_XG6al9r5FfVosArGnAt8Qexwu0,981
-barsukov-1.3.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-barsukov-1.3.1.dist-info/top_level.txt,sha256=Js5sHbNjP0UNMB9O5HtCHZqlfHabuNS8nTsHbg-1DDQ,9
-barsukov-1.3.1.dist-info/RECORD,,