todo todo

analisis/plots/20230906_CPTconmicromocion2/Data/EITfit/MM_eightLevel_2repumps_python_scripts.py

@@ -233,7 +233,9 @@ def dopplerBroadening(wlg, wlp, alpha, T, mcalcio = 6.655e-23*1e-3):
     
     kboltzmann = 1.38e-23 #J/K
     
-    gammaD = (2*np.pi)*np.sqrt((1/(wlg*wlg)) + (1/(wlp*wlp)) - 2*(1/(wlg*wlp))*np.cos(alpha))*np.sqrt(kboltzmann*T/(2*mcalcio))
+    gammaD = (2*np.pi)*np.sqrt((1/(wlg*wlg)) + (1/(wlp*wlp)) - 2*(1/(wlg*wlp))*np.cos(alpha))*np.sqrt(kboltzmann*T/(1*mcalcio))
+
+    #print('tuk')
 
     return gammaD
     
@@ -249,8 +251,8 @@ def FullL_MM(rabG, rabP, gPS = 0, gPD = 0, Detg = 0, Detp = 0, u = 0, lwg = 0, l
     
     db = dopplerBroadening(0.397e-6, 0.866e-6, alpha, T)
 
-    lwg = np.sqrt(lwg**2 + db**2)
-    lwp = np.sqrt(lwp**2 + db**2)    
+    lwg = 0.5*np.sqrt(lwg**2 + db**2)
+    lwp = 0.5*np.sqrt(lwp**2 + db**2)    
     
     CC = EffectiveL(gPS, gPD, lwg, lwp)
     

analisis/plots/20231123_CPTconmicromocion3/CPT_plotter_20231123.py

+import h5py
+import matplotlib.pyplot as plt
+import numpy as np
+import sys
+import re
+import ast
+from scipy.optimize import curve_fit
+import os
+from scipy import interpolate
+
+"""
+Primero tengo mediciones de espectros cpt de un ion variando la tension dc_A
+"""
+
+#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/20231123_CPTconmicromocion3/Data/')
+
+CPT_FILES = """000016262-IR_Scan_withcal_optimized
+000016239-IR_Scan_withcal_optimized
+000016240-IR_Scan_withcal_optimized
+000016241-IR_Scan_withcal_optimized
+000016244-IR_Scan_withcal_optimized
+000016255-IR_Scan_withcal_optimized
+000016256-IR_Scan_withcal_optimized
+000016257-IR_Scan_withcal_optimized
+""" 
+
+
+def SeeKeys(files):
+    for i, fname in enumerate(files.split()):
+        data = h5py.File(fname+'.h5', 'r') # Leo el h5: Recordar que nuestros datos estan en 'datasets'
+        print(fname)
+        print(list(data['datasets'].keys()))
+
+print(SeeKeys(CPT_FILES))
+
+#carpeta pc nico labo escritorio:
+#C:\Users\Usuario\Documents\artiq\artiq_experiments\analisis\plots\20211101_CPT_DosLaseres_v03\Data
+
+Counts = []
+Freqs = []
+
+AmpTisa = []
+UVCPTAmp = []
+No_measures = []
+Voltages = []
+
+for i, fname in enumerate(CPT_FILES.split()):
+    print(str(i) + ' - ' + fname)
+    #print(fname)
+    data = h5py.File(fname+'.h5', 'r') # Leo el h5: Recordar que nuestros datos estan en 'datasets'
+
+    # Aca hago algo repugnante para poder levantar los strings que dejamos
+    # que además tenian un error de tipeo al final. Esto no deberá ser necesario
+    # cuando se solucione el error este del guardado.
+    Freqs.append(np.array(data['datasets']['IR1_Frequencies']))
+    Counts.append(np.array(data['datasets']['data_array']))
+    #AmpTisa.append(np.array(data['datasets']['TISA_CPT_amp']))
+    UVCPTAmp.append(np.array(data['datasets']['UV_CPT_amp']))
+    No_measures.append(np.array(data['datasets']['no_measures']))
+    Voltages.append(np.array(data['datasets']['scanning_voltages']))
+
+def Split(array,n):
+    length=len(array)/n
+    splitlist = []
+    jj = 0
+    while jj<length:
+        partial = []
+        ii = 0
+        while ii < n:
+            partial.append(array[jj*n+ii])
+            ii = ii + 1
+        splitlist.append(partial)
+        jj = jj + 1
+    return splitlist
+
+
+CountsSplit = []
+CountsSplit.append(Split(Counts[0],len(Freqs[0])))
+
+
+CountsSplit_2ions = []
+CountsSplit_2ions.append(Split(Counts[4],len(Freqs[4])))
+
+#%%
+
+"""
+Ploteo la cpt de referencia / plotting the reference CPT
+"""
+
+jvec = [9] # de la 1 a la 9 vale la pena, despues no
+
+drs = [390.5, 399.5, 406, 413.5]
+
+drive=22.1
+
+Frequencies = Freqs[0]
+
+plt.figure()
+i = 0
+for j in jvec:
+    plt.errorbar([2*f*1e-6 for f in Frequencies], CountsSplit[0][j], yerr=np.sqrt(CountsSplit[0][j]), fmt='o', capsize=2, markersize=2)
+    i = i + 1
+plt.xlabel('Frecuencia (MHz)')
+plt.ylabel('counts')
+plt.grid()
+#for dr in drs:
+#    plt.axvline(dr)
+    #plt.axvline(dr+drive)
+plt.legend()
+
+
+
+#%%
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+"""
+MEDICION 1
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 13
+
+offsetxpi = 419+correccion+3*0.8
+DetDoppler = -11.5-correccion
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+
+selectedcurve = 1
+
+FreqsDR = [2*f*1e-6-offsetxpi for f in Freqs[0]]
+CountsDR = CountsSplit[0][selectedcurve]
+CountsDR[100]=0.5*(CountsDR[99]+CountsDR[101])
+CountsDR[105]=0.5*(CountsDR[104]+CountsDR[106])
+
+freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+
+CircPr = 1
+alpha = 0
+
+
+def FitEIT_MM_single(freqs, SG, SP, SCALE1, OFFSET, BETA1, TEMP):
+#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
+    #BETA = 1.8
+    # SG = 0.6
+    # SP = 8.1
+    # TEMP = 0.2e-3
+    
+    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)
+
+    ScaledFluo1 = np.array([f*SCALE1 + OFFSET for f in Fluorescence1])
+    return ScaledFluo1
+    #return ScaledFluo1
+
+do_fit = False
+if do_fit:
+    popt_1, pcov_1 = curve_fit(FitEIT_MM_single, FreqsDR, CountsDR, p0=[0.9, 6.2, 3e4, 1.34e3, 2, 1e-3], bounds=((0, 0, 0, 0, 0, 0), (2, 20, 5e4, 5e4, 10, 10e-3)))
+    FittedEITpi_1 = FitEIT_MM_single(freqslong, *popt_1)
+
+beta1 = popt_1[4]
+errorbeta1 = np.sqrt(pcov_1[4,4])
+temp1 = popt_1[5]
+errortemp1 = np.sqrt(pcov_1[5,5])
+
+plt.figure()
+plt.errorbar(FreqsDR, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+plt.plot(freqslong, FittedEITpi_1, color='darkolivegreen', linewidth=3, label='med 1')
+#plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+plt.xlabel('Detuning (MHz)')
+plt.ylabel('Counts')
+plt.legend(loc='upper left', fontsize=20)
+plt.grid()
+
+#%%
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+"""
+MEDICION 2
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 13
+
+offsetxpi = 419+correccion+1.6
+DetDoppler = -11.5-correccion
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+
+
+selectedcurve = 2
+
+FreqsDR = [2*f*1e-6-offsetxpi for f in Freqs[0]]
+CountsDR = CountsSplit[0][selectedcurve]
+
+freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+
+CircPr = 1
+alpha = 0
+
+
+def FitEIT_MM_single(freqs, SG, SP, SCALE1, OFFSET, BETA1, TEMP):
+#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
+    #BETA = 1.8
+    # SG = 0.6
+    # SP = 8.1
+    # TEMP = 0.2e-3
+    
+    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)
+
+    ScaledFluo1 = np.array([f*SCALE1 + OFFSET for f in Fluorescence1])
+    return ScaledFluo1
+    #return ScaledFluo1
+
+do_fit = False
+if do_fit:
+    popt_2, pcov_2 = curve_fit(FitEIT_MM_single, FreqsDR, CountsDR, p0=[0.9, 6.2, 3e4, 1.34e3, 2, 1e-3], bounds=((0, 0, 0, 0, 0, 0), (2, 20, 5e4, 5e4, 10, 10e-3)))
+    FittedEITpi_2 = FitEIT_MM_single(freqslong, *popt_2)
+
+beta2 = popt_2[4]
+errorbeta2 = np.sqrt(pcov_2[4,4])
+temp2 = popt_2[5]
+errortemp2 = np.sqrt(pcov_2[5,5])
+
+plt.figure()
+plt.errorbar(FreqsDR, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+plt.plot(freqslong, FittedEITpi_2, color='darkolivegreen', linewidth=3, label='med 2')
+#plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+plt.xlabel('Detuning (MHz)')
+plt.ylabel('Counts')
+plt.legend(loc='upper left', fontsize=20)
+plt.grid()
+
+
+#%%
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+"""
+MEDICION 3
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 13
+
+offsetxpi = 419+correccion+0.8
+DetDoppler = -11.5-correccion
+
+print(offsetxpi,DetDoppler)
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+
+selectedcurve = 3
+
+FreqsDR = [2*f*1e-6-offsetxpi for f in Freqs[0]]
+CountsDR = CountsSplit[0][selectedcurve]
+
+freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+
+CircPr = 1
+alpha = 0
+
+
+def FitEIT_MM_single(freqs, SG, SP, SCALE1, OFFSET, BETA1, TEMP):
+#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
+    #BETA = 1.8
+    # SG = 0.6
+    # SP = 8.1
+    # TEMP = 0.2e-3
+    
+    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)
+
+    ScaledFluo1 = np.array([f*SCALE1 + OFFSET for f in Fluorescence1])
+    return ScaledFluo1
+    #return ScaledFluo1
+
+do_fit = True
+if do_fit:
+    popt_3, pcov_3 = curve_fit(FitEIT_MM_single, FreqsDR, CountsDR, p0=[0.9, 6.2, 3e4, 1.34e3, 2, 1e-3], bounds=((0, 0, 0, 0, 0, 0), (2, 20, 5e4, 5e4, 10, 10e-3)))
+    FittedEITpi_3 = FitEIT_MM_single(freqslong, *popt_3)
+
+beta3 = popt_3[4]
+errorbeta3 = np.sqrt(pcov_3[4,4])
+temp3 = popt_3[5]
+errortemp3 = np.sqrt(pcov_3[5,5])
+
+plt.figure()
+plt.errorbar(FreqsDR, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+plt.plot(freqslong, FittedEITpi_3, color='darkolivegreen', linewidth=3, label='med 3')
+#plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+plt.xlabel('Detuning (MHz)')
+plt.ylabel('Counts')
+plt.legend(loc='upper left', fontsize=20)
+plt.grid()
+
+
+#%%
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+"""
+MEDICION 4
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 13
+
+offsetxpi = 419+correccion
+DetDoppler = -11.5-correccion
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+
+selectedcurve = 4
+
+FreqsDR = [2*f*1e-6-offsetxpi for f in Freqs[0]]
+CountsDR = CountsSplit[0][selectedcurve]
+
+freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+
+CircPr = 1
+alpha = 0
+
+
+def FitEIT_MM_single(freqs, SG, SP, SCALE1, OFFSET, BETA1, TEMP):
+#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
+    #BETA = 1.8
+    # SG = 0.6
+    # SP = 8.1
+    # TEMP = 0.2e-3
+    
+    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)
+
+    ScaledFluo1 = np.array([f*SCALE1 + OFFSET for f in Fluorescence1])
+    return ScaledFluo1
+    #return ScaledFluo1
+
+do_fit = False
+if do_fit:
+    popt_4, pcov_4 = curve_fit(FitEIT_MM_single, FreqsDR, CountsDR, p0=[0.9, 6.2, 3e4, 1.34e3, 2, 1e-3], bounds=((0, 0, 0, 0, 0, 0), (2, 20, 5e4, 5e4, 10, 10e-3)))
+    FittedEITpi_4 = FitEIT_MM_single(freqslong, *popt_4)
+
+beta4 = popt_4[4]
+errorbeta4 = np.sqrt(pcov_4[4,4])
+temp4 = popt_4[5]
+errortemp4 = np.sqrt(pcov_4[5,5])
+
+
+plt.figure()
+plt.errorbar(FreqsDR, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+plt.plot(freqslong, FittedEITpi_4, color='darkolivegreen', linewidth=3, label='med 4')
+#plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+plt.xlabel('Detuning (MHz)')
+plt.ylabel('Counts')
+plt.legend(loc='upper left', fontsize=20)
+plt.grid()
+
+
+#%%
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+"""
+MEDICION 5
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 13
+
+offsetxpi = 419+correccion-1
+DetDoppler = -11.5-correccion
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+
+selectedcurve = 5
+
+FreqsDR = [2*f*1e-6-offsetxpi for f in Freqs[0]]
+CountsDR = CountsSplit[0][selectedcurve]
+
+freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+
+CircPr = 1
+alpha = 0
+
+
+def FitEIT_MM_single(freqs, SG, SP, SCALE1, OFFSET, BETA1, TEMP):
+#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
+    #BETA = 1.8
+    # SG = 0.6
+    # SP = 8.1
+    #TEMP = 0.2e-3
+    
+    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)
+
+    ScaledFluo1 = np.array([f*SCALE1 + OFFSET for f in Fluorescence1])
+    return ScaledFluo1
+    #return ScaledFluo1
+
+do_fit = False
+if do_fit:
+    popt_5, pcov_5 = curve_fit(FitEIT_MM_single, FreqsDR, CountsDR, p0=[0.9, 6.2, 3e4, 1.34e3, 2, 1e-3], bounds=((0, 0, 0, 0, 0, 0), (2, 20, 5e4, 5e4, 10, 10e-3)))
+    FittedEITpi_5 = FitEIT_MM_single(freqslong, *popt_5)
+
+beta5 = popt_5[4]
+errorbeta5 = np.sqrt(pcov_5[4,4])
+temp5 = popt_5[5]
+errortemp5 = np.sqrt(pcov_5[5,5])
+
+plt.figure()
+plt.errorbar(FreqsDR, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+plt.plot(freqslong, FittedEITpi_5, color='darkolivegreen', linewidth=3, label='med 5')
+#plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+plt.xlabel('Detuning (MHz)')
+plt.ylabel('Counts')
+plt.legend(loc='upper left', fontsize=20)
+plt.grid()
+
+#%%
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+"""
+MEDICION 6
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 13
+
+offsetxpi = 419+correccion-2.2  
+DetDoppler = -11.5-correccion
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+
+selectedcurve = 6
+
+FreqsDR = [2*f*1e-6-offsetxpi for f in Freqs[0]]
+CountsDR = CountsSplit[0][selectedcurve]
+CountsDR[76]=0.5*(CountsDR[75]+CountsDR[77])
+CountsDR[1]=0.5*(CountsDR[0]+CountsDR[2])
+
+freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+
+CircPr = 1
+alpha = 0
+
+
+def FitEIT_MM_single(freqs, SG, SP, SCALE1, OFFSET, BETA1, TEMP):
+#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
+    #BETA = 1.8
+    # SG = 0.6
+    # SP = 8.1
+    # TEMP = 0.2e-3
+    
+    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)
+
+    ScaledFluo1 = np.array([f*SCALE1 + OFFSET for f in Fluorescence1])
+    return ScaledFluo1
+    #return ScaledFluo1
+
+do_fit = True
+if do_fit:
+    popt_6, pcov_6 = curve_fit(FitEIT_MM_single, FreqsDR, CountsDR, p0=[0.9, 6.2, 5e4, 1e3, 2, 1e-3], bounds=((0, 0, 0, 0, 0, 0), (2, 20, 5e4, 5e4, 10, 10e-3)))
+    FittedEITpi_6 = FitEIT_MM_single(freqslong, *popt_6)
+
+beta6 = popt_6[4]
+errorbeta6 = np.sqrt(pcov_6[4,4])
+temp6 = popt_6[5]
+errortemp6 = np.sqrt(pcov_6[5,5])
+
+plt.figure()
+plt.errorbar(FreqsDR, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+plt.plot(freqslong, FittedEITpi_6, color='darkolivegreen', linewidth=3, label='med 6')
+#plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+plt.xlabel('Detuning (MHz)')
+plt.ylabel('Counts')
+plt.legend(loc='upper left', fontsize=20)
+plt.grid()
+
+
+#%%
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+"""
+MEDICION 7
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 13
+
+offsetxpi = 419+correccion-3.7
+DetDoppler = -11.5-correccion
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+
+selectedcurve = 7
+
+FreqsDR = [2*f*1e-6-offsetxpi for f in Freqs[0]]
+CountsDR = CountsSplit[0][selectedcurve]
+
+freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+
+CircPr = 1
+alpha = 0
+
+
+def FitEIT_MM_single(freqs, SG, SP, SCALE1, OFFSET, BETA1, TEMP):
+#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
+    #BETA = 1.8
+    # SG = 0.6
+    # SP = 8.1
+    # TEMP = 0.2e-3
+    
+    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)
+
+    ScaledFluo1 = np.array([f*SCALE1 + OFFSET for f in Fluorescence1])
+    return ScaledFluo1
+    #return ScaledFluo1
+
+do_fit = False
+if do_fit:
+    popt_7, pcov_7 = curve_fit(FitEIT_MM_single, FreqsDR, CountsDR, p0=[0.9, 6.2, 3e4, 1.34e3, 2, 1e-3], bounds=((0, 0, 0, 0, 0, 0), (2, 20, 5e4, 5e4, 10, 10e-3)))
+    FittedEITpi_7 = FitEIT_MM_single(freqslong, *popt_7)
+
+beta7 = popt_7[4]
+errorbeta7 = np.sqrt(pcov_7[4,4])
+temp7 = popt_7[5]
+errortemp7 = np.sqrt(pcov_7[5,5])
+
+plt.figure()
+plt.errorbar(FreqsDR, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+plt.plot(freqslong, FittedEITpi_7, color='darkolivegreen', linewidth=3, label='med 7')
+#plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+plt.xlabel('Detuning (MHz)')
+plt.ylabel('Counts')
+plt.legend(loc='upper left', fontsize=20)
+plt.grid()
+
+
+#%%
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+"""
+MEDICION 8
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 13
+
+offsetxpi = 419+correccion-4.9
+DetDoppler = -11.5-correccion
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+
+selectedcurve = 8
+
+FreqsDR = [2*f*1e-6-offsetxpi for f in Freqs[0]]
+CountsDR = CountsSplit[0][selectedcurve]
+
+freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+
+CircPr = 1
+alpha = 0
+
+
+def FitEIT_MM_single(freqs, SG, SP, SCALE1, OFFSET, BETA1, TEMP):
+#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
+    #BETA = 1.8
+    # SG = 0.6
+    # SP = 8.1
+    # TEMP = 0.2e-3
+    
+    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)
+
+    ScaledFluo1 = np.array([f*SCALE1 + OFFSET for f in Fluorescence1])
+    return ScaledFluo1
+    #return ScaledFluo1
+
+do_fit = False
+if do_fit:
+    popt_8, pcov_8 = curve_fit(FitEIT_MM_single, FreqsDR, CountsDR, p0=[0.9, 6.2, 3e4, 1.34e3, 2, 1e-3], bounds=((0, 0, 0, 0, 0, 0), (2, 20, 5e4, 5e4, 10, 10e-3)))
+    FittedEITpi_8 = FitEIT_MM_single(freqslong, *popt_8)
+
+beta8 = popt_8[4]
+errorbeta8 = np.sqrt(pcov_8[4,4])
+temp8 = popt_8[5]
+errortemp8 = np.sqrt(pcov_8[5,5])
+
+print()
+
+plt.figure()
+plt.errorbar(FreqsDR, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+plt.plot(freqslong, FittedEITpi_8, color='darkolivegreen', linewidth=3, label='med 8')
+#plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+plt.xlabel('Detuning (MHz)')
+plt.ylabel('Counts')
+plt.legend(loc='upper left', fontsize=20)
+plt.grid()
+
+
+#%%
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+"""
+MEDICION 9
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 16
+
+offsetxpi = 419+correccion-6
+DetDoppler = -11.5-correccion
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+
+selectedcurve = 9
+
+FreqsDR = [2*f*1e-6-offsetxpi for f in Freqs[0]]
+CountsDR = CountsSplit[0][selectedcurve]
+
+freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+
+CircPr = 1
+alpha = 0
+
+
+def FitEIT_MM_single(freqs, SG, SP, SCALE1, OFFSET, BETA1, TEMP):
+#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
+    #BETA = 1.8
+    # SG = 0.6
+    # SP = 8.1
+    #TEMP = 0.2e-3
+    
+    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)
+
+    ScaledFluo1 = np.array([f*SCALE1 + OFFSET for f in Fluorescence1])
+    return ScaledFluo1
+    #return ScaledFluo1
+
+do_fit = True
+if do_fit:
+    popt_9, pcov_9 = curve_fit(FitEIT_MM_single, FreqsDR, CountsDR, p0=[0.9, 6.2, 3e4, 1.34e3, 2, 1e-3], bounds=((0, 0, 0, 0, 0, 0), (2, 20, 5e4, 5e4, 10,10e-3)))
+
+    FittedEITpi_9 = FitEIT_MM_single(freqslong, *popt_9)
+
+beta9 = popt_9[4]
+errorbeta9 = np.sqrt(pcov_9[4,4])
+temp9 = popt_9[5]
+errortemp9 = np.sqrt(pcov_9[5,5])
+
+
+plt.figure()
+plt.errorbar(FreqsDR, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+plt.plot(freqslong, FittedEITpi_9, color='darkolivegreen', linewidth=3, label='med 9')
+#plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+plt.xlabel('Detuning (MHz)')
+plt.ylabel('Counts')
+plt.legend(loc='upper left', fontsize=20)
+plt.grid()
+
+
+#%%
+"""
+AHORA INTENTO SUPER AJUSTES O SEA CON OFFSETXPI Y DETDOPPLER INCLUIDOS
+"""
+
+
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+"""
+MEDICION 3: SUPER AJUSTE (SA)
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 13
+
+#DetDoppler = -11.5-correccion
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+
+SelectedCurveVec = [1,2,3,4,5,6,7,8,9]
+#SelectedCurveVec = [4]
+
+popt_SA_vec = []
+pcov_SA_vec = []
+Detuningsshort_vec = []
+Counts_vec = []
+Detuningslong_vec = []
+FittedCounts_vec = []
+
+Betas_vec = []
+ErrorBetas_vec = []
+Temp_vec = []
+ErrorTemp_vec = []
+
+DetuningsUV_vec = []
+ErrorDetuningsUV_vec = []
+
+for selectedcurve in SelectedCurveVec: 
+
+#selectedcurve = 2 #IMPORTANTE: SELECCIONA LA MEDICION
+
+    FreqsDR = Freqs[0]
+    CountsDR = CountsSplit[0][selectedcurve]
+    
+    freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+    
+    CircPr = 1
+    alpha = 0
+    
+    
+    def FitEIT_MM_single(Freqs, offset, DetDoppler, SG, SP, SCALE1, OFFSET, BETA1, TEMP, 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)
+    
+        ScaledFluo1 = np.array([f*SCALE1 + OFFSET for f in Fluorescence1])
+        if plot:
+            return ScaledFluo1, Detunings
+        else:
+            return ScaledFluo1
+        #return ScaledFluo1
+    
+    do_fit = True
+    if do_fit:
+        popt_3_SA, pcov_3_SA = curve_fit(FitEIT_MM_single, FreqsDR, CountsDR, p0=[430, -25, 0.9, 6.2, 3e4, 1.34e3, 2, 1e-3], bounds=((0, -50, 0, 0, 0, 0, 0, 0), (1000, 0, 2, 20, 5e4, 5e4, 10, 10e-3)))
+        
+        popt_SA_vec.append(popt_3_SA)
+        pcov_SA_vec.append(pcov_3_SA)
+    
+        FittedEITpi_3_SA_short, Detunings_3_SA_short = FitEIT_MM_single(FreqsDR, *popt_3_SA, plot=True)
+        freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+        FittedEITpi_3_SA_long, Detunings_3_SA_long = FitEIT_MM_single(freqslong, *popt_3_SA, plot=True)
+    
+    DetuningsUV_vec.append(popt_3_SA[1])
+    ErrorDetuningsUV_vec.append(np.sqrt(pcov_3_SA[1,1]))
+    
+    Betas_vec.append(popt_3_SA[6])
+    ErrorBetas_vec.append(np.sqrt(pcov_3_SA[6,6]))
+    Temp_vec.append(popt_3_SA[7])
+    ErrorTemp_vec.append(np.sqrt(pcov_3_SA[7,7]))
+    
+    Detuningsshort_vec.append(Detunings_3_SA_short)
+    Counts_vec.append(CountsDR)
+    Detuningslong_vec.append(Detunings_3_SA_long)
+    FittedCounts_vec.append(FittedEITpi_3_SA_long)
+    
+    
+    plt.figure()
+    plt.errorbar(Detunings_3_SA_short, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+    plt.plot(Detunings_3_SA_long, FittedEITpi_3_SA_long, color='darkolivegreen', linewidth=3, label=f'med {selectedcurve}')
+    #plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+    plt.xlabel('Detuning (MHz)')
+    plt.ylabel('Counts')
+    plt.legend(loc='upper left', fontsize=20)
+    plt.grid()
+    
+    print(f'listo med {selectedcurve}')
+    print(popt_3_SA)
+    #print(f'Detdop:{popt_3_SA[1]},popt_3_SA:{popt[0]}')
+    
+#%%
+"""
+Grafico distintas variables que salieron del SUper ajuste
+"""
+
+import seaborn as sns
+
+def lineal(x,a,b):
+    return a*x+b
+
+paleta = sns.color_palette("rocket")
+
+voltages_dcA = Voltages[0][1:10]
+
+poptini,pcovini = curve_fit(lineal,voltages_dcA[0:3],Betas_vec[0:3])
+poptfin,pcovfin = curve_fit(lineal,voltages_dcA[4:],Betas_vec[4:])
+
+minimum_voltage = -(poptini[1]-poptfin[1])/(poptini[0]-poptfin[0]) #voltaje donde se intersectan las rectas, es decir, donde deberia estar el minimo de micromocion
+minimum_modulationfactor = lineal(minimum_voltage,*poptini) #es lo mismo si pongo *poptfin
+
+xini = np.linspace(-0.23,-0.13,100)
+xfin = np.linspace(-0.15,0.005,100)
+
+plt.figure()
+plt.errorbar(voltages_dcA,Betas_vec,yerr=ErrorBetas_vec,fmt='o',capsize=5,markersize=5,color=paleta[1])
+plt.plot(xini,lineal(xini,*poptini))
+plt.plot(xfin,lineal(xfin,*poptfin))
+plt.axvline(minimum_voltage,linestyle='dashed',color='grey')
+plt.xlabel('Endcap voltage (V)')
+plt.ylabel('Modulation factor')
+plt.grid()
+
+
+plt.figure()
+plt.errorbar(voltages_dcA,[t*1e3 for t in Temp_vec],yerr=[t*1e3 for t in ErrorTemp_vec],fmt='o',capsize=5,markersize=5,color=paleta[3])
+plt.axvline(minimum_voltage,linestyle='dashed',color='grey')
+plt.axhline(0.538)
+plt.xlabel('Endcap voltage (V)')
+plt.ylabel('Temperature (mK)')
+plt.grid()
+#plt.ylim(0,2)
+
+
+
+#%%
+"""
+Esto no es del super ajuste sino de los ajustes anteriores en donde DetDoppler y offset son puestos a mano
+Aca grafico los betas con su error en funcion de la tension variada.
+Ademas, hago ajuste lineal para primeros y ultimos puntos, ya que espero que
+si la tension hace que la posicion del ion varie linealmente, el beta varia proporcional a dicha posicion.
+"""
+
+import seaborn as sns
+
+def lineal(x,a,b):
+    return a*x+b
+
+paleta = sns.color_palette("rocket")
+
+betavector = [beta1,beta2,beta3,beta4,beta5,beta6,beta7,beta8,beta9]
+errorbetavector = [errorbeta1,errorbeta2,errorbeta3,errorbeta4,errorbeta5,errorbeta6,errorbeta7,errorbeta8,errorbeta9]
+voltages_dcA = Voltages[0][1:10]
+
+poptini,pcovini = curve_fit(lineal,voltages_dcA[0:3],betavector[0:3])
+poptfin,pcovfin = curve_fit(lineal,voltages_dcA[4:],betavector[4:])
+
+minimum_voltage = -(poptini[1]-poptfin[1])/(poptini[0]-poptfin[0]) #voltaje donde se intersectan las rectas, es decir, donde deberia estar el minimo de micromocion
+minimum_modulationfactor = lineal(minimum_voltage,*poptini) #es lo mismo si pongo *poptfin
+
+xini = np.linspace(-0.23,-0.13,100)
+xfin = np.linspace(-0.15,0.005,100)
+
+plt.figure()
+plt.errorbar(voltages_dcA,betavector,yerr=errorbetavector,fmt='o',capsize=5,markersize=5,color=paleta[1])
+plt.plot(xini,lineal(xini,*poptini))
+plt.plot(xfin,lineal(xfin,*poptfin))
+plt.axvline(minimum_voltage,linestyle='dashed',color='grey')
+plt.xlabel('Endcap voltage (V)')
+plt.ylabel('Modulation factor')
+plt.grid()
+
+
+#%%
+"""
+Aca veo la temperatura del ion en funcion del voltaje del endcap, ya que
+al cambiar la cantidad de micromocion, cambia la calidad del enfriado
+"""
+tempvector = np.array([temp1,temp2,temp3,temp4,temp5,temp6,temp7,temp8,temp9])*1e3
+errortempvector = np.array([errortemp1,errortemp2,errortemp3,errortemp4,errortemp5,errortemp6,errortemp7,errortemp8,errortemp9])*1e3
+
+voltages_dcA = Voltages[0][1:10]
+
+plt.figure()
+plt.errorbar(voltages_dcA,tempvector,yerr=errortempvector,fmt='o',capsize=5,markersize=5,color=paleta[3])
+plt.axvline(minimum_voltage,linestyle='dashed',color='grey')
+plt.xlabel('Endcap voltage (V)')
+plt.ylabel('Temperature (mK)')
+plt.grid()
+plt.ylim(0,2)
+
+
+#%%
+"""
+Por las dudas, temperatura en funcion de beta
+"""
+plt.figure()
+plt.errorbar(betavector,tempvector,yerr=errortempvector,xerr=errorbetavector,fmt='o',capsize=5,markersize=5)
+plt.xlabel('Modulation factor')
+plt.ylabel('Temperature (mK)')
+plt.grid()
+
+
+
+#%%
+"""
+Si quiero ver algun parametro del ajuste puntual. el orden es: 0:SG, 1:SP, 2:SCALE1, 3:OFFSET
+"""
+ki=2
+plt.errorbar(np.arange(0,9,1),[popt_1[ki],popt_2[ki],popt_3[ki],popt_4[ki],popt_5[ki],popt_6[ki],popt_7[ki],popt_8[ki],popt_9[ki]],yerr=[np.sqrt(pcov_1[ki,ki]),np.sqrt(pcov_2[ki,ki]),np.sqrt(pcov_3[ki,ki]),np.sqrt(pcov_4[ki,ki]),np.sqrt(pcov_5[ki,ki]),np.sqrt(pcov_6[ki,ki]),np.sqrt(pcov_7[ki,ki]),np.sqrt(pcov_8[ki,ki]),np.sqrt(pcov_9[ki,ki])], fmt='o',capsize=3,markersize=3)
+
+#%%
+"""
+AHORA VAMOS A MEDICIONES CON MAS DE UN ION!!!
+"""
+
+"""
+Ploteo la cpt de referencia / plotting the reference CPT
+
+1: 2 iones, -100 mV dcA
+2: 2 iones, -150 mV dcA
+3: 2 iones, -50 mV dcA
+4: 2 iones, 5 voltajes (el ion se va en la 4ta medicion y en la 5ta ni esta)
+5, 6 y 7: 3 iones en donde el scaneo esta centrado en distintos puntos
+
+"""
+
+jvec = [3] # desde la 1, pero la 4 no porque es un merge de curvitas
+
+plt.figure()
+i = 0
+for j in jvec:
+    plt.errorbar([2*f*1e-6 for f in Freqs[j]], Counts[j], yerr=np.sqrt(Counts[j]), fmt='o', capsize=2, markersize=2)
+    i = i + 1
+plt.xlabel('Frecuencia (MHz)')
+plt.ylabel('counts')
+plt.grid()
+#for dr in drs:
+#    plt.axvline(dr)
+    #plt.axvline(dr+drive)
+plt.legend()
+
+
+#%%
+"""
+Mergeo la 5, 6 y 7
+"""
+
+Freqs5 = [2*f*1e-6 for f in Freqs[5]]
+Freqs6 = [2*f*1e-6 for f in Freqs[6]]
+Freqs7 = [2*f*1e-6 for f in Freqs[7]]
+
+Counts5 = Counts[5]
+Counts6 = Counts[6]
+Counts7 = Counts[7]
+
+i_1_ini = 0
+i_1 = 36
+i_2_ini = 0
+i_2 = 24
+
+f_1 = 18
+f_2 = 30
+
+
+scale_1 = 0.92
+scale_2 = 0.98
+
+#Merged_freqs_test = [f-f_2 for f in Freqs6[i_2_ini:i_2]]+[f-f_1 for f in Freqs5[i_1_ini:i_1]]+Freqs7
+
+#plt.plot(Merged_freqs_test,'o')
+
+
+
+Merged_freqs = [f-f_2 for f in Freqs6[0:i_2]]+[f-f_1 for f in Freqs5[0:i_1]]+Freqs7
+Merged_counts = [scale_2*c for c in Counts6[0:i_2]]+[scale_1*c for c in Counts5[0:i_1]]+list(Counts7)
+
+Merged_freqs_rescaled = np.linspace(np.min(Merged_freqs),np.max(Merged_freqs),len(Merged_freqs))
+
+#drs = [391.5, 399.5, 405.5, 414]
+drs = [370,379,385,391.5]
+
+plt.figure()
+i = 0
+for j in jvec:
+    plt.plot([f-f_1 for f in Freqs5[0:i_1]], [scale_1*c for c in Counts5[0:i_1]],'o')
+    plt.plot([f-f_2 for f in Freqs6[0:i_2]], [scale_2*c for c in Counts6[0:i_2]],'o')
+    plt.plot(Freqs7, Counts7,'o')
+    plt.errorbar(Merged_freqs, Merged_counts, yerr=np.sqrt(Merged_counts), fmt='o', capsize=2, markersize=2)
+    
+    
+    i = i + 1
+plt.xlabel('Frecuencia (MHz)')
+plt.ylabel('counts')
+plt.grid()
+for dr in drs:
+    plt.axvline(dr)
+    plt.axvline(dr+drive, color='red', linestyle='dashed', alpha=0.3)
+    plt.axvline(dr-drive, color='red', linestyle='dashed', alpha=0.3)
+    
+plt.legend()
+
+#%%
+"""
+ajusto la mergeada de 3 iones
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = -20
+
+offsetxpi = 438+correccion
+DetDoppler = -35-correccion-22
+
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+FreqsDR = [f-offsetxpi for f in Merged_freqs]
+CountsDR = Merged_counts
+
+freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+
+CircPr = 1
+alpha = 0
+
+
+def FitEIT_MM(freqs, SG, SP, SCALE1, SCALE2, SCALE3, OFFSET, BETA1, BETA2, BETA3):
+#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
+    #BETA = 1.8
+    # SG = 0.6
+    # SP = 8.1
+    TEMP = 0.1e-3
+
+    
+    #BETA1, BETA2, BETA3 = 0, 0, 2
+    
+    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, Fluorescence3 = PerformExperiment_8levels_MM(SG, SP, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, TEMP, alpha, phidoppler, titadoppler, phiprobe, titaprobe,  BETA3, 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 for f in Fluorescence1])
+    ScaledFluo2 = np.array([f*SCALE2 for f in Fluorescence2])
+    ScaledFluo3 = np.array([f*SCALE3 for f in Fluorescence3])
+    return ScaledFluo1+ScaledFluo2+ScaledFluo3+OFFSET
+    #return ScaledFluo1
+
+
+do_fit = True
+if do_fit:
+    popt_3ions, pcov_3ions = curve_fit(FitEIT_MM, FreqsDR, CountsDR, p0=[0.6, 6.2, 3.5e5, 3.5e5, 3.5e5, 2e3, 1, 1, 1], bounds=((0, 0, 0, 0, 0, 0, 0, 0, 0), (2, 20, 5e8, 5e8, 5e8, 7e3, 10, 10, 10)))
+#popt, pcov = curve_fit(FitEIT_MM, FreqsDR, CountsDR, p0=[0.8, 8, 4e4, 3.5e3, 0], bounds=((0, 0, 0, 0, 0), (2, 15, 1e5, 1e5, 10)))
+
+#array([7.12876797e-01, 7.92474752e+00, 4.29735308e+04, 1.74240582e+04,
+       #1.53401696e+03, 1.17073206e-06, 2.53804151e+00])
+
+
+FittedEITpi_3ions = FitEIT_MM(freqslong, *popt_3ions)
+#FittedEITpi_3ions = FitEIT_MM(freqslong, popt_3ions[0],popt_3ions[1],popt_3ions[2],popt_3ions[3],popt_3ions[4],popt_3ions[5],4,2,0)
+
+#FittedEITpi_3ions = FitEIT_MM(freqslong, *popt_3ions)
+
+
+print(popt_3ions)
+
+plt.figure()
+plt.errorbar(FreqsDR, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+plt.plot(freqslong, FittedEITpi_3ions, color='darkgreen', linewidth=3)
+#plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+plt.xlabel('Detuning (MHz)')
+plt.ylabel('Counts')
+plt.title(f'Corr:{correccion},DetD:{DetDoppler}')
+plt.grid()
+
+
+
+
+
+#%%
+"""
+Veo la medicion de varios voltajes uno atras de otro
+Se va en medio de la medicion 4, y en la 5 ni esta
+"""
+
+jvec = [2] # desde la 1, pero la 4 no porque es un merge de curvitas
+
+Freqs
+
+plt.figure()
+i = 0
+for j in jvec:
+    plt.errorbar([2*f*1e-6 for f in Freqs[4]], CountsSplit_2ions[0][j], yerr=np.sqrt(CountsSplit_2ions[0][j]), fmt='o', capsize=2, markersize=2)
+    i = i + 1
+plt.xlabel('Frecuencia (MHz)')
+plt.ylabel('counts')
+plt.grid()
+#for dr in drs:
+#    plt.axvline(dr)
+    #plt.axvline(dr+drive)
+plt.legend()
+
+
+#%%
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+"""
+AJUSTO LA CPT DE 2 IONES CON UN MODELO EN DONDE SUMO DOS ESPECTROS CON BETAS DISTINTOS
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 27
+
+offsetxpi = 421+correccion
+DetDoppler = -16-correccion+5
+
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+FreqsDR = [2*f*1e-6-offsetxpi for f in Freqs[1]]
+CountsDR = Counts[1]
+
+freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+
+CircPr = 1
+alpha = 0
+
+
+def FitEIT_MM(freqs, SG, SP, SCALE1, SCALE2, OFFSET):
+#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
+    #BETA = 1.8
+    # SG = 0.6
+    # SP = 8.1
+    TEMP = 0.1e-3
+    
+    BETA1, BETA2 = 3, 0
+    
+    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])
+    return ScaledFluo1+ScaledFluo2
+    #return ScaledFluo1
+
+
+do_fit = True
+if do_fit:
+    popt_2ions_1, pcov_2ions_1 = curve_fit(FitEIT_MM, FreqsDR, CountsDR, p0=[0.9, 6.2, 3.5e3, 2.9e3, 3e3], bounds=((0, 0, 0, 0, 0), (2, 20, 5e8, 5e8, 8e3)))
+#popt, pcov = curve_fit(FitEIT_MM, FreqsDR, CountsDR, p0=[0.8, 8, 4e4, 3.5e3, 0], bounds=((0, 0, 0, 0, 0), (2, 15, 1e5, 1e5, 10)))
+
+#array([7.12876797e-01, 7.92474752e+00, 4.29735308e+04, 1.74240582e+04,
+       #1.53401696e+03, 1.17073206e-06, 2.53804151e+00])
+
+FittedEITpi_2sp = FitEIT_MM(freqslong, *popt_2ions_1)
+#FittedEITpi = FitEIT_MM(freqslong, 0.8, 8, 4e4, 3.5e3, 0)
+
+# beta1_2ions = popt_2ions_1[5]
+# beta2_2ions = popt_2ions_1[6]
+
+# errbeta1_2ions = np.sqrt(pcov_2ions_1[5,5])
+# errbeta2_2ions = np.sqrt(pcov_2ions_1[6,6])
+
+"""
+Estos params dan bien poniendo beta2=0 y correccion=0 y son SG, SP, SCALE1, SCALE2, OFFSET, BETA1
+#array([9.03123248e-01, 6.25865542e+00, 3.47684055e+04, 2.92076804e+04, 1.34556420e+03, 3.55045904e+00])
+"""
+
+"""
+Ahora considerando ambos betas, con los parametros iniciales dados por los que se obtuvieron con beta2=0
+y correccion=0 dan estos parametros que son los de antes pero con BETA2 incluido:
+array([8.52685426e-01, 7.42939084e+00, 3.61998310e+04, 3.40160472e+04, 8.62651715e+02, 3.89756335e+00, 7.64867601e-01])
+"""
+
+#arreglito = np.array([8.52685426e-01, 7.42939084e+00, 3.61998310e+04, 3.40160472e+04, 8.62651715e+02, 3.89756335e+00, 7.64867601e-01])
+
+FittedEITpi_2ions_1 = FitEIT_MM(freqslong, *popt_2ions_1)
+
+
+print(popt_2ions_1)
+
+plt.figure()
+plt.errorbar(FreqsDR, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+plt.plot(freqslong, FittedEITpi_2ions_1, color='darkgreen', linewidth=3)
+#plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+plt.xlabel('Detuning (MHz)')
+plt.ylabel('Counts')
+plt.title(f'Corr:{correccion},DetD:{DetDoppler}')
+plt.grid()
+
+
+#%%
+"""
+SUPER AJUSTE PARA MED DE 2 IONES
+"""
+
+
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 13
+
+#DetDoppler = -11.5-correccion
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+
+SelectedCurveVec = [3]
+
+popt_SA_vec_2ions = []
+pcov_SA_vec_2ions = []
+
+for selectedcurve in SelectedCurveVec: 
+
+    FreqsDR = Freqs[selectedcurve]
+    CountsDR = Counts[selectedcurve]
+    
+    freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+    
+    CircPr = 1
+    alpha = 0
+    
+    
+    def FitEIT_MM_single(Freqs, offset, DetDoppler, SG, SP, SCALE1, SCALE2, OFFSET, BETA1, BETA2, TEMP, 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 for f in Fluorescence2])
+        if plot:
+            return ScaledFluo1+ScaledFluo2, Detunings
+        else:
+            return ScaledFluo1+ScaledFluo2
+        #return ScaledFluo1
+    
+    do_fit = True
+    if do_fit:
+        popt_3_SA_2ions, pcov_3_SA_2ions = curve_fit(FitEIT_MM_single, FreqsDR, CountsDR, p0=[448, -42, 0.6, 8.1, 4e4, 4e4, 6e3, 1, 1.2, 0.5e-3], bounds=((0, -100,0, 0, 0,0,0,0,0, 0), (1000, 0, 2, 20,5e6, 5e6,5e4, 10, 10,10e-3)))
+        
+        #popt_3_SA_2ions = [448, -42, 8e4, 6e3, 2, 0.5e-3]
+        
+        
+        popt_SA_vec_2ions.append(popt_3_SA_2ions)
+        pcov_SA_vec_2ions.append(pcov_3_SA_2ions)
+    
+        FittedEITpi_3_SA_short, Detunings_3_SA_short = FitEIT_MM_single(FreqsDR, *popt_3_SA_2ions, plot=True)
+        freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+        FittedEITpi_3_SA_long, Detunings_3_SA_long = FitEIT_MM_single(freqslong, *popt_3_SA_2ions, plot=True)
+    
+    
+    plt.figure()
+    plt.errorbar(Detunings_3_SA_short, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+    plt.plot(Detunings_3_SA_long, FittedEITpi_3_SA_long, color='darkolivegreen', linewidth=3, label=f'med {selectedcurve}')
+    #plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+    plt.xlabel('Detuning (MHz)')
+    plt.ylabel('Counts')
+    plt.legend(loc='upper left', fontsize=20)
+    plt.grid()
+    
+    print(f'listo med {selectedcurve}')
+    print(popt_3_SA_2ions)
+    #print(f'Detdop:{popt_3_SA[1]},popt_3_SA:{popt[0]}')
+
+
+#%%
+#from EITfit.MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels
+from scipy.optimize import curve_fit
+import time
+
+"""
+AJUSTO LA CPT DE 2 IONES CON UN MODELO EN DONDE SUMO DOS ESPECTROS CON BETAS DISTINTOS
+"""
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+Temp = 0.5e-3
+
+sg = 0.544
+sp = 4.5
+sr = 0
+DetRepump = 0
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+
+u = 32.5e6
+
+#B = (u/(2*np.pi))/c
+
+correccion = 27
+
+offsetxpi = 421+correccion
+DetDoppler = -16-correccion+5
+
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 
+alpha = 0
+
+
+drivefreq = 2*np.pi*22.135*1e6
+
+FreqsDR = [2*f*1e-6-offsetxpi for f in Freqs[1]]
+CountsDR = Counts[1]
+
+freqslong = np.arange(min(FreqsDR), max(FreqsDR)+FreqsDR[1]-FreqsDR[0], 0.1*(FreqsDR[1]-FreqsDR[0]))
+
+CircPr = 1
+alpha = 0
+
+
+def FitEIT_MM(freqs, SG, SP, SCALE1, SCALE2, OFFSET):
+#def FitEIT_MM(freqs, SG, SP, SCALE1, OFFSET, BETA1):
+    #BETA = 1.8
+    # SG = 0.6
+    # SP = 8.1
+    TEMP = 0.1e-3
+    
+    BETA1, BETA2 = 3, 0
+    
+    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])
+    return ScaledFluo1+ScaledFluo2
+    #return ScaledFluo1
+
+
+do_fit = True
+if do_fit:
+    popt_2ions_1, pcov_2ions_1 = curve_fit(FitEIT_MM, FreqsDR, CountsDR, p0=[0.9, 6.2, 3.5e3, 2.9e3, 3e3], bounds=((0, 0, 0, 0, 0), (2, 20, 5e8, 5e8, 8e3)))
+#popt, pcov = curve_fit(FitEIT_MM, FreqsDR, CountsDR, p0=[0.8, 8, 4e4, 3.5e3, 0], bounds=((0, 0, 0, 0, 0), (2, 15, 1e5, 1e5, 10)))
+
+#array([7.12876797e-01, 7.92474752e+00, 4.29735308e+04, 1.74240582e+04,
+       #1.53401696e+03, 1.17073206e-06, 2.53804151e+00])
+
+FittedEITpi_2sp = FitEIT_MM(freqslong, *popt_2ions_1)
+#FittedEITpi = FitEIT_MM(freqslong, 0.8, 8, 4e4, 3.5e3, 0)
+
+# beta1_2ions = popt_2ions_1[5]
+# beta2_2ions = popt_2ions_1[6]
+
+# errbeta1_2ions = np.sqrt(pcov_2ions_1[5,5])
+# errbeta2_2ions = np.sqrt(pcov_2ions_1[6,6])
+
+"""
+Estos params dan bien poniendo beta2=0 y correccion=0 y son SG, SP, SCALE1, SCALE2, OFFSET, BETA1
+#array([9.03123248e-01, 6.25865542e+00, 3.47684055e+04, 2.92076804e+04, 1.34556420e+03, 3.55045904e+00])
+"""
+
+"""
+Ahora considerando ambos betas, con los parametros iniciales dados por los que se obtuvieron con beta2=0
+y correccion=0 dan estos parametros que son los de antes pero con BETA2 incluido:
+array([8.52685426e-01, 7.42939084e+00, 3.61998310e+04, 3.40160472e+04, 8.62651715e+02, 3.89756335e+00, 7.64867601e-01])
+"""
+
+#arreglito = np.array([8.52685426e-01, 7.42939084e+00, 3.61998310e+04, 3.40160472e+04, 8.62651715e+02, 3.89756335e+00, 7.64867601e-01])
+
+FittedEITpi_2ions_1 = FitEIT_MM(freqslong, *popt_2ions_1)
+
+
+print(popt_2ions_1)
+
+plt.figure()
+plt.errorbar(FreqsDR, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', color='darkgreen', alpha=0.5, capsize=2, markersize=2)
+plt.plot(freqslong, FittedEITpi_2ions_1, color='darkgreen', linewidth=3)
+#plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {round(popt[2]*1e3, 2)} mK, detDop: {DetDoppler} MHz')
+plt.xlabel('Detuning (MHz)')
+plt.ylabel('Counts')
+plt.title(f'Corr:{correccion},DetD:{DetDoppler}')
+plt.grid()
+
+
+
+
+
+
+
+
+

analisis/plots/20231123_CPTconmicromocion3/Data/EITfit/MM_eightLevel_2repumps_AnalysisFunctions.py

+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Thu Jul  2 16:30:09 2020
+
+@author: oem
+"""
+
+"""
+ESTE ES EL CODIGO QUE PLOTEA CPT CON MICROMOCION BIEN
+"""
+
+import os
+import numpy as np
+import time
+import matplotlib.pyplot as plt
+from scipy.signal import argrelextrema
+#from EITfit.MM_eightLevel_2repumps_python_scripts import CPTspectrum8levels_MM
+import random
+from scipy.signal import savgol_filter as sf
+
+
+def PerformExperiment_8levels_MM(sg, sp, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobe, beta, drivefreq, freqMin, freqMax, freqStep, circularityprobe=1, plot=False, solvemode=1, detpvec=None):
+    """
+    solvemode=1: resuelve con np.linalg.solve
+    solvemode=2: resuelve invirtiendo L con la funcion np.linalg.inv
+    """
+    #tinicial = time.time()
+    ProbeDetuningVectorL, Fluovector = CPTspectrum8levels_MM(sg, sp, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobe, circularityprobe, beta, drivefreq, freqMin=freqMin, freqMax=freqMax, freqStep=freqStep, plot=False, solvemode=1)
+    #tfinal = time.time()
+    
+    #print('Done, Total time: ', round((tfinal-tinicial), 2), "s")   
+          
+    return ProbeDetuningVectorL, Fluovector
+
+
+def GenerateNoisyCPT_MM(sg, sp, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobeVec, kg, kr, v0, drivefreq, freqMin, freqMax, freqStep, circularityprobe=1, plot=False, solvemode=1, detpvec=None, noiseamplitude=0.001):
+    Frequencyvector, Fluovector = PerformExperiment_8levels_MM(sg, sp, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobeVec, kg, kr, v0, drivefreq, freqMin, freqMax, freqStep, circularityprobe, plot=False, solvemode=1, detpvec=None)
+    NoisyFluovector = [fluo+noiseamplitude*(2*random.random()-1) for fluo in Fluovector]
+    return Frequencyvector, NoisyFluovector
+
+def GenerateNoisyCPT_MM_fit(sg, sp, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobeVec, beta, drivefreq, freqs, circularityprobe=1, plot=False, solvemode=1, detpvec=None, noiseamplitude=0.001):
+    
+    Frequencyvector, Fluovector = PerformExperiment_8levels_MM(sg, sp, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobeVec, beta, drivefreq, freqs[0], freqs[-1], freqs[1]-freqs[0], circularityprobe, plot=False, solvemode=1, detpvec=None)
+    #NoisyFluovector = [fluo+noiseamplitude*(2*random.random()-1) for fluo in Fluovector]
+    return Frequencyvector, Fluovector
+
+
+def SmoothNoisyCPT(Fluo, window=11, poly=3):
+    SmoothenFluo = sf(Fluo, window, poly)
+    return SmoothenFluo
+
+
+
+
+
+

analisis/plots/20231123_CPTconmicromocion3/Data/EITfit/MM_eightLevel_2repumps_CPTPlotter.py

+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Tue Sep  1 17:58:39 2020
+
+@author: nico
+"""
+
+
+
+import os
+import numpy as np
+#os.chdir('/home/oem/Nextcloud/G_liaf/liaf-TrampaAnular/Código General/EIT-CPT/Buenos Aires/Experiment Simulations/CPT scripts/Eight Level 2 repumps')
+#from MM_eightLevel_2repumps_AnalysisFunctions import PerformExperiment_8levels, GenerateNoisyCPT, SmoothNoisyCPT
+import matplotlib.pyplot as plt
+import time
+#from threeLevel_2repumps_AnalysisFunctions import MeasureRelativeFluorescenceFromCPT, IdentifyPolarizationCoincidences, RetrieveAbsoluteCoincidencesBetweenMaps, GetClosestIndex
+import seaborn as sns
+
+#C:\Users\Usuario\Nextcloud\G_liaf\liaf-TrampaAnular\Código General\EIT-CPT\Buenos Aires\Experiment Simulations\CPT scripts\Eight Level 2 repumps
+
+ub = 9.27e-24 #magneton de bohr
+h = 6.63e-34 #cte de planck
+c = (ub/h)*1e-4 #en unidades de MHz/G
+
+u = 2e6 #proportional to the magnetic field of around 5 G
+
+B = (u/(2*np.pi))/c
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 #anchos de linea de las transiciones
+
+lw = 0. #linewidth of the lasers, 0.1 MHz are the actual linewidths of both lasers
+DopplerLaserLinewidth, ProbeLaserLinewidth = lw, lw #ancho de linea de los laseres
+
+
+TempVec = [0e-3] #Temperature vector
+alpha = 0 #angle between lasers, which is zero
+
+#Polarization angles (we can keep it fixed in 90)
+phidoppler, titadoppler = 0, 90
+titaprobe = 90
+phiprobe = 0
+
+#este es el desfasaje exp(i.phi) de la componente de la polarizacion y respecto a la x. Con 1 la polarizacion es lineal
+CircPr = 1  #this has to do with the circularity of the polarizations and since both are linear it is one
+
+#Simulation parameters
+center = -10
+span = 200
+freqMin = center-span*0.5
+freqMax = center+span*0.5
+freqStep = 2e-1
+
+noiseamplitude = 0 #i dont know what it is
+
+#parametros de saturacion de los laseres. g: doppler. p: probe (un rebombeo que scanea), r: repump (otro rebombeo fijo)
+
+"""
+Good case: sg=0.6, sp=9, DetDoppler=-15
+"""
+
+DetDoppler = -25 #nice range: -30 to 0 
+sgvec = [0.6] #nice range: 0.1 to 10 #g is for green but is the doppler
+sp = 8 #nice range: 0.1 to 20 #p is for probe but is the repump
+
+
+
+drivefreq=2*np.pi*22.135*1e6 #ignore it
+#betavec = np.arange(0,1.1,0.1) #ignore it
+betavec=[0] #ignore it
+alphavec = [0] #ignore it
+
+
+
+fig1, ax1 = plt.subplots()
+
+FrequenciesVec = []
+FluorescencesVec = []
+
+for sg in sgvec:
+    for T in TempVec:
+        for alpha in alphavec:
+            for beta in betavec:
+                Frequencies, Fluorescence = PerformExperiment_8levels(sg, sp, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobe,  beta, drivefreq, freqMin, freqMax, freqStep, circularityprobe=CircPr, plot=False, solvemode=1, detpvec=None)
+                
+                FrequenciesVec.append(Frequencies)
+                FluorescencesVec.append(Fluorescence)
+                
+                ax1.plot(Frequencies, [100*f for f in Fluorescence], label=fr'$\alpha={int(alpha*180/np.pi)}°$')  
+                ax1.set_xlabel('Detuning Rebombeo (MHz)')
+                ax1.set_ylabel('Fluorescencia (AU)')
+                ax1.set_title(f'Sdop: {sg}, Spr: {sp}, Temp: {int(T*1e3)} mK')
+                #ax1.legend()
+ax1.grid()
+
+#%%
+import seaborn as sns
+
+paleta=sns.color_palette('mako')
+
+plt.figure()
+plt.plot(Frequencies, [100*f for f in Fluorescence], color=paleta[1], linewidth=3)  
+plt.grid()
+plt.axvline(-25,color=paleta[2], linestyle='dashed')
+plt.xlabel(r'$\Delta_2$ (MHz)', fontsize=25, fontname='STIXgeneral')
+plt.ylabel('Fluorescence', fontsize=18, fontname='STIXgeneral')
+#%%
+#Este bloque ajusta a las curvas con un beta de micromocion de 0
+
+from scipy.optimize import curve_fit
+
+def FitEIT_MM(freqs, Temp):
+    BETA = 0
+    scale=1
+    offset=0
+    Detunings, Fluorescence = PerformExperiment_8levels(sg, sp, gPS, gPD, DetDoppler, u, DopplerLaserLinewidth, ProbeLaserLinewidth, Temp, alpha, phidoppler, titadoppler, phiprobe, titaprobe,  BETA, drivefreq, freqMin, freqMax, freqStep, circularityprobe=CircPr, plot=False, solvemode=1, detpvec=None)
+    ScaledFluo = [f*scale + offset for f in Fluorescence]
+    return ScaledFluo
+
+TempMedidas = []
+FittedEIT_fluosVec = []
+
+for j in range(len(betavec)):
+    SelectedFluo = FluorescencesVec[j]
+    SelectedFreqs = FrequenciesVec[j]
+    
+    popt_mm, pcov_mm = curve_fit(FitEIT_MM, SelectedFreqs, SelectedFluo, p0=[1e-3], bounds=((0), (10e-3)))
+    
+    TempMedidas.append(1e3*popt_mm[2])
+    
+    print(popt_mm)
+    
+    FittedEIT_fluo = FitEIT_MM(SelectedFreqs, *popt_mm)
+    
+    FittedEIT_fluosVec.append(FittedEIT_fluo)
+    
+    plt.figure()
+    plt.plot(SelectedFreqs, SelectedFluo, 'o')
+    plt.plot(SelectedFreqs, FittedEIT_fluo)
+
+plt.figure()
+for i in range(len(FluorescencesVec)):
+    plt.plot(SelectedFreqs, FluorescencesVec[i], 'o', markersize=3)
+    plt.plot(SelectedFreqs, FittedEIT_fluosVec[i])    
+
+
+plt.figure()
+plt.plot(betavec, TempMedidas, 'o', markersize=10)
+plt.xlabel('Beta')
+plt.ylabel('Temperatura medida (mK)')
+plt.axhline(T*1e3, label='Temperatura real', linestyle='--', color='red')
+plt.legend()
+plt.grid()
\ No newline at end of file

analisis/plots/20231123_CPTconmicromocion3/Data/EITfit/MM_eightLevel_2repumps_python_scripts.py

+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Tue Apr  7 22:30:01 2020
+
+@author: nico
+"""
+
+"""
+ESTE ES EL CODIGO QUE PLOTEA CPT CON MICROMOCION BIEN
+"""
+
+#ESTE CODIGO ES EL PRINCIPAL PARA PLOTEAR CPT TEORICOS
+import numpy as np
+import time
+import matplotlib.pyplot as plt
+from scipy.signal import argrelextrema
+
+
+"""
+Scripts para el calculo de la curva CPT
+"""
+
+
+def H0matrix(Detg, Detp, u): 
+    """
+    Calcula la matriz H0 en donde dr es el detuning del doppler, dp es el retuning del repump y u es el campo magnético en Hz/Gauss.
+    Para esto se toma la energía del nivel P como 0
+    """
+    
+    eigenEnergies = (Detg-u, Detg+u, -u/3, u/3, Detp-6*u/5, Detp-2*u/5, Detp+2*u/5, Detp+6*u/5) #pagina 26 de Oberst. los lande del calcio son iguales a Bario.
+    H0 = np.diag(eigenEnergies)
+    
+    return H0
+
+
+def HImatrix(rabG, rabP, phidoppler, titadoppler, phiprobe, titaprobe, circularityprobe=1):
+    """
+    Calcula la matriz de interacción Hsp + Hpd, en donde rabR es la frecuencia de rabi de la transición Doppler SP, 
+    rabP es la frecuencia de rabi de la transición repump DP, y las componentes ei_r y ei_p son las componentes de la polarización
+    del campo eléctrico incidente de doppler y repump respectivamente. Deben estar normalizadas a 1
+    """
+    HI = np.zeros((8, 8), dtype=np.complex_)
+    
+    
+    i, j = 1, 3
+    HI[i-1, j-1] = (rabG/np.sqrt(3)) * np.cos(titadoppler)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1]) 
+    
+    i, j = 1, 4
+    HI[i-1, j-1] = -(rabG/np.sqrt(3)) * np.sin(titadoppler)*np.exp(1j*phidoppler)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    i, j = 2, 3
+    HI[i-1, j-1] = -(rabG/np.sqrt(3)) * np.sin(titadoppler)*np.exp(-1j*phidoppler)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+     
+    i, j = 2, 4
+    HI[i-1, j-1] = -(rabG/np.sqrt(3)) * np.cos(titadoppler)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])   
+    
+    i, j = 3, 5
+    HI[i-1, j-1] = -(rabP/2) * np.sin(titaprobe)*(np.cos(phiprobe)-1j*np.sin(phiprobe)*circularityprobe)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    i, j = 3, 6
+    HI[i-1, j-1] = -(rabP/np.sqrt(3)) * np.cos(titaprobe)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    i, j = 3, 7
+    HI[i-1, j-1] = rabP/np.sqrt(12) * np.sin(titaprobe)*(np.cos(phiprobe)+1j*np.sin(phiprobe)*circularityprobe)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    
+    i, j = 4, 6
+    HI[i-1, j-1] = -(rabP/np.sqrt(12)) * np.sin(titaprobe)*(np.cos(phiprobe)-1j*np.sin(phiprobe)*circularityprobe)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    i, j = 4, 7
+    HI[i-1, j-1] = -(rabP/np.sqrt(3)) * np.cos(titaprobe) 
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    i, j = 4, 8
+    HI[i-1, j-1] = (rabP/2) * np.sin(titaprobe)*(np.cos(phiprobe)+1j*np.sin(phiprobe)*circularityprobe)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    
+    return HI
+
+
+def LtempCalculus(beta, drivefreq, forma=1):
+    Hint = np.zeros((8, 8), dtype=np.complex_)
+    
+    ampg=beta*drivefreq
+    ampr=beta*drivefreq*(397/866)        
+    #ampr=beta*drivefreq
+    Hint[0,0] = ampg
+    Hint[1,1] = ampg
+    Hint[4,4] = ampr
+    Hint[5,5] = ampr
+    Hint[6,6] = ampr
+    Hint[7,7] = ampr
+    
+    if forma==1:
+        Ltemp = np.zeros((64, 64), dtype=np.complex_)
+        """
+        for r in range(8):
+            for q in range(8):
+                for k in range(8):
+                    for j in range(8):
+                        Ltemp[r*8+q][k*8+j] = (-1j)*(Hint[r,k]*int(j==q) - Hint[j,q]*int(r==k))
+        """
+        """
+        for r in range(8):
+            for q in range(8):
+                for k in range(8):
+                    for j in range(8):
+                        if r==k and j==q:
+                            Ltemp[r*8+q][k*8+j] = (-1j)*(Hint[r,k] - Hint[j,q])
+        """
+
+        
+        for r in range(8):
+            for q in range(8):
+                if r!=q:
+                    Ltemp[r*8+q][r*8+q] = (-1j)*(Hint[r,r] - Hint[q,q])
+        
+        
+    if forma==2:
+        deltaKro = np.diag([1, 1, 1, 1, 1, 1, 1, 1])
+        Ltemp = (-1j)*(np.kron(Hint, deltaKro) - np.kron(deltaKro, Hint))
+
+    Omega = np.zeros((64, 64), dtype=np.complex_)
+    
+    for i in range(64):
+        Omega[i, i] = (1j)*drivefreq
+    
+
+    return np.matrix(Ltemp), np.matrix(Omega)
+
+
+def GetL1(Ltemp, L0, Omega, nmax):
+    """
+    Devuelve Splus0 y Sminus0
+    """
+    
+    Sp = (-1)*(np.matrix(np.linalg.inv(L0 - (nmax+1)*Omega))*0.5*np.matrix(Ltemp))
+    Sm = (-1)*(np.matrix(np.linalg.inv(L0 + (nmax+1)*Omega))*0.5*np.matrix(Ltemp))
+    
+    for n in list(range(nmax+1))[(nmax+1)::-1][0:len(list(range(nmax+1))[(nmax+1)::-1])-1]: #jaja esto solo es para que vaya de nmax a 1 bajando. debe haber algo mas facil pero kcio
+        Sp = (-1)*(np.matrix(np.linalg.inv(L0 - n*Omega + (0.5*Ltemp*np.matrix(Sp))))*0.5*np.matrix(Ltemp))
+        Sm = (-1)*(np.matrix(np.linalg.inv(L0 + n*Omega + (0.5*Ltemp*np.matrix(Sm))))*0.5*np.matrix(Ltemp))
+    L1 = 0.5*np.matrix(Ltemp)*(np.matrix(Sp) + np.matrix(Sm))
+    
+    return L1
+
+
+def EffectiveL(gPS, gPD, lwg, lwp):
+
+    """
+    Siendo Heff = H + EffectiveL, calcula dicho EffectiveL que es (-0.5j)*sumatoria(CmDaga*Cm) que luego sirve para calcular el Liouvilliano
+    """
+    Leff = np.zeros((8, 8), dtype=np.complex_)
+    
+    Leff[0, 0] = 2*lwg
+    Leff[1, 1] = 2*lwg
+    Leff[2, 2] = ((2/3)+(1/3))*gPS + ((1/2) + (1/6) + (1/3))*gPD
+    Leff[3, 3] = ((2/3)+(1/3))*gPS + ((1/2) + (1/6) + (1/3))*gPD
+    Leff[4, 4] = 2*lwp
+    Leff[5, 5] = 2*lwp
+    Leff[6, 6] = 2*lwp
+    Leff[7, 7] = 2*lwp
+    
+    return (-0.5j)*Leff
+
+
+def CalculateSingleMmatrix(gPS, gPD, lwg, lwp):
+    """
+    Si tomamos el Liuvilliano como L = (-j)*(Heff*deltak - Heffdaga*deltak) + sum(Mm),
+    esta funcion calcula dichos Mm, que tienen dimensión 64x64 ya que esa es la dimensión del L. Estas componentes
+    salen de hacer la cuenta a mano conociendo los Cm y considerando que Mm[8*(r-1)+s, 8*(k-1)+j] = Cm[r,l] + Cmdaga[j,s] = Cm[r,l] + Cm[s,j]
+    ya que los componentes de Cm son reales.
+    Esta M es la suma de las 8 matrices M.
+    
+    """
+    
+    M = np.matrix(np.zeros((64, 64), dtype=np.complex_))
+    
+    M[0,27] = (2/3)*gPS
+    
+    M[9,18] = (2/3)*gPS
+    
+    M[0,18] = (1/3)*gPS
+    M[1,19] = -(1/3)*gPS
+    M[8,26] = -(1/3)*gPS
+    M[9,27] = (1/3)*gPS
+    
+    M[36,18] = (1/2)*gPD
+    M[37,19] = (1/np.sqrt(12))*gPD
+    M[44,26] = (1/np.sqrt(12))*gPD
+    M[45,27] = (1/6)*gPD
+    
+    M[54,18] = (1/6)*gPD
+    M[55,19] = (1/np.sqrt(12))*gPD
+    M[62,26] = (1/np.sqrt(12))*gPD
+    M[63,27] = (1/2)*gPD
+    
+    M[45,18] = (1/3)*gPD
+    M[46,19] = (1/3)*gPD
+    M[53,26] = (1/3)*gPD
+    M[54,27] = (1/3)*gPD
+    
+    M[0,0] = 2*lwg
+    M[1,1] = 2*lwg
+    M[8,8] = 2*lwg
+    M[9,9] = 2*lwg
+
+    
+    #M[36, 45] = lwp
+    
+    
+    for k in [36, 37, 38, 39, 44, 45, 46, 47, 52, 53, 54, 55, 60, 61, 62, 63]:
+        M[k,k]=2*lwp
+     
+    return M
+
+def dopplerBroadening(wlg, wlp, alpha, T, mcalcio = 6.655e-23*1e-3):
+    """
+    Calcula el broadening extra semiclásico por temperatura considerando que el ion atrapado se mueve.
+    wlg es la longitud de onda doppler, wlp la longitud de onda repump, T la temperatura del ion en kelvin, y alpha (en rads) el ángulo
+    que forman ambos láseres.
+    """
+    
+    kboltzmann = 1.38e-23 #J/K
+    
+    gammaD = (2*np.pi)*np.sqrt((1/(wlg*wlg)) + (1/(wlp*wlp)) - 2*(1/(wlg*wlp))*np.cos(alpha))*np.sqrt(kboltzmann*T/(2*mcalcio))
+
+    return gammaD
+    
+
+def FullL_MM(rabG, rabP, gPS = 0, gPD = 0, Detg = 0, Detp = 0, u = 0, lwg = 0, lwp = 0, 
+          phidoppler=0, titadoppler=0, phiprobe=0, titaprobe=0, beta=0, drivefreq=2*np.pi*22.135*1e6, T = 0, alpha = 0, circularityprobe=1):
+
+    """
+    Calcula el Liouvilliano total de manera explícita índice a índice. Suma aparte las componentes de las matrices M.
+    Es la más eficiente hasta ahora.
+    """
+    
+    
+    db = dopplerBroadening(0.397e-6, 0.866e-6, alpha, T)
+    
+    lwg = np.sqrt(lwg**2 + db**2)
+    lwp = np.sqrt(lwp**2 + db**2)    
+    
+    CC = EffectiveL(gPS, gPD, lwg, lwp)
+    
+    Heff = H0matrix(Detg, Detp, u) + HImatrix(rabG, rabP, phidoppler, titadoppler, phiprobe, titaprobe, circularityprobe) + CC
+    
+    Heffdaga = np.matrix(Heff).getH()
+    
+    Lfullpartial = np.zeros((64, 64), dtype=np.complex_)
+    
+    for r  in range(8):
+        for q in range(8):
+            for k in range(8):
+                for j in range(8):
+                    if j!=q and r!=k:
+                        pass
+                    elif j==q and r!=k:
+                        if (r < 2 and k > 3) or (k < 2 and r > 3) or (r > 3 and k > 3) or (r==0 and k==1) or (r==1 and k==0) or (r==2 and k==3) or (r==3 and k==2): #todo esto sale de analizar explicitamente la matriz y tratar de no calcular cosas de más que dan cero
+                            pass
+                        else:
+                            Lfullpartial[r*8+q][k*8+j] = (-1j)*(Heff[r,k])
+                    elif j!=q and r==k:
+                        if (j < 2 and q > 3) or (q < 2 and j > 3) or (j > 3 and q > 3) or (j==0 and q==1) or (j==1 and q==0) or (j==2 and q==3) or (j==3 and q==2):
+                            pass
+                        else:
+                            Lfullpartial[r*8+q][k*8+j] = (-1j)*(-Heffdaga[j,q])
+                    else:
+                        if Heff[r,k] == Heffdaga[j,q]:
+                            pass
+                        else:
+                            Lfullpartial[r*8+q][k*8+j] = (-1j)*(Heff[r,k]-Heffdaga[j,q])
+
+    M = CalculateSingleMmatrix(gPS, gPD, lwg, lwp) 
+    L0 = np.array(np.matrix(Lfullpartial) + M)
+    
+    #ESTA PARTE ES CUANDO AGREGAS MICROMOCION
+    nmax = 3
+    
+    #print(nmax)
+    Ltemp, Omega = LtempCalculus(beta, drivefreq)
+    #print(factor)
+    L1 = GetL1(Ltemp, L0, Omega, nmax)
+    Lfull = L0 + L1 #ESA CORRECCION ESTA EN L1
+    #HASTA ACA
+    
+    #NORMALIZACION DE RHO
+    i = 0 
+    while i < 64:
+        if i%9 == 0:
+            Lfull[0, i] = 1
+        else:
+            Lfull[0, i] = 0
+        i = i + 1    
+    
+    return Lfull 
+
+
+"""
+Scripts para correr un experimento y hacer el análisis de los datos
+"""
+
+
+def CPTspectrum8levels_MM(sg, sp, gPS, gPD, Detg, u, lwg, lwp, Temp, alpha, phidoppler, titadoppler, phiprobe, titaprobe, Circularityprobe, beta, drivefreq, freqMin=-100, freqMax=100, freqStep=1e-1, plot=False, solvemode=1):
+
+    """
+    ESTA ES LA FUNCION QUE ESTAMOS USANDO
+    Hace un experimento barriendo ángulos de repump con el angulo de doppler fijo.
+    
+    solvemode=1: resuelve con np.linalg.solve
+    solvemode=2: resuelve invirtiendo L con la funcion np.linalg.inv
+    """
+    phidoppler, titadoppler = phidoppler*(np.pi/180), titadoppler*(np.pi/180) 
+    phiprobe, titaprobe = phiprobe*(np.pi/180), titaprobe*(np.pi/180)
+    
+    DetProbeVector = 2*np.pi*np.arange(freqMin*1e6, freqMax*1e6+0*freqStep*1e6, freqStep*1e6)
+    Detg = 2*np.pi*Detg*1e6
+    #lwg, lwr, lwp = 2*np.pi*lwg*1e6, 2*np.pi*lwr*1e6, 2*np.pi*lwp*1e6
+    lwg, lwp = lwg*1e6, lwp*1e6
+
+    rabG = sg*gPS
+    rabP = sp*gPD
+    #u = 2*np.pi*u*1e6
+    
+    Fluovector = []
+    
+    tinicial = time.time()
+    
+    for Detp in DetProbeVector:
+        L = FullL_MM(rabG, rabP, gPS, gPD, Detg, Detp, u, lwg, lwp, phidoppler, titadoppler, phiprobe, titaprobe, beta, drivefreq, Temp, alpha, Circularityprobe)
+        if solvemode == 1:
+            rhovectorized = np.linalg.solve(L, np.array([int(i==0) for i in range(64)]))
+            Fluo = np.real(rhovectorized[18] + np.real(rhovectorized[27]))
+            Fluovector.append(Fluo)                
+
+        if solvemode == 2:
+            Linv = np.linalg.inv(L) 
+            rhovectorized = [Linv[j][0] for j in range(len(Linv))]
+            Fluo = np.real(rhovectorized[18] + np.real(rhovectorized[27])) #estos son los rho33 + rho44
+            Fluovector.append(Fluo)
+        
+    tfinal = time.time()
+        
+    print('Done, Total time: ', round((tfinal-tinicial), 2), "s")   
+    
+    DetProbeVectorMHz = np.arange(freqMin, freqMax, freqStep)
+    
+    if plot:
+        plt.xlabel('Probe detuning (MHz)')
+        plt.ylabel('Fluorescence (A.U.)')
+        plt.plot(DetProbeVectorMHz, [100*f for f in Fluovector], label=str(titaprobe) + 'º, T: ' + str(Temp*1e3) + ' mK')
+        plt.legend()
+        
+    return DetProbeVectorMHz, Fluovector
+
+#%%
+if __name__ == "__main__":
+    ub = 9.27e-24
+    h = 6.63e-34
+    c = (ub/h)*1e-4 #en unidades de MHz/G
+    
+    B = 25 #campo magnetico en gauss
+    
+    u = c*B
+    
+    
+    sg, sr, sp = 0.5, 1.5, 4 #parámetros de saturación del doppler y repump
+    gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 #anchos de linea de las transiciones
+    rabG, rabR, rabP = sg*gPS, sr*gPD, sp*gPD #frecuencias de rabi
+    
+    lwg, lwr, lwp = 0.3, 0.3, 0.3 #ancho de linea de los laseres
+    
+    Detg = -25
+    Detr = 20 #detuning del doppler y repump
+    
+    Temp = 0.0e-3 #temperatura en K
+    alpha = 0*(np.pi/180) #angulo entre los láseres
+    
+    phidoppler, titadoppler = 0, 90
+    phirepump, titarepump = 0, 90
+    
+    phiprobe, titaprobe = 0, 90
+    
+    
+    plotCPT = False
+    
+    freqMin = -50
+    freqMax = 50
+    freqStep = 5e-2
+    
+    Frequencyvector, Fluovector = CPTspectrum8levels_MM(rabG, rabR, rabP, gPS, gPD, Detg, Detr, u, lwg, lwr, lwp, Temp, alpha, phidoppler, titadoppler, phiprobe, titaprobe, phirepump, titarepump, freqMin=freqMin, freqMax=freqMax, freqStep=freqStep, plot=plotCPT, solvemode=1)
+    
+    plt.plot(Frequencyvector, [100*f for f in Fluovector], label=str(titaprobe) + 'º, T: ' + str(Temp*1e3) + ' mK')
+    plt.xlabel('Probe detuning (MHz)')
+    plt.ylabel('Fluorescence (A.U.)')
+    
+

analisis/plots/20231123_CPTconmicromocion3/Data/EITfit/threeLevel_2repumps_AnalysisFunctions.py

+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Thu Jul  2 16:30:09 2020
+
+@author: oem
+"""
+
+
+import os
+import numpy as np
+import time
+import matplotlib.pyplot as plt
+from scipy.signal import argrelextrema
+from EITfit.threeLevel_2repumps_linealpol_python_scripts import CPTspectrum8levels, CPTspectrum8levels_fixedRabi
+import random
+from scipy.signal import savgol_filter as sf
+
+
+def CalculoTeoricoDarkResonances_8levels(u, titadoppler, detuningdoppler, detuningrepump):
+    
+    if titadoppler==0:
+        NegativeDR = [(-7/5)*u, (-3/5)*u, (-1/5)*u, (1/5)*u, (3/5)*u, (7/5)*u]
+    elif titadoppler==90:
+        NegativeDR = [(-11/5)*u, (-7/5)*u, (-3/5)*u, (3/5)*u, (7/5)*u, (11/5)*u]
+    else:
+        NegativeDR = [(-11/5)*u, (-7/5)*u, (-3/5)*u, (-1/5)*u, (1/5)*u, (3/5)*u, (7/5)*u, (11/5)*u]
+    
+    PositiveDR = [(-8/5)*u, (-4/5)*u, 0, (4/5)*u, (8/5)*u]
+    
+    return [detuningdoppler + dr for dr in NegativeDR], [detuningrepump + dr for dr in PositiveDR]
+
+
+def GetClosestIndex(Vector, value, tolerance=1e-3):
+
+    i = 0
+    while i<len(Vector):
+        if abs(Vector[i] - value) < tolerance:
+            return i
+        else:
+            i = i + 1
+    return GetClosestIndex(Vector, value, tolerance=2*tolerance)
+    
+
+def FindDRFrequencies(Freq, Fluo, TeoDR, entorno=3):
+    """
+    Busca los indices y la frecuencia de los minimos en un entorno cercano al de la DR.
+    Si no encuentra, devuelve el valor teórico.
+    """
+    
+    IndiceDRteo1, IndiceEntornoinicialDRteo1, IndiceEntornofinalDRteo1 = GetClosestIndex(Freq, TeoDR[0]), GetClosestIndex(Freq, TeoDR[0]-entorno), GetClosestIndex(Freq, TeoDR[0]+entorno)
+    IndiceDRteo2, IndiceEntornoinicialDRteo2, IndiceEntornofinalDRteo2 = GetClosestIndex(Freq, TeoDR[1]), GetClosestIndex(Freq, TeoDR[1]-entorno), GetClosestIndex(Freq, TeoDR[1]+entorno)
+    IndiceDRteo3, IndiceEntornoinicialDRteo3, IndiceEntornofinalDRteo3 = GetClosestIndex(Freq, TeoDR[2]), GetClosestIndex(Freq, TeoDR[2]-entorno), GetClosestIndex(Freq, TeoDR[2]+entorno)
+    IndiceDRteo4, IndiceEntornoinicialDRteo4, IndiceEntornofinalDRteo4 = GetClosestIndex(Freq, TeoDR[3]), GetClosestIndex(Freq, TeoDR[3]-entorno), GetClosestIndex(Freq, TeoDR[3]+entorno)
+    IndiceDRteo5, IndiceEntornoinicialDRteo5, IndiceEntornofinalDRteo5 = GetClosestIndex(Freq, TeoDR[4]), GetClosestIndex(Freq, TeoDR[4]-entorno), GetClosestIndex(Freq, TeoDR[4]+entorno)
+    IndiceDRteo6, IndiceEntornoinicialDRteo6, IndiceEntornofinalDRteo6 = GetClosestIndex(Freq, TeoDR[5]), GetClosestIndex(Freq, TeoDR[5]-entorno), GetClosestIndex(Freq, TeoDR[5]+entorno)
+
+    EntornoFreqDR1, EntornoFreqDR2 = Freq[IndiceEntornoinicialDRteo1:IndiceEntornofinalDRteo1], Freq[IndiceEntornoinicialDRteo2:IndiceEntornofinalDRteo2]
+    EntornoFreqDR3, EntornoFreqDR4 = Freq[IndiceEntornoinicialDRteo3:IndiceEntornofinalDRteo3], Freq[IndiceEntornoinicialDRteo4:IndiceEntornofinalDRteo4]
+    EntornoFreqDR5, EntornoFreqDR6 = Freq[IndiceEntornoinicialDRteo5:IndiceEntornofinalDRteo5], Freq[IndiceEntornoinicialDRteo6:IndiceEntornofinalDRteo6]
+
+    EntornoFluoDR1, EntornoFluoDR2 = Fluo[IndiceEntornoinicialDRteo1:IndiceEntornofinalDRteo1], Fluo[IndiceEntornoinicialDRteo2:IndiceEntornofinalDRteo2]
+    EntornoFluoDR3, EntornoFluoDR4 = Fluo[IndiceEntornoinicialDRteo3:IndiceEntornofinalDRteo3], Fluo[IndiceEntornoinicialDRteo4:IndiceEntornofinalDRteo4]
+    EntornoFluoDR5, EntornoFluoDR6 = Fluo[IndiceEntornoinicialDRteo5:IndiceEntornofinalDRteo5], Fluo[IndiceEntornoinicialDRteo6:IndiceEntornofinalDRteo6]
+    
+    IndiceFluoMinimaEntorno1, IndiceFluoMinimaEntorno2 = argrelextrema(np.array(EntornoFluoDR1), np.less)[0], argrelextrema(np.array(EntornoFluoDR2), np.less)[0]
+    IndiceFluoMinimaEntorno3, IndiceFluoMinimaEntorno4 = argrelextrema(np.array(EntornoFluoDR3), np.less)[0], argrelextrema(np.array(EntornoFluoDR4), np.less)[0]
+    IndiceFluoMinimaEntorno5, IndiceFluoMinimaEntorno6 = argrelextrema(np.array(EntornoFluoDR5), np.less)[0], argrelextrema(np.array(EntornoFluoDR6), np.less)[0]
+        
+    try:
+        FreqDR1 = EntornoFreqDR1[int(IndiceFluoMinimaEntorno1)]
+        IndiceDR1 = GetClosestIndex(Freq, FreqDR1)
+    except:
+        FreqDR1 = TeoDR[0]
+        IndiceDR1 = IndiceDRteo1
+    try:
+        FreqDR2 = EntornoFreqDR2[int(IndiceFluoMinimaEntorno2)]
+        IndiceDR2 = GetClosestIndex(Freq, FreqDR2)
+    except:
+        FreqDR2 = TeoDR[1]
+        IndiceDR2 = IndiceDRteo2
+    try:
+        FreqDR3 = EntornoFreqDR3[int(IndiceFluoMinimaEntorno3)]
+        IndiceDR3 = GetClosestIndex(Freq, FreqDR3)
+    except:
+        FreqDR3 = TeoDR[2]
+        IndiceDR3 = IndiceDRteo3
+    try:
+        FreqDR4 = EntornoFreqDR4[int(IndiceFluoMinimaEntorno4)]
+        IndiceDR4 = GetClosestIndex(Freq, FreqDR4)
+    except:
+        FreqDR4 = TeoDR[3]
+        IndiceDR4 = IndiceDRteo4
+    try:
+        FreqDR5 = EntornoFreqDR5[int(IndiceFluoMinimaEntorno5)]
+        IndiceDR5 = GetClosestIndex(Freq, FreqDR5)
+    except:
+        FreqDR5 = TeoDR[4]
+        IndiceDR5 = IndiceDRteo5
+    try:
+        FreqDR6 = EntornoFreqDR6[int(IndiceFluoMinimaEntorno6)]
+        IndiceDR6 = GetClosestIndex(Freq, FreqDR6)
+    except:
+        FreqDR6 = TeoDR[5]
+        IndiceDR6 = IndiceDRteo6
+                
+    return [IndiceDR1, IndiceDR2, IndiceDR3, IndiceDR4, IndiceDR5, IndiceDR6], [FreqDR1, FreqDR2, FreqDR3, FreqDR4, FreqDR5, FreqDR6]
+
+
+def FindRelativeFluorescencesOfDR(Freq, Fluo, IndicesDR, detuningdoppler, NormalizationCriterium=1, frecuenciareferenciacriterioasintotico=-100, getindices=False):
+    """
+    Toma los indices donde estan las DR y evalua su fluorescencia. Esos indices son minimos locales en un entorno
+    cercano a las DR teoricas y, si no hay ningun minimo, toma la teorica.
+    Luego, hace el cociente de esa fluorescencia y un factor de normalización segun NormalizationCriterium:
+        1: Devuelve la fluorescencia absoluta de los minimos
+        2: Devuelve el cociente entre la fluorescencia del minimo y un valor medio entre dos puntos lejanos, como si no 
+        hubiera una resonancia oscura y hubiera una recta. Ese valor esta a  DistanciaFrecuenciaCociente del detuning del azul (el punto medio entre las dos DR en este caso)
+        3: Devuelve el cociente entre la fluorescencia del minimo y el valor a -100 MHz (si se hizo de -100 a 100),
+        o el valor limite por izquierda de la curva
+        4: Deuelve el cociente entre la fluorescencia del minimo y el valor de fluorescencia a detuning 0 MHz        
+    
+    """
+    IndiceDR1, IndiceDR2, IndiceDR3, IndiceDR4, IndiceDR5, IndiceDR6 = IndicesDR[0], IndicesDR[1], IndicesDR[2], IndicesDR[3], IndicesDR[4], IndicesDR[5]
+    FluorescenceOfMinimums = [Fluo[IndiceDR1], Fluo[IndiceDR2], Fluo[IndiceDR3], Fluo[IndiceDR4], Fluo[IndiceDR5], Fluo[IndiceDR6]]
+    FrequencyOfMinimums = [Freq[IndiceDR1], Freq[IndiceDR2], Freq[IndiceDR3], Freq[IndiceDR4], Freq[IndiceDR5], Freq[IndiceDR6]]
+    DistanciaFrecuenciaCociente = 25
+
+    if NormalizationCriterium==0:
+        print('che')
+        return FrequencyOfMinimums, FluorescenceOfMinimums
+    
+    if NormalizationCriterium==1:      
+        Fluorescenciacerodetuning = Fluo[GetClosestIndex(Freq, 0)]
+        Fluorescenciaasintotica = Fluo[GetClosestIndex(Freq, frecuenciareferenciacriterioasintotico)]
+        return FrequencyOfMinimums, np.array([Fluorescenciacerodetuning/Fluorescenciaasintotica, Fluorescenciacerodetuning/Fluorescenciaasintotica, Fluorescenciacerodetuning/Fluorescenciaasintotica, Fluorescenciacerodetuning/Fluorescenciaasintotica, Fluorescenciacerodetuning/Fluorescenciaasintotica, Fluorescenciacerodetuning/Fluorescenciaasintotica])
+        
+    if NormalizationCriterium==2:
+        k = 0
+        while k < len(Freq):
+            if Freq[k] < detuningdoppler-DistanciaFrecuenciaCociente + 2 and Freq[k] > detuningdoppler-DistanciaFrecuenciaCociente - 2:
+                FluoIzquierda = Fluo[k]
+                indiceizquierda = k
+                print('Izq:', Freq[k])
+                break
+            else:
+                k = k + 1
+        
+        l = 0
+        while l < len(Freq):
+            if Freq[l] < detuningdoppler+DistanciaFrecuenciaCociente + 2 and Freq[l] > detuningdoppler+DistanciaFrecuenciaCociente - 2:
+                FluoDerecha = Fluo[l]
+                indicederecha = l
+                print('Der: ', Freq[l])
+                break
+            else:
+                l = l + 1
+        FluoNormDivisor = 0.5*(FluoDerecha+FluoIzquierda)
+        print(FluoNormDivisor)
+    
+    if NormalizationCriterium==3:
+        #asintotico
+        FluoNormDivisor = Fluo[GetClosestIndex(Freq, frecuenciareferenciacriterioasintotico)]
+
+    if NormalizationCriterium==4:
+        #este te tira la fluorescencia de detuning 0
+        FluoNormDivisor = Fluo[GetClosestIndex(Freq, 0)]
+
+   
+    RelativeFluorescenceOfMinimums = np.array([Fluore/FluoNormDivisor for Fluore in FluorescenceOfMinimums])
+    print('Esto: ', RelativeFluorescenceOfMinimums)
+
+    if NormalizationCriterium==2 and getindices==True:
+        return FrequencyOfMinimums, RelativeFluorescenceOfMinimums, indiceizquierda, indicederecha
+    
+    return FrequencyOfMinimums, RelativeFluorescenceOfMinimums
+
+
+def GetFinalMaps(MapasDR1, MapasDR2, MapasDR3, MapasDR4, MapasDR5, MapasDR6):
+    """
+    Nota: esto vale para polarizacion del 397 sigma+ + sigma-. Sino hay que cambiar los coeficientes.
+    La estructura es:
+        MapasDRi = [MapaMedido_criterio1_DRi, MapaMedido_criterio2_DRi, MapaMedido_criterio3_DRi, MapaMedido_criterio4_DRi]
+    """
+    Mapa1 = MapasDR1[0]
+    
+    Mapa2pi = np.sqrt(3)*(MapasDR2[1] + MapasDR5[1])
+    Mapa2smas = np.sqrt(12/2)*MapasDR3[1] + (2/np.sqrt(2))*MapasDR6[1]
+    Mapa2smenos = (2/np.sqrt(2))*MapasDR1[1] + np.sqrt(12/2)*MapasDR4[1]
+    
+    Mapa3pi = np.sqrt(3)*(MapasDR2[2] + MapasDR5[2])
+    Mapa3smas = np.sqrt(12/2)*MapasDR3[2] + (2/np.sqrt(2))*MapasDR6[2]
+    Mapa3smenos = (2/np.sqrt(2))*MapasDR1[2] + np.sqrt(12/2)*MapasDR4[2]
+        
+    return Mapa1, [Mapa2pi, Mapa2smas, Mapa2smenos], [Mapa3pi, Mapa3smas, Mapa3smenos]
+
+
+def CombinateDRwithCG(RelMinMedido1, RelMinMedido2, RelMinMedido3, RelMinMedido4):
+    Fluo1 = RelMinMedido1[0]
+    
+    Fluo2pi = np.sqrt(3)*(RelMinMedido2[1] + RelMinMedido2[4])
+    Fluo2smas = np.sqrt(12/2)*RelMinMedido2[2] + (2/np.sqrt(2))*RelMinMedido2[5]
+    Fluo2smenos = (2/np.sqrt(2))*RelMinMedido2[0] + np.sqrt(12/2)*RelMinMedido2[3]
+    
+    Fluo3pi = np.sqrt(3)*(RelMinMedido3[1] + RelMinMedido3[4])
+    Fluo3smas = np.sqrt(12/2)*RelMinMedido3[2] + (2/np.sqrt(2))*RelMinMedido3[5]
+    Fluo3smenos = (2/np.sqrt(2))*RelMinMedido3[0] + np.sqrt(12/2)*RelMinMedido3[3]
+    
+    return Fluo1, [Fluo2pi, Fluo2smas, Fluo2smenos], [Fluo3pi, Fluo3smas, Fluo3smenos]
+
+
+
+def IdentifyPolarizationCoincidences(theoricalmap, target, tolerance=1e-1):
+    """
+    Busca en un mapa 2D la presencia de un valor target (medido) con tolerancia tolerance.
+    Si lo encuentra, pone un 1. Sino, un 0. Al plotear con pcolor se verá
+    en blanco la zona donde el valor medido se puede hallar.
+    """
+    CoincidenceMatrix = np.zeros((len(theoricalmap), len(theoricalmap[0])))
+    
+    i = 0
+    while i<len(theoricalmap):
+        j = 0
+        while j<len(theoricalmap[0]):
+            if abs(theoricalmap[i][j]-target) < tolerance:
+                CoincidenceMatrix[i][j] = 1
+            j=j+1
+        i=i+1
+    return CoincidenceMatrix
+
+def RetrieveAbsoluteCoincidencesBetweenMaps(MapsVectors):
+    
+    MatrixSum = np.zeros((len(MapsVectors[0]), len(MapsVectors[0][0])))
+    AbsoluteCoincidencesMatrix = np.zeros((len(MapsVectors[0]), len(MapsVectors[0][0])))
+
+    
+    MatrixMapsVectors = []
+    
+    for i in range(len(MapsVectors)):
+        MatrixMapsVectors.append(np.matrix(MapsVectors[i]))
+
+    for i in range(len(MatrixMapsVectors)):
+        MatrixSum = MatrixSum + MatrixMapsVectors[i]
+        
+    MaxNumberOfCoincidences = np.max(MatrixSum)
+    
+    ListMatrixSum = [list(i) for i in list(np.array(MatrixSum))]
+    
+    for i in range(len(ListMatrixSum)):
+        for j in range(len(ListMatrixSum[0])):
+            if ListMatrixSum[i][j] == MaxNumberOfCoincidences:
+                AbsoluteCoincidencesMatrix[i][j] = 1
+    
+    return AbsoluteCoincidencesMatrix, MaxNumberOfCoincidences
+
+
+def MeasureMeanValueOfEstimatedArea(AbsoluteCoincidencesMap, X, Y):
+    NonZeroIndices = np.nonzero(AbsoluteCoincidencesMap)
+    
+    Xsum = 0
+    Xvec = []
+    Ysum = 0
+    Yvec = []
+    N = len(NonZeroIndices[0])
+    for i in range(N):
+        Xsum = Xsum + X[NonZeroIndices[1][i]]
+        Xvec.append(X[NonZeroIndices[1][i]])
+        Ysum = Ysum + Y[NonZeroIndices[0][i]]
+        Yvec.append(Y[NonZeroIndices[0][i]])
+    Xaverage = Xsum/N
+    Yaverage = Ysum/N
+    Xspread = np.std(Xvec)
+    Yspread = np.std(Yvec)
+    return Xaverage, Yaverage, N, Xspread, Yspread
+    
+
+def MeasureRelativeFluorescenceFromCPT(Freq, Fluo, u, titadoppler, detuningrepump, detuningdoppler, frefasint=-100, entorno=3):
+    ResonanciasTeoricas, ResonanciasPositivas = CalculoTeoricoDarkResonances_8levels(u, titadoppler, detuningdoppler, detuningrepump)
+    IndicesDR, FreqsDR = FindDRFrequencies(Freq, Fluo, ResonanciasTeoricas, entorno=entorno)
+    FrequencyOfMinimums, RelativeFluorescenceOfMinimums0 = FindRelativeFluorescencesOfDR(Freq, Fluo, IndicesDR, detuningdoppler, NormalizationCriterium=0, frecuenciareferenciacriterioasintotico=frefasint)
+    FrequencyOfMinimums, RelativeFluorescenceOfMinimums1 = FindRelativeFluorescencesOfDR(Freq, Fluo, IndicesDR, detuningdoppler, NormalizationCriterium=1, frecuenciareferenciacriterioasintotico=frefasint)
+    FrequencyOfMinimums, RelativeFluorescenceOfMinimums2, indiceizquierda, indicederecha = FindRelativeFluorescencesOfDR(Freq, Fluo, IndicesDR, detuningdoppler, NormalizationCriterium=2, frecuenciareferenciacriterioasintotico=frefasint, getindices=True)
+    FrequencyOfMinimums, RelativeFluorescenceOfMinimums3 = FindRelativeFluorescencesOfDR(Freq, Fluo, IndicesDR, detuningdoppler, NormalizationCriterium=3, frecuenciareferenciacriterioasintotico=frefasint)
+    FrequencyOfMinimums, RelativeFluorescenceOfMinimums4 = FindRelativeFluorescencesOfDR(Freq, Fluo, IndicesDR, detuningdoppler, NormalizationCriterium=4, frecuenciareferenciacriterioasintotico=frefasint)
+    print('hola')
+    print(RelativeFluorescenceOfMinimums0)
+    return RelativeFluorescenceOfMinimums0, RelativeFluorescenceOfMinimums1, RelativeFluorescenceOfMinimums2, RelativeFluorescenceOfMinimums3, RelativeFluorescenceOfMinimums4, IndicesDR, [indiceizquierda, indicederecha]
+
+
+def GenerateNoisyCPT(rabG, rabR, rabP, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobeVec, phirepump, titarepump, freqMin, freqMax, freqStep, plot=False, solvemode=1, detpvec=None, noiseamplitude=0.001):
+    Frequencyvector, Fluovector = PerformExperiment_8levels(rabG, rabR, rabP, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobeVec, phirepump, titarepump, freqMin, freqMax, freqStep, plot=False, solvemode=1, detpvec=None)
+    NoisyFluovector = [fluo+noiseamplitude*(2*random.random()-1) for fluo in Fluovector]
+    return Frequencyvector, NoisyFluovector
+
+
+def GenerateNoisyCPT_fixedRabi(sg, sr, sp, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobeVec, phirepump, titarepump, freqMin, freqMax, freqStep, plot=False, solvemode=1, detpvec=None, noiseamplitude=0.001):
+    Frequencyvector, Fluovector = PerformExperiment_8levels_fixedRabi(sg, sr, sp, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobeVec, phirepump, titarepump, freqMin, freqMax, freqStep, plot=False, solvemode=1, detpvec=None)
+    NoisyFluovector = [fluo+noiseamplitude*(2*random.random()-1) for fluo in Fluovector]
+    return Frequencyvector, NoisyFluovector
+
+def GenerateNoisyCPT_fit(sg, sr, sp, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobeVec, phirepump, titarepump, freqs, plot=False, solvemode=1, detpvec=None, noiseamplitude=0.001):
+    Frequencyvector, Fluovector = PerformExperiment_8levels_fixedRabi(sg, sr, sp, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobeVec, phirepump, titarepump, min(freqs), max(freqs) + freqs[1]-freqs[0], freqs[1]-freqs[0], plot=False, solvemode=1, detpvec=None)
+    NoisyFluovector = [fluo+noiseamplitude*(2*random.random()-1) for fluo in Fluovector]
+    return Frequencyvector, NoisyFluovector
+
+
+def AddNoiseToCPT(Fluo, noisefactor):
+    return [f+noisefactor*(2*random.random()-1) for f in Fluo]
+
+
+def SmoothNoisyCPT(Fluo, window=11, poly=3):
+    SmoothenFluo = sf(Fluo, window, poly)
+    return SmoothenFluo
+
+
+def GetMinimaInfo(Freq, Fluo, u, titadoppler, detuningdoppler, detuningrepump, MinimumCriterium=2, NormalizationCriterium=1):
+    """
+    FUNCION VIEJA
+    
+    Esta funcion devuelve valores de frecuencias y fluorescencia relativa de los minimos.
+    Minimumcriterion:
+        1: Saca los minimos con funcion argelextrema
+        2: Directamente con las frecuencias teoricas busca las fluorescencias
+    
+    Normalizationcriterium:
+        1: Devuelve la fluorescencia absoluta de los minimos
+        2: Devuelve el cociente entre la fluorescencia del minimo y un valor medio entre dos puntos lejanos, como si no 
+        hubiera una resonancia oscura y hubiera una recta. Ese valor esta a  DistanciaFrecuenciaCociente del detuning del azul (el punto medio entre las dos DR en este caso)
+        3: Devuelve el cociente entre la fluorescencia del minimo y el valor a -100 MHz (si se hizo de -100 a 100),
+        o el valor limite por izquierda de la curva
+    
+    """
+    FluorescenceOfMaximum = max(Fluo)
+    FrequencyOfMaximum = Freq[Fluo.index(FluorescenceOfMaximum)]
+
+
+    #criterio para encontrar los minimos
+    #criterio usando minimos de la fluorescencia calculados con la curva
+    if MinimumCriterium == 1:
+        LocationOfMinimums = argrelextrema(np.array(Fluo), np.less)[0]
+        FluorescenceOfMinimums = np.array([Fluo[i] for i in LocationOfMinimums])
+        FrequencyOfMinimums = np.array([Freq[j] for j in LocationOfMinimums])
+
+
+    #criterio con las DR teoricas
+    if MinimumCriterium == 2:
+        FrecuenciasDRTeoricas, FrecuenciasDRTeoricasPositivas = [darkresonance for darkresonance in CalculoTeoricoDarkResonances_8levels(u, titadoppler, detuningdoppler, detuningrepump)[0]]
+        FrequencyOfMinimums = []
+        FluorescenceOfMinimums =[]
+        print(FrecuenciasDRTeoricas)
+        k=0
+        
+        ventanita = 0.001
+        while k < len(Freq):
+            if Freq[k] < FrecuenciasDRTeoricas[0] + ventanita and Freq[k] > FrecuenciasDRTeoricas[0] - ventanita:
+                FrequencyOfMinimums.append(Freq[k])
+                FluorescenceOfMinimums.append(Fluo[k])
+            elif Freq[k] < FrecuenciasDRTeoricas[1] + ventanita and Freq[k] > FrecuenciasDRTeoricas[1] - ventanita:
+                FrequencyOfMinimums.append(Freq[k])
+                FluorescenceOfMinimums.append(Fluo[k])
+            elif Freq[k] < FrecuenciasDRTeoricas[2] + ventanita and Freq[k] > FrecuenciasDRTeoricas[2] - ventanita:
+                FrequencyOfMinimums.append(Freq[k])
+                FluorescenceOfMinimums.append(Fluo[k])
+            elif Freq[k] < FrecuenciasDRTeoricas[3] + ventanita and Freq[k] > FrecuenciasDRTeoricas[3] - ventanita:
+                FrequencyOfMinimums.append(Freq[k])
+                FluorescenceOfMinimums.append(Fluo[k])
+            elif Freq[k] < FrecuenciasDRTeoricas[4] + ventanita and Freq[k] > FrecuenciasDRTeoricas[4] - ventanita:
+                FrequencyOfMinimums.append(Freq[k])
+                FluorescenceOfMinimums.append(Fluo[k])
+            elif Freq[k] < FrecuenciasDRTeoricas[5] + ventanita and Freq[k] > FrecuenciasDRTeoricas[5] - ventanita:
+                FrequencyOfMinimums.append(Freq[k])
+                FluorescenceOfMinimums.append(Fluo[k])
+            k = k + 1
+        print(FrequencyOfMinimums)
+        if len(FrequencyOfMinimums) !=  len(FrecuenciasDRTeoricas):
+            print('NO ANDA BIEN ESTO PAPI, revisalo')
+        
+            
+    #esto es para establecer un criterio para la fluorescencia relativa
+    DistanciaFrecuenciaCociente = 15
+    
+    if NormalizationCriterium==1:      
+        FluoNormDivisor = 1 
+        
+    if NormalizationCriterium==2:
+        k = 0
+        while k < len(Freq):
+            if Freq[k] < detuningdoppler-DistanciaFrecuenciaCociente + 2 and Freq[k] > detuningdoppler-DistanciaFrecuenciaCociente - 2:
+                FluoIzquierda = Fluo[k]
+                print('Izq:', Freq[k])
+                break
+            else:
+                k = k + 1
+        
+        l = 0
+        while l < len(Freq):
+            if Freq[l] < detuningdoppler+DistanciaFrecuenciaCociente + 2 and Freq[l] > detuningdoppler+DistanciaFrecuenciaCociente - 2:
+                FluoDerecha = Fluo[l]
+                print('Der: ', Freq[l])
+                break
+            else:
+                l = l + 1
+        FluoNormDivisor = 0.5*(FluoDerecha+FluoIzquierda)
+        print(FluoNormDivisor)
+    
+    if NormalizationCriterium==3:
+        FluoNormDivisor = Fluo[0]
+    
+    RelativeFluorescenceOfMinimums = np.array([Fluore/FluoNormDivisor for Fluore in FluorescenceOfMinimums])
+    
+    return FrequencyOfMinimums, RelativeFluorescenceOfMinimums
+
+
+def GetPlotsofFluovsAngle_8levels(FrequencyOfMinimumsVector, RelativeFluorescenceOfMinimumsVector, u, titadoppler, detuningdoppler, detuningrepump, ventana=0.25, taketheoricalDR=False):
+    
+    #primero buscamos las frecuencias referencia que se parezcan a las 6:
+    i = 0
+    FrecuenciasReferenciaBase = FrequencyOfMinimumsVector[0]
+    
+    FrecuenciasDRTeoricas = [darkresonance for darkresonance in CalculoTeoricoDarkResonances_8levels(u, titadoppler, detuningdoppler, detuningrepump)[0]]
+    
+    while i < len(FrequencyOfMinimumsVector):
+        if len(FrequencyOfMinimumsVector[i])==len(FrecuenciasDRTeoricas):
+            FrecuenciasReferenciaBase = FrequencyOfMinimumsVector[i]
+            print('Cool! Taking the DR identified with any curve')
+            break
+        else:
+            i = i + 1
+            if i==len(FrequencyOfMinimumsVector):
+                print('No hay ningun plot con 5 resonancias oscuras. Tomo las teóricas')
+                FrecuenciasReferenciaBase = FrecuenciasDRTeoricas
+    
+    if taketheoricalDR:
+        FrecuenciasReferenciaBase = FrecuenciasDRTeoricas
+        
+        
+            
+    Ventana = abs(ventana*(FrecuenciasReferenciaBase[1] - FrecuenciasReferenciaBase[0])) #ventana separadora de resonancias
+    
+    print('Ventana = ', Ventana)
+    DarkResonance1Frequency = []
+    DarkResonance1Fluorescence = []
+    
+    DarkResonance2Frequency = []
+    DarkResonance2Fluorescence = []
+    
+    DarkResonance3Frequency = []
+    DarkResonance3Fluorescence = []
+   
+    DarkResonance4Frequency = []
+    DarkResonance4Fluorescence = []
+    
+    DarkResonance5Frequency = []
+    DarkResonance5Fluorescence = []
+    
+    DarkResonance6Frequency = []
+    DarkResonance6Fluorescence = []    
+    
+    i = 0
+    
+   
+    while i < len(FrequencyOfMinimumsVector):
+        j = 0
+        FrecuenciasReferencia = [i for i in FrecuenciasReferenciaBase]
+
+
+        while j < len(FrequencyOfMinimumsVector[i]):
+            
+            
+            if abs(FrequencyOfMinimumsVector[i][j]) < (abs(FrecuenciasReferencia[0])+Ventana) and abs(FrequencyOfMinimumsVector[i][j]) >= (abs(FrecuenciasReferencia[0])-Ventana):
+                DarkResonance1Frequency.append(FrequencyOfMinimumsVector[i][j])
+                DarkResonance1Fluorescence.append(RelativeFluorescenceOfMinimumsVector[i][j])
+                FrecuenciasReferencia[0] = 0
+            
+            elif abs(FrequencyOfMinimumsVector[i][j]) < (abs(FrecuenciasReferencia[1])+Ventana) and abs(FrequencyOfMinimumsVector[i][j]) >= (abs(FrecuenciasReferencia[1])-Ventana):
+                DarkResonance2Frequency.append(FrequencyOfMinimumsVector[i][j])
+                DarkResonance2Fluorescence.append(RelativeFluorescenceOfMinimumsVector[i][j])
+                FrecuenciasReferencia[1] = 0
+
+            elif abs(FrequencyOfMinimumsVector[i][j]) < (abs(FrecuenciasReferencia[2])+Ventana) and abs(FrequencyOfMinimumsVector[i][j]) >= (abs(FrecuenciasReferencia[2])-Ventana):
+                DarkResonance3Frequency.append(FrequencyOfMinimumsVector[i][j])
+                DarkResonance3Fluorescence.append(RelativeFluorescenceOfMinimumsVector[i][j])
+                FrecuenciasReferencia[2] = 0
+
+            elif abs(FrequencyOfMinimumsVector[i][j]) < (abs(FrecuenciasReferencia[3])+Ventana) and abs(FrequencyOfMinimumsVector[i][j]) >= (abs(FrecuenciasReferencia[3])-Ventana):
+                DarkResonance4Frequency.append(FrequencyOfMinimumsVector[i][j])
+                DarkResonance4Fluorescence.append(RelativeFluorescenceOfMinimumsVector[i][j])
+                FrecuenciasReferencia[3] = 0
+
+            elif abs(FrequencyOfMinimumsVector[i][j]) < (abs(FrecuenciasReferencia[4])+Ventana) and abs(FrequencyOfMinimumsVector[i][j]) >= (abs(FrecuenciasReferencia[4])-Ventana):
+                DarkResonance5Frequency.append(FrequencyOfMinimumsVector[i][j])
+                DarkResonance5Fluorescence.append(RelativeFluorescenceOfMinimumsVector[i][j])
+                FrecuenciasReferencia[4] = 0
+
+            elif abs(FrequencyOfMinimumsVector[i][j]) < (abs(FrecuenciasReferencia[5])+Ventana) and abs(FrequencyOfMinimumsVector[i][j]) >= (abs(FrecuenciasReferencia[5])-Ventana):
+                DarkResonance6Frequency.append(FrequencyOfMinimumsVector[i][j])
+                DarkResonance6Fluorescence.append(RelativeFluorescenceOfMinimumsVector[i][j])
+                FrecuenciasReferencia[5] = 0
+                
+            else:
+                #print('Algo anduvo mal, por ahi tenes que cambiar la ventana che')
+                pass
+            j = j + 1
+        
+        if np.count_nonzero(FrecuenciasReferencia) > 0:
+            if FrecuenciasReferencia[0] != 0:
+                DarkResonance1Frequency.append(FrecuenciasReferencia[0])
+                DarkResonance1Fluorescence.append()
+                
+            if FrecuenciasReferencia[1] != 0:
+                DarkResonance2Frequency.append(FrecuenciasReferencia[1])
+                DarkResonance2Fluorescence.append(0)
+
+            if FrecuenciasReferencia[2] != 0:
+                DarkResonance3Frequency.append(FrecuenciasReferencia[2])
+                DarkResonance3Fluorescence.append(0)
+
+            if FrecuenciasReferencia[3] != 0:
+                DarkResonance4Frequency.append(FrecuenciasReferencia[3])
+                DarkResonance4Fluorescence.append(0)
+
+            if FrecuenciasReferencia[4] != 0:
+                DarkResonance5Frequency.append(FrecuenciasReferencia[4])
+                DarkResonance5Fluorescence.append(0)
+
+            if FrecuenciasReferencia[5] != 0:
+                DarkResonance6Frequency.append(FrecuenciasReferencia[5])
+                DarkResonance6Fluorescence.append(0)            
+            
+        i = i + 1
+
+    return DarkResonance1Frequency, DarkResonance1Fluorescence, DarkResonance2Frequency, DarkResonance2Fluorescence, DarkResonance3Frequency, DarkResonance3Fluorescence, DarkResonance4Frequency, DarkResonance4Fluorescence, DarkResonance5Frequency, DarkResonance5Fluorescence, DarkResonance6Frequency, DarkResonance6Fluorescence, FrecuenciasReferenciaBase
+
+
+
+def PerformExperiment_8levels(rabG, rabR, rabP, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobeVec, phirepump, titarepump, freqMin, freqMax, freqStep, plot=False, solvemode=1, detpvec=None):
+    
+    """
+    Hace un experimento barriendo ángulos de repump con el angulo de doppler fijo.
+    
+    solvemode=1: resuelve con np.linalg.solve
+    solvemode=2: resuelve invirtiendo L con la funcion np.linalg.inv
+    """
+    
+    Fluovectors = []
+    
+    for titaprobe in titaprobeVec:
+        
+        tinicial = time.time()
+
+        ProbeDetuningVectorL, Fluovector = CPTspectrum8levels(rabG, rabR, rabP, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobe, phirepump, titarepump, freqMin=freqMin, freqMax=freqMax, freqStep=freqStep, plot=False, solvemode=1)
+
+        tfinal = time.time()
+        
+        print('Done angle ', titarepump, ' Total time: ', round((tfinal-tinicial), 2), "s")   
+        
+        if plot:
+            plt.figure()
+            plt.xlabel('Repump detuning (MHz')
+            plt.ylabel('Fluorescence (A.U.)')
+            plt.plot(ProbeDetuningVectorL, Fluovector, label=str(titarepump)+'º tita repump, T: ' + str(T*1e3) + ' mK')
+            plt.legend()
+            
+        Fluovectors.append(Fluovector)
+        
+        if len(titaprobeVec) == 1: #esto es para que no devuelva un vector de vectores si solo fijamos un angulo
+            Fluovectors = Fluovector
+   
+    return ProbeDetuningVectorL, Fluovectors
+
+
+
+def PerformExperiment_8levels_fixedRabi(sg, sr, sp, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobeVec, phirepump, titarepump, freqMin, freqMax, freqStep, plot=False, solvemode=1, detpvec=None):
+    
+    """
+    Hace un experimento barriendo ángulos de repump con el angulo de doppler fijo.
+    
+    solvemode=1: resuelve con np.linalg.solve
+    solvemode=2: resuelve invirtiendo L con la funcion np.linalg.inv
+    """
+    
+    Fluovectors = []
+    
+    for titaprobe in titaprobeVec:
+        
+        tinicial = time.time()
+
+        ProbeDetuningVectorL, Fluovector = CPTspectrum8levels_fixedRabi(sg, sr, sp, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, titaprobe, phirepump, titarepump, freqMin=freqMin, freqMax=freqMax, freqStep=freqStep, plot=False, solvemode=1)
+
+        tfinal = time.time()
+        
+        print('Done angle ', titarepump, ' Total time: ', round((tfinal-tinicial), 2), "s")   
+        
+        if plot:
+            plt.figure()
+            plt.xlabel('Repump detuning (MHz')
+            plt.ylabel('Fluorescence (A.U.)')
+            plt.plot(ProbeDetuningVectorL, Fluovector, label=str(titarepump)+'º tita repump, T: ' + str(T*1e3) + ' mK')
+            plt.legend()
+            
+        Fluovectors.append(Fluovector)
+        
+        if len(titaprobeVec) == 1: #esto es para que no devuelva un vector de vectores si solo fijamos un angulo
+            Fluovectors = Fluovector
+   
+    return ProbeDetuningVectorL, Fluovectors
+
+
+

analisis/plots/20231123_CPTconmicromocion3/Data/EITfit/threeLevel_2repumps_CPTPlotter.py

+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Tue Sep  1 17:58:39 2020
+
+@author: oem
+"""
+
+
+
+import os
+import numpy as np
+#os.chdir('/home/oem/Nextcloud/G_liaf/liaf-TrampaAnular/Código General/EIT-CPT/Buenos Aires/Experiment Simulations/CPT scripts/Eight Level 2 repumps')
+from threeLevel_2repumps_AnalysisFunctions import CalculoTeoricoDarkResonances_8levels, GetMinimaInfo, GetPlotsofFluovsAngle_8levels, PerformExperiment_8levels, FindDRFrequencies, FindRelativeFluorescencesOfDR, GenerateNoisyCPT, SmoothNoisyCPT, GetFinalMaps, GenerateNoisyCPT_fixedRabi, GenerateNoisyCPT_fit
+import matplotlib.pyplot as plt
+import time
+from threeLevel_2repumps_AnalysisFunctions import MeasureRelativeFluorescenceFromCPT, IdentifyPolarizationCoincidences, RetrieveAbsoluteCoincidencesBetweenMaps, GetClosestIndex
+
+#C:\Users\Usuario\Nextcloud\G_liaf\liaf-TrampaAnular\Código General\EIT-CPT\Buenos Aires\Experiment Simulations\CPT scripts\Eight Level 2 repumps
+
+ub = 9.27e-24
+h = 6.63e-34
+c = (ub/h)*1e-4 #en unidades de MHz/G
+
+#u = 1e6
+u = 33.5e6
+
+B = (u/(2*np.pi))/c
+
+
+#sg, sp = 0.6, 5  #parámetros de control, saturación del doppler y repump
+#rabG, rabP = sg*gPS, sp*gPD #frecuencias de rabi
+
+gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 #anchos de linea de las transiciones
+
+
+
+lw = 0.1
+DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth = lw, lw, lw #ancho de linea de los laseres
+
+DetDoppler = -36 #42
+DetRepumpVec = [DetDoppler+29.6]
+
+Tvec = [0.7] #temperatura en mK
+alpha = 0*(np.pi/180) #angulo entre los láseres
+
+
+phidoppler, titadoppler = 0, 90
+phirepump, titarepump = 0,  0
+phiprobe = 0
+titaprobe = 90
+
+#Calculo las resonancias oscuras teóricas
+#ResonanciasTeoricas, DRPositivas = CalculoTeoricoDarkResonances_8levels(u/(2*np.pi*1e6), titadoppler, DetDoppler, DetRepump)
+
+#Parametros de la simulacion cpt
+center = -45
+span = 80
+freqMin = center-span*0.5
+freqMax = center+span*0.5
+
+""" parametros para tener espectros coherentes
+freqMin = -56
+freqMax = 14
+"""
+freqStep = 1e-1
+
+noiseamplitude = 0
+
+RelMinMedido0Vector = []
+RelMinMedido1Vector = []
+RelMinMedido2Vector = []
+RelMinMedido3Vector = []
+RelMinMedido4Vector = []
+
+#Sr = np.arange(0, 10, 0.2)
+
+#Sg = np.arange(0.01, 1, 0.05)
+#Sp = np.arange(0.1, 6.1, 1)
+
+#Sg = [0.6**2]
+#Sp = [2.3**2]
+
+
+Sg = [1.4]
+Sp = [6]
+
+Sr = [11]
+
+
+
+
+i = 0
+
+save = False
+
+
+showFigures = True
+
+if not showFigures:
+    plt.ioff()
+else:
+    plt.ion()
+    
+fig1, ax1 = plt.subplots()
+
+offsetx = 464
+
+ax1.plot([f-offsetx for f in FreqsDR], CountsDR, 'o')
+
+run = True
+
+Scale = 730
+Offset = 600 #600 para 20k cuentas aprox
+
+MaxCoherenceValue = []
+
+for sg in Sg:
+    for sp in Sp:
+        rabG, rabP = sg*gPS, sp*gPD
+        for Ti in Tvec:
+            T = Ti*1e-3
+            for DetRepump in DetRepumpVec:
+                print(T)
+                for sr in Sr:
+                
+                    rabR = sr*gPD
+                    
+                    #MeasuredFreq, MeasuredFluo = GenerateNoisyCPT(rabG, rabR, rabP, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, [titaprobe], phirepump, titarepump, freqMin, freqMax, freqStep, plot=False, solvemode=1, detpvec=None, noiseamplitude=noiseamplitude)
+                    if run:
+                        MeasuredFreq4, MeasuredFluo4 = GenerateNoisyCPT_fixedRabi(sg, sr, sp, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, [titaprobe], phirepump, titarepump, freqMin, freqMax, freqStep, plot=False, solvemode=1, detpvec=None, noiseamplitude=noiseamplitude)
+                    
+                    #SmoothFluo = SmoothNoisyCPT(MeasuredFluo, window=9, poly=2)
+                    SmoothFluo4 = MeasuredFluo4
+                    
+                    #Scale = max(BestC)/max([100*s for s in SmoothFluo4])
+                    ax1.plot(MeasuredFreq4, [Scale*100*f + Offset for f in SmoothFluo4], label=f'Sr = {sr}')
+                    ax1.axvline(DetDoppler, linestyle='--', linewidth=1)
+                    #if sr != 0:
+                        #ax1.axvline(DetRepump, linestyle='--', linewidth=1)
+
+                    MaxCoherenceValue.append(np.max(SmoothFluo4))
+
+                    #print(titaprobe)
+                    ax1.set_xlabel('Detuning Rebombeo (MHz)')
+                    ax1.set_ylabel('Fluorescencia (AU)')
+                    ax1.set_title(f'B: {round(B, 2)} G, Sdop: {round(sg, 2)}, Sp: {round(sp, 2)}, Sr: {round(sr, 2)}, lw: {lw} MHz, T: {Ti} mK')
+                    #ax1.set_ylim(0, 8)
+                    #ax1.axvline(DetDoppler, linestyle='dashed', color='red', linewidth=1)
+                    #ax1.axvline(DetRepump, linestyle='dashed', color='black', linewidth=1)
+                    #ax1.set_title('Pol Doppler y Repump: Sigma+ Sigma-, Pol Probe: PI')
+                    #ax1.legend()
+                    ax1.grid()
+                    print (f'{i+1}/{len(Sg)*len(Sp)}')
+                    i = i + 1
+                    if save:
+                        plt.savefig(f'Mapa_plots_100k_1mk/CPT_SMSM_sdop{round(sg, 2)}_sp{round(sp, 2)}_sr{round(sr, 2)}.jpg')
+                    ax1.legend()
+                    
+"""
+plt.figure()
+plt.plot(Sr, MaxCoherenceValue, 'o')
+plt.xlabel('Sr')
+plt.ylabel('Coherence')
+"""
+
+"""
+                        
+plt.figure()
+plt.plot(MeasuredFreq, [100*f for f in SmoothFluo], color='darkred')
+plt.xlabel('Desintonía 866 (MHz)')
+plt.ylabel('Fluorescencia (A.U.)')
+plt.axvline(-30, color='darkblue', linewidth=1.2, linestyle='--')
+plt.yticks(np.arange(0.4, 1.8, 0.2))
+plt.ylim(0.5, 1.6)
+plt.grid()
+              
+
+
+plt.figure()
+plt.plot(MeasuredFreq4, [100*f for f in SmoothFluo4], color='darkred')
+plt.xlabel('Desintonía 866 (MHz)')
+plt.ylabel('Fluorescencia (A.U.)')
+plt.axvline(-30, color='darkblue', linewidth=1.2, linestyle='--')
+plt.yticks(np.arange(0.8, 2.4, 0.4))
+plt.grid()
+              
+"""
+
+
+
+
+#%%
+from scipy.optimize import curve_fit
+
+T = 0.5e-3
+
+sg = 0.7
+sp = 6
+sr = 0
+DetDoppler = -14
+DetRepump = 0
+
+FitsSp = []
+FitsOffset = []
+
+Sg = [0.87]
+
+def FitEIT(freqs, SP, offset):
+    MeasuredFreq, MeasuredFluo = GenerateNoisyCPT_fit(0.87, sr, SP, gPS, gPD, DetDoppler, DetRepump, u, DopplerLaserLinewidth, RepumpLaserLinewidth, ProbeLaserLinewidth, T, alpha, phidoppler, titadoppler, phiprobe, [titaprobe], phirepump, titarepump, freqs, plot=False, solvemode=1, detpvec=None, noiseamplitude=noiseamplitude)
+    FinalFluo = [f*43000 + 2685 for f in MeasuredFluo]
+    return FinalFluo
+
+freqs = [f-offsetx+32 for f in FreqsDR]
+freqslong = np.arange(min(freqs), max(freqs)+freqs[1]-freqs[0], 0.1*(freqs[1]-freqs[0]))
+
+popt, pcov = curve_fit(FitEIT, freqs, CountsDR, p0=[5, 700], bounds=(0, [10, 1e6]))
+
+FitsSp.append(popt[0])
+FitsOffset.append(popt[1])
+
+print(popt)
+
+FittedEIT = FitEIT(freqslong, *popt)
+
+
+plt.figure()
+plt.errorbar(freqs, CountsDR, yerr=2*np.sqrt(CountsDR), fmt='o', capsize=2, markersize=2)
+plt.plot(freqslong, FitEIT(freqslong, *popt))
+plt.title(f'Sdop: {round(popt[0], 2)}, Spr: {round(popt[1], 2)}, T: {T*1e3} mK, detDop: {DetDoppler} MHz')
+
+np.savetxt('CPT_measured.txt', np.transpose([freqs, CountsDR]))
+np.savetxt('CPT_fitted.txt', np.transpose([freqslong, FittedEIT]))

analisis/plots/20231123_CPTconmicromocion3/Data/EITfit/threeLevel_2repumps_linealpol_python_scripts.py

+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Tue Apr  7 22:30:01 2020
+
+@author: nico
+"""
+
+
+import numpy as np
+import time
+import matplotlib.pyplot as plt
+from scipy.signal import argrelextrema
+
+
+"""
+Scripts para el calculo de la curva CPT
+"""
+
+
+def H0matrix(Detg, Detp, u): 
+    """
+    Calcula la matriz H0 en donde dr es el detuning del doppler, dp es el retuning del repump y u es el campo magnético en Hz/Gauss.
+    Para esto se toma la energía del nivel P como 0
+    """
+    
+    eigenEnergies = (Detg-u, Detg+u, -u/3, u/3, Detp-6*u/5, Detp-2*u/5, Detp+2*u/5, Detp+6*u/5) #pagina 26 de Oberst. los lande del calcio son iguales a Bario.
+    H0 = np.diag(eigenEnergies)
+    
+    return H0
+
+
+def HImatrix(rabG, rabP, phidoppler, titadoppler, phiprobe, titaprobe):
+    """
+    Calcula la matriz de interacción Hsp + Hpd, en donde rabR es la frecuencia de rabi de la transición Doppler SP, 
+    rabP es la frecuencia de rabi de la transición repump DP, y las componentes ei_r y ei_p son las componentes de la polarización
+    del campo eléctrico incidente de doppler y repump respectivamente. Deben estar normalizadas a 1
+    """
+    HI = np.zeros((8, 8), dtype=np.complex_)
+    
+    i, j = 1, 3
+    HI[i-1, j-1] = (rabG/np.sqrt(3)) * np.cos(titadoppler)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1]) 
+    
+    i, j = 1, 4
+    HI[i-1, j-1] = -(rabG/np.sqrt(3)) * np.sin(titadoppler)*np.exp(1j*phidoppler)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    i, j = 2, 3
+    HI[i-1, j-1] = -(rabG/np.sqrt(3)) * np.sin(titadoppler)*np.exp(-1j*phidoppler)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+     
+    i, j = 2, 4
+    HI[i-1, j-1] = -(rabG/np.sqrt(3)) * np.cos(titadoppler)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])   
+    
+    
+    i, j = 3, 5
+    HI[i-1, j-1] = -(rabP/2) * np.sin(titaprobe)*np.exp(-1j*phiprobe)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    i, j = 3, 6
+    HI[i-1, j-1] = -(rabP/np.sqrt(3)) * np.cos(titaprobe)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    i, j = 3, 7
+    HI[i-1, j-1] = rabP/np.sqrt(12) * np.sin(titaprobe)*np.exp(1j*phiprobe)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    
+    i, j = 4, 6
+    HI[i-1, j-1] = -(rabP/np.sqrt(12)) * np.sin(titaprobe)*np.exp(-1j*phiprobe)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    i, j = 4, 7
+    HI[i-1, j-1] = -(rabP/np.sqrt(3)) * np.cos(titaprobe) 
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    i, j = 4, 8
+    HI[i-1, j-1] = (rabP/2) * np.sin(titaprobe)*np.exp(1j*phiprobe)
+    HI[j-1, i-1] = np.conjugate(HI[i-1, j-1])
+    
+    return HI
+
+
+def Lplusminus(detr, detp, phirepump, titarepump, forma=1):
+    Hintplus = np.zeros((8, 8), dtype=np.complex_)
+    Hintminus = np.zeros((8, 8), dtype=np.complex_)
+
+
+    Hintplus[4, 2] = (-1/2)*np.sin(titarepump)*np.exp(1j*phirepump)
+    Hintplus[5, 2] = (-1/np.sqrt(3))*np.cos(titarepump)
+    Hintplus[6, 2] = (1/(2*np.sqrt(3)))*np.sin(titarepump)*np.exp(-1j*phirepump)
+    
+    Hintplus[5, 3] = (-1/(2*np.sqrt(3)))*np.sin(titarepump)*np.exp(1j*phirepump)
+    Hintplus[6, 3] = (-1/np.sqrt(3))*np.cos(titarepump)
+    Hintplus[7, 3] = (1/2)*np.sin(titarepump)*np.exp(-1j*phirepump)
+    
+
+    Hintminus[2, 4] = (-1/2)*np.sin(titarepump)*np.exp(-1j*phirepump)
+    Hintminus[2, 5] = (-1/np.sqrt(3))*np.cos(titarepump)
+    Hintminus[2, 6] = (1/(2*np.sqrt(3)))*np.sin(titarepump)*np.exp(1j*phirepump)
+    
+    Hintminus[3, 5] = (-1/(2*np.sqrt(3)))*np.sin(titarepump)*np.exp(-1j*phirepump)
+    Hintminus[3, 6] = (-1/np.sqrt(3))*np.cos(titarepump)
+    Hintminus[3, 7] = (1/2)*np.sin(titarepump)*np.exp(1j*phirepump)
+
+    if forma==1:
+        Lplus = np.zeros((64, 64), dtype=np.complex_)
+        Lminus = np.zeros((64, 64), dtype=np.complex_)
+        DeltaBar = np.zeros((64, 64), dtype=np.complex_)
+    
+        for r  in range(8):
+            for q in range(8):
+                for k in range(8):
+                    for j in range(8):
+                        if j==q:
+                            if (k==2 or k==3) and r > 3:
+                                Lplus[r*8+q][k*8+j] = (-1j)*(Hintplus[r,k]) 
+                            if (r==2 or r==3) and k > 3:
+                                Lminus[r*8+q][k*8+j] = (-1j)*(Hintminus[r,k])
+                        elif r==k:
+                            if (q==2 or q==3) and j > 3:
+                                Lplus[r*8+q][k*8+j] = (-1j)*(- Hintplus[j,q]) 
+                            if (j==2 or j==3) and q > 3:
+                                Lminus[r*8+q][k*8+j] = (-1j)*(- Hintminus[j,q])
+    if forma==2:
+        deltaKro = np.diag([1, 1, 1, 1, 1, 1, 1, 1])
+        Lplus = (-1j)*(np.kron(Hintplus, deltaKro) - np.kron(deltaKro, Hintplus))
+        Lminus = (-1j)*(np.kron(Hintminus, deltaKro) - np.kron(deltaKro, Hintminus))
+    
+    DeltaBar = np.zeros((64, 64), dtype=np.complex_)   
+    for i in range(64):
+        
+        DeltaBar[i, i] = (1j)*(detr - detp)
+
+    return np.matrix(Lminus), np.matrix(Lplus), np.matrix(DeltaBar)
+
+
+def GetL1(Lplus, Lminus, DeltaBar, L0, rabR, nmax):
+    """
+    Devuelve Splus0 y Sminus0
+    """
+    
+    Sp = (-1)*(0.5*rabR)*(np.matrix(np.linalg.inv(L0 - (nmax+1)*DeltaBar))*np.matrix(Lplus))
+    Sm = (-1)*(0.5*rabR)*(np.matrix(np.linalg.inv(L0 + (nmax+1)*DeltaBar))*np.matrix(Lminus))
+    
+    for n in list(range(nmax+1))[(nmax+1)::-1][0:len(list(range(nmax+1))[(nmax+1)::-1])-1]: #jaja esto solo es para que vaya de nmax a 1 bajando. debe haber algo mas facil pero kcio
+        Sp = (-1)*(rabR)*(np.matrix(np.linalg.inv(L0 - n*DeltaBar + rabR*(Lminus*np.matrix(Sp))))*np.matrix(Lplus))
+        Sm = (-1)*(rabR)*(np.matrix(np.linalg.inv(L0 + n*DeltaBar + rabR*(Lplus*np.matrix(Sm))))*np.matrix(Lminus))
+    L1 = 0.5*rabR*(np.matrix(Lminus)*np.matrix(Sp) + np.matrix(Lplus)*np.matrix(Sm))
+    
+    return L1
+
+
+def EffectiveL(gPS, gPD, lwg, lwr, lwp):
+
+    """
+    Siendo Heff = H + EffectiveL, calcula dicho EffectiveL que es (-0.5j)*sumatoria(CmDaga*Cm) que luego sirve para calcular el Liouvilliano
+    """
+    Leff = np.zeros((8, 8), dtype=np.complex_)
+    
+    Leff[0, 0] = 2*lwg
+    Leff[1, 1] = 2*lwg
+    Leff[2, 2] = ((2/3)+(1/3))*gPS + ((1/2) + (1/6) + (1/3))*gPD
+    Leff[3, 3] = ((2/3)+(1/3))*gPS + ((1/2) + (1/6) + (1/3))*gPD
+    Leff[4, 4] = 2*(lwr + lwp)
+    Leff[5, 5] = 2*(lwr + lwp)
+    Leff[6, 6] = 2*(lwr + lwp)
+    Leff[7, 7] = 2*(lwr + lwp)
+    
+    return (-0.5j)*Leff
+
+
+def CalculateSingleMmatrix(gPS, gPD, lwg, lwr, lwp):
+    """
+    Si tomamos el Liuvilliano como L = (-j)*(Heff*deltak - Heffdaga*deltak) + sum(Mm),
+    esta funcion calcula dichos Mm, que tienen dimensión 64x64 ya que esa es la dimensión del L. Estas componentes
+    salen de hacer la cuenta a mano conociendo los Cm y considerando que Mm[8*(r-1)+s, 8*(k-1)+j] = Cm[r,l] + Cmdaga[j,s] = Cm[r,l] + Cm[s,j]
+    ya que los componentes de Cm son reales.
+    Esta M es la suma de las 8 matrices M.
+    
+    """
+    
+    M = np.matrix(np.zeros((64, 64), dtype=np.complex_))
+    
+    M[0,27] = (2/3)*gPS
+    
+    M[9,18] = (2/3)*gPS
+    
+    M[0,18] = (1/3)*gPS
+    M[1,19] = -(1/3)*gPS
+    M[8,26] = -(1/3)*gPS
+    M[9,27] = (1/3)*gPS
+    
+    M[36,18] = (1/2)*gPD
+    M[37,19] = (1/np.sqrt(12))*gPD
+    M[44,26] = (1/np.sqrt(12))*gPD
+    M[45,27] = (1/6)*gPD
+    
+    M[54,18] = (1/6)*gPD
+    M[55,19] = (1/np.sqrt(12))*gPD
+    M[62,26] = (1/np.sqrt(12))*gPD
+    M[63,27] = (1/2)*gPD
+    
+    M[45,18] = (1/3)*gPD
+    M[46,19] = (1/3)*gPD
+    M[53,26] = (1/3)*gPD
+    M[54,27] = (1/3)*gPD
+    
+    M[0,0] = 2*lwg
+    M[1,1] = 2*lwg
+    M[8,8] = 2*lwg
+    M[9,9] = 2*lwg
+    
+    factor1 = 1
+    factor2 = 1
+    factor3 = 1
+    factor4 = 1
+    
+    
+    #M[36, 45] = lwp
+    
+    
+    M[36,36] = 2*(lwr + factor1*lwp)
+    M[37,37] = 2*(lwr + factor1*lwp)
+    M[38,38] = 2*(lwr + factor1*lwp)
+    M[39,39] = 2*(lwr + factor1*lwp)
+    M[44,44] = 2*(lwr + factor2*lwp)
+    M[45,45] = 2*(lwr + factor2*lwp)
+    M[46,46] = 2*(lwr + factor2*lwp)
+    M[47,47] = 2*(lwr + factor2*lwp)
+    M[52,52] = 2*(lwr + factor3*lwp)
+    M[53,53] = 2*(lwr + factor3*lwp)
+    M[54,54] = 2*(lwr + factor3*lwp)
+    M[55,55] = 2*(lwr + factor3*lwp)
+    M[60,60] = 2*(lwr + factor4*lwp)
+    M[61,61] = 2*(lwr + factor4*lwp)
+    M[62,62] = 2*(lwr + factor4*lwp)
+    M[63,63] = 2*(lwr + factor4*lwp)
+
+    return M
+
+def dopplerBroadening(wlg, wlp, alpha, T, mcalcio = 6.655e-23*1e-3):
+    """
+    Calcula el broadening extra semiclásico por temperatura considerando que el ion atrapado se mueve.
+    wlg es la longitud de onda doppler, wlp la longitud de onda repump, T la temperatura del ion en kelvin, y alpha (en rads) el ángulo
+    que forman ambos láseres.
+    """
+    
+    kboltzmann = 1.38e-23 #J/K
+    
+    gammaD = (2*np.pi)*np.sqrt((1/(wlg*wlg)) + (1/(wlp*wlp)) - 2*(1/(wlg*wlp))*np.cos(alpha))*np.sqrt(kboltzmann*T/(2*mcalcio))
+
+    return gammaD
+    
+
+def FullL_efficient(rabG, rabR, rabP, gPS = 0, gPD = 0, Detg = 0, Detr = 0, Detp = 0, u = 0, lwg = 0, lwr=0, lwp = 0, 
+          phidoppler=0, titadoppler=0, phiprobe=0, titaprobe=0, phirepump=0, titarepump=0, T = 0, alpha = 0):
+
+    """
+    Calcula el Liouvilliano total de manera explícita índice a índice. Suma aparte las componentes de las matrices M.
+    Es la más eficiente hasta ahora.
+    """
+    
+    
+    db = dopplerBroadening(0.397e-6, 0.866e-6, alpha, T)
+    
+    #lwr = np.sqrt(lwr**2 + dopplerBroadening(0.397e-6, 0.866e-6, alpha, T)**2)
+    lwg = np.sqrt(lwg**2 + db**2)
+    lwr = np.sqrt(lwr**2 + db**2)    
+    
+    CC = EffectiveL(gPS, gPD, lwg, lwr, lwp)
+    
+    Heff = H0matrix(Detg, Detp, u) + HImatrix(rabG, rabP, phidoppler, titadoppler, phiprobe, titaprobe) + CC
+    
+    Heffdaga = np.matrix(Heff).getH()
+    
+    Lfullpartial = np.zeros((64, 64), dtype=np.complex_)
+    
+    for r  in range(8):
+        for q in range(8):
+            for k in range(8):
+                for j in range(8):
+                    if j!=q and r!=k:
+                        pass
+                    elif j==q and r!=k:
+                        if (r < 2 and k > 3) or (k < 2 and r > 3) or (r > 3 and k > 3) or (r==0 and k==1) or (r==1 and k==0) or (r==2 and k==3) or (r==3 and k==2): #todo esto sale de analizar explicitamente la matriz y tratar de no calcular cosas de más que dan cero
+                            pass
+                        else:
+                            Lfullpartial[r*8+q][k*8+j] = (-1j)*(Heff[r,k])
+                    elif j!=q and r==k:
+                        if (j < 2 and q > 3) or (q < 2 and j > 3) or (j > 3 and q > 3) or (j==0 and q==1) or (j==1 and q==0) or (j==2 and q==3) or (j==3 and q==2):
+                            pass
+                        else:
+                            Lfullpartial[r*8+q][k*8+j] = (-1j)*(-Heffdaga[j,q])
+                    else:
+                        if Heff[r,k] == Heffdaga[j,q]:
+                            pass
+                        else:
+                            Lfullpartial[r*8+q][k*8+j] = (-1j)*(Heff[r,k]-Heffdaga[j,q])
+
+    M = CalculateSingleMmatrix(gPS, gPD, lwg, lwr, lwp) 
+    L0 = np.array(np.matrix(Lfullpartial) + M)
+    
+    nmax = 1
+    Lminus, Lplus, DeltaBar = Lplusminus(Detr, Detp, phirepump, titarepump)
+    factor1 = np.exp(1j*0.2*np.pi)
+    factor2 = np.exp(-1j*0.2*np.pi)
+    #print(factor)
+    L1 = GetL1(factor1*Lplus, factor2*Lminus, DeltaBar, L0, rabR, nmax)
+    Lfull = L0 + L1    
+    
+    
+    #NORMALIZACION DE RHO
+    i = 0 
+    while i < 64:
+        if i%9 == 0:
+            Lfull[0, i] = 1
+        else:
+            Lfull[0, i] = 0
+        i = i + 1    
+    
+    return Lfull 
+
+
+"""
+Scripts para correr un experimento y hacer el análisis de los datos
+"""
+
+def CalculoTeoricoDarkResonances(u, titadoppler):
+    if titadoppler==0:
+        NegativeDR = [(-7/5)*u, (-3/5)*u, (-1/5)*u, (1/5)*u, (3/5)*u, (7/5)*u]
+    elif titadoppler==90:
+        NegativeDR = [(-11/5)*u, (-7/5)*u, (-3/5)*u, (3/5)*u, (7/5)*u, (11/5)*u]
+    
+    PositiveDR = [(-8/5)*u, (-4/5)*u, 0, (4/5)*u, (8/5)*u]
+    
+    return NegativeDR, PositiveDR
+
+
+def CPTspectrum8levels(rabG, rabR, rabP, gPS, gPD, Detg, Detr, u, lwg, lwr, lwp, Temp, alpha, phidoppler, titadoppler, phiprobe, titaprobe, phirepump, titarepump, 
+                      freqMin=-100, freqMax=100, freqStep=1e-1, plot=False, solvemode=1):
+    """
+    Hace un experimento barriendo ángulos de repump con el angulo de doppler fijo.
+    
+    solvemode=1: resuelve con np.linalg.solve
+    solvemode=2: resuelve invirtiendo L con la funcion np.linalg.inv
+    """
+    
+    phidoppler, titadoppler = phidoppler*(np.pi/180), titadoppler*(np.pi/180) 
+    phiprobe, titaprobe = phiprobe*(np.pi/180), titaprobe*(np.pi/180)
+    phirepump, titarepump = phirepump*(np.pi/180), titarepump*(np.pi/180)
+    
+    DetProbeVector = 2*np.pi*np.arange(freqMin*1e6, freqMax*1e6, freqStep*1e6)
+    Detg, Detr = 2*np.pi*Detg*1e6, 2*np.pi*Detr*1e6
+    lwg, lwr, lwp = 2*np.pi*lwg*1e6, 2*np.pi*lwr*1e6, 2*np.pi*lwp*1e6
+    
+    #u = 2*np.pi*u*1e6
+    
+    Fluovector = []
+    
+    tinicial = time.time()
+    
+    for Detp in DetProbeVector:
+        L = FullL_efficient(rabG, rabR, rabP, gPS, gPD, Detg, Detr, Detp, u, lwg, lwr, lwp, phidoppler, titadoppler, phiprobe, titaprobe, phirepump, titarepump, Temp, alpha)
+        
+        if solvemode == 1:
+            rhovectorized = np.linalg.solve(L, np.array([int(i==0) for i in range(64)]))
+            Fluo = np.real(rhovectorized[18] + np.real(rhovectorized[27])) #estos son los rho33 + rho44
+            Fluovector.append(Fluo)                
+
+        if solvemode == 2:
+            Linv = np.linalg.inv(L) 
+            rhovectorized = [Linv[j][0] for j in range(len(Linv))]
+            Fluo = np.real(rhovectorized[18] + np.real(rhovectorized[27])) #estos son los rho33 + rho44
+            Fluovector.append(Fluo)
+        
+    tfinal = time.time()
+        
+    print('Done, Total time: ', round((tfinal-tinicial), 2), "s")   
+    
+    DetProbeVectorMHz = np.arange(freqMin, freqMax, freqStep)
+    
+    if plot:
+        plt.xlabel('Probe detuning (MHz)')
+        plt.ylabel('Fluorescence (A.U.)')
+        plt.plot(DetProbeVectorMHz, [100*f for f in Fluovector], label=str(titaprobe) + 'º, T: ' + str(Temp*1e3) + ' mK')
+        plt.legend()
+        
+    return DetProbeVectorMHz, Fluovector
+
+
+def CPTspectrum8levels_fixedRabi(sg, sr, sp, gPS, gPD, Detg, Detr, u, lwg, lwr, lwp, Temp, alpha, phidoppler, titadoppler, phiprobe, titaprobe, phirepump, titarepump, 
+                      freqMin=-100, freqMax=100, freqStep=1e-1, plot=False, solvemode=1):
+    """
+    Hace un experimento barriendo ángulos de repump con el angulo de doppler fijo.
+    
+    solvemode=1: resuelve con np.linalg.solve
+    solvemode=2: resuelve invirtiendo L con la funcion np.linalg.inv
+    """
+
+
+
+    
+    phidoppler, titadoppler = phidoppler*(np.pi/180), titadoppler*(np.pi/180) 
+    phiprobe, titaprobe = phiprobe*(np.pi/180), titaprobe*(np.pi/180)
+    phirepump, titarepump = phirepump*(np.pi/180), titarepump*(np.pi/180)
+    
+    DetProbeVector = 2*np.pi*np.arange(freqMin*1e6, freqMax*1e6, freqStep*1e6)
+    Detg, Detr = 2*np.pi*Detg*1e6, 2*np.pi*Detr*1e6
+    #lwg, lwr, lwp = 2*np.pi*lwg*1e6, 2*np.pi*lwr*1e6, 2*np.pi*lwp*1e6
+    lwg, lwr, lwp = lwg*1e6, lwr*1e6, lwp*1e6
+
+    rabG = sg*gPS
+    rabR = sr*gPD
+    rabP = sp*gPD
+    #u = 2*np.pi*u*1e6
+    
+    Fluovector = []
+    
+    tinicial = time.time()
+    
+    for Detp in DetProbeVector:
+
+        L = FullL_efficient(rabG, rabR, rabP, gPS, gPD, Detg, Detr, Detp, u, lwg, lwr, lwp, phidoppler, titadoppler, phiprobe, titaprobe, phirepump, titarepump, Temp, alpha)
+        
+        if solvemode == 1:
+            coh = 5
+            rhovectorized = np.linalg.solve(L, np.array([int(i==0) for i in range(64)]))
+            #Fluo = np.abs(rhovectorized[coh])
+            Fluo = np.real(rhovectorized[18] + np.real(rhovectorized[27])) #estos son los rho33 + rho44
+            Fluovector.append(Fluo)                
+
+        if solvemode == 2:
+            Linv = np.linalg.inv(L) 
+            rhovectorized = [Linv[j][0] for j in range(len(Linv))]
+            Fluo = np.real(rhovectorized[18] + np.real(rhovectorized[27])) #estos son los rho33 + rho44
+            Fluovector.append(Fluo)
+        
+    tfinal = time.time()
+        
+    print('Done, Total time: ', round((tfinal-tinicial), 2), "s")   
+    
+    DetProbeVectorMHz = np.arange(freqMin, freqMax, freqStep)
+    
+    if plot:
+        plt.xlabel('Probe detuning (MHz)')
+        plt.ylabel('Fluorescence (A.U.)')
+        plt.plot(DetProbeVectorMHz, [100*f for f in Fluovector], label=str(titaprobe) + 'º, T: ' + str(Temp*1e3) + ' mK')
+        plt.legend()
+        
+    return DetProbeVectorMHz, Fluovector
+#%%
+
+if __name__ == "__main__":
+    ub = 9.27e-24
+    h = 6.63e-34
+    c = (ub/h)*1e-4 #en unidades de MHz/G
+    
+    B = 25 #campo magnetico en gauss
+    
+    u = c*B
+    
+    
+    sg, sr, sp = 0.5, 1.5, 4 #parámetros de saturación del doppler y repump
+    gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6 #anchos de linea de las transiciones
+    rabG, rabR, rabP = sg*gPS, sr*gPD, sp*gPD #frecuencias de rabi
+    
+    lwg, lwr, lwp = 0.3, 0.3, 0.3 #ancho de linea de los laseres
+    
+    Detg = -25
+    Detr = 20 #detuning del doppler y repump
+    
+    Temp = 0.0e-3 #temperatura en K
+    alpha = 0*(np.pi/180) #angulo entre los láseres
+    
+    phidoppler, titadoppler = 0, 90
+    phirepump, titarepump = 0, 90
+    
+    phiprobe, titaprobe = 0, 90
+    
+    
+    plotCPT = False
+    
+    freqMin = -50
+    freqMax = 50
+    freqStep = 5e-2
+    
+    Frequencyvector, Fluovector = CPTspectrum8levels(rabG, rabR, rabP, gPS, gPD, Detg, Detr, u, lwg, lwr, lwp, Temp, alpha, phidoppler, titadoppler, phiprobe, titaprobe, phirepump, titarepump, freqMin=freqMin, freqMax=freqMax, freqStep=freqStep, plot=plotCPT, solvemode=1)
+    
+    NegativeDR, PositiveDR = CalculoTeoricoDarkResonances(u/(2*np.pi*1e6), titadoppler)
+
+    plt.plot(Frequencyvector, [100*f for f in Fluovector], label=str(titaprobe) + 'º, T: ' + str(Temp*1e3) + ' mK')
+    plt.xlabel('Probe detuning (MHz)')
+    plt.ylabel('Fluorescence (A.U.)')
+    
+    for PDR in PositiveDR:
+        plt.axvline(Detr+PDR, linestyle='--', linewidth=0.5, color='red')
+    for NDR in NegativeDR:
+        plt.axvline(Detg+NDR, linestyle='--', linewidth=0.5, color='blue')
+
+
+
+    
+    #parametros que andan piola:
+        
+    
+    """
+    ub = 9.27e-24
+    h = 6.63e-34
+    c = (ub/h)*1e-4 #en unidades de MHz/G
+    
+    B = 17 #campo magnetico en gauss
+    
+    u = c*B
+    #u = 80e6
+    
+    sr, sp = 0.53, 4.2
+    gPS, gPD, = 2*np.pi*21.58e6, 2*np.pi*1.35e6
+    rabR, rabP = sr*gPS, sp*gPD
+    lw = 2*np.pi * 0.33e6
+    lwr, lwp = lw, lw #ancho de linea de los laseres
+    dr_spec = - 2*np.pi* 26e6
+    
+    
+    freqSteps = 500
+    freqMin = -100e6
+    freqMax = 100e6
+    
+    dps = 2*np.pi*np.linspace(freqMin, freqMax, freqSteps)
+    
+    #dps = [-30e6]
+    
+    alfar = 90*(np.pi/180)
+    ex_r, ey_r, ez_r = np.sin(alfar)*np.cos(0), np.sin(alfar)*np.sin(0), np.cos(alfar)
+    
+    
+    alfap = 90*(np.pi/180)
+    ex_p, ey_p, ez_p = np.sin(alfap)*np.cos(0), np.sin(alfap)*np.sin(0), np.cos(alfap)
+    
+    """