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

No se que estoy haciendo espero no cagarla

analisis/plots/20230804_RotationalDopplerShift_v2/RDS_CPT2.py

@@ -262,7 +262,7 @@ secular=False
 
 
 plt.plot([2*f*1e-6 for f in ExtraIR1_Freqs[1][1:]], [1e-3*c for c in ExtraCounts[1][1:]], '-o', markersize=2, label='Colineales')
-plt.xlabel('Frequency (MHz)', fontname='STIXgeneral',fontsize=15)
+plt.xlabel('IR1 Frequency (MHz)', fontname='STIXgeneral',fontsize=15)
 plt.ylabel('kCounts',fontname='STIXgeneral',fontsize=15)
 plt.xlim(425, 455)
 plt.yticks([1,1.5,2,2.5,3],fontname='STIXgeneral',fontsize=15)

analisis/plots/20230912_RotationalDopplerShift_v6/RDS_piezobeamsizes.py

@@ -46,8 +46,8 @@ def SeeKeys(files):
         print(fname)
         print(list(data['datasets'].keys()))
 
-def Lorentzian( x, A, B, x0, gam,C):
-    #C=0
+def Lorentzian( x, A, B, x0, gam):
+    C=0
     return A * gam**2 / ( gam**2 + ( x - x0 )**2) + B - C*(x - x0)
 
 
@@ -598,9 +598,12 @@ Resonancias DD configuracion +2/-2 colineal variando la ubicacion del ion en los
 Alta estadistica
 """
 
+def Lorentzian( x, A, B, x0, gam,C):
 
+    return A * gam**2 / ( gam**2 + ( x - x0 )**2) + B - C*(x - x0)
 
-palette = sns.color_palette("tab10")
+
+palette = sns.color_palette("rocket")
 
 pmlocmedvec = np.arange(0,len(HS_FILES),1)
 
@@ -644,17 +647,17 @@ for med in pmlocmedvec:
         
     fi=775
     if med not in [800]:
-        plt.plot([1e3*(2*f*1e-6-435)-fi for f in PiezoHSFrequencies[med][1:]], [1e-3*c for c in PiezoHSCounts[med][1:]], '-o', markersize=2, alpha=0.7)
-        plt.plot([1e3*(f-435)-fi for f in Freqs],[l*1e-3 for l in Lorentzian(Freqs,*popt)],linewidth=5)
+        plt.plot([1e3*(2*f*1e-6-435)-fi for f in PiezoHSFrequencies[med][1:]], [1e-3*c for c in PiezoHSCounts[med][1:]], '-o', markersize=2, alpha=0.7,color=palette[0])
+        plt.plot([1e3*(f-435)-fi for f in Freqs],[l*1e-3 for l in Lorentzian(Freqs,*popt)],linewidth=5,color=palette[0])
     
     jj=jj+1
-plt.xlabel('Frequency (kHz)',fontname='STIXgeneral',fontsize=50)
-plt.ylabel('kCounts',fontname='STIXgeneral',fontsize=50)
+plt.xlabel('IR1 Frequency (kHz)',fontname='STIXgeneral',fontsize=40)
+plt.ylabel('kCounts',fontname='STIXgeneral',fontsize=40)
 plt.xticks([-50,-25,0,25,50],fontname='STIXgeneral',fontsize=35)
 plt.yticks([3.5,4,4.5],fontname='STIXgeneral',fontsize=35)
 plt.tight_layout()
 plt.grid()
 plt.savefig('/home/nico/Nextcloud/Nico/Doctorado/Charlas/2023 Europe/DDresonancesexperimental_fine.pdf')
 # plt.legend()
-#plt.title(f'Ancho: {round(1e3*popt[3],2)} kHz')
+print(f'Ancho: {round(1e3*popt[3],2)} kHz')