diff --git a/calibration_scans/__pycache__/optimize_optical_pumping.cpython-35.pyc b/calibration_scans/__pycache__/optimize_optical_pumping.cpython-35.pyc index da099dd1..52f39576 100644 Binary files a/calibration_scans/__pycache__/optimize_optical_pumping.cpython-35.pyc and b/calibration_scans/__pycache__/optimize_optical_pumping.cpython-35.pyc differ diff --git a/calibration_scans/__pycache__/ramsey_drift_tracker.cpython-35.pyc b/calibration_scans/__pycache__/ramsey_drift_tracker.cpython-35.pyc index e0716b16..c704aecb 100644 Binary files a/calibration_scans/__pycache__/ramsey_drift_tracker.cpython-35.pyc and b/calibration_scans/__pycache__/ramsey_drift_tracker.cpython-35.pyc differ diff --git a/dataset_db.pyon b/dataset_db.pyon new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/dataset_db.pyon @@ -0,0 +1 @@ +{} diff --git a/general_purpose/__pycache__/molmer_sorensen.cpython-35.pyc b/general_purpose/__pycache__/molmer_sorensen.cpython-35.pyc index ab9567c7..28a2b9de 100644 Binary files a/general_purpose/__pycache__/molmer_sorensen.cpython-35.pyc and b/general_purpose/__pycache__/molmer_sorensen.cpython-35.pyc differ diff --git a/general_purpose/__pycache__/rabi_flopping.cpython-35.pyc b/general_purpose/__pycache__/rabi_flopping.cpython-35.pyc index 1cb8c6c2..fca83e05 100644 Binary files a/general_purpose/__pycache__/rabi_flopping.cpython-35.pyc and b/general_purpose/__pycache__/rabi_flopping.cpython-35.pyc differ diff --git a/general_purpose/__pycache__/ramsey.cpython-35.pyc b/general_purpose/__pycache__/ramsey.cpython-35.pyc index be7a37dc..9c2f21a2 100644 Binary files a/general_purpose/__pycache__/ramsey.cpython-35.pyc and b/general_purpose/__pycache__/ramsey.cpython-35.pyc differ diff --git a/general_purpose/__pycache__/spectrum.cpython-35.pyc b/general_purpose/__pycache__/spectrum.cpython-35.pyc index c1053d39..781dc6cb 100644 Binary files a/general_purpose/__pycache__/spectrum.cpython-35.pyc and b/general_purpose/__pycache__/spectrum.cpython-35.pyc differ diff --git a/last_rid.pyon b/last_rid.pyon new file mode 100644 index 00000000..3a2e3f49 --- /dev/null +++ b/last_rid.pyon @@ -0,0 +1 @@ +-1 diff --git a/subsequences/__pycache__/vaet.cpython-35.pyc b/subsequences/__pycache__/vaet.cpython-35.pyc index eb956f9a..6b3a561d 100644 Binary files a/subsequences/__pycache__/vaet.cpython-35.pyc and b/subsequences/__pycache__/vaet.cpython-35.pyc differ diff --git a/subsequences/setup_single_ion_vaet.py b/subsequences/setup_single_ion_vaet.py index 18502fee..b6e422ef 100644 --- a/subsequences/setup_single_ion_vaet.py +++ b/subsequences/setup_single_ion_vaet.py @@ -26,13 +26,14 @@ class SetupSingleIonVAET: phase_ref_time=np.int64(-1) implemented_phase=0. implemented_amp=0. + test_phase="SingleIonVAET.test_phase" def subsequence(self): s = SetupSingleIonVAET trap_frequency = self.get_trap_frequency(s.selection_sideband) offset = self.get_offset_frequency("729G") - freq_blue = 80*MHz +trap_frequency + s.nu_eff + offset + freq_blue = 80*MHz + trap_frequency + s.nu_eff + offset freq_red = 80*MHz - trap_frequency - s.nu_eff + offset freq_carr = 80*MHz + offset dp_freq = self.calc_frequency( @@ -68,7 +69,7 @@ def subsequence(self): freq_carr, amplitude=s.noise_amp, ref_time_mu=s.phase_ref_time, - phase=0.26 #0.381 + phase=0.25 #0.381 ) @@ -137,7 +138,6 @@ def subsequence(self): self.dds_729_SP.set_att(s.J_att) self.dds_729_SP_bichro.set_att(s.delta_att) self.dds_SP_729L1.set_att(s.noise_att) - self.dds_729_SP_line1_bichro.set_att(s.BSB_att) self.dds_729_SP_line2_bichro.set_att(s.RSB_att) @@ -146,15 +146,14 @@ def subsequence(self): self.dds_729_SP.sw.on() self.dds_729_SP_bichro.sw.on() self.dds_SP_729L1.sw.on() - self.dds_729_SP_line1_bichro.sw.on() self.dds_729_SP_line2_bichro.sw.on() delay(s.duration) + with parallel: self.dds_729.sw.off() self.dds_729_SP.sw.off() self.dds_729_SP_bichro.sw.off() - self.dds_729L1.sw.off() self.dds_729_SP_line1_bichro.sw.off() self.dds_729_SP_line2_bichro.sw.off() \ No newline at end of file