barsukov 0.0.5__py3-none-any.whl → 1.0.8__py3-none-any.whl

2025-01-24_No Stn_Anon_No Sample_No Description/mw.dill

@@ -0,0 +1 @@
+�

2025-01-24_No Stn_Anon_No Sample_No Description/mw.pkl

@@ -0,0 +1 @@
+�

barsukov/__init__.py

@@ -1,14 +1,15 @@
-# Modules:
-from . import time
-from . import data
-
-# Objects/Functions:
-from .script import Script
-from .logger import Logger
-
-# Equipment Objects:
-from .exp.mwHP import mwHP
-
-__all__ = ["time", "formula", "data", "Script", "Logger", "mwHP"]
-
-
+# Modules:
+from . import time
+from . import data
+
+# Objects/Functions:
+from .script import Script
+from .logger import Logger
+from .testpickle import *
+
+# Equipment Objects:
+from .exp.mwHP import mwHP
+
+__all__ = ["time", "formula", "data", "Script", "Logger", "mwHP"]
+
+

barsukov/data/__init__.py

@@ -0,0 +1 @@
+from .fft import *

barsukov/data/fft.py

@@ -1,87 +1,87 @@
-### BEGIN Dependencies ###
-import numpy as np
-import scipy as sp
-from barsukov.logger import debug    # Un-comment before implementing in pip
-### END Dependencies ###
-
-
-def fft(x, y, equidistant_check=True, equidistant_rel_error=1e-4, remove_negative_f=False, inverse=False):
-    ### Takes: x=list of real floats, y=list of data or list of lists of data. Data can be real or complex.
-    ### Returns: freqs, fft_y_norm, msg
-    ### This fft used to give wrong sign of the imaginary component because of the "wrong" definition of fft in np and sp
-    ### Now it has been corrected to the Mathematica definition of fft = int ... exp(2pi f t)
-    msg = ''
-    if equidistant_check:
-        diffs = np.diff(x)
-        if not np.allclose(diffs, diffs[0], rtol=equidistant_rel_error):
-            # x is not equidistant, must start interpolating
-            x,y = make_equidistant(x, y, step=None)
-            y = y.T
-            msg += debug('fft(x,y) made x,y equidistant.')
-
-    y = np.array(y)
-    #print(y)
-
-    if y.ndim == 1:
-        # y is 1D, treat it as a single column
-        n = len(y)  # Number of points in the column
-        if inverse is False: fft_y = np.fft.ifft(y) * n # np fft has the "wrong" imag sign
-        else: fft_y = np.fft.fft(y) # That's why fft and ifft are inverted in this code
-    else:
-        # y is 2D, treat it as multiple columns
-        n = y.shape[1]  # Number of points in each column
-        if inverse is False: fft_y = np.fft.ifft(y, axis=1) * n # np fft has the "wrong" imag sign
-        else: fft_y = np.fft.fft(y, axis=1) # That's why fft and ifft are inverted in this code
-
-    sample_spacing = ( x[-1] - x[0] ) / (n-1)
-    #print(n, sample_spacing, x[1] - x[0])
-    fft_y_norm = fft_y * sample_spacing # This normalizes FFT to mathematically correct
-    freqs = np.fft.fftfreq(n, d=sample_spacing)
-
-    if remove_negative_f is False:
-        sorted_indices = np.argsort(freqs)
-        freqs = freqs[sorted_indices]
-        if isinstance(fft_y_norm[0], (list, np.ndarray)):  # If fft_y_norm contains multiple columns
-            fft_y_norm = [x[sorted_indices] for x in fft_y_norm]
-        else:  # If fft_y_norm is a single column
-            fft_y_norm = fft_y_norm[sorted_indices]
-        msg += debug('fft(x,y) sorted negative and positive frequencies.')
-    else:
-        mask = freqs >= 0 # Boolean array with Falses for negative frequencies, effectively removing them
-        freqs = freqs[mask]
-        # If fft_y_norm contains multiple columns:
-        if isinstance(fft_y_norm[0], (list, np.ndarray)):
-            fft_y_norm = [x[mask] for x in fft_y_norm]
-        else:  # If fft_y_norm is a single column
-            fft_y_norm = fft_y_norm[mask]
-        msg += debug('fft(x,y) removed negative frequencies.')
-
-    msg += debug('freqs, fft_y_norm, msg = fft(x,y) is done.\nThe forward fft approximates the mathematically correct integral over ...exp(+i2pift).\nNow do not forget to apply np.abs(fft_y_norm), np.angle(fft_y_norm), fft_y_norm.real, fft_y_norm.imag')
-    return freqs, fft_y_norm, msg
-
-def ifft(x, y, equidistant_check=True, equidistant_rel_error=1e-4, remove_negative_f=False):
-    return fft(x, y, equidistant_check=equidistant_check, equidistant_rel_error=equidistant_rel_error, remove_negative_f=remove_negative_f, inverse=True)
-
-def make_equidistant(x, y, step=None):
-    ### Takes one column x and one or more columns y and makes them equidistant in x
-    ### Returns new_x, new_y. The number of points will likely change.
-    if step is None:
-        # Calculate the smallest difference between consecutive elements
-        min_step = np.min(np.diff(x))
-    else:
-        min_step = step
-    
-    # Generate the new equidistant x array
-    new_x = np.arange(x[0], x[-1] + min_step, min_step)
-    
-    if isinstance(y[0], (list, np.ndarray)):  # If y contains multiple columns
-        new_y = []
-        for y_column in y:
-            interpolation_function = sp.interpolate.interp1d(x, y_column, kind='linear', fill_value='extrapolate')
-            new_y.append(interpolation_function(new_x))
-        new_y = np.array(new_y).T  # Transpose to match the original structure
-    else:  # If y is a single column
-        interpolation_function = sp.interpolate.interp1d(x, y, kind='linear', fill_value='extrapolate')
-        new_y = interpolation_function(new_x)
-    
-    return new_x, new_y
+### BEGIN Dependencies ###
+import numpy as np
+import scipy as sp
+from barsukov.logger import debug    # Un-comment before implementing in pip
+### END Dependencies ###
+
+
+def fft(x, y, equidistant_check=True, equidistant_rel_error=1e-4, remove_negative_f=False, inverse=False):
+    ### Takes: x=list of real floats, y=list of data or list of lists of data. Data can be real or complex.
+    ### Returns: freqs, fft_y_norm, msg
+    ### This fft used to give wrong sign of the imaginary component because of the "wrong" definition of fft in np and sp
+    ### Now it has been corrected to the Mathematica definition of fft = int ... exp(2pi f t)
+    msg = ''
+    if equidistant_check:
+        diffs = np.diff(x)
+        if not np.allclose(diffs, diffs[0], rtol=equidistant_rel_error):
+            # x is not equidistant, must start interpolating
+            x,y = make_equidistant(x, y, step=None)
+            y = y.T
+            msg += debug('fft(x,y) made x,y equidistant.')
+
+    y = np.array(y)
+    #print(y)
+
+    if y.ndim == 1:
+        # y is 1D, treat it as a single column
+        n = len(y)  # Number of points in the column
+        if inverse is False: fft_y = np.fft.ifft(y) * n # np fft has the "wrong" imag sign
+        else: fft_y = np.fft.fft(y) # That's why fft and ifft are inverted in this code
+    else:
+        # y is 2D, treat it as multiple columns
+        n = y.shape[1]  # Number of points in each column
+        if inverse is False: fft_y = np.fft.ifft(y, axis=1) * n # np fft has the "wrong" imag sign
+        else: fft_y = np.fft.fft(y, axis=1) # That's why fft and ifft are inverted in this code
+
+    sample_spacing = ( x[-1] - x[0] ) / (n-1)
+    #print(n, sample_spacing, x[1] - x[0])
+    fft_y_norm = fft_y * sample_spacing # This normalizes FFT to mathematically correct
+    freqs = np.fft.fftfreq(n, d=sample_spacing)
+
+    if remove_negative_f is False:
+        sorted_indices = np.argsort(freqs)
+        freqs = freqs[sorted_indices]
+        if isinstance(fft_y_norm[0], (list, np.ndarray)):  # If fft_y_norm contains multiple columns
+            fft_y_norm = [x[sorted_indices] for x in fft_y_norm]
+        else:  # If fft_y_norm is a single column
+            fft_y_norm = fft_y_norm[sorted_indices]
+        msg += debug('fft(x,y) sorted negative and positive frequencies.')
+    else:
+        mask = freqs >= 0 # Boolean array with Falses for negative frequencies, effectively removing them
+        freqs = freqs[mask]
+        # If fft_y_norm contains multiple columns:
+        if isinstance(fft_y_norm[0], (list, np.ndarray)):
+            fft_y_norm = [x[mask] for x in fft_y_norm]
+        else:  # If fft_y_norm is a single column
+            fft_y_norm = fft_y_norm[mask]
+        msg += debug('fft(x,y) removed negative frequencies.')
+
+    msg += debug('freqs, fft_y_norm, msg = fft(x,y) is done.\nThe forward fft approximates the mathematically correct integral over ...exp(+i2pift).\nNow do not forget to apply np.abs(fft_y_norm), np.angle(fft_y_norm), fft_y_norm.real, fft_y_norm.imag')
+    return freqs, fft_y_norm, msg
+
+def ifft(x, y, equidistant_check=True, equidistant_rel_error=1e-4, remove_negative_f=False):
+    return fft(x, y, equidistant_check=equidistant_check, equidistant_rel_error=equidistant_rel_error, remove_negative_f=remove_negative_f, inverse=True)
+
+def make_equidistant(x, y, step=None):
+    ### Takes one column x and one or more columns y and makes them equidistant in x
+    ### Returns new_x, new_y. The number of points will likely change.
+    if step is None:
+        # Calculate the smallest difference between consecutive elements
+        min_step = np.min(np.diff(x))
+    else:
+        min_step = step
+    
+    # Generate the new equidistant x array
+    new_x = np.arange(x[0], x[-1] + min_step, min_step)
+    
+    if isinstance(y[0], (list, np.ndarray)):  # If y contains multiple columns
+        new_y = []
+        for y_column in y:
+            interpolation_function = sp.interpolate.interp1d(x, y_column, kind='linear', fill_value='extrapolate')
+            new_y.append(interpolation_function(new_x))
+        new_y = np.array(new_y).T  # Transpose to match the original structure
+    else:  # If y is a single column
+        interpolation_function = sp.interpolate.interp1d(x, y, kind='linear', fill_value='extrapolate')
+        new_y = interpolation_function(new_x)
+    
+    return new_x, new_y

barsukov/exp/exp_utils.py

@@ -1,119 +1,136 @@
-### BEGIN Dependencies ###
-import numpy as np
-import sys
-from barsukov.time import *
-### END Dependencies
-
-
-
-
-
-
-### BEGIN Helper functions
-
-def log_in_eq(eq_obj, msg, log='default'): # FINISHED 2024/10/26
-    decorated_msg = str(eq_obj.msg_deco) + ' ' + msg
-    if eq_obj.logger is None:
-        if log=='no': return
-        else: print(time_stamp() + ' ' + decorated_msg)
-    else:
-        eq_obj.logger.log(decorated_msg, log)
-
-def initialize_gpib(eq_obj):
-    # Initializes a visa.open_resource(). Returns rm.open_resource(). Exits if error.
-    if eq_obj.rm is None: # eq_obj has no ResourceManager
-        if eq_obj.script is None:  # If there is no Script
-            eq_obj.log('Visa ResourceManager and Script have not been passed to me. I will attempt to initialize visa myself.', log='important')
-            try:
-                import pyvisa as visa
-                eq_obj.rm = visa.ResourceManager()
-                eq_obj.log('I just set my self.rm = visa.ResourceManager.', log='screen')
-            except:
-                eq_obj.log('I failed to initialize set my self.rm = visa.ResourceManager. I am sys-exiting.', log='important')
-                sys.exit()
-        else: # If there is a Script
-            if eq_obj.script.rm is None: # If Script has no ResourceManager
-                eq_obj.log('I see Script but it does not have rm. I am asking Script to initialize visa.ResourceManager and pass it to me.', log='important')
-                try: 
-                    eq_obj.rm = eq_obj.script.init_rm() # Script will try to init ResourceManager
-                    #print('eq_obj.rm initialized as ', eq_obj.rm)
-                except:
-                    eq_obj.log('Error while Script was initializing visa.ResourceManager. I am sys-exiting.', log='important')
-                    sys.exit()
-            else:
-                eq_obj.log('Script has visa.ResourceManager. I am grabbing it.', log='screen')
-                eq_obj.rm = eq_obj.script.rm
-            if eq_obj.rm is None: # Just to double check if rm is in fact there.
-                eq_obj.log('My last check showed that my self.rm is still None. I am sys-exiting.', log='important')
-                sys.exit()
-    # Now, we assume there is a resource manager
-    if (eq_obj.gpib is None) or (eq_obj.gpib_card is None):
-        eq_obj.log('GPIB card number or GPIB address is not set.', log='important')
-        sys.exit()
-    try:
-        #print(eq_obj.rm)
-        eq_obj.log('I am trying to rm.open_resource().', log='screen')
-        y = eq_obj.rm.open_resource(f'GPIB{eq_obj.gpib_card}::{eq_obj.gpib}')
-        #print('y=',y)
-        return y
-    except:
-        eq_obj.log(f'I could not initialize rm.open_resource() for GPIB {eq_obj.gpib_card}::{eq_obj.gpib}. Also check visa_rm, just in case.', log='important')
-        sys.exit()
-
-### END Helper functions
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-### BEGIN Functions that are likely unnecessary
-
-def query_float(eq_obj, cmd):
-    ### Returns float or np.nan
-    try:
-        q = eq_obj.eq.query(cmd)
-        q = float(q) # Will it work with all equipment?
-        return q
-    except:
-        eq_obj.log(f'Error while quering: \"{cmd}\".', log='important')
-        return np.nan
-
-def write_float(eq_obj, cmd, value, digits, limits):
-    value_differs = ''
-    try:
-        value = float(value)
-        value_round = round(value, digits)
-        if value_round < limits[0]:
-            value_round = limits[0]
-        if value_round > limits[1]:
-            value_round = limits[1]
-        if value_round != value:
-            value_differs = f' But requested {value}.'
-        cmd = ''.join( [value_round if el is None else el for el in cmd] )
-        eq_obj.eq.write(cmd)
-        write_error = False
-        return write_error, value_differs
-    except:
-        write_error = True
-        eq_obj.log(f'Error while writing: \"{cmd}\".', log='important')
-        return write_error, value_differs
-
-### END Functions that are likely unnecessary
+### BEGIN Dependencies ###
+import numpy as np
+import sys
+from barsukov.time import *
+### END Dependencies
+
+
+
+
+
+
+### BEGIN Helper functions
+
+def log_in_eq(eq_obj, msg, log='default'): # FINISHED 2024/10/26
+    decorated_msg = str(eq_obj.msg_deco) + ' ' + msg
+    if eq_obj.logger is None:
+        if log=='no': return
+        else: print(time_stamp() + ' ' + decorated_msg)
+    else:
+        eq_obj.logger.log(decorated_msg, log)
+
+def initialize_gpib(eq_obj):
+    # Initializes a visa.open_resource(). Returns rm.open_resource(). Exits if error.
+    if eq_obj.rm is None: # eq_obj has no ResourceManager
+        if eq_obj.script is None:  # If there is no Script
+            eq_obj.log('Visa ResourceManager and Script have not been passed to me. I will attempt to initialize visa myself.', log='important')
+            try:
+                import pyvisa as visa
+                eq_obj.rm = visa.ResourceManager()
+                eq_obj.log('I just set my self.rm = visa.ResourceManager.', log='screen')
+            except:
+                eq_obj.log('I failed to initialize set my self.rm = visa.ResourceManager. I am sys-exiting.', log='important')
+                sys.exit()
+        else: # If there is a Script
+            if eq_obj.script.rm is None: # If Script has no ResourceManager
+                eq_obj.log('I see Script but it does not have rm. I am asking Script to initialize visa.ResourceManager and pass it to me.', log='important')
+                try: 
+                    eq_obj.rm = eq_obj.script.init_rm() # Script will try to init ResourceManager
+                    #print('eq_obj.rm initialized as ', eq_obj.rm)
+                except:
+                    eq_obj.log('Error while Script was initializing visa.ResourceManager. I am sys-exiting.', log='important')
+                    sys.exit()
+            else:
+                eq_obj.log('Script has visa.ResourceManager. I am grabbing it.', log='screen')
+                eq_obj.rm = eq_obj.script.rm
+            if eq_obj.rm is None: # Just to double check if rm is in fact there.
+                eq_obj.log('My last check showed that my self.rm is still None. I am sys-exiting.', log='important')
+                sys.exit()
+    # Now, we assume there is a resource manager
+    if (eq_obj.gpib is None) or (eq_obj.gpib_card is None):
+        eq_obj.log('GPIB card number or GPIB address is not set.', log='important')
+        sys.exit()
+    try:
+        #print(eq_obj.rm)
+        eq_obj.log('I am trying to rm.open_resource().', log='screen')
+        y = eq_obj.rm.open_resource(f'GPIB{eq_obj.gpib_card}::{eq_obj.gpib}')
+        #print('y=',y)
+        return y
+    except:
+        eq_obj.log(f'I could not initialize rm.open_resource() for GPIB {eq_obj.gpib_card}::{eq_obj.gpib}. Also check visa_rm, just in case.', log='important')
+        sys.exit()
+
+def eq_disconnect(eq_obj):
+    try:
+        eq_obj.rm.close()
+        eq_obj.rm.visalib._registry.clear()
+        eq_obj.log( f'Successfully disconnected GPIB resource for {eq_obj.gpib_card}::{eq_obj.gpib}.', log='screen')
+    except:
+        eq_obj.log( f'Failed to disconnect GPIB resource for {eq_obj.gpib_card}::{eq_obj.gpib}.', log='screen')
+        
+def eq_reconnect(eq_obj):
+    try:
+        import pyvisa as visa
+        eq_obj.rm = visa.ResourceManager()
+        eq_obj.eq = initialize_gpib(eq_obj)
+        eq_obj.log( f'Successfully reconnected GPIB resource for {eq_obj.gpib_card}::{eq_obj.gpib}.', log='screen')
+        eq_obj.log( f'Initialized: {eq_obj.identify()}', log='important' )
+    except: 
+        eq_obj.log(f'Failed to reconnect GPIB resource for {eq_obj.gpib_card}::{eq_obj.gpib}.', log='important')
+### END Helper functions
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+### BEGIN Functions that are likely unnecessary
+
+def query_float(eq_obj, cmd):
+    ### Returns float or np.nan
+    try:
+        q = eq_obj.eq.query(cmd)
+        q = float(q) # Will it work with all equipment?
+        return q
+    except:
+        eq_obj.log(f'Error while quering: \"{cmd}\".', log='important')
+        return np.nan
+
+def write_float(eq_obj, cmd, value, digits, limits):
+    value_differs = ''
+    try:
+        value = float(value)
+        value_round = round(value, digits)
+        if value_round < limits[0]:
+            value_round = limits[0]
+        if value_round > limits[1]:
+            value_round = limits[1]
+        if value_round != value:
+            value_differs = f' But requested {value}.'
+        cmd = ''.join( [value_round if el is None else el for el in cmd] )
+        eq_obj.eq.write(cmd)
+        write_error = False
+        return write_error, value_differs
+    except:
+        write_error = True
+        eq_obj.log(f'Error while writing: \"{cmd}\".', log='important')
+        return write_error, value_differs
+
+### END Functions that are likely unnecessary