todo

artiq_master/last_rid.pyon

-14036
+14234

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

@@ -4,7 +4,9 @@ from pyLIAF.artiq.controllers import UrukulCh
 import time
 import numpy as np
 
-
+PORT = 60000
+PASS = b'Secr3t Pa55W0rd'
+from multiprocessing.connection import Client
 
 class IR_Scan_withcal_optimized(EnvExperiment):
     """Two IR lasers - With heating stage - IR frequency sweep with calibration - First N freqs, then change freq - Optimized delays"""
@@ -192,12 +194,18 @@ class IR_Scan_withcal_optimized(EnvExperiment):
         self.set_dataset("IR2_CPT_freq", self.IR2_CPT_freq, broadcast=False, archive=True)
         self.set_dataset("IR2_CPT_amp", self.IR2_CPT_amp, broadcast=False, archive=True)
 
+        self.set_dataset("initialvoltage_dcA", self.read_dcvoltage(cmd="volt_dcA")[0], broadcast=False, archive=True)
+        self.set_dataset("initialvoltage_dcB", self.read_dcvoltage(cmd="volt_dcB")[0], broadcast=False, archive=True)
+        self.set_dataset("initialvoltage_compOven", self.read_dcvoltage(cmd="volt_compOven")[0], broadcast=False, archive=True)
+
+
         self.set_dataset("t_cool", self.t_cool, broadcast=False, archive=True)
         self.set_dataset("t_trans", self.t_trans, broadcast=False, archive=True)
         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("Comments", self.Comments, broadcast=False, archive=True)
 
         #self.set_dataset("calibration", self.get_dataset())
@@ -261,10 +269,24 @@ class IR_Scan_withcal_optimized(EnvExperiment):
 
         return Experiment_amps
 
+    @rpc
+    def initialize_andor_com(self):
+        print('tuki')
+        address = ('localhost', PORT)
+        self.conn = Client(address, authkey=PASS)
+
+    @rpc
+    def read_dcvoltage(self,cmd='volt_compOven') -> TList(TFloat):
+        self.conn.send(f'{cmd}')
+        rta = self.conn.recv()
+        return [rta]
+
 
     @kernel
     def run(self):
 
+        self.initialize_andor_com()
+
         t_cool_mu = self.core.seconds_to_mu(self.t_cool) # Precomputo esto para despues
         cuentas = 0
         Freqs = self.Get_Calibrated_Frequencies()

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

@@ -221,6 +221,8 @@ class AD9910RAM_andor(EnvExperiment):
                         self.mutate_dataset("error_freq",  ind,  2 )
 
             conn.send('rois_count True')
+            #val=5.6
+            #conn.send(f'volt_compOven {val}')
             rta = conn.recv()
             val = rta
             for ii in range(self.number_of_rois):