primeras preubas micromocion

artiq_master/last_rid.pyon

-20344
+20472

artiq_master/repository/Calibrations/Power Calibration AOM/IR/IR_Power_calibration_BS_rpi.py

@@ -84,7 +84,7 @@ class IR_LaserPowerCalibration_BS(EnvExperiment):
 
     @rpc(flags={"async"})
     def measure_PD(self, dump=False): #este dump esta al pedo, habra que sacarlo en el futuro
-        value = rpi.ReadPD_average_pi(0, 1)
+        value = rpi.ReadPD_average_pi(2, 1)
         print(value)
         if not dump:
             self.mutate_dataset(f"Current_PD_IR", 0, np.abs(value))

artiq_master/repository/Calibrations/Power Calibration AOM/UV/UV_Power_calibration_BS_rpi.py

@@ -83,7 +83,7 @@ class UV_LaserPowerCalibration_BS_rpi(EnvExperiment):
 
     @rpc(flags={"async"})
     def measure_PD(self, dump=False):
-        value = rpi.ReadPD_average_pi(0, 1)
+        value = rpi.ReadPD_average_pi(2, 1)
         print(value)
         if not dump:
             self.mutate_dataset(f"Current_PD_UV", 0, np.abs(value))

artiq_master/repository/Calibrations/Power Calibration AOM/UV/UV_Power_calibration_check_rpi.py

@@ -45,7 +45,7 @@ class LaserPowerCalibration(EnvExperiment):
 
     @rpc(flags={"async"})
     def measure_PD(self, i, dump=False):
-        value = rpi.ReadPD_average_pi(0, 1)
+        value = rpi.ReadPD_average_pi(2, 1)
         print(value)
         if not dump:
             self.mutate_dataset(f"Test_Measured_PD_UV_counts", i, np.abs(value))

artiq_master/repository/Experiments/Saturation/DP_Saturation_measurement.py

@@ -118,11 +118,11 @@ class IR_Saturation(EnvExperiment):
             delay(100*us)
             cuentas_ON = self.readout() # Hago la medicion y vuelvo con las cuentas
             delay(100*us)
-            #self.laserIR.off()
+            self.laserIR.off()
             delay(100*us)
             cuentas_OFF = self.readout() # Hago la medicion y vuelvo con las cuentas
-            #counts = cuentas_ON-cuentas_OFF
-            counts = 0.5*(cuentas_ON+cuentas_OFF)
+            counts = cuentas_ON-cuentas_OFF
+            #counts = 0.5*(cuentas_ON+cuentas_OFF)
             #print(counts)
             self.mutate_dataset("measurements_IR_sat", save_index, counts)
             delay(500*us)   

artiq_master/repository/Experiments/Saturation/SP_Saturation_measurement.py

@@ -19,7 +19,7 @@ class UV_Saturation(EnvExperiment):
         self.pmt = self.get_device("ttl0")
 
         self.laserUV = UrukulCh(self, ch=2, freq=110.0, amp=0.3, name="UV") #corresponde a 0.7 Vpp
-        self.laserIR = UrukulCh(self, ch=1, freq=208.0, amp=0.35, name="IR") #corresponde a 0.8 Vpp
+        self.laserIR = UrukulCh(self, ch=1, freq=210.0, amp=0.2, name="IR") #corresponde a 0.8 Vpp
 
 
         self.setattr_argument(f"IR_freq",
@@ -53,6 +53,7 @@ class UV_Saturation(EnvExperiment):
     def create_datasets(self):
 
         self.set_dataset("measurements_UV_sat", np.zeros(len(self.UV_amps.sequence), dtype=int), broadcast=True, archive=True)
+        
         self.set_dataset("UV_amps", self.UV_amps.sequence, broadcast=True, archive=True)
 
         self.set_dataset("t_readout", self.t_readout, broadcast=False, archive=True)