Merge branch 'master' of https://code.df.uba.ar/nnunez/artiq_experiments Ni...

Merge branch 'master' of https://code.df.uba.ar/nnunez/artiq_experiments Ni idea por que me pide mergear, deberia estar igual

artiq_master/last_rid.pyon

-23189
+23201

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

@@ -204,7 +204,7 @@ class IR_Scan_simple(EnvExperiment):
         finalIR2_amp = self.get_dataset("IR2_amp")
         #finalIR2shift_freq = self.get_dataset("IR2shift_freq")
         #finalIR2shift_amp = self.get_dataset("IR2shift_amp")
-        return [finalIR1_freq, finalIR1_amp, finalUV_freq, finalUV_amp, finalIR2_freq, finalIR2_amp, finalIR2shift_freq, finalIR2shift_amp]
+        return [finalIR1_freq, finalIR1_amp, finalUV_freq, finalUV_amp, finalIR2_freq, finalIR2_amp]#, finalIR2shift_freq, finalIR2shift_amp]
 
 
     @kernel