ONV 0.0.1__tar.gz → 1.0.1__tar.gz

{onv-0.0.1 → onv-1.0.1}/ONV.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ONV
-Version: 0.0.1
+Version: 1.0.1
 Summary: Package for general NV based simulations
 Author: Oliver Whaites
 Author-email: o.whaites@btinternet.com

{onv-0.0.1 → onv-1.0.1}/ONV.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ cce/PCE.py
 cce/__init__.py
 nv/__init__.py
 nv/nv.py
-nv/p1.py
+p1/__init__.py
+p1/p1.py
 tools/__init__.py
 tools/plot_tools.py

{onv-0.0.1 → onv-1.0.1}/ONV.egg-info/top_level.txt

@@ -1,3 +1,4 @@
 cce
 nv
+p1
 tools

{onv-0.0.1 → onv-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ONV
-Version: 0.0.1
+Version: 1.0.1
 Summary: Package for general NV based simulations
 Author: Oliver Whaites
 Author-email: o.whaites@btinternet.com

{onv-0.0.1 → onv-1.0.1}/cce/CCE.py

@@ -13,7 +13,7 @@ from sys import path
 
 path.append('/Users/ollywhaites/Documents/Documents/PhD/Python/Libraries')
 
-import NV_Library as nv
+import ONV.nv as nv
 import pandas as pd
 import numpy as np
 import math
@@ -75,7 +75,7 @@ def CCE0(spins,couplings,ts,params = nv.params(),pbar = True,NV_state = 'Xp',mea
          
     
 
-def CCE1(spins,couplings,ts,params = nv.params(),pbar = True,NV_state = 'Xp',measure = 'x',NV_sub = '-',cluster = 'test'):
+def CCE1(spins,couplings,ts,params = nv.params(),pbar = True,NV_state = 'Xp',measure = 'x',NV_sub = '-',cluster = 'test',Dir = ''):
     
     """
     A program which finds PCE for a bath of spins and coupled to the NV.
@@ -96,10 +96,10 @@ def CCE1(spins,couplings,ts,params = nv.params(),pbar = True,NV_state = 'Xp',mea
     """
     
     params['N_nuc'] = 1
-    operators, params = nv.generate_operators([0], [0], params, NV_state = NV_state,NV_sub = NV_sub)
+    operators, params = nv.generate_operators([0], [0],params = params, NV_state = NV_state,NV_sub = NV_sub)
 
 
-    Dir = '/Users/ollywhaites/Documents/Documents/PhD/Python/Extend_coherence/CCE/{}/{}_data/1_spin/'.format(params['protocol'],cluster)
+    Dir += '{}_data/1_spin/'.format(cluster)
 
 
     # PCE4 = pd.DataFrame(columns = ['P3'], index = taus*1e6)
@@ -133,7 +133,7 @@ def CCE1(spins,couplings,ts,params = nv.params(),pbar = True,NV_state = 'Xp',mea
                         params['tau'] = t
                         params['t_ev'] = t
                         
-                        Ltemp, rho = nv.pulse_NV(operators,params,measure=measure)
+                        Ltemp, rho, _ = nv.pulse_NV(operators,params = params,measure=measure)
                         L1.append(Ltemp.real)
                 
                     
@@ -169,7 +169,7 @@ def CCE1(spins,couplings,ts,params = nv.params(),pbar = True,NV_state = 'Xp',mea
                            params['tau'] = t
                            params['t_ev'] = t
                            
-                           Ltemp, rho = nv.pulse_NV(operators,params,measure = measure)
+                           Ltemp, rho,_ = nv.pulse_NV(operators,params = params,measure = measure)
                            L1.append(Ltemp)
                        
                        

{onv-0.0.1 → onv-1.0.1}/cce/PCE.py

@@ -10,7 +10,7 @@ sys.path.insert(1,'/Users/ollywhaites/Documents/Documents/PhD/Python/Libraries')
 
 import numpy as np
 import pandas as pd
-import NV_Library as nv
+import ONV.nv as nv
 from tqdm import tqdm
 
 from os import path

onv-1.0.1/cce/__init__.py

@@ -0,0 +1,3 @@
+from .CCE import CCE0, CCE1, CCE2
+from .PCE import PCE2, PCE3, PCE4, PCE5
+

onv-1.0.1/nv/__init__.py

@@ -0,0 +1,10 @@
+from .nv import params, plot_params, generate_operators, add_N14
+from .nv import generate_H0, generate_full_H0 
+from .nv import pulse_NV, hyperpol, hyperpol_avg
+from .nv import plot_D_pol, plot_D_pol_N
+from .nv import floquet_spectrum
+from .nv import nv_generator
+
+
+
+

{onv-0.0.1 → onv-1.0.1}/nv/nv.py

@@ -17,8 +17,8 @@ import scipy
 from matplotlib.ticker import  AutoMinorLocator
 from scipy.signal.windows import gaussian
 
-options = qutip.solver.Options()
-options.store_states = True 
+#options = qutip.solver.Options()
+options = {'store_states': True} 
 
 """
 OPERATIONS

onv-1.0.1/p1/__init__.py

@@ -0,0 +1,2 @@
+from .p1 import construct_H0, LG, LG4, find_U
+

{onv-0.0.1/nv → onv-1.0.1/p1}/p1.py

@@ -9,7 +9,7 @@ from sys import path
 path.append('/Users/ollywhaites/Documents/Documents/PhD/Python/Libraries/')
 
 import numpy as np
-import NV_Library as nv
+import ONV.nv.nv as nv
 
 
 def rot_mat(a,b):
@@ -67,11 +67,11 @@ def construct_H0(operators,params,spins,bath,Tin):
         
         if bath.loc[i].iloc[0]['Species'] == 'N':
             Adiag = np.array([[-2*np.pi*113.83e6,0,0],[0,-2*np.pi*113.83e6,0],[0,0,-2*np.pi*159.7e6]]) 
-            Pdiag = np.array([[0,0,0],[0,0,0],[0,0,0]])
+            Pdiag = np.array([[0,0,0],[0,0,0],[0,0,-2*np.pi*3.97e6]])
         else:
 
             Adiag = np.array([[2*np.pi*81.32e6,0,0],[0,2*np.pi*81.32e6,0],[0,0,2*np.pi*114.03e6]]) 
-            Pdiag = np.array([[2*np.pi*1.32e6,0,0],[0,2*np.pi*1.32e6,0],[0,0,2*np.pi*2.65e6]])
+            #Pdiag = np.array([[2*np.pi*1.32e6,0,0],[0,2*np.pi*1.32e6,0],[0,0,2*np.pi*2.65e6]])
             Pdiag = np.array([[2*np.pi*0,0,0],[0,2*np.pi*0,0],[0,0,-2*np.pi*3.97e6]])
             
         #AN = find_axisCoup(Adiag,axis = bath.loc[i]['JT_axis'].iloc[1])
@@ -80,11 +80,12 @@ def construct_H0(operators,params,spins,bath,Tin):
         if Tin == True:
             AN = find_axisCoup(Adiag,axis = bath.loc[i]['JT_axis'].iloc[1])[2]
             
-            Hi += (params['D']*operators['Iz'][2*k + 0] + 2*np.pi*params['gamma_N']*params['B0']*operators['Iz'][2*k + 1] 
+            Hi += (params['D']*operators['Iz'][2*k + 0] + 2*np.pi*params['gamma_e']*params['B0']*operators['Iz'][2*k + 0] + 2*np.pi*params['gamma_N']*params['B0']*operators['Iz'][2*k + 1] 
                    + (AN[2]*operators['Iz'][2*k  + 1] + AN[0]*operators['Ix'][2*k  + 1] + AN[1]*operators['Iy'][2*k  + 1])*operators['Iz'][2*k + 0]
                    #+ tensor_prod(operators,2*k  + 1,2*k + 1,PN)
                    + 2*np.pi*1e3*(bath.loc[i]['Az'].iloc[1]*operators['Iz'][2*k  + 0])*operators['Sz']
-                   + params['Omega_RF']*(np.sin(params['RF_phase'])*operators['Ix'][2*k  + 0] + np.cos(params['RF_phase'])*operators['Iy'][2*k  + 0]))
+                   + params['Omega_RF']*(np.sin(params['RF_phase'])*operators['Ix'][2*k  + 0] + np.cos(params['RF_phase'])*operators['Iy'][2*k  + 0])
+                   + params['Omega_N']*(np.sin(params['N_phase'])*operators['Ix'][2*k  + 1] + np.cos(params['N_phase'])*operators['Iy'][2*k  + 1]))
             
         elif Tin == False:
             AN = find_axisCoup(Adiag,axis = bath.loc[i]['JT_axis'].iloc[1])
@@ -165,10 +166,49 @@ def LG(operators,params,bath,spins,Tin):
     
     return U
 
+def LG_pulse(operators,params,bath,spins,Tin):
+
+    D = params['D']
+    OmRF = params['Omega_RF']
+    OmN = params['Omega_N']
+    Om = params['Omega']
+    alpha = params['RF_phase']  
+    t_ev = params['t_ev']
+    
+
+    params['D'] = 0
+    params['Omega_RF'] = OmRF
+    params['Omega_N'] = 0
+    params['RF_phase'] = alpha
+    
+    
+    operators,params = construct_H0(operators,params,spins,bath,Tin)
+    _,_, U0 = nv.pulse_NV(operators,params,measure = 'x',)
+    
+    
+    params['D'] = 0
+    params['Omega_RF'] = 0
+    params['Omega_N'] = OmN
+    params['Omega'] = 0
+    params['RF_phase'] = alpha + np.pi/2
+    
+    params['t_ev'] = params['Tp_RF']
+    params['t_ev'] = np.pi/params['Omega_N'] if params['Omega_N'] != 0 else 0
+    
+    operators,params = construct_H0(operators,params,spins,bath,Tin)
+    _,_, UX = nv.pulse_NV(operators,params,measure = 'x',)
+    
+    params['Omega'] = Om
+    params['RF_phase'] = alpha
+    params['t_ev'] = t_ev
+    
+    return U0*UX*U0
+
 RF_protocols = {'LG': LG,
-                'LG4': LG4}
+                'LG4': LG4,
+                'LG_pulse': LG_pulse}
 
-def  find_U(operators,params,bath,spins,Tin):
+def find_U(operators,params,bath,spins,Tin):
     
     U = RF_protocols[params['RF_protocol']](operators,params,bath,spins,Tin)
     

{onv-0.0.1 → onv-1.0.1}/setup_ONV.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '0.0.1'
+VERSION = '1.0.1'
 DESCRIPTION = 'Package for general NV based simulations'
 LONG_DESCRIPTION = 'A basic package of functions which are commonly used in the simuitons of NV centers fro quantum computing and NMR sensing'
 

onv-0.0.1/cce/__init__.py

@@ -1,3 +0,0 @@
-from CCE import CCE0, CCE1, CCE2
-from PCE import PCE2, PCE3, PCE4, PCE5
-

onv-0.0.1/nv/__init__.py

@@ -1,10 +0,0 @@
-from nv import params, plot_params, generate_operators, add_N14
-from nv import generate_H0, generate_full_H0 
-from nv import pulse_nv, hyperpol, hyperpol_avg
-from nv import plot_D_pol, plot_D_pol_N
-from nv import floquet_spectrum
-from nv import nv_generator
-
-from p1 import construct_H0, LG, LG4, find_U
-
-