todo

artiq_master/last_rid.pyon

-14442
+14481

artiq_master/repository/Experiments/Spectrum/With_calibration/IR/MICROMOTION_IR_spectrum_withcalib_delaysfixed_TwoIRLasers.py

@@ -191,8 +191,11 @@ class IR_Scan_withcal_optimized(EnvExperiment):
         self.set_dataset("t_readout", self.t_readout, broadcast=False, archive=True)
         self.set_dataset("t_heating", self.t_heating, broadcast=False, archive=True)
 
-        self.set_dataset("plot_array", np.zeros(len(self.Scanning_voltages.sequence)), broadcast=True, archive=True)
-        #self.set_dataset("plot_array", np.zeros(len(self.Scanning_heattimes.sequence)), broadcast=True, archive=True)
+        if self.Sweep_type == 'heating_time':
+            self.set_dataset("plot_array", np.zeros(len(self.Scanning_heattimes.sequence)), broadcast=True, archive=True)
+        else:
+            self.set_dataset("plot_array", np.zeros(len(self.Scanning_voltages.sequence)), broadcast=True, archive=True)
+
 
         self.set_dataset("scanned", self.Sweep_type, broadcast=False, archive=True)
 
@@ -204,11 +207,6 @@ class IR_Scan_withcal_optimized(EnvExperiment):
 
         self.set_dataset("Comments", self.Comments, broadcast=False, archive=True)
 
-        #self.set_dataset("calibration", self.get_dataset())
-
-
-        #self.laserIR1.generate_dataset()
-        #self.laserUV.generate_dataset()
 
     @rpc(flags={"async"})
     def create_applets(self, no_freqs):
@@ -223,6 +221,11 @@ class IR_Scan_withcal_optimized(EnvExperiment):
                         "plot_array "
                         "--x scanning_heattimess")
 
+        self.ccb.issue("create_applet", "spectrum_realtime",
+                        "${python} -m pyLIAF.artiq.applets.plot_xy "
+                        "freqplot_array "
+                        "--x IR1_Frequencies")
+
     @rpc
     def Get_Calibrated_Frequencies(self)  -> TList(TFloat):
         if self.Fine_scan:
@@ -237,9 +240,12 @@ class IR_Scan_withcal_optimized(EnvExperiment):
             Experiment_freqs = self.Scanning_frequencies.sequence
         self.set_dataset("IR1_Frequencies", np.array(Experiment_freqs), broadcast=True, archive=True)
         self.set_dataset("no_freqs", len(Calibrated_Experiment_freqs), broadcast=True, archive=True)
-        #self.set_dataset("counts_spectrum", np.zeros(len(Experiment_freqs), dtype=int), broadcast=True, archive=True)
-        self.set_dataset("data_array", np.zeros(len(self.Scanning_voltages.sequence)*len(Experiment_freqs), dtype=int), broadcast=False, archive=True)
-        #self.set_dataset("data_array", np.zeros(len(self.Scanning_heattimes.sequence)*len(Experiment_freqs), dtype=int), broadcast=False, archive=True)
+        self.set_dataset("counts_spectrum", np.zeros(len(Experiment_freqs), dtype=int), broadcast=True, archive=True)
+
+        if self.Sweep_type == 'heating_time':
+            self.set_dataset("data_array", np.zeros(len(self.Scanning_heattimes.sequence)*len(Experiment_freqs), dtype=int), broadcast=False, archive=True)
+        else:
+            self.set_dataset("data_array", np.zeros(len(self.Scanning_voltages.sequence)*len(Experiment_freqs), dtype=int), broadcast=False, archive=True)
         return Experiment_freqs
 
 
@@ -299,12 +305,11 @@ class IR_Scan_withcal_optimized(EnvExperiment):
         t_cool_mu = self.core.seconds_to_mu(self.t_cool) # Precomputo esto para despues
         cuentas = 0
         Freqs = self.Get_Calibrated_Frequencies()
-        #Freqs = self.UV_Freqs.sequence
         Amps = self.Get_Calibrated_Amplitudes()
 
         Heattimes = self.Scanning_heattimes.sequence
-        print(Heattimes)
         Voltages = self.Scanning_voltages.sequence
+
         self.create_datasets()
         self.create_applets(len(Freqs))
         self.init_kernel()
@@ -338,30 +343,26 @@ class IR_Scan_withcal_optimized(EnvExperiment):
                             self.laserUV.off()
                             delay(self.t_heating)
                             self.laserUV.on()
-                            #self.enfriar_ion()
-                            #delay(0.001*self.t_heating)
+
                         cuentas = self.readout() # Hago la medicion y vuelvo con las cuentas
                         Accumulated_counts = Accumulated_counts + cuentas
                     self.mutate_dataset("data_array", voltage_index*len(Freqs)+iter_index, Accumulated_counts)
                     temporal_freq_list[iter_index] = Accumulated_counts
                     delay(5000*us)
+                    self.mutate_dataset("counts_spectrum", iter_index, Accumulated_counts)
                     iter_index = iter_index + 1
 
-
                 if self.Plot_type == 'relative_depths':
                     self.mutate_dataset("plot_array", voltage_index, (temporal_freq_list[0]-temporal_freq_list[1])/temporal_freq_list[0])
                 elif self.Plot_type == 'absolute_depths':
                     self.mutate_dataset("plot_array", voltage_index, temporal_freq_list[1])
-                #self.mutate_dataset("plot_array", voltage_index, (temporal_freq_list[0]-temporal_freq_list[1])/1)
 
                 voltage_index = voltage_index + 1
             delay(500*us)
 
         if self.Sweep_type == "heating_time":
-            print('1')
             voltage_index = 0
             while voltage_index < len(Heattimes):
-                print(2)
                 iter_index = 0
                 temporal_freq_list=[0]*len(Freqs)
                 while iter_index < len(Freqs):
@@ -385,10 +386,11 @@ class IR_Scan_withcal_optimized(EnvExperiment):
                     self.mutate_dataset("data_array", voltage_index*len(Freqs)+iter_index, Accumulated_counts)
                     temporal_freq_list[iter_index] = Accumulated_counts
                     delay(5000*us)
+                    self.mutate_dataset("counts_spectrum", iter_index, Accumulated_counts)
                     iter_index = iter_index + 1
+
                 print("done time")
                 if self.Plot_type == 'relative_depths':
-                    print(3)
                     self.mutate_dataset("plot_array", voltage_index, (temporal_freq_list[0]-temporal_freq_list[1])/temporal_freq_list[0])
                 elif self.Plot_type == 'absolute_depths':
                     self.mutate_dataset("plot_array", voltage_index, temporal_freq_list[1])