F241 AWG support

Author: HKaras

autodeer/DEER_analysis.py

@@ -1458,7 +1458,7 @@ def plot_overlap(Fieldsweep, pump_pulse, exc_pulse, ref_pulse,spectrum_shift=0,
     pump_profile[pump_profile <0] = 0
     exc_profile[exc_profile <0] = 0
 
-    cmap = kwargs.get('cmap',primary_colors[0])
+    cmap = kwargs.get('cmap',primary_colors)
 
     if axs is None and fig is None:
         fig, axs = plt.subplots(1,1,figsize=(5,5), layout='constrained')

autodeer/Logging.py

@@ -44,9 +44,9 @@ def setup_logs(folder: str):
 
     autoDEER_log = logging.getLogger('autoDEER')
     interface_log = logging.getLogger('interface')
-    # logHandler_core = handlers.TimedRotatingFileHandler(
-    #     os.path.join(folder,'autoDEER.log'), when='D', backupCount=4)
-    logHandler_core = handlers.FileHandler(os.path.join(folder,'autoDEER.log'))
+    logHandler_core = handlers.TimedRotatingFileHandler(
+        os.path.join(folder,'autoDEER.log'), when='D', backupCount=4)
+    # logHandler_core = handlers.FileHandler(os.path.join(folder,'autoDEER.log'))
     logHandler_core.setFormatter(formatter)
     autoDEER_log.setLevel(logging.INFO)
     autoDEER_log.addHandler(logHandler_core)
@@ -55,9 +55,9 @@ def setup_logs(folder: str):
     QTHandler.setFormatter(DictFormater())
     autoDEER_log.addHandler(QTHandler)
 
-    # logHandler_hardware = handlers.TimedRotatingFileHandler(
-    #     os.path.join(folder,'interface.log'), when='D', backupCount=4)
-    logHandler_hardware = handlers.FileHandler(os.path.join(folder,'interface.log'))
+    logHandler_hardware = handlers.TimedRotatingFileHandler(
+        os.path.join(folder,'interface.log'), when='D', backupCount=4)
+    # logHandler_hardware = handlers.FileHandler(os.path.join(folder,'interface.log'))
     logHandler_hardware.setFormatter(formatter)
     interface_log.setLevel(logging.INFO)
     interface_log.addHandler(logHandler_hardware)

autodeer/gui/autoDEER_worker.py

@@ -191,7 +191,7 @@ def run_respro(self):
 
         RPseq = ResonatorProfileSequence(
             B=freq/gyro, freq=freq,reptime=reptime,averages=10,shots=shots,
-            pi2_pulse=p90, pi_pulse=p180, fwidth=fwidth, dtp=dtp,
+            pi2_pulse=p90, pi_pulse=p180, fwidth=fwidth, dtp=dtp,tp_dim=60
         )
 
         self.interface.launch(RPseq,savename=self.savename("ResPro"),)
@@ -453,8 +453,8 @@ def run_reptime_opt(self):
         freq = self.freq
         p90, p180 = self.interface.tune_rectpulse(tp=self.tp, freq=freq, B=freq/self.gyro, reptime = reptime_guess,shots=int(100*self.noise_mode))
 
-        n_shots = int(np.max([int(50*self.noise_mode),10]))
-        scan = ReptimeScan(B=freq/self.gyro, freq=freq,reptime=reptime_guess, reptime_max=12e3, averages=10, shots=n_shots,
+        n_shots = int(np.max([int(50*self.noise_mode),25]))
+        scan = ReptimeScan(B=freq/self.gyro, freq=freq,reptime=reptime_guess, start=100,reptime_max=12e3, averages=10, shots=n_shots,
                            pi2_pulse=p90, pi_pulse=p180)
         self.interface.launch(scan,savename=f"{self.samplename}_reptimescan",)
         self.interface.terminate_at(SNRCriteria(30),verbosity=2,test_interval=self.test_interval)

autodeer/gui/main.py

@@ -350,11 +350,12 @@ def load_spectrometer_config(self, filename=None):
                 self.spectromterInterface = ETH_awg_interface(self.config)
                 self.spectromterInterface.savefolder = self.data_folder
                 self.Bruker=False
-                self.modeTuneDialog = ModeTune(self.spectromterInterface, gyro=self.gyro, threadpool=self.threadpool, current_folder=self.current_folder)
-                self.modeTuneDialog.dataUpdated.connect(self.update_resonator_info)
-                self.modeTuneButton = QPushButton('Mode Tune')
-                self.formLayout_2.addWidget(self.modeTuneButton)
-                self.modeTuneButton.clicked.connect(self.modeTuneDialog.show)
+                if self.config['Spectrometer'].get('ModeTune',False):
+                    self.modeTuneDialog = ModeTune(self.spectromterInterface, gyro=self.gyro, threadpool=self.threadpool, current_folder=self.current_folder)
+                    self.modeTuneDialog.dataUpdated.connect(self.update_resonator_info)
+                    self.modeTuneButton = QPushButton('Mode Tune')
+                    self.formLayout_2.addWidget(self.modeTuneButton)
+                    self.modeTuneButton.clicked.connect(self.modeTuneDialog.show)
                 self.pump_pulses = [epr.RectPulse,epr.ChirpPulse]
 
             elif model == 'Bruker_MPFU':

config_files/ETHAWG.yaml

@@ -5,6 +5,7 @@ Spectrometer:
   Local Name: F243_AWG
 
   AWG: True
+  
 
   Bridge:
     Min Freq: 33 #GHz

pyproject.toml

@@ -18,7 +18,7 @@ h5netcdf = "^1.4.0"
 pyqt6 = "^6.7.1"
 threadpoolctl = "^3.5.0"
 quadprog = "^0.1.13"
-pyepr = {path = "../PyEPR", develop = true}
+pyepr-esr = "^1.0"
 qt-material = "^2.14"