agrego tuti

artiq_master/last_rid.pyon

-12815
+13109

artiq_master/repository/Experiments/Saturation/Saturation_camerareading.py

@@ -138,7 +138,7 @@ class MeltingExperiment(EnvExperiment):
             print(f"Amp: {ampli}")
             self.set_measurement_amplitude(ampli,self._channel)
 
-            conn.send('rois True')
+            conn.send('rois_count True')
             rta = conn.recv()
             val = rta
 

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

@@ -70,7 +70,7 @@ class AD9910RAM_andor(EnvExperiment):
         self.setattr_device("core")                                         #sets core device drivers as attributes
         self.setattr_device("ccb")
         self.u = [ self.get_device("urukul0_ch0"),
-                   self.get_device("urukul0_ch1"),
+                   self.get_device("urukul0_ch1"),  
                    self.get_device("urukul0_ch2"),
                    self.get_device("urukul0_ch3")]
 
@@ -220,7 +220,7 @@ class AD9910RAM_andor(EnvExperiment):
                         print(F"NO SE PUDO SINTETIZAR F_am={am_freq} Hz POR ERRORES DEL KERNEL")
                         self.mutate_dataset("error_freq",  ind,  2 )
 
-            conn.send('rois True')
+            conn.send('rois_count True')
             rta = conn.recv()
             val = rta
             self.mutate_dataset("counts_roi1", ind, val[0] )
@@ -295,7 +295,7 @@ class AD9910RAM_andor(EnvExperiment):
         # self.u[3].set_amplitude(self.IR2_amp)
         self.u[3].set(self.IR2_freq, amplitude=self.IR2_amp)
         self.core.break_realtime()
-
+        print('oka')
         delay(5*ms)
         #self.u[2].set_frequency(self.UV_freq, self.UV_amp)
         #self.u[3].set_frequency(self.IR2_freq, self.IR2_amp)