Commit 2c74777d authored by Nicolas Nunez Barreto's avatar Nicolas Nunez Barreto

para muri

parent 21e4723d
...@@ -260,6 +260,56 @@ plt.xlabel('Detuning (MHz)') ...@@ -260,6 +260,56 @@ plt.xlabel('Detuning (MHz)')
plt.ylabel('Counts') plt.ylabel('Counts')
plt.grid() plt.grid()
#%%
"""
Ahora repito el fit pero con un super ajuste
"""
FreqsDR = Freqs[10]
CountsDR = Counts[10]
def FitEIT_MM_SA(Freqs, offset, DetDoppler, SG, SP, SCALE1, SCALE2, OFFSET, BETA1, BETA2, TEMP, U, plot=False):
#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
#BETA = 1.8
# SG = 0.6
# SP = 8.1
# TEMP = 0.2e-3
freqs = [2*f*1e-6-offset for f in Freqs]
Detunings, Fluorescence1 = PerformExperiment_8levels_MM(SG, SP, gPS, gPD, DetDoppler, U, DopplerLaserLinewidth, ProbeLaserLinewidth, TEMP, alpha, phidoppler, titadoppler, phiprobe, titaprobe, BETA1, drivefreq, min(freqs), max(freqs)+(freqs[1]-freqs[0]), freqs[1]-freqs[0], circularityprobe=CircPr, plot=False, solvemode=1, detpvec=None)
Detunings, Fluorescence2 = PerformExperiment_8levels_MM(SG, SP, gPS, gPD, DetDoppler, U, DopplerLaserLinewidth, ProbeLaserLinewidth, TEMP, alpha, phidoppler, titadoppler, phiprobe, titaprobe, BETA2, drivefreq, min(freqs), max(freqs)+(freqs[1]-freqs[0]), freqs[1]-freqs[0], circularityprobe=CircPr, plot=False, solvemode=1, detpvec=None)
ScaledFluo1 = np.array([f*SCALE1 + OFFSET for f in Fluorescence1])
ScaledFluo2 = np.array([f*SCALE2 + OFFSET for f in Fluorescence2])
if plot:
return ScaledFluo1+ScaledFluo2, Detunings
else:
return ScaledFluo1+ScaledFluo2
#return ScaledFluo1
popt_SA, pcov_SA = curve_fit(FitEIT_MM_SA, FreqsDR, CountsDR, p0=[425, -13, 0.9, 7.5, 4e3, 5e3, 4000, 3.8, 0.8, 0.2e-3, 32e6], bounds=((0, -50, 0, 0, 0, 0, 0, 0,0, 0, 28e6), (1000, 0, 2, 20, 5e6, 5e6, 1e4, 10, 10,20e-3,40e6)))
FittedEITpi_short_SA, Detunings_short_SA = FitEIT_MM_SA(FreqsDR, *popt_SA, plot=True)
freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
FittedEITpi_long_SA, Detunings_long_SA = FitEIT_MM_SA(freqslong, *popt_SA, plot=True)
plt.figure()
plt.errorbar(Detunings_short_SA, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
plt.plot(Detunings_long_SA, FittedEITpi_long_SA, color='darkolivegreen', linewidth=3)
plt.title('2 ion model')
plt.xlabel('Detuning (MHz)')
plt.ylabel('Counts')
#plt.legend(loc='upper left', fontsize=20)
plt.grid()
#%% #%%
""" """
Vemos la contribucion de cada ion Vemos la contribucion de cada ion
......
...@@ -413,14 +413,16 @@ for selectedcurve in selectedcurvevec: ...@@ -413,14 +413,16 @@ for selectedcurve in selectedcurvevec:
return ScaledFluo1+ScaledFluo2 return ScaledFluo1+ScaledFluo2
#return ScaledFluo1 #return ScaledFluo1
def FitEIT_MM_1ion(Freqs, offset, DetDoppler, SG, SP, SCALE1, OFFSET, BETA1, TEMP, plot=False):
def FitEIT_MM_1ion(Freqs, offset1, offset2, DetDoppler, SG, SP, SCALE1, OFFSET, BETA1, TEMP, plot=False):
#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1): #def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
#BETA = 1.8 #BETA = 1.8
# SG = 0.6 # SG = 0.6
# SP = 8.1 # SP = 8.1
# TEMP = 0.2e-3 # TEMP = 0.2e-3
freqs = [2*f*1e-6-offset for f in Freqs] freqs = [2*f*1e-6-offset1 for f in Freqs]
Detunings, Fluorescence1 = PerformExperiment_8levels_MM(SG, SP, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, TEMP, alpha, phidoppler, titadoppler, phiprobe, titaprobe, BETA1, drivefreq, min(freqs), max(freqs)+(freqs[1]-freqs[0]), freqs[1]-freqs[0], circularityprobe=CircPr, plot=False, solvemode=1, detpvec=None) Detunings, Fluorescence1 = PerformExperiment_8levels_MM(SG, SP, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, TEMP, alpha, phidoppler, titadoppler, phiprobe, titaprobe, BETA1, drivefreq, min(freqs), max(freqs)+(freqs[1]-freqs[0]), freqs[1]-freqs[0], circularityprobe=CircPr, plot=False, solvemode=1, detpvec=None)
#Detunings, Fluorescence2 = PerformExperiment_8levels_MM(SG, SP, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, TEMP, alpha, phidoppler, titadoppler, phiprobe, titaprobe, BETA2, drivefreq, min(freqs), max(freqs)+(freqs[1]-freqs[0]), freqs[1]-freqs[0], circularityprobe=CircPr, plot=False, solvemode=1, detpvec=None) #Detunings, Fluorescence2 = PerformExperiment_8levels_MM(SG, SP, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, TEMP, alpha, phidoppler, titadoppler, phiprobe, titaprobe, BETA2, drivefreq, min(freqs), max(freqs)+(freqs[1]-freqs[0]), freqs[1]-freqs[0], circularityprobe=CircPr, plot=False, solvemode=1, detpvec=None)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment