ONV 0.0.1__py3-none-any.whl → 1.0.2__py3-none-any.whl

{ONV-0.0.1.dist-info → ONV-1.0.2.dist-info}/METADATA

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

ONV-1.0.2.dist-info/RECORD

@@ -0,0 +1,14 @@
+cce/CCE.py,sha256=uvlNS6bqT_FriDM_5nF0UJy146C3n9yK54ANf6Nnu50,10115
+cce/PCE.py,sha256=tcWMbi_PwrEswr4WEmH-_ovrPpyEKEgb7M86zqbCNPY,30534
+cce/__init__.py,sha256=hNgLJ1_jy6BdfAmU4kZ0y37FiDKP0Yps6OewEglGZAo,75
+nv/__init__.py,sha256=n4FnUeWmUEWQoyf3oUfMDAIUpD0SU3bFJU64eFhXGkM,268
+nv/nv.py,sha256=35lowRoUKsGZ14HAQ0f933cJizhWzGAQleCNyQBILTs,62333
+nv/p1.py,sha256=ZOwEqfcdvO9XXZIfqXrx68mdTMF9PyRTvvJu2GvEhpI,6046
+p1/__init__.py,sha256=3uzD4_ZDB0AbyBCkUfnpLyM-i7ut1i4-9YwY61NElJI,47
+p1/p1.py,sha256=kiD9J0a4uFO-a5vGsSNlCfpG7WEW1JTekGKvOYGfbb0,7289
+tools/__init__.py,sha256=cIGZJCLRoUxKs705DjaJKRcl-bJnOc0YGeTqo3iano8,69
+tools/plot_tools.py,sha256=RE2hZDNiMVhrzS9suMVaKhV2nz9AUnKFmlje92rHpR8,4520
+ONV-1.0.2.dist-info/METADATA,sha256=R4ubLoszHSrAq8iW2KlHM_KPXmycEMnMvE1XXmuGbY8,580
+ONV-1.0.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+ONV-1.0.2.dist-info/top_level.txt,sha256=CjVyEG5qMKMI9ZnDsLCTBafQJncO5Tb0dBDiKf5W5yQ,16
+ONV-1.0.2.dist-info/RECORD,,

{ONV-0.0.1.dist-info → ONV-1.0.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{ONV-0.0.1.dist-info → ONV-1.0.2.dist-info}/top_level.txt

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

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)
                        
                        

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

cce/__init__.py

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

nv/__init__.py

@@ -1,10 +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
-
-from p1 import construct_H0, LG, LG4, find_U
+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
+
+
 
 

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

p1/__init__.py

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

p1/p1.py

@@ -0,0 +1,215 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Mon Oct  7 11:48:14 2024
+
+@author: ollywhaites
+"""
+from sys import path
+path.append('/Users/ollywhaites/Documents/Documents/PhD/Python/Libraries/')
+
+import numpy as np
+import ONV.nv.nv as nv
+
+
+def rot_mat(a,b):
+    
+    R = np.array([[np.cos(a)*np.cos(b),np.cos(b)*np.sin(a),-np.sin(b)],
+         [-np.sin(a),np.cos(a),0],
+         [np.sin(b)*np.cos(a),np.sin(b)*np.sin(a),np.cos(b)]])
+
+    return R
+def find_axisCoup(Adiag,axis = 'D'):
+    
+    rot = {'A':{'a':0,'b':np.radians(109.5)},
+           'B':{'a':0*np.radians(120),'b':np.radians(109.5)},
+           'C':{'a':0*np.radians(240),'b':np.radians(109.5)},
+           'D':{'a':0,'b':0}}
+    
+    R = rot_mat(rot[axis]['a'], rot[axis]['b'])
+    
+    return np.dot(np.dot(R,Adiag),R.T)
+
+
+def tensor_prod(operators,i,j,PN):
+    
+    axis = {0:'x',
+            1: 'y',
+            2: 'z'}
+    
+    HQ = 0
+    for n in range(3):
+        #m = n
+        for m in range(3):
+            HQ += PN[n][m]*operators['I%s'%axis[n]][i]*operators['I%s'%axis[m]][j]
+            
+            
+    return HQ
+
+
+def construct_H0(operators,params,spins,bath,Tin):
+    
+
+    
+    H0 = 0
+    if params['lab'] == True:
+        H0 += params['omega_e']*operators['Sz'] + params['zfs_NV']*operators['Sz']*operators['Sz'] 
+    
+    Hi = 0
+    Hij = 0
+    k = 0
+    for i in spins:
+
+        r1 = {'x':bath.loc[i].iloc[1]['pos'][0]*1e-10,
+                'y':bath.loc[i].iloc[1]['pos'][1]*1e-10,
+                'z':bath.loc[i].iloc[1]['pos'][2]*1e-10}
+        
+        
+        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,-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*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])
+        PN = find_axisCoup(Pdiag,axis = bath.loc[i]['JT_axis'].iloc[1])
+        
+        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_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_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])
+              
+            Hi += (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] 
+                   + tensor_prod(operators,2*k  + 0,2*k + 1,AN)
+                   #+ (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']
+                   #+ 2*np.pi*1e3*(bath.loc[i]['Az'].iloc[1]*operators['Iz'][2*k  + 0] + bath.loc[i]['Ax'].iloc[1]*operators['Ix'][2*k  + 0] + bath.loc[i]['Ay'].iloc[1]*operators['Iy'][2*k  + 0])*operators['Sz']
+                   #+ 2*params['Omega']*(np.sin(params['omega_RF']*params['t'] - params['RF_phase'])*operators['Ix'][2*k  + 0]))
+                   )
+            
+
+        for j in spins[k + 1:]:
+
+            r2 = {'x':bath.loc[j].iloc[1]['pos'][0]*1e-10,
+                    'y':bath.loc[j].iloc[1]['pos'][1]*1e-10,
+                    'z':bath.loc[j].iloc[1]['pos'][2]*1e-10}
+            
+            
+            Cij = 2*np.pi*nv.cc_coupling(r1,r2,params = params,species = 'e')
+            
+            Hij += Cij*(operators['Iz'][2*k  + 0]*operators['Iz'][2*k + 2] - (1/2)*(operators['Ix'][2*k  + 0]*operators['Ix'][2*k + 2] + operators['Iy'][2*k  + 0]*operators['Iy'][2*k + 2]))
+
+            
+        k+=1
+    operators['H0'] = H0 + Hi + Hij
+    
+    return operators,params
+
+
+def LG4(operators,params,bath,spins,Tin):
+    
+    D = params['D']
+    Om = params['Omega']
+    alpha = params['RF_phase']
+    
+    operators,params = construct_H0(operators,params,spins,bath,Tin)
+    rho,coh, UA = nv.pulse_NV(operators,params,measure = 'x',)
+    
+    params['D'] = -D
+    params['Omega'] = -Om
+    params['RF_phase'] = alpha
+    
+    operators,params = construct_H0(operators,params,spins,bath,Tin)
+    rho,coh, UAm = nv.pulse_NV(operators,params,measure = 'x',)
+    
+    params['D'] = D
+    params['Omega'] = Om
+    params['RF_phase'] = -alpha
+    
+    operators,params = construct_H0(operators,params,spins,bath,Tin)
+    rho,coh, UB = nv.pulse_NV(operators,params,measure = 'x',)
+    
+    
+    params['D'] = -D
+    params['Omega'] = -Om
+    params['RF_phase'] = -alpha
+    
+    operators,params = construct_H0(operators,params,spins,bath,Tin)
+    rho,coh, UBm = nv.pulse_NV(operators,params,measure = 'x',)
+    
+    params['D'] = D
+    params['Omega'] = Om
+    params['RF_phase'] = alpha
+    
+    U = UBm*UB*UAm*UA
+    
+    return U
+    
+
+
+def LG(operators,params,bath,spins,Tin):
+
+    operators,params = construct_H0(operators,params,spins,bath,Tin)
+    rho,coh, U = nv.pulse_NV(operators,params,measure = 'x',)
+    
+    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,
+                'LG_pulse': LG_pulse}
+
+def find_U(operators,params,bath,spins,Tin):
+    
+    U = RF_protocols[params['RF_protocol']](operators,params,bath,spins,Tin)
+    
+    return U

ONV-0.0.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-cce/CCE.py,sha256=sdBl4fwXkHGJnaA55lBXHw-ilIrxTyYElFWxo2jgnFw,10171
-cce/PCE.py,sha256=czPRY0w5Ul_vs-xOk_sKTQOH4jP-ROpm61c_h-_R6pc,30538
-cce/__init__.py,sha256=joddLkdNmwZGCc2kiY-hxQ00S4Yt4rvQvnFl2B6P900,73
-nv/__init__.py,sha256=XjVbtWn9lXo5BGMmRlMZyvAILQ35TlrJG6WY1CLa1II,306
-nv/nv.py,sha256=ejjFU195CohwAw3SbP9J1TJc42Qr54SR176_uyd-Md8,62327
-nv/p1.py,sha256=ZOwEqfcdvO9XXZIfqXrx68mdTMF9PyRTvvJu2GvEhpI,6046
-tools/__init__.py,sha256=cIGZJCLRoUxKs705DjaJKRcl-bJnOc0YGeTqo3iano8,69
-tools/plot_tools.py,sha256=RE2hZDNiMVhrzS9suMVaKhV2nz9AUnKFmlje92rHpR8,4520
-ONV-0.0.1.dist-info/METADATA,sha256=c-ATokNiReyat2RNnPMlguiiByrHzcpcPZzun-HLFjI,580
-ONV-0.0.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-ONV-0.0.1.dist-info/top_level.txt,sha256=jmmBPxx5ufCxRVITkxZpr2dsr7HSkTt2IboqWPmx5u0,13
-ONV-0.0.1.dist-info/RECORD,,