agrego todo xdxd

artiq_master/last_rid.pyon

-13303
+13495

artiq_master/repository/Experiments/Spectrum/With_calibration/Motional/urukul_RAM_AM_scan2_andor.py

@@ -85,8 +85,8 @@ class AD9910RAM_andor(EnvExperiment):
         self.setattr_argument("channel",EnumerationValue(self._channel_list))
         self.depth     = self.get_argument(f"AM Floor", NumberValue(   0.15,                        min=0.000, max=1.000))
         self.number_of_rois     = self.get_argument(f"ROIs_no", NumberValue(2, ndecimals=0, scale=1, step=1))
-
-        self._channel = 0
+        self.frequency          = 0.0
+        self._channel           = 0
 
         self.scan_time_step = self.get_argument(f"Scan time step"         ,NumberValue(1 , min=0.01, max=60,unit="s") )
         self.sorted = self.get_argument(f"sorted", BooleanValue(True))
@@ -167,6 +167,7 @@ class AD9910RAM_andor(EnvExperiment):
         amplitudes = [0, self.IR1_amp, self.UV_amp, self.IR2_amp]
         amplitude  = amplitudes[self._channel]
 
+        self.frequency = [270e6,self.IR1_freq,self.UV_freq,self.IR2_freq][self._channel]
         for ind,am_freq in enumerate(sequence):
             t0 = time() #; jj=0
             # print(f"{jj}: {time()-t0}") ; jj += 1
@@ -390,7 +391,7 @@ class AD9910RAM_andor(EnvExperiment):
 
         self.u[self._channel].sw.on()
         #set urukuln parameters and turn channel on
-        #self.u[self._channel].set_frequency(self.frequency)
+        self.u[self._channel].set_frequency(self.frequency)
         self.u[self._channel].cpld.io_update.pulse_mu(8)
         # self.u.set_att(10*dB)