Minor Adjustments

JeschkeLab · May 27, 2024 · 5266196 · 5266196
1 parent 571b5c6
commit 5266196
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/autodeer/colors.py b/autodeer/colors.py
@@ -1,3 +1,3 @@
-primary_colors=['#D95B6F','#42A399','E1AE38']
+primary_colors=['#D95B6F','#42A399','#E1AE38']
 ReIm_colors = ['#D61B00','#00BBD6']
 shade_colors=[]
diff --git a/autodeer/gui/autoDEER_worker.py b/autodeer/gui/autoDEER_worker.py
@@ -80,7 +80,7 @@ def __init__(self, interface, wait:QtCore.QWaitCondition, mutex:QtCore.QMutex,pu
         self.stop_flag = False
         self.quick_deer_state = True
 
-        self.max_tau = 5
+        self.max_tau = 3.5
 
         if (self.project is None) or (self.project == ''):
             def savename(exp, suffix=""):
@@ -190,7 +190,7 @@ def run_CP_relax(self,dt=200):
         gyro = self.gyro
         reptime = self.reptime
         relax = DEERSequence(
-            B=LO/gyro, LO=LO,reptime=reptime,averages=10,shots=int(10*self.noise_mode),
+            B=LO/gyro, LO=LO,reptime=reptime,averages=10,shots=int(20*self.noise_mode),
             tau1=0.5, tau2=0.5, tau3=0.2, dt=15,
             exc_pulse=self.pulses['exc_pulse'], ref_pulse=self.pulses['ref_pulse'],
             pump_pulse=self.pulses['pump_pulse'], det_event=self.pulses['det_event']
@@ -217,7 +217,7 @@ def run_T2_relax(self,dt=60):
         reptime = self.reptime
 
         seq = T2RelaxationSequence(
-            B=LO/gyro, LO=LO,reptime=reptime,averages=10,shots=int(20*self.noise_mode),
+            B=LO/gyro, LO=LO,reptime=reptime,averages=10,shots=int(40*self.noise_mode),
             step=dt,dim=200,pi2_pulse=self.pulses['exc_pulse'],
             pi_pulse=self.pulses['ref_pulse'], det_event=self.pulses['det_event'])
 
@@ -236,7 +236,7 @@ def run_2D_relax(self):
         reptime = self.reptime
 
         seq = RefocusedEcho2DSequence(
-            B=LO/gyro, LO=LO,reptime=reptime,averages=10,shots=int(20*self.noise_mode),
+            B=LO/gyro, LO=LO,reptime=reptime,averages=10,shots=int(50*self.noise_mode),
             tau=self.max_tau, pi2_pulse=self.pulses['exc_pulse'],
             pi_pulse=self.pulses['ref_pulse'], det_event=self.pulses['det_event'])
 

diff --git a/autodeer/hardware/ETH_awg.py b/autodeer/hardware/ETH_awg.py
@@ -152,6 +152,10 @@ def extract_date_time(str):
                     data = uwb_eval_match(Matfile, exp,verbosity=verbosity,filter_type='cheby2',filter_width=0.01)
                 else:
                     data = uwb_eval_match(Matfile, exp,verbosity=verbosity)
+
+                if np.all(data.data == 0+0j):
+                    time.sleep(10)
+                    continue
             except OSError:
                 time.sleep(10)
             except IndexError:
@@ -880,7 +884,7 @@ def set_params_by_uuid(new_seq, progTable,uuid,index):
             while bool(interface.engine.dig_interface('savenow')):
                 if stop_flag.is_set():
                     break
-                time.sleep(1)
+                time.sleep(10)
 
             if reduced:
                 single_scan_data = interface.acquire_dataset_from_matlab(cur_exp=tmp_seq).data