adapted code to match Tphi and sigma_fluxnoise

DiCarloLab-Delft · Sep 13, 2018 · f3e1842 · f3e1842
1 parent d5b8aeb
commit f3e1842
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/pycqed/instrument_drivers/virtual_instruments/noise_parameters_CZ.py b/pycqed/instrument_drivers/virtual_instruments/noise_parameters_CZ.py
@@ -56,7 +56,21 @@ def __init__(self, name, **kw):
         self.add_parameter('alpha_q1', unit='Hz',
                            label='anharmonicity of the static qubit',
                            parameter_class=ManualParameter,
-                           vals=vals.Numbers(), initial_value=-262e6)     
+                           vals=vals.Numbers(), initial_value=-262e6)
+        # for flux noise simulations
+        self.add_parameter('sigma', unit='flux quanta',
+                           label='standard deviation of the Gaussian from which we sample the flux bias',
+                           parameter_class=ManualParameter,
+                           vals=vals.Numbers(), initial_value=4e-4)
+        self.add_parameter('timestamp', unit='n.a.',
+                           label='timestamp of the file from which we have extracted the optimum lambda2 and theta_f',
+                           parameter_class=ManualParameter,
+                           vals=vals.Strings())
+        self.add_parameter('quantities_optimum',
+                           label='quantities in timestamp corresponding to the optimum avgatefidcompsub_pc',
+                           parameter_class=ManualParameter,
+                           vals=vals.Arrays())
+
 
         # for qdots simulations
         self.add_parameter('detuning', unit='meV',

diff --git a/...ations/cz_superoperator_simulation_withdistortions_newdevice_singlequbitphases_newcode.py b/...ations/cz_superoperator_simulation_withdistortions_newdevice_singlequbitphases_newcode.py
@@ -1042,7 +1042,10 @@ def expT2(x,gc,amp,tau):
                 return gc+gc*amp*np.exp(-x/tau)         # formula used to fit the experimental data
 
             T2_q0_vec=expT2(f_pulse_convolved_new,T2_q0_amplitude_dependent[0],T2_q0_amplitude_dependent[1],T2_q0_amplitude_dependent[2])
-            Tphi01_q0_vec = Tphi_from_T1andT2(T1_q0,T2_q0_vec)
+            if T1_q0 != 0:
+                Tphi01_q0_vec = Tphi_from_T1andT2(T1_q0,T2_q0_vec)
+            else:
+            	Tphi01_q0_vec = T2_q0_vec     # in the case where we don't want T1 and we are inputting Tphi and not T2
 
             c_ops = c_ops_amplitudedependent(T1_q0,T1_q1,Tphi01_q0_vec,Tphi01_q1)
 

diff --git a/...superoperator_simulation_withdistortions_newdevice_singlequbitphases_newcode_fluxnoise.py b/...superoperator_simulation_withdistortions_newdevice_singlequbitphases_newcode_fluxnoise.py
@@ -872,7 +872,7 @@ def acquire_data_point(self, **kw):
 
         # sample flux bias from a Gaussian, in units of the flux quantum
         mean = 0
-        sigma = 4e-6    # 4e-6 is the same value as in the surface-17 paper of tom&brian
+        sigma = self.noise_parameters_CZ.sigma()    # 4e-6 is the same value as in the surface-17 paper of tom&brian
         self.fluxbias = np.random.normal(mean,sigma)