barsukov 1.3.4__tar.gz → 1.3.5__tar.gz

{barsukov-1.3.4/src/barsukov.egg-info → barsukov-1.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: barsukov
-Version: 1.3.4
+Version: 1.3.5
 Summary: Experiment Automation Package
 Author-email: Igor Barsukov <igorb@ucr.edu>, Steven Castaneda <scast206@ucr.edu>
 Project-URL: Homepage, https://barsukov.ucr.edu

{barsukov-1.3.4 → barsukov-1.3.5}/src/barsukov/data/Lock_in_emulator.py

@@ -44,16 +44,9 @@ class Lock_in_emulator:
         self.x_plot = self.x_arr(self.t_plot)
 
         self.original_signal = self.signal_arr(self.x_plot)
-        self.expected_signal_num = 0.5 * self.x_amp * np.gradient(self.original_signal, self.x_plot)
+        self.expected_signal = 0.5 * self.x_amp * np.gradient(self.original_signal, self.x_plot)
         self.output_signal = self.signal_output_arr(self.t_plot)
 
-        #Symbolic feature:
-        x, p, w, a = sp.symbols('x p w a')
-        f = a / ((x - p)**2 + w**2)
-        dfdx = sp.diff(f, x)
-        f_prime = sp.lambdify((x, p, w, a), dfdx, 'numpy')
-        self.expected_signal = 0.5 * self.x_amp * f_prime(self.x_plot, 2, 1, 1e-6)
-
         self.fit()
         #self.plot()
 
@@ -165,7 +158,6 @@ class Lock_in_emulator:
             self.axes[0].plot(self.x_plot, self.original_signal, 'r-', label='Original Signal')[0],
             self.axes[1].plot(self.x_plot, self.output_signal, 'b-', label='Demodulated Signal (Lock-In)')[0],
             self.axes[1].plot(self.x_plot, self.expected_signal, 'r-', label='Demodulated Signal (Expected)')[0],
-            self.axes[1].plot(self.x_plot, self.expected_signal_num, 'm-', label='Demodulated Signal (Expected Numerical)')[0],
             self.axes[1].plot(self.x_plot, self.adjusted_signal, 'g-', label=f'Demodulated Signal (Adjusted)\n  Diminish: {self.diminish}\n  Stretch:{self.stretch}\n  Shift: {self.shift}')[0],
         ]
 

{barsukov-1.3.4 → barsukov-1.3.5}/src/barsukov/data/__init__.py

@@ -2,4 +2,5 @@ from . import constants
 from . import noise
 from .fft import *
 from .Change_phase import Change_phase
-from .Lock_in_emulator import Lock_in_emulator
+from .Lock_in_emulator import Lock_in_emulator
+from . import lock_in_emulator_app

{barsukov-1.3.4/src/barsukov/app → barsukov-1.3.5/src/barsukov/data}/lock_in_emulator_app.py

@@ -1,26 +1,27 @@
 from PyQt5 import QtWidgets
 import pyqtgraph as pg
+import numpy as np
 import sys
 
 from barsukov.data import Lock_in_emulator, noise
 
-def make_lorentzian(center, width, amp):
+def make_lorentzian(center, HW, amp):
     def l(x):
-        return amp / ((x - center)**2 + width**2)
+        return amp / ((x - center)**2 + HW**2)
     return l
 
-def make_gaussian(center, width, amp):
-    def g(x):
-        return amp / ((x - center)**2 + width**2)
-    return g
+def make_antilorentzian(center, HW, amp):
+    def al(x):
+        return amp * (x - center) / np.abs(HW) / (1 + ( (x - center) / HW)**2)
+    return al
 
 params = [
     ("l_center", 2, "Center:", float),
-    ("l_width", 1, "Width:", float),
+    ("l_HW", 1, "HW:", float),
     ("l_amp", 1e-6, "Amplitude:", float),
-    ("g_center", 4, "Center:", float),
-    ("g_width", 2, "Width:", float),
-    ("g_amp", 2e-6, "Amplitude:", float),
+    ("al_center", 4, "Center:", float),
+    ("al_HW", 2, "HW:", float),
+    ("al_amp", 2e-6, "Amplitude:", float),
     ("jT", 300, "Temperature (K):", float),
     ("jR", 200, "Resistance (Ohms):", float),
     ("sI", 1e-3, "Current (Amps):", float),
@@ -70,7 +71,7 @@ class MyWindow(QtWidgets.QWidget):
 
         # Signal Type Selector
         signal_combo = QtWidgets.QComboBox()
-        signal_combo.addItems(["Lorentzian", "Gaussian"])
+        signal_combo.addItems(["Lorentzian", "Anti-Lorentzian"])
         #signal_combo.currentIndexChanged.connect(self.update_plot)
         self.inputs["signal_type"] = (signal_combo, lambda w: str(w.currentText()))
         left_layout.addWidget(QtWidgets.QLabel("<b>Signal Type:</b>"))
@@ -84,17 +85,17 @@ class MyWindow(QtWidgets.QWidget):
         lorentz_widget = QtWidgets.QWidget()
         lorentz_layout = QtWidgets.QFormLayout(lorentz_widget)
         lorentz_layout.addRow("<b>Center:</b>", self.line_edits["l_center"])
-        lorentz_layout.addRow("<b>Width:</b>", self.line_edits["l_width"])
+        lorentz_layout.addRow("<b>HW:</b>", self.line_edits["l_HW"])
         lorentz_layout.addRow("<b>Amplitude:</b>", self.line_edits["l_amp"])
         signal_stack.addWidget(lorentz_widget)
 
         #Guassian Inputs
-        gauss_widget = QtWidgets.QWidget()
-        gauss_layout = QtWidgets.QFormLayout(gauss_widget)
-        gauss_layout.addRow("<b>Center:</b>", self.line_edits["g_center"])
-        gauss_layout.addRow("<b>Width:</b>", self.line_edits["g_width"])
-        gauss_layout.addRow("<b>Amplitude:</b>", self.line_edits["g_amp"])
-        signal_stack.addWidget(gauss_widget)
+        antilorentz_widget = QtWidgets.QWidget()
+        antilorentz_layout = QtWidgets.QFormLayout(antilorentz_widget)
+        antilorentz_layout.addRow("<b>Center:</b>", self.line_edits["al_center"])
+        antilorentz_layout.addRow("<b>HW:</b>", self.line_edits["al_HW"])
+        antilorentz_layout.addRow("<b>Amplitude:</b>", self.line_edits["al_amp"])
+        signal_stack.addWidget(antilorentz_widget)
 
         signal_combo.currentIndexChanged.connect(signal_stack.setCurrentIndex)
 
@@ -229,9 +230,9 @@ class MyWindow(QtWidgets.QWidget):
             #Signal Setup
             signal = 0
             if v["signal_type"] == "Lorentzian": 
-                signal = make_lorentzian(v["l_center"], v["l_width"], v["l_amp"])
+                signal = make_lorentzian(v["l_center"], v["l_HW"], v["l_amp"])
             else:
-                signal = make_gaussian(v["g_center"], v["g_width"], v["g_amp"])
+                signal = make_antilorentzian(v["al_center"], v["al_HW"], v["al_amp"])
 
             #Noise Setup
             jT = jR = sI = sR = oRMS = rTU = rTD = rSU = rSD = bD = bMIN = bMAX = 0
@@ -286,8 +287,11 @@ class MyWindow(QtWidgets.QWidget):
             self.line_edits[name].setText(str(default))
         self.update_plot()
 
-if __name__ == "__main__":
+def run():
     app = QtWidgets.QApplication(sys.argv)
     w = MyWindow()
     w.show()
-    sys.exit(app.exec_())
+    sys.exit(app.exec_())
+
+if __name__ == "__main__":
+    run()

{barsukov-1.3.4 → barsukov-1.3.5/src/barsukov.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: barsukov
-Version: 1.3.4
+Version: 1.3.5
 Summary: Experiment Automation Package
 Author-email: Igor Barsukov <igorb@ucr.edu>, Steven Castaneda <scast206@ucr.edu>
 Project-URL: Homepage, https://barsukov.ucr.edu

{barsukov-1.3.4 → barsukov-1.3.5}/src/barsukov.egg-info/SOURCES.txt

@@ -13,12 +13,12 @@ src/barsukov.egg-info/SOURCES.txt
 src/barsukov.egg-info/dependency_links.txt
 src/barsukov.egg-info/requires.txt
 src/barsukov.egg-info/top_level.txt
-src/barsukov/app/lock_in_emulator_app.py
 src/barsukov/data/Change_phase.py
 src/barsukov/data/Lock_in_emulator.py
 src/barsukov/data/__init__.py
 src/barsukov/data/constants.py
 src/barsukov/data/fft.py
+src/barsukov/data/lock_in_emulator_app.py
 src/barsukov/data/noise.py
 src/barsukov/exp/__init__.py
 src/barsukov/exp/exp_utils.py