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

analisis/plots/20210703/BranchingFraction.py

@@ -7,15 +7,6 @@ import ast
 from scipy.optimize import curve_fit
 import os
 
-# Solo levanto algunos experimentos
-ALL_FILES_SP = """000001523-SingleLine.h5"""
-
-ALL_FILES_DP = """000001525-SingleLine.h5
-000001526-SingleLine.h5
-000001527-SingleLine.h5
-000001528-SingleLine.h5
-000001529-SingleLine.h5
-000001530-SingleLine.h5"""
 
 def Background_Risetime_AOM(t, bineo, bkgr_in, bkgr_end, rise_time, rise_time_init):
     """simulo un prendido de AOM"""
@@ -94,13 +85,23 @@ plt.grid()
 
 #%%
 
+# Solo levanto algunos experimentos
+ALL_FILES_SP = """000001523-SingleLine.h5"""
+
+ALL_FILES_DP = """000001525-SingleLine.h5
+000001526-SingleLine.h5
+000001527-SingleLine.h5
+000001528-SingleLine.h5
+000001529-SingleLine.h5
+000001530-SingleLine.h5"""
+
 ## Mostrar corte de los histos:
 # fig, ax = plt.subplots()
 # ax.axvline(T0, color='k')
 os.chdir('/home/oem/Documentos/Doctorado/Artiq/Repositorio/artiq_experiments/artiq_master/results/2021-07-02/17')
 
 
-BINW = 25e-9
+BINW = 20e-9
 T0 = 0.01e-6
 #T0 = 0.02e-6
 
@@ -129,7 +130,7 @@ for i, fname in enumerate(ALL_FILES_SP.split()):
         
         
         rise_time_init = 1.02
-        rise_time = 0.11
+        rise_time = 0.060 #rise time medido del AOM 397 sin iones
         time_initbkgr_target = 0.6
         time_endbkgr_target = 4
         
@@ -138,7 +139,7 @@ for i, fname in enumerate(ALL_FILES_SP.split()):
 
         #print('bckg DP:' + str(bckg))
         
-        #axSP.plot([b*1e6 for b in binsf_SP], DynamicBkg, label='Rising AOM')            
+        axSP.plot([b*1e6 for b in binsf_SP], DynamicBkg, label='Rising AOM')            
        
         axSP.plot([b*1e6 for b in binsf_SP[:-1]], CountsSubstSP, label='Background substracted')
            
@@ -150,10 +151,16 @@ for i, fname in enumerate(ALL_FILES_SP.split()):
         axSP.axvline(0.97, color='blue', linestyle='--', linewidth=0.5, label='UV turns on')
         axSP.axvspan(0, 0.97, color='lightcyan')
         axSP.legend()
+
+        LowLim_counts_BranchingF = 0.15
+        HighLim_counts_BranchingF = 0.55
         
-        TotalCountsDetected_SP = np.sum(CountsSubstSP[int(0.*len(heigs_SP)):int(0.6*len(heigs_SP))])
+        axSP.axvline(1e6*binsf_SP[int(LowLim_counts_BranchingF*len(binsf_SP))], color='black', linewidth=0.5, linestyle='--')
+        axSP.axvline(1e6*binsf_SP[int(HighLim_counts_BranchingF*len(binsf_SP))], color='black', linewidth=0.5, linestyle='--')
+        
+        TotalCountsDetected_SP = np.sum(CountsSubstSP[int(LowLim_counts_BranchingF*len(heigs_SP)):int(HighLim_counts_BranchingF*len(heigs_SP))])
+        NaiveTotalCountsDetected_SP = np.sum(CountsSubstSP)
 
-#%%
 figDP, axDP = plt.subplots()
 
 
@@ -193,8 +200,17 @@ for i, fname in enumerate(ALL_FILES_DP.split()):
         axDP.axvline(0.64, color='red', linestyle='--', linewidth=0.5, label='IR turns on')
         axDP.axvspan(0.4, 0.64, color='papayawhip')
         axDP.legend()
+
+        LowLim_counts_BranchingF_DP = 0.028
+        HighLim_counts_BranchingF_DP = 0.40
+        
+        axDP.axvline(1e6*binsf_DP[int(LowLim_counts_BranchingF_DP*len(binsf_DP))], color='black', linewidth=0.5, linestyle='--')
+        axDP.axvline(1e6*binsf_DP[int(HighLim_counts_BranchingF_DP*len(binsf_DP))], color='black', linewidth=0.5, linestyle='--')
+        
+        TotalCountsDetected_DP = np.sum(CountsSubstDP[int(LowLim_counts_BranchingF_DP*len(heigs_DP)):int(HighLim_counts_BranchingF_DP*len(heigs_DP))])
+
         
-        TotalCountsDetected_DP= np.sum(CountsSubstDP[0:int(0.2*len(heigs_DP))])
+        #TotalCountsDetected_DP= np.sum(CountsSubstDP[0:int(0.2*len(heigs_DP))])
         
 print(TotalCountsDetected_DP)        
 print('BR: ', TotalCountsDetected_SP/TotalCountsDetected_DP)