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

analisis/plots/20230804_RotationalDopplerShift_v2/RDS_CPT2.py

@@ -240,6 +240,10 @@ plt.grid()
 plt.legend()
 plt.title('Comparacion de config colineal (insensible) con desplazada (sensible)')
 
+#%%
+
+
+
 
 #%%
 

analisis/plots/20230804_RotationalDopplerShift_v2/RDS_location.py

@@ -70,6 +70,18 @@ for i, fname in enumerate(LOC_FILES.split()):
     LocCounts.append(np.array(data['datasets']['counts_spectrum']))
     LocFrequencies.append(np.array(data['datasets']['IR1_Frequencies']))
 
+def linealfunc(x,a,b):
+    return a*x+b
+
+def normalizeplot(xvec, yvec,skip=0):
+    i_1, i_2, i_3, i_4 = 0, 20, -10-skip, -1-skip
+    popt, pcov = curve_fit(linealfunc, list(xvec[i_1:i_2])+list(xvec[i_3:i_4]), list(yvec[i_1:i_2])+list(yvec[i_3:i_4]))
+    print(popt)
+    yvecnorm = []
+    for jj in range(len(yvec)):
+        print(linealfunc(xvec[jj],*popt))
+        yvecnorm.append(yvec[jj]/linealfunc(xvec[jj],*popt))
+    return yvecnorm
 
 #%%
 
@@ -125,3 +137,34 @@ plt.grid()
 plt.legend()
 plt.title('Espectros para distintas geometrías')
 
+
+#%%
+"""
+Resonancias DD comparando +2/+2 con +2/-2 ambas colineales
+"""
+
+powermedvec = [2,4]
+
+AmpsVecs = ['Colineal', 'Desplazada']
+
+plt.figure()
+
+ftrap = 22.1
+
+DR1 = 435.8
+DR2 = 444.2
+
+jj=0
+for med in powermedvec:
+    Freqs = [2*f*1e-6 for f in LocFrequencies[med][1:]]
+    Counts = [c for c in LocCounts[med][1:]]
+    CountsNorm = normalizeplot(Freqs,Counts)
+    plt.plot(Freqs,CountsNorm, '-o', markersize=2, label=f'{AmpsVecs[jj]}')
+    jj=jj+1
+plt.xlabel('Frecuencia (MHz)')
+plt.ylabel('Counts')
+plt.grid()
+plt.legend()
+plt.title('Espectros para distintas geometrías')
+
+

analisis/plots/20230815_RotationalDopplerShift_v3/RDS_location2.py

@@ -118,9 +118,9 @@ Resonancias DD configuracion +2/-2
 
 palette = sns.color_palette("tab10")
 
-#powermedvec = [0,1,2,3]
+powermedvec = [0,1,2,3]
 
-powermedvec = [3]
+#powermedvec = [3]
 
 AmpsVecs = ['Arriba', 'Abajo', 'Izquierda', 'Derecha']
 

analisis/plots/20230817_RotationalDopplerShift_v4/RDS_location4.py

@@ -339,7 +339,7 @@ if plotmm:
         #plt.plot([2*f*1e-6 for f in PmFrequencies[med][1:]][idxtest], [c for c in PmCounts[med][1:]][idxtest], 'o', color=palette[med],markersize=14, label=f'{LocVecs[jj]}')
         jj=jj+1
 
-plt.ylim(0,1.2)
+#plt.ylim(0,1.2)
 plt.xlabel('Frecuencia (MHz)')
 plt.ylabel('Normalized Counts')
 #plt.ylim(412,2500)
@@ -348,6 +348,52 @@ plt.grid()
 
 
 
+#%%
+import seaborn as sns
+"comparo una pm con una mm"
+
+pmlocmedvec = [7]
+mmlocmedvec = [0]
+
+
+paletita = sns.color_palette('rocket')
+
+plt.figure()
+jj=0
+for med in mmlocmedvec:
+    Freqsmm = [2*f*1e-6 for f in HS_MmFrequencies[med][1:-8]]
+    Countsmm = [c-120 for c in HS_MmCounts[med][1:-8]]
+    print(Countsmm)
+    NormCountsmm = normalizeplot(Freqsmm, Countsmm, skip=0)
+    NormCountsmm[97]=1
+    plt.plot(Freqsmm, NormCountsmm, '-o', color=paletita[jj], markersize=2, alpha=1, label='+2/+2')
+    #plt.plot(Freqs, sf(NormCounts,5,2), 'o', color=palette[jj], markersize=2, label=f'{LocVecs[jj]}')
+    #plt.plot([2*f*1e-6 for f in PmFrequencies[med][1:]][idxtest], [c for c in PmCounts[med][1:]][idxtest], 'o', color=palette[med],markersize=14, label=f'{LocVecs[jj]}')
+    jj=jj+1
+
+for med in pmlocmedvec:
+    Freqspm = [2*f*1e-6 for f in PmFrequencies[med][1:]]
+    Countspm = [c-120 for c in PmCounts[med][1:]]
+    NormCountspm = normalizeplot(Freqspm, Countspm)
+    NormCountspm[21]=1
+    NormCountspm[183]=1
+    NormCountspm[184]=1
+    NormCountspm[214]=1
+    NormCountspm[285]=1
+    NormCountspm[293]=1
+    plt.plot(Freqspm, NormCountspm, '-o', color=paletita[jj+2], markersize=2, alpha=1, label='+2/-2')
+    #plt.plot(Freqs, sf(NormCounts,5,2), 'o', color=palette[jj], markersize=2, label=f'{LocVecs[jj]}')
+    #plt.plot([2*f*1e-6 for f in PmFrequencies[med][1:]][idxtest], [c for c in PmCounts[med][1:]][idxtest], 'o', color=palette[med],markersize=14, label=f'{LocVecs[jj]}')
+    jj=jj+1
+
+
+
+#plt.ylim(0,1.2)
+plt.xlabel('IR1 Frequency (MHz)',fontsize=14,fontname='STIXgeneral')
+plt.ylabel('Normalized Counts',fontsize=14,fontname='STIXgeneral')
+plt.ylim(0.3,1.1)
+plt.grid()
+plt.legend(fontsize=14,markerscale=5)
 
 
 

analisis/plots/20230817_RotationalDopplerShift_v4/RDS_location5.py

@@ -224,6 +224,7 @@ plt.ylabel('DR1 Relative depth config -2/-2')
 plt.xticks([])
 plt.ylim(0,1)
 
+
 #%%
 """
 grafico la profundidad de la resonancia oscura en funcion de la ubicacion del ion

analisis/plots/20230912_RotationalDopplerShift_v6/RDS_piezobeamsizes_vert.py

@@ -12,7 +12,7 @@ from scipy import interpolate
 
 #C:\Users\Usuario\Documents\artiq\artiq_experiments\analisis\plots\20220106_CPT_DosLaseres_v08_TISA_DR\Data
 
-#os.chdir('/home/nico/Documents/artiq_experiments/analisis/plots/20230912_RotationalDopplerShift_v6/Data')
+os.chdir('/home/nico/Documents/artiq_experiments/analisis/plots/20230912_RotationalDopplerShift_v6/Data')
 
 
 """
@@ -478,7 +478,7 @@ pmlocmedvec31 = np.arange(0,len(PIEZOS3_FILES_POT1),1)
 
 #pmlocmedvec31 = [4]
 
-plotcurvita = 0
+plotcurvita = 1
 
 plt.figure()
 
@@ -929,17 +929,34 @@ plt.errorbar(np.arange(0,len(Intensityver34),1), [p for p in pmdepthsdrver34], y
 plt.ylim(0,1.05)
 plt.grid()
 
+#%%
+
+k = 0.55
 #ahora la anterior con haz grande y alguna de las 4 potencias con haz chico
 plt.figure()
-# plt.plot(np.arange(0,len(Intensityver1),1), [i/np.max(Intensityver1) for i in Intensityver1], '-o', color='navy',alpha=0.5,markersize=8)
-# plt.errorbar(np.arange(0,len(Intensityver1),1), [p for p in pmdepthsdrver1], yerr= errorpmdepthsdrver1, fmt='o', color='navy',alpha=1, capsize=3, markersize=8)
-plt.plot(np.arange(0,len(Intensityver2),1), [i/np.max(Intensityver2) for i in Intensityver2], '-o', color='navy',alpha=0.5,markersize=8)
-plt.errorbar(np.arange(0,len(Intensityver2),1), [p for p in pmdepthsdrver2], yerr= errorpmdepthsdrver2, fmt='o', color='navy',alpha=1, capsize=3, markersize=8)
-plt.plot(np.arange(0,len(Intensityver33),1), [i/np.max(Intensityver33) for i in Intensityver33], '-o',color='green',markersize=8,alpha=0.5)
-plt.errorbar(np.arange(0,len(Intensityver33),1), [1*p for p in pmdepthsdrver33], yerr= errorpmdepthsdrver33, fmt='o', color='green',alpha=1,capsize=3, markersize=8)
-plt.xlim(-0.5, 20)
+plt.plot([k*f for f in np.arange(0,len(Intensityver1),1)], [i/np.max(Intensityver1) for i in Intensityver1], '-o', color='navy',alpha=0.5,markersize=8)
+plt.errorbar([k*f for f in np.arange(0,len(Intensityver1),1)], [p for p in pmdepthsdrver1], yerr= errorpmdepthsdrver1, fmt='o', color='navy',alpha=1, capsize=3, markersize=8)
+# plt.plot(np.arange(0,len(Intensityver2),1), [i/np.max(Intensityver2) for i in Intensityver2], '-o', color='navy',alpha=0.5,markersize=8)
+# plt.errorbar(np.arange(0,len(Intensityver2),1), [p for p in pmdepthsdrver2], yerr= errorpmdepthsdrver2, fmt='o', color='navy',alpha=1, capsize=3, markersize=8)
+plt.plot(np.arange(0,len(Intensityver31),1), [i/np.max(Intensityver31) for i in Intensityver31], '-o',color='green',markersize=8,alpha=0.5)
+plt.errorbar(np.arange(0,len(Intensityver31),1), [0.8*p for p in pmdepthsdrver31], yerr= errorpmdepthsdrver31, fmt='o', color='green',alpha=1,capsize=3, markersize=8)
+#plt.xlim(-0.5, 14)
 plt.ylim(-0.1,1.1)
 plt.grid()
 
+#%%
+
+k = 0.55
+#ahora la anterior con haz grande y alguna de las 4 potencias con haz chico
+plt.figure()
+plt.plot([k*f for f in np.arange(0,len(Intensityver1),1)], [i/np.max(Intensityver1) for i in Intensityver1], '-o', color='navy',alpha=0.5,markersize=8)
+plt.errorbar([k*f for f in np.arange(0,len(Intensityver1),1)], [p for p in pmdepthsdrver1], yerr= errorpmdepthsdrver1, fmt='o', color='navy',alpha=1, capsize=3, markersize=8)
+# plt.plot(np.arange(0,len(Intensityver2),1), [i/np.max(Intensityver2) for i in Intensityver2], '-o', color='navy',alpha=0.5,markersize=8)
+# plt.errorbar(np.arange(0,len(Intensityver2),1), [p for p in pmdepthsdrver2], yerr= errorpmdepthsdrver2, fmt='o', color='navy',alpha=1, capsize=3, markersize=8)
+plt.plot(np.arange(0,len(Intensityver33),1), [i/np.max(Intensityver33) for i in Intensityver33], '-o',color='green',markersize=8,alpha=0.5)
+plt.errorbar(np.arange(0,len(Intensityver33),1), [0.8*p for p in pmdepthsdrver33], yerr= errorpmdepthsdrver33, fmt='o', color='green',alpha=1,capsize=3, markersize=8)
+#plt.xlim(-0.5, 14)
+plt.ylim(-0.1,1.1)
+plt.grid()